[PATCH 2/3] Actually show translators comments in PO files

[David Prévot]

---
 agent/call-pinentry.c |    2 +-
 g10/pkclist.c         |    2 +-
 g10/trustdb.c         |   10 +++++-----
 scd/app-openpgp.c     |    3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 381d0f0..c37831a 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -818,7 +818,7 @@ agent_askpin (ctrl_t ctrl,
 
       if (errtext)
         {
-          /* TRANLATORS: The string is appended to an error message in
+          /* TRANSLATORS: The string is appended to an error message in
              the pinentry.  The %s is the actual error message, the
              two %d give the current and maximum number of tries. */
           snprintf (line, DIM(line)-1, _("SETERROR %s (try %d of %d)"),
diff --git a/g10/pkclist.c b/g10/pkclist.c
index c43c74c..f805da8 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -202,7 +202,7 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
   for(;;) {
     /* A string with valid answers.
 
-       Note to translators: These are the allowed answers in lower and
+       TRANSLATORS: These are the allowed answers in lower and
        uppercase.  Below you will find the matching strings which
        should be translated accordingly and the letter changed to
        match the one in the answer string.
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 0f13dc1..6b228d2 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -507,7 +507,11 @@ trust_letter (unsigned int value)
     }
 }
 
-/* NOTE TO TRANSLATOR: these strings are similar to those in
+const char *
+uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid)
+{
+  if(!key && !uid)
+/* TRANSLATORS: these strings are similar to those in
    trust_value_to_string(), but are a fixed length.  This is needed to
    make attractive information listings where columns line up
    properly.  The value "10" should be the length of the strings you
@@ -515,10 +519,6 @@ trust_letter (unsigned int value)
    It gets passed to atoi() so everything after the number is
    essentially a comment and need not be translated.  Either key and
    uid are both NULL, or neither are NULL. */
-const char *
-uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid)
-{
-  if(!key && !uid)
     return _("10 translator see trustdb.c:uid_trust_string_fixed");
   else if(uid->is_revoked || (key && key->flags.revoked))
     return                         _("[ revoked]");
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 0dd20e2..9c8ef59 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2081,8 +2081,7 @@ do_change_pin (app_t app, ctrl_t ctrl,  const char *chvnostr,
       /* TRANSLATORS: Do not translate the "|*|" prefixes but
          keep it at the start of the string.  We need this elsewhere
          to get some infos on the string. */
-      rc = pincb (pincb_arg,
-                  set_resetcode? _("|RN|New Reset Code") :
+      rc = pincb (pincb_arg, set_resetcode? _("|RN|New Reset Code") :
                   chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"),
                   &pinvalue);
       if (rc)
-- 
1.7.10.4