From e394811ce1907296a3b5390777eefd212fbe13c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 30 Aug 2017 18:01:03 +0200 Subject: [PATCH] Relocate locales to proper locations Fixes https://github.com/Ultimaker/Uranium/issues/246 Fixes https://github.com/Ultimaker/Uranium/issues/277 --- resources/i18n/{jp => ja}/cura.po | 0 resources/i18n/{jp => ja}/fdmextruder.def.json.po | 0 resources/i18n/{jp => ja}/fdmprinter.def.json.po | 0 resources/i18n/{ptbr => pt_BR}/cura.po | 0 resources/i18n/{ptbr => pt_BR}/fdmextruder.def.json.po | 0 resources/i18n/{ptbr => pt_BR}/fdmprinter.def.json.po | 0 resources/qml/Preferences/GeneralPage.qml | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename resources/i18n/{jp => ja}/cura.po (100%) rename resources/i18n/{jp => ja}/fdmextruder.def.json.po (100%) rename resources/i18n/{jp => ja}/fdmprinter.def.json.po (100%) rename resources/i18n/{ptbr => pt_BR}/cura.po (100%) rename resources/i18n/{ptbr => pt_BR}/fdmextruder.def.json.po (100%) rename resources/i18n/{ptbr => pt_BR}/fdmprinter.def.json.po (100%) diff --git a/resources/i18n/jp/cura.po b/resources/i18n/ja/cura.po similarity index 100% rename from resources/i18n/jp/cura.po rename to resources/i18n/ja/cura.po diff --git a/resources/i18n/jp/fdmextruder.def.json.po b/resources/i18n/ja/fdmextruder.def.json.po similarity index 100% rename from resources/i18n/jp/fdmextruder.def.json.po rename to resources/i18n/ja/fdmextruder.def.json.po diff --git a/resources/i18n/jp/fdmprinter.def.json.po b/resources/i18n/ja/fdmprinter.def.json.po similarity index 100% rename from resources/i18n/jp/fdmprinter.def.json.po rename to resources/i18n/ja/fdmprinter.def.json.po diff --git a/resources/i18n/ptbr/cura.po b/resources/i18n/pt_BR/cura.po similarity index 100% rename from resources/i18n/ptbr/cura.po rename to resources/i18n/pt_BR/cura.po diff --git a/resources/i18n/ptbr/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po similarity index 100% rename from resources/i18n/ptbr/fdmextruder.def.json.po rename to resources/i18n/pt_BR/fdmextruder.def.json.po diff --git a/resources/i18n/ptbr/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po similarity index 100% rename from resources/i18n/ptbr/fdmprinter.def.json.po rename to resources/i18n/pt_BR/fdmprinter.def.json.po diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index e3c10071af..38ad26b3c6 100755 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -154,11 +154,11 @@ UM.PreferencesPage append({ text: "Suomi", code: "fi" }) append({ text: "Français", code: "fr" }) append({ text: "Italiano", code: "it" }) - append({ text: "日本語", code: "jp" }) + append({ text: "日本語", code: "ja" }) append({ text: "한국어", code: "ko" }) append({ text: "Nederlands", code: "nl" }) append({ text: "Polski", code: "pl" }) - append({ text: "Português do Brasil", code: "ptbr" }) + append({ text: "Português do Brasil", code: "pt_BR" }) append({ text: "Русский", code: "ru" }) append({ text: "Türkçe", code: "tr" }) append({ text: "简体中文", code: "zh_CN" })