fix i18n merge conflicts

edrlab · Jan 8, 2025 · ac3ebe2 · ac3ebe2
1 parent 2711b71
commit ac3ebe2
Show file tree

Hide file tree

Showing 28 changed files with 4 additions and 95 deletions.
diff --git a/src/resources/locales/ar.json b/src/resources/locales/ar.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/bg.json b/src/resources/locales/bg.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/ca.json b/src/resources/locales/ca.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/da.json b/src/resources/locales/da.json
@@ -339,11 +339,8 @@
         "red": "Rød",
         "yellow": "Gul"
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "Alle",
         "filterByColor": "Filtrér efter Farve",

diff --git a/src/resources/locales/de.json b/src/resources/locales/de.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/el.json b/src/resources/locales/el.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/en.json b/src/resources/locales/en.json
@@ -339,11 +339,8 @@
         "red": "Red",
         "yellow": "Yellow"
       },
-<<<<<<< HEAD
       "date": "Modification date",
-=======
       "export": "Save notes as",
->>>>>>> develop
       "filter": {
         "all": "All",
         "filterByColor": "Filter by Color",

diff --git a/src/resources/locales/es.json b/src/resources/locales/es.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/eu.json b/src/resources/locales/eu.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/fi.json b/src/resources/locales/fi.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/fr.json b/src/resources/locales/fr.json
@@ -339,11 +339,8 @@
         "red": "Rouge",
         "yellow": "Jaune"
       },
-<<<<<<< HEAD
       "date": "Date de modification",
-=======
       "export": "Sauvegarder sous",
->>>>>>> develop
       "filter": {
         "all": "Tous",
         "filterByColor": "Filtré par couleur",

diff --git a/src/resources/locales/gl.json b/src/resources/locales/gl.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/hr.json b/src/resources/locales/hr.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/it.json b/src/resources/locales/it.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/ja.json b/src/resources/locales/ja.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/ka.json b/src/resources/locales/ka.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/ko.json b/src/resources/locales/ko.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/lt.json b/src/resources/locales/lt.json
@@ -339,11 +339,8 @@
         "red": "Raudona",
         "yellow": "Geltona"
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "Visos",
         "filterByColor": "Filtruoti pagal spalvą",

diff --git a/src/resources/locales/nl.json b/src/resources/locales/nl.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/pt-br.json b/src/resources/locales/pt-br.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/pt-pt.json b/src/resources/locales/pt-pt.json
@@ -339,11 +339,8 @@
         "red": "Vermelho",
         "yellow": "Amarelo"
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "Tudo",
         "filterByColor": "Filtrar por cor",

diff --git a/src/resources/locales/ru.json b/src/resources/locales/ru.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/sl.json b/src/resources/locales/sl.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/sv.json b/src/resources/locales/sv.json
@@ -339,11 +339,8 @@
         "red": "Röd",
         "yellow": "Gul"
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "Alla",
         "filterByColor": "Filtrera efter färg",

diff --git a/src/resources/locales/zh-cn.json b/src/resources/locales/zh-cn.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",

diff --git a/src/resources/locales/zh-tw.json b/src/resources/locales/zh-tw.json
@@ -339,11 +339,8 @@
         "red": "",
         "yellow": ""
       },
-<<<<<<< HEAD
       "date": "",
-=======
       "export": "",
->>>>>>> develop
       "filter": {
         "all": "",
         "filterByColor": "",