fix: translation fixes etc

package.json

@@ -46,7 +46,7 @@
     "sass": "^1.32.8",
     "sass-loader": "^11.0.1",
     "source-map-loader": "^2.0.1",
-    "webpack": "^5.31.2",
+    "webpack": "^5.33.2",
     "webpack-cli": "^4.6.0",
     "webpack-dev-server": "^3.11.2"
   },

src/index.js

@@ -12,7 +12,7 @@ import '@fontsource/lexend-deca/latin-400.css';
 import '@fontsource/montserrat/cyrillic-500.css';
 
 // language
-import merge from '@material-ui/utils/deepmerge';
+import merge from '@material-ui/utils/esm/deepmerge';
 
 const languagecode = localStorage.getItem('language') || 'en_GB';
 

src/translations/de_DE.json

@@ -54,9 +54,9 @@
         "marketplace": "Marktplatz"
       },
       "error_boundary": {
-        "title": "Error",
+        "title": "Fehler",
         "message": "Failed to load this component of Mue",
-        "refresh": "Refresh"
+        "refresh": "Neuladen"
       },
       "settings": {
         "enabled": "Aktivieren",
@@ -363,6 +363,7 @@
     "quote": "Kopierte Zitate",
     "installed": "Erfolgreich installiert",
     "uninstalled": "Erfolgreich entfernt",
-    "error": "Etwas ist schief gelaufen"
+    "error": "Etwas ist schief gelaufen",
+    "imported": "Erfolgreich importiert"
   }
 }

src/translations/en_GB.json

@@ -363,6 +363,7 @@
     "quote": "Quote copied",
     "installed": "Successfully installed",
     "uninstalled": "Successfully removed",
-    "error": "Something went wrong"
+    "error": "Something went wrong",
+    "imported": "Successfully imported"
   }
 }

src/translations/en_US.json

@@ -363,6 +363,7 @@
     "quote": "Quote copied",
     "installed": "Successfully installed",
     "uninstalled": "Successfully removed",
-    "error": "Something went wrong"
+    "error": "Something went wrong",
+    "imported": "Successfully imported"
   }
 }

src/translations/es.json

@@ -46,7 +46,7 @@
   "modals": {
     "main": {
       "title": "Opciones",
-      "loading": "Loading...",
+      "loading": "Cargando...",
       "file_upload_error": "File is over 2MB",
       "navbar": {
         "settings": "Ajustes",
@@ -56,7 +56,7 @@
       "error_boundary": {
         "title": "Error",
         "message": "Failed to load this component of Mue",
-        "refresh": "Refresh"
+        "refresh": "Refrescar"
       },
       "settings": {
         "enabled": "Enabled",
@@ -73,11 +73,11 @@
               "title": "Digital",
               "seconds": "Segundos",
               "twentyfourhour": "24 Horas",
-              "twelvehour": "12 hour",
+              "twelvehour": "12 Horas",
               "zero": "Sin ceros"
             },
             "analogue": {
-              "title": "Analógico",
+              "analog": "Analógico",
               "second_hand": "Seconds hand",
               "minute_hand": "Minutes hand",
               "hour_hand": "Hours hand",
@@ -112,9 +112,9 @@
             "custom_author": "Custom authour",
             "buttons": {
               "title": "Buttons",
-              "copy": "Copiar",
+              "copy": "Botón de copiar",
-              "tweet": "Tweet",
+              "tweet": "Botón de Tweet",
-              "favourite": "Favoritos"
+              "favourite": "Botón de favoritos"
             }
           },
           "greeting": {
@@ -153,7 +153,7 @@
               "api": "Fondos API",
               "custom_background": "Fondo personalizado",
               "custom_colour": "Color del fondo personalizado",
-              "upload": "Subir",
+              "upload": "Upload",
               "add_colour": "Añadir color",
               "disabled": "Desactivado",
               "loop_video": "Loop video",
@@ -199,7 +199,7 @@
               "light": "Light",
               "dark": "Dark"
             },
-            "animations": "Animations",
+            "animations": "Animaciones",
             "navbar": {
               "title": "Navbar",
               "notes": "Notes",
@@ -259,7 +259,7 @@
             "developer": "Developer"
           },
           "language": {
-            "title": "Language",
+            "language": "Lenguaje",
             "quote": "Quote language"
           },
           "changelog": "Change Log",
@@ -290,10 +290,6 @@
           "reset": "Reiniciar",
           "import": "Importar",
           "export": "Exportar"
-        },
-        "toasts": {
-          "reset": "Restablecido correctamente",
-          "imported": "Importado correctamente"
         }
       },
       "marketplace": {
@@ -341,11 +337,8 @@
         "title": "Error",
         "description": "No se pudo conectar con el servidor"
       },
-      "read_blog": "Read on the blog here",
+      "read_blog": "Leer en el blog aquí",
-      "contact_support": "Contact us here",
+      "contact_support": "Contáctanos aquí"
-      "loading": "Cargando...",
-      "readblog": "Leer en el blog aquí",
-      "contactsupport": "Contáctanos aquí"
     },
     "welcome": {
       "title": "Welcome to",
@@ -369,8 +362,8 @@
   "toasts": {
     "quote": "Cita copiada",
     "installed": "Instalado correctamente",
-    "uninstalled": "Successfully removed",
+    "uninstalled": "Retirado correctamente",
-    "error": "Something went wrong",
+    "error": "Algo salió mal",
-    "removed": "Retirado correctamente"
+    "imported": "Importado correctamente"
   }
 }

src/translations/fr.json

@@ -54,9 +54,9 @@
         "marketplace": "Marché"
       },
       "error_boundary": {
-        "title": "Error",
+        "title": "Erreur",
         "message": "Failed to load this component of Mue",
-        "refresh": "Refresh"
+        "refresh": "Rafraîchir"
       },
       "settings": {
         "enabled": "Enabled",
@@ -73,7 +73,7 @@
               "title": "Digital",
               "seconds": "Secondes",
               "twentyfourhour": "24 heures",
-              "twelvehour": "12 hour",
+              "twelvehour": "12 heures",
               "zero": "Complétion de zéros"
             },
             "analogue": {
@@ -362,8 +362,8 @@
   "toasts": {
     "quote": "Citation copiée",
     "installed": "Installé avec succès",
-    "uninstalled": "Successfully removed",
+    "uninstalled": "Enlevé avec succès",
     "error": "Quelque chose s'est mal passé",
-    "removed": "Enlevé avec succès"
+    "imported": "Importé avec succès"
   }
 }

src/translations/nl.json

@@ -46,7 +46,7 @@
   "modals": {
     "main": {
       "title": "Opties",
-      "loading": "Loading...",
+      "loading": "Bezig met laden…",
       "file_upload_error": "File is over 2MB",
       "navbar": {
         "settings": "Instellingen",
@@ -54,7 +54,7 @@
         "marketplace": "Marktplaats"
       },
       "error_boundary": {
-        "title": "Error",
+        "title": "Foutmelding",
         "message": "Failed to load this component of Mue",
         "refresh": "Refresh"
       },
@@ -72,8 +72,8 @@
             "digital": {
               "title": "Digital",
               "seconds": "Seconden tonen",
-              "twentyfourhour": "24 Hour",
+              "twentyfourhour": "24-uursklok gebruiken",
-              "twelvehour": "12 hour",
+              "twelvehour": "12-uursklok gebruiken",
               "zero": "Nulopvulling"
             },
             "analogue": {
@@ -363,6 +363,7 @@
     "quote": "Het citaat is gekopieerd",
     "installed": "De installatie is voltooid",
     "uninstalled": "Het verwijderen is voltooid",
-    "error": "Er is iets misgegaan"
+    "error": "Er is iets misgegaan",
+    "imported": "Het importeren is voltooid"
   }
 }

src/translations/no.json

@@ -46,7 +46,7 @@
   "modals": {
     "main": {
       "title": "Options",
-      "loading": "Loading...",
+      "loading": "Laster...",
       "file_upload_error": "File is over 2MB",
       "navbar": {
         "settings": "Instillinger",
@@ -77,7 +77,7 @@
               "zero": "Ekstra Null"
             },
             "analogue": {
-              "title": "Analog",
+              "title": "Analogue",
               "second_hand": "Seconds hand",
               "minute_hand": "Minutes hand",
               "hour_hand": "Hours hand",
@@ -239,7 +239,7 @@
           },
           "advanced": {
             "title": "Advanced",
-            "offline_mode": "Offline mode",
+            "offline_mode": "Frakoblet Modus",
             "data": "Data",
             "reset_modal": {
               "title": "WARNING",
@@ -251,8 +251,7 @@
             "custom_css": "Custom CSS",
             "custom_js": "Custom JS",
             "tab_name": "Tab name",
-            "experimental_warning": "Please note that the Mue team cannot provide support if you have experimental mode on. Please disable it first and see if the issue continues to occur before contacting support.",
+            "experimental_warning": "Please note that the Mue team cannot provide support if you have experimental mode on. Please disable it first and see if the issue continues to occur before contacting support."
-            "offline": "Frakoblet Modus"
           },
           "experimental": {
             "title": "Eksperimental",
@@ -291,11 +290,6 @@
           "reset": "Nullstill",
           "import": "Importer",
           "export": "Eksporter"
-        },
-        "toasts": {
-          "reset": "Tilbakestillte vellykket",
-          "imported": "Successfully imported",
-          "error": "Noe gikk galt"
         }
       },
       "marketplace": {
@@ -341,12 +335,10 @@
       },
       "error": {
         "title": "Error",
-        "description": "Could not connect to the server",
+        "description": "Kan ikke koble til serveren."
-        "content": "Kan ikke koble til serveren."
       },
       "read_blog": "Read on the blog here",
-      "contact_support": "Contact us here",
+      "contact_support": "Contact us here"
-      "loading": "Laster..."
     },
     "welcome": {
       "title": "Welcome to",
@@ -368,9 +360,10 @@
     }
   },
   "toasts": {
-    "quote": "Quote copied",
+    "quote": "Sitat kopiert",
-    "installed": "Successfully installed",
+    "installed": "Installert",
-    "uninstalled": "Successfully removed",
+    "uninstalled": "Fjernet",
-    "error": "Something went wrong"
+    "error": "Noe gikk galt",
+    "imported": "Successfully imported"
   }
 }

src/translations/ru.json

@@ -46,7 +46,7 @@
   "modals": {
     "main": {
       "title": "Options",
-      "loading": "Loading...",
+      "loading": "Загрузка...",
       "file_upload_error": "File is over 2MB",
       "navbar": {
         "settings": "Settings",
@@ -54,9 +54,9 @@
         "marketplace": "Marketplace"
       },
       "error_boundary": {
-        "title": "Error",
+        "title": "Ошибка",
         "message": "Failed to load this component of Mue",
-        "refresh": "Refresh"
+        "refresh": "Обновить"
       },
       "settings": {
         "enabled": "Enabled",
@@ -73,11 +73,11 @@
               "title": "Digital",
               "seconds": "Секунды",
               "twentyfourhour": "24 Часа",
-              "twelvehour": "12 hour",
+              "twelvehour": "12 часов",
               "zero": "Дополнительный ноль"
             },
             "analogue": {
-              "title": "Аналоговое",
+              "title": "Analogue",
               "second_hand": "Seconds hand",
               "minute_hand": "Minutes hand",
               "hour_hand": "Hours hand",
@@ -135,8 +135,7 @@
               "title": "Buttons",
               "view": "Просмотр",
               "favourite": "Любимые",
-              "download": "Download",
+              "download": "Download"
-              "refresh": "Обновить"
             },
             "effects": {
               "title": "Effects",
@@ -153,7 +152,7 @@
               "title": "Source",
               "api": "API для фона",
               "custom_background": "Пользовательский фон",
-              "custom_colour": "Пользовательский цвет фона",
+              "custom_colour": "Пользовательский цвет фон",
               "upload": "Загрузить",
               "add_colour": "Добавить цвет",
               "disabled": "Выключен",
@@ -291,11 +290,6 @@
           "reset": "Сбросить",
           "import": "Импорт",
           "export": "Экспорт"
-        },
-        "toasts": {
-          "reset": "Сброшено!",
-          "imported": "Успешно импортировано",
-          "error": "Что-то пошло не так"
         }
       },
       "marketplace": {
@@ -341,14 +335,10 @@
       },
       "error": {
         "title": "Ошибка",
-        "description": "Could not connect to the server",
         "content": "Не удалось подключиться к серверу"
       },
-      "read_blog": "Read on the blog here",
+      "read_blog": "Прочитайте об изменениях в блоге",
-      "contact_support": "Contact us here",
+      "contact_support": "Связаться с нами"
-      "loading": "Загрузка...",
-      "readblog": "Прочитайте об изменениях в блоге",
-      "contactsupport": "Связаться с нами"
     },
     "welcome": {
       "title": "Welcome to",
@@ -370,9 +360,10 @@
     }
   },
   "toasts": {
-    "quote": "Quote copied",
+    "quote": "Цитата скопирована!",
-    "installed": "Successfully installed",
+    "installed": "Успешно установлено",
-    "uninstalled": "Successfully removed",
+    "uninstalled": "Успешно удалено",
-    "error": "Something went wrong"
+    "error": "Что-то пошло не так",
+    "imported": "Успешно импортировано"
   }
 }

src/translations/zh_CN.json

@@ -54,9 +54,9 @@
         "marketplace": "插件市场"
       },
       "error_boundary": {
-        "title": "Error",
+        "title": "错误",
         "message": "Failed to load this component of Mue",
-        "refresh": "Refresh"
+        "refresh": "刷新"
       },
       "settings": {
         "enabled": "已启用",
@@ -72,8 +72,8 @@
             "digital": {
               "title": "Digital",
               "seconds": "显示秒",
-              "twentyfourhour": "24 Hour",
+              "twentyfourhour": "使用 24 小时制",
-              "twelvehour": "12 hour",
+              "twelvehour": "12 小时制下显示",
               "zero": "加零补足二位数字"
             },
             "analogue": {
@@ -363,6 +363,7 @@
     "quote": "名言已复制",
     "installed": "安装成功",
     "uninstalled": "卸载成功",
-    "error": "发生了错误"
+    "error": "发生了错误",
+    "imported": "导入成功"
   }
 }