Re: POTFILES.in update
On Sun, 13 Feb 2005, Tamotsu Takahashi wrote:
> I agree.
> Remove anything you don't like.
Here is a fixed version.
--
tamo
Index: po/POTFILES.in
===================================================================
RCS file: /home/roessler/cvs/mutt/po/POTFILES.in,v
retrieving revision 3.2
diff -u -u -r3.2 POTFILES.in
--- po/POTFILES.in 27 Mar 2002 08:44:17 -0000 3.2
+++ po/POTFILES.in 13 Feb 2005 06:27:23 -0000
@@ -8,7 +8,9 @@
color.c
commands.c
compose.c
+crypt-gpgme.c
crypt.c
+cryptglue.c
curs_lib.c
curs_main.c
edit.c
@@ -37,9 +45,12 @@
mbox.c
menu.c
mh.c
-muttlib.c
mutt_socket.c
mutt_ssl.c
+mutt_ssl_gnutls.c
+mutt_ssl_nss.c
+mutt_tunnel.c
+muttlib.c
mx.c
pager.c
parse.c
--- mutt_ssl_gnutls.c~ 2005-02-12 21:25:57.000000000 +0900
+++ mutt_ssl_gnutls.c 2005-02-13 15:45:46.912343440 +0900
@@ -92,7 +92,7 @@
if (!data)
{
- mutt_error ("Error: no TLS socket open");
+ mutt_error _("Error: no TLS socket open");
mutt_sleep (2);
return -1;
}
@@ -114,7 +114,7 @@
if (!data)
{
- mutt_error ("Error: no TLS socket open");
+ mutt_error _("Error: no TLS socket open");
mutt_sleep (2);
return -1;
}
--- crypt-gpgme.c~ 2005-02-08 21:54:27.000000000 +0900
+++ crypt-gpgme.c 2005-02-13 16:03:55.947158504 +0900
@@ -332,7 +332,7 @@
err = gpgme_new (&ctx);
if (err)
{
- mutt_error ("error creating gpgme context: %s\n", gpgme_strerror (err));
+ mutt_error (_("error creating gpgme context: %s\n"), gpgme_strerror
(err));
sleep (2);
mutt_exit (1);
}
@@ -342,7 +342,7 @@
err = gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
if (err)
{
- mutt_error ("error enabling CMS protocol: %s\n",
+ mutt_error (_("error enabling CMS protocol: %s\n"),
gpgme_strerror (err));
sleep (2);
mutt_exit (1);
@@ -362,7 +362,7 @@
err = gpgme_data_new (&data);
if (err)
{
- mutt_error ("error creating gpgme data object: %s\n",
+ mutt_error (_("error creating gpgme data object: %s\n"),
gpgme_strerror (err));
sleep (2);
mutt_exit (1);
@@ -428,7 +428,7 @@
unlink (tempfile);
if (err)
{
- mutt_error ("error allocating data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error allocating data object: %s\n"), gpgme_strerror
(err));
return NULL;
}
@@ -446,7 +446,7 @@
err = gpgme_data_new_from_filepart (&data, NULL, fp, offset, length);
if (err)
{
- mutt_error ("error allocating data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error allocating data object: %s\n"), gpgme_strerror
(err));
return NULL;
}
@@ -464,7 +464,7 @@
? gpgme_error_from_errno (errno) : 0);
if (err)
{
- mutt_error ("error rewinding data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error rewinding data object: %s\n"), gpgme_strerror
(err));
return -1;
}
@@ -486,7 +486,7 @@
}
if (nread == -1)
{
- mutt_error ("error reading data object: %s\n", strerror (errno));
+ mutt_error (_("error reading data object: %s\n"), strerror (errno));
return -1;
}
return 0;
@@ -533,7 +533,7 @@
fclose (fp);
if (nread == -1)
{
- mutt_error ("error reading data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error reading data object: %s\n"), gpgme_strerror (err));
unlink (tempfile);
fclose (fp);
return NULL;
@@ -594,7 +594,7 @@
}
else
{
- mutt_error ("error adding recipient `%s': %s\n",
+ mutt_error (_("error adding recipient `%s': %s\n"),
buf, gpgme_strerror (err));
FREE (&rset);
return NULL;
@@ -698,7 +698,7 @@
mutt_need_hard_redraw ();
if (err)
{
- mutt_error ("error encrypting data: %s\n", gpgme_strerror (err));
+ mutt_error (_("error encrypting data: %s\n"), gpgme_strerror (err));
gpgme_data_release (ciphertext);
gpgme_release (ctx);
return NULL;
@@ -795,7 +795,7 @@
{
gpgme_data_release (signature);
gpgme_release (ctx);
- mutt_error ("error signing data: %s\n", gpgme_strerror (err));
+ mutt_error (_("error signing data: %s\n"), gpgme_strerror (err));
return NULL;
}
@@ -1324,7 +1324,7 @@
if (err)
{
gpgme_data_release (signature);
- mutt_error ("error allocating data object: %s\n", gpgme_strerror (err));
+ mutt_error (_("error allocating data object: %s\n"), gpgme_strerror
(err));
return -1;
}
ctx = create_gpgme_context (is_smime);
@@ -1381,9 +1381,9 @@
{
if (signature->notations)
{
- state_attach_puts ("*** Begin Notation (signature by: ", s);
+ state_attach_puts (_("*** Begin Notation (signature by: "), s);
state_attach_puts (signature->fpr, s);
- state_attach_puts (") ***\n", s);
+ state_attach_puts (_(") ***\n"), s);
for (notation = signature->notations; notation;
notation = notation->next)
{
@@ -1400,7 +1400,7 @@
state_attach_puts ("\n", s);
}
}
- state_attach_puts ("*** End Notation ***\n", s);
+ state_attach_puts (_("*** End Notation ***\n"), s);
}
}
}
@@ -2950,7 +2950,7 @@
continue;
s = uid->uid;
- fprintf (fp, "%s ......: ", idx ? _(" aka") :_("Name"));
+ fprintf (fp, _("%s ......: "), idx ? _(" aka") :_("Name"));
if (uid->invalid)
{
fputs (_("[Invalid]"), fp);
@@ -2973,7 +2973,7 @@
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid From : %s\n", shortbuf);
+ fprintf (fp, _("Valid From : %s\n"), shortbuf);
}
if (key->subkeys && (key->subkeys->expires > 0))
@@ -2986,7 +2986,7 @@
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid To ..: %s\n", shortbuf);
+ fprintf (fp, _("Valid To ..: %s\n"), shortbuf);
}
if (key->subkeys)
@@ -2999,9 +2999,9 @@
if (key->subkeys)
aval = key->subkeys->length;
- fprintf (fp, "Key Type ..: %s, %lu bit %s\n", s2, aval, s);
+ fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), s2, aval, s);
- fprintf (fp, "Key Usage .: ");
+ fprintf (fp, _("Key Usage .: "));
delim = "";
if (key_check_cap (key, KEY_CAP_CAN_ENCRYPT))
@@ -3056,7 +3056,7 @@
{
s = key->issuer_serial;
if (s)
- fprintf (fp, "Serial-No .: 0x%s\n", s);
+ fprintf (fp, _("Serial-No .: 0x%s\n"), s);
}
if (key->issuer_name)
@@ -3064,7 +3064,7 @@
s = key->issuer_name;
if (s)
{
- fprintf (fp, "Issued By .: ");
+ fprintf (fp, _("Issued By .: "));
parse_and_print_user_id (fp, s);
putc ('\n', fp);
}
@@ -3083,7 +3083,7 @@
putc ('\n', fp);
if ( strlen (s) == 16)
s += 8; /* display only the short keyID */
- fprintf (fp, "Subkey ....: 0x%s", s);
+ fprintf (fp, _("Subkey ....: 0x%s"), s);
if (subkey->revoked)
{
putc (' ', fp);
@@ -3116,7 +3116,7 @@
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid From : %s\n", shortbuf);
+ fprintf (fp, _("Valid From : %s\n"), shortbuf);
}
if (subkey->expires > 0)
@@ -3129,7 +3129,7 @@
#else
strftime (shortbuf, sizeof shortbuf, "%c", tm);
#endif
- fprintf (fp, "Valid To ..: %s\n", shortbuf);
+ fprintf (fp, _("Valid To ..: %s\n"), shortbuf);
}
if (subkey)
@@ -3142,9 +3142,9 @@
else
aval = 0;
- fprintf (fp, "Key Type ..: %s, %lu bit %s\n", "PGP", aval, s);
+ fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), "PGP", aval, s);
- fprintf (fp, "Key Usage .: ");
+ fprintf (fp, _("Key Usage .: "));
delim = "";
if (subkey->can_encrypt)
@@ -3196,7 +3196,7 @@
err = gpgme_new (&listctx);
if (err)
{
- fprintf (fp, "Internal error: can't create gpgme context: %s\n",
+ fprintf (fp, _("Internal error: can't create gpgme context: %s\n"),
gpgme_strerror (err));
goto leave;
}
@@ -3319,7 +3319,7 @@
err = gpgme_new (&ctx);
if (err)
{
- mutt_error ("gpgme_new failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_new failed: %s"), gpgme_strerror (err));
FREE (&pattern);
return NULL;
}
@@ -3358,7 +3358,7 @@
FREE (&patarr);
if (err)
{
- mutt_error ("gpgme_op_keylist_start failed: %s",
+ mutt_error (_("gpgme_op_keylist_start failed: %s"),
gpgme_strerror (err));
gpgme_release (ctx);
FREE (&pattern);
@@ -3408,7 +3408,7 @@
}
}
if (gpg_err_code (err) != GPG_ERR_EOF)
- mutt_error ("gpgme_op_keylist_next failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_op_keylist_next failed: %s"), gpgme_strerror
(err));
gpgme_op_keylist_end (ctx);
no_pgphints:
;
@@ -3421,7 +3421,7 @@
err = gpgme_op_keylist_start (ctx, pattern, 0);
if (err)
{
- mutt_error ("gpgme_op_keylist_start failed: %s",
+ mutt_error (_("gpgme_op_keylist_start failed: %s"),
gpgme_strerror (err));
gpgme_release (ctx);
FREE (&pattern);
@@ -3449,7 +3449,7 @@
}
}
if (gpg_err_code (err) != GPG_ERR_EOF)
- mutt_error ("gpgme_op_keylist_next failed: %s", gpgme_strerror (err));
+ mutt_error (_("gpgme_op_keylist_next failed: %s"), gpgme_strerror
(err));
gpgme_op_keylist_end (ctx);
}
@@ -4091,7 +4091,7 @@
/* Make sure that gpg-agent is running. */
if (! getenv ("GPG_AGENT_INFO"))
{
- mutt_error ("\nUsing GPGME backend, although no gpg-agent is running");
+ mutt_error _("\nUsing GPGME backend, although no gpg-agent is running");
if (mutt_any_key_to_continue (NULL) == -1)
mutt_exit(1);
}
@@ -4232,10 +4232,10 @@
}
}
else
- mutt_any_key_to_continue ("Failed to verify sender");
+ mutt_any_key_to_continue _("Failed to verify sender");
}
else
- mutt_any_key_to_continue ("Failed to figure out sender");
+ mutt_any_key_to_continue _("Failed to figure out sender");
if (signature_key)
{