From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 18 Mar 2012 21:03:33 +0000 (+0100)
Subject: Improve translator comments.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96a1f6df5b8d23e587e322b5d3fa96828004711d;p=pspp

Improve translator comments.

Apparently some of the TRANSLATOR comments were not clear enough. This
change makes it less easy for translators to become confused.
---

diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c
index 7c3371f5db..720d910f68 100644
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -175,12 +175,13 @@ recognize_unit (struct substring name, enum date_unit *unit)
         return true;
       }
 
-  /* TRANSLATORS: Don't translate the the actual unit names `weeks', `days' etc
-	They must remain in their original English. */
   msg (SE, _("Unrecognized date unit `%.*s'.  "
-             "Valid date units are `years', `quarters', `months', "
-             "`weeks', `days', `hours', `minutes', and `seconds'."),
-       (int) ss_length (name), ss_data (name));
+             "Valid date units are `%s', `%s', `%s', "
+             "`%s', `%s', `%s', `%s', and `%s'."),
+       (int) ss_length (name), ss_data (name),
+       "years", "quarters", "months",
+       "weeks", "days", "hours", "minutes", "seconds");
+
   return false;
 }
 
@@ -328,7 +329,7 @@ recognize_method (struct substring method_name, enum date_sum_method *method)
   else
     {
       msg (SE, _("Invalid DATESUM method.  "
-                 "Valid choices are `closest' and `rollover'."));
+                 "Valid choices are `%s' and `%s'."), "closest", "rollover");
       return false;
     }
 }
diff --git a/src/output/driver.c b/src/output/driver.c
index 5c5c864886..acc58cf999 100644
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -315,9 +315,8 @@ output_driver_create (struct string_map *options)
     device_type = SETTINGS_DEVICE_LISTING;
   else
     {
-      /* TRANSLATORS: Don't translate the words `terminal' or `listing'. */
-      error (0, 0, _("%s is not a valid device type (the choices are "
-                     "`terminal' and `listing')"), device_string);
+      error (0, 0, _("%s is not a valid device type (the choices are `%s' and `%s')"),
+                     device_string, "terminal", "listing");
       device_type = default_device_type (file_name);
     }
 
diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c
index 9d1ccf8246..cd4d751c6a 100644
--- a/src/ui/gui/help-menu.c
+++ b/src/ui/gui/help-menu.c
@@ -71,8 +71,8 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_about_dialog_set_translator_credits 
     (
      GTK_ABOUT_DIALOG (about),
-     /* TRANSLATORS: Use this string to list the people who have helped with
-	translation to your language. */
+     /* TRANSLATORS: Do not translate this string.  Instead, put the names of the people
+	who have helped in the translation. */
      _("translator-credits")
      );
 
diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 295ab65dbe..5e9691c5d0 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1334,7 +1334,6 @@ psppire_data_window_new (struct dataset *ds)
   dw = GTK_WIDGET (
     g_object_new (
       psppire_data_window_get_type (),
-      /* TRANSLATORS: This will form a filename.  Please avoid whitespace. */
       "description", _("Data Editor"),
       "dataset", ds,
       NULL));