Revision 3cf8f87d
Added by Leszek Koltunski almost 2 years ago
src/main/java/org/distorted/solvers/pduo/SolverPyraminxDuo.java | ||
---|---|---|
32 | 32 |
private static final int ERROR_TWO_CENTERS_SWAP = -9; |
33 | 33 |
private static final int ERROR_CORNER_TWISTED = -10; |
34 | 34 |
|
35 |
private static final int ERROR_EDGE_GY = -11; |
|
36 |
private static final int ERROR_EDGE_GB = -12; |
|
37 |
private static final int ERROR_EDGE_GR = -13; |
|
38 |
private static final int ERROR_EDGE_YB = -14; |
|
39 |
private static final int ERROR_EDGE_YR = -15; |
|
40 |
private static final int ERROR_EDGE_BR = -16; |
|
41 |
|
|
35 | 42 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
36 | 43 |
|
37 | 44 |
private boolean cornerEqual(int[] corner, int c1, int c2, int c3) |
... | ... | |
95 | 102 |
|
96 | 103 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
97 | 104 |
|
98 |
private int[] computeCornerTwists(int[][] corners)
|
|
105 |
private int computeCornerTwist(int index, int[][] corners)
|
|
99 | 106 |
{ |
100 |
return new int[] {0,0,0,0}; // TODO
|
|
107 |
return 0; // TODO
|
|
101 | 108 |
} |
102 | 109 |
|
103 | 110 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
107 | 114 |
if( centers[0]==color1 ) |
108 | 115 |
{ |
109 | 116 |
if( centers[1]==color2 ) return 1; |
110 |
if( centers[2]==color2 ) return 0;
|
|
111 |
if( centers[3]==color2 ) return 2;
|
|
117 |
if( centers[2]==color2 ) return 2;
|
|
118 |
if( centers[3]==color2 ) return 0;
|
|
112 | 119 |
|
113 | 120 |
return -1; |
114 | 121 |
} |
115 | 122 |
if( centers[1]==color1 ) |
116 | 123 |
{ |
117 | 124 |
if( centers[0]==color2 ) return 1; |
118 |
if( centers[2]==color2 ) return 1;
|
|
119 |
if( centers[3]==color2 ) return 0;
|
|
125 |
if( centers[2]==color2 ) return 0;
|
|
126 |
if( centers[3]==color2 ) return 2;
|
|
120 | 127 |
|
121 | 128 |
return -1; |
122 | 129 |
} |
123 | 130 |
if( centers[2]==color1 ) |
124 | 131 |
{ |
125 |
if( centers[0]==color2 ) return 0;
|
|
126 |
if( centers[1]==color2 ) return 1;
|
|
132 |
if( centers[0]==color2 ) return 2;
|
|
133 |
if( centers[1]==color2 ) return 0;
|
|
127 | 134 |
if( centers[3]==color2 ) return 1; |
128 | 135 |
|
129 | 136 |
return -1; |
130 | 137 |
} |
131 | 138 |
if( centers[3]==color1 ) |
132 | 139 |
{ |
133 |
if( centers[0]==color2 ) return 2;
|
|
134 |
if( centers[1]==color2 ) return 0;
|
|
140 |
if( centers[0]==color2 ) return 0;
|
|
141 |
if( centers[1]==color2 ) return 2;
|
|
135 | 142 |
if( centers[2]==color2 ) return 1; |
136 | 143 |
|
137 | 144 |
return -1; |
... | ... | |
153 | 160 |
{ |
154 | 161 |
int[][] corners = new int[4][3]; |
155 | 162 |
int[] centers = new int[4]; |
163 |
int[] corner_twist = new int[4]; |
|
156 | 164 |
|
157 | 165 |
for(int i=0; i<4; i++) |
158 | 166 |
{ |
159 |
centers[i] = object.getCubitFaceStickerIndex(i+4,0); |
|
167 |
centers[i] = object.getCubitFaceStickerIndex(i+4,0) - 4;
|
|
160 | 168 |
|
161 | 169 |
for(int j=0; j<3; j++) |
162 | 170 |
corners[i][j] = object.getCubitFaceStickerIndex(i,j); |
... | ... | |
173 | 181 |
|
174 | 182 |
if( (twist_ry-twist_gr+1)%3 != 0 ) return ERROR_TWO_CENTERS_SWAP; |
175 | 183 |
|
176 |
int[] corner_twists = computeCornerTwists(corners); |
|
177 |
int total_twist = corner_twists[0]+corner_twists[1]+corner_twists[2]+corner_twists[3]; |
|
184 |
int total_twist=0; |
|
185 |
|
|
186 |
for(int i=0; i<4; i++) |
|
187 |
{ |
|
188 |
corner_twist[i] = computeCornerTwist(i,corners); |
|
189 |
if( corner_twist[i]<0 ) return corner_twist[i]; |
|
190 |
total_twist += corner_twist[i]; |
|
191 |
} |
|
178 | 192 |
|
179 | 193 |
if( (total_twist-twist_gr)%3 !=0 ) return ERROR_CORNER_TWISTED; |
180 | 194 |
|
181 | 195 |
int green_face = getFaceOfGreenCenter(centers); |
182 | 196 |
|
183 |
return green_face + 4*(corner_twists[3] + 3*(corner_twists[2] + 3*(corner_twists[1] + 3*corner_twists[0])));
|
|
197 |
return green_face + 4*(corner_twist[3] + 3*(corner_twist[2] + 3*(corner_twist[1] + 3*corner_twist[0])));
|
|
184 | 198 |
} |
185 | 199 |
|
186 | 200 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
189 | 203 |
{ |
190 | 204 |
switch(index) |
191 | 205 |
{ |
192 |
case ERROR_CORNER_YBR_MISSING: String c0 = res.getString(R.string.color_YBR); |
|
193 |
return res.getString(R.string.solver_generic_missing_corner,c0); |
|
194 |
case ERROR_CORNER_GBR_MISSING: String c1 = res.getString(R.string.color_GBR); |
|
195 |
return res.getString(R.string.solver_generic_missing_corner,c1); |
|
196 |
case ERROR_CORNER_GYR_MISSING: String c2 = res.getString(R.string.color_GYR); |
|
197 |
return res.getString(R.string.solver_generic_missing_corner,c2); |
|
198 |
case ERROR_CORNER_GYB_MISSING: String c3 = res.getString(R.string.color_GYB); |
|
199 |
return res.getString(R.string.solver_generic_missing_corner,c3); |
|
206 |
case ERROR_CORNER_YBR_MISSING: String c01 = res.getString(R.string.color_yellow3); |
|
207 |
String c02 = res.getString(R.string.color_blue3); |
|
208 |
String c03 = res.getString(R.string.color_red4); |
|
209 |
return res.getString(R.string.solver_generic_missing_corner,c01,c02,c03); |
|
210 |
case ERROR_CORNER_GBR_MISSING: String c11 = res.getString(R.string.color_green3); |
|
211 |
String c12 = res.getString(R.string.color_blue3); |
|
212 |
String c13 = res.getString(R.string.color_red4); |
|
213 |
return res.getString(R.string.solver_generic_missing_corner,c11,c12,c13); |
|
214 |
case ERROR_CORNER_GYR_MISSING: String c21 = res.getString(R.string.color_green3); |
|
215 |
String c22 = res.getString(R.string.color_yellow3); |
|
216 |
String c23 = res.getString(R.string.color_red4); |
|
217 |
return res.getString(R.string.solver_generic_missing_corner,c21,c22,c23); |
|
218 |
case ERROR_CORNER_GYB_MISSING: String c31 = res.getString(R.string.color_green3); |
|
219 |
String c32 = res.getString(R.string.color_yellow3); |
|
220 |
String c33 = res.getString(R.string.color_blue4); |
|
221 |
return res.getString(R.string.solver_generic_missing_corner,c31,c32,c33); |
|
200 | 222 |
case ERROR_CENTER_G_MISSING : String colorG = res.getString(R.string.color_green2); |
201 | 223 |
return res.getString(R.string.solver_generic_missing_center,colorG); |
202 | 224 |
case ERROR_CENTER_Y_MISSING : String colorY = res.getString(R.string.color_yellow2); |
src/main/res/values-de/strings.xml | ||
---|---|---|
82 | 82 |
<string name="solver_generic_not_implemented">Löser für dieses Objekt und diese Größe noch nicht implementiert!</string> |
83 | 83 |
<string name="solver_generic_corner_twist">Eine Ecke muss verdreht werden!</string> |
84 | 84 |
<string name="solver_generic_two_centers">Zwei Zentren müssen ausgetauscht werden!</string> |
85 |
<string name="solver_generic_missing_center">%1$s Mitte fehlt!</string> |
|
86 |
<string name="solver_generic_missing_corner">%1$s Ecke fehlt!</string>
|
|
85 |
<string name="solver_generic_missing_center">Die %1$s Mitte fehlt!</string>
|
|
86 |
<string name="solver_generic_missing_corner">Die %1$s-%2$s-%3$s Ecke fehlt!</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">Es gibt nur %1$d %2$s Facelets.</string> |
89 | 89 |
<string name="solver_cube3_error2">Nicht alle 12 Kanten gibt es genau einmal!</string> |
... | ... | |
101 | 101 |
<string name="color_red1">rote</string> |
102 | 102 |
<string name="color_orange1">orange</string> |
103 | 103 |
|
104 |
<string name="color_yellow2">Gelbe</string>
|
|
105 |
<string name="color_white2">Weiße</string>
|
|
106 |
<string name="color_blue2">Blaue</string>
|
|
107 |
<string name="color_green2">Grüne</string>
|
|
108 |
<string name="color_red2">Rote</string>
|
|
109 |
<string name="color_orange2">Orange</string>
|
|
104 |
<string name="color_yellow2">gelbe</string>
|
|
105 |
<string name="color_white2">weiße</string>
|
|
106 |
<string name="color_blue2">blaue</string>
|
|
107 |
<string name="color_green2">grüne</string>
|
|
108 |
<string name="color_red2">rote</string>
|
|
109 |
<string name="color_orange2">orange</string>
|
|
110 | 110 |
|
111 |
<string name="color_YBR">Gelb-blau-rote</string> |
|
112 |
<string name="color_GBR">Grün-blau-rote</string> |
|
113 |
<string name="color_GYR">Grün-gelb-rote</string> |
|
114 |
<string name="color_GYB">Grün-gelb-blaue</string> |
|
111 |
<string name="color_yellow3">gelb</string> |
|
112 |
<string name="color_white3">weiß</string> |
|
113 |
<string name="color_blue3">blau</string> |
|
114 |
<string name="color_green3">grün</string> |
|
115 |
<string name="color_red3">rot</string> |
|
116 |
<string name="color_orange3">orange</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">gelbe</string> |
|
119 |
<string name="color_white4">weiße</string> |
|
120 |
<string name="color_blue4">blaue</string> |
|
121 |
<string name="color_green4">grüne</string> |
|
122 |
<string name="color_red4">rote</string> |
|
123 |
<string name="color_orange4">orange</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string> |
117 | 126 |
<string name="solver_pduo2_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string> |
src/main/res/values-es/strings.xml | ||
---|---|---|
83 | 83 |
<string name="solver_generic_corner_twist">¡Hay que torcer una esquina!</string> |
84 | 84 |
<string name="solver_generic_two_centers">¡Hay que cambiar dos centros!</string> |
85 | 85 |
<string name="solver_generic_missing_center">¡Falta el centro %1$s!</string> |
86 |
<string name="solver_generic_missing_corner">¡Falta la esquina %1$s!</string> |
|
86 |
<string name="solver_generic_missing_corner">¡Falta la esquina %1$s-%2$s-%3$s!</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">Solo hay %1$d facetas %2$s.</string> |
89 | 89 |
<string name="solver_cube3_error2">¡No todos los 12 bordes existen exactamente una vez!</string> |
... | ... | |
108 | 108 |
<string name="color_red2">rojo</string> |
109 | 109 |
<string name="color_orange2">naranja</string> |
110 | 110 |
|
111 |
<string name="color_YBR">amarilla-azul-roja</string> |
|
112 |
<string name="color_GBR">verde-azul-roja</string> |
|
113 |
<string name="color_GYR">verde-amarilla-roja</string> |
|
114 |
<string name="color_GYB">verde-amarilla-azul</string> |
|
111 |
<string name="color_yellow3">amarilla</string> |
|
112 |
<string name="color_white3">blanca</string> |
|
113 |
<string name="color_blue3">azul</string> |
|
114 |
<string name="color_green3">verde</string> |
|
115 |
<string name="color_red3">roja</string> |
|
116 |
<string name="color_orange3">naranja</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">amarilla</string> |
|
119 |
<string name="color_white4">blanca</string> |
|
120 |
<string name="color_blue4">azul</string> |
|
121 |
<string name="color_green4">verde</string> |
|
122 |
<string name="color_red4">roja</string> |
|
123 |
<string name="color_orange4">naranja</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string> |
117 | 126 |
<string name="solver_pduo2_description">Aun no implementado.\nAutor: Leszek Koltunski.</string> |
src/main/res/values-fr/strings.xml | ||
---|---|---|
83 | 83 |
<string name="solver_generic_corner_twist">Un coin doit être tourné !</string> |
84 | 84 |
<string name="solver_generic_two_centers">Deux centres doivent être échangés !</string> |
85 | 85 |
<string name="solver_generic_missing_center">Centre %1$s manquant !</string> |
86 |
<string name="solver_generic_missing_corner">Coin %1$s manquant !</string> |
|
86 |
<string name="solver_generic_missing_corner">Coin %1$s-%2$s-%3$s manquant !</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">Il n\'y a que %1$d facettes %2$s.</string> |
89 | 89 |
<string name="solver_cube3_error2">Les 12 arêtes n\'existent pas exactement une fois !</string> |
... | ... | |
108 | 108 |
<string name="color_red2">rouge</string> |
109 | 109 |
<string name="color_orange2">orange</string> |
110 | 110 |
|
111 |
<string name="color_YBR">jaune-bleu-rouge</string> |
|
112 |
<string name="color_GBR">vert-bleu-rouge</string> |
|
113 |
<string name="color_GYR">vert-jaune-rouge</string> |
|
114 |
<string name="color_GYB">vert-jaune-bleu</string> |
|
111 |
<string name="color_yellow3">jaune</string> |
|
112 |
<string name="color_white3">blanc</string> |
|
113 |
<string name="color_blue3">bleu</string> |
|
114 |
<string name="color_green3">vert</string> |
|
115 |
<string name="color_red3">rouge</string> |
|
116 |
<string name="color_orange3">orange</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">jaune</string> |
|
119 |
<string name="color_white4">blanc</string> |
|
120 |
<string name="color_blue4">bleu</string> |
|
121 |
<string name="color_green4">vert</string> |
|
122 |
<string name="color_red4">rouge</string> |
|
123 |
<string name="color_orange4">orange</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string> |
117 | 126 |
<string name="solver_pduo2_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string> |
src/main/res/values-ja/strings.xml | ||
---|---|---|
84 | 84 |
<string name="solver_generic_corner_twist">1 つのコーナーをねじる必要があります。</string> |
85 | 85 |
<string name="solver_generic_two_centers">2つのセンターを交換しなければならない!</string> |
86 | 86 |
<string name="solver_generic_missing_center">%1$sのセンターが欠けてる!</string> |
87 |
<string name="solver_generic_missing_corner">%1$sのコーナーがない!</string> |
|
87 |
<string name="solver_generic_missing_corner">%1$s%2$s%3$sのコーナーがない!</string>
|
|
88 | 88 |
|
89 | 89 |
<string name="solver_cube3_error1">%2$s小顔は%1$dつだけ</string> |
90 | 90 |
<string name="solver_cube3_error2">12 のエッジすべてが 存在するわけではありません。</string> |
... | ... | |
109 | 109 |
<string name="color_red2">レッド</string> |
110 | 110 |
<string name="color_orange2">オレンジ</string> |
111 | 111 |
|
112 |
<string name="color_YBR">黄青赤</string> |
|
113 |
<string name="color_GBR">緑青赤</string> |
|
114 |
<string name="color_GYR">緑黄赤</string> |
|
115 |
<string name="color_GYB">緑黄青</string> |
|
112 |
<string name="color_yellow3">イエロー</string> |
|
113 |
<string name="color_white3">ホワイト</string> |
|
114 |
<string name="color_blue3">ブルー</string> |
|
115 |
<string name="color_green3">グリーン</string> |
|
116 |
<string name="color_red3">レッド</string> |
|
117 |
<string name="color_orange3">オレンジ</string> |
|
118 |
|
|
119 |
<string name="color_yellow4">イエロー</string> |
|
120 |
<string name="color_white4">ホワイト</string> |
|
121 |
<string name="color_blue4">ブルー</string> |
|
122 |
<string name="color_green4">グリーン</string> |
|
123 |
<string name="color_red4">レッド</string> |
|
124 |
<string name="color_orange4">オレンジ</string> |
|
116 | 125 |
|
117 | 126 |
<string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string> |
118 | 127 |
<string name="solver_pduo2_description">まだ実装されていません。\n著者: Leszek Koltunski.</string> |
src/main/res/values-ko/strings.xml | ||
---|---|---|
83 | 83 |
<string name="solver_generic_corner_twist">한쪽 모서리를 비틀어야 합니다!</string> |
84 | 84 |
<string name="solver_generic_two_centers">두 개의 센터를 교환해야 합니다!</string> |
85 | 85 |
<string name="solver_generic_missing_center">%1$s 중앙이 사라졌습니다!</string> |
86 |
<string name="solver_generic_missing_corner">%1$s 모서리 금지!</string> |
|
86 |
<string name="solver_generic_missing_corner">%1$s-%2$s-%3$s 모서리 금지!</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">%2$s작은 얼굴은 %1$d개뿐입니다.</string> |
89 | 89 |
<string name="solver_cube3_error2">12개의 가장자리 모두가 정확하게 한 번 존재하지 않습니다!</string> |
... | ... | |
108 | 108 |
<string name="color_red2">레드</string> |
109 | 109 |
<string name="color_orange2">오렌지</string> |
110 | 110 |
|
111 |
<string name="color_YBR">노란색-파란색-빨간색</string> |
|
112 |
<string name="color_GBR">녹색-파란색-빨간색</string> |
|
113 |
<string name="color_GYR">녹색-노란색-빨간색</string> |
|
114 |
<string name="color_GYB">녹색-노란색-파란색</string> |
|
111 |
<string name="color_yellow3">노란색</string> |
|
112 |
<string name="color_white3">흰색</string> |
|
113 |
<string name="color_blue3">블루</string> |
|
114 |
<string name="color_green3">그린</string> |
|
115 |
<string name="color_red3">빨간색</string> |
|
116 |
<string name="color_orange3">주황색</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">노란색</string> |
|
119 |
<string name="color_white4">흰색</string> |
|
120 |
<string name="color_blue4">블루</string> |
|
121 |
<string name="color_green4">그린</string> |
|
122 |
<string name="color_red4">빨간색</string> |
|
123 |
<string name="color_orange4">주황색</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string> |
117 | 126 |
<string name="solver_pduo2_description">아직 구현되지 않음\n작가: Leszek Koltunski.</string> |
src/main/res/values-pl/strings.xml | ||
---|---|---|
83 | 83 |
<string name="solver_generic_corner_twist">Jeden z rogów musi byc obrócony!</string> |
84 | 84 |
<string name="solver_generic_two_centers">Dwa środki muszą być wymienione!</string> |
85 | 85 |
<string name="solver_generic_missing_center">Brakuje %1$s środka!</string> |
86 |
<string name="solver_generic_missing_corner">Brakuje %1$s rogu!</string> |
|
86 |
<string name="solver_generic_missing_corner">Brakuje %1$s-%2$s-%3$s rogu!</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">Jest tylko %1$d %2$s ścian.</string> |
89 | 89 |
<string name="solver_cube3_error2">Któraś z 12 krawędzi nie istnieje!</string> |
... | ... | |
108 | 108 |
<string name="color_red2">czerwonego</string> |
109 | 109 |
<string name="color_orange2">pomarańczowego</string> |
110 | 110 |
|
111 |
<string name="color_YBR">żółto-niebiesko-czerwonego</string> |
|
112 |
<string name="color_GBR">zielono-niebiesko-czerwonego</string> |
|
113 |
<string name="color_GYR">zielono-żółto-czerwonego</string> |
|
114 |
<string name="color_GYB">zielono-żółto-niebieskiego</string> |
|
111 |
<string name="color_yellow3">żółto</string> |
|
112 |
<string name="color_white3">biało</string> |
|
113 |
<string name="color_blue3">niebiesko</string> |
|
114 |
<string name="color_green3">zielono</string> |
|
115 |
<string name="color_red3">czerwono</string> |
|
116 |
<string name="color_orange3">pomarańczowo</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">żółtego</string> |
|
119 |
<string name="color_white4">białego</string> |
|
120 |
<string name="color_blue4">niebieskiego</string> |
|
121 |
<string name="color_green4">zielonego</string> |
|
122 |
<string name="color_red4">czerwonego</string> |
|
123 |
<string name="color_orange4">pomarańczowego</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">Natychmiastowy, prawie perfekcyjny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string> |
117 | 126 |
<string name="solver_pduo2_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string> |
src/main/res/values-ru/strings.xml | ||
---|---|---|
82 | 82 |
<string name="solver_generic_not_implemented">Решебника для этого объекта и размера еще нет!</string> |
83 | 83 |
<string name="solver_generic_corner_twist">Один угол должен быть переставлен!</string> |
84 | 84 |
<string name="solver_generic_two_centers">Два центра должны быть обменены!</string> |
85 |
<string name="solver_generic_missing_center">%1$s центр отсутствует!</string>
|
|
86 |
<string name="solver_generic_missing_corner">Нет %1$s угла!</string> |
|
85 |
<string name="solver_generic_missing_center">Нет %1$s центра!</string>
|
|
86 |
<string name="solver_generic_missing_corner">Нет %1$s-%2$s-%3$s угла!</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">Всего %1$d %2$s граней!</string> |
89 | 89 |
<string name="solver_cube3_error2">Не все 12 ребер существуют в единичном экземпляре!</string> |
... | ... | |
101 | 101 |
<string name="color_red1">красных</string> |
102 | 102 |
<string name="color_orange1">оранжевых</string> |
103 | 103 |
|
104 |
<string name="color_yellow2">Желтый</string>
|
|
105 |
<string name="color_white2">Белый</string>
|
|
106 |
<string name="color_blue2">Синий</string>
|
|
107 |
<string name="color_green2">Зеленый</string>
|
|
108 |
<string name="color_red2">Kрасный</string>
|
|
109 |
<string name="color_orange2">Оранжевый</string>
|
|
104 |
<string name="color_yellow2">желтого</string>
|
|
105 |
<string name="color_white2">белого</string>
|
|
106 |
<string name="color_blue2">синого</string>
|
|
107 |
<string name="color_green2">зеленого</string>
|
|
108 |
<string name="color_red2">красного</string>
|
|
109 |
<string name="color_orange2">оранжевого</string>
|
|
110 | 110 |
|
111 |
<string name="color_YBR">желто-сине-красного</string> |
|
112 |
<string name="color_GBR">зелено-сине-красного</string> |
|
113 |
<string name="color_GYR">зелено-желто-красного</string> |
|
114 |
<string name="color_GYB">зелено-желто-синего</string> |
|
111 |
<string name="color_yellow3">желто</string> |
|
112 |
<string name="color_white3">бело</string> |
|
113 |
<string name="color_blue3">сине</string> |
|
114 |
<string name="color_green3">зелено</string> |
|
115 |
<string name="color_red3">красно</string> |
|
116 |
<string name="color_orange3">оранжево</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">желтого</string> |
|
119 |
<string name="color_white4">белого</string> |
|
120 |
<string name="color_blue4">синого</string> |
|
121 |
<string name="color_green4">зеленого</string> |
|
122 |
<string name="color_red4">красного</string> |
|
123 |
<string name="color_orange4">оранжевого</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string> |
117 | 126 |
<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_two_centers">必须要交换两个中心!</string> |
91 | 91 |
<string name="solver_generic_missing_center">%1$s中心不見了!</string> |
92 |
<string name="solver_generic_missing_corner">没有%1$s的角落!</string> |
|
92 |
<string name="solver_generic_missing_corner">没有%1$s-%2$s-%3$s的角落!</string>
|
|
93 | 93 |
|
94 | 94 |
<string name="solver_cube3_error1">只有%1$d个%2$s小面</string> |
95 | 95 |
<string name="solver_cube3_error2">并非所有12条边都只存在一次!</string> |
... | ... | |
107 | 107 |
<string name="color_red1">红色的</string> |
108 | 108 |
<string name="color_orange1">橙色的</string> |
109 | 109 |
|
110 |
<string name="color_yellow2">黄色</string> |
|
111 |
<string name="color_white2">白色</string> |
|
112 |
<string name="color_blue2">蓝色</string> |
|
113 |
<string name="color_green2">绿色</string> |
|
114 |
<string name="color_red2">红色</string> |
|
115 |
<string name="color_orange2">橙色</string> |
|
110 |
<string name="color_yellow2">黄色的</string>
|
|
111 |
<string name="color_white2">白色的</string>
|
|
112 |
<string name="color_blue2">蓝色的</string>
|
|
113 |
<string name="color_green2">绿色的</string>
|
|
114 |
<string name="color_red2">红色的</string>
|
|
115 |
<string name="color_orange2">橙色的</string>
|
|
116 | 116 |
|
117 |
<string name="color_YBR">黄-蓝-红</string> |
|
118 |
<string name="color_GBR">绿-蓝-红</string> |
|
119 |
<string name="color_GYR">绿-黄-红</string> |
|
120 |
<string name="color_GYB">绿-黄-蓝</string> |
|
117 |
<string name="color_yellow3">黄色的</string> |
|
118 |
<string name="color_white3">白色的</string> |
|
119 |
<string name="color_blue3">蓝色的</string> |
|
120 |
<string name="color_green3">绿色的</string> |
|
121 |
<string name="color_red3">红色的</string> |
|
122 |
<string name="color_orange3">橙色的</string> |
|
123 |
|
|
124 |
<string name="color_yellow4">黄色的</string> |
|
125 |
<string name="color_white4">白色的</string> |
|
126 |
<string name="color_blue4">蓝色的</string> |
|
127 |
<string name="color_green4">绿色的</string> |
|
128 |
<string name="color_red4">红色的</string> |
|
129 |
<string name="color_orange4">橙色的</string> |
|
121 | 130 |
|
122 | 131 |
<string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string> |
123 | 132 |
<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_two_centers">兩個中鋒要互換!</string> |
85 | 85 |
<string name="solver_generic_missing_center">%1$s的中心不见了!</string> |
86 |
<string name="solver_generic_missing_corner">沒有%1$s的角落!</string> |
|
86 |
<string name="solver_generic_missing_corner">沒有%1$s-%2$s-%3$s的角落!</string>
|
|
87 | 87 |
|
88 | 88 |
<string name="solver_cube3_error1">只有%1$d個%2$s小臉</string> |
89 | 89 |
<string name="solver_cube3_error2">並非所有12條邊都只存在一次!</string> |
... | ... | |
101 | 101 |
<string name="color_red1">紅色的</string> |
102 | 102 |
<string name="color_orange1">橙色的</string> |
103 | 103 |
|
104 |
<string name="color_yellow2">黃色</string> |
|
105 |
<string name="color_white2">白色</string> |
|
106 |
<string name="color_blue2">藍色</string> |
|
107 |
<string name="color_green2">綠色</string> |
|
108 |
<string name="color_red2">紅色</string> |
|
109 |
<string name="color_orange2">橙色</string> |
|
104 |
<string name="color_yellow2">黃色的</string>
|
|
105 |
<string name="color_white2">白色的</string>
|
|
106 |
<string name="color_blue2">藍色的</string>
|
|
107 |
<string name="color_green2">綠色的</string>
|
|
108 |
<string name="color_red2">紅色的</string>
|
|
109 |
<string name="color_orange2">橙色的</string>
|
|
110 | 110 |
|
111 |
<string name="color_YBR">黄-蓝-红</string> |
|
112 |
<string name="color_GBR">绿-蓝-红</string> |
|
113 |
<string name="color_GYR">绿-黄-红</string> |
|
114 |
<string name="color_GYB">绿-黄-蓝</string> |
|
111 |
<string name="color_yellow3">黃色的</string> |
|
112 |
<string name="color_white3">白色的</string> |
|
113 |
<string name="color_blue3">藍色的</string> |
|
114 |
<string name="color_green3">綠色的</string> |
|
115 |
<string name="color_red3">紅色的</string> |
|
116 |
<string name="color_orange3">橙色的</string> |
|
117 |
|
|
118 |
<string name="color_yellow4">黃色的</string> |
|
119 |
<string name="color_white4">白色的</string> |
|
120 |
<string name="color_blue4">藍色的</string> |
|
121 |
<string name="color_green4">綠色的</string> |
|
122 |
<string name="color_red4">紅色的</string> |
|
123 |
<string name="color_orange4">橙色的</string> |
|
115 | 124 |
|
116 | 125 |
<string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string> |
117 | 126 |
<string name="solver_pduo2_description">尚未實現。\n作者: Leszek Koltunski.</string> |
src/main/res/values/strings.xml | ||
---|---|---|
102 | 102 |
<string name="solver_generic_not_implemented">Solver for this object not implemented yet!</string> |
103 | 103 |
<string name="solver_generic_corner_twist">One corner has to be twisted!</string> |
104 | 104 |
<string name="solver_generic_two_centers">Two centers have to be exchanged!</string> |
105 |
<string name="solver_generic_missing_center">%1$s center missing!</string> |
|
106 |
<string name="solver_generic_missing_corner">%1$s corner missing!</string>
|
|
105 |
<string name="solver_generic_missing_center">The %1$s center missing!</string>
|
|
106 |
<string name="solver_generic_missing_corner">The %1$s-%2$s-%3$s corner missing!</string>
|
|
107 | 107 |
|
108 | 108 |
<string name="solver_cube3_error1">There are only %1$d %2$s facelets.</string> |
109 | 109 |
<string name="solver_cube3_error2">Not all 12 edges exist exactly once!</string> |
... | ... | |
121 | 121 |
<string name="color_red1">red</string> |
122 | 122 |
<string name="color_orange1">orange</string> |
123 | 123 |
|
124 |
<string name="color_yellow2">Yellow</string> |
|
125 |
<string name="color_white2">White</string> |
|
126 |
<string name="color_blue2">Blue</string> |
|
127 |
<string name="color_green2">Green</string> |
|
128 |
<string name="color_red2">Red</string> |
|
129 |
<string name="color_orange2">Orange</string> |
|
130 |
|
|
131 |
<string name="color_YBR">Yellow-blue-red</string> |
|
132 |
<string name="color_GBR">Green-blue-red</string> |
|
133 |
<string name="color_GYR">Green-yellow-red</string> |
|
134 |
<string name="color_GYB">Green-yellow-blue</string> |
|
124 |
<string name="color_yellow2">yellow</string> |
|
125 |
<string name="color_white2">white</string> |
|
126 |
<string name="color_blue2">blue</string> |
|
127 |
<string name="color_green2">green</string> |
|
128 |
<string name="color_red2">red</string> |
|
129 |
<string name="color_orange2">orange</string> |
|
130 |
|
|
131 |
<string name="color_yellow3">yellow</string> |
|
132 |
<string name="color_white3">white</string> |
|
133 |
<string name="color_blue3">blue</string> |
|
134 |
<string name="color_green3">green</string> |
|
135 |
<string name="color_red3">red</string> |
|
136 |
<string name="color_orange3">orange</string> |
|
137 |
|
|
138 |
<string name="color_yellow4">yellow</string> |
|
139 |
<string name="color_white4">white</string> |
|
140 |
<string name="color_blue4">blue</string> |
|
141 |
<string name="color_green4">green</string> |
|
142 |
<string name="color_red4">red</string> |
|
143 |
<string name="color_orange4">orange</string> |
|
135 | 144 |
|
136 | 145 |
<string name="solver_cube3_title" translatable="false">Kociemba 3x3 Solver</string> |
137 | 146 |
<string name="solver_pduo2_title" translatable="false">Pyraminx Duo Solver</string> |
Also available in: Unified diff
Progress with the Pyraminx Duo solver