From: David Planella
Date: Fri, 4 Dec 2009 22:48:43 +0000 (+0100)
Subject: Merged duplicate msgid and translations with msguniq
X-Git-Tag: 0.6-beta1~90
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=d1592fdad29ac39ccdb54cab0472e8ff5de32590;p=quassel.git
Merged duplicate msgid and translations with msguniq
In order for gettext tools such as msgmerge and msgfmt to work with PO
files, these must have a valid format. Therefore duplicate msgid must be
merged into single ones, which is what has been done to the current
translations. The following command has been used (using Italian as an
example):
msguniq --use-first quassel_it.po > it.po && rm quassel_it.po
Note that some of the PO header files had to be fixed manually prior to
executing the command, so that they had the right format.
Additionally, the file names have been renamed to ll.po (where ll is the
language code). While this is just a minor detail, I believe it makes
sense to use the same naming convention as gettext-based OSS projects.
---
diff --git a/po/cs.po b/po/cs.po
index b13ea997..2001e340 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -24,33 +24,26 @@ msgstr "Verze: %1
Verze protokolu: %2
SloženÃ: %3"
#: ../src/qtui/aboutdlg.cpp:46
msgid ""
"A modern, distributed IRC Client
©2005-2009 by the "
-"Quassel Project
http://quassel-irc.org
#quassel on Freenode
Quassel IRC is "
-"dual-licensed under GPLv2 and GPLv3.
Most icons "
-"are © by the Oxygen Team "
-"and used under the LGPL.
Please use "
-"http://bugs.quassel-irc.org to "
-"report bugs."
+"Quassel Project
http://quassel-irc."
+"org
#quassel on Freenode
Quassel IRC is dual-"
+"licensed under GPLv2 "
+"and GPLv3.
Most "
+"icons are © by the Oxygen Team"
+"a> and used under the LGPL.
Please use http://bugs.quassel-irc.org to report bugs."
msgstr ""
"A ModernÃ, distribuovaný IRC Client
VytvoÅený ©2005-2008 "
-"Quassel Project
http://quassel-irc.org
#quassel na Freenode
Quassel IRC je "
-"duálnÄ-licencován pod GPLv2 a GPLv3.
VÄtÅ¡ina ikon "
-"náležà © Oxygen Teamu pod "
-"licencà LGPL.
ProsÃme "
-"použijte http://bugs.quassel-irc.org pro "
-"hlášenà chyb."
+"Quassel Project
http://quassel-irc."
+"org
#quassel na Freenode
Quassel IRC je duálnÄ-"
+"licencován pod GPLv2 "
+"a GPLv3.
VÄtÅ¡ina "
+"ikon náležà © Oxygen Teamu "
+"pod licencà LGPL."
+"
ProsÃme použijte http://bugs."
+"quassel-irc.org pro hlášenà chyb."
#. ts-context AboutDlg
#: ../src/qtui/aboutdlg.cpp:62
@@ -69,33 +62,29 @@ msgstr ""
#. ts-context AboutDlg
#: ../src/qtui/aboutdlg.cpp:128
msgid ""
-"Special thanks goes to:
- John \"nox\" Hand
- for "
-"the original Quassel icon - The All-Seeing Eye
- The Oxygen Team
- for "
-"creating all the artwork you see throughout Quassel
- Qt Software formerly known as "
-"Trolltech
- for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more
- for keeping Qt alive, and for "
-"sponsoring development of Quassel Mobile with N810s
"
+"Special thanks goes to:
- "
+"John \"nox\" Hand
- for the original Quassel icon - The All-"
+"Seeing Eye
- The Oxygen Team
- for creating all the "
+"artwork you see throughout Quassel
- Qt Software formerly known "
+"as Trolltech
- for creating Qt and Qtopia, and for sponsoring "
+"development of QuasselTopia with Greenphones and more
- for "
+"keeping Qt alive, and for sponsoring development of Quassel Mobile with "
+"N810s
"
msgstr ""
-"ZvláštÄ bychom rádi podÄkovali:
- Johnu \"nox\" "
-"Handovi
- pro skvÄlý artwork a Quassel logo/ikonku
- Oxygen Team
- pro "
-"vytvoÅenà vÄtÅ¡iny ostatnÃch skvÄlých ikon, které můžete vidÄt vÅ¡ude možnÄ v "
-"aplikaci
- Qt Software (dÅÃve znám jako "
-"Trolltech)
- za vytvoÅenà Qt a Qtopia, a pro sponzorovánà "
-"vývoje QuasselTopia s Greenphones a dalÅ¡Ãch
- pro udržovánà Qt naživu, a pro "
-"sponzorovánà vývoje Quassel Mobile N810
"
+"ZvláštÄ bychom rádi podÄkovali:
- Johnu \"nox\" Handovi
- pro skvÄlý artwork a Quassel "
+"logo/ikonku
- Oxygen Team
- pro vytvoÅenà vÄtÅ¡iny "
+"ostatnÃch skvÄlých ikon, které můžete vidÄt vÅ¡ude možnÄ v aplikaci"
+"dd>
- Qt Software (dÅÃve znám jako Trolltech)
- za "
+"vytvoÅenà Qt a Qtopia, a pro sponzorovánà vývoje QuasselTopia s Greenphones "
+"a dalÅ¡Ãch
- pro udržovánà Qt naživu, a pro sponzorovánà "
+"vývoje Quassel Mobile N810
"
#. ts-context AboutDlg
#: ../src/qtui/ui/aboutdlg.ui:17
@@ -105,41 +94,40 @@ msgstr "O aplikaci Quassel"
#. ts-context AboutDlg
#: ../src/qtui/ui/aboutdlg.ui:59
msgid ""
-"\n"
-"Quassel "
-"IRC
"
+"Quassel IRC
Quassel IRC