[Aptitude-devel] Bug#720186: Bug#720186: German translation confusing

[Axel Beckert]

Control: tag -1 + pending patch

Hi Manuel,

Manuel A. Fernandez Montecelo wrote:
> I don't think that a fix for this was commited to the VCS,

It was committed but never pushed due to pending workflow questions.

See http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=16;bug=720186

> and it did not make it to the last release, so unmarking it as
> pending.

Granted. I nevertheless still have those commits (and some more :-) so
tagging again as pending, since I'm ready to push, I'm just unsure
where to push them, i.e. to which branch.

I've got:

+ 1 upstream fix for #720186
+ 1 debian packaging fix to fix a lintian warning
+ 1 debian packaging fix to fix a lintian warning, fixed in today's upload, too

Where can I push which one (the last one will be dropped of couse)
after rebasing on top of the current git branches?

> If anybody can tell what's the right thing to do, either 'schl' or
> 'opt', we can fix it even if not knowing German ourselves :-)

Not needed. The fix already exists. :-)

Here's the patch waiting for me to be pushed somewhere:

commit 4157c7e72ac597c548a416b5a6b6151667048ec1
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu Aug 29 18:47:39 2013 +0200

    Fix inconsistent German translations (Closes: #720186)

diff --git a/po/de.po b/po/de.po
index 1d4f724..99a4856 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: aptitude 0.6.6-1\n"
 "Report-Msgid-Bugs-To: aptitude at packages.debian.org\n"
 "POT-Creation-Date: 2012-11-04 19:55+0800\n"
-"PO-Revision-Date: 2012-06-03 12:22+0800\n"
+"PO-Revision-Date: 2013-08-29 18:46+0200\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
 "Language: \n"
@@ -5790,7 +5790,7 @@ msgstr " -q             Keine Fortschrittsanzeige im Befehlszeilenmodus\n"
 #: src/main.cc:250
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
-msgstr " -o opt=wert    Die Konfigurationsoption »schl« direkt setzen\n"
+msgstr " -o schl=wert    Die Konfigurationsoption »schl« direkt setzen\n"
 
 #: src/main.cc:251
 #, c-format


		Regards, Axel
-- 
 ,''`.  |  Axel Beckert <abe at debian.org>, http://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE
  `-    |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5