commit 8c8a9fb9657bc0c93831eabc4e9f0e5bf352033a
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Apr 17 00:56:19 2023 +0200

    CU_323 solver: progress

diff --git a/src/main/java/org/distorted/solvers/SolverCuboid323.java b/src/main/java/org/distorted/solvers/SolverCuboid323.java
index 01da6e2d..7d290dce 100644
--- a/src/main/java/org/distorted/solvers/SolverCuboid323.java
+++ b/src/main/java/org/distorted/solvers/SolverCuboid323.java
@@ -16,7 +16,6 @@ import org.distorted.objectlib.helpers.OperatingSystemInterface;
 import org.distorted.objectlib.main.ObjectSignatures;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
-import org.distorted.objectlib.tablebases.TablebaseHelpers;
 import org.distorted.objectlib.tablebases.TablebasesAbstract;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -32,6 +31,7 @@ public class SolverCuboid323 extends SolverTablebase
   TablebasesAbstract mSolver;
   private final int[] mFaceColors;
   private int mErrorColor1, mErrorColor2, mErrorColor3;
+  private boolean mUpper;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -150,112 +150,239 @@ public class SolverCuboid323 extends SolverTablebase
     return 0;
     }
 
-////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private int computeFaceColors(int[][] corners, int[][] edges, int[] centers)
+  private int[] correctEdgePerm(int[] perm)
     {
-    mFaceColors[2] = centers[0];
-    mFaceColors[3] = centers[1];
+    int[] ret = new int[3];
+
+    ret[0] = perm[0];
+    ret[1] = perm[2];
+    ret[2] = perm[3];
+
+    if( ret[0]>1 ) ret[0]--;
+    if( ret[1]>1 ) ret[1]--;
+    if( ret[2]>1 ) ret[2]--;
 
-         if( edges[1][1]==mFaceColors[2] ) mFaceColors[4] = edges[1][0];
-    else if( edges[1][1]==mFaceColors[2] ) mFaceColors[4] = edges[1][0];
+    return ret;
+    }
 
-         if( edges[0][0]==mFaceColors[1] ) mFaceColors[5] = edges[0][1];
-    else if( edges[2][0]==mFaceColors[1] ) mFaceColors[5] = edges[2][1];
-    else if( edges[3][0]==mFaceColors[1] ) mFaceColors[5] = edges[3][1];
-    else return ERROR_EDGE_TWISTED;
+///////////////////////////////////////////////////////////////////////////////////////////////////
 
-         if( edges[0][1]==mFaceColors[4] ) mFaceColors[0] = edges[0][0];
-    else if( edges[2][1]==mFaceColors[4] ) mFaceColors[0] = edges[2][0];
-    else if( edges[3][1]==mFaceColors[4] ) mFaceColors[0] = edges[3][0];
-    else return ERROR_EDGE_TWISTED;
+  public SolverCuboid323(OperatingSystemInterface os, Resources res, TwistyObject object)
+    {
+    super(os,res,object);
+    mFaceColors = new int[6];
+    }
 
-    boolean found2 = false;
-    boolean found3 = false;
+////////////////////////////////////////////////////////////////////////////////////////
 
-    for(int c=0; c<8; c++)
+  private int findCorner(int[][] corners, int c1, int c2)
+    {
+    for(int i=0; i<8; i++)
       {
-      if( !found3 && corners[c][1]==mFaceColors[4] && corners[c][2]==mFaceColors[1] )
+      int[] c = corners[i];
+
+      if( c[0]==c1 && c[1]==c2 ) return c[2];
+      if( c[1]==c1 && c[2]==c2 ) return c[0];
+      if( c[2]==c1 && c[0]==c2 ) return c[1];
+      }
+
+    return ERROR_CORNERS_CANNOT;
+    }
+
+////////////////////////////////////////////////////////////////////////////////////////
+
+  private int missingColor()
+    {
+    boolean[] present = new boolean[6];
+    for(int i=0; i<5; i++) present[mFaceColors[i]] = true;
+
+    int indexFalse = -1;
+
+    for(int i=0; i<6; i++)
+      if( !present[i] )
         {
-        found3=true;
-        mFaceColors[3] = corners[c][0];
+        if( indexFalse<0 ) indexFalse=i;
+        else return ERROR_CORNERS_CANNOT;
         }
-      if( !found2 && corners[c][1]==mFaceColors[1] && corners[c][2]==mFaceColors[4] )
+
+    return indexFalse;
+    }
+
+////////////////////////////////////////////////////////////////////////////////////////
+
+  private int edgePresent(int[][] edges, int f0, int f1)
+    {
+    int c0 = mFaceColors[f0];
+    int c1 = mFaceColors[f1];
+
+    for(int[] edge : edges)
+      {
+      if( edge[0]==c0 && edge[1]==c1 )
+        return 0;
+      if( edge[0]==c1 && edge[1]==c0 )
         {
-        found2=true;
-        mFaceColors[2] = corners[c][0];
+        mErrorColor1 = c0;
+        mErrorColor2 = c1;
+        return ERROR_EDGE_TWISTED;
         }
       }
 
-    if( !found2 || !found3 ) return ERROR_CORNERS_CANNOT;
+    mErrorColor1 = c0;
+    mErrorColor2 = c1;
+    return ERROR_EDGE_MISSING;
+    }
 
-    for(int i=0; i<6; i++)
-      for(int j=i+1; j<6; j++)
-        if( mFaceColors[i]==mFaceColors[j] ) return ERROR_CORNERS_CANNOT;
+////////////////////////////////////////////////////////////////////////////////////////
 
-    return 0;
+  private int cornerPresent(int[][] corners, int f0, int f1, int f2)
+    {
+    int c0 = mFaceColors[f0];
+    int c1 = mFaceColors[f1];
+    int c2 = mFaceColors[f2];
+
+    for(int[] corner : corners )
+      {
+      if(  corner[0]==c0 && corner[1]==c1 && corner[2]==c2 ) return 0;
+      if( (corner[0]==c1 && corner[1]==c2 && corner[2]==c0 ) ||
+          (corner[0]==c2 && corner[1]==c0 && corner[2]==c1 )  )
+        {
+        mErrorColor1 = c0;
+        mErrorColor2 = c1;
+        mErrorColor3 = c2;
+        return ERROR_CORNER_TWISTED;
+        }
+      }
+
+    mErrorColor1 = c0;
+    mErrorColor2 = c1;
+    mErrorColor3 = c2;
+    return ERROR_CORNER_MISSING;
     }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////
 
-  private int[] correctEdgePerm(int[] perm)
+  private int checkAllEdgesPresent(int[][] edges)
     {
-    int[] ret = new int[3];
+    int result;
+
+    result = edgePresent(edges,0,2);
+    if( result<0 ) return result;
+    result = edgePresent(edges,1,2);
+    if( result<0 ) return result;
+    result = edgePresent(edges,4,2);
+    if( result<0 ) return result;
+    result = edgePresent(edges,5,2);
+    if( result<0 ) return result;
+    result = edgePresent(edges,0,3);
+    if( result<0 ) return result;
+    result = edgePresent(edges,1,3);
+    if( result<0 ) return result;
+    result = edgePresent(edges,4,3);
+    if( result<0 ) return result;
+    result = edgePresent(edges,5,3);
+    if( result<0 ) return result;
 
-    ret[0] = perm[0];
-    ret[1] = perm[2];
-    ret[2] = perm[3];
+    return 0;
+    }
 
-    if( ret[0]>1 ) ret[0]--;
-    if( ret[1]>1 ) ret[1]--;
-    if( ret[2]>1 ) ret[2]--;
+////////////////////////////////////////////////////////////////////////////////////////
 
-    return ret;
+  private int checkAllCornersPresent(int[][] corners)
+    {
+    int result;
+
+    result = cornerPresent(corners,0,4,2);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,5,0,2);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,1,5,2);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,4,1,2);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,4,0,3);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,0,5,3);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,5,1,3);
+    if( result<0 ) return result;
+    result = cornerPresent(corners,1,4,3);
+    if( result<0 ) return result;
+
+    return 0;
     }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////
 
-  public SolverCuboid323(OperatingSystemInterface os, Resources res, TwistyObject object)
+  private int computeFaceColors(int[][] corners, int[][] edges, int[] centers)
     {
-    super(os,res,object);
-    mFaceColors = new int[6];
+    mFaceColors[2] = centers[0];
+    mFaceColors[3] = centers[1];
+
+    if( edges[1][1]==mFaceColors[2] )
+      {
+      mUpper = true;
+      mFaceColors[4] = edges[1][0];
+      }
+    else if( edges[3][1]==mFaceColors[2] )
+      {
+      mUpper = true;
+      mFaceColors[4] = edges[3][0];
+      }
+    else
+      {
+      mUpper = false;
+      mFaceColors[4] = edges[3][0];
+      }
+
+    mFaceColors[0] = findCorner(corners,mFaceColors[4],mFaceColors[2]);
+    if( mFaceColors[0]<0 ) return mFaceColors[0];
+
+    mFaceColors[1] = findCorner(corners,mFaceColors[2],mFaceColors[4]);
+    if( mFaceColors[1]<0 ) return mFaceColors[1];
+
+    mFaceColors[5] = missingColor();
+    if( mFaceColors[5]<0 ) return mFaceColors[5];
+
+    return 0;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   private void getCorners(TwistyObject object, int[][] corners)
     {
-    corners[0][0] = object.getCubitFaceStickerIndex(0,1);
-    corners[0][1] = object.getCubitFaceStickerIndex(0,3);
-    corners[0][2] = object.getCubitFaceStickerIndex(0,5);
+    corners[0][0] = object.getCubitFaceStickerIndex(0,5);
+    corners[0][1] = object.getCubitFaceStickerIndex(0,1);
+    corners[0][2] = object.getCubitFaceStickerIndex(0,3);
 
     corners[1][0] = object.getCubitFaceStickerIndex(1,3);
-    corners[1][1] = object.getCubitFaceStickerIndex(1,1);
-    corners[1][2] = object.getCubitFaceStickerIndex(1,5);
+    corners[1][1] = object.getCubitFaceStickerIndex(1,5);
+    corners[1][2] = object.getCubitFaceStickerIndex(1,1);
 
     corners[2][0] = object.getCubitFaceStickerIndex(2,5);
-    corners[2][1] = object.getCubitFaceStickerIndex(2,3);
-    corners[2][2] = object.getCubitFaceStickerIndex(2,1);
+    corners[2][1] = object.getCubitFaceStickerIndex(2,1);
+    corners[2][2] = object.getCubitFaceStickerIndex(2,3);
 
-    corners[3][0] = object.getCubitFaceStickerIndex(3,1);
-    corners[3][1] = object.getCubitFaceStickerIndex(3,3);
-    corners[3][2] = object.getCubitFaceStickerIndex(3,5);
+    corners[3][0] = object.getCubitFaceStickerIndex(3,5);
+    corners[3][1] = object.getCubitFaceStickerIndex(3,1);
+    corners[3][2] = object.getCubitFaceStickerIndex(3,3);
 
     corners[4][0] = object.getCubitFaceStickerIndex(4,1);
-    corners[4][1] = object.getCubitFaceStickerIndex(4,5);
-    corners[4][2] = object.getCubitFaceStickerIndex(4,3);
+    corners[4][1] = object.getCubitFaceStickerIndex(4,3);
+    corners[4][2] = object.getCubitFaceStickerIndex(4,5);
 
-    corners[5][0] = object.getCubitFaceStickerIndex(5,1);
-    corners[5][1] = object.getCubitFaceStickerIndex(5,3);
-    corners[5][2] = object.getCubitFaceStickerIndex(5,5);
+    corners[5][0] = object.getCubitFaceStickerIndex(5,5);
+    corners[5][1] = object.getCubitFaceStickerIndex(5,1);
+    corners[5][2] = object.getCubitFaceStickerIndex(5,3);
 
-    corners[6][0] = object.getCubitFaceStickerIndex(6,1);
-    corners[6][1] = object.getCubitFaceStickerIndex(6,3);
-    corners[6][2] = object.getCubitFaceStickerIndex(6,5);
+    corners[6][0] = object.getCubitFaceStickerIndex(6,5);
+    corners[6][1] = object.getCubitFaceStickerIndex(6,1);
+    corners[6][2] = object.getCubitFaceStickerIndex(6,3);
 
     corners[7][0] = object.getCubitFaceStickerIndex(7,1);
-    corners[7][1] = object.getCubitFaceStickerIndex(7,5);
-    corners[7][2] = object.getCubitFaceStickerIndex(7,3);
+    corners[7][1] = object.getCubitFaceStickerIndex(7,3);
+    corners[7][2] = object.getCubitFaceStickerIndex(7,5);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -300,8 +427,19 @@ public class SolverCuboid323 extends SolverTablebase
     getEdges(object,edges);
     getCenters(object,centers);
 
+for(int i=0; i<8; i++) android.util.Log.e("D", "corner: "+i+" : "+corners[i][0]+" "+corners[i][1]+" "+corners[i][2]);
+
     int result0 = computeFaceColors(corners, edges, centers);
     if( result0<0 ) return result0;
+
+    int result1 = checkAllEdgesPresent(edges);
+    if( result1<0 ) return result1;
+
+    int result2 = checkAllCornersPresent(corners);
+    if( result2<0 ) return result2;
+
+android.util.Log.e("D", "upper: "+mUpper);
+for(int i=0; i<6; i++) android.util.Log.e("D", "face color: "+mFaceColors[i]);
 /*
     int[] corner_perm = new int[8];
     int result1 = retCornerPermutation(corner_perm,corners);
@@ -324,9 +462,9 @@ public class SolverCuboid323 extends SolverTablebase
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private int getColorIndex4(int face)
+  private int getColorIndex4(int color)
     {
-    switch(mFaceColors[face])
+    switch(color)
       {
       case 0: return R.string.color_yellow4;
       case 1: return R.string.color_white4;
@@ -341,9 +479,9 @@ public class SolverCuboid323 extends SolverTablebase
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private int getColorIndex3(int face)
+  private int getColorIndex3(int color)
     {
-    switch(mFaceColors[face])
+    switch(color)
       {
       case 0: return R.string.color_yellow3;
       case 1: return R.string.color_white3;
@@ -358,9 +496,26 @@ public class SolverCuboid323 extends SolverTablebase
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private int getColorIndex6(int face)
+  private int getColorIndex5(int color)
+    {
+    switch(color)
+      {
+      case 0: return R.string.color_yellow5;
+      case 1: return R.string.color_white5;
+      case 2: return R.string.color_blue5;
+      case 3: return R.string.color_green5;
+      case 4: return R.string.color_red5;
+      case 5: return R.string.color_orange5;
+      }
+
+    return -1;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private int getColorIndex6(int color)
     {
-    switch(mFaceColors[face])
+    switch(color)
       {
       case 0: return R.string.color_yellow6;
       case 1: return R.string.color_white6;
@@ -375,10 +530,38 @@ public class SolverCuboid323 extends SolverTablebase
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private String edgeError(Resources res, int face0, int face1)
+  private String edgeTwistedError(Resources res, int color0, int color1)
+    {
+    int j0 = getColorIndex3(color0);
+    int j1 = getColorIndex6(color1);
+
+    String c0 = res.getString(j0);
+    String c1 = res.getString(j1);
+
+    return res.getString(R.string.solver_generic_twisted_edge,c0,c1);
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private String cornerTwistedError(Resources res, int color0, int color1, int color2)
+    {
+    int j0 = getColorIndex3(color0);
+    int j1 = getColorIndex3(color1);
+    int j2 = getColorIndex5(color2);
+
+    String c0 = res.getString(j0);
+    String c1 = res.getString(j1);
+    String c2 = res.getString(j2);
+
+    return res.getString(R.string.solver_generic_twisted_corner,c0,c1,c2);
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private String edgeMissingError(Resources res, int color0, int color1)
     {
-    int j0 = getColorIndex3(face0);
-    int j1 = getColorIndex6(face1);
+    int j0 = getColorIndex3(color0);
+    int j1 = getColorIndex6(color1);
 
     String c0 = res.getString(j0);
     String c1 = res.getString(j1);
@@ -388,11 +571,11 @@ public class SolverCuboid323 extends SolverTablebase
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  private String cornerError(Resources res, int face0, int face1, int face2)
+  private String cornerMissingError(Resources res, int color0, int color1, int color2)
     {
-    int j0 = getColorIndex3(face0);
-    int j1 = getColorIndex3(face1);
-    int j2 = getColorIndex4(face2);
+    int j0 = getColorIndex3(color0);
+    int j1 = getColorIndex3(color1);
+    int j2 = getColorIndex4(color2);
 
     String c0 = res.getString(j0);
     String c1 = res.getString(j1);
@@ -407,11 +590,11 @@ public class SolverCuboid323 extends SolverTablebase
     {
     switch(index)
       {
-      case ERROR_CORNER_MISSING : return cornerError(res,mErrorColor1,mErrorColor2,mErrorColor3);
-      case ERROR_EDGE_MISSING   : return edgeError(res,mErrorColor1,mErrorColor2);
+      case ERROR_CORNER_MISSING : return cornerMissingError(res,mErrorColor1,mErrorColor2,mErrorColor3);
+      case ERROR_EDGE_MISSING   : return edgeMissingError(res,mErrorColor1,mErrorColor2);
       case ERROR_CORNERS_CANNOT : return res.getString(R.string.solver_generic_corners_cannot);
-      case ERROR_EDGE_TWISTED   : return res.getString(R.string.solver_generic_edge_twist);
-      case ERROR_CORNER_TWISTED : return res.getString(R.string.solver_generic_corner_twist);
+      case ERROR_EDGE_TWISTED   : return edgeTwistedError(res,mErrorColor1,mErrorColor2);
+      case ERROR_CORNER_TWISTED : return cornerTwistedError(res,mErrorColor1,mErrorColor2,mErrorColor3);
       }
 
     return null;
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index afbfb6ea..e5531a31 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -93,6 +93,7 @@
     <string name="solver_generic_missing_vertex">Der %1$s-%2$s-%3$s Oktaeder fehlt!</string>
     <string name="solver_generic_missing_edge">Die %1$s-%2$s Kante fehlt!</string>
     <string name="solver_generic_twisted_edge">Die Kante %1$s-%2$s muss verdreht werden!</string>
+    <string name="solver_generic_twisted_corner">Die Ecke %1$s-%2$s-%3$s muss verdreht werden!</string>
     <string name="solver_generic_missing_corner2">Die %1$s-%2$s Ecke fehlt!</string>
     <string name="solver_generic_corners_cannot">Ecken können nicht verdreht werden, sodass alle Seiten einfarbig sind!</string>
     <string name="solver_generic_vertices_cannot">Oktaederstücke können nicht so verdreht werden, sodass alle Seiten einfarbig sind!</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 6ee1a9e5..f29b219a 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -93,6 +93,7 @@
     <string name="solver_generic_missing_vertex">¡Falta el octaedro %1$s-%2$s-%3$s!</string>
     <string name="solver_generic_missing_edge">¡Falta la pieza del borde %1$s-%2$s!</string>
     <string name="solver_generic_twisted_edge">¡El borde %1$s-%2$s necesita ser retorcido!</string>
+    <string name="solver_generic_twisted_corner">¡La esquina %1$s-%2$s-%3$s necesita ser retorcido!</string>
     <string name="solver_generic_missing_corner2">¡Falta la esquina %1$s-%2$s!</string>
     <string name="solver_generic_corners_cannot">¡Las esquinas no se pueden torcer para que todos los lados sean monocromáticos!</string>
     <string name="solver_generic_vertices_cannot">¡Las piezas octaédricas no se pueden torcer para que todos los lados sean monocromáticos!</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 9909dd04..ffec0e54 100755
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -93,6 +93,7 @@
     <string name="solver_generic_missing_vertex">L\'octaèdre %1$s-%2$s-%3$s manque !</string>
     <string name="solver_generic_missing_edge">La pièce de bordure %1$s-%2$s manque!</string>
     <string name="solver_generic_twisted_edge">Le bord %1$s-%2$s doit être tordu !</string>
+    <string name="solver_generic_twisted_corner">Le coin %1$s-%2$s-%3$s doit être tordu !</string>
     <string name="solver_generic_missing_corner2">Coin %1$s-%2$s manquant !</string>
     <string name="solver_generic_corners_cannot">Les coins ne peuvent pas être tordus afin que tous les côtés soient monochromes !</string>
     <string name="solver_generic_vertices_cannot">Les pièces octaédriques ne peuvent pas être tordues afin que tous les côtés soient monochromes !</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 11d7a3de..52d25e33 100755
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -93,6 +93,7 @@
     <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_twisted_edge">%1$s-%2$s エッジをねじる必要があります!</string>
+    <string name="solver_generic_twisted_corner">%1$s-%2$s-%3$s の角をねじる必要があります!</string>
     <string name="solver_generic_missing_corner2">%1$s%2$sのコーナーがない！</string>
     <string name="solver_generic_corners_cannot">すべての面がモノクロになるようにコーナーをねじることはできません。</string>
     <string name="solver_generic_vertices_cannot">すべての面が単色になるように、八面体のピースをねじることはできません。</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 865b4e40..ca8f9a1a 100755
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -93,6 +93,7 @@
     <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_twisted_edge">%1$s-%2$s 가장자리를 꼬아야 합니다!</string>
+    <string name="solver_generic_twisted_corner">%1$s-%2$s-%3$s 모서리를 비틀어야 합니다!</string>
     <string name="solver_generic_missing_corner2">%1$s-%2$s 모서리 금지!</string>
     <string name="solver_generic_corners_cannot">모든면이 단색이되도록 모서리를 비틀 수 없습니다!</string>
     <string name="solver_generic_vertices_cannot">팔면체 조각은 뒤틀릴 수 없으므로 모든면이 단색입니다!</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index ed83799d..562199b5 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -93,6 +93,7 @@
     <string name="solver_generic_missing_vertex">Brakuje %1$s-%2$s-%3$s ośmiokątu!</string>
     <string name="solver_generic_missing_edge">Brakuje %1$s-%2$s krawędzi!</string>
     <string name="solver_generic_twisted_edge">Krawędz %1$s-%2$s musi byc obrócona!</string>
+    <string name="solver_generic_twisted_corner">Róg %1$s-%2$s-%3$s musi byc obrócony!</string>
     <string name="solver_generic_missing_corner2">Brakuje %1$s-%2$s rogu!</string>
     <string name="solver_generic_corners_cannot">Narożników nie da się skręcić tak, aby wszystkie boki były monochromatyczne!</string>
     <string name="solver_generic_vertices_cannot">Części ośmiościennych nie da się skręcić tak, aby wszystkie boki były monochromatyczne!</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 5cfdeb9a..a4b75eee 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -93,6 +93,7 @@
     <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_twisted_edge">Ребрo %1$s-%2$s нужно скрутить!</string>
+    <string name="solver_generic_twisted_corner">Угол %1$s-%2$s-%3$s нужно скрутить!</string>
     <string name="solver_generic_missing_corner2">Нет %1$s-%2$s угла!</string>
     <string name="solver_generic_corners_cannot">Углы нельзя скручивать так, чтобы все стороны были однотонными!</string>
     <string name="solver_generic_vertices_cannot">Восьмигранные фигуры нельзя скрутить так, чтобы все стороны были однотонными!</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 0a34728e..9bcf651f 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -99,6 +99,7 @@
     <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_twisted_edge">边缘 %1$s-%2$s 需要扭曲！</string>
+    <string name="solver_generic_twisted_corner">%1$s-%2$s-%3$s 角需要扭曲！</string>
     <string name="solver_generic_missing_corner2">没有%1$s-%2$s的角落！</string>
     <string name="solver_generic_corners_cannot">角不能扭曲，这样所有的面都是单色的！</string>
     <string name="solver_generic_vertices_cannot">八面体块不能扭曲，所以所有面都是单色的！</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 0e144113..5bb6e10d 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -93,6 +93,7 @@
     <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_twisted_edge">邊緣 %1$s-%2$s 需要扭曲！</string>
+    <string name="solver_generic_twisted_corner">%1$s-%2$s-%3$s 角需要扭曲！</string>
     <string name="solver_generic_missing_corner2">沒有%1$s-%2$s的角落!</string>
     <string name="solver_generic_corners_cannot">角不能扭曲，這樣所有的面都是單色的！</string>
     <string name="solver_generic_vertices_cannot">八面體塊不能扭曲，所以所有面都是單色的！</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 11001109..61b4d19a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -113,6 +113,7 @@
     <string name="solver_generic_missing_vertex">The %1$s-%2$s-%3$s octahedron piece is missing!</string>
     <string name="solver_generic_missing_edge">The %1$s-%2$s edge is missing!</string>
     <string name="solver_generic_twisted_edge">The %1$s-%2$s edge needs to be twisted!</string>
+    <string name="solver_generic_twisted_corner">The %1$s-%2$s-%3$s corner needs to be twisted!</string>
     <string name="solver_generic_missing_corner2">The %1$s-%2$s corner is missing!</string>
     <string name="solver_generic_corners_cannot">Corners cannot be twisted so that all faces are monochromatic!</string>
     <string name="solver_generic_vertices_cannot">Octahedral pieces cannot be twisted so that all faces are monochromatic!</string>