[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. apt-listbugs/0.1.9-6-g8fa70a0

[Francesco Poli (wintermute)]

The following commit has been merged in the master branch:
commit 3837eb3e7ca14b74509831ff23f6240e82c2b6c3
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Sun Jun 30 22:25:01 2013 +0200

    further improve i18n

diff --git a/debian/changelog b/debian/changelog
index 2416138..b629313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apt-listbugs (0.1.10) UNRELEASED; urgency=low
   * clarified various online help messages and changed the default list of
     pending-state categories to be shown:
     [pending,forwarded,pending-fixed,fixed,done]
+  * improved internationalization
 
  -- Francesco Poli (wintermute) <invernomuto at paranoici.org>  Sat, 29 Jun 2013 17:18:26 +0200
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 91b6efa..f01cacc 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -41,6 +41,7 @@ class AppConfig
       _(" [options] <command> [arguments]"),
       "\n",
       _("Options:\n"),
+      # TRANSLATORS: the colons (:) in the following strings are vertically aligned, please keep their alignment consistent
       _(" -h               : Display this help and exit.\n"),
       _(" -v               : Show version number and exit.\n"),
       sprintf(_(" -s <severities>  : Filter bugs by severities you want to see (or \"all\")\n                    [%s].\n"), @severity.join(',')),
@@ -68,6 +69,7 @@ class AppConfig
     @severity = ["critical", "grave", "serious"]
     @tag = nil
     @stats = ["pending", "forwarded", "pending-fixed", "fixed", "done"]
+    # TRANSLATORS: the following six strings refer to a plural quantity of bugs
     @statmap = [["pending", _("Outstanding")],
                 ["forwarded", _("Forwarded")],
                 ["pending-fixed", _("Pending Upload")],
@@ -450,7 +452,7 @@ class Viewer
 	  if pkgs.size != 0
             if @config.frontend.yes_or_no? ngettext(
              # TRANSLATORS: %{plist} is a comma-separated list of %{npkgs} packages to be pinned or put on hold.
-             "The following package will be pinned or on hold:\n %{plist}\nAre you sure?",
+             "The following %{npkgs} package will be pinned or on hold:\n %{plist}\nAre you sure?",
              "The following %{npkgs} packages will be pinned or on hold:\n %{plist}\nAre you sure?",
              pkgs.size) % {:npkgs => pkgs.size,
                            :plist => pkgs.keys.join(', ')}
@@ -467,6 +469,7 @@ class Viewer
 	else
 	  if hold_pkgs.empty?
 	    @config.frontend.puts "" +
+              # TRANSLATORS: the dashes (-) in the following strings are vertically aligned, please keep their alignment consistent
               _("     y     - continue the apt installation, but do not mark the bugs\n             as ignored.\n") +
               _("     a     - continue the apt installation and mark all the above bugs\n             as ignored.\n")
 	  end
@@ -559,10 +562,13 @@ class Viewer
 		bug_exist = 1
 	      end
 	      bug_str = " ##{bug.bug_number} - #{bug.desc}"
+              # TRANSLATORS: "Found" refers to one singular bug
               bug_str += sprintf(_(" (Found: %s)"), "#{bug.found}") if ( ! bug.found.nil? ) && $DEBUG
+              # TRANSLATORS: "Fixed" refers to one singular bug
               bug_str += sprintf(_(" (Fixed: %s)"), "#{bug.fixed}") if ! bug.fixed.nil?
 	      @config.frontend.puts bug_str
 	      if bug.mergeids.size > 0
+                # TRANSLATORS: "Merged" refers to one singular bug
 		bug_str =  _("   Merged with:").dup()
 		bug.mergeids.each { |m|
 		  bug_str << " #{m}"
@@ -770,6 +776,7 @@ module Factory
       size = new_pkgs.size
       mutex = Mutex.new
       threads = []
+      # TRANSLATORS: this sentence, followed by the translation of "Done" (see above) should fit in less than 79 columns to work well with default width terminals
       yield _("Retrieving bug reports..."), "0%"
       begin
         # obtain a list of package names
@@ -988,6 +995,7 @@ module Factory
       max=bugs.size
       step=(max/100)*10+1
       i=0
+      # TRANSLATORS: this sentence, followed by the translation of "Done" (see above) should fit in less than 79 columns to work well with default width terminals
       yield _("Parsing Found/Fixed information..."), "0%"
 
       bugs.delete_if { |bug|

-- 
apt-listbugs development tree