Here the patch with only i18n improvements changes.
--
diff -rN -u old-aptitude/po/Makevars new-aptitude/po/Makevars
--- old-aptitude/po/Makevars2006-02-05 18:49:58.0 +0100
+++ new-aptitude/po/Makevars2006-02-05 18:50:01.0 +0100
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_
--add-comments="Translators:"
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
@@ -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
@@ -36,8 +34,8 @@
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS = [EMAIL PROTECTED]
+MSGID_BUGS_ADDRESS = [EMAIL PROTECTED]
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
+EXTRA_LOCALE_CATEGORIES =
diff -rN -u old-aptitude/po/Makevars.template new-aptitude/po/Makevars.template
--- old-aptitude/po/Makevars.template 2006-02-05 18:49:58.0 +0100
+++ new-aptitude/po/Makevars.template 2006-02-05 18:50:01.0 +0100
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_
--add-comments="Translators:"
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
@@ -18,7 +18,7 @@
# 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.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+COPYRIGHT_HOLDER = Daniel Burrows <[EMAIL PROTECTED]>
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
@@ -34,7 +34,7 @@
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS =
+MSGID_BUGS_ADDRESS = [EMAIL PROTECTED]
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
diff -rN -u old-aptitude/src/apt_options.cc new-aptitude/src/apt_options.cc
--- old-aptitude/src/apt_options.cc 2006-02-05 18:50:00.0 +0100
+++ new-aptitude/src/apt_options.cc 2006-02-05 18:50:03.0 +0100
@@ -168,7 +168,7 @@
option_item(N_("Forget which packages are \"new\" whenever packages are
installed or removed"),
PACKAGE "::Forget-New-On-Install",
false),
- option_item(N_("Do not display a warning when the first change is made in
read-only mode."),
+ option_item(N_("Do not display a warning when the first change is made in
read-only mode"),
PACKAGE "::Suppress-Read-Only-Warning",
false),
option_item(N_("Warn when attempting to perform a privileged action as a
non-root user"),
diff -rN -u old-aptitude/src/broken_indicator.cc
new-aptitude/src/broken_indicator.cc
--- old-aptitude/src/broken_indicator.cc2006-02-05 18:49:59.0
+0100
+++ new-aptitude/src/broken_indicator.cc2006-02-05 18:50:02.0
+0100
@@ -323,7 +323,6 @@
state.generated_solutions);
fragments.push_back(fragf("%s ", countstr.c_str()));
-fragments.push_back(fragf(_("Suggest ")));
vector suggestions;
@@ -357,8 +356,10 @@
downgrade_count),
downgrade_count)));
-fragments.push_back(join_fragments(suggestions,
- L","));
+/* Translators: %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/cmdline/cmdline_resolver.cc
new-aptitude/src/cmdline/cmdline_resolver.cc
--- old-aptitude/src/cmdline/cmdline_resolver.cc2006-02-05
18:50:00.0 +0100
+++ new-aptitude/src/cmdline/cmdline_resolver.cc2006-02-05
18:50:03.0 +0100
@@ -629,6 +629,7 @@
