Fix conflicts. Store locale translations only in default en_US

7 years ago · 8ed03b22bd
17 changed files with 1831 additions and 281 deletions
--- a/ui/src/app/locale/locale.constant-cs_CZ.json
+++ b/ui/src/app/locale/locale.constant-cs_CZ.json
@ -1638,23 +1638,6 @@
        }
    },
    "language": {
-        "language": "Jazyk",
-        "locales": {
-            "de_DE": "German",
-            "fr_FR": "French",
-            "zh_CN": "Chinese",
-            "en_US": "English",
-            "it_IT": "Italian",
-            "ko_KR": "Korean",
-            "ru_RU": "Russian",
-            "es_ES": "Spanish",
-            "ja_JA": "Japanese",
-            "tr_TR": "Turkish",
-            "fa_IR": "Persian",
-            "uk_UA": "Ukrainian",
-            "cs_CZ": "Česky",
-            "el_GR": "Řečtina",
-            "lv_LV": "Lotyština"
-        }
+        "language": "Jazyk"
    }
 }
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@ -1686,23 +1686,6 @@
    }
  },
  "language": {
-    "language": "Sprache",
-    "locales": {
-      "de_DE": "Deutsch",
-      "fr_FR": "Französisch",
-      "zh_CN": "Chinesisch",
-      "en_US": "Englisch",
-      "it_IT": "Italienisch",
-      "ko_KR": "Koreanisch",
-      "ru_RU": "Russisch",
-      "es_ES": "Spanisch",
-      "ja_JA": "Japanisch",
-      "tr_TR": "Türkisch",
-      "fa_IR": "Persisch",
-      "uk_UA": "Ukrainisch",
-      "cs_CZ": "Tschechisch",
-      "el_GR": "Griechisch",
-      "lv_LV": "Lettisch"
-    }
+    "language": "Sprache"
  }
 }
--- a/ui/src/app/locale/locale.constant-el_GR.json
+++ b/ui/src/app/locale/locale.constant-el_GR.json
@ -2602,23 +2602,5 @@
    }
  },
  "language": {
-    "language": "Γλώσσα",
-    "locales": {
-      "de_DE": "Γερμανικά",
-      "fr_FR": "Γαλλικά",
-      "zh_CN": "Κινέζικα",
-      "en_US": "Αγγλικά",
-      "it_IT": "Ιταλικά",
-      "ko_KR": "Κορεάτικα",
-      "ru_RU": "Ρώσικα",
-      "es_ES": "Ισπανικά",
-      "ja_JA": "Ιαπωνικά",
-      "tr_TR": "Τούρκικα",
-      "fa_IR": "Περσικά",
-      "uk_UA": "Ουκρανικά",
-      "cs_CZ": "Τσέχικα",
-	  "el_GR": "Ελληνικά",
-      "lv_LV": "Λετονικά"
-    }
  }
 }
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@ -50,8 +50,7 @@
        "export": "Export",
        "share-via": "Share via {{provider}}",
        "continue": "Continue",
-        "discard-changes": "Discard Changes",
-        "download": "Download"
+        "discard-changes": "Discard Changes"
    },
    "aggregation": {
        "aggregation": "Aggregation",
@ -1871,22 +1870,23 @@
    "language": {
        "language": "Language",
        "locales": {
-            "de_DE": "German",
-            "fr_FR": "French",
-            "zh_CN": "Simplified Chinese",
-            "zh_TW": "Traditional Chinese",
+            "de_DE": "Deutsch",
+            "fr_FR": "Français",
+            "zh_CN": "简体中文",
+            "zh_TW": "繁體中文",
            "en_US": "English",
-            "it_IT": "Italian",
-            "ko_KR": "Korean",
-            "ru_RU": "Russian",
-            "es_ES": "Spanish",
-            "ja_JA": "Japanese",
-            "tr_TR": "Turkish",
-            "fa_IR": "Persian",
-            "uk_UA": "Ukrainian",
-            "cs_CZ": "Czech",
-            "el_GR": "Greek",
-            "lv_LV": "Latvian"
+            "it_IT": "Italiano",
+            "ko_KR": "한글",
+            "ru_RU": "Русский",
+            "es_ES": "Español",
+            "ja_JA": "日本語",
+            "tr_TR": "Türkçe",
+            "fa_IR": "فارسي",
+            "uk_UA": "Українська",
+            "cs_CZ": "Česky",
+            "el_GR": "Ελληνικά",
+            "ro_RO": "Română",
+            "lv_LV": "Latviešu"
        }
    }
 }
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@ -1760,23 +1760,6 @@
        }
    },
    "language": {
-        "language": "Lenguaje",
-        "locales": {
-            "de_DE": "Alemán",
-            "fr_FR": "Francés",
-            "zh_CN": "Chino",
-            "en_US": "Inglés",
-            "it_IT": "Italiano",
-            "ko_KR": "Coreano",
-            "ru_RU": "Ruso",
-            "es_ES": "Español",
-            "ja_JA": "Japonés",
-            "tr_TR": "Turco",
-            "fa_IR": "Persa",
-            "uk_UA": "Ucraniano",
-            "cs_CZ": "Checo",
-            "el_GR": "Griego",
-            "lv_LV": "Letón"
-        }
+        "language": "Lenguaje"
    }
 }
--- a/ui/src/app/locale/locale.constant-fa_IR.json
+++ b/ui/src/app/locale/locale.constant-fa_IR.json
@ -1625,21 +1625,6 @@
        }
    },
    "language": {
-        "language": "زبان",
-        "locales": {
-            "de_DE": "آلمانی",
-			"fr_FR": "فرانسوي",
-            "zh_CN": "چيني",
-            "en_US": "انگليسي",
-            "it_IT": "ايتاليايي",
-            "ko_KR": "کره اي",
-            "ru_RU": "روسي",
-            "es_ES": "اسپانيولي",
-            "ja_JA": "ژاپني",
-            "tr_TR": "ترکي",
-			"fa_IR": "فارسي",
-            "uk_UA": "اوکراین",
-	          "cs_CZ": "در چک "            
-        }
+        "language": "زبان"
    }
 }
--- a/ui/src/app/locale/locale.constant-fr_FR.json
+++ b/ui/src/app/locale/locale.constant-fr_FR.json
@ -1170,24 +1170,7 @@
        "value": "Valeur"
    },
    "language": {
-        "language": "Language",
-        "locales": {
-            "de_DE": "Allemand",
-            "en_US": "Anglais",
-            "fr_FR": "Français",
-            "es_ES": "Espagnol",
-            "it_IT": "Italien",
-            "ko_KR": "Coréen",
-            "ru_RU": "Russe",
-            "zh_CN": "Chinois",
-            "ja_JA": "Japonaise",
-            "tr_TR": "Turc",
-            "fa_IR": "Persane",
-            "uk_UA": "Ukrainien",
-            "cs_CZ": "Tchèque",
-            "el_GR": "Grec",
-            "lv_LV": "Letton"
-        }
+        "language": "Language"
    },
    "layout": {
        "color": "Couleur",
--- a/ui/src/app/locale/locale.constant-it_IT.json
+++ b/ui/src/app/locale/locale.constant-it_IT.json
@ -1701,23 +1701,6 @@
        }
    },
    "language": {
-        "language": "Lingua",
-        "locales": {
-            "de_DE": "Tedesco",
-            "fr_FR": "Francese",
-            "zh_CN": "Cinese",
-            "en_US": "Inglese",
-            "it_IT": "Italiano",
-            "ko_KR": "Coreano",
-            "ru_RU": "Russo",
-            "es_ES": "Spagnolo",
-            "ja_JA": "Giapponese",
-            "tr_TR": "Turco",
-            "fa_IR": "Persiana",
-            "uk_UA": "Ucraino",
-            "cs_CZ": "Ceco",
-            "el_GR": "Greco",
-            "lv_LV": "lettone"
-        }
+        "language": "Lingua"
    }
 }
--- a/ui/src/app/locale/locale.constant-ja_JA.json
+++ b/ui/src/app/locale/locale.constant-ja_JA.json
@ -1509,21 +1509,6 @@
 		}
 	},
 	"language": {
-		"language": "言語",
-		"locales": {
-			"de_DE": "ドイツ語",
-            "fr_FR": "フランス語",
-			"en_US": "英語",
-			"ko_KR": "韓国語",
-			"it_IT": "イタリアの",
-			"zh_CN": "中国語",
-			"ru_RU": "ロシア",
-			"es_ES": "スペイン語",
-			"ja_JA": "日本語",
-			"tr_TR": "トルコ語",
-            "fa_IR": "ペルシャ語",
-            "uk_UA": "ウクライナ語",
-			"cs_CZ": "チェコ語で"            
-		}
+		"language": "言語"
 	}
-}
+}
--- a/ui/src/app/locale/locale.constant-ko_KR.json
+++ b/ui/src/app/locale/locale.constant-ko_KR.json
@ -1384,21 +1384,6 @@
        }
    },
    "language": {
-        "language": "언어",
-        "locales": {
-            "de_DE": "독일어",
-            "en_US": "영어",
-            "fr_FR": "프랑스의",
-            "ko_KR": "한글",
-            "zh_CN": "중국어",
-            "ru_RU": "러시아어",
-            "es_ES": "스페인어",
-            "it_IT": "이탈리아 사람",
-            "ja_JA": "일본어",
-            "tr_TR": "터키어",
-            "fa_IR": "페르시아 인",
-            "uk_UA": "우크라이나의",
-            "cs_CZ": "체코 어로"            
-        }
+        "language": "언어"
    }
-}
+}
--- a/ui/src/app/locale/locale.constant-lv_LV.json
+++ b/ui/src/app/locale/locale.constant-lv_LV.json
@ -1678,21 +1678,6 @@
        }
    },
    "language": {
-        "language": "Language",
-        "locales": {
-            "de_DE": "German",
-            "fr_FR": "French",
-            "zh_CN": "Simplified Chinese",
-            "en_US": "English",
-            "it_IT": "Italian",
-            "ko_KR": "Korean",
-            "ru_RU": "Russian",
-            "es_ES": "Spanish",
-            "ja_JA": "Japanese",
-            "tr_TR": "Turkish",
-            "fa_IR": "Persian",
-            "uk_UA": "Ukrainian",
-            "cs_CZ": "Czech"
-        }
+        "language": "Language"
    }
-}
+}
--- a/ui/src/app/locale/locale.constant-ro_RO.json
+++ b/ui/src/app/locale/locale.constant-ro_RO.json
--- a/ui/src/app/locale/locale.constant-ru_RU.json
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
@ -1788,23 +1788,6 @@
        }
    },
    "language": {
-        "language": "Язык",
-        "locales": {
-            "de_DE": "Немецкий",
-            "en_US": "Английский",
-            "zh_CN": "Китайский",
-            "ko_KR": "Корейский",
-            "es_ES": "Испанский",
-            "it_IT": "Итальянский",
-            "ru_RU": "Русский",
-            "tr_TR": "Турецкий",
-            "fr_FR": "Французский",
-            "ja_JA": "Японский",
-            "fa_IR": "Персидский",
-            "uk_UA": "Украинский",
-            "cs_CZ": "Чешский",
-            "el_GR": "Греческий",
-            "lv_LV": "Латышский"
-        }
+        "language": "Язык"
    }
 }
--- a/ui/src/app/locale/locale.constant-tr_TR.json
+++ b/ui/src/app/locale/locale.constant-tr_TR.json
@ -1591,23 +1591,6 @@
        }
    },
    "language": {
-        "language": "Dil",
-        "locales": {
-            "de_DE": "Almanca",
-            "fr_FR": "Fransızca",
-            "zh_CN": "Çince",
-            "en_US": "İngilizce",
-            "it_IT": "İtalyan",
-            "ko_KR": "Koreli",
-            "ru_RU": "Rusça",
-            "es_ES": "İspanyol",
-            "ja_JA": "Japonca",
-            "tr_TR": "Türkçe",
-            "fa_IR": "Farsça",
-            "uk_UA": "Ukrayna",
-            "cs_CZ": "Çekçe",
-            "el_GR": "Yunanca",
-            "lv_LV": "Letonca"
-        }
+        "language": "Dil"
    }
-}
+}
--- a/ui/src/app/locale/locale.constant-uk_UA.json
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
@ -2394,23 +2394,6 @@
        }
    },
    "language": {
-        "language": "Мова",
-        "locales": {
-            "fr_FR": "Французька",
-            "zh_CN": "Китайська",
-            "en_US": "Англійська",
-            "it_IT": "Італійська",
-            "ko_KR": "Корейська",
-            "ru_RU": "Російська",
-            "es_ES": "Іспанська",
-            "ja_JA": "Японська",
-            "tr_TR": "Турецька",
-            "de_DE": "Німецька",
-            "uk_UA": "Українська",
-            "fa_IR": "Перська",
-            "cs_CZ": "Чеська",
-            "el_GR": "Грецька",
-            "lv_LV": "Латиська"
-        }
+        "language": "Мова"
    }
 }
--- a/ui/src/app/locale/locale.constant-zh_CN.json
+++ b/ui/src/app/locale/locale.constant-zh_CN.json
@ -1602,22 +1602,6 @@
        }
    },
    "language": {
-        "language": "语言",
-        "locales": {
-            "de_DE": "德文",
-            "en_US": "英文",
-            "fr_FR": "法文",
-            "ko_KR": "韩文",
-            "zh_CN": "简体中文",
-            "zh_TW": "繁体中文",
-            "ru_RU": "俄文",
-            "es_ES": "西班牙文",
-            "it_IT": "意大利文",
-            "ja_JA": "日文",
-            "tr_TR": "土耳其文",
-            "fa_IR": "波斯文",
-            "uk_UA": "乌克兰文",
-            "cs_CZ": "捷克文"            
-        }
+        "language": "语言"
    }
 }
--- a/ui/src/app/locale/locale.constant-zh_TW.json
+++ b/ui/src/app/locale/locale.constant-zh_TW.json
@ -1602,22 +1602,6 @@
         }
     },
     "language": {
-        "language": "語言",
-        "locales": {
-            "de_DE": "德文",
-            "en_US": "英文",
-            "fr_FR": "法文",
-            "ko_KR": "韓文",
-            "zh_CN": "簡體中文",
-            "zh_TW": "繁體中文",
-            "ru_RU": "俄文",
-            "es_ES": "西班牙文",
-            "it_IT": "意大利文",
-            "ja_JA": "日文",
-            "tr_TR": "土耳其文",
-            "fa_IR": "波斯文",
-            "uk_UA": "烏克蘭文",
-            "cs_CZ": "捷克文"
-        }
+        "language": "語言"
     }
 }