From 846ce2425763e175e0453f2b3c3a2feab35e58c9 Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Thu, 7 Jan 2010 22:28:25 +0100 Subject: [PATCH] rename translation files to <2 letter ISO code>.po - change sources accordingly - some minor .po header fixes --- po/CMakeLists.txt | 2 +- po/{quassel_cs.po => cs.po} | 0 po/{quassel_da.po => da.po} | 2 +- po/{quassel_de.po => de.po} | 0 po/{quassel_es_ES.po => es.po} | 0 po/{quassel_fi.po => fi.po} | 2 +- po/{quassel_fr.po => fr.po} | 2 +- po/{quassel_hu.po => hu.po} | 2 +- po/{quassel_it.po => it.po} | 0 po/{quassel_nb_NO.po => nb.po} | 0 po/{quassel_ru.po => ru.po} | 2 +- po/{quassel_sl.po => sl.po} | 1 - po/{quassel_tr_TR.po => tr.po} | 2 +- po/update.sh | 2 +- src/common/quassel.cpp | 2 +- src/qtui/settingspages/appearancesettingspage.cpp | 2 +- 16 files changed, 10 insertions(+), 11 deletions(-) rename po/{quassel_cs.po => cs.po} (100%) rename po/{quassel_da.po => da.po} (99%) rename po/{quassel_de.po => de.po} (100%) rename po/{quassel_es_ES.po => es.po} (100%) rename po/{quassel_fi.po => fi.po} (99%) rename po/{quassel_fr.po => fr.po} (99%) rename po/{quassel_hu.po => hu.po} (99%) rename po/{quassel_it.po => it.po} (100%) rename po/{quassel_nb_NO.po => nb.po} (100%) rename po/{quassel_ru.po => ru.po} (99%) rename po/{quassel_sl.po => sl.po} (99%) rename po/{quassel_tr_TR.po => tr.po} (99%) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index b6922bc5..9e1d70f0 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -6,7 +6,7 @@ if(QT_LCONVERT_EXECUTABLE) set(LINGUAS "$ENV{LINGUAS}") string(REGEX REPLACE "[ \t]+" \; output "${LINGUAS}") # Find more languages - file(GLOB avail_pofiles quassel_*.po qt_*.po) + file(GLOB avail_pofiles *.po qt_*.po) foreach(PO_FILE ${avail_pofiles}) get_filename_component(basename ${PO_FILE} NAME_WE) string(REGEX REPLACE "q[^_]+_([a-zA-Z]+)(_.+)?$" "\\1" lang ${basename}) diff --git a/po/quassel_cs.po b/po/cs.po similarity index 100% rename from po/quassel_cs.po rename to po/cs.po diff --git a/po/quassel_da.po b/po/da.po similarity index 99% rename from po/quassel_da.po rename to po/da.po index d47d266a..0e9ff395 100644 --- a/po/quassel_da.po +++ b/po/da.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: da_DK\n" +"Content-Type: text/plain; charset=UTF-8\n" #~ msgid "Day changed to %1" #~ msgstr "Dagen skiftede til %1" diff --git a/po/quassel_de.po b/po/de.po similarity index 100% rename from po/quassel_de.po rename to po/de.po diff --git a/po/quassel_es_ES.po b/po/es.po similarity index 100% rename from po/quassel_es_ES.po rename to po/es.po diff --git a/po/quassel_fi.po b/po/fi.po similarity index 99% rename from po/quassel_fi.po rename to po/fi.po index b4b6299d..75254fa5 100644 --- a/po/quassel_fi.po +++ b/po/fi.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: fi_FI\n" "X-Source-Language: en_US\n" +"Content-Type: text/plain; charset=UTF-8\n" #. ts-context AboutDlg #: ../src/qtui/aboutdlg.cpp:32 diff --git a/po/quassel_fr.po b/po/fr.po similarity index 99% rename from po/quassel_fr.po rename to po/fr.po index e9446c93..2a81fc2f 100644 --- a/po/quassel_fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: fr\n" +"Content-Type: text/plain; charset=UTF-8\n" #. ts-context @default #~ msgid "Day changed to %1" diff --git a/po/quassel_hu.po b/po/hu.po similarity index 99% rename from po/quassel_hu.po rename to po/hu.po index 42c8c560..d9aadb73 100644 --- a/po/quassel_hu.po +++ b/po/hu.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: hu_HU\n" +"Content-Type: text/plain; charset=UTF-8\n" #~ msgid "Day changed to %1" #~ msgstr "Nap váltása: %1" diff --git a/po/quassel_it.po b/po/it.po similarity index 100% rename from po/quassel_it.po rename to po/it.po diff --git a/po/quassel_nb_NO.po b/po/nb.po similarity index 100% rename from po/quassel_nb_NO.po rename to po/nb.po diff --git a/po/quassel_ru.po b/po/ru.po similarity index 99% rename from po/quassel_ru.po rename to po/ru.po index 0d3dab5d..785e088f 100644 --- a/po/quassel_ru.po +++ b/po/ru.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: ru\n" +"Content-Type: text/plain; charset=UTF-8\n" #~ msgid "Day changed to %1" #~ msgstr "День сменился на %1" diff --git a/po/quassel_sl.po b/po/sl.po similarity index 99% rename from po/quassel_sl.po rename to po/sl.po index 3bd3a254..63033c50 100644 --- a/po/quassel_sl.po +++ b/po/sl.po @@ -4,7 +4,6 @@ # Jure Repinc , 2009. msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: sl\n" "Last-Translator: Jure Repinc \n" "PO-Revision-Date: 2009-11-22 19:25+0100\n" diff --git a/po/quassel_tr_TR.po b/po/tr.po similarity index 99% rename from po/quassel_tr_TR.po rename to po/tr.po index 4b19cb9b..d2a1048c 100644 --- a/po/quassel_tr_TR.po +++ b/po/tr.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"X-Virgin-Header: remove this line if you change anything in the header.\n" "X-Language: tr\n" +"Content-Type: text/plain; charset=UTF-8\n" #~ msgid "Day changed to %1" #~ msgstr "Gün %1 olarak değişti" diff --git a/po/update.sh b/po/update.sh index f08443dd..13013680 100755 --- a/po/update.sh +++ b/po/update.sh @@ -8,7 +8,7 @@ fi CONV=lconvert POT=quassel.pot -BASE=quassel_$1 +BASE=$1 PO=$BASE.po TS=$BASE.ts diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index e6e20725..864403d8 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -420,5 +420,5 @@ void Quassel::loadTranslation(const QLocale &locale) { bool success = qtTranslator->load(QString("qt_%1").arg(locale.name()), translationDirPath()); if(!success) qtTranslator->load(QString("qt_%1").arg(locale.name()), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - quasselTranslator->load(QString("quassel_%1").arg(locale.name()), translationDirPath()); + quasselTranslator->load(QString("%1").arg(locale.name()), translationDirPath()); } diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp index 19d2d9c8..22ecd04d 100644 --- a/src/qtui/settingspages/appearancesettingspage.cpp +++ b/src/qtui/settingspages/appearancesettingspage.cpp @@ -75,7 +75,7 @@ void AppearanceSettingsPage::initStyleComboBox() { } void AppearanceSettingsPage::initLanguageComboBox() { - QDir i18nDir(Quassel::translationDirPath(), "quassel_*.qm"); + QDir i18nDir(Quassel::translationDirPath(), "*.qm"); foreach(QString translationFile, i18nDir.entryList()) { QString localeName(translationFile.mid(8)); -- 2.20.1