Am Mittwoch, den 08.02.2006, 23:07 +0100 schrieb Jens Seidel:
> My locale is the same. I tried it again and this time it worked, I'm
> confused. So I created the package again from a clean darcs checkout.
> Now it fails again. I tried both
> msgid "Encoding of README|UTF-8"
> msgstr "ISO_8859-1"
>
> and
>
> msgid "Encoding of README|UTF-8"
> msgstr "UTF-8"
>
> without effect. After reinstalling version 0.4.1-1 from the archive it
> works again.
So, Daniel, it seems that you need to check this regression.
Apart of this, I've splittet into smaller patches Jens' patch, and
applied the ones I think can be safely applied. The other are attached
to this mail, and i think you should review them. I've sent the rest to
daniel as a patch to his darcs repository.
diff -rN -u old-aptitude/src/vscreen/fragment.cc new-aptitude/src/vscreen/fragment.cc
--- old-aptitude/src/vscreen/fragment.cc 2006-02-05 18:50:00.000000000 +0100
+++ new-aptitude/src/vscreen/fragment.cc 2006-02-05 18:50:03.000000000 +0100
@@ -1367,8 +1367,6 @@
arguments[i].F=va_arg(arglst, fragment *);
break;
case 's':
- arguments[i].s=va_arg(arglst, const char *);
- break;
case 'S':
arguments[i].s=va_arg(arglst, const char *);
break;
diff -rN -u old-aptitude/po/Makevars new-aptitude/po/Makevars
--- old-aptitude/po/Makevars 2006-02-05 18:49:58.000000000 +0100
+++ new-aptitude/po/Makevars 2006-02-05 18:50:01.000000000 +0100
@@ -18,8 +18,6 @@
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-#
-# (is that correct for aptitude?)
COPYRIGHT_HOLDER = Daniel Burrows <[EMAIL PROTECTED]>
# This is the email address or URL to which the translators shall report
diff -rN -u old-aptitude/src/broken_indicator.cc new-aptitude/src/broken_indicator.cc
--- old-aptitude/src/broken_indicator.cc 2006-02-05 18:49:59.000000000 +0100
+++ new-aptitude/src/broken_indicator.cc 2006-02-05 18:50:02.000000000 +0100
@@ -323,7 +323,6 @@
state.generated_solutions);
fragments.push_back(fragf("%s ", countstr.c_str()));
- fragments.push_back(fragf(_("Suggest ")));
vector<fragment *> suggestions;
@@ -357,8 +356,10 @@
downgrade_count),
downgrade_count)));
- fragments.push_back(join_fragments(suggestions,
- L","));
+ /* ForTranslators: %F is replaced with a comma separated list such as
+ "n1 installs, n2 removals", ...
+ */
+ fragments.push_back(fragf(_("Suggest %F"), join_fragments(suggestions, L", ")));
if(state.background_thread_active)
{
diff -rN -u old-aptitude/src/ui.cc new-aptitude/src/ui.cc
--- old-aptitude/src/ui.cc 2006-02-05 18:50:00.000000000 +0100
+++ new-aptitude/src/ui.cc 2006-02-05 18:50:02.000000000 +0100
@@ -881,15 +881,17 @@
{
char buf[512];
- snprintf(buf, 512, HELPDIR "/%s", _("README")); // README can be translated..
+ snprintf(buf, 512, HELPDIR "/%s", _("README")); // README can be translated...
- const char *encoding=P_("Encoding of README|UTF-8");
+ const char *encoding=P_("Encoding of README|ISO_8859-1");
// Deal with missing localized docs.
if(access(buf, R_OK)!=0)
{
+ // encoding is latin1=ISO_8859-1, right?
+ // cannot open README in a German locale, why?
strncpy(buf, HELPDIR "/README", 512);
- encoding="UTF-8";
+ encoding="ISO_8859-1";
}
vs_table_ref t = vs_table::create();
