Revision 686de47a
Added by Leszek Koltunski almost 2 years ago
src/main/java/org/distorted/solvers/pduo/SolverPyraminxDuo.java | ||
---|---|---|
229 | 229 |
return res.getString(R.string.solver_generic_missing_center,colorR); |
230 | 230 |
case ERROR_TWO_CENTERS_SWAP : return res.getString(R.string.solver_generic_two_centers); |
231 | 231 |
case ERROR_CORNER_TWISTED : return res.getString(R.string.solver_generic_corner_twist); |
232 |
case ERROR_EDGE_GY : String c41 = res.getString(R.string.color_green3); |
|
233 |
String c42 = res.getString(R.string.color_yellow5); |
|
234 |
return res.getString(R.string.solver_generic_two_corners,c41,c42); |
|
235 |
case ERROR_EDGE_GB : String c51 = res.getString(R.string.color_green3); |
|
236 |
String c52 = res.getString(R.string.color_blue5); |
|
237 |
return res.getString(R.string.solver_generic_two_corners,c51,c52); |
|
238 |
case ERROR_EDGE_GR : String c61 = res.getString(R.string.color_green3); |
|
239 |
String c62 = res.getString(R.string.color_red5); |
|
240 |
return res.getString(R.string.solver_generic_two_corners,c61,c62); |
|
241 |
case ERROR_EDGE_YB : String c71 = res.getString(R.string.color_yellow3); |
|
242 |
String c72 = res.getString(R.string.color_blue5); |
|
243 |
return res.getString(R.string.solver_generic_two_corners,c71,c72); |
|
244 |
case ERROR_EDGE_YR : String c81 = res.getString(R.string.color_yellow3); |
|
245 |
String c82 = res.getString(R.string.color_red5); |
|
246 |
return res.getString(R.string.solver_generic_two_corners,c81,c82); |
|
247 |
case ERROR_EDGE_BR : String c91 = res.getString(R.string.color_blue3); |
|
248 |
String c92 = res.getString(R.string.color_red5); |
|
249 |
return res.getString(R.string.solver_generic_two_corners,c91,c92); |
|
232 | 250 |
} |
233 | 251 |
|
234 | 252 |
return null; |
src/main/res/values-de/strings.xml | ||
---|---|---|
84 | 84 |
<string name="solver_generic_two_centers">Zwei Zentren müssen ausgetauscht werden!</string> |
85 | 85 |
<string name="solver_generic_missing_center">Die %1$s Mitte fehlt!</string> |
86 | 86 |
<string name="solver_generic_missing_corner">Die %1$s-%2$s-%3$s Ecke fehlt!</string> |
87 |
<string name="solver_generic_two_corners">Zwei Ecken passen nicht zusammen (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">Es gibt nur %1$d %2$s Facelets.</string> |
89 | 90 |
<string name="solver_cube3_error2">Nicht alle 12 Kanten gibt es genau einmal!</string> |
... | ... | |
122 | 123 |
<string name="color_red4">rote</string> |
123 | 124 |
<string name="color_orange4">orange</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">gelb</string> |
|
127 |
<string name="color_white5">weiß</string> |
|
128 |
<string name="color_blue5">blau</string> |
|
129 |
<string name="color_green5">grün</string> |
|
130 |
<string name="color_red5">rot</string> |
|
131 |
<string name="color_orange5">orange</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string> |
src/main/res/values-es/strings.xml | ||
---|---|---|
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 | 86 |
<string name="solver_generic_missing_corner">¡Falta la esquina %1$s-%2$s-%3$s!</string> |
87 |
<string name="solver_generic_two_corners">Dos esquinas no coinciden (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">Solo hay %1$d facetas %2$s.</string> |
89 | 90 |
<string name="solver_cube3_error2">¡No todos los 12 bordes existen exactamente una vez!</string> |
... | ... | |
122 | 123 |
<string name="color_red4">roja</string> |
123 | 124 |
<string name="color_orange4">naranja</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">amarillo</string> |
|
127 |
<string name="color_white5">blanco</string> |
|
128 |
<string name="color_blue5">azul</string> |
|
129 |
<string name="color_green5">verde</string> |
|
130 |
<string name="color_red5">rojo</string> |
|
131 |
<string name="color_orange5">naranja</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">Aun no implementado.\nAutor: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">Aun no implementado.\nAutor: Leszek Koltunski.</string> |
src/main/res/values-fr/strings.xml | ||
---|---|---|
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 | 86 |
<string name="solver_generic_missing_corner">Coin %1$s-%2$s-%3$s manquant !</string> |
87 |
<string name="solver_generic_two_corners">Deux coins ne correspondent pas (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">Il n\'y a que %1$d facettes %2$s.</string> |
89 | 90 |
<string name="solver_cube3_error2">Les 12 arêtes n\'existent pas exactement une fois !</string> |
... | ... | |
122 | 123 |
<string name="color_red4">rouge</string> |
123 | 124 |
<string name="color_orange4">orange</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">jaune</string> |
|
127 |
<string name="color_white5">blanc</string> |
|
128 |
<string name="color_blue5">bleu</string> |
|
129 |
<string name="color_green5">vert</string> |
|
130 |
<string name="color_red5">rouge</string> |
|
131 |
<string name="color_orange5">orange</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string> |
src/main/res/values-ja/strings.xml | ||
---|---|---|
85 | 85 |
<string name="solver_generic_two_centers">2つのセンターを交換しなければならない!</string> |
86 | 86 |
<string name="solver_generic_missing_center">%1$sのセンターが欠けてる!</string> |
87 | 87 |
<string name="solver_generic_missing_corner">%1$s%2$s%3$sのコーナーがない!</string> |
88 |
<string name="solver_generic_two_corners">2 つの角が一致しません (%1$s-%2$s)</string> |
|
88 | 89 |
|
89 | 90 |
<string name="solver_cube3_error1">%2$s小顔は%1$dつだけ</string> |
90 | 91 |
<string name="solver_cube3_error2">12 のエッジすべてが 存在するわけではありません。</string> |
... | ... | |
123 | 124 |
<string name="color_red4">レッド</string> |
124 | 125 |
<string name="color_orange4">オレンジ</string> |
125 | 126 |
|
127 |
<string name="color_yellow5">イエロー</string> |
|
128 |
<string name="color_white5">ホワイト</string> |
|
129 |
<string name="color_blue5">ブルー</string> |
|
130 |
<string name="color_green5">グリーン</string> |
|
131 |
<string name="color_red5">レッド</string> |
|
132 |
<string name="color_orange5">オレンジ</string> |
|
133 |
|
|
126 | 134 |
<string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string> |
127 | 135 |
<string name="solver_pduo2_description">まだ実装されていません。\n著者: Leszek Koltunski.</string> |
128 | 136 |
<string name="solver_pyra3_description">まだ実装されていません。\n著者: Leszek Koltunski.</string> |
src/main/res/values-ko/strings.xml | ||
---|---|---|
84 | 84 |
<string name="solver_generic_two_centers">두 개의 센터를 교환해야 합니다!</string> |
85 | 85 |
<string name="solver_generic_missing_center">%1$s 중앙이 사라졌습니다!</string> |
86 | 86 |
<string name="solver_generic_missing_corner">%1$s-%2$s-%3$s 모서리 금지!</string> |
87 |
<string name="solver_generic_two_corners">두 모서리가 일치하지 않음 (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">%2$s작은 얼굴은 %1$d개뿐입니다.</string> |
89 | 90 |
<string name="solver_cube3_error2">12개의 가장자리 모두가 정확하게 한 번 존재하지 않습니다!</string> |
... | ... | |
122 | 123 |
<string name="color_red4">빨간색</string> |
123 | 124 |
<string name="color_orange4">주황색</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">노란색</string> |
|
127 |
<string name="color_white5">흰색</string> |
|
128 |
<string name="color_blue5">블루</string> |
|
129 |
<string name="color_green5">그린</string> |
|
130 |
<string name="color_red5">빨간색</string> |
|
131 |
<string name="color_orange5">주황색</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">아직 구현되지 않음\n작가: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">아직 구현되지 않음\n작가: Leszek Koltunski.</string> |
src/main/res/values-pl/strings.xml | ||
---|---|---|
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 | 86 |
<string name="solver_generic_missing_corner">Brakuje %1$s-%2$s-%3$s rogu!</string> |
87 |
<string name="solver_generic_two_corners">Dwa rogi nie zgadzają się ze sobą (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">Jest tylko %1$d %2$s ścian.</string> |
89 | 90 |
<string name="solver_cube3_error2">Któraś z 12 krawędzi nie istnieje!</string> |
... | ... | |
122 | 123 |
<string name="color_red4">czerwonego</string> |
123 | 124 |
<string name="color_orange4">pomarańczowego</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">żółte</string> |
|
127 |
<string name="color_white5">białe</string> |
|
128 |
<string name="color_blue5">niebieskie</string> |
|
129 |
<string name="color_green5">zielone</string> |
|
130 |
<string name="color_red5">czerwone</string> |
|
131 |
<string name="color_orange5">pomarańczowe</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">Natychmiastowy, prawie perfekcyjny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string> |
src/main/res/values-ru/strings.xml | ||
---|---|---|
84 | 84 |
<string name="solver_generic_two_centers">Два центра должны быть обменены!</string> |
85 | 85 |
<string name="solver_generic_missing_center">Нет %1$s центра!</string> |
86 | 86 |
<string name="solver_generic_missing_corner">Нет %1$s-%2$s-%3$s угла!</string> |
87 |
<string name="solver_generic_two_corners">Два угла не совпадают (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">Всего %1$d %2$s граней!</string> |
89 | 90 |
<string name="solver_cube3_error2">Не все 12 ребер существуют в единичном экземпляре!</string> |
... | ... | |
122 | 123 |
<string name="color_red4">красного</string> |
123 | 124 |
<string name="color_orange4">оранжевого</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">желтый</string> |
|
127 |
<string name="color_white5">белогый</string> |
|
128 |
<string name="color_blue5">синый</string> |
|
129 |
<string name="color_green5">зеленый</string> |
|
130 |
<string name="color_red5">красный</string> |
|
131 |
<string name="color_orange5">оранжевый</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">Еще не реализован.\nАвтор: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">Еще не реализован.\nАвтор: Leszek Koltunski.</string> |
src/main/res/values-zh-rCN/strings.xml | ||
---|---|---|
90 | 90 |
<string name="solver_generic_two_centers">必须要交换两个中心!</string> |
91 | 91 |
<string name="solver_generic_missing_center">%1$s中心不見了!</string> |
92 | 92 |
<string name="solver_generic_missing_corner">没有%1$s-%2$s-%3$s的角落!</string> |
93 |
<string name="solver_generic_two_corners">两个角不匹配 (%1$s-%2$s)</string> |
|
93 | 94 |
|
94 | 95 |
<string name="solver_cube3_error1">只有%1$d个%2$s小面</string> |
95 | 96 |
<string name="solver_cube3_error2">并非所有12条边都只存在一次!</string> |
... | ... | |
114 | 115 |
<string name="color_red2">红色的</string> |
115 | 116 |
<string name="color_orange2">橙色的</string> |
116 | 117 |
|
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>
|
|
118 |
<string name="color_yellow3">黄</string> |
|
119 |
<string name="color_white3">白</string> |
|
120 |
<string name="color_blue3">蓝</string> |
|
121 |
<string name="color_green3">绿</string> |
|
122 |
<string name="color_red3">红</string> |
|
123 |
<string name="color_orange3">橙</string> |
|
123 | 124 |
|
124 | 125 |
<string name="color_yellow4">黄色的</string> |
125 | 126 |
<string name="color_white4">白色的</string> |
... | ... | |
128 | 129 |
<string name="color_red4">红色的</string> |
129 | 130 |
<string name="color_orange4">橙色的</string> |
130 | 131 |
|
132 |
<string name="color_yellow5">黄色的</string> |
|
133 |
<string name="color_white5">白色的</string> |
|
134 |
<string name="color_blue5">蓝色的</string> |
|
135 |
<string name="color_green5">绿色的</string> |
|
136 |
<string name="color_red5">红色的</string> |
|
137 |
<string name="color_orange5">橙色的</string> |
|
138 |
|
|
131 | 139 |
<string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string> |
132 | 140 |
<string name="solver_pduo2_description">尚未实施。\n作者: Leszek Koltunski.</string> |
133 | 141 |
<string name="solver_pyra3_description">尚未实施。\n作者: Leszek Koltunski.</string> |
src/main/res/values-zh-rTW/strings.xml | ||
---|---|---|
84 | 84 |
<string name="solver_generic_two_centers">兩個中鋒要互換!</string> |
85 | 85 |
<string name="solver_generic_missing_center">%1$s的中心不见了!</string> |
86 | 86 |
<string name="solver_generic_missing_corner">沒有%1$s-%2$s-%3$s的角落!</string> |
87 |
<string name="solver_generic_two_corners">兩個角不匹配 (%1$s-%2$s)</string> |
|
87 | 88 |
|
88 | 89 |
<string name="solver_cube3_error1">只有%1$d個%2$s小臉</string> |
89 | 90 |
<string name="solver_cube3_error2">並非所有12條邊都只存在一次!</string> |
... | ... | |
108 | 109 |
<string name="color_red2">紅色的</string> |
109 | 110 |
<string name="color_orange2">橙色的</string> |
110 | 111 |
|
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>
|
|
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> |
|
117 | 118 |
|
118 | 119 |
<string name="color_yellow4">黃色的</string> |
119 | 120 |
<string name="color_white4">白色的</string> |
... | ... | |
122 | 123 |
<string name="color_red4">紅色的</string> |
123 | 124 |
<string name="color_orange4">橙色的</string> |
124 | 125 |
|
126 |
<string name="color_yellow5">黃色的</string> |
|
127 |
<string name="color_white5">白色的</string> |
|
128 |
<string name="color_blue5">藍色的</string> |
|
129 |
<string name="color_green5">綠色的</string> |
|
130 |
<string name="color_red5">紅色的</string> |
|
131 |
<string name="color_orange5">橙色的</string> |
|
132 |
|
|
125 | 133 |
<string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string> |
126 | 134 |
<string name="solver_pduo2_description">尚未實現。\n作者: Leszek Koltunski.</string> |
127 | 135 |
<string name="solver_pyra3_description">尚未實現。\n作者: Leszek Koltunski.</string> |
src/main/res/values/strings.xml | ||
---|---|---|
104 | 104 |
<string name="solver_generic_two_centers">Two centers have to be exchanged!</string> |
105 | 105 |
<string name="solver_generic_missing_center">The %1$s center missing!</string> |
106 | 106 |
<string name="solver_generic_missing_corner">The %1$s-%2$s-%3$s corner missing!</string> |
107 |
<string name="solver_generic_two_corners">Two corners do not match (%1$s-%2$s)</string> |
|
107 | 108 |
|
108 | 109 |
<string name="solver_cube3_error1">There are only %1$d %2$s facelets.</string> |
109 | 110 |
<string name="solver_cube3_error2">Not all 12 edges exist exactly once!</string> |
... | ... | |
142 | 143 |
<string name="color_red4">red</string> |
143 | 144 |
<string name="color_orange4">orange</string> |
144 | 145 |
|
146 |
<string name="color_yellow5">yellow</string> |
|
147 |
<string name="color_white5">white</string> |
|
148 |
<string name="color_blue5">blue</string> |
|
149 |
<string name="color_green5">green</string> |
|
150 |
<string name="color_red5">red</string> |
|
151 |
<string name="color_orange5">orange</string> |
|
152 |
|
|
145 | 153 |
<string name="solver_cube3_title" translatable="false">Kociemba 3x3 Solver</string> |
146 | 154 |
<string name="solver_pduo2_title" translatable="false">Pyraminx Duo Solver</string> |
147 | 155 |
<string name="solver_pyra3_title" translatable="false">Pyraminx Solver</string> |
Also available in: Unified diff
Progress with the Pyraminx Duo solver