From 77ecae70b2a81052e3c1f3dc54dd0097ffd4abfa Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Wed, 13 Sep 2023 15:20:34 -0300
Subject: [PATCH] fix locales fusion conflict

---
 .../locales/es/LC_MESSAGES/KlipperScreen.po      | 16 ++++++++--------
 .../locales/it/LC_MESSAGES/KlipperScreen.po      |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po
index 8f3837ac..05fb99ea 100644
--- a/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po
+++ b/ks_includes/locales/es/LC_MESSAGES/KlipperScreen.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.3.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.0.1-dev\n"
 
 #, python-format
 msgid "%s will be updated to version"
@@ -91,7 +91,7 @@ msgid "Auto-close notifications"
 msgstr "Auto-cerrar notificaciones"
 
 msgid "Auto-open Extrude On Pause"
-msgstr ""
+msgstr "Auto-abrir Extruir al pausar"
 
 msgid "Auto-scroll"
 msgstr "Auto-scroll"
@@ -252,7 +252,7 @@ msgid "Fine Tuning"
 msgstr "Ajuste Fino"
 
 msgid "Finish"
-msgstr "Cerrar"
+msgstr "Finalizar"
 
 msgid "Firmware Restart"
 msgstr "Reiniciar Firmware"
@@ -261,7 +261,7 @@ msgid "Flow:"
 msgstr "Flujo:"
 
 msgid "Flowrate:"
-msgstr "Flujo:"
+msgstr "Tasa de Flujo:"
 
 msgid "Font Size"
 msgstr "Tamaño del texto"
@@ -406,7 +406,7 @@ msgid "Macros"
 msgstr "Macros"
 
 msgid "Main Menu"
-msgstr "Menú"
+msgstr "Menú Principal"
 
 msgid "Material"
 msgstr "Material"
@@ -575,7 +575,7 @@ msgid "Reference"
 msgstr "Referencia"
 
 msgid "Refresh"
-msgstr "Actualizar"
+msgstr "Recargar"
 
 msgid "Rename/Move:"
 msgstr "Renombrar/Mover:"
@@ -753,7 +753,7 @@ msgid "Z Calibrate"
 msgstr "Calibrar Z"
 
 msgid "Z Move Speed (mm/s)"
-msgstr "Velocidad Z  (mm/s)"
+msgstr "Velocidad Z (mm/s)"
 
 msgid "Z Speed (mm/s)"
 msgstr "Z Velocidad (mm/s)"
diff --git a/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po b/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po
index 7a75a133..d846c479 100644
--- a/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po
+++ b/ks_includes/locales/it/LC_MESSAGES/KlipperScreen.po
@@ -10,8 +10,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.0.1-dev\n"
 
 #, python-format
 msgid "%s will be updated to version"
@@ -556,7 +556,7 @@ msgid "Raise Nozzle"
 msgstr "Alza ugello"
 
 msgid "Recover"
-msgstr "Ripristino "
+msgstr "Ripristino"
 
 msgid "Recover Hard"
 msgstr "Ripristino Hard"