[Aptitude-devel] Several i18n patches and updated German translation

[Jens Seidel]

On Wed, Feb 20, 2008 at 05:54:56PM -0800, Daniel Burrows wrote:
>   OK, I've applied your patches.  I'll commit them to the main branch
> once I get off this bus and have Internet access again.

Thanks a lot. I will send further translation patches directly to
Christian. Nevertheless there is still a remaining patch:

po/ja.po

This file was invalid and "make" failed. I fixed it and marked the message
fuzzy.

diff -r e3781fc33ca0 src/cmdline/cmdline_resolver.cc
--- a/src/cmdline/cmdline_resolver.cc	Wed Feb 20 19:54:48 2008 -0800
+++ b/src/cmdline/cmdline_resolver.cc	Thu Feb 21 10:02:09 2008 +0100
@@ -271,6 +271,7 @@ static void reject_or_mandate_version(co
 
       if(in.eof())
 	{
+    /* ForTranslators: Do not translate UNINST */
 	  cerr << ssprintf(_("Expected a version or \"UNINST\" after \"%s\""), pkgname.c_str()) << endl;
 	  return;
 	}

It seems indeed that you require that UNINST is not translated. So
please add this comment.

diff -r e3781fc33ca0 src/download_screen.h
--- a/src/download_screen.h	Wed Feb 20 19:54:48 2008 -0800
+++ b/src/download_screen.h	Thu Feb 21 10:02:09 2008 +0100
@@ -31,6 +31,8 @@
 #include <cwidget/widgets/subtree.h>
 
 #include <apt-pkg/acquire.h>
+
+#include <map>
 
 class download_item;
 
If you use std::map you have to include the header file :-) There is
otherwise a compilation error (with gcc 4.2.3, normally I even use
the gcc 4.3 snapshot).

diff -r e3781fc33ca0 src/generic/apt/matchers.cc
--- a/src/generic/apt/matchers.cc	Wed Feb 20 19:54:48 2008 -0800
+++ b/src/generic/apt/matchers.cc	Thu Feb 21 10:02:09 2008 +0100
@@ -367,7 +367,9 @@ namespace
     matcher_type type;
   };
 
-  // ForTranslators: these strings can be translated to allow your
+  const matcher_info matcher_types[] =
+  {
+  // ForTranslators: these "Matcher Type|" strings can be translated to allow your
   // users to specify match terms in their native tongue.  Each is
   // translated using the usual rule for pipe-tagged messages, so you
   // can just delete the pipe (|) and everything preceding it in your
@@ -389,8 +391,6 @@ namespace
   // That is: if you translate "Matcher Type|false" to "description",
   // "description" would still produce a description matcher, not a
   // false matcher, because the English meaning takes precedence.
-  const matcher_info matcher_types[] =
-  {
     { N_("Matcher Type|action"), matcher_type_action },
     { N_("Matcher Type|all-versions"), matcher_type_all },
     { N_("Matcher Type|and"), matcher_type_and },

Without this move the comment will not occur in PO files. So please
apply.

See the attached patch for details.

Thanks,
Jens
-------------- next part --------------
A non-text attachment was scrubbed...
Name: aptitude.diff
Type: text/x-patch
Size: 2611 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/aptitude-devel/attachments/20080221/724b02c3/attachment.bin