From e220bdfd37bb08952e76b1b3e5409951605e755a Mon Sep 17 00:00:00 2001
From: Nicolas Camera <nico_camera98@hotmail.com>
Date: Sat, 15 Apr 2023 19:21:29 -0300
Subject: [PATCH] Actualizar internationalization

---
 .../binarios/internationalization/en.po       |  46 ++++++++++++++----
 .../en/LC_MESSAGES/mate-fun.mo                | Bin 8137 -> 8660 bytes
 .../binarios/internationalization/es.po       |  46 ++++++++++++++----
 .../es/LC_MESSAGES/mate-fun.mo                | Bin 8532 -> 9050 bytes
 4 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po
index 51bd0e98..445c24c9 100755
--- a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po	
+++ b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po	
@@ -329,10 +329,14 @@ msgstr "circ"
 msgid "color"
 msgstr "color"
 
-#: src/MateFun/ReservedNames.hs:52
+#: src/MateFun/ReservedNames.hs:64
 msgid "color3D"
 msgstr "color3D"
 
+#: src/MateFun/ReservedNames.hs:65
+msgid "transparency3D"
+msgstr "transparency3D"
+
 #: src/MateFun/TypeCheck.hs:92
 msgid "column"
 msgstr "column"
@@ -341,13 +345,25 @@ msgstr "column"
 msgid "cos"
 msgstr "cos"
 
-#: src/MateFun/ReservedNames.hs:49
+#: src/MateFun/ReservedNames.hs:51
+msgid "tetrahedron"
+msgstr "tetrahedron"
+
+#: src/MateFun/ReservedNames.hs:52
 msgid "cube"
-msgstr "cube"
+msgstr "prism"
+
+#: src/MateFun/ReservedNames.hs:53
+msgid "octahedron"
+msgstr "octahedron"
 
-#: src/MateFun/ReservedNames.hs:48
-msgid "cylinder"
-msgstr "cylinder"
+#: src/MateFun/ReservedNames.hs:54
+msgid "dodecahedron"
+msgstr "dodecahedron"
+
+#: src/MateFun/ReservedNames.hs:55
+msgid "icosahedron"
+msgstr "icosahedron"
 
 #: src/MateFun/Parser.hs:279
 msgid "depends on itself."
@@ -445,6 +461,14 @@ msgstr "join3D"
 msgid "line"
 msgstr "line"
 
+#: src/MateFun/TypeCheck.hs:85
+msgid "Two circles, two rectangles or two polygons are expected"
+msgstr "Two circles, two rectangles or two polygons are expected"
+
+#: src/MateFun/TypeCheck.hs:86
+msgid "Polygons are expected whose number of vertices matches"
+msgstr "Polygons are expected whose number of vertices matches"
+
 #: src/MateFun/ReservedNames.hs:36
 msgid "line2D"
 msgstr "segment"
@@ -530,8 +554,8 @@ msgid "reload actual program"
 msgstr "reload actual program"
 
 #: src/MateFun/ReservedNames.hs:108
-msgid "required is a subset of resulting"
-msgstr "required is a subset of resulting"
+msgid "obtained is not a subset of required"
+msgstr "obtained is not a subset of required"
 
 #: src/MateFun/ReservedNames.hs:60
 msgid "rest"
@@ -541,10 +565,14 @@ msgstr "rest"
 msgid "rgb"
 msgstr "rgb"
 
-#: src/MateFun/ReservedNames.hs:50
+#: src/MateFun/ReservedNames.hs:58
 msgid "ring"
 msgstr "ring"
 
+#: src/MateFun/ReservedNames.hs:61
+msgid "joinFigIn3D"
+msgstr "joinFigIn3D"
+
 #: src/MateFun/ReservedNames.hs:41
 msgid "rotate"
 msgstr "rotate"
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo
index 831188d3b124d9009101aabc63862d134d6e2ebd..b53df3184a5fc2b7c3c3889a2496786813bd5bda 100755
GIT binary patch
literal 8660
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

delta 3582
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

diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po
index 4a414c32..a6d4763b 100755
--- a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po	
+++ b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po	
@@ -331,10 +331,14 @@ msgstr "circ"
 msgid "color"
 msgstr "color"
 
-#: src/MateFun/ReservedNames.hs:52
+#: src/MateFun/ReservedNames.hs:64
 msgid "color3D"
 msgstr "color3D"
 
+#: src/MateFun/ReservedNames.hs:65
+msgid "transparency3D"
+msgstr "transparencia3D"
+
 #: src/MateFun/TypeCheck.hs:92
 msgid "column"
 msgstr "columna"
@@ -343,13 +347,25 @@ msgstr "columna"
 msgid "cos"
 msgstr "cos"
 
-#: src/MateFun/ReservedNames.hs:49
+#: src/MateFun/ReservedNames.hs:51
+msgid "tetrahedron"
+msgstr "tetraedro"
+
+#: src/MateFun/ReservedNames.hs:52
 msgid "cube"
-msgstr "cubo"
+msgstr "prisma"
+
+#: src/MateFun/ReservedNames.hs:53
+msgid "octahedron"
+msgstr "octaedro"
 
-#: src/MateFun/ReservedNames.hs:48
-msgid "cylinder"
-msgstr "cilindro"
+#: src/MateFun/ReservedNames.hs:54
+msgid "dodecahedron"
+msgstr "dodecaedro"
+
+#: src/MateFun/ReservedNames.hs:55
+msgid "icosahedron"
+msgstr "icosaedro"
 
 #: src/MateFun/Parser.hs:279
 msgid "depends on itself."
@@ -447,6 +463,14 @@ msgstr "juntar3D"
 msgid "line"
 msgstr "linea"
 
+#: src/MateFun/TypeCheck.hs:85
+msgid "Two circles, two rectangles or two polygons are expected"
+msgstr "Se esperan dos circulos, dos rectangulos o dos poligonos"
+
+#: src/MateFun/TypeCheck.hs:86
+msgid "Polygons are expected whose number of vertices matches"
+msgstr "Se esperan poligonos cuya cantidad de vertices coincida"
+
 #: src/MateFun/ReservedNames.hs:36
 msgid "line2D"
 msgstr "segmento"
@@ -532,8 +556,8 @@ msgid "reload actual program"
 msgstr "volver a cargar el programa actual"
 
 #: src/MateFun/ReservedNames.hs:108
-msgid "required is a subset of resulting"
-msgstr "requerido es subconjunto del resultante"
+msgid "obtained is not a subset of required"
+msgstr "obtenido no es subconjunto del requerido"
 
 #: src/MateFun/ReservedNames.hs:60
 msgid "rest"
@@ -543,10 +567,14 @@ msgstr "resto"
 msgid "rgb"
 msgstr "rgb"
 
-#: src/MateFun/ReservedNames.hs:50
+#: src/MateFun/ReservedNames.hs:58
 msgid "ring"
 msgstr "anillo"
 
+#: src/MateFun/ReservedNames.hs:61
+msgid "joinFigIn3D"
+msgstr "juntarFigEn3D"
+
 #: src/MateFun/ReservedNames.hs:41
 msgid "rotate"
 msgstr "rotar"
diff --git a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo
index 9ce2d08e52d339d4468d439a797d45bf008fd73a..be1028dc42270d035e1d37db71a454f8193e0237 100755
GIT binary patch
delta 4064
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

delta 3562
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

-- 
GitLab