diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/sankore_ar.ts index 09fe7f07..165eb415 100644 --- a/resources/i18n/sankore_ar.ts +++ b/resources/i18n/sankore_ar.ts @@ -1661,6 +1661,29 @@ Do you want to ignore these errors for this host? لم يستطع Sankore الدخول الى سجل الوثيقة '1%'. للأسف، يجب اغلاق التطبيق لتفادي فساد البيانات. يمكن أيضا فقدان التغييرات الأخيرة. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_bg.ts b/resources/i18n/sankore_bg.ts index f2cde333..e3d7eb92 100644 --- a/resources/i18n/sankore_bg.ts +++ b/resources/i18n/sankore_bg.ts @@ -1660,6 +1660,29 @@ Do you want to ignore these errors for this host? Санкоре изгуби достъп до хранилището за докумети '%1'. За съжаление приложението ще се затвори, за да не се повредят файловете. Последните промени могат да бъдат изгубени. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/sankore_da.ts index 3d7db71b..15ee368e 100644 --- a/resources/i18n/sankore_da.ts +++ b/resources/i18n/sankore_da.ts @@ -1658,6 +1658,29 @@ Do you want to ignore these errors for this host? Sankore har mistet adgangen til dokumentdepotet '%1'. Desværre må applikationen lukke ned for at undgå, at data mistes. De seneste ændringer kan være gået tabt. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/sankore_de.ts index bc1fc935..3e784ce8 100644 --- a/resources/i18n/sankore_de.ts +++ b/resources/i18n/sankore_de.ts @@ -1658,6 +1658,29 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren? Sankore hat den Zugang zum Dokumentenarchiv '%1' verloren. Die Anwendung muss leider beendet werden, um Datenkorruption zu vermeiden. Der Verlust kürzlich vorgenommener Änderungen ist möglich. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/sankore_en.ts index 98eaffa1..34a92260 100644 --- a/resources/i18n/sankore_en.ts +++ b/resources/i18n/sankore_en.ts @@ -1650,6 +1650,29 @@ Do you want to ignore these errors for this host? + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/sankore_en_UK.ts index efd11cc4..bf6cb9fc 100644 --- a/resources/i18n/sankore_en_UK.ts +++ b/resources/i18n/sankore_en_UK.ts @@ -1650,6 +1650,29 @@ Do you want to ignore these errors for this host? + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/sankore_es.ts index 3d6a0e08..57518263 100644 --- a/resources/i18n/sankore_es.ts +++ b/resources/i18n/sankore_es.ts @@ -1652,6 +1652,29 @@ Do you want to ignore these errors for this host? Sankore ha perdido acceso al depósito de documentos '%1'. Desafortunadamente la aplicación debe cerrarse para evitar daños en los datos. También se podrían perder los últimos cambios. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 6431035f..3ba905f0 100755 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -1658,6 +1658,29 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Open-Sankoré a perdu l'accès au répertoire des documents '%1'. L'application doit malheureusement être fermée pour éviter tout risque de corruption de vos fichiers. Les dernières modifications effectuées risquent d'être perdues. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index 6431035f..3ba905f0 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -1658,6 +1658,29 @@ Voulez-vous ignorer les erreurs pour ce serveur ? Open-Sankoré a perdu l'accès au répertoire des documents '%1'. L'application doit malheureusement être fermée pour éviter tout risque de corruption de vos fichiers. Les dernières modifications effectuées risquent d'être perdues. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/sankore_it.ts index 55e68924..67c061fd 100644 --- a/resources/i18n/sankore_it.ts +++ b/resources/i18n/sankore_it.ts @@ -1658,6 +1658,29 @@ Vuoi ignorare gli errori per questo host? Sankore ha perso l'accesso all'archivio dei documenti '%1'. Purtroppo l'applicazione deve chiudere per evitare la corruzione dei dati. Potrebbero essere andate perse anche le ultime modifiche. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/sankore_iw.ts index 854b5425..02e04412 100644 --- a/resources/i18n/sankore_iw.ts +++ b/resources/i18n/sankore_iw.ts @@ -1653,6 +1653,29 @@ Do you want to ignore these errors for this host? Sakomeאיבד את הגישה למקום אכסון המסמך %1 : לצערנו היישום צריך להסגר כדי למנוע השחתת נתונים. ייתכן שגם השינויים האחרונים יאבדו. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/sankore_ja.ts index 395c33a7..528e6e58 100644 --- a/resources/i18n/sankore_ja.ts +++ b/resources/i18n/sankore_ja.ts @@ -1657,6 +1657,29 @@ Do you want to ignore these errors for this host? Sankoreはドキュメント・リポジトリ'%1'へのアクセスを失いました。データ崩壊を避けるために残念ながらアプリケーションはシャットダウンします。したがって最後の変更は失われます。 + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/sankore_ko.ts index 31fd0f0c..8427d569 100644 --- a/resources/i18n/sankore_ko.ts +++ b/resources/i18n/sankore_ko.ts @@ -1656,6 +1656,29 @@ Do you want to ignore these errors for this host? Sankore가 '%1' 문서 저장소에 액세스할 수 없습니다. 데이터 손상을 방지하기 위해 응용 프로그램을 종료해야 합니다. 최종 변경된 내용도 손실되었을 수 있습니다. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/sankore_nb.ts index 7cd91ba0..4fff08f6 100644 --- a/resources/i18n/sankore_nb.ts +++ b/resources/i18n/sankore_nb.ts @@ -857,7 +857,7 @@ UBAbstractWidget Cannot load content - Kan ikke laste innhold + Kan ikke laste innhold Loading ... @@ -1660,6 +1660,29 @@ Do you want to ignore these errors for this host? Sankore har mistet tilgangen til dokumentdatabasen "%1%. Dessverre må applikasjonen avsluttes for å unngå korrupte data. De siste endringene kan også gå tapt. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/sankore_nl.ts index eed56bf9..e0072a4e 100644 --- a/resources/i18n/sankore_nl.ts +++ b/resources/i18n/sankore_nl.ts @@ -1650,6 +1650,29 @@ Do you want to ignore these errors for this host? Sankore geen toegang meer tot documentopslag "%1". De applicatie moet sluiten om data schade te voorkomen. De laatste wijzigingen kunnen eveneens verloren gaan. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/sankore_pl.ts index 4fbb2b5d..91257bb5 100644 --- a/resources/i18n/sankore_pl.ts +++ b/resources/i18n/sankore_pl.ts @@ -1665,6 +1665,29 @@ Czy chcesz ignorować te błędy dla tego hosta? Sankore utraciło dostęp do repozytorium dokumentów „%1”. Niestety aplikacja musi zostać zamknięta, aby uniknąć uszkodzenia danych. Najnowsze zmiany mogą zostać utracone. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/sankore_pt.ts index 21026d96..47371298 100644 --- a/resources/i18n/sankore_pt.ts +++ b/resources/i18n/sankore_pt.ts @@ -1650,6 +1650,29 @@ Do you want to ignore these errors for this host? + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_rm.ts b/resources/i18n/sankore_rm.ts index e2aaffe6..904247c8 100644 --- a/resources/i18n/sankore_rm.ts +++ b/resources/i18n/sankore_rm.ts @@ -1650,6 +1650,29 @@ Do you want to ignore these errors for this host? + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/sankore_ro.ts index 85f8b5c4..72ecdfb6 100644 --- a/resources/i18n/sankore_ro.ts +++ b/resources/i18n/sankore_ro.ts @@ -1658,6 +1658,29 @@ Doriţi să ignoraţi aceste erori pentru acest host? Sankore a pierdut accesul la depozitul de documente '%1'. Din păcate, aplicaţia trebuie închisă pentru a evita coruperea datelor. Este posibil şi ca ultimele modificări să fie pierdute. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/sankore_ru.ts index f8c84e24..cab971ce 100644 --- a/resources/i18n/sankore_ru.ts +++ b/resources/i18n/sankore_ru.ts @@ -1658,6 +1658,29 @@ Do you want to ignore these errors for this host? Sankore потерял соединение с репозиторием документов '%1'. Приложение должно завершить работу, чтобы избежать повреждения данных. Также могут быть потеряны последние изменения. + + UBPlatformUtils + + English + Английский + + + Russian + Русский + + + German + Немецкий + + + French + Французский + + + Swiss French + Шв. французский + + UBPodcastController diff --git a/resources/i18n/sankore_sk.ts b/resources/i18n/sankore_sk.ts index 52f7dcb5..2f3a60a4 100644 --- a/resources/i18n/sankore_sk.ts +++ b/resources/i18n/sankore_sk.ts @@ -1662,6 +1662,29 @@ Chcete ignorovať tieto chyby na tomto serveri? Strata depozitára s dokumentami + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/sankore_sv.ts index e589e65e..024f3fbc 100644 --- a/resources/i18n/sankore_sv.ts +++ b/resources/i18n/sankore_sv.ts @@ -1658,6 +1658,29 @@ Vill du ignorera felen för den här värden? Sankore har förlorat access till dokumentarkiv '%1'. Tyvärr måste programmet stängas ner för att undvika korruption av data. De senaste ändringarna kan gå förlorade. + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/sankore_zh.ts index 2a23cc61..22a298c5 100644 --- a/resources/i18n/sankore_zh.ts +++ b/resources/i18n/sankore_zh.ts @@ -1656,6 +1656,29 @@ Do you want to ignore these errors for this host? Sankore无法进入文档库。为避免数据出错，应用程序须立即关闭，最近所做的修改也可能丢失。 + + UBPlatformUtils + + English + + + + Russian + + + + German + + + + French + + + + Swiss French + + + UBPodcastController diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index e67404c9..94d447cc 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -128,7 +128,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing || args.contains("-log") || args.contains("log"); - UBPlatformUtils::init(); + UBResources::resources(); if (!undoStack) @@ -154,6 +154,8 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing QLocale::setDefault(QLocale(localString)); qDebug() << "Running application in:" << localString; + UBPlatformUtils::init(); + UBSettings *settings = UBSettings::settings(); connect(settings->appToolBarPositionedAtTop, SIGNAL(changed(QVariant)), this, SLOT(toolBarPositionChanged(QVariant))); diff --git a/src/frameworks/UBPlatformUtils.h b/src/frameworks/UBPlatformUtils.h index 23f1f96d..41c3669d 100644 --- a/src/frameworks/UBPlatformUtils.h +++ b/src/frameworks/UBPlatformUtils.h @@ -160,6 +160,8 @@ struct KEYBT class UBPlatformUtils { + Q_DECLARE_TR_FUNCTIONS(UBPlatformUtils) + private: UBPlatformUtils(); virtual ~UBPlatformUtils(); @@ -169,7 +171,7 @@ class UBPlatformUtils static int nKeyboardLayouts; static UBKeyboardLocale** keyboardLayouts; - public: +public: static void init(); static void destroy(); static QString applicationResourcesDirectory(); diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index 02d31297..9e2c67e2 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -382,11 +382,11 @@ void UBPlatformUtils::initializeKeyboardLayouts() { nKeyboardLayouts = 5; keyboardLayouts = new UBKeyboardLocale*[nKeyboardLayouts]; - keyboardLayouts[0] = new UBKeyboardLocale("English", "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE); - keyboardLayouts[1] = new UBKeyboardLocale("Russian", "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE); - keyboardLayouts[2] = new UBKeyboardLocale("German", "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE); - keyboardLayouts[3] = new UBKeyboardLocale("French", "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE); - keyboardLayouts[4] = new UBKeyboardLocale("Swiss French", "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE); + keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE); + keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE); + keyboardLayouts[2] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE); + keyboardLayouts[3] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE); + keyboardLayouts[4] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE); } void UBPlatformUtils::destroyKeyboardLayouts() diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index bef2d0be..314f9a46 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -398,11 +398,11 @@ void UBPlatformUtils::initializeKeyboardLayouts() { nKeyboardLayouts = 5; keyboardLayouts = new UBKeyboardLocale*[nKeyboardLayouts]; - keyboardLayouts[0] = new UBKeyboardLocale("English", "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE); - keyboardLayouts[1] = new UBKeyboardLocale("Russian", "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE); - keyboardLayouts[2] = new UBKeyboardLocale("French", "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE); - keyboardLayouts[3] = new UBKeyboardLocale("Swiss French", "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE); - keyboardLayouts[4] = new UBKeyboardLocale("German", "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE); + keyboardLayouts[0] = new UBKeyboardLocale(tr("English"), "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE); + keyboardLayouts[1] = new UBKeyboardLocale(tr("Russian"), "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE); + keyboardLayouts[2] = new UBKeyboardLocale(tr("French"), "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE); + keyboardLayouts[3] = new UBKeyboardLocale(tr("Swiss French"), "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE); + keyboardLayouts[4] = new UBKeyboardLocale(tr("German"), "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE); } void UBPlatformUtils::destroyKeyboardLayouts()