Project

General

Profile

« Previous | Next » 

Revision ad2f13eb

Added by Leszek Koltunski about 1 year ago

More translations for the CU_232 solver

View differences:

src/main/java/org/distorted/solvers/SolverCuboid232.java
266 266
    int result1 = retCornerPermutation(corner_perm,corners);
267 267
    if( result1<0 ) return result1;
268 268

  
269
    int[] edge_perm = new int[8];
269
    int[] edge_perm = new int[4];
270 270
    int result2 = retEdgePermutation(edge_perm,edges);
271 271
    if( result2<0 ) return result2;
272 272

  
273 273
    int corner_perm_num = TablebaseHelpers.computePermutationNum(corner_perm);
274 274
    int edge_perm_num = TablebaseHelpers.computePermutationNum(edge_perm);
275 275

  
276
    // TODO: adjust edge_perm_num to account for the fact that edge[1] is fixed
277

  
276 278
    return edge_perm_num + 6*corner_perm_num;
277 279
    }
278 280

  
src/main/res/values-de/strings.xml
85 85
    <string name="solver_generic_two_centers">Zwei Zentren müssen ausgetauscht werden!</string>
86 86
    <string name="solver_generic_missing_center">Die %1$s Mitte fehlt!</string>
87 87
    <string name="solver_generic_missing_corner">Die %1$s-%2$s-%3$s Ecke fehlt!</string>
88
    <string name="solver_generic_missing_edge">Die %1$s-%2$s Kante fehlt!</string>
88 89
    <string name="solver_generic_corners_cannot">Ecken können nicht verdreht werden, sodass alle Flächen einfarbig sind!</string>
89 90

  
90 91
    <string name="solver_cube3_error1">Es gibt nur %1$d %2$s Facelets.</string>
......
131 132
    <string name="color_red5">rot</string>
132 133
    <string name="color_orange5">orange</string>
133 134

  
135
    <string name="color_yellow6">gelbe</string>
136
    <string name="color_white6">weiße</string>
137
    <string name="color_blue6">blaue</string>
138
    <string name="color_green6">grüne</string>
139
    <string name="color_red6">rote</string>
140
    <string name="color_orange6">orange</string>
141

  
134 142
    <string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
src/main/res/values-es/strings.xml
85 85
    <string name="solver_generic_two_centers">¡Hay que cambiar dos centros!</string>
86 86
    <string name="solver_generic_missing_center">¡Falta el centro %1$s!</string>
87 87
    <string name="solver_generic_missing_corner">¡Falta la esquina %1$s-%2$s-%3$s!</string>
88
    <string name="solver_generic_missing_edge">¡Falta la pieza del borde %1$s-%2$s!</string>
88 89
    <string name="solver_generic_corners_cannot">¡Las esquinas no se pueden torcer para que todos los lados sean monocromáticos!</string>
89 90

  
90 91
    <string name="solver_cube3_error1">Solo hay %1$d facetas %2$s.</string>
......
131 132
    <string name="color_red5">rojo</string>
132 133
    <string name="color_orange5">naranja</string>
133 134

  
135
    <string name="color_yellow6">amarillo</string>
136
    <string name="color_white6">blanco</string>
137
    <string name="color_blue6">azul</string>
138
    <string name="color_green6">verde</string>
139
    <string name="color_red6">rojo</string>
140
    <string name="color_orange6">naranja</string>
141

  
134 142
    <string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
src/main/res/values-fr/strings.xml
85 85
    <string name="solver_generic_two_centers">Deux centres doivent être échangés !</string>
86 86
    <string name="solver_generic_missing_center">Centre %1$s manquant !</string>
87 87
    <string name="solver_generic_missing_corner">Coin %1$s-%2$s-%3$s manquant !</string>
88
    <string name="solver_generic_missing_edge">La pièce de bordure %1$s-%2$s manque!</string>
88 89
    <string name="solver_generic_corners_cannot">Les coins ne peuvent pas être tordus afin que tous les côtés soient monochromes !</string>
89 90

  
90 91
    <string name="solver_cube3_error1">Il n\'y a que %1$d facettes %2$s.</string>
......
131 132
    <string name="color_red5">rouge</string>
132 133
    <string name="color_orange5">orange</string>
133 134

  
135
    <string name="color_yellow6">jaune</string>
136
    <string name="color_white6">blanc</string>
137
    <string name="color_blue6">bleu</string>
138
    <string name="color_green6">vert</string>
139
    <string name="color_red6">rouge</string>
140
    <string name="color_orange6">orange</string>
141

  
134 142
    <string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
src/main/res/values-ja/strings.xml
86 86
    <string name="solver_generic_two_centers">2つのセンターを交換しなければならない!</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
    <string name="solver_generic_missing_edge">%1$s%2$sボーダーピースはありません!</string>
89 90
    <string name="solver_generic_corners_cannot">すべての面がモノクロになるようにコーナーをねじることはできません。</string>
90 91

  
91 92
    <string name="solver_cube3_error1">%2$s小顔は%1$dつだけ</string>
......
132 133
    <string name="color_red5">レッド</string>
133 134
    <string name="color_orange5">オレンジ</string>
134 135

  
136
    <string name="color_yellow6">イエロー</string>
137
    <string name="color_white6">ホワイト</string>
138
    <string name="color_blue6">ブルー</string>
139
    <string name="color_green6">グリーン</string>
140
    <string name="color_red6">レッド</string>
141
    <string name="color_orange6">オレンジ</string>
142

  
135 143
    <string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string>
136 144
    <string name="solver_pduo2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
137 145
    <string name="solver_ivy_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
src/main/res/values-ko/strings.xml
85 85
    <string name="solver_generic_two_centers">두 개의 센터를 교환해야 합니다!</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_missing_edge">%1$s%2$s테두리 조각이 없습니다!</string>
88 89
    <string name="solver_generic_corners_cannot">모든면이 단색이되도록 모서리를 비틀 수 없습니다!</string>
89 90

  
90 91
    <string name="solver_cube3_error1">%2$s작은 얼굴은  %1$d개뿐입니다.</string>
......
131 132
    <string name="color_red5">빨간색</string>
132 133
    <string name="color_orange5">주황색</string>
133 134

  
135
    <string name="color_yellow6">노란색</string>
136
    <string name="color_white6">흰색</string>
137
    <string name="color_blue6">블루</string>
138
    <string name="color_green6">그린</string>
139
    <string name="color_red6">빨간색</string>
140
    <string name="color_orange6">주황색</string>
141

  
134 142
    <string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
src/main/res/values-pl/strings.xml
85 85
    <string name="solver_generic_two_centers">Dwa środki muszą być wymienione!</string>
86 86
    <string name="solver_generic_missing_center">Brakuje %1$s środka!</string>
87 87
    <string name="solver_generic_missing_corner">Brakuje %1$s-%2$s-%3$s rogu!</string>
88
    <string name="solver_generic_missing_edge">Brakuje %1$s-%2$s krawędzi!</string>
88 89
    <string name="solver_generic_corners_cannot">Narożników nie można skręcić tak, aby wszystkie boki były monochromatyczne!</string>
89 90

  
90 91
    <string name="solver_cube3_error1">Jest tylko %1$d %2$s ścian.</string>
......
131 132
    <string name="color_red5">czerwone</string>
132 133
    <string name="color_orange5">pomarańczowe</string>
133 134

  
135
    <string name="color_yellow6">żółtej</string>
136
    <string name="color_white6">białej</string>
137
    <string name="color_blue6">niebieskiej</string>
138
    <string name="color_green6">zielonej</string>
139
    <string name="color_red6">czerwonej</string>
140
    <string name="color_orange6">pomarańczowej</string>
141

  
134 142
    <string name="solver_cube3_description">Natychmiastowy, prawie perfekcyjny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
src/main/res/values-ru/strings.xml
85 85
    <string name="solver_generic_two_centers">Два центра должны быть обменены!</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_missing_edge">Нет %1$s-%2$s края!</string>
88 89
    <string name="solver_generic_corners_cannot">Углы нельзя скручивать так, чтобы все стороны были однотонными!</string>
89 90

  
90 91
    <string name="solver_cube3_error1">Всего %1$d %2$s граней!</string>
......
131 132
    <string name="color_red5">красный</string>
132 133
    <string name="color_orange5">оранжевый</string>
133 134

  
135
    <string name="color_yellow6">желтого</string>
136
    <string name="color_white6">белого</string>
137
    <string name="color_blue6">синого</string>
138
    <string name="color_green6">зеленого</string>
139
    <string name="color_red6">красного</string>
140
    <string name="color_orange6">оранжевого</string>
141

  
134 142
    <string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
src/main/res/values-zh-rCN/strings.xml
90 90
    <string name="solver_generic_edge_twist">一条边需要扭动!</string>
91 91
    <string name="solver_generic_two_centers">必须要交换两个中心!</string>
92 92
    <string name="solver_generic_missing_center">%1$s中心不見了!</string>
93
    <string name="solver_generic_missing_corner">没有%1$s-%2$s-%3$s的角落!</string>
93
    <string name="solver_generic_missing_corner">没有%1$s-%2$s-%3$s的角落!</string>
94
    <string name="solver_generic_missing_edge">没有1$s-%2$s边!</string>
94 95
    <string name="solver_generic_corners_cannot">角不能扭曲,这样所有的面都是单色的!</string>
95 96

  
96 97
    <string name="solver_cube3_error1">只有%1$d个%2$s小面</string>
......
137 138
    <string name="color_red5">红色的</string>
138 139
    <string name="color_orange5">橙色的</string>
139 140

  
141
    <string name="color_yellow6">黄色的</string>
142
    <string name="color_white6">白色的</string>
143
    <string name="color_blue6">蓝色的</string>
144
    <string name="color_green6">绿色的</string>
145
    <string name="color_red6">红色的</string>
146
    <string name="color_orange6">橙色的</string>
147

  
140 148
    <string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string>
141 149
    <string name="solver_pduo2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
142 150
    <string name="solver_ivy_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
src/main/res/values-zh-rTW/strings.xml
85 85
    <string name="solver_generic_two_centers">兩個中鋒要互換!</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_missing_edge">沒有1$s-%2$s邊!</string>
88 89
    <string name="solver_generic_corners_cannot">角不能扭曲,這樣所有的面都是單色的!</string>
89 90

  
90 91
    <string name="solver_cube3_error1">只有%1$d個%2$s小臉</string>
......
131 132
    <string name="color_red5">紅色的</string>
132 133
    <string name="color_orange5">橙色的</string>
133 134

  
135
    <string name="color_yellow6">黃色的</string>
136
    <string name="color_white6">白色的</string>
137
    <string name="color_blue6">藍色的</string>
138
    <string name="color_green6">綠色的</string>
139
    <string name="color_red6">紅色的</string>
140
    <string name="color_orange6">橙色的</string>
141

  
134 142
    <string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string>
135 143
    <string name="solver_pduo2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>
136 144
    <string name="solver_ivy_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>

Also available in: Unified diff