Revision 8afa10ef
Added by Leszek Koltunski over 1 year ago
src/main/java/org/distorted/solvers/ImplementedSolversList.java | ||
---|---|---|
25 | 25 |
TOWER (ObjectSignatures.CU_232, R.string.solver_cu232_title, R.string.solver_cu232_description, true), |
26 | 26 |
DIAMOND (ObjectSignatures.DIAM_2, R.string.solver_diam2_title, R.string.solver_diam2_description, true), |
27 | 27 |
JING2 (ObjectSignatures.JING_2, R.string.solver_jing2_title, R.string.solver_jing2_description, true), |
28 |
DINO6 (ObjectSignatures.DINO_3, R.string.solver_dino6_title, R.string.solver_dino6_description, false), |
|
28 |
DINO6 (ObjectSignatures.DINO_3, R.string.solver_dino6_title, R.string.solver_dino6_description, true), |
|
29 |
DINO4 (ObjectSignatures.DIN4_3, R.string.solver_dino4_title, R.string.solver_dino4_description, false), |
|
29 | 30 |
PDIA (ObjectSignatures.PDIA_3, R.string.solver_pdia_title, R.string.solver_pdia_description, false), |
30 | 31 |
; |
31 | 32 |
|
src/main/java/org/distorted/solvers/SolverDino4.java | ||
---|---|---|
1 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
2 |
// Copyright 2023 Leszek Koltunski // |
|
3 |
// // |
|
4 |
// This file is part of Magic Cube. // |
|
5 |
// // |
|
6 |
// Magic Cube is proprietary software licensed under an EULA which you should have received // |
|
7 |
// along with the code. If not, check https://distorted.org/magic/License-Magic-Cube.html // |
|
8 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
9 |
|
|
10 |
package org.distorted.solvers; |
|
11 |
|
|
12 |
import android.content.res.Resources; |
|
13 |
|
|
14 |
import org.distorted.main.R; |
|
15 |
import org.distorted.objectlib.main.ObjectSignatures; |
|
16 |
import org.distorted.objectlib.main.TwistyObject; |
|
17 |
import org.distorted.objectlib.tablebases.ImplementedTablebasesList; |
|
18 |
import org.distorted.objectlib.tablebases.TBDino4; |
|
19 |
import org.distorted.objectlib.tablebases.TablebasesAbstract; |
|
20 |
|
|
21 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
22 |
|
|
23 |
public class SolverDino4 extends SolverTablebase |
|
24 |
{ |
|
25 |
private static final int ERROR_EDGE_THREE = -1; |
|
26 |
private TablebasesAbstract mSolver; |
|
27 |
private int mErrorColor; |
|
28 |
|
|
29 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
30 |
|
|
31 |
public SolverDino4(Resources res, TwistyObject object) |
|
32 |
{ |
|
33 |
super(res,object); |
|
34 |
} |
|
35 |
|
|
36 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
37 |
|
|
38 |
private void getEdges(TwistyObject object, int[][] edges) |
|
39 |
{ |
|
40 |
for(int i=0; i<12; i++) |
|
41 |
{ |
|
42 |
edges[0][i] = object.getCubitFaceStickerIndex(i,0); |
|
43 |
edges[1][i] = object.getCubitFaceStickerIndex(i,1); |
|
44 |
} |
|
45 |
} |
|
46 |
|
|
47 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
48 |
|
|
49 |
private int checkEdges(int[][] edges) |
|
50 |
{ |
|
51 |
int numBlue=0,numRed=0, numYellow=0, numWhite=0; |
|
52 |
|
|
53 |
for(int i=0; i<12; i++) |
|
54 |
{ |
|
55 |
int e = edges[0][i]; |
|
56 |
|
|
57 |
if( e==edges[1][i] ) |
|
58 |
switch(e) |
|
59 |
{ |
|
60 |
case 0: numYellow++; break; |
|
61 |
case 1: numWhite++ ; break; |
|
62 |
case 2: numBlue++ ; break; |
|
63 |
case 3: numRed++ ; break; |
|
64 |
} |
|
65 |
} |
|
66 |
|
|
67 |
if( numYellow!=3 ) { mErrorColor=0; return ERROR_EDGE_THREE; } |
|
68 |
if( numWhite !=3 ) { mErrorColor=1; return ERROR_EDGE_THREE; } |
|
69 |
if( numBlue !=3 ) { mErrorColor=2; return ERROR_EDGE_THREE; } |
|
70 |
if( numRed !=3 ) { mErrorColor=3; return ERROR_EDGE_THREE; } |
|
71 |
|
|
72 |
return 0; |
|
73 |
} |
|
74 |
|
|
75 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
76 |
|
|
77 |
public int tablebaseIndex(TwistyObject object) |
|
78 |
{ |
|
79 |
int[][] edges = new int[2][12]; |
|
80 |
getEdges(object,edges); |
|
81 |
|
|
82 |
int result1 = checkEdges(edges); |
|
83 |
if( result1<0 ) return result1; |
|
84 |
|
|
85 |
return TBDino4.indexFromPartition(edges[0]); |
|
86 |
} |
|
87 |
|
|
88 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
89 |
|
|
90 |
private int getColorIndex7(int color) |
|
91 |
{ |
|
92 |
switch(color) |
|
93 |
{ |
|
94 |
case 0: return R.string.color_yellow7; |
|
95 |
case 1: return R.string.color_white7; |
|
96 |
case 2: return R.string.color_blue7; |
|
97 |
case 3: return R.string.color_red7; |
|
98 |
} |
|
99 |
|
|
100 |
return -1; |
|
101 |
} |
|
102 |
|
|
103 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
104 |
|
|
105 |
public String error(int index, Resources res) |
|
106 |
{ |
|
107 |
int i = getColorIndex7(mErrorColor); |
|
108 |
String color = res.getString(i); |
|
109 |
|
|
110 |
return res.getString(R.string.solver_generic_edge_three,color); |
|
111 |
} |
|
112 |
|
|
113 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
114 |
|
|
115 |
public int[][] solution(int index, Resources res) |
|
116 |
{ |
|
117 |
if( mSolver==null ) |
|
118 |
{ |
|
119 |
mSolver = ImplementedTablebasesList.createUnpacked(ObjectSignatures.DIN4_3); |
|
120 |
if( mSolver!=null ) mSolver.createTablebase(-1); |
|
121 |
} |
|
122 |
|
|
123 |
return mSolver!=null ? mSolver.solution(index,null) : null; |
|
124 |
} |
|
125 |
} |
|
126 |
|
src/main/java/org/distorted/solvers/SolverMain.java | ||
---|---|---|
121 | 121 |
SolverTablebase solver = new SolverDino6(mRes,mObject); |
122 | 122 |
solver.solve(screen); |
123 | 123 |
} |
124 |
else if( mSignature==ObjectSignatures.DIN4_3 ) |
|
125 |
{ |
|
126 |
SolverTablebase solver = new SolverDino4(mRes,mObject); |
|
127 |
solver.solve(screen); |
|
128 |
} |
|
124 | 129 |
else |
125 | 130 |
{ |
126 | 131 |
screen.displayErrorDialog(mRes.getString(R.string.solver_generic_not_implemented)); |
src/main/res/values-de/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">Oktaederstücke und Tetraederecken passen nicht zusammen!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">%1$s-%2$s Kante?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">Zwei %1$s-%2$s Kanten!</string> |
103 |
<string name="solver_generic_edge_three">Es sollten 3 %1$s Kanten sein!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">Es gibt nur %1$d %2$s Facelets.</string> |
105 | 106 |
<string name="solver_cube3_error2">Nicht alle 12 Kanten gibt es genau einmal!</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">violette</string> |
164 | 165 |
<string name="color_grey6">graue</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">gelbe</string> |
|
168 |
<string name="color_white7">weiße</string> |
|
169 |
<string name="color_blue7">blaue</string> |
|
170 |
<string name="color_green7">grüne</string> |
|
171 |
<string name="color_red7">rote</string> |
|
172 |
<string name="color_orange7">orange</string> |
|
173 |
<string name="color_violet7">violette</string> |
|
174 |
<string name="color_grey7">graue</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
... | ... | |
172 | 182 |
<string name="solver_cube2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
173 | 183 |
<string name="solver_skew2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
174 | 184 |
<string name="solver_jing2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
175 |
<string name="solver_dino6_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string> |
|
176 | 187 |
<string name="solver_pdia_description">Noch nicht implementiert.\nAutor: Leszek Koltunski.</string> |
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d ms</string> |
src/main/res/values-es/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">¡Las piezas octaédricas y las esquinas tetraédricas no coinciden!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">Borde %1$s-%2$s?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">¡Dos bordes %1$s-%2$s!</string> |
103 |
<string name="solver_generic_edge_three">¡Debe haber 3 bordes %1$s!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">Solo hay %1$d facetas %2$s.</string> |
105 | 106 |
<string name="solver_cube3_error2">¡No todos los 12 bordes existen exactamente una vez!</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">violeta</string> |
164 | 165 |
<string name="color_grey6">gris</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">amarillas</string> |
|
168 |
<string name="color_white7">blancos</string> |
|
169 |
<string name="color_blue7">azules</string> |
|
170 |
<string name="color_green7">verdes</string> |
|
171 |
<string name="color_red7">rojos</string> |
|
172 |
<string name="color_orange7">naranjas</string> |
|
173 |
<string name="color_violet7">violetas</string> |
|
174 |
<string name="color_grey7">grises</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
... | ... | |
172 | 182 |
<string name="solver_cube2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
173 | 183 |
<string name="solver_skew2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
174 | 184 |
<string name="solver_jing2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
175 |
<string name="solver_dino6_description">Aun no implementado.\nAutor: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string> |
|
176 | 187 |
<string name="solver_pdia_description">Aun no implementado.\nAutor: Leszek Koltunski.</string> |
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d ms</string> |
src/main/res/values-fr/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">Les pièces octaédriques et les coins tétraédriques ne correspondent pas !</string> |
101 | 101 |
<string name="solver_generic_edge_mono">Bord %1$s-%2$s?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">Deux bords %1$s-%2$s !</string> |
103 |
<string name="solver_generic_edge_three">Il devrait y avoir 3 bords %1$s !</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">Il n\'y a que %1$d facettes %2$s.</string> |
105 | 106 |
<string name="solver_cube3_error2">Les 12 arêtes n\'existent pas exactement une fois !</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">violet</string> |
164 | 165 |
<string name="color_grey6">gris</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">jaunes</string> |
|
168 |
<string name="color_white7">blancs</string> |
|
169 |
<string name="color_blue7">bleus</string> |
|
170 |
<string name="color_green7">verts</string> |
|
171 |
<string name="color_red7">rouges</string> |
|
172 |
<string name="color_orange7">orange</string> |
|
173 |
<string name="color_violet7">violets</string> |
|
174 |
<string name="color_grey7">gris</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
... | ... | |
170 | 180 |
<string name="solver_pyra3_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
171 | 181 |
<string name="solver_diam2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
172 | 182 |
<string name="solver_cube2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
173 |
<string name="solver_skew2_description">Un solveur parfait et instantané.\nAutor: Leszek Koltunski.</string> |
|
174 |
<string name="solver_jing2_description">Un solveur parfait et instantané.\nAutor: Leszek Koltunski.</string> |
|
175 |
<string name="solver_dino6_description">Pas encore mis en œuvre.\nAutor: Leszek Koltunski.</string> |
|
176 |
<string name="solver_pdia_description">Pas encore mis en œuvre.\nAutor: Leszek Koltunski.</string> |
|
183 |
<string name="solver_skew2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
|
184 |
<string name="solver_jing2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string> |
|
187 |
<string name="solver_pdia_description">Pas encore mis en œuvre.\nAuteur: Leszek Koltunski.</string> |
|
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d ms</string> |
179 | 190 |
<string name="lv_placeholder">Niveau %1$d</string> |
src/main/res/values-ja/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">八面体のピースと四面体の角が一致しません!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">%1$s%2$s エッジ?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">2 つの %1$s-%2$s エッジ!</string> |
103 |
<string name="solver_generic_edge_three">3 つの %1$s エッジがあるはずです!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">%2$s小顔は%1$dつだけ</string> |
105 | 106 |
<string name="solver_cube3_error2">12 のエッジすべてが 存在するわけではありません。</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">バイオレット</string> |
164 | 165 |
<string name="color_grey6">グレー</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">イエロー</string> |
|
168 |
<string name="color_white7">ホワイト</string> |
|
169 |
<string name="color_blue7">ブルー</string> |
|
170 |
<string name="color_green7">グリーン</string> |
|
171 |
<string name="color_red7">レッド</string> |
|
172 |
<string name="color_orange7">オレンジ</string> |
|
173 |
<string name="color_violet7">バイオレット</string> |
|
174 |
<string name="color_grey7">グレー</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
... | ... | |
170 | 180 |
<string name="solver_pyra3_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
171 | 181 |
<string name="solver_diam2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
172 | 182 |
<string name="solver_cube2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
173 |
<string name="solver_skew2_description">完璧で瞬時のソルバー。\nAutor: Leszek Koltunski.</string> |
|
174 |
<string name="solver_jing2_description">完璧で瞬時のソルバー。\nAutor: Leszek Koltunski.</string> |
|
175 |
<string name="solver_dino6_description">まだ実装されていません。\nAutor: Leszek Koltunski.</string> |
|
176 |
<string name="solver_pdia_description">まだ実装されていません。\nAutor: Leszek Koltunski.</string> |
|
183 |
<string name="solver_skew2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
|
184 |
<string name="solver_jing2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string> |
|
187 |
<string name="solver_pdia_description">まだ実装されていません。\n著者: Leszek Koltunski.</string> |
|
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d ms</string> |
179 | 190 |
<string name="lv_placeholder">レベル %1$d</string> |
src/main/res/values-ko/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">팔면체 조각과 사면체 모서리가 일치하지 않습니다!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">%1$s%2$s 에지?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">두 개의 %1$s-%2$s 모서리!</string> |
103 |
<string name="solver_generic_edge_three">3개의 %1$s 모서리가 있어야 합니다!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">%2$s작은 얼굴은 %1$d개뿐입니다.</string> |
105 | 106 |
<string name="solver_cube3_error2">12개의 가장자리 모두가 정확하게 한 번 존재하지 않습니다!</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">제비꽃</string> |
164 | 165 |
<string name="color_grey6">회색</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">노란색</string> |
|
168 |
<string name="color_white7">흰색</string> |
|
169 |
<string name="color_blue7">블루</string> |
|
170 |
<string name="color_green7">그린</string> |
|
171 |
<string name="color_red7">빨간색</string> |
|
172 |
<string name="color_orange7">주황색</string> |
|
173 |
<string name="color_violet7">제비꽃</string> |
|
174 |
<string name="color_grey7">회색</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
... | ... | |
170 | 180 |
<string name="solver_pyra3_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
171 | 181 |
<string name="solver_diam2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
172 | 182 |
<string name="solver_cube2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
173 |
<string name="solver_skew2_description">완벽하고 즉각적인 솔버.\nAutor: Leszek Koltunski.</string> |
|
174 |
<string name="solver_jing2_description">완벽하고 즉각적인 솔버.\nAutor: Leszek Koltunski.</string> |
|
175 |
<string name="solver_dino6_description">아직 구현되지 않음.\nAutor: Leszek Koltunski.</string> |
|
176 |
<string name="solver_pdia_description">아직 구현되지 않음.\nAutor: Leszek Koltunski.</string> |
|
183 |
<string name="solver_skew2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
|
184 |
<string name="solver_jing2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string> |
|
187 |
<string name="solver_pdia_description">아직 구현되지 않음.\n작가: Leszek Koltunski.</string> |
|
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d ms</string> |
179 | 190 |
<string name="lv_placeholder">레벨 %1$d</string> |
src/main/res/values-pl/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">Części ośmiościenne i czworościenne rogi nie pasują do siebie!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">%1$s-%2$s krawędz?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">Dwie krawędzie %1$s-%2$s!</string> |
103 |
<string name="solver_generic_edge_three">Powinny być 3 %1$s krawędzie!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">Jest tylko %1$d %2$s ścian.</string> |
105 | 106 |
<string name="solver_cube3_error2">Któraś z 12 krawędzi nie istnieje!</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">fioletowej</string> |
164 | 165 |
<string name="color_grey6">szarej</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">żółte</string> |
|
168 |
<string name="color_white7">białe</string> |
|
169 |
<string name="color_blue7">niebieskie</string> |
|
170 |
<string name="color_green7">zielone</string> |
|
171 |
<string name="color_red7">czerwone</string> |
|
172 |
<string name="color_orange7">pomarańczowe</string> |
|
173 |
<string name="color_violet7">fioletowe</string> |
|
174 |
<string name="color_grey7">szare</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">Natychmiastowy, prawie optymalny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
... | ... | |
172 | 182 |
<string name="solver_cube2_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
173 | 183 |
<string name="solver_skew2_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
174 | 184 |
<string name="solver_jing2_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
175 |
<string name="solver_dino6_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">Optymalny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string> |
|
176 | 187 |
<string name="solver_pdia_description">Jeszcze nie zaimplementowany.\nAutor: Leszek Koltunski.</string> |
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d ms</string> |
src/main/res/values-ru/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">Восьмигранные фигуры и четырехгранные углы не совпадают!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">%1$s-%2$s ребрo?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">Два ребра %1$s-%2$s!</string> |
103 |
<string name="solver_generic_edge_three">Должно быть 3 %1$s ребра!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">Всего %1$d %2$s граней!</string> |
105 | 106 |
<string name="solver_cube3_error2">Не все 12 ребер существуют в единичном экземпляре!</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">фиолетового</string> |
164 | 165 |
<string name="color_grey6">серого</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">желтых</string> |
|
168 |
<string name="color_white7">белых</string> |
|
169 |
<string name="color_blue7">синих</string> |
|
170 |
<string name="color_green7">зеленых</string> |
|
171 |
<string name="color_red7">красных</string> |
|
172 |
<string name="color_orange7">оранжевых</string> |
|
173 |
<string name="color_violet7">фиолетовых</string> |
|
174 |
<string name="color_grey7">серых</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
... | ... | |
170 | 180 |
<string name="solver_pyra3_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
171 | 181 |
<string name="solver_diam2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
172 | 182 |
<string name="solver_cube2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
173 |
<string name="solver_skew2_description">Идеальный, мгновенный решатель.\nAutor: Leszek Koltunski.</string> |
|
174 |
<string name="solver_jing2_description">Идеальный, мгновенный решатель.\nAutor: Leszek Koltunski.</string> |
|
175 |
<string name="solver_dino6_description">Еще не реализован.\nAutor: Leszek Koltunski.</string> |
|
176 |
<string name="solver_pdia_description">Еще не реализован.\nAutor: Leszek Koltunski.</string> |
|
183 |
<string name="solver_skew2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
|
184 |
<string name="solver_jing2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string> |
|
187 |
<string name="solver_pdia_description">Еще не реализован.\nАвтор: Leszek Koltunski.</string> |
|
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d мс</string> |
179 | 190 |
<string name="lv_placeholder">Уровень %1$d</string> |
src/main/res/values-zh-rCN/strings.xml | ||
---|---|---|
106 | 106 |
<string name="solver_generic_c_v_dont_match">八面体块和四面体角不匹配!</string> |
107 | 107 |
<string name="solver_generic_edge_mono">%1$s%2$s 边缘?</string> |
108 | 108 |
<string name="solver_generic_edge_twice">两个 %1$s-%2$s 边!</string> |
109 |
<string name="solver_generic_edge_three">应该有 3 %1$s 条边!</string> |
|
109 | 110 |
|
110 | 111 |
<string name="solver_cube3_error1">只有%1$d个%2$s小面</string> |
111 | 112 |
<string name="solver_cube3_error2">并非所有12条边都只存在一次!</string> |
... | ... | |
169 | 170 |
<string name="color_violet6">紫色的</string> |
170 | 171 |
<string name="color_grey6">灰色的</string> |
171 | 172 |
|
173 |
<string name="color_yellow7">黄色的</string> |
|
174 |
<string name="color_white7">白色的</string> |
|
175 |
<string name="color_blue7">蓝色的</string> |
|
176 |
<string name="color_green7">绿色的</string> |
|
177 |
<string name="color_red7">红色的</string> |
|
178 |
<string name="color_orange7">橙色的</string> |
|
179 |
<string name="color_violet7">紫色的</string> |
|
180 |
<string name="color_grey7">灰色的</string> |
|
181 |
|
|
172 | 182 |
<string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string> |
173 | 183 |
<string name="solver_pduo2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
174 | 184 |
<string name="solver_ivy_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
... | ... | |
176 | 186 |
<string name="solver_pyra3_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
177 | 187 |
<string name="solver_diam2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
178 | 188 |
<string name="solver_cube2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
179 |
<string name="solver_skew2_description">完美的即时求解器。\nAutor: Leszek Koltunski.</string> |
|
180 |
<string name="solver_jing2_description">完美的即时求解器。\nAutor: Leszek Koltunski.</string> |
|
181 |
<string name="solver_dino6_description">尚未实施。\nAutor: Leszek Koltunski.</string> |
|
182 |
<string name="solver_pdia_description">尚未实施。\nAutor: Leszek Koltunski.</string> |
|
189 |
<string name="solver_skew2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
|
190 |
<string name="solver_jing2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
|
191 |
<string name="solver_dino6_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
|
192 |
<string name="solver_dino4_description">完美的即时求解器。\n作者: Leszek Koltunski.</string> |
|
193 |
<string name="solver_pdia_description">尚未实施。\n作者: Leszek Koltunski.</string> |
|
183 | 194 |
|
184 | 195 |
<string name="ms_placeholder">%1$d毫秒</string> |
185 | 196 |
<string name="lv_placeholder">%1$d级</string> |
src/main/res/values-zh-rTW/strings.xml | ||
---|---|---|
100 | 100 |
<string name="solver_generic_c_v_dont_match">八面體塊和四面體角不匹配!</string> |
101 | 101 |
<string name="solver_generic_edge_mono">%1$s%2$s 邊緣?</string> |
102 | 102 |
<string name="solver_generic_edge_twice">兩個 %1$s-%2$s 邊!</string> |
103 |
<string name="solver_generic_edge_three">應該有 3 %1$s 條邊!</string> |
|
103 | 104 |
|
104 | 105 |
<string name="solver_cube3_error1">只有%1$d個%2$s小臉</string> |
105 | 106 |
<string name="solver_cube3_error2">並非所有12條邊都只存在一次!</string> |
... | ... | |
163 | 164 |
<string name="color_violet6">紫色的</string> |
164 | 165 |
<string name="color_grey6">灰色的</string> |
165 | 166 |
|
167 |
<string name="color_yellow7">黃色的</string> |
|
168 |
<string name="color_white7">白色的</string> |
|
169 |
<string name="color_blue7">藍色的</string> |
|
170 |
<string name="color_green7">綠色的</string> |
|
171 |
<string name="color_red7">紅色的</string> |
|
172 |
<string name="color_orange7">橙色的</string> |
|
173 |
<string name="color_violet7">紫色的</string> |
|
174 |
<string name="color_grey7">灰色的</string> |
|
175 |
|
|
166 | 176 |
<string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string> |
167 | 177 |
<string name="solver_pduo2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
168 | 178 |
<string name="solver_ivy_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
... | ... | |
170 | 180 |
<string name="solver_pyra3_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
171 | 181 |
<string name="solver_diam2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
172 | 182 |
<string name="solver_cube2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
173 |
<string name="solver_skew2_description">完美的即時求解器。\nAutor: Leszek Koltunski.</string> |
|
174 |
<string name="solver_jing2_description">完美的即時求解器。\nAutor: Leszek Koltunski.</string> |
|
175 |
<string name="solver_dino6_description">尚未實現。\nAutor: Leszek Koltunski.</string> |
|
176 |
<string name="solver_pdia_description">尚未實現。\nAutor: Leszek Koltunski.</string> |
|
183 |
<string name="solver_skew2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
|
184 |
<string name="solver_jing2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
|
185 |
<string name="solver_dino6_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
|
186 |
<string name="solver_dino4_description">完美的即時求解器。\n作者: Leszek Koltunski.</string> |
|
187 |
<string name="solver_pdia_description">尚未實現。\n作者: Leszek Koltunski.</string> |
|
177 | 188 |
|
178 | 189 |
<string name="ms_placeholder">%1$d毫秒</string> |
179 | 190 |
<string name="lv_placeholder">%1$d級</string> |
src/main/res/values/strings.xml | ||
---|---|---|
120 | 120 |
<string name="solver_generic_c_v_dont_match">Octahedral pieces and tetrahedral corners do not match!</string> |
121 | 121 |
<string name="solver_generic_edge_mono">%1$s-%2$s edge?</string> |
122 | 122 |
<string name="solver_generic_edge_twice">Two %1$s-%2$s edges!</string> |
123 |
<string name="solver_generic_edge_three">There should be 3 %1$s edges!</string> |
|
123 | 124 |
|
124 | 125 |
<string name="solver_cube3_error1">There are only %1$d %2$s facelets.</string> |
125 | 126 |
<string name="solver_cube3_error2">Not all 12 edges exist exactly once!</string> |
... | ... | |
183 | 184 |
<string name="color_violet6">violet</string> |
184 | 185 |
<string name="color_grey6">grey</string> |
185 | 186 |
|
187 |
<string name="color_yellow7">yellow</string> |
|
188 |
<string name="color_white7">white</string> |
|
189 |
<string name="color_blue7">blue</string> |
|
190 |
<string name="color_green7">green</string> |
|
191 |
<string name="color_red7">red</string> |
|
192 |
<string name="color_orange7">orange</string> |
|
193 |
<string name="color_violet7">violet</string> |
|
194 |
<string name="color_grey7">grey</string> |
|
195 |
|
|
186 | 196 |
<string name="solver_cube3_title" translatable="false">3x3 Cube Solver</string> |
187 | 197 |
<string name="solver_pduo2_title" translatable="false">Pyraminx Duo Solver</string> |
188 | 198 |
<string name="solver_pyra3_title" translatable="false">Pyraminx Solver</string> |
... | ... | |
193 | 203 |
<string name="solver_skew2_title" translatable="false">Skewb Solver</string> |
194 | 204 |
<string name="solver_jing2_title" translatable="false">Jing Pyraminx Solver</string> |
195 | 205 |
<string name="solver_dino6_title" translatable="false">6-color Dino Solver</string> |
206 |
<string name="solver_dino4_title" translatable="false">4-color Dino Solver</string> |
|
196 | 207 |
<string name="solver_pdia_title" translatable="false">Pyraminx Diamond Solver</string> |
197 | 208 |
|
198 | 209 |
<string name="solver_cube3_description">A near-perfect, instantaneous, two-phase 3x3x3 solver.\nAuthor: Herbert Kociemba.</string> |
... | ... | |
204 | 215 |
<string name="solver_cube2_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string> |
205 | 216 |
<string name="solver_skew2_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string> |
206 | 217 |
<string name="solver_jing2_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string> |
207 |
<string name="solver_dino6_description">Not implemented yet.\nAuthor: Leszek Koltunski.</string> |
|
218 |
<string name="solver_dino6_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string> |
|
219 |
<string name="solver_dino4_description">A perfect, instantaneous solver.\nAuthor: Leszek Koltunski.</string> |
|
208 | 220 |
<string name="solver_pdia_description">Not implemented yet.\nAuthor: Leszek Koltunski.</string> |
209 | 221 |
|
210 | 222 |
<string name="email_address" translatable="false">app.magic.cube@gmail.com</string> |
Also available in: Unified diff
Dino4 solver: skeleton.