From 2e0b08b31f5802cb349436d1163cd2424a2bab5b Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Wed, 23 Nov 2016 01:12:37 +0000 Subject: [PATCH] l10n: add translator notes --- account.c | 1 + browser.c | 3 +++ commands.c | 3 +++ compose.c | 1 + crypt-gpgme.c | 32 +++++++++++++++++++++++--------- mutt_ssl.c | 5 ++--- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/account.c b/account.c index ca0ee8e2c..16f13ccd9 100644 --- a/account.c +++ b/account.c @@ -183,6 +183,7 @@ int mutt_account_getuser (ACCOUNT* account) /* prompt (defaults to unix username), copy into account->user */ else { + /* L10N: Example: Username at myhost.com */ snprintf (prompt, sizeof (prompt), _("Username at %s: "), account->host); strfcpy (account->user, NONULL (Username), sizeof (account->user)); if (mutt_get_field_unbuffered (prompt, account->user, sizeof (account->user), 0)) diff --git a/browser.c b/browser.c index 66c858a0c..e029e6b50 100644 --- a/browser.c +++ b/browser.c @@ -1721,8 +1721,11 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num int reverse = (i == OP_SORT_REVERSE); switch (mutt_multi_choice ((reverse) ? + /* L10N: The highlighted letters must match the "Sort" options */ _("Reverse sort by (d)ate, (a)lpha, si(z)e, d(e)scription, (c)ount, ne(w) count, or do(n)'t sort? ") : + /* L10N: The highlighted letters must match the "Reverse Sort" options */ _("Sort by (d)ate, (a)lpha, si(z)e, d(e)scription, (c)ount, ne(w) count, or do(n)'t sort? "), + /* L10N: These must match the highlighted letters from "Sort" and "Reverse Sort" */ _("dazecwn"))) { case -1: /* abort */ diff --git a/commands.c b/commands.c index 6daf2c15a..baf808600 100644 --- a/commands.c +++ b/commands.c @@ -544,8 +544,11 @@ int mutt_select_sort (int reverse) int method = Sort; /* save the current method in case of abort */ switch (mutt_multi_choice (reverse ? + /* L10N: The highlighted letters must match the "Sort" options */ _("Rev-Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: ") : + /* L10N: The highlighted letters must match the "Rev-Sort" options */ _("Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "), + /* L10N: These must match the highlighted letters from "Sort" and "Rev-Sort" */ _("dfrsotuzcpl"))) { case -1: /* abort - don't resort */ diff --git a/compose.c b/compose.c index be23e407c..10c143421 100644 --- a/compose.c +++ b/compose.c @@ -158,6 +158,7 @@ static void redraw_crypt_lines (HEADER *msg) else if (msg->security & SIGN) addstr (_("Sign")); else + /* L10N: This refers to the encryption of the email, e.g. "Security: None" */ addstr (_("None")); if ((msg->security & (ENCRYPT | SIGN))) diff --git a/crypt-gpgme.c b/crypt-gpgme.c index 51d5569b9..00322cfdd 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -3384,10 +3384,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp) continue; s = uid->uid; - /* L10N: - Fill dots to make the DOTFILL entries the same length. - In English, msgid "Fingerprint: " is the longest entry for this menu. - Your language may vary. */ + /* L10N: DOTFILL */ fputs (idx ? _(" aka ......: ") :_("Name ......: "), fp); if (uid->invalid) { @@ -3466,7 +3463,10 @@ static void print_key_info (gpgme_key_t key, FILE *fp) if (key->subkeys) { s = key->subkeys->fpr; - /* L10N: DOTFILL */ + /* L10N: + Fill dots to make the DOTFILL entries the same length. + In English, msgid "Fingerprint: " is the longest entry for this menu. + Your language may vary. */ fputs (_("Fingerprint: "), fp); if (is_pgp && strlen (s) == 40) { @@ -4718,17 +4718,19 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime) { if (is_smime) { + /* L10N: S/MIME options (opportunistic encryption is on) */ prompt = _("S/MIME (s)ign, sign (a)s, (p)gp, (c)lear, or (o)ppenc mode off? "); - /* L10N: The 'f' is from "forget it", an old undocumented synonym of - 'clear'. Please use a corresponding letter in your language. - Alternatively, you may duplicate the letter 'c' is translated to. - This comment also applies to the five following letter sequences. */ + /* L10N: S/MIME options (opportunistic encryption is on) + The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */ letters = _("sapfco"); choices = "SapFCo"; } else { + /* L10N: PGP options (opportunistic encryption is on) */ prompt = _("PGP (s)ign, sign (a)s, s/(m)ime, (c)lear, or (o)ppenc mode off? "); + /* L10N: PGP options (opportunistic encryption is on) + The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */ letters = _("samfco"); choices = "SamFCo"; } @@ -4741,13 +4743,19 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime) { if (is_smime) { + /* L10N: S/MIME options (opportunistic encryption is off) */ prompt = _("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp, (c)lear, or (o)ppenc mode? "); + /* L10N: S/MIME options (opportunistic encryption is off) + The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */ letters = _("esabpfco"); choices = "esabpfcO"; } else { + /* L10N: PGP options (opportunistic encryption is off) */ prompt = _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime, (c)lear, or (o)ppenc mode? "); + /* L10N: PGP options (opportunistic encryption is off) + The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */ letters = _("esabmfco"); choices = "esabmfcO"; } @@ -4759,13 +4767,19 @@ static int gpgme_send_menu (HEADER *msg, int *redraw, int is_smime) { if (is_smime) { + /* L10N: S/MIME options */ prompt = _("S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear? "); + /* L10N: S/MIME options + The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */ letters = _("esabpfc"); choices = "esabpfc"; } else { + /* L10N: PGP options */ prompt = _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear? "); + /* L10N: PGP options + The 'f' is undocumented. Please duplicate the letter 'c' is translated into. */ letters = _("esabmfc"); choices = "esabmfc"; } diff --git a/mutt_ssl.c b/mutt_ssl.c index 2e1c45363..e6c56c4be 100644 --- a/mutt_ssl.c +++ b/mutt_ssl.c @@ -341,9 +341,8 @@ static int ssl_socket_open (CONNECTION * conn) if (! (data->ctx = SSL_CTX_new (SSLv23_client_method ()))) { /* L10N: an SSL context is a data structure returned by the OpenSSL - * function SSL_CTX_new(). In this case it returned NULL: an - * error condition. - */ + function SSL_CTX_new(). In this case it returned NULL: an + error condition. */ mutt_error (_("Unable to create SSL context")); ssl_dprint_err_stack (); mutt_socket_close (conn); -- 2.40.0