From a1926a8f89d4c37040b3913ae25ae250d65d05ae Mon Sep 17 00:00:00 2001 From: PKEuS Date: Fri, 1 Mar 2013 11:07:28 -0800 Subject: [PATCH] Partial Fix for #3647: Provide translations for standard Qt buttons --- gui/cppcheck_de.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_es.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_fi.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_fr.ts | 15 +++++++++++ gui/cppcheck_it.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_ja.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_ko.ts | 15 +++++++++++ gui/cppcheck_nl.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_ru.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_sr.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_sv.ts | 54 +++++++++++++++++++++++++------------- gui/cppcheck_zh_CN.ts | 54 +++++++++++++++++++++++++------------- gui/translationhandler.cpp | 8 ++++++ 13 files changed, 398 insertions(+), 180 deletions(-) diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts index 2582450cc..3a470d305 100644 --- a/gui/cppcheck_de.ts +++ b/gui/cppcheck_de.ts @@ -731,67 +731,67 @@ Do you want to remove the file from the recently used projects -list? Möchten Sie die Datei von der Liste der zuletzt benutzten Projekte entfernen? - + Finnish Finnisch - + English Englisch - + Chinese (Simplified) Chinesisch (vereinfacht) - + Dutch Niederländisch - + French Französisch - + Italian Italienisch - + Korean Koreanisch - + Spanish Spanisch - + Swedish Schwedisch - + German Deutsch - + Russian Russisch - + Japanese Japanisch - + Serbian Serbisch @@ -976,20 +976,38 @@ Optionen: Wähle zu ignorierendes Verzeichnis + + QDialogButtonBox + + + OK + OK + + + + Cancel + Abbrechen + + + + Close + Schließen + + QObject - + Unknown language specified! Unbekannte Sprache angegeben! - + Language file %1 not found! Sprachdatei %1 nicht gefunden! - + Failed to load translation for language %1 from file %2 Die Übersetzungen der Sprache %1 konnten nicht aus der Datei %2 geladen werden @@ -1603,7 +1621,7 @@ Legen Sie unter dem Menü Ansicht fest, welche Arten von Fehlern angezeigt werde TranslationHandler - + Failed to change the user interface language: %1 @@ -1616,7 +1634,7 @@ The user interface language has been reset to English. Open the Preferences-dial Die Sprache wurde auf Englisch zurückgesetzt. Öffnen Sie den Einstellungen-Dialog um eine verfügbare Sprache auszuwählen. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_es.ts b/gui/cppcheck_es.ts index 0de073e52..352107416 100644 --- a/gui/cppcheck_es.ts +++ b/gui/cppcheck_es.ts @@ -706,67 +706,67 @@ Do you want to remove the file from the recently used projects -list? - + English English - + Dutch Holandés - + Chinese (Simplified) - + Finnish Finés - + French - + Italian - + Korean - + Spanish - + Swedish Sueco - + German Alemán - + Russian Ruso - + Japanese Japonés - + Serbian Servio @@ -941,20 +941,38 @@ Options: + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + Cerrar + + QObject - + Unknown language specified! - + Language file %1 not found! ¡Fichero de idioma %1 no encontrado! - + Failed to load translation for language %1 from file %2 Fallo al cargar la traducción para el idioma %1 desde el fichero %2 @@ -1565,7 +1583,7 @@ Para cambiar el tipo de comportamiento, abrir el menú vista. TranslationHandler - + Failed to change the user interface language: %1 @@ -1574,7 +1592,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts index 8cd812944..ceeca7fa7 100644 --- a/gui/cppcheck_fi.ts +++ b/gui/cppcheck_fi.ts @@ -708,68 +708,68 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Suomi - + English Englanti - + Chinese (Simplified) - + Dutch - + French - + Italian - + Korean - + Spanish - + Swedish Ruotsi - + German Saksa - + Russian Venäjä - + Japanese Japanease - + Serbian @@ -944,21 +944,39 @@ Options: + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + + + QObject - + Unknown language specified! - + Language file %1 not found! Language file %1.qm not found! Käännöstiedostoa %1 ei löytynyt! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Käänöksen lataaminen kielelle %1 tiedostosta %2 epäonnistui @@ -1569,7 +1587,7 @@ Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valik TranslationHandler - + Failed to change the user interface language: %1 @@ -1578,7 +1596,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_fr.ts b/gui/cppcheck_fr.ts index 0dd73ac21..444ab27a7 100644 --- a/gui/cppcheck_fr.ts +++ b/gui/cppcheck_fr.ts @@ -742,6 +742,21 @@ Options: + + QDialogButtonBox + + OK + + + + Cancel + + + + Close + + + QObject diff --git a/gui/cppcheck_it.ts b/gui/cppcheck_it.ts index d9984ec77..7e25f5d93 100644 --- a/gui/cppcheck_it.ts +++ b/gui/cppcheck_it.ts @@ -744,67 +744,67 @@ Do you want to remove the file from the recently used projects -list? Vuoi rimuovere il file dalla lista dei progetti recentemente usati? - + Finnish Finnish - + English English - + Chinese (Simplified) - + Dutch Dutch - + French French - + Italian Italian - + Korean Korean - + Spanish Spanish - + Swedish Swedish - + German German - + Russian Russian - + Japanese Japanese - + Serbian Serbian @@ -979,20 +979,38 @@ Options: Seleziona la cartella da ignorare + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + Chiudi + + QObject - + Unknown language specified! Lingua specificata sconosciuta! - + Language file %1 not found! Il file di lingua %1 non trovato! - + Failed to load translation for language %1 from file %2 Fallito il tentativo di aprire la traduzione per la lingua %1 dal file %2 @@ -1606,7 +1624,7 @@ Per vedere il tipo di errori che sono mostrati, apri il menu Visualizza. TranslationHandler - + Failed to change the user interface language: %1 @@ -1619,7 +1637,7 @@ The user interface language has been reset to English. Open the Preferences-dial L'interfaccia utente è stata risettata in Inglese. Apri la finestra di dialogo Preferenze per selezionare una qualunque lingua a disposizione. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_ja.ts b/gui/cppcheck_ja.ts index f041a64b1..3185e0396 100644 --- a/gui/cppcheck_ja.ts +++ b/gui/cppcheck_ja.ts @@ -707,68 +707,68 @@ Do you want to remove the file from the recently used projects -list? - + English 英語 - + Dutch オランダ語 - + Chinese (Simplified) - + Finnish フィンランド語 - + French フランス語 - + Italian - + Korean - + Spanish スペイン語 - + Swedish スウェーデン語 - + German ドイツ語 - + Russian ロシア語 - + Japanese Japanease 日本語 - + Serbian セルビア語 @@ -943,20 +943,38 @@ Options: + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + 閉じる + + QObject - + Unknown language specified! 指定された未知の言語 - + Language file %1 not found! 言語ファイル %1 が見つかりません! - + Failed to load translation for language %1 from file %2 @@ -1567,7 +1585,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1576,7 +1594,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_ko.ts b/gui/cppcheck_ko.ts index d4ac3f863..9a3219a0f 100644 --- a/gui/cppcheck_ko.ts +++ b/gui/cppcheck_ko.ts @@ -786,6 +786,21 @@ Options: 무시할 디렉토리 선택 + + QDialogButtonBox + + OK + + + + Cancel + + + + Close + 닫기 + + QObject diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts index 6ad22d5bd..1d2ad8bf8 100644 --- a/gui/cppcheck_nl.ts +++ b/gui/cppcheck_nl.ts @@ -708,68 +708,68 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Fins - + English Engels - + Chinese (Simplified) - + Dutch Nederlands - + French - + Italian - + Korean - + Spanish - + Swedish Zweeds - + German Duits - + Russian Russisch - + Japanese Japanease - + Serbian @@ -944,21 +944,39 @@ Options: + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + + + QObject - + Unknown language specified! - + Language file %1 not found! Language file %1.qm not found! Kon het taalbestand niet vinden: %1! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Kon de vertaling voor taal %1 in bestand %2 niet laden @@ -1569,7 +1587,7 @@ Gebruik het uitzicht menu om te selecteren welke fouten getoond worden. TranslationHandler - + Failed to change the user interface language: %1 @@ -1578,7 +1596,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts index 59c775d56..27bf3c2a5 100644 --- a/gui/cppcheck_ru.ts +++ b/gui/cppcheck_ru.ts @@ -743,68 +743,68 @@ Do you want to remove the file from the recently used projects -list? Хотите удалить его из списка проектов? - + Finnish Финский - + English Английский - + Chinese (Simplified) Китайский (упрощенный) - + Dutch Голландский - + French Французский - + Italian Итальянский - + Korean Корейский - + Spanish Испанский - + Swedish Шведский - + German Немецкий - + Russian Русский - + Japanese Japanease Японский - + Serbian Сербский @@ -979,21 +979,39 @@ Options: Выберите директорию, которую надо проигнорировать + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + Закрыть + + QObject - + Unknown language specified! Неизвестный язык! - + Language file %1 not found! Language file %1.qm not found! Языковой файл %1 не найден! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Ошибка загрузки переводов для языка %1 из файла %2 @@ -1601,7 +1619,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1614,7 +1632,7 @@ The user interface language has been reset to English. Open the Preferences-dial The user interface language has been reset to English. Open the Preferences-dialog to select any of the available languages. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_sr.ts b/gui/cppcheck_sr.ts index 268fc5a00..eedc40427 100644 --- a/gui/cppcheck_sr.ts +++ b/gui/cppcheck_sr.ts @@ -705,67 +705,67 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Finski - + English Engleski - + Chinese (Simplified) - + Dutch Holandski - + French Francuski - + Italian - + Korean - + Spanish Španski - + Swedish Švedski - + German Nemački - + Russian Ruski - + Japanese Japanski - + Serbian Srpski @@ -940,20 +940,38 @@ Options: + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + + + QObject - + Unknown language specified! - + Language file %1 not found! Could not find the file: %1! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2 @@ -1561,7 +1579,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1570,7 +1588,7 @@ The user interface language has been reset to English. Open the Preferences-dial - + Cppcheck Cppcheck diff --git a/gui/cppcheck_sv.ts b/gui/cppcheck_sv.ts index f1c4471b3..ecf19dccd 100644 --- a/gui/cppcheck_sv.ts +++ b/gui/cppcheck_sv.ts @@ -739,68 +739,68 @@ Do you want to remove the file from the recently used projects -list? - + Finnish Finska - + English Engelska - + Chinese (Simplified) - + Dutch Nederländska - + French Franska - + Italian - + Korean - + Spanish - + Swedish Svenska - + German Tyska - + Russian Ryska - + Japanese Japanease Japanska - + Serbian Serbiska @@ -975,21 +975,39 @@ Options: Välj sökväg att ignorera + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + Stäng + + QObject - + Unknown language specified! Okänt språk valt! - + Language file %1 not found! Language file %1.qm not found! Språk filen %1 hittades ej! - + Failed to load translation for language %1 from file %2 Failed to load translation for language %1 from file %2.qm Misslyckades med att ladda översättningen för %1 från filen %2 @@ -1602,7 +1620,7 @@ För att ställa in vilka fel som skall visas använd visa menyn. TranslationHandler - + Failed to change the user interface language: %1 @@ -1615,7 +1633,7 @@ The user interface language has been reset to English. Open the Preferences-dial Språket har nollställts till Engelska. Öppna Preferences och välj något av de tillgängliga språken. - + Cppcheck Cppcheck diff --git a/gui/cppcheck_zh_CN.ts b/gui/cppcheck_zh_CN.ts index 0a29864f8..9473eeed5 100644 --- a/gui/cppcheck_zh_CN.ts +++ b/gui/cppcheck_zh_CN.ts @@ -743,68 +743,68 @@ Do you want to remove the file from the recently used projects -list? 你要从最近使用的项目列表中删除此文件吗？ - + English 英語 - + Dutch 荷兰语 - + Chinese (Simplified) - + Finnish 芬兰语 - + French 法语 - + Italian 意大利语 - + Korean 韩文 - + Spanish 西班牙语 - + Swedish 瑞典语 - + German 德语 - + Russian 俄语 - + Japanese Japanease 日语 - + Serbian 塞尔维亚语 @@ -979,20 +979,38 @@ Options: 选择忽略的目录 + + QDialogButtonBox + + + OK + + + + + Cancel + + + + + Close + 关闭 + + QObject - + Unknown language specified! 指定了未知语言！ - + Language file %1 not found! 语言文件 %1 不存在！ - + Failed to load translation for language %1 from file %2 无法从文件 %2 中为语言 %1 加载翻译文件 @@ -1608,7 +1626,7 @@ To toggle what kind of errors are shown, open view menu. TranslationHandler - + Failed to change the user interface language: %1 @@ -1621,7 +1639,7 @@ The user interface language has been reset to English. Open the Preferences-dial 用户界面语言已被重置为英语。打开“首选项”对话框，选择任何可用的语言。 - + Cppcheck Cppcheck diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp index 42dc152a6..a18ac76d3 100644 --- a/gui/translationhandler.cpp +++ b/gui/translationhandler.cpp @@ -23,6 +23,14 @@ #include #include "translationhandler.h" +// Provide own translations for standard buttons. This (garbage) code is needed to enforce them to appear in .ts files even after "lupdate gui.pro" +static void unused() +{ + QT_TRANSLATE_NOOP("QDialogButtonBox", "OK"); + QT_TRANSLATE_NOOP("QDialogButtonBox", "Cancel"); + QT_TRANSLATE_NOOP("QDialogButtonBox", "Close"); +} + TranslationHandler::TranslationHandler(QObject *parent) : QObject(parent), mCurrentLanguage("en"),