commit f41d2652c3ab8e8ef2fe2645d76d047dc81581e9
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Feb 26 18:50:10 2023 +0100

    Pyraminx solver: error messages

diff --git a/src/main/java/org/distorted/solvers/SolverPyraminx.java b/src/main/java/org/distorted/solvers/SolverPyraminx.java
index 9e39c43a..5bc3c4a7 100644
--- a/src/main/java/org/distorted/solvers/SolverPyraminx.java
+++ b/src/main/java/org/distorted/solvers/SolverPyraminx.java
@@ -211,6 +211,13 @@ public class SolverPyraminx extends SolverTablebase
     return ( twist1!=twist2 || twist1!=twist3 ) ? -1 : twist1;
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private int computeEdgePermutation(int[] edge_permutation, int[][] edges)
+    {
+
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public SolverPyraminx(Resources res, TwistyObject object)
@@ -324,6 +331,10 @@ public class SolverPyraminx extends SolverTablebase
       if( vertex_twist[i]<0 ) return ERROR_VERTICES_CANNOT;
       }
 
+    int[] edge_permutation = new int[6];
+    int result5 = computeEdgePermutation(edge_permutation,edges);
+    if( result5<0 ) return result5;
+
     return 0;
     }
 
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 78019e8c..9e4b7aa2 100755
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -89,7 +89,7 @@
     <string name="solver_generic_missing_edge">Die %1$s-%2$s Kante 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>
-    <string name="solver_generic_c_v_dont_match"></string>
+    <string name="solver_generic_c_v_dont_match">Oktaederstücke und Tetraederecken passen nicht zusammen!</string>
 
     <string name="solver_cube3_error1">Es gibt nur %1$d %2$s Facelets.</string>
     <string name="solver_cube3_error2">Nicht alle 12 Kanten gibt es genau einmal!</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d42ca9c5..89bef480 100755
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -89,7 +89,7 @@
     <string name="solver_generic_missing_edge">¡Falta la pieza del borde %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>
-    <string name="solver_generic_c_v_dont_match"></string>
+    <string name="solver_generic_c_v_dont_match">¡Las piezas octaédricas y las esquinas tetraédricas no coinciden!</string>
 
     <string name="solver_cube3_error1">Solo hay %1$d facetas %2$s.</string>
     <string name="solver_cube3_error2">¡No todos los 12 bordes existen exactamente una vez!</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 0efb281a..1762c9df 100755
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -89,7 +89,7 @@
     <string name="solver_generic_missing_edge">La pièce de bordure %1$s-%2$s manque!</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>
-    <string name="solver_generic_c_v_dont_match"></string>
+    <string name="solver_generic_c_v_dont_match">Les pièces octaédriques et les coins tétraédriques ne correspondent pas !</string>
 
     <string name="solver_cube3_error1">Il n\'y a que %1$d facettes %2$s.</string>
     <string name="solver_cube3_error2">Les 12 arêtes n\'existent pas exactement une fois !</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 844e46da..0e13d1c6 100755
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -90,7 +90,7 @@
     <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>
+    <string name="solver_generic_c_v_dont_match">八面体のピースと四面体の角が一致しません!</string>
 
     <string name="solver_cube3_error1">%2$s小顔は%1$dつだけ</string>
     <string name="solver_cube3_error2">12 のエッジすべてが 存在するわけではありません。</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 46f5b188..162a961e 100755
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -89,7 +89,7 @@
     <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>
+    <string name="solver_generic_c_v_dont_match">팔면체 조각과 사면체 모서리가 일치하지 않습니다!</string>
 
     <string name="solver_cube3_error1">%2$s작은 얼굴은  %1$d개뿐입니다.</string>
     <string name="solver_cube3_error2">12개의 가장자리 모두가 정확하게 한 번 존재하지 않습니다!</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 10b687d0..ef19e8ff 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -89,7 +89,7 @@
     <string name="solver_generic_missing_edge">Brakuje %1$s-%2$s krawędzi!</string>
     <string name="solver_generic_corners_cannot">Narożników nie można skręcić tak, aby wszystkie boki były monochromatyczne!</string>
     <string name="solver_generic_vertices_cannot">Części ośmiościennych nie można skręcić tak, aby wszystkie boki były monochromatyczne!</string>
-    <string name="solver_generic_c_v_dont_match"></string>
+    <string name="solver_generic_c_v_dont_match">Części ośmiościenne i czworościenne rogi nie pasują do siebie!</string>
 
     <string name="solver_cube3_error1">Jest tylko %1$d %2$s ścian.</string>
     <string name="solver_cube3_error2">Któraś z 12 krawędzi nie istnieje!</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 3bc2c3ba..adfa7282 100755
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -89,7 +89,7 @@
     <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>
+    <string name="solver_generic_c_v_dont_match">Восьмигранные фигуры и четырехгранные углы не совпадают!</string>
 
     <string name="solver_cube3_error1">Всего %1$d %2$s граней!</string>
     <string name="solver_cube3_error2">Не все 12 ребер существуют в единичном экземпляре!</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index b88aa6bc..212e7682 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -95,7 +95,7 @@
     <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>
+    <string name="solver_generic_c_v_dont_match">八面体块和四面体角不匹配！</string>
 
     <string name="solver_cube3_error1">只有%1$d个%2$s小面</string>
     <string name="solver_cube3_error2">并非所有12条边都只存在一次！</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index aa9dba2c..3d51a3b0 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -89,7 +89,7 @@
     <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>
+    <string name="solver_generic_c_v_dont_match">八面體塊和四面體角不匹配！</string>
 
     <string name="solver_cube3_error1">只有%1$d個%2$s小臉</string>
     <string name="solver_cube3_error2">並非所有12條邊都只存在一次！</string>