Project

General

Profile

« Previous | Next » 

Revision 379ba26d

Added by Leszek Koltunski almost 2 years ago

Solver: new error strings.

View differences:

src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
49 49
    super(res,object);
50 50
    }
51 51

  
52
///////////////////////////////////////////////////////////////////////////////////////////////////
53

  
54
  private int checkAllCentersPresent(int[] centers)
55
    {
56
    return 0;
57
    }
58

  
59
///////////////////////////////////////////////////////////////////////////////////////////////////
60

  
61
  private void getCorners(TwistyObject object, int[][] corners)
62
    {
63
    corners[0][0] = object.getCubitFaceStickerIndex( 0,0); // FR
64
    corners[0][1] = object.getCubitFaceStickerIndex( 0,1);
65
    corners[0][2] = object.getCubitFaceStickerIndex( 0,5);
66
    corners[0][3] = object.getCubitFaceStickerIndex( 0,4);
67

  
68
    corners[1][0] = object.getCubitFaceStickerIndex( 1,1); // BR
69
    corners[1][1] = object.getCubitFaceStickerIndex( 1,2);
70
    corners[1][2] = object.getCubitFaceStickerIndex( 1,6);
71
    corners[1][3] = object.getCubitFaceStickerIndex( 1,5);
72

  
73
    corners[2][0] = object.getCubitFaceStickerIndex( 2,2); // BL
74
    corners[2][1] = object.getCubitFaceStickerIndex( 2,3);
75
    corners[2][2] = object.getCubitFaceStickerIndex( 2,7);
76
    corners[2][3] = object.getCubitFaceStickerIndex( 2,6);
77

  
78
    corners[3][0] = object.getCubitFaceStickerIndex( 3,3); // FL
79
    corners[3][1] = object.getCubitFaceStickerIndex( 3,0);
80
    corners[3][2] = object.getCubitFaceStickerIndex( 3,4);
81
    corners[3][3] = object.getCubitFaceStickerIndex( 3,7);
82

  
83
    corners[4][0] = object.getCubitFaceStickerIndex( 4,0); // U
84
    corners[4][1] = object.getCubitFaceStickerIndex( 4,3);
85
    corners[4][2] = object.getCubitFaceStickerIndex( 4,2);
86
    corners[4][3] = object.getCubitFaceStickerIndex( 4,1);
87

  
88
    corners[5][0] = object.getCubitFaceStickerIndex( 5,6); // D
89
    corners[5][1] = object.getCubitFaceStickerIndex( 5,7);
90
    corners[5][2] = object.getCubitFaceStickerIndex( 5,4);
91
    corners[5][3] = object.getCubitFaceStickerIndex( 5,5);
92
    }
93

  
94
///////////////////////////////////////////////////////////////////////////////////////////////////
95

  
96
  private void getCenters(TwistyObject object, int[] centers)
97
    {
98
    centers[0] = object.getCubitFaceStickerIndex( 6,0); // UR
99
    centers[1] = object.getCubitFaceStickerIndex( 8,0); // UL
100
    centers[2] = object.getCubitFaceStickerIndex(11,0); // DB
101
    centers[3] = object.getCubitFaceStickerIndex(13,0); // DF
102
    centers[4] = object.getCubitFaceStickerIndex( 9,0); // UF
103
    centers[5] = object.getCubitFaceStickerIndex( 7,0); // UB
104
    centers[6] = object.getCubitFaceStickerIndex(12,0); // DL
105
    centers[7] = object.getCubitFaceStickerIndex(10,1); // DR
106
    }
107

  
52 108
///////////////////////////////////////////////////////////////////////////////////////////////////
53 109

  
54 110
  public int tablebaseIndex(TwistyObject object)
55 111
    {
112
    int[][] corners = new int[6][4];
113
    int[] centers = new int[8];
114

  
115
    getCorners(object,corners);
116
    getCenters(object,centers);
117

  
118
    int result1 = checkAllCentersPresent(centers);
119
    if( result1<0 ) return result1;
120

  
56 121
    return 0;
57 122
    }
58 123

  
src/main/res/values-de/strings.xml
106 106
    <string name="color_green1">grüne</string>
107 107
    <string name="color_red1">rote</string>
108 108
    <string name="color_orange1">orange</string>
109
    <string name="color_violet1">violette</string>
110
    <string name="color_grey1">graue</string>
109 111

  
110 112
    <string name="color_yellow2">gelbe</string>
111 113
    <string name="color_white2">weiße</string>
......
113 115
    <string name="color_green2">grüne</string>
114 116
    <string name="color_red2">rote</string>
115 117
    <string name="color_orange2">orange</string>
118
    <string name="color_violet2">violette</string>
119
    <string name="color_grey2">graue</string>
116 120

  
117 121
    <string name="color_yellow3">gelb</string>
118 122
    <string name="color_white3">weiß</string>
......
120 124
    <string name="color_green3">grün</string>
121 125
    <string name="color_red3">rot</string>
122 126
    <string name="color_orange3">orange</string>
127
    <string name="color_violet3">violett</string>
128
    <string name="color_grey3">grau</string>
123 129

  
124 130
    <string name="color_yellow4">gelbe</string>
125 131
    <string name="color_white4">weiße</string>
......
127 133
    <string name="color_green4">grüne</string>
128 134
    <string name="color_red4">rote</string>
129 135
    <string name="color_orange4">orange</string>
136
    <string name="color_violet4">violette</string>
137
    <string name="color_grey4">graue</string>
130 138

  
131 139
    <string name="color_yellow5">gelb</string>
132 140
    <string name="color_white5">weiß</string>
......
134 142
    <string name="color_green5">grün</string>
135 143
    <string name="color_red5">rot</string>
136 144
    <string name="color_orange5">orange</string>
145
    <string name="color_violet5">violett</string>
146
    <string name="color_grey5">grau</string>
137 147

  
138 148
    <string name="color_yellow6">gelbe</string>
139 149
    <string name="color_white6">weiße</string>
......
141 151
    <string name="color_green6">grüne</string>
142 152
    <string name="color_red6">rote</string>
143 153
    <string name="color_orange6">orange</string>
154
    <string name="color_violet6">violette</string>
155
    <string name="color_grey6">graue</string>
144 156

  
145 157
    <string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
src/main/res/values-es/strings.xml
106 106
    <string name="color_green1">verdes</string>
107 107
    <string name="color_red1">rojos</string>
108 108
    <string name="color_orange1">naranjas</string>
109
    <string name="color_violet1">violetas</string>
110
    <string name="color_grey1">grises</string>
109 111

  
110 112
    <string name="color_yellow2">amarillo</string>
111 113
    <string name="color_white2">blanco</string>
......
113 115
    <string name="color_green2">verde</string>
114 116
    <string name="color_red2">rojo</string>
115 117
    <string name="color_orange2">naranja</string>
118
    <string name="color_violet2">violeta</string>
119
    <string name="color_grey2">gris</string>
116 120

  
117 121
    <string name="color_yellow3">amarilla</string>
118 122
    <string name="color_white3">blanca</string>
......
120 124
    <string name="color_green3">verde</string>
121 125
    <string name="color_red3">roja</string>
122 126
    <string name="color_orange3">naranja</string>
127
    <string name="color_violet3">violeta</string>
128
    <string name="color_grey3">gris</string>
123 129

  
124 130
    <string name="color_yellow4">amarilla</string>
125 131
    <string name="color_white4">blanca</string>
......
127 133
    <string name="color_green4">verde</string>
128 134
    <string name="color_red4">roja</string>
129 135
    <string name="color_orange4">naranja</string>
136
    <string name="color_violet4">violeta</string>
137
    <string name="color_grey4">gris</string>
130 138

  
131 139
    <string name="color_yellow5">amarillo</string>
132 140
    <string name="color_white5">blanco</string>
......
134 142
    <string name="color_green5">verde</string>
135 143
    <string name="color_red5">rojo</string>
136 144
    <string name="color_orange5">naranja</string>
145
    <string name="color_violet5">violeta</string>
146
    <string name="color_grey5">gris</string>
137 147

  
138 148
    <string name="color_yellow6">amarillo</string>
139 149
    <string name="color_white6">blanco</string>
......
141 151
    <string name="color_green6">verde</string>
142 152
    <string name="color_red6">rojo</string>
143 153
    <string name="color_orange6">naranja</string>
154
    <string name="color_violet6">violeta</string>
155
    <string name="color_grey6">gris</string>
144 156

  
145 157
    <string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
src/main/res/values-fr/strings.xml
106 106
    <string name="color_green1">vertes</string>
107 107
    <string name="color_red1">rouges</string>
108 108
    <string name="color_orange1">orange</string>
109
    <string name="color_violet1">violettes</string>
110
    <string name="color_grey1">grises</string>
109 111

  
110 112
    <string name="color_yellow2">jaune</string>
111 113
    <string name="color_white2">blanc</string>
......
113 115
    <string name="color_green2">vert</string>
114 116
    <string name="color_red2">rouge</string>
115 117
    <string name="color_orange2">orange</string>
118
    <string name="color_violet2">violet</string>
119
    <string name="color_grey2">gris</string>
116 120

  
117 121
    <string name="color_yellow3">jaune</string>
118 122
    <string name="color_white3">blanc</string>
......
120 124
    <string name="color_green3">vert</string>
121 125
    <string name="color_red3">rouge</string>
122 126
    <string name="color_orange3">orange</string>
127
    <string name="color_violet3">violet</string>
128
    <string name="color_grey3">gris</string>
123 129

  
124 130
    <string name="color_yellow4">jaune</string>
125 131
    <string name="color_white4">blanc</string>
......
127 133
    <string name="color_green4">vert</string>
128 134
    <string name="color_red4">rouge</string>
129 135
    <string name="color_orange4">orange</string>
136
    <string name="color_violet4">violet</string>
137
    <string name="color_grey4">gris</string>
130 138

  
131 139
    <string name="color_yellow5">jaune</string>
132 140
    <string name="color_white5">blanc</string>
......
134 142
    <string name="color_green5">vert</string>
135 143
    <string name="color_red5">rouge</string>
136 144
    <string name="color_orange5">orange</string>
145
    <string name="color_violet5">violet</string>
146
    <string name="color_grey5">gris</string>
137 147

  
138 148
    <string name="color_yellow6">jaune</string>
139 149
    <string name="color_white6">blanc</string>
......
141 151
    <string name="color_green6">vert</string>
142 152
    <string name="color_red6">rouge</string>
143 153
    <string name="color_orange6">orange</string>
154
    <string name="color_violet6">violet</string>
155
    <string name="color_grey6">gris</string>
144 156

  
145 157
    <string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
src/main/res/values-ja/strings.xml
107 107
    <string name="color_green1">緑の</string>
108 108
    <string name="color_red1">赤い</string>
109 109
    <string name="color_orange1">オレンジ色の</string>
110
    <string name="color_violet1">紫色の</string>
111
    <string name="color_grey1">灰色の</string>
110 112

  
111 113
    <string name="color_yellow2">イエロー</string>
112 114
    <string name="color_white2">ホワイト</string>
......
114 116
    <string name="color_green2">グリーン</string>
115 117
    <string name="color_red2">レッド</string>
116 118
    <string name="color_orange2">オレンジ</string>
119
    <string name="color_violet2">バイオレット</string>
120
    <string name="color_grey2">グレー</string>
117 121

  
118 122
    <string name="color_yellow3">イエロー</string>
119 123
    <string name="color_white3">ホワイト</string>
......
121 125
    <string name="color_green3">グリーン</string>
122 126
    <string name="color_red3">レッド</string>
123 127
    <string name="color_orange3">オレンジ</string>
128
    <string name="color_violet3">バイオレット</string>
129
    <string name="color_grey3">グレー</string>
124 130

  
125 131
    <string name="color_yellow4">イエロー</string>
126 132
    <string name="color_white4">ホワイト</string>
......
128 134
    <string name="color_green4">グリーン</string>
129 135
    <string name="color_red4">レッド</string>
130 136
    <string name="color_orange4">オレンジ</string>
137
    <string name="color_violet4">バイオレット</string>
138
    <string name="color_grey4">グレー</string>
131 139

  
132 140
    <string name="color_yellow5">イエロー</string>
133 141
    <string name="color_white5">ホワイト</string>
......
135 143
    <string name="color_green5">グリーン</string>
136 144
    <string name="color_red5">レッド</string>
137 145
    <string name="color_orange5">オレンジ</string>
146
    <string name="color_violet5">バイオレット</string>
147
    <string name="color_grey5">グレー</string>
138 148

  
139 149
    <string name="color_yellow6">イエロー</string>
140 150
    <string name="color_white6">ホワイト</string>
......
142 152
    <string name="color_green6">グリーン</string>
143 153
    <string name="color_red6">レッド</string>
144 154
    <string name="color_orange6">オレンジ</string>
155
    <string name="color_violet6">バイオレット</string>
156
    <string name="color_grey6">グレー</string>
145 157

  
146 158
    <string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string>
147 159
    <string name="solver_pduo2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
src/main/res/values-ko/strings.xml
87 87
    <string name="solver_generic_missing_center">%1$s 중앙이 사라졌습니다!</string>
88 88
    <string name="solver_generic_missing_corner">%1$s-%2$s-%3$s 모서리 금지!</string>
89 89
    <string name="solver_generic_missing_vertex">%1$s-%2$s-%3$s 팔면체가 없습니다!</string>
90
    <string name="solver_generic_missing_edge">%1$s%2$s테두리 조각이 없습니다!</string>
90
    <string name="solver_generic_missing_edge">%1$s%2$s 테두리 조각이 없습니다!</string>
91 91
    <string name="solver_generic_corners_cannot">모든면이 단색이되도록 모서리를 비틀 수 없습니다!</string>
92 92
    <string name="solver_generic_vertices_cannot">팔면체 조각은 뒤틀릴 수 없으므로 모든면이 단색입니다!</string>
93 93
    <string name="solver_generic_c_v_dont_match">팔면체 조각과 사면체 모서리가 일치하지 않습니다!</string>
......
106 106
    <string name="color_green1">녹색의</string>
107 107
    <string name="color_red1">빨간</string>
108 108
    <string name="color_orange1">주황색</string>
109
    <string name="color_violet1">제비꽃</string>
110
    <string name="color_grey1">회색</string>
109 111

  
110 112
    <string name="color_yellow2">옐로우</string>
111 113
    <string name="color_white2">화이트</string>
......
113 115
    <string name="color_green2">그린</string>
114 116
    <string name="color_red2">레드</string>
115 117
    <string name="color_orange2">오렌지</string>
118
    <string name="color_violet2">제비꽃</string>
119
    <string name="color_grey2">회색</string>
116 120

  
117 121
    <string name="color_yellow3">노란색</string>
118 122
    <string name="color_white3">흰색</string>
......
120 124
    <string name="color_green3">그린</string>
121 125
    <string name="color_red3">빨간색</string>
122 126
    <string name="color_orange3">주황색</string>
127
    <string name="color_violet3">제비꽃</string>
128
    <string name="color_grey3">회색</string>
123 129

  
124 130
    <string name="color_yellow4">노란색</string>
125 131
    <string name="color_white4">흰색</string>
......
127 133
    <string name="color_green4">그린</string>
128 134
    <string name="color_red4">빨간색</string>
129 135
    <string name="color_orange4">주황색</string>
136
    <string name="color_violet4">제비꽃</string>
137
    <string name="color_grey4">회색</string>
130 138

  
131 139
    <string name="color_yellow5">노란색</string>
132 140
    <string name="color_white5">흰색</string>
......
134 142
    <string name="color_green5">그린</string>
135 143
    <string name="color_red5">빨간색</string>
136 144
    <string name="color_orange5">주황색</string>
145
    <string name="color_violet5">제비꽃</string>
146
    <string name="color_grey5">회색</string>
137 147

  
138 148
    <string name="color_yellow6">노란색</string>
139 149
    <string name="color_white6">흰색</string>
......
141 151
    <string name="color_green6">그린</string>
142 152
    <string name="color_red6">빨간색</string>
143 153
    <string name="color_orange6">주황색</string>
154
    <string name="color_violet6">제비꽃</string>
155
    <string name="color_grey6">회색</string>
144 156

  
145 157
    <string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
src/main/res/values-pl/strings.xml
106 106
    <string name="color_green1">zielonych</string>
107 107
    <string name="color_red1">czerwonych</string>
108 108
    <string name="color_orange1">pomarańczowych</string>
109
    <string name="color_violet1">fioletowych</string>
110
    <string name="color_grey1">szarych</string>
109 111

  
110 112
    <string name="color_yellow2">żółtego</string>
111 113
    <string name="color_white2">białego</string>
......
113 115
    <string name="color_green2">zielonego</string>
114 116
    <string name="color_red2">czerwonego</string>
115 117
    <string name="color_orange2">pomarańczowego</string>
118
    <string name="color_violet2">fioletowego</string>
119
    <string name="color_grey2">szarego</string>
116 120

  
117 121
    <string name="color_yellow3">żółto</string>
118 122
    <string name="color_white3">biało</string>
......
120 124
    <string name="color_green3">zielono</string>
121 125
    <string name="color_red3">czerwono</string>
122 126
    <string name="color_orange3">pomarańczowo</string>
127
    <string name="color_violet3">fioletowo</string>
128
    <string name="color_grey3">szaro</string>
123 129

  
124 130
    <string name="color_yellow4">żółtego</string>
125 131
    <string name="color_white4">białego</string>
......
127 133
    <string name="color_green4">zielonego</string>
128 134
    <string name="color_red4">czerwonego</string>
129 135
    <string name="color_orange4">pomarańczowego</string>
136
    <string name="color_violet4">fioletowego</string>
137
    <string name="color_grey4">szarego</string>
130 138

  
131 139
    <string name="color_yellow5">żółte</string>
132 140
    <string name="color_white5">białe</string>
......
134 142
    <string name="color_green5">zielone</string>
135 143
    <string name="color_red5">czerwone</string>
136 144
    <string name="color_orange5">pomarańczowe</string>
145
    <string name="color_violet5">fioletowe</string>
146
    <string name="color_grey5">szare</string>
137 147

  
138 148
    <string name="color_yellow6">żółtej</string>
139 149
    <string name="color_white6">białej</string>
......
141 151
    <string name="color_green6">zielonej</string>
142 152
    <string name="color_red6">czerwonej</string>
143 153
    <string name="color_orange6">pomarańczowej</string>
154
    <string name="color_violet6">fioletowej</string>
155
    <string name="color_grey6">szarej</string>
144 156

  
145 157
    <string name="solver_cube3_description">Natychmiastowy, prawie perfekcyjny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
src/main/res/values-ru/strings.xml
106 106
    <string name="color_green1">зеленых</string>
107 107
    <string name="color_red1">красных</string>
108 108
    <string name="color_orange1">оранжевых</string>
109
    <string name="color_violet1">фиолетовых</string>
110
    <string name="color_grey1">серых</string>
109 111

  
110 112
    <string name="color_yellow2">желтого</string>
111 113
    <string name="color_white2">белого</string>
......
113 115
    <string name="color_green2">зеленого</string>
114 116
    <string name="color_red2">красного</string>
115 117
    <string name="color_orange2">оранжевого</string>
118
    <string name="color_violet2">фиолетового</string>
119
    <string name="color_grey2">серого</string>
116 120

  
117 121
    <string name="color_yellow3">желто</string>
118 122
    <string name="color_white3">бело</string>
......
120 124
    <string name="color_green3">зелено</string>
121 125
    <string name="color_red3">красно</string>
122 126
    <string name="color_orange3">оранжево</string>
127
    <string name="color_violet3">фиолетово</string>
128
    <string name="color_grey3">серо</string>
123 129

  
124 130
    <string name="color_yellow4">желтого</string>
125 131
    <string name="color_white4">белого</string>
......
127 133
    <string name="color_green4">зеленого</string>
128 134
    <string name="color_red4">красного</string>
129 135
    <string name="color_orange4">оранжевого</string>
136
    <string name="color_violet4">фиолетового</string>
137
    <string name="color_grey4">серого</string>
130 138

  
131 139
    <string name="color_yellow5">желтый</string>
132 140
    <string name="color_white5">белогый</string>
......
134 142
    <string name="color_green5">зеленый</string>
135 143
    <string name="color_red5">красный</string>
136 144
    <string name="color_orange5">оранжевый</string>
145
    <string name="color_violet5">фиолетовый</string>
146
    <string name="color_grey5">серый</string>
137 147

  
138 148
    <string name="color_yellow6">желтого</string>
139 149
    <string name="color_white6">белого</string>
......
141 151
    <string name="color_green6">зеленого</string>
142 152
    <string name="color_red6">красного</string>
143 153
    <string name="color_orange6">оранжевого</string>
154
    <string name="color_violet6">фиолетового</string>
155
    <string name="color_grey6">серого</string>
144 156

  
145 157
    <string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
src/main/res/values-zh-rCN/strings.xml
89 89
    <string name="solver_generic_corner_twist">一个角需要扭动!</string>
90 90
    <string name="solver_generic_edge_twist">一条边需要扭动!</string>
91 91
    <string name="solver_generic_two_centers">必须要交换两个中心!</string>
92
    <string name="solver_generic_two_edges"></string>
92
    <string name="solver_generic_two_edges">必须交换两个边缘!</string>
93 93
    <string name="solver_generic_missing_center">%1$s中心不見了!</string>
94 94
    <string name="solver_generic_missing_corner">没有%1$s-%2$s-%3$s的角落!</string>
95 95
    <string name="solver_generic_missing_vertex">没有%1$s-%2$s-%3$s八面体!</string>
......
112 112
    <string name="color_green1">绿色的</string>
113 113
    <string name="color_red1">红色的</string>
114 114
    <string name="color_orange1">橙色的</string>
115
    <string name="color_violet1">紫色的</string>
116
    <string name="color_grey1">灰色的</string>
115 117

  
116 118
    <string name="color_yellow2">黄色的</string>
117 119
    <string name="color_white2">白色的</string>
......
119 121
    <string name="color_green2">绿色的</string>
120 122
    <string name="color_red2">红色的</string>
121 123
    <string name="color_orange2">橙色的</string>
124
    <string name="color_violet2">紫色的</string>
125
    <string name="color_grey2">灰色的</string>
122 126

  
123 127
    <string name="color_yellow3">黄</string>
124 128
    <string name="color_white3">白</string>
......
126 130
    <string name="color_green3">绿</string>
127 131
    <string name="color_red3">红</string>
128 132
    <string name="color_orange3">橙</string>
133
    <string name="color_violet3">紫</string>
134
    <string name="color_grey3">灰</string>
129 135

  
130 136
    <string name="color_yellow4">黄色的</string>
131 137
    <string name="color_white4">白色的</string>
......
133 139
    <string name="color_green4">绿色的</string>
134 140
    <string name="color_red4">红色的</string>
135 141
    <string name="color_orange4">橙色的</string>
142
    <string name="color_violet4">紫色的</string>
143
    <string name="color_grey4">灰色的</string>
136 144

  
137 145
    <string name="color_yellow5">黄色的</string>
138 146
    <string name="color_white5">白色的</string>
......
140 148
    <string name="color_green5">绿色的</string>
141 149
    <string name="color_red5">红色的</string>
142 150
    <string name="color_orange5">橙色的</string>
151
    <string name="color_violet5">紫色的</string>
152
    <string name="color_grey5">灰色的</string>
143 153

  
144 154
    <string name="color_yellow6">黄色的</string>
145 155
    <string name="color_white6">白色的</string>
......
147 157
    <string name="color_green6">绿色的</string>
148 158
    <string name="color_red6">红色的</string>
149 159
    <string name="color_orange6">橙色的</string>
160
    <string name="color_violet6">紫色的</string>
161
    <string name="color_grey6">灰色的</string>
150 162

  
151 163
    <string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string>
152 164
    <string name="solver_pduo2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
src/main/res/values-zh-rTW/strings.xml
83 83
    <string name="solver_generic_corner_twist">一個角需要扭動!</string>
84 84
    <string name="solver_generic_edge_twist">一個邊緣要扭動!</string>
85 85
    <string name="solver_generic_two_centers">兩個中鋒要互換!</string>
86
    <string name="solver_generic_two_edges"></string>
86
    <string name="solver_generic_two_edges">必須交換兩個邊緣!</string>
87 87
    <string name="solver_generic_missing_center">%1$s的中心不见了!</string>
88 88
    <string name="solver_generic_missing_corner">沒有%1$s-%2$s-%3$s的角落!</string>
89 89
    <string name="solver_generic_missing_vertex">沒有%1$s-%2$s-%3$s八面體!</string>
......
106 106
    <string name="color_green1">綠色的</string>
107 107
    <string name="color_red1">紅色的</string>
108 108
    <string name="color_orange1">橙色的</string>
109
    <string name="color_violet1">紫色的</string>
110
    <string name="color_grey1">灰色的</string>
109 111

  
110 112
    <string name="color_yellow2">黃色的</string>
111 113
    <string name="color_white2">白色的</string>
......
113 115
    <string name="color_green2">綠色的</string>
114 116
    <string name="color_red2">紅色的</string>
115 117
    <string name="color_orange2">橙色的</string>
118
    <string name="color_violet2">紫色的</string>
119
    <string name="color_grey2">灰色的</string>
116 120

  
117 121
    <string name="color_yellow3">黃</string>
118 122
    <string name="color_white3">白</string>
......
120 124
    <string name="color_green3">綠</string>
121 125
    <string name="color_red3">紅</string>
122 126
    <string name="color_orange3">橙</string>
127
    <string name="color_violet3">紫</string>
128
    <string name="color_grey3">灰</string>
123 129

  
124 130
    <string name="color_yellow4">黃色的</string>
125 131
    <string name="color_white4">白色的</string>
......
127 133
    <string name="color_green4">綠色的</string>
128 134
    <string name="color_red4">紅色的</string>
129 135
    <string name="color_orange4">橙色的</string>
136
    <string name="color_violet4">紫色的</string>
137
    <string name="color_grey4">灰色的</string>
130 138

  
131 139
    <string name="color_yellow5">黃色的</string>
132 140
    <string name="color_white5">白色的</string>
......
134 142
    <string name="color_green5">綠色的</string>
135 143
    <string name="color_red5">紅色的</string>
136 144
    <string name="color_orange5">橙色的</string>
145
    <string name="color_violet5">紫色的</string>
146
    <string name="color_grey5">灰色的</string>
137 147

  
138 148
    <string name="color_yellow6">黃色的</string>
139 149
    <string name="color_white6">白色的</string>
......
141 151
    <string name="color_green6">綠色的</string>
142 152
    <string name="color_red6">紅色的</string>
143 153
    <string name="color_orange6">橙色的</string>
154
    <string name="color_violet6">紫色的</string>
155
    <string name="color_grey6">灰色的</string>
144 156

  
145 157
    <string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string>
146 158
    <string name="solver_pduo2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>
src/main/res/values/strings.xml
126 126
    <string name="color_green1">green</string>
127 127
    <string name="color_red1">red</string>
128 128
    <string name="color_orange1">orange</string>
129
    <string name="color_violet1">violet</string>
130
    <string name="color_grey1">grey</string>
129 131

  
130 132
    <string name="color_yellow2">yellow</string>
131 133
    <string name="color_white2">white</string>
......
133 135
    <string name="color_green2">green</string>
134 136
    <string name="color_red2">red</string>
135 137
    <string name="color_orange2">orange</string>
138
    <string name="color_violet2">violet</string>
139
    <string name="color_grey2">grey</string>
136 140

  
137 141
    <string name="color_yellow3">yellow</string>
138 142
    <string name="color_white3">white</string>
......
140 144
    <string name="color_green3">green</string>
141 145
    <string name="color_red3">red</string>
142 146
    <string name="color_orange3">orange</string>
147
    <string name="color_violet3">violet</string>
148
    <string name="color_grey3">grey</string>
143 149

  
144 150
    <string name="color_yellow4">yellow</string>
145 151
    <string name="color_white4">white</string>
......
147 153
    <string name="color_green4">green</string>
148 154
    <string name="color_red4">red</string>
149 155
    <string name="color_orange4">orange</string>
156
    <string name="color_violet4">violet</string>
157
    <string name="color_grey4">grey</string>
150 158

  
151 159
    <string name="color_yellow5">yellow</string>
152 160
    <string name="color_white5">white</string>
......
154 162
    <string name="color_green5">green</string>
155 163
    <string name="color_red5">red</string>
156 164
    <string name="color_orange5">orange</string>
165
    <string name="color_violet5">violet</string>
166
    <string name="color_grey5">grey</string>
157 167

  
158 168
    <string name="color_yellow6">yellow</string>
159 169
    <string name="color_white6">white</string>
......
161 171
    <string name="color_green6">green</string>
162 172
    <string name="color_red6">red</string>
163 173
    <string name="color_orange6">orange</string>
174
    <string name="color_violet6">violet</string>
175
    <string name="color_grey6">grey</string>
164 176

  
165 177
    <string name="solver_cube3_title" translatable="false">Kociemba 3x3 Solver</string>
166 178
    <string name="solver_pduo2_title" translatable="false">Pyraminx Duo Solver</string>

Also available in: Unified diff