commit 379ba26d22279808061044f84f1c9513108003cf
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Wed Mar 1 10:24:55 2023 +0100

    Solver: new error strings.

diff --git a/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java b/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
index 33d4a8d8..b1185e09 100644
--- a/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
+++ b/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
@@ -49,10 +49,75 @@ public class SolverSkewbDiamond extends SolverTablebase
     super(res,object);
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private int checkAllCentersPresent(int[] centers)
+    {
+    return 0;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void getCorners(TwistyObject object, int[][] corners)
+    {
+    corners[0][0] = object.getCubitFaceStickerIndex( 0,0); // FR
+    corners[0][1] = object.getCubitFaceStickerIndex( 0,1);
+    corners[0][2] = object.getCubitFaceStickerIndex( 0,5);
+    corners[0][3] = object.getCubitFaceStickerIndex( 0,4);
+
+    corners[1][0] = object.getCubitFaceStickerIndex( 1,1); // BR
+    corners[1][1] = object.getCubitFaceStickerIndex( 1,2);
+    corners[1][2] = object.getCubitFaceStickerIndex( 1,6);
+    corners[1][3] = object.getCubitFaceStickerIndex( 1,5);
+
+    corners[2][0] = object.getCubitFaceStickerIndex( 2,2); // BL
+    corners[2][1] = object.getCubitFaceStickerIndex( 2,3);
+    corners[2][2] = object.getCubitFaceStickerIndex( 2,7);
+    corners[2][3] = object.getCubitFaceStickerIndex( 2,6);
+
+    corners[3][0] = object.getCubitFaceStickerIndex( 3,3); // FL
+    corners[3][1] = object.getCubitFaceStickerIndex( 3,0);
+    corners[3][2] = object.getCubitFaceStickerIndex( 3,4);
+    corners[3][3] = object.getCubitFaceStickerIndex( 3,7);
+
+    corners[4][0] = object.getCubitFaceStickerIndex( 4,0); // U
+    corners[4][1] = object.getCubitFaceStickerIndex( 4,3);
+    corners[4][2] = object.getCubitFaceStickerIndex( 4,2);
+    corners[4][3] = object.getCubitFaceStickerIndex( 4,1);
+
+    corners[5][0] = object.getCubitFaceStickerIndex( 5,6); // D
+    corners[5][1] = object.getCubitFaceStickerIndex( 5,7);
+    corners[5][2] = object.getCubitFaceStickerIndex( 5,4);
+    corners[5][3] = object.getCubitFaceStickerIndex( 5,5);
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private void getCenters(TwistyObject object, int[] centers)
+    {
+    centers[0] = object.getCubitFaceStickerIndex( 6,0); // UR
+    centers[1] = object.getCubitFaceStickerIndex( 8,0); // UL
+    centers[2] = object.getCubitFaceStickerIndex(11,0); // DB
+    centers[3] = object.getCubitFaceStickerIndex(13,0); // DF
+    centers[4] = object.getCubitFaceStickerIndex( 9,0); // UF
+    centers[5] = object.getCubitFaceStickerIndex( 7,0); // UB
+    centers[6] = object.getCubitFaceStickerIndex(12,0); // DL
+    centers[7] = object.getCubitFaceStickerIndex(10,1); // DR
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public int tablebaseIndex(TwistyObject object)
     {
+    int[][] corners = new int[6][4];
+    int[] centers = new int[8];
+
+    getCorners(object,corners);
+    getCenters(object,centers);
+
+    int result1 = checkAllCentersPresent(centers);
+    if( result1<0 ) return result1;
+
     return 0;
     }
 
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 87dc258a..d53e4d69 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -106,6 +106,8 @@
     <string name="color_green1">grüne</string>
     <string name="color_red1">rote</string>
     <string name="color_orange1">orange</string>
+    <string name="color_violet1">violette</string>
+    <string name="color_grey1">graue</string>
 
     <string name="color_yellow2">gelbe</string>
     <string name="color_white2">weiße</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">grüne</string>
     <string name="color_red2">rote</string>
     <string name="color_orange2">orange</string>
+    <string name="color_violet2">violette</string>
+    <string name="color_grey2">graue</string>
 
     <string name="color_yellow3">gelb</string>
     <string name="color_white3">weiß</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">grün</string>
     <string name="color_red3">rot</string>
     <string name="color_orange3">orange</string>
+    <string name="color_violet3">violett</string>
+    <string name="color_grey3">grau</string>
 
     <string name="color_yellow4">gelbe</string>
     <string name="color_white4">weiße</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">grüne</string>
     <string name="color_red4">rote</string>
     <string name="color_orange4">orange</string>
+    <string name="color_violet4">violette</string>
+    <string name="color_grey4">graue</string>
 
     <string name="color_yellow5">gelb</string>
     <string name="color_white5">weiß</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">grün</string>
     <string name="color_red5">rot</string>
     <string name="color_orange5">orange</string>
+    <string name="color_violet5">violett</string>
+    <string name="color_grey5">grau</string>
 
     <string name="color_yellow6">gelbe</string>
     <string name="color_white6">weiße</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">grüne</string>
     <string name="color_red6">rote</string>
     <string name="color_orange6">orange</string>
+    <string name="color_violet6">violette</string>
+    <string name="color_grey6">graue</string>
 
     <string name="solver_cube3_description">Ein nahezu perfekter, sofortiger, zweiphasiger 3x3x3-Löser.\nAutor: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">Ein perfekter, sofortiger Löser.\nAutor: Leszek Koltunski.</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c8b79b54..30171b3f 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -106,6 +106,8 @@
     <string name="color_green1">verdes</string>
     <string name="color_red1">rojos</string>
     <string name="color_orange1">naranjas</string>
+    <string name="color_violet1">violetas</string>
+    <string name="color_grey1">grises</string>
 
     <string name="color_yellow2">amarillo</string>
     <string name="color_white2">blanco</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">verde</string>
     <string name="color_red2">rojo</string>
     <string name="color_orange2">naranja</string>
+    <string name="color_violet2">violeta</string>
+    <string name="color_grey2">gris</string>
 
     <string name="color_yellow3">amarilla</string>
     <string name="color_white3">blanca</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">verde</string>
     <string name="color_red3">roja</string>
     <string name="color_orange3">naranja</string>
+    <string name="color_violet3">violeta</string>
+    <string name="color_grey3">gris</string>
 
     <string name="color_yellow4">amarilla</string>
     <string name="color_white4">blanca</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">verde</string>
     <string name="color_red4">roja</string>
     <string name="color_orange4">naranja</string>
+    <string name="color_violet4">violeta</string>
+    <string name="color_grey4">gris</string>
 
     <string name="color_yellow5">amarillo</string>
     <string name="color_white5">blanco</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">verde</string>
     <string name="color_red5">rojo</string>
     <string name="color_orange5">naranja</string>
+    <string name="color_violet5">violeta</string>
+    <string name="color_grey5">gris</string>
 
     <string name="color_yellow6">amarillo</string>
     <string name="color_white6">blanco</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">verde</string>
     <string name="color_red6">rojo</string>
     <string name="color_orange6">naranja</string>
+    <string name="color_violet6">violeta</string>
+    <string name="color_grey6">gris</string>
 
     <string name="solver_cube3_description">Un 3x3x3 solucionador casi perfecto, instantáneo, de dos fases.\nAutor: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">Un solucionador perfecto e instantáneo.\nAutor: Leszek Koltunski.</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index c970014f..c9c7972f 100755
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -106,6 +106,8 @@
     <string name="color_green1">vertes</string>
     <string name="color_red1">rouges</string>
     <string name="color_orange1">orange</string>
+    <string name="color_violet1">violettes</string>
+    <string name="color_grey1">grises</string>
 
     <string name="color_yellow2">jaune</string>
     <string name="color_white2">blanc</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">vert</string>
     <string name="color_red2">rouge</string>
     <string name="color_orange2">orange</string>
+    <string name="color_violet2">violet</string>
+    <string name="color_grey2">gris</string>
 
     <string name="color_yellow3">jaune</string>
     <string name="color_white3">blanc</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">vert</string>
     <string name="color_red3">rouge</string>
     <string name="color_orange3">orange</string>
+    <string name="color_violet3">violet</string>
+    <string name="color_grey3">gris</string>
 
     <string name="color_yellow4">jaune</string>
     <string name="color_white4">blanc</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">vert</string>
     <string name="color_red4">rouge</string>
     <string name="color_orange4">orange</string>
+    <string name="color_violet4">violet</string>
+    <string name="color_grey4">gris</string>
 
     <string name="color_yellow5">jaune</string>
     <string name="color_white5">blanc</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">vert</string>
     <string name="color_red5">rouge</string>
     <string name="color_orange5">orange</string>
+    <string name="color_violet5">violet</string>
+    <string name="color_grey5">gris</string>
 
     <string name="color_yellow6">jaune</string>
     <string name="color_white6">blanc</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">vert</string>
     <string name="color_red6">rouge</string>
     <string name="color_orange6">orange</string>
+    <string name="color_violet6">violet</string>
+    <string name="color_grey6">gris</string>
 
     <string name="solver_cube3_description">Un solveur 3x3x3 biphasé presque parfait, instantané.\nAuteur: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">Un solveur parfait et instantané.\nAuteur: Leszek Koltunski.</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 023c0ab7..18407f6a 100755
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -107,6 +107,8 @@
     <string name="color_green1">緑の</string>
     <string name="color_red1">赤い</string>
     <string name="color_orange1">オレンジ色の</string>
+    <string name="color_violet1">紫色の</string>
+    <string name="color_grey1">灰色の</string>
 
     <string name="color_yellow2">イエロー</string>
     <string name="color_white2">ホワイト</string>
@@ -114,6 +116,8 @@
     <string name="color_green2">グリーン</string>
     <string name="color_red2">レッド</string>
     <string name="color_orange2">オレンジ</string>
+    <string name="color_violet2">バイオレット</string>
+    <string name="color_grey2">グレー</string>
 
     <string name="color_yellow3">イエロー</string>
     <string name="color_white3">ホワイト</string>
@@ -121,6 +125,8 @@
     <string name="color_green3">グリーン</string>
     <string name="color_red3">レッド</string>
     <string name="color_orange3">オレンジ</string>
+    <string name="color_violet3">バイオレット</string>
+    <string name="color_grey3">グレー</string>
 
     <string name="color_yellow4">イエロー</string>
     <string name="color_white4">ホワイト</string>
@@ -128,6 +134,8 @@
     <string name="color_green4">グリーン</string>
     <string name="color_red4">レッド</string>
     <string name="color_orange4">オレンジ</string>
+    <string name="color_violet4">バイオレット</string>
+    <string name="color_grey4">グレー</string>
 
     <string name="color_yellow5">イエロー</string>
     <string name="color_white5">ホワイト</string>
@@ -135,6 +143,8 @@
     <string name="color_green5">グリーン</string>
     <string name="color_red5">レッド</string>
     <string name="color_orange5">オレンジ</string>
+    <string name="color_violet5">バイオレット</string>
+    <string name="color_grey5">グレー</string>
 
     <string name="color_yellow6">イエロー</string>
     <string name="color_white6">ホワイト</string>
@@ -142,6 +152,8 @@
     <string name="color_green6">グリーン</string>
     <string name="color_red6">レッド</string>
     <string name="color_orange6">オレンジ</string>
+    <string name="color_violet6">バイオレット</string>
+    <string name="color_grey6">グレー</string>
 
     <string name="solver_cube3_description">ほぼ完璧で瞬間的な 2 フェーズ 3x3x3 ソルバー。\n著者: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">完璧で瞬時のソルバー。\n著者: Leszek Koltunski.</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 327e958b..6887f1e9 100755
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -87,7 +87,7 @@
     <string name="solver_generic_missing_center">%1$s 중앙이 사라졌습니다!</string>
     <string name="solver_generic_missing_corner">%1$s-%2$s-%3$s 모서리 금지!</string>
     <string name="solver_generic_missing_vertex">%1$s-%2$s-%3$s 팔면체가 없습니다!</string>
-    <string name="solver_generic_missing_edge">%1$s%2$s테두리 조각이 없습니다!</string>
+    <string name="solver_generic_missing_edge">%1$s%2$s 테두리 조각이 없습니다!</string>
     <string name="solver_generic_corners_cannot">모든면이 단색이되도록 모서리를 비틀 수 없습니다!</string>
     <string name="solver_generic_vertices_cannot">팔면체 조각은 뒤틀릴 수 없으므로 모든면이 단색입니다!</string>
     <string name="solver_generic_c_v_dont_match">팔면체 조각과 사면체 모서리가 일치하지 않습니다!</string>
@@ -106,6 +106,8 @@
     <string name="color_green1">녹색의</string>
     <string name="color_red1">빨간</string>
     <string name="color_orange1">주황색</string>
+    <string name="color_violet1">제비꽃</string>
+    <string name="color_grey1">회색</string>
 
     <string name="color_yellow2">옐로우</string>
     <string name="color_white2">화이트</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">그린</string>
     <string name="color_red2">레드</string>
     <string name="color_orange2">오렌지</string>
+    <string name="color_violet2">제비꽃</string>
+    <string name="color_grey2">회색</string>
 
     <string name="color_yellow3">노란색</string>
     <string name="color_white3">흰색</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">그린</string>
     <string name="color_red3">빨간색</string>
     <string name="color_orange3">주황색</string>
+    <string name="color_violet3">제비꽃</string>
+    <string name="color_grey3">회색</string>
 
     <string name="color_yellow4">노란색</string>
     <string name="color_white4">흰색</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">그린</string>
     <string name="color_red4">빨간색</string>
     <string name="color_orange4">주황색</string>
+    <string name="color_violet4">제비꽃</string>
+    <string name="color_grey4">회색</string>
 
     <string name="color_yellow5">노란색</string>
     <string name="color_white5">흰색</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">그린</string>
     <string name="color_red5">빨간색</string>
     <string name="color_orange5">주황색</string>
+    <string name="color_violet5">제비꽃</string>
+    <string name="color_grey5">회색</string>
 
     <string name="color_yellow6">노란색</string>
     <string name="color_white6">흰색</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">그린</string>
     <string name="color_red6">빨간색</string>
     <string name="color_orange6">주황색</string>
+    <string name="color_violet6">제비꽃</string>
+    <string name="color_grey6">회색</string>
 
     <string name="solver_cube3_description">거의 완벽하고 즉각적인 2상 3x3x3 솔버입니다.\n작가: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">완벽하고 즉각적인 솔버.\n작가: Leszek Koltunski.</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a75b074f..00907ec1 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -106,6 +106,8 @@
     <string name="color_green1">zielonych</string>
     <string name="color_red1">czerwonych</string>
     <string name="color_orange1">pomarańczowych</string>
+    <string name="color_violet1">fioletowych</string>
+    <string name="color_grey1">szarych</string>
 
     <string name="color_yellow2">żółtego</string>
     <string name="color_white2">białego</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">zielonego</string>
     <string name="color_red2">czerwonego</string>
     <string name="color_orange2">pomarańczowego</string>
+    <string name="color_violet2">fioletowego</string>
+    <string name="color_grey2">szarego</string>
 
     <string name="color_yellow3">żółto</string>
     <string name="color_white3">biało</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">zielono</string>
     <string name="color_red3">czerwono</string>
     <string name="color_orange3">pomarańczowo</string>
+    <string name="color_violet3">fioletowo</string>
+    <string name="color_grey3">szaro</string>
 
     <string name="color_yellow4">żółtego</string>
     <string name="color_white4">białego</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">zielonego</string>
     <string name="color_red4">czerwonego</string>
     <string name="color_orange4">pomarańczowego</string>
+    <string name="color_violet4">fioletowego</string>
+    <string name="color_grey4">szarego</string>
 
     <string name="color_yellow5">żółte</string>
     <string name="color_white5">białe</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">zielone</string>
     <string name="color_red5">czerwone</string>
     <string name="color_orange5">pomarańczowe</string>
+    <string name="color_violet5">fioletowe</string>
+    <string name="color_grey5">szare</string>
 
     <string name="color_yellow6">żółtej</string>
     <string name="color_white6">białej</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">zielonej</string>
     <string name="color_red6">czerwonej</string>
     <string name="color_orange6">pomarańczowej</string>
+    <string name="color_violet6">fioletowej</string>
+    <string name="color_grey6">szarej</string>
 
     <string name="solver_cube3_description">Natychmiastowy, prawie perfekcyjny rozwiązywacz kostki 3x3x3.\nAutor: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">Perfekcyjny, natychmiastowy rozwiązywacz.\nAutor: Leszek Koltunski.</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e7205e6c..411dcacb 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -106,6 +106,8 @@
     <string name="color_green1">зеленых</string>
     <string name="color_red1">красных</string>
     <string name="color_orange1">оранжевых</string>
+    <string name="color_violet1">фиолетовых</string>
+    <string name="color_grey1">серых</string>
 
     <string name="color_yellow2">желтого</string>
     <string name="color_white2">белого</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">зеленого</string>
     <string name="color_red2">красного</string>
     <string name="color_orange2">оранжевого</string>
+    <string name="color_violet2">фиолетового</string>
+    <string name="color_grey2">серого</string>
 
     <string name="color_yellow3">желто</string>
     <string name="color_white3">бело</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">зелено</string>
     <string name="color_red3">красно</string>
     <string name="color_orange3">оранжево</string>
+    <string name="color_violet3">фиолетово</string>
+    <string name="color_grey3">серо</string>
 
     <string name="color_yellow4">желтого</string>
     <string name="color_white4">белого</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">зеленого</string>
     <string name="color_red4">красного</string>
     <string name="color_orange4">оранжевого</string>
+    <string name="color_violet4">фиолетового</string>
+    <string name="color_grey4">серого</string>
 
     <string name="color_yellow5">желтый</string>
     <string name="color_white5">белогый</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">зеленый</string>
     <string name="color_red5">красный</string>
     <string name="color_orange5">оранжевый</string>
+    <string name="color_violet5">фиолетовый</string>
+    <string name="color_grey5">серый</string>
 
     <string name="color_yellow6">желтого</string>
     <string name="color_white6">белого</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">зеленого</string>
     <string name="color_red6">красного</string>
     <string name="color_orange6">оранжевого</string>
+    <string name="color_violet6">фиолетового</string>
+    <string name="color_grey6">серого</string>
 
     <string name="solver_cube3_description">Практически идеальный, мгновенный, двухфазный решатель 3x3x3.\nАвтор: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">Идеальный, мгновенный решатель.\nАвтор: Leszek Koltunski.</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 61f4ec1e..ae02e02f 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -89,7 +89,7 @@
     <string name="solver_generic_corner_twist">一个角需要扭动！</string>
     <string name="solver_generic_edge_twist">一条边需要扭动！</string>
     <string name="solver_generic_two_centers">必须要交换两个中心！</string>
-    <string name="solver_generic_two_edges"></string>
+    <string name="solver_generic_two_edges">必须交换两个边缘！</string>
     <string name="solver_generic_missing_center">%1$s中心不見了！</string>
     <string name="solver_generic_missing_corner">没有%1$s-%2$s-%3$s的角落！</string>
     <string name="solver_generic_missing_vertex">没有%1$s-%2$s-%3$s八面体！</string>
@@ -112,6 +112,8 @@
     <string name="color_green1">绿色的</string>
     <string name="color_red1">红色的</string>
     <string name="color_orange1">橙色的</string>
+    <string name="color_violet1">紫色的</string>
+    <string name="color_grey1">灰色的</string>
 
     <string name="color_yellow2">黄色的</string>
     <string name="color_white2">白色的</string>
@@ -119,6 +121,8 @@
     <string name="color_green2">绿色的</string>
     <string name="color_red2">红色的</string>
     <string name="color_orange2">橙色的</string>
+    <string name="color_violet2">紫色的</string>
+    <string name="color_grey2">灰色的</string>
 
     <string name="color_yellow3">黄</string>
     <string name="color_white3">白</string>
@@ -126,6 +130,8 @@
     <string name="color_green3">绿</string>
     <string name="color_red3">红</string>
     <string name="color_orange3">橙</string>
+    <string name="color_violet3">紫</string>
+    <string name="color_grey3">灰</string>
 
     <string name="color_yellow4">黄色的</string>
     <string name="color_white4">白色的</string>
@@ -133,6 +139,8 @@
     <string name="color_green4">绿色的</string>
     <string name="color_red4">红色的</string>
     <string name="color_orange4">橙色的</string>
+    <string name="color_violet4">紫色的</string>
+    <string name="color_grey4">灰色的</string>
 
     <string name="color_yellow5">黄色的</string>
     <string name="color_white5">白色的</string>
@@ -140,6 +148,8 @@
     <string name="color_green5">绿色的</string>
     <string name="color_red5">红色的</string>
     <string name="color_orange5">橙色的</string>
+    <string name="color_violet5">紫色的</string>
+    <string name="color_grey5">灰色的</string>
 
     <string name="color_yellow6">黄色的</string>
     <string name="color_white6">白色的</string>
@@ -147,6 +157,8 @@
     <string name="color_green6">绿色的</string>
     <string name="color_red6">红色的</string>
     <string name="color_orange6">橙色的</string>
+    <string name="color_violet6">紫色的</string>
+    <string name="color_grey6">灰色的</string>
 
     <string name="solver_cube3_description">一个几乎完美的、瞬时的、两相的3x3x3解算器。\n作者: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">完美的即时求解器。\n作者: Leszek Koltunski.</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index b0bbe934..1bc8bdba 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -83,7 +83,7 @@
     <string name="solver_generic_corner_twist">一個角需要扭動！</string>
     <string name="solver_generic_edge_twist">一個邊緣要扭動！</string>
     <string name="solver_generic_two_centers">兩個中鋒要互換！</string>
-    <string name="solver_generic_two_edges"></string>
+    <string name="solver_generic_two_edges">必須交換兩個邊緣！</string>
     <string name="solver_generic_missing_center">%1$s的中心不见了！</string>
     <string name="solver_generic_missing_corner">沒有%1$s-%2$s-%3$s的角落!</string>
     <string name="solver_generic_missing_vertex">沒有%1$s-%2$s-%3$s八面體！</string>
@@ -106,6 +106,8 @@
     <string name="color_green1">綠色的</string>
     <string name="color_red1">紅色的</string>
     <string name="color_orange1">橙色的</string>
+    <string name="color_violet1">紫色的</string>
+    <string name="color_grey1">灰色的</string>
 
     <string name="color_yellow2">黃色的</string>
     <string name="color_white2">白色的</string>
@@ -113,6 +115,8 @@
     <string name="color_green2">綠色的</string>
     <string name="color_red2">紅色的</string>
     <string name="color_orange2">橙色的</string>
+    <string name="color_violet2">紫色的</string>
+    <string name="color_grey2">灰色的</string>
 
     <string name="color_yellow3">黃</string>
     <string name="color_white3">白</string>
@@ -120,6 +124,8 @@
     <string name="color_green3">綠</string>
     <string name="color_red3">紅</string>
     <string name="color_orange3">橙</string>
+    <string name="color_violet3">紫</string>
+    <string name="color_grey3">灰</string>
 
     <string name="color_yellow4">黃色的</string>
     <string name="color_white4">白色的</string>
@@ -127,6 +133,8 @@
     <string name="color_green4">綠色的</string>
     <string name="color_red4">紅色的</string>
     <string name="color_orange4">橙色的</string>
+    <string name="color_violet4">紫色的</string>
+    <string name="color_grey4">灰色的</string>
 
     <string name="color_yellow5">黃色的</string>
     <string name="color_white5">白色的</string>
@@ -134,6 +142,8 @@
     <string name="color_green5">綠色的</string>
     <string name="color_red5">紅色的</string>
     <string name="color_orange5">橙色的</string>
+    <string name="color_violet5">紫色的</string>
+    <string name="color_grey5">灰色的</string>
 
     <string name="color_yellow6">黃色的</string>
     <string name="color_white6">白色的</string>
@@ -141,6 +151,8 @@
     <string name="color_green6">綠色的</string>
     <string name="color_red6">紅色的</string>
     <string name="color_orange6">橙色的</string>
+    <string name="color_violet6">紫色的</string>
+    <string name="color_grey6">灰色的</string>
 
     <string name="solver_cube3_description">一個近乎完美的瞬時兩相 3x3x3 求解器。\n作者: Herbert Kociemba.</string>
     <string name="solver_pduo2_description">完美的即時求解器。\n作者: Leszek Koltunski.</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 45bee1ee..f6dd2cc1 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -126,6 +126,8 @@
     <string name="color_green1">green</string>
     <string name="color_red1">red</string>
     <string name="color_orange1">orange</string>
+    <string name="color_violet1">violet</string>
+    <string name="color_grey1">grey</string>
 
     <string name="color_yellow2">yellow</string>
     <string name="color_white2">white</string>
@@ -133,6 +135,8 @@
     <string name="color_green2">green</string>
     <string name="color_red2">red</string>
     <string name="color_orange2">orange</string>
+    <string name="color_violet2">violet</string>
+    <string name="color_grey2">grey</string>
 
     <string name="color_yellow3">yellow</string>
     <string name="color_white3">white</string>
@@ -140,6 +144,8 @@
     <string name="color_green3">green</string>
     <string name="color_red3">red</string>
     <string name="color_orange3">orange</string>
+    <string name="color_violet3">violet</string>
+    <string name="color_grey3">grey</string>
 
     <string name="color_yellow4">yellow</string>
     <string name="color_white4">white</string>
@@ -147,6 +153,8 @@
     <string name="color_green4">green</string>
     <string name="color_red4">red</string>
     <string name="color_orange4">orange</string>
+    <string name="color_violet4">violet</string>
+    <string name="color_grey4">grey</string>
 
     <string name="color_yellow5">yellow</string>
     <string name="color_white5">white</string>
@@ -154,6 +162,8 @@
     <string name="color_green5">green</string>
     <string name="color_red5">red</string>
     <string name="color_orange5">orange</string>
+    <string name="color_violet5">violet</string>
+    <string name="color_grey5">grey</string>
 
     <string name="color_yellow6">yellow</string>
     <string name="color_white6">white</string>
@@ -161,6 +171,8 @@
     <string name="color_green6">green</string>
     <string name="color_red6">red</string>
     <string name="color_orange6">orange</string>
+    <string name="color_violet6">violet</string>
+    <string name="color_grey6">grey</string>
 
     <string name="solver_cube3_title" translatable="false">Kociemba 3x3 Solver</string>
     <string name="solver_pduo2_title" translatable="false">Pyraminx Duo Solver</string>