Here the patch with only i18n improvements changes. --
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
@@ -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.000000000 +0100
+++ new-aptitude/po/Makevars.template 2006-02-05 18:50:01.000000000 +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.000000000 +0100
+++ new-aptitude/src/apt_options.cc 2006-02-05 18:50:03.000000000 +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.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","));
+ /* 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.cc 2006-02-05
18:50:00.000000000 +0100
+++ new-aptitude/src/cmdline/cmdline_resolver.cc 2006-02-05
18:50:03.000000000 +0100
@@ -629,6 +629,7 @@
loc=0;
response='Y';
}
+// FIXME: translate Y, N
switch(toupper(response[loc]))
{
case 'Y':
diff -rN -u old-aptitude/src/mine/cmine.cc new-aptitude/src/mine/cmine.cc
--- old-aptitude/src/mine/cmine.cc 2006-02-05 18:50:00.000000000 +0100
+++ new-aptitude/src/mine/cmine.cc 2006-02-05 18:50:02.000000000 +0100
@@ -475,7 +475,7 @@
if(rand()<(RAND_MAX/3))
{
if(rand()<(RAND_MAX/2))
- add_status_widget(vs_label::create(_("The spikes were
poisoned! The poison was deadly.. --More--"),
+ add_status_widget(vs_label::create(_("The spikes were
poisoned! The poison was deadly... --More--"),
retr_status_color()));
add_status_widget(vs_label::create(_("You land on a set of
sharp iron spikes! --More--"),
diff -rN -u old-aptitude/src/pkg_grouppolicy.cc
new-aptitude/src/pkg_grouppolicy.cc
--- old-aptitude/src/pkg_grouppolicy.cc 2006-02-05 18:50:00.000000000 +0100
+++ new-aptitude/src/pkg_grouppolicy.cc 2006-02-05 18:50:03.000000000 +0100
@@ -166,7 +166,7 @@
section_descriptions["alien"]=transcode(_("Packages converted from foreign
formats (rpm, tgz, etc)\n Packages in the 'alien' section were created by the
'alien' program from a non-Debian package format such as RPM"));
section_descriptions["base"]=transcode(_("The Debian base system\n Packages
in the 'base' section are part of the initial system installation."));
- section_descriptions["comm"]=transcode(_("Programs for faxmodems and other
communications devices\n Packages in the 'comm' section are used to control
modems and other hardware communications devices. This includes software to
control faxmodems (for instance, PPP for dial-up internet connections and
programs originally written for that purpose, such as zmodem/kermit), as well
as software to control cellular phones, interface with FidoNet, and run a
BBS."));
+ section_descriptions["comm"]=transcode(_("Programs for faxmodems and other
communication devices\n Packages in the 'comm' section are used to control
modems and other hardware communications devices. This includes software to
control faxmodems (for instance, PPP for dial-up internet connections and
programs originally written for that purpose, such as zmodem/kermit), as well
as software to control cellular phones, interface with FidoNet, and run a
BBS."));
section_descriptions["devel"]=transcode(_("Utilities and programs for
software development\n Packages in the 'devel' section are used to write new
software and work on existing software. Non-programmers who do not compile
their own software probably do not need much software from this section.\n .\n
It includes compilers, debugging tools, programmer's editors, source processing
tools, and other things related to software development."));
section_descriptions["doc"]=transcode(_("Documentation and specialized
programs for viewing documentation\n Packages in the 'doc' section document
parts of the Debian system, or are viewers for documentation formats."));
section_descriptions["editors"]=transcode(_("Text editors and word
processors\n Packages in the 'editors' section allow you to edit plain ASCII
text. These are not necessarily word processors, although some word processors
may be found in this section."));
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();
@@ -2183,7 +2185,7 @@
N_("View a list of frequently asked questions"),
sigc::ptr_fun(do_help_faq)),
- vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^NEWS"), NULL,
+ vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^News"), NULL,
N_("View the important changes made in each version of "
PACKAGE),
sigc::ptr_fun(do_help_news)),
diff -rN -u old-aptitude/src/view_changelog.cc
new-aptitude/src/view_changelog.cc
--- old-aptitude/src/view_changelog.cc 2006-02-05 18:50:00.000000000 +0100
+++ new-aptitude/src/view_changelog.cc 2006-02-05 18:50:03.000000000 +0100
@@ -223,6 +223,6 @@
if(manager != NULL)
(new ui_download_manager(manager, true, false, false,
_("Downloading Changelog"),
- _(""),
+ "",
_("Download Changelog")))->start();
}
diff -rN -u old-aptitude/src/vscreen/config/keybindings.cc
new-aptitude/src/vscreen/config/keybindings.cc
--- old-aptitude/src/vscreen/config/keybindings.cc 2006-02-05
18:50:00.000000000 +0100
+++ new-aptitude/src/vscreen/config/keybindings.cc 2006-02-05
18:50:03.000000000 +0100
@@ -48,6 +48,7 @@
// lowercase; however, the routines to parse keys take this into account and
// convert the input to lowercase before checking it.
// FIXME: Function keys (F0-Fx) really ought to be handled specially
+// FIXME: Translate keys such as "enter" in menu
map<key, wstring> rev_keynames;
bool key_tables_initialized=false;
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;
signature.asc
Description: Digital signature
