From 8a419c491cf99e60dff697400a635303b6f75352 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Thu, 25 Oct 2012 14:11:05 +0000
Subject: [PATCH] Fix loadig of Qt plural translations

---
 po/cantata.pot | 29 ++++++++++++++---------------
 po/cs.po       | 29 ++++++++++++++---------------
 po/de.po       | 29 ++++++++++++++---------------
 po/es.po       | 29 ++++++++++++++---------------
 po/generate.sh | 10 +++++++---
 po/pl.po       | 29 ++++++++++++++---------------
 6 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/po/cantata.pot b/po/cantata.pot
index 69926160e..2d7ef4910 100644
--- a/po/cantata.pot
+++ b/po/cantata.pot
@@ -3349,84 +3349,83 @@ msgstr ""
  
 
 #: ../gui/tageditor.cpp:692 ../replaygain/rgdialog.cpp:398
-msgctxt "QObject|"
 msgid "Failed to update the tags of some tracks."
 msgstr ""
 
 #: ../qtplural.h:28
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track"
 msgstr ""
 
 #: ../qtplural.h:29
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks"
 msgstr ""
 
 #: ../qtplural.h:32
 #, qt-format
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track (%1)"
 msgstr ""
 
 #: ../qtplural.h:33
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks (%2)"
 msgstr ""
 
 #: ../qtplural.h:36
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Album"
 msgstr ""
 
 #: ../qtplural.h:37
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Albums"
 msgstr ""
 
 #: ../qtplural.h:40
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Artist"
 msgstr ""
 
 #: ../qtplural.h:41
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Artists"
 msgstr ""
 
 #: ../qtplural.h:44
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Stream"
 msgstr ""
 
 #: ../qtplural.h:45
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Streams"
 msgstr ""
 
 #: ../qtplural.h:48
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Entry"
 msgstr ""
 
 #: ../qtplural.h:49
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Entries"
 msgstr ""
 
 #: ../qtplural.h:52
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Rule"
 msgstr ""
 
 #: ../qtplural.h:53
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Rules"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 60f79d399..2386bb044 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3634,85 +3634,84 @@ msgid "Search %1..."
 msgstr "Hledání %1..."
 
 #: ../gui/tageditor.cpp:692 ../replaygain/rgdialog.cpp:398
-msgctxt "QObject|"
 msgid "Failed to update the tags of some tracks."
 msgstr "Nepodařilo se zaktualizovat značky některých skladeb."
 
 #: ../qtplural.h:28
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track"
 msgstr "Skladby: 1"
 
 #: ../qtplural.h:29
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks"
 msgstr "Skladby: 1%"
 
 #: ../qtplural.h:32
 #, qt-format
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track (%1)"
 msgstr "Skladby: 1 (%1)"
 
 #: ../qtplural.h:33
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks (%2)"
 msgstr "Skladby: 1% (%2)"
 
 #: ../qtplural.h:36
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Album"
 msgstr "Alba: 1"
 
 #: ../qtplural.h:37
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Albums"
 msgstr "Alba: 1%"
 
 #: ../qtplural.h:40
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Artist"
 msgstr "Umělci: 1"
 
 #: ../qtplural.h:41
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Artists"
 msgstr "Umělci: 1%"
 
 #: ../qtplural.h:44
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Stream"
 msgstr "Proudy: 1"
 
 #: ../qtplural.h:45
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Streams"
 msgstr "Proudy: 1%"
 
 #: ../qtplural.h:48
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Entry"
 msgstr "Položky: 1"
 
 #: ../qtplural.h:49
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Entries"
 msgstr "Položky: 1%"
 
 #: ../qtplural.h:52
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Rule"
 msgstr "Pravidla: 1"
 
 #: ../qtplural.h:53
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Rules"
 msgstr "Pravidla: 1%"
 
diff --git a/po/de.po b/po/de.po
index d951ff1e9..f41980c91 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3624,85 +3624,84 @@ msgid "Search %1..."
 msgstr "Suche %1..."
 
 #: ../gui/tageditor.cpp:692 ../replaygain/rgdialog.cpp:398
-msgctxt "QObject|"
 msgid "Failed to update the tags of some tracks."
 msgstr "Fehler beim aktualisieren einiger Stücke."
 
 #: ../qtplural.h:28
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track"
 msgstr "1 Stück"
 
 #: ../qtplural.h:29
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks"
 msgstr "%1 Stücke"
 
 #: ../qtplural.h:32
 #, qt-format
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track (%1)"
 msgstr "1 Stück (%1)"
 
 #: ../qtplural.h:33
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks (%2)"
 msgstr "%1 Stücke (%2)"
 
 #: ../qtplural.h:36
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Album"
 msgstr "1 Album"
 
 #: ../qtplural.h:37
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Albums"
 msgstr "%1 Alben"
 
 #: ../qtplural.h:40
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Artist"
 msgstr "1 Künstler"
 
 #: ../qtplural.h:41
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Artists"
 msgstr "%1 Künstler"
 
 #: ../qtplural.h:44
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Stream"
 msgstr "1 Stream"
 
 #: ../qtplural.h:45
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Streams"
 msgstr "%1 Streams"
 
 #: ../qtplural.h:48
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Entry"
 msgstr "1 Eintrag"
 
 #: ../qtplural.h:49
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Entries"
 msgstr "%1 Einträge"
 
 #: ../qtplural.h:52
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Rule"
 msgstr "1 Regel"
 
 #: ../qtplural.h:53
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Rules"
 msgstr "%1 Regeln"
 
diff --git a/po/es.po b/po/es.po
index 847704e44..b96a71f0a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3646,91 +3646,90 @@ msgid "Search %1..."
 msgstr "Buscar %1..."
 
 #: ../gui/tageditor.cpp:692 ../replaygain/rgdialog.cpp:398
-msgctxt "QObject|"
 msgid "Failed to update the tags of some tracks."
 msgstr ""
 
 #: ../qtplural.h:28
 #, fuzzy
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track"
 msgstr "1 pista"
 
 #: ../qtplural.h:29
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks"
 msgstr "1 pista"
 
 #: ../qtplural.h:32
 #, fuzzy, qt-format
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track (%1)"
 msgstr "1 pista (%2)"
 
 #: ../qtplural.h:33
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks (%2)"
 msgstr "1 pista (%2)"
 
 #: ../qtplural.h:36
 #, fuzzy
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Album"
 msgstr "1 álbum"
 
 #: ../qtplural.h:37
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Albums"
 msgstr "1 álbum"
 
 #: ../qtplural.h:40
 #, fuzzy
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Artist"
 msgstr "1 artista"
 
 #: ../qtplural.h:41
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Artists"
 msgstr "1 artista"
 
 #: ../qtplural.h:44
 #, fuzzy
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Stream"
 msgstr "1 flujo"
 
 #: ../qtplural.h:45
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Streams"
 msgstr "1 flujo"
 
 #: ../qtplural.h:48
 #, fuzzy
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Entry"
 msgstr "1 entrada"
 
 #: ../qtplural.h:49
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Entries"
 msgstr "1 entrada"
 
 #: ../qtplural.h:52
 #, fuzzy
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Rule"
 msgstr "1 norma"
 
 #: ../qtplural.h:53
 #, fuzzy, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Rules"
 msgstr "1 norma"
 
diff --git a/po/generate.sh b/po/generate.sh
index 7bfd1b4a5..6ec436fe3 100755
--- a/po/generate.sh
+++ b/po/generate.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-for app in extractrc xgettext msgmerge ; do
+for app in extractrc xgettext msgmerge lupdate lconvert msguniq sed grep ; do
     which $app > /dev/null 2>&1
     if [ $? -ne 0 ] ; then
         echo "ERROR: Could not find $app"
@@ -37,9 +37,13 @@ xgettext --from-code=UTF-8 -C -kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki1
 
 find .. -name '*.cpp' | xargs grep -l 'QObject::tr(' |  grep -v "solid-lite" | sort > ${WDIR}/infiles.qt.list
 echo "../qtplural.h" >> ${WDIR}/infiles.qt.list
-lupdate @infiles.qt.list -ts ${PROJECT}.ts && lconvert -i ${PROJECT}.ts -o ${PROJECT}_qt.po && msguniq -o ${PROJECT}_qt.pot ${PROJECT}_qt.po && rm ${PROJECT}.ts ${PROJECT}_qt.po
 
-#Fix charset...
+# If we just call lconvert this adds a msgctxt of "QObject|<any other context>" This seems to mess things up.
+# So, pipe the output of lconvert into sed to change "QObject|<any other context>" to "<any other context>", and then into
+# grep -Ev to remove any blank contexts...
+lupdate @infiles.qt.list -ts ${PROJECT}.ts && lconvert -i ${PROJECT}.ts -of po | sed s^QObject\|^^g | grep -Ev 'msgctxt ""' > ${PROJECT}_qt.po && msguniq -o ${PROJECT}_qt.pot ${PROJECT}_qt.po && rm ${PROJECT}.ts ${PROJECT}_qt.po
+
+Fix charset...
 cat ${PROJECT}_kde.pot | sed s^charset=CHARSET^charset=UTF-8^g > ${PROJECT}_kde.pot-new
 tail -n +7 ${PROJECT}_qt.pot | sed s^charset=CHARSET^charset=UTF-8^g > ${PROJECT}_qt.pot-new
 cat ${PROJECT}_kde.pot-new > ${PROJECT}.pot
diff --git a/po/pl.po b/po/pl.po
index d91e71818..63538411e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3658,85 +3658,84 @@ msgid "Search %1..."
 msgstr "Szukaj w: %1..."
 
 #: ../gui/tageditor.cpp:692 ../replaygain/rgdialog.cpp:398
-msgctxt "QObject|"
 msgid "Failed to update the tags of some tracks."
 msgstr "Uaktualnianie tagów niektórych plików nie powiodło się."
 
 #: ../qtplural.h:28
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track"
 msgstr "Utwory: 1"
 
 #: ../qtplural.h:29
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks"
 msgstr "Utwory: %1"
 
 #: ../qtplural.h:32
 #, qt-format
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Track (%1)"
 msgstr "Utwory: 1 (%1)"
 
 #: ../qtplural.h:33
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Tracks (%2)"
 msgstr "Utwory: %1 (%2)"
 
 #: ../qtplural.h:36
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Album"
 msgstr "Albumy: 1"
 
 #: ../qtplural.h:37
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Albums"
 msgstr "Albumy: %1"
 
 #: ../qtplural.h:40
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Artist"
 msgstr "Artyści: 1"
 
 #: ../qtplural.h:41
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Artists"
 msgstr "Artyści: %1"
 
 #: ../qtplural.h:44
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Stream"
 msgstr "Strumienie: 1"
 
 #: ../qtplural.h:45
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Streams"
 msgstr "Strumienie: %1"
 
 #: ../qtplural.h:48
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Entry"
 msgstr "Elementy: 1"
 
 #: ../qtplural.h:49
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Entries"
 msgstr "Elementy: %1"
 
 #: ../qtplural.h:52
-msgctxt "QObject|Singular"
+msgctxt "Singular"
 msgid "1 Rule"
 msgstr "Reguły: 1"
 
 #: ../qtplural.h:53
 #, qt-format
-msgctxt "QObject|Plural (N!=1)"
+msgctxt "Plural (N!=1)"
 msgid "%1 Rules"
 msgstr "Reguły: %1"