Project

General

Profile

« Previous | Next » 

Revision 76ccbefa

Added by Leszek Koltunski 5 days ago

beginnings of ther Kilominx verifier

View differences:

src/main/java/org/distorted/solvers/SolverErrors.java
46 46
                  {R.string.color_white1 ,R.string.color_white2 ,R.string.color_white3 ,R.string.color_white4 ,R.string.color_white5 ,R.string.color_white6 ,R.string.color_white7  },
47 47
                  {R.string.color_yellow1,R.string.color_yellow2,R.string.color_yellow3,R.string.color_yellow4,R.string.color_yellow5,R.string.color_yellow6,R.string.color_yellow7 },
48 48
          };
49

  
50
  private static final int[][] colorsDod =
51
          {
52
                  {R.string.color_yellow1,R.string.color_yellow2,R.string.color_yellow3,R.string.color_yellow4,R.string.color_yellow5,R.string.color_yellow6,R.string.color_yellow7 },
53
                  {R.string.color_orange1,R.string.color_orange2,R.string.color_orange3,R.string.color_orange4,R.string.color_orange5,R.string.color_orange6,R.string.color_orange7 },
54
                  {R.string.color_red1   ,R.string.color_red2   ,R.string.color_red3   ,R.string.color_red4   ,R.string.color_red5   ,R.string.color_red6   ,R.string.color_red7    },
55
                  {R.string.color_sandy1 ,R.string.color_sandy2 ,R.string.color_sandy3 ,R.string.color_sandy4 ,R.string.color_sandy5 ,R.string.color_sandy6 ,R.string.color_sandy7  },
56
                  {R.string.color_dblue1 ,R.string.color_dblue2 ,R.string.color_dblue3 ,R.string.color_dblue4 ,R.string.color_dblue5 ,R.string.color_dblue6 ,R.string.color_dblue7  },
57
                  {R.string.color_white1 ,R.string.color_white2 ,R.string.color_white3 ,R.string.color_white4 ,R.string.color_white5 ,R.string.color_white6 ,R.string.color_white7  },
58
                  {R.string.color_grey1  ,R.string.color_grey2  ,R.string.color_grey3  ,R.string.color_grey4  ,R.string.color_grey5  ,R.string.color_grey6  ,R.string.color_grey7   },
59
                  {R.string.color_blue1  ,R.string.color_blue2  ,R.string.color_blue3  ,R.string.color_blue4  ,R.string.color_blue5  ,R.string.color_blue6  ,R.string.color_blue7   },
60
                  {R.string.color_green1 ,R.string.color_green2 ,R.string.color_green3 ,R.string.color_green4 ,R.string.color_green5 ,R.string.color_green6 ,R.string.color_green7  },
61
                  {R.string.color_violet1,R.string.color_violet2,R.string.color_violet3,R.string.color_violet4,R.string.color_violet5,R.string.color_violet6,R.string.color_violet7 },
62
                  {R.string.color_pink1  ,R.string.color_pink2  ,R.string.color_pink3  ,R.string.color_pink4  ,R.string.color_pink5  ,R.string.color_pink6  ,R.string.color_pink7   },
63
                  {R.string.color_dgreen1,R.string.color_dgreen2,R.string.color_dgreen3,R.string.color_dgreen4,R.string.color_dgreen5,R.string.color_dgreen6,R.string.color_dgreen7 },
64
          };
65

  
49 66
  private static final int[][] colorsDi4 =
50 67
          {
51 68
                  {R.string.color_yellow1,R.string.color_yellow2,R.string.color_yellow3,R.string.color_yellow4,R.string.color_yellow5,R.string.color_yellow6,R.string.color_yellow7 },
......
59 76
  private static int getHexColor(int color,int variant) { return colorsHex[color][variant]; }
60 77
  private static int getTetColor(int color,int variant) { return colorsTet[color][variant]; }
61 78
  private static int getOctColor(int color,int variant) { return colorsOct[color][variant]; }
79
  private static int getDodColor(int color,int variant) { return colorsDod[color][variant]; }
62 80
  private static int getDi4Color(int color,int variant) { return colorsDi4[color][variant]; }
63 81

  
64 82
///////////////////////////////////////////////////////////////////////////////////////////////////
......
222 240
    return res.getString(R.string.solver_generic_missing_vertex,c0,c1,c2);
223 241
    }
224 242

  
243
///////////////////////////////////////////////////////////////////////////////////////////////////
244

  
245
  private static String dodCornerMissingError(Resources res, int color0, int color1, int color2)
246
    {
247
    int j0 = getDodColor(color0,3);
248
    int j1 = getDodColor(color1,3);
249
    int j2 = getDodColor(color2,4);
250

  
251
    String c0 = res.getString(j0);
252
    String c1 = res.getString(j1);
253
    String c2 = res.getString(j2);
254

  
255
    return res.getString(R.string.solver_generic_missing_corner,c0,c1,c2);
256
    }
257

  
258
///////////////////////////////////////////////////////////////////////////////////////////////////
259

  
260
  private static String dodEdgeMissingError(Resources res, int face0, int face1)
261
    {
262
    int j0 = getDodColor(face0,3);
263
    int j1 = getDodColor(face1,6);
264

  
265
    String c0 = res.getString(j0);
266
    String c1 = res.getString(j1);
267

  
268
    return res.getString(R.string.solver_generic_missing_edge,c0,c1);
269
    }
270

  
271
///////////////////////////////////////////////////////////////////////////////////////////////////
272

  
273
  private static String dodCenterMissingError(Resources res, int face)
274
    {
275
    int j = getDodColor(face,2);
276
    String c = res.getString(j);
277
    return res.getString(R.string.solver_generic_missing_center,c);
278
    }
279

  
225 280
///////////////////////////////////////////////////////////////////////////////////////////////////
226 281

  
227 282
  private static String di4EdgeThreeError(Resources res, int color)
......
253 308
      case ERROR_OCT_CENTER_MISSING    : return octCenterMissingError(res,err[1]);
254 309
      case ERROR_OCT_CORNER_MISSING    : return octCornerMissingError(res,err[1],err[2]);
255 310

  
311
      case ERROR_DOD_CENTER_MISSING    : return dodCenterMissingError(res,err[1]);
312
      case ERROR_DOD_EDGE_MISSING      : return dodEdgeMissingError(res,err[1],err[2]);
313
      case ERROR_DOD_CORNER_MISSING    : return dodCornerMissingError(res,err[1],err[2],err[3]);
314

  
256 315
      case ERROR_DI4_EDGE_THREE        : return di4EdgeThreeError(res,err[1]);
257 316

  
258 317
      case ERROR_CORNERS_CANNOT        : return res.getString(R.string.solver_generic_corners_cannot);
src/main/res/values-de/strings.xml
148 148
    <string name="color_orange1">orange</string>
149 149
    <string name="color_violet1">violette</string>
150 150
    <string name="color_grey1">graue</string>
151
    <string name="color_sandy1">sandige</string>
152
    <string name="color_dblue1">dunkelblaue</string>
153
    <string name="color_pink1">rose</string>
154
    <string name="color_dgreen1">dunkelgrüne</string>
151 155

  
152 156
    <string name="color_yellow2">gelbe</string>
153 157
    <string name="color_white2">weiße</string>
......
157 161
    <string name="color_orange2">orange</string>
158 162
    <string name="color_violet2">violette</string>
159 163
    <string name="color_grey2">graue</string>
164
    <string name="color_sandy2">sandige</string>
165
    <string name="color_dblue2">dunkelblaue</string>
166
    <string name="color_pink2">rose</string>
167
    <string name="color_dgreen2">dunkelgrüne</string>
160 168

  
161 169
    <string name="color_yellow3">gelb</string>
162 170
    <string name="color_white3">weiß</string>
......
166 174
    <string name="color_orange3">orange</string>
167 175
    <string name="color_violet3">violett</string>
168 176
    <string name="color_grey3">grau</string>
177
    <string name="color_sandy3">sandig</string>
178
    <string name="color_dblue3">dunkelblau</string>
179
    <string name="color_pink3">rosa</string>
180
    <string name="color_dgreen3">dunkelgrün</string>
169 181

  
170 182
    <string name="color_yellow4">gelbe</string>
171 183
    <string name="color_white4">weiße</string>
......
175 187
    <string name="color_orange4">orange</string>
176 188
    <string name="color_violet4">violette</string>
177 189
    <string name="color_grey4">graue</string>
190
    <string name="color_sandy4">sandige</string>
191
    <string name="color_dblue4">dunkelblaue</string>
192
    <string name="color_pink4">rose</string>
193
    <string name="color_dgreen4">dunkelgrüne</string>
178 194

  
179 195
    <string name="color_yellow5">gelb</string>
180 196
    <string name="color_white5">weiß</string>
......
184 200
    <string name="color_orange5">orange</string>
185 201
    <string name="color_violet5">violett</string>
186 202
    <string name="color_grey5">grau</string>
203
    <string name="color_sandy5">sandig</string>
204
    <string name="color_dblue5">dunkelblau</string>
205
    <string name="color_pink5">rosa</string>
206
    <string name="color_dgreen5">dunkelgrün</string>
187 207

  
188 208
    <string name="color_yellow6">gelbe</string>
189 209
    <string name="color_white6">weiße</string>
......
193 213
    <string name="color_orange6">orange</string>
194 214
    <string name="color_violet6">violette</string>
195 215
    <string name="color_grey6">graue</string>
216
    <string name="color_sandy6">sandige</string>
217
    <string name="color_dblue6">dunkelblaue</string>
218
    <string name="color_pink6">rose</string>
219
    <string name="color_dgreen6">dunkelgrüne</string>
196 220

  
197 221
    <string name="color_yellow7">gelbe</string>
198 222
    <string name="color_white7">weiße</string>
......
202 226
    <string name="color_orange7">orange</string>
203 227
    <string name="color_violet7">violette</string>
204 228
    <string name="color_grey7">graue</string>
229
    <string name="color_sandy7">sandige</string>
230
    <string name="color_dblue7">dunkelblaue</string>
231
    <string name="color_pink7">rose</string>
232
    <string name="color_dgreen7">dunkelgrüne</string>
205 233

  
206 234
    <string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3-Löser.\nAutor: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">Implementierung des Anfängeralgorithmus. 7 Phasen. Erzeugt Lösungen mit etwa 100 Zügen.\nAutor: Leszek Koltunski.</string>
src/main/res/values-es/strings.xml
148 148
    <string name="color_orange1">naranjas</string>
149 149
    <string name="color_violet1">violetas</string>
150 150
    <string name="color_grey1">grises</string>
151
    <string name="color_sandy1">arenas</string>
152
    <string name="color_dblue1">azules oscuro</string>
153
    <string name="color_pink1">rosas</string>
154
    <string name="color_dgreen1">verdes oscuro</string>
151 155

  
152 156
    <string name="color_yellow2">amarillo</string>
153 157
    <string name="color_white2">blanco</string>
......
157 161
    <string name="color_orange2">naranja</string>
158 162
    <string name="color_violet2">violeta</string>
159 163
    <string name="color_grey2">gris</string>
164
    <string name="color_sandy2">areno</string>
165
    <string name="color_dblue2">azul oscuro</string>
166
    <string name="color_pink2">rosa</string>
167
    <string name="color_dgreen2">verde oscuro</string>
160 168

  
161 169
    <string name="color_yellow3">amarilla</string>
162 170
    <string name="color_white3">blanca</string>
......
166 174
    <string name="color_orange3">naranja</string>
167 175
    <string name="color_violet3">violeta</string>
168 176
    <string name="color_grey3">gris</string>
177
    <string name="color_sandy3">arena</string>
178
    <string name="color_dblue3">azul oscuro</string>
179
    <string name="color_pink3">rosa</string>
180
    <string name="color_dgreen3">verde oscuro</string>
169 181

  
170 182
    <string name="color_yellow4">amarilla</string>
171 183
    <string name="color_white4">blanca</string>
......
175 187
    <string name="color_orange4">naranja</string>
176 188
    <string name="color_violet4">violeta</string>
177 189
    <string name="color_grey4">gris</string>
190
    <string name="color_sandy4">arena</string>
191
    <string name="color_dblue4">azul oscuro</string>
192
    <string name="color_pink4">rosa</string>
193
    <string name="color_dgreen4">verde oscuro</string>
178 194

  
179 195
    <string name="color_yellow5">amarillo</string>
180 196
    <string name="color_white5">blanco</string>
......
184 200
    <string name="color_orange5">naranja</string>
185 201
    <string name="color_violet5">violeta</string>
186 202
    <string name="color_grey5">gris</string>
203
    <string name="color_sandy5">areno</string>
204
    <string name="color_dblue5">azul oscuro</string>
205
    <string name="color_pink5">rosa</string>
206
    <string name="color_dgreen5">verde oscuro</string>
187 207

  
188 208
    <string name="color_yellow6">amarillo</string>
189 209
    <string name="color_white6">blanco</string>
......
193 213
    <string name="color_orange6">naranja</string>
194 214
    <string name="color_violet6">violeta</string>
195 215
    <string name="color_grey6">gris</string>
216
    <string name="color_sandy6">areno</string>
217
    <string name="color_dblue6">azul oscuro</string>
218
    <string name="color_pink6">rosa</string>
219
    <string name="color_dgreen6">verde oscuro</string>
196 220

  
197 221
    <string name="color_yellow7">amarillas</string>
198 222
    <string name="color_white7">blancos</string>
......
202 226
    <string name="color_orange7">naranjas</string>
203 227
    <string name="color_violet7">violetas</string>
204 228
    <string name="color_grey7">grises</string>
229
    <string name="color_sandy7">arenas</string>
230
    <string name="color_dblue7">azules oscuro</string>
231
    <string name="color_pink7">rosas</string>
232
    <string name="color_dgreen7">verdes oscuro</string>
205 233

  
206 234
    <string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">Implementación del algoritmo para principiantes. 7 fases. Produce soluciones de aproximadamente 100 movimientos.\nAutor: Leszek Koltunski.</string>
src/main/res/values-fr/strings.xml
148 148
    <string name="color_orange1">orange</string>
149 149
    <string name="color_violet1">violettes</string>
150 150
    <string name="color_grey1">grises</string>
151
    <string name="color_sandy1">sables</string>
152
    <string name="color_dblue1">bleues foncé</string>
153
    <string name="color_pink1">roses</string>
154
    <string name="color_dgreen1">vertes foncé</string>
151 155

  
152 156
    <string name="color_yellow2">jaune</string>
153 157
    <string name="color_white2">blanc</string>
......
157 161
    <string name="color_orange2">orange</string>
158 162
    <string name="color_violet2">violet</string>
159 163
    <string name="color_grey2">gris</string>
164
    <string name="color_sandy2">sable</string>
165
    <string name="color_dblue2">bleu foncé</string>
166
    <string name="color_pink2">rose</string>
167
    <string name="color_dgreen2">vert foncé</string>
160 168

  
161 169
    <string name="color_yellow3">jaune</string>
162 170
    <string name="color_white3">blanc</string>
......
166 174
    <string name="color_orange3">orange</string>
167 175
    <string name="color_violet3">violet</string>
168 176
    <string name="color_grey3">gris</string>
177
    <string name="color_sandy3">sable</string>
178
    <string name="color_dblue3">bleu foncé</string>
179
    <string name="color_pink3">rose</string>
180
    <string name="color_dgreen3">vert foncé</string>
169 181

  
170 182
    <string name="color_yellow4">jaune</string>
171 183
    <string name="color_white4">blanc</string>
......
175 187
    <string name="color_orange4">orange</string>
176 188
    <string name="color_violet4">violet</string>
177 189
    <string name="color_grey4">gris</string>
190
    <string name="color_sandy4">sable</string>
191
    <string name="color_dblue4">bleu foncé</string>
192
    <string name="color_pink4">rose</string>
193
    <string name="color_dgreen4">vert foncé</string>
178 194

  
179 195
    <string name="color_yellow5">jaune</string>
180 196
    <string name="color_white5">blanc</string>
......
184 200
    <string name="color_orange5">orange</string>
185 201
    <string name="color_violet5">violet</string>
186 202
    <string name="color_grey5">gris</string>
203
    <string name="color_sandy5">sable</string>
204
    <string name="color_dblue5">bleu foncé</string>
205
    <string name="color_pink5">rose</string>
206
    <string name="color_dgreen5">vert foncé</string>
187 207

  
188 208
    <string name="color_yellow6">jaune</string>
189 209
    <string name="color_white6">blanc</string>
......
193 213
    <string name="color_orange6">orange</string>
194 214
    <string name="color_violet6">violet</string>
195 215
    <string name="color_grey6">gris</string>
216
    <string name="color_sandy6">sable</string>
217
    <string name="color_dblue6">bleu foncé</string>
218
    <string name="color_pink6">rose</string>
219
    <string name="color_dgreen6">vert foncé</string>
196 220

  
197 221
    <string name="color_yellow7">jaunes</string>
198 222
    <string name="color_white7">blancs</string>
......
202 226
    <string name="color_orange7">orange</string>
203 227
    <string name="color_violet7">violets</string>
204 228
    <string name="color_grey7">gris</string>
229
    <string name="color_sandy7">sables</string>
230
    <string name="color_dblue7">bleues foncé</string>
231
    <string name="color_pink7">roses</string>
232
    <string name="color_dgreen7">vertes foncé</string>
205 233

  
206 234
    <string name="solver_cube3_description">Un solveur 3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">Mise en œuvre de l\'algorithme pour débutants. 7 phases. Produit des solutions longues d\'environ 100 coups.\nAuteur: Leszek Koltunski.</string>
src/main/res/values-ja/strings.xml
140 140
    <string name="solver_generic_free_corners_rotated">フリーコーナーが正しく回転していません!</string>
141 141
    <string name="solver_two_corners_two_edges">2 つのコーナーまたは 2 つのエッジを交換する必要があります!</string>
142 142

  
143
    <string name="color_yellow1">黄色い</string>
144
    <string name="color_white1">白い</string>
145
    <string name="color_blue1">青い</string>
146
    <string name="color_green1">緑の</string>
147
    <string name="color_red1">赤い</string>
148
    <string name="color_orange1">オレンジ色の</string>
149
    <string name="color_violet1">紫色の</string>
150
    <string name="color_grey1">灰色の</string>
143
    <string name="color_yellow1">イエロー</string>
144
    <string name="color_white1">ホワイト</string>
145
    <string name="color_blue1">ブルー</string>
146
    <string name="color_green1">グリーン</string>
147
    <string name="color_red1">レッド</string>
148
    <string name="color_orange1">オレンジ</string>
149
    <string name="color_violet1">バイオレット</string>
150
    <string name="color_grey1">グレー</string>
151
    <string name="color_sandy1">砂色</string>
152
    <string name="color_dblue1">濃い青</string>
153
    <string name="color_pink1">ピンク</string>
154
    <string name="color_dgreen1">濃い緑</string>
151 155

  
152 156
    <string name="color_yellow2">イエロー</string>
153 157
    <string name="color_white2">ホワイト</string>
......
157 161
    <string name="color_orange2">オレンジ</string>
158 162
    <string name="color_violet2">バイオレット</string>
159 163
    <string name="color_grey2">グレー</string>
164
    <string name="color_sandy2">砂色</string>
165
    <string name="color_dblue2">濃い青</string>
166
    <string name="color_pink2">ピンク</string>
167
    <string name="color_dgreen2">濃い緑</string>
160 168

  
161 169
    <string name="color_yellow3">イエロー</string>
162 170
    <string name="color_white3">ホワイト</string>
......
166 174
    <string name="color_orange3">オレンジ</string>
167 175
    <string name="color_violet3">バイオレット</string>
168 176
    <string name="color_grey3">グレー</string>
177
    <string name="color_sandy3">砂色</string>
178
    <string name="color_dblue3">濃い青</string>
179
    <string name="color_pink3">ピンク</string>
180
    <string name="color_dgreen3">濃い緑</string>
169 181

  
170 182
    <string name="color_yellow4">イエロー</string>
171 183
    <string name="color_white4">ホワイト</string>
......
175 187
    <string name="color_orange4">オレンジ</string>
176 188
    <string name="color_violet4">バイオレット</string>
177 189
    <string name="color_grey4">グレー</string>
190
    <string name="color_sandy4">砂色</string>
191
    <string name="color_dblue4">濃い青</string>
192
    <string name="color_pink4">ピンク</string>
193
    <string name="color_dgreen4">濃い緑</string>
178 194

  
179 195
    <string name="color_yellow5">イエロー</string>
180 196
    <string name="color_white5">ホワイト</string>
......
184 200
    <string name="color_orange5">オレンジ</string>
185 201
    <string name="color_violet5">バイオレット</string>
186 202
    <string name="color_grey5">グレー</string>
203
    <string name="color_sandy5">砂色</string>
204
    <string name="color_dblue5">濃い青</string>
205
    <string name="color_pink5">ピンク</string>
206
    <string name="color_dgreen5">濃い緑</string>
187 207

  
188 208
    <string name="color_yellow6">イエロー</string>
189 209
    <string name="color_white6">ホワイト</string>
......
193 213
    <string name="color_orange6">オレンジ</string>
194 214
    <string name="color_violet6">バイオレット</string>
195 215
    <string name="color_grey6">グレー</string>
216
    <string name="color_sandy6">砂色</string>
217
    <string name="color_dblue6">濃い青</string>
218
    <string name="color_pink6">ピンク</string>
219
    <string name="color_dgreen6">濃い緑</string>
196 220

  
197 221
    <string name="color_yellow7">イエロー</string>
198 222
    <string name="color_white7">ホワイト</string>
......
202 226
    <string name="color_orange7">オレンジ</string>
203 227
    <string name="color_violet7">バイオレット</string>
204 228
    <string name="color_grey7">グレー</string>
229
    <string name="color_sandy7">砂色</string>
230
    <string name="color_dblue7">濃い青</string>
231
    <string name="color_pink7">ピンク</string>
232
    <string name="color_dgreen7">濃い緑</string>
205 233

  
206 234
    <string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">初心者向けアルゴリズムの実装。7 フェーズ。約 100 手の長さのソリューションを生成します。\n著者: Leszek Koltunski.</string>
src/main/res/values-ko/strings.xml
148 148
    <string name="color_orange1">주황색</string>
149 149
    <string name="color_violet1">제비꽃</string>
150 150
    <string name="color_grey1">회색</string>
151
    <string name="color_sandy1">모래색</string>
152
    <string name="color_dblue1">진한 파란색</string>
153
    <string name="color_pink1">분홍색</string>
154
    <string name="color_dgreen1">진한 녹색</string>
151 155

  
152 156
    <string name="color_yellow2">옐로우</string>
153 157
    <string name="color_white2">화이트</string>
......
157 161
    <string name="color_orange2">오렌지</string>
158 162
    <string name="color_violet2">제비꽃</string>
159 163
    <string name="color_grey2">회색</string>
164
    <string name="color_sandy2">모래색</string>
165
    <string name="color_dblue2">진한 파란색</string>
166
    <string name="color_pink2">분홍색</string>
167
    <string name="color_dgreen2">진한 녹색</string>
160 168

  
161 169
    <string name="color_yellow3">노란색</string>
162 170
    <string name="color_white3">흰색</string>
......
166 174
    <string name="color_orange3">주황색</string>
167 175
    <string name="color_violet3">제비꽃</string>
168 176
    <string name="color_grey3">회색</string>
177
    <string name="color_sandy3">모래색</string>
178
    <string name="color_dblue3">진한 파란색</string>
179
    <string name="color_pink3">분홍색</string>
180
    <string name="color_dgreen3">진한 녹색</string>
169 181

  
170 182
    <string name="color_yellow4">노란색</string>
171 183
    <string name="color_white4">흰색</string>
......
175 187
    <string name="color_orange4">주황색</string>
176 188
    <string name="color_violet4">제비꽃</string>
177 189
    <string name="color_grey4">회색</string>
190
    <string name="color_sandy4">모래색</string>
191
    <string name="color_dblue4">진한 파란색</string>
192
    <string name="color_pink4">분홍색</string>
193
    <string name="color_dgreen4">진한 녹색</string>
178 194

  
179 195
    <string name="color_yellow5">노란색</string>
180 196
    <string name="color_white5">흰색</string>
......
184 200
    <string name="color_orange5">주황색</string>
185 201
    <string name="color_violet5">제비꽃</string>
186 202
    <string name="color_grey5">회색</string>
203
    <string name="color_sandy5">모래색</string>
204
    <string name="color_dblue5">진한 파란색</string>
205
    <string name="color_pink5">분홍색</string>
206
    <string name="color_dgreen5">진한 녹색</string>
187 207

  
188 208
    <string name="color_yellow6">노란색</string>
189 209
    <string name="color_white6">흰색</string>
......
193 213
    <string name="color_orange6">주황색</string>
194 214
    <string name="color_violet6">제비꽃</string>
195 215
    <string name="color_grey6">회색</string>
216
    <string name="color_sandy6">모래색</string>
217
    <string name="color_dblue6">진한 파란색</string>
218
    <string name="color_pink6">분홍색</string>
219
    <string name="color_dgreen6">진한 녹색</string>
196 220

  
197 221
    <string name="color_yellow7">노란색</string>
198 222
    <string name="color_white7">흰색</string>
......
202 226
    <string name="color_orange7">주황색</string>
203 227
    <string name="color_violet7">제비꽃</string>
204 228
    <string name="color_grey7">회색</string>
229
    <string name="color_sandy7">모래색</string>
230
    <string name="color_dblue7">진한 파란색</string>
231
    <string name="color_pink7">분홍색</string>
232
    <string name="color_dgreen7">진한 녹색</string>
205 233

  
206 234
    <string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">초보자 알고리즘 구현. 7단계. 약 100-이동 길이의 솔루션을 생성합니다.\n작가: Leszek Koltunski.</string>
src/main/res/values-pl/strings.xml
148 148
    <string name="color_orange1">pomarańczowych</string>
149 149
    <string name="color_violet1">fioletowych</string>
150 150
    <string name="color_grey1">szarych</string>
151
    <string name="color_sandy1">piaskowych</string>
152
    <string name="color_dblue1">ciemnoniebieskich</string>
153
    <string name="color_pink1">różowych</string>
154
    <string name="color_dgreen1">ciemnozielonych</string>
151 155

  
152 156
    <string name="color_yellow2">żółtego</string>
153 157
    <string name="color_white2">białego</string>
......
157 161
    <string name="color_orange2">pomarańczowego</string>
158 162
    <string name="color_violet2">fioletowego</string>
159 163
    <string name="color_grey2">szarego</string>
164
    <string name="color_sandy2">piaskowego</string>
165
    <string name="color_dblue2">ciemnoniebieskiego</string>
166
    <string name="color_pink2">różowego</string>
167
    <string name="color_dgreen2">ciemnozielonego</string>
160 168

  
161 169
    <string name="color_yellow3">żółto</string>
162 170
    <string name="color_white3">biało</string>
......
166 174
    <string name="color_orange3">pomarańczowo</string>
167 175
    <string name="color_violet3">fioletowo</string>
168 176
    <string name="color_grey3">szaro</string>
177
    <string name="color_sandy3">piaskowo</string>
178
    <string name="color_dblue3">ciemnoniebiesko</string>
179
    <string name="color_pink3">różowo</string>
180
    <string name="color_dgreen3">ciemnozielono</string>
169 181

  
170 182
    <string name="color_yellow4">żółtego</string>
171 183
    <string name="color_white4">białego</string>
......
175 187
    <string name="color_orange4">pomarańczowego</string>
176 188
    <string name="color_violet4">fioletowego</string>
177 189
    <string name="color_grey4">szarego</string>
190
    <string name="color_sandy4">piaskowego</string>
191
    <string name="color_dblue4">ciemnoniebieskiego</string>
192
    <string name="color_pink4">różowego</string>
193
    <string name="color_dgreen4">ciemnozielonego</string>
178 194

  
179 195
    <string name="color_yellow5">żółte</string>
180 196
    <string name="color_white5">białe</string>
......
184 200
    <string name="color_orange5">pomarańczowe</string>
185 201
    <string name="color_violet5">fioletowe</string>
186 202
    <string name="color_grey5">szare</string>
203
    <string name="color_sandy5">piaskowe</string>
204
    <string name="color_dblue5">ciemnoniebieskie</string>
205
    <string name="color_pink5">różowe</string>
206
    <string name="color_dgreen5">ciemnozielone</string>
187 207

  
188 208
    <string name="color_yellow6">żółtej</string>
189 209
    <string name="color_white6">białej</string>
......
193 213
    <string name="color_orange6">pomarańczowej</string>
194 214
    <string name="color_violet6">fioletowej</string>
195 215
    <string name="color_grey6">szarej</string>
216
    <string name="color_sandy6">piaskowej</string>
217
    <string name="color_dblue6">ciemnoniebieskiej</string>
218
    <string name="color_pink6">różowej</string>
219
    <string name="color_dgreen6">ciemnozielonej</string>
196 220

  
197 221
    <string name="color_yellow7">żółte</string>
198 222
    <string name="color_white7">białe</string>
......
202 226
    <string name="color_orange7">pomarańczowe</string>
203 227
    <string name="color_violet7">fioletowe</string>
204 228
    <string name="color_grey7">szare</string>
229
    <string name="color_sandy7">piaskowe</string>
230
    <string name="color_dblue7">ciemnoniebieskie</string>
231
    <string name="color_pink7">różowe</string>
232
    <string name="color_dgreen7">ciemnozielone</string>
205 233

  
206 234
    <string name="solver_cube3_description">Natychmiastowy, prawie optymalny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">Implementacja algorytmu dla początkujących. 7 faz. Tworzy rozwiązania o długości około 100 ruchów.\nAutor: Leszek Koltunski.</string>
src/main/res/values-ru/strings.xml
148 148
    <string name="color_orange1">оранжевых</string>
149 149
    <string name="color_violet1">фиолетовых</string>
150 150
    <string name="color_grey1">серых</string>
151
    <string name="color_sandy1">песочных</string>
152
    <string name="color_dblue1">тёмно-синих</string>
153
    <string name="color_pink1">розовых</string>
154
    <string name="color_dgreen1">тёмно-зеленых</string>
151 155

  
152 156
    <string name="color_yellow2">желтого</string>
153 157
    <string name="color_white2">белого</string>
......
157 161
    <string name="color_orange2">оранжевого</string>
158 162
    <string name="color_violet2">фиолетового</string>
159 163
    <string name="color_grey2">серого</string>
164
    <string name="color_sandy2">песочного</string>
165
    <string name="color_dblue2">тёмно-синого</string>
166
    <string name="color_pink2">розового</string>
167
    <string name="color_dgreen2">тёмно-зеленого</string>
160 168

  
161 169
    <string name="color_yellow3">желто</string>
162 170
    <string name="color_white3">бело</string>
......
166 174
    <string name="color_orange3">оранжево</string>
167 175
    <string name="color_violet3">фиолетово</string>
168 176
    <string name="color_grey3">серо</string>
177
    <string name="color_sandy3">песочно</string>
178
    <string name="color_dblue3">тёмно-сине</string>
179
    <string name="color_pink3">розово</string>
180
    <string name="color_dgreen3">тёмно-зелено</string>
169 181

  
170 182
    <string name="color_yellow4">желтого</string>
171 183
    <string name="color_white4">белого</string>
......
175 187
    <string name="color_orange4">оранжевого</string>
176 188
    <string name="color_violet4">фиолетового</string>
177 189
    <string name="color_grey4">серого</string>
190
    <string name="color_sandy4">песочного</string>
191
    <string name="color_dblue4">тёмно-синого</string>
192
    <string name="color_pink4">розового</string>
193
    <string name="color_dgreen4">тёмно-зеленого</string>
178 194

  
179 195
    <string name="color_yellow5">желтый</string>
180 196
    <string name="color_white5">белогый</string>
......
184 200
    <string name="color_orange5">оранжевый</string>
185 201
    <string name="color_violet5">фиолетовый</string>
186 202
    <string name="color_grey5">серый</string>
203
    <string name="color_sandy5">песочный</string>
204
    <string name="color_dblue5">тёмно-синий</string>
205
    <string name="color_pink5">розовый</string>
206
    <string name="color_dgreen5">тёмно-зелёный</string>
187 207

  
188 208
    <string name="color_yellow6">желтого</string>
189 209
    <string name="color_white6">белого</string>
......
193 213
    <string name="color_orange6">оранжевого</string>
194 214
    <string name="color_violet6">фиолетового</string>
195 215
    <string name="color_grey6">серого</string>
216
    <string name="color_sandy6">песочного</string>
217
    <string name="color_dblue6">тёмно-синого</string>
218
    <string name="color_pink6">розового</string>
219
    <string name="color_dgreen6">тёмно-зеленого</string>
196 220

  
197 221
    <string name="color_yellow7">желтых</string>
198 222
    <string name="color_white7">белых</string>
......
202 226
    <string name="color_orange7">оранжевых</string>
203 227
    <string name="color_violet7">фиолетовых</string>
204 228
    <string name="color_grey7">серых</string>
229
    <string name="color_sandy7">песочных</string>
230
    <string name="color_dblue7">тёмно-синих</string>
231
    <string name="color_pink7">розовых</string>
232
    <string name="color_dgreen7">тёмно-зеленых</string>
205 233

  
206 234
    <string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">Реализация алгоритма для начинающих. 7 фаз. Выдает решения длиной около 100 ходов.\nАвтор: Leszek Koltunski.</string>
src/main/res/values-zh-rCN/strings.xml
154 154
    <string name="color_orange1">橙色的</string>
155 155
    <string name="color_violet1">紫色的</string>
156 156
    <string name="color_grey1">灰色的</string>
157
    <string name="color_sandy1">沙色的</string>
158
    <string name="color_dblue1">深蓝色的</string>
159
    <string name="color_pink1">粉红色的</string>
160
    <string name="color_dgreen1">深绿色的</string>
157 161

  
158 162
    <string name="color_yellow2">黄色的</string>
159 163
    <string name="color_white2">白色的</string>
......
163 167
    <string name="color_orange2">橙色的</string>
164 168
    <string name="color_violet2">紫色的</string>
165 169
    <string name="color_grey2">灰色的</string>
170
    <string name="color_sandy2">沙色的</string>
171
    <string name="color_dblue2">深蓝色的</string>
172
    <string name="color_pink2">粉红色的</string>
173
    <string name="color_dgreen2">深绿色的</string>
166 174

  
167 175
    <string name="color_yellow3">黄</string>
168 176
    <string name="color_white3">白</string>
......
172 180
    <string name="color_orange3">橙</string>
173 181
    <string name="color_violet3">紫</string>
174 182
    <string name="color_grey3">灰</string>
183
    <string name="color_sandy3">沙</string>
184
    <string name="color_dblue3">深蓝</string>
185
    <string name="color_pink3">粉红</string>
186
    <string name="color_dgreen3">深绿</string>
175 187

  
176 188
    <string name="color_yellow4">黄色的</string>
177 189
    <string name="color_white4">白色的</string>
......
181 193
    <string name="color_orange4">橙色的</string>
182 194
    <string name="color_violet4">紫色的</string>
183 195
    <string name="color_grey4">灰色的</string>
196
    <string name="color_sandy4">沙色的</string>
197
    <string name="color_dblue4">深蓝色的</string>
198
    <string name="color_pink4">粉红色的</string>
199
    <string name="color_dgreen4">深绿色的</string>
184 200

  
185 201
    <string name="color_yellow5">黄色的</string>
186 202
    <string name="color_white5">白色的</string>
......
190 206
    <string name="color_orange5">橙色的</string>
191 207
    <string name="color_violet5">紫色的</string>
192 208
    <string name="color_grey5">灰色的</string>
209
    <string name="color_sandy5">沙色的</string>
210
    <string name="color_dblue5">深蓝色的</string>
211
    <string name="color_pink5">粉红色的</string>
212
    <string name="color_dgreen5">深绿色的</string>
193 213

  
194 214
    <string name="color_yellow6">黄色的</string>
195 215
    <string name="color_white6">白色的</string>
......
199 219
    <string name="color_orange6">橙色的</string>
200 220
    <string name="color_violet6">紫色的</string>
201 221
    <string name="color_grey6">灰色的</string>
222
    <string name="color_sandy6">沙色的</string>
223
    <string name="color_dblue6">深蓝色的</string>
224
    <string name="color_pink6">粉红色的</string>
225
    <string name="color_dgreen6">深绿色的</string>
202 226

  
203 227
    <string name="color_yellow7">黄色的</string>
204 228
    <string name="color_white7">白色的</string>
......
208 232
    <string name="color_orange7">橙色的</string>
209 233
    <string name="color_violet7">紫色的</string>
210 234
    <string name="color_grey7">灰色的</string>
235
    <string name="color_sandy7">沙色的</string>
236
    <string name="color_dblue7">深蓝色的</string>
237
    <string name="color_pink7">粉红色的</string>
238
    <string name="color_dgreen7">深绿色的</string>
211 239

  
212 240
    <string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string>
213 241
    <string name="solver_3algo_description">初学者算法的实现。7 个阶段。产生大约 100 步长的解决方案。\n作者: Leszek Koltunski.</string>
src/main/res/values-zh-rTW/strings.xml
148 148
    <string name="color_orange1">橙色的</string>
149 149
    <string name="color_violet1">紫色的</string>
150 150
    <string name="color_grey1">灰色的</string>
151
    <string name="color_sandy1">沙色的</string>
152
    <string name="color_dblue1">深藍色的</string>
153
    <string name="color_pink1">粉紅色的的</string>
154
    <string name="color_dgreen1">深綠色的</string>
151 155

  
152 156
    <string name="color_yellow2">黃色的</string>
153 157
    <string name="color_white2">白色的</string>
......
157 161
    <string name="color_orange2">橙色的</string>
158 162
    <string name="color_violet2">紫色的</string>
159 163
    <string name="color_grey2">灰色的</string>
164
    <string name="color_sandy2">沙色的</string>
165
    <string name="color_dblue2">深藍色的</string>
166
    <string name="color_pink2">粉紅色的的</string>
167
    <string name="color_dgreen2">深綠色的</string>
160 168

  
161 169
    <string name="color_yellow3">黃</string>
162 170
    <string name="color_white3">白</string>
......
166 174
    <string name="color_orange3">橙</string>
167 175
    <string name="color_violet3">紫</string>
168 176
    <string name="color_grey3">灰</string>
177
    <string name="color_sandy3">沙</string>
178
    <string name="color_dblue3">深藍</string>
179
    <string name="color_pink3">粉紅色</string>
180
    <string name="color_dgreen3">深綠</string>
169 181

  
170 182
    <string name="color_yellow4">黃色的</string>
171 183
    <string name="color_white4">白色的</string>
......
175 187
    <string name="color_orange4">橙色的</string>
176 188
    <string name="color_violet4">紫色的</string>
177 189
    <string name="color_grey4">灰色的</string>
190
    <string name="color_sandy4">沙色的</string>
191
    <string name="color_dblue4">深藍色的</string>
192
    <string name="color_pink4">粉紅色的的</string>
193
    <string name="color_dgreen4">深綠色的</string>
178 194

  
179 195
    <string name="color_yellow5">黃色的</string>
180 196
    <string name="color_white5">白色的</string>
......
184 200
    <string name="color_orange5">橙色的</string>
185 201
    <string name="color_violet5">紫色的</string>
186 202
    <string name="color_grey5">灰色的</string>
203
    <string name="color_sandy5">沙色的</string>
204
    <string name="color_dblue5">深藍色的</string>
205
    <string name="color_pink5">粉紅色的的</string>
206
    <string name="color_dgreen5">深綠色的</string>
187 207

  
188 208
    <string name="color_yellow6">黃色的</string>
189 209
    <string name="color_white6">白色的</string>
......
193 213
    <string name="color_orange6">橙色的</string>
194 214
    <string name="color_violet6">紫色的</string>
195 215
    <string name="color_grey6">灰色的</string>
216
    <string name="color_sandy6">沙色的</string>
217
    <string name="color_dblue6">深藍色的</string>
218
    <string name="color_pink6">粉紅色的的</string>
219
    <string name="color_dgreen6">深綠色的</string>
196 220

  
197 221
    <string name="color_yellow7">黃色的</string>
198 222
    <string name="color_white7">白色的</string>
......
202 226
    <string name="color_orange7">橙色的</string>
203 227
    <string name="color_violet7">紫色的</string>
204 228
    <string name="color_grey7">灰色的</string>
229
    <string name="color_sandy7">沙色的</string>
230
    <string name="color_dblue7">深藍色的</string>
231
    <string name="color_pink7">粉紅色的的</string>
232
    <string name="color_dgreen7">深綠色的</string>
205 233

  
206 234
    <string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string>
207 235
    <string name="solver_3algo_description">初學者演算法的實作。 7 個階段。產生大約 100 個動作的長解。\n作者: Leszek Koltunski.</string>
src/main/res/values/strings.xml
171 171
    <string name="color_orange1">orange</string>
172 172
    <string name="color_violet1">violet</string>
173 173
    <string name="color_grey1">grey</string>
174
    <string name="color_sandy1">sandy</string>
175
    <string name="color_dblue1">dark blue</string>
176
    <string name="color_pink1">pink</string>
177
    <string name="color_dgreen1">dark green</string>
174 178

  
175 179
    <string name="color_yellow2">yellow</string>
176 180
    <string name="color_white2">white</string>
......
180 184
    <string name="color_orange2">orange</string>
181 185
    <string name="color_violet2">violet</string>
182 186
    <string name="color_grey2">grey</string>
187
    <string name="color_sandy2">sandy</string>
188
    <string name="color_dblue2">dark blue</string>
189
    <string name="color_pink2">pink</string>
190
    <string name="color_dgreen2">dark green</string>
183 191

  
184 192
    <string name="color_yellow3">yellow</string>
185 193
    <string name="color_white3">white</string>
......
189 197
    <string name="color_orange3">orange</string>
190 198
    <string name="color_violet3">violet</string>
191 199
    <string name="color_grey3">grey</string>
200
    <string name="color_sandy3">sandy</string>
201
    <string name="color_dblue3">dark blue</string>
202
    <string name="color_pink3">pink</string>
203
    <string name="color_dgreen3">dark green</string>
192 204

  
193 205
    <string name="color_yellow4">yellow</string>
194 206
    <string name="color_white4">white</string>
......
198 210
    <string name="color_orange4">orange</string>
199 211
    <string name="color_violet4">violet</string>
200 212
    <string name="color_grey4">grey</string>
213
    <string name="color_sandy4">sandy</string>
214
    <string name="color_dblue4">dark blue</string>
215
    <string name="color_pink4">pink</string>
216
    <string name="color_dgreen4">dark green</string>
201 217

  
202 218
    <string name="color_yellow5">yellow</string>
203 219
    <string name="color_white5">white</string>
......
207 223
    <string name="color_orange5">orange</string>
208 224
    <string name="color_violet5">violet</string>
209 225
    <string name="color_grey5">grey</string>
226
    <string name="color_sandy5">sandy</string>
227
    <string name="color_dblue5">dark blue</string>
228
    <string name="color_pink5">pink</string>
229
    <string name="color_dgreen5">dark green</string>
210 230

  
211 231
    <string name="color_yellow6">yellow</string>
212 232
    <string name="color_white6">white</string>
......
216 236
    <string name="color_orange6">orange</string>
217 237
    <string name="color_violet6">violet</string>
218 238
    <string name="color_grey6">grey</string>
239
    <string name="color_sandy6">sandy</string>
240
    <string name="color_dblue6">dark blue</string>
241
    <string name="color_pink6">pink</string>
242
    <string name="color_dgreen6">dark green</string>
219 243

  
220 244
    <string name="color_yellow7">yellow</string>
221 245
    <string name="color_white7">white</string>
......
225 249
    <string name="color_orange7">orange</string>
226 250
    <string name="color_violet7">violet</string>
227 251
    <string name="color_grey7">grey</string>
252
    <string name="color_sandy7">sandy</string>
253
    <string name="color_dblue7">dark blue</string>
254
    <string name="color_pink7">pink</string>
255
    <string name="color_dgreen7">dark green</string>
228 256

  
229 257
    <string name="creators">Creators</string>
230 258
    <string name="creator_cuboid_title" translatable="false">Bandaged Cuboids</string>

Also available in: Unified diff