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 51bd0e9815fc05c9fbbd74a04a02f9da785fd2bd..445c24c9182da28c1cf9a7047c1f1a93c3461ffc 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 Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo and b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en/LC_MESSAGES/mate-fun.mo differ 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 4a414c32a36f208e31f1b8f23e3a652e8e9a7d56..a6d4763bfb7c91b241857dc9a9714a8b2731614d 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 Binary files a/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo and b/Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es/LC_MESSAGES/mate-fun.mo differ