From e393ae3e29cf24a335016bce0fd3bff0665ecc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taffit@debian.org>
Date: Sun, 5 Aug 2012 18:22:46 -0400
Subject: [PATCH] Actually show translators comments in PO files

--

Note that strings marked for gettext need to immediately follow a
TRANSLATOR comment block.
---
 g10/app-openpgp.c |  3 +--
 g10/misc.c        |  2 +-
 g10/pkclist.c     |  2 +-
 g10/trustdb.c     | 10 +++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c
index 34100b839..b2ca46910 100644
--- a/g10/app-openpgp.c
+++ b/g10/app-openpgp.c
@@ -2056,8 +2056,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)
diff --git a/g10/misc.c b/g10/misc.c
index 8dd4e52b1..b688a93d7 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -799,7 +799,7 @@ compress_algo_to_string(int algo)
 int
 string_to_compress_algo(const char *string)
 {
-  /* NOTE TO TRANSLATOR: See doc/TRANSLATE about this string. */
+  /* TRANSLATORS: See doc/TRANSLATE about this string. */
   if(match_multistr(_("uncompressed|none"),string))
     return 0;
   else if(ascii_strcasecmp(string,"uncompressed")==0)
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 5154b19b1..d0d2a532c 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -194,7 +194,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 a3fae5d09..24d675b22 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -509,7 +509,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
@@ -517,10 +521,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->is_revoked))
     return                         _("[ revoked]");