rename translation files to <2 letter ISO code>.po

- change sources accordingly
- some minor .po header fixes

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index b6922bc..9e1d70f 100644 (file)
--- 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
   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})
   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 d47d266..0e9ff39 100644 (file)
--- a/po/quassel_da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"X-Virgin-Header: remove this line if you change anything in the header.\n"

 "X-Language: da_DK\n"
 "X-Language: da_DK\n"

+"Content-Type: text/plain; charset=UTF-8\n"

 
 #~ msgid "Day changed to %1"
 #~ msgstr "Dagen skiftede til %1"
 
 #~ 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 b4b6299..75254fa 100644 (file)
--- a/po/quassel_fi.po
+++ b/po/fi.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, 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"
 "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
 
 #. 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 e9446c9..2a81fc2 100644 (file)
--- a/po/quassel_fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"X-Virgin-Header: remove this line if you change anything in the header.\n"

 "X-Language: fr\n"
 "X-Language: fr\n"

+"Content-Type: text/plain; charset=UTF-8\n"

 
 #. ts-context @default
 #~ msgid "Day changed to %1"
 
 #. 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 42c8c56..d9aadb7 100644 (file)
--- a/po/quassel_hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"X-Virgin-Header: remove this line if you change anything in the header.\n"

 "X-Language: hu_HU\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"
 
 #~ 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 0d3dab5..785e088 100644 (file)
--- a/po/quassel_ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"X-Virgin-Header: remove this line if you change anything in the header.\n"

 "X-Language: ru\n"
 "X-Language: ru\n"

+"Content-Type: text/plain; charset=UTF-8\n"

 
 #~ msgid "Day changed to %1"
 #~ msgstr "День сменился на %1"
 
 #~ 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 3bd3a25..63033c5 100644 (file)
--- a/po/quassel_sl.po
+++ b/po/sl.po
@@ -4,7 +4,6 @@
 # Jure Repinc <jlp@holodeck1.com>, 2009.
 msgid ""
 msgstr ""
 # Jure Repinc <jlp@holodeck1.com>, 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 <jlp@holodeck1.com>\n"
 "PO-Revision-Date: 2009-11-22 19:25+0100\n"
 "X-Language: sl\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\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 4b19cb9..d2a1048 100644 (file)
--- a/po/quassel_tr_TR.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"X-Virgin-Header: remove this line if you change anything in the header.\n"

 "X-Language: tr\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"
 
 #~ msgid "Day changed to %1"
 #~ msgstr "Gün %1 olarak değişti"

diff --git a/po/update.sh b/po/update.sh
index f08443d..1301368 100755 (executable)
--- a/po/update.sh
+++ b/po/update.sh
@@ -8,7 +8,7 @@ fi
 
 CONV=lconvert
 POT=quassel.pot
 
 CONV=lconvert
 POT=quassel.pot

-BASE=quassel_$1
+BASE=$1

 PO=$BASE.po
 TS=$BASE.ts
 
 PO=$BASE.po
 TS=$BASE.ts
 

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index e6e2072..864403d 100644 (file)
--- 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));
   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 19d2d9c..22ecd04 100644 (file)
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -75,7 +75,7 @@ void AppearanceSettingsPage::initStyleComboBox() {
 }
 
 void AppearanceSettingsPage::initLanguageComboBox() {
 }
 
 void AppearanceSettingsPage::initLanguageComboBox() {

-  QDir i18nDir(Quassel::translationDirPath(), "quassel_*.qm");
+  QDir i18nDir(Quassel::translationDirPath(), "*.qm");

 
   foreach(QString translationFile, i18nDir.entryList()) {
     QString localeName(translationFile.mid(8));
 
   foreach(QString translationFile, i18nDir.entryList()) {
     QString localeName(translationFile.mid(8));