[Aptitude-devel] r3185 - in branches/aptitude-0.3/aptitude: . src

Daniel Burrows dburrows@costa.debian.org
Fri, 29 Apr 2005 13:25:14 +0000


Author: dburrows
Date: Fri Apr 29 13:25:11 2005
New Revision: 3185

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Typo fixes.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr 29 13:25:11 2005
@@ -1,3 +1,10 @@
+2005-04-29  Daniel Burrows  <dburrows@debian.org>
+
+	* src/ui.cc:
+
+	  Fix some typos in various strings that were pointed out by the
+	  Vietnamese translator.
+
 2005-04-28  Daniel Burrows  <dburrows@debian.org>
 
 	* src/generic/aptitude_resolver.h, src/generic/aptitude_resolver.cc, src/generic/problemresolver/problemresolver.h:

Modified: branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc	Fri Apr 29 13:25:11 2005
@@ -1,6 +1,6 @@
 // pkg_grouppolicy.cc
 //
-//  Copyright 1999,2000,2001 Daniel Burrows
+//  Copyright 1999-2005 Daniel Burrows
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -155,7 +155,7 @@
 
   section_descriptions["alien"]=_("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"]=_("The Debian base system\n Packages in the 'base' section are part of the initial system installation.");
-  section_descriptions["comm"]=_("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 (zmodem/kermit), as well as software to control cellular phones, interface with FidoNet, and run a BBS.");
+  section_descriptions["comm"]=_("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["devel"]=_("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"]=_("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"]=_("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.");
@@ -190,7 +190,7 @@
   section_descriptions["contrib"]=_("Programs which depend on software not in Debian\n Packages in the 'contrib' section are not part of Debian.\n .\n These packages are Free Software, but they depend on software which is not part of Debian.  This may be because it is not Free Software, but is packaged in the non-free section of the archive, because Debian cannot distribute it at all, or (in rare cases) because no-one has packaged it yet.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines");
   section_descriptions["main"]=_("The main Debian archive\n The Debian distribution consists of packages from the 'main' section. Every package in 'main' is Free Software.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines");
   section_descriptions["non-US"]=_("Programs stored outside the US due to export controls\n Packages in 'non-US' likely contain cryptography; a few implement patented algorithms. Because of this, they cannot be exported from the United States, and hence are stored on a server in the \"free world\".\n .\n Note: the Debian Project is currently merging cryptographic software into the US-based archives after consulting with legal experts about recent changes in export policies. Most packages which were formerly found in this section, therefore, are now in 'main'.");
-  section_descriptions["non-free"]=_("Programs which are not free software\n Packages in the 'non-free' section are not part of Debian.\n .\n These packages fail to meet one or more of the requirements of the Debian Free Software Guidelines (see below) You should read the license of programs in this section to be sure that you are allowed to use them in the way you intend.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines");
+  section_descriptions["non-free"]=_("Programs which are not free software\n Packages in the 'non-free' section are not part of Debian.\n .\n These packages fail to meet one or more of the requirements of the Debian Free Software Guidelines (see below). You should read the license of programs in this section to be sure that you are allowed to use them in the way you intend.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines");
 
   section_descriptions["virtual"]=_("Virtual packages\n These packages do not exist; they are names other packages use to require or provide some functionality.");
 
@@ -317,7 +317,7 @@
 {
   N_("Security Updates\n Security updates for these packages are available from security.debian.org."),
   N_("Upgradable Packages\n A newer version of these packages is available."),
-  N_("New Packages\n These packages have been added to Debian since the last time you cleared the list of \"new\" packages. (choose \"Forget new packages\" from the Actions menu to empty this list)"),
+  N_("New Packages\n These packages have been added to Debian since the last time you cleared the list of \"new\" packages (choose \"Forget new packages\" from the Actions menu to empty this list)."),
   N_("Installed Packages\n These packages are currently installed on your computer."),
   N_("Not Installed Packages\n These packages are not installed on your computer."),
   N_("Obsolete and Locally Created Packages\n These packages are currently installed on your computer, but they are not available from any apt source.  They may be obsolete and removed from the archive, or you may have built a private version of them yourself."),

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Fri Apr 29 13:25:11 2005
@@ -1510,8 +1510,8 @@
 	       N_("View a list of frequently asked questions"),
 	       sigc::ptr_fun(do_help_faq)),
 
-  vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^ChangeLog"), NULL,
-	       N_("View the important changes made in each version of the program"),
+  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)),
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^License"), NULL,