Updated Russian translation.

diff --git a/ChangeLog b/ChangeLog
index c7c5ca36c172d7e389789260609584aa4949d09f..4edd045c2cc704cb39d44677649baa9c99c01c37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2007-04-07 16:13 -0700  Fabian Groffen  <grobian@gentoo.org>  (779befaca281)
+2007-04-07 16:22 -0700  Michael Elkins  <me@mutt.org>  (c310dd3d6d73)
+
+       * hook.c, pattern.c: Allow reply-hook to use ~h when replying from the
+       index. Fixes regression introduced by fix for bug #2190.
+       mutt_pattern_exec() now checks for ctx!=NULL so that Mutt will no
+       longer segfault when replying to a message from the attachment menu.
+
+2007-04-07 16:20 -0700  Fabian Groffen  <grobian@gentoo.org>  (1c9db84ed54f)
+
+       * imap/message.c, muttlib.c: Fix compiler aliasing warnings
 
        * hcache.c: Fix compiler warnings
 

diff --git a/po/ru.po b/po/ru.po
index 194e979a4fdb7b0d688df781fcfb311924e397ab..2fb96528a09b9ce4afd5718544bc2618768f844c 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutt-1.5.14\n"
+"Project-Id-Version: mutt-1.5.15\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-04-06 13:35-0700\n"
-"PO-Revision-Date: 2007-02-28 14:21+0200\n"
+"PO-Revision-Date: 2007-04-08 18:45+0300\n"
 "Last-Translator: mutt-ru@woe.spb.ru\n"
 "Language-Team: RUSSIAN <mutt-ru@woe.spb.ru>\n"
 "MIME-Version: 1.0\n"
@@ -778,9 +778,9 @@ msgid "error setting secret key `%s': %s\n"
 msgstr "ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ `%s': %s\n"
 
 #: crypt-gpgme.c:684
-#, fuzzy, c-format
+#, c-format
 msgid "error setting PKA signature notation: %s\n"
-msgstr "ïÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ Ï ËÌÀÞÅ: "
+msgstr "ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÐÒÉÍÅÞÁÎÉÑ Ë ÐÏÄÐÉÓÉ: %s\n"
 
 #: crypt-gpgme.c:740
 #, c-format
@@ -830,13 +830,12 @@ msgid "A system error occurred"
 msgstr "óÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
 #: crypt-gpgme.c:1140
-#, fuzzy
 msgid "WARNING: PKA entry does not match signer's address: "
-msgstr "ðòåäõðòåöäåîéå: ÉÍÑ ÓÅÒ×ÅÒÁ ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÓÅÒÔÉÆÉËÁÔÕ"
+msgstr "ðòåäõðòåöäåîéå: PKA ÚÁÐÉÓØ ÎÅ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÁÄÒÅÓÕ ×ÌÁÄÅÌØÃÁ:"
 
 #: crypt-gpgme.c:1147
 msgid "PKA verified signer's address is: "
-msgstr ""
+msgstr "áÄÒÅÓ, ÐÒÏ×ÅÒÅÎÎÙÊ ÐÒÉ ÐÏÍÏÝÉ PKA: "
 
 #: crypt-gpgme.c:1164 crypt-gpgme.c:3123
 msgid "Fingerprint: "
@@ -1955,7 +1954,7 @@ msgstr "
 #: history.c:75 history.c:109 history.c:132
 #, c-format
 msgid "Bad history file format (line %d)"
-msgstr ""
+msgstr "îÅËÏÒÒÅËÔÎÙÊ ÆÏÒÍÁÔ ÆÁÊÌÁ ÉÓÔÏÒÉÉ (ÓÔÒÏËÁ %d)"
 
 #: hook.c:251
 #, c-format
@@ -3241,14 +3240,13 @@ msgstr ""
 "þÔÏÂÙ ÓÏÏÂÝÉÔØ ÏÂ ÏÛÉÂËÅ, ÐÏÓÅÔÉÔÅ http://bugs.mutt.org/.\n"
 
 #: main.c:63
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2007 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
-"Copyright (C) 1996-2006 Michael R. Elkins É ÄÒÕÇÉÅ.\n"
+"Copyright (C) 1996-2007 Michael R. Elkins É ÄÒÕÇÉÅ.\n"
 "Mutt ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ âåú ëáëéè-ìéâï çáòáîôéê; ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ\n"
 "ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ××ÅÄÉÔÅ `mutt -vv'.\n"
 "Mutt Ñ×ÌÑÅÔÓÑ Ó×ÏÂÏÄÎÙÍ ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ.  ÷Ù ÍÏÖÅÔÅ\n"
@@ -3256,7 +3254,6 @@ msgstr ""
 "ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ××ÅÄÉÔÅ `mutt -vv'.\n"
 
 #: main.c:69
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -3271,9 +3268,9 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2006 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2006 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2007 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
@@ -3325,6 +3322,14 @@ msgid ""
 "       mutt [<options>] -D\n"
 "       mutt -v[v]\n"
 msgstr ""
+"ÚÁÐÕÓË: mutt [<options>] [-z] [-f <file> | -yZ]\n"
+"        mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
+"<file> [...]] [--] <addr> [...]\n"
+"        mutt [<options>] -p\n"
+"        mutt [<options>] -A <alias> [...]\n"
+"        mutt [<options>] -Q <query> [...]\n"
+"        mutt [<options>] -D\n"
+"        mutt -v[v]\n"
 
 #: main.c:116
 msgid ""
@@ -3396,6 +3401,8 @@ msgid ""
 "  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
 "\t\twhen using -a with multiple filenames using -- is mandatory"
 msgstr ""
+"  --\t\tÓÞÉÔÁÔØ ÁÒÇÕÍÅÎÔÙ ÁÄÒÅÓÁÍÉ, ÄÁÖÅ ÅÓÌÉ ÏÎÉ ÎÁÞÉÎÁÀÔÓÑ ÓÏ ÚÎÁËÁ '-'\n"
+"\t\tÎÅÏÂÈÏÄÉÍÏ ÐÒÉÍÅÎÅÎÉÅ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ -a Ó ÎÅÓËÏÌØËÉÍÉ ÆÁÊÌÁÍÉ"
 
 #: main.c:187
 msgid ""
@@ -3578,40 +3585,39 @@ msgstr "maildir_commit_message(): 
 
 #: mutt_sasl.c:189
 msgid "Unknown SASL profile"
-msgstr ""
+msgstr "SASL: ÎÅÉÚ×ÅÓÔÎÙÊ ÐÒÏÔÏËÏÌ"
 
 #: mutt_sasl.c:195
 msgid "SASL failed to get local IP address"
-msgstr ""
+msgstr "SASL: ÎÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÌÏËÁÌØÎÙÊ IP ÁÄÒÅÓ"
 
 #: mutt_sasl.c:200
 msgid "SASL failed to parse local IP address"
-msgstr ""
+msgstr "SASL: ÎÅ ÕÄÁÌÏÓØ ÒÁÓÐÏÚÎÁÔØ ÌÏËÁÌØÎÙÊ IP ÁÄÒÅÓ"
 
 #: mutt_sasl.c:206
 msgid "SASL failed to get remote IP address"
-msgstr ""
+msgstr "SASL: ÎÅ ÕÄÁÌÏÓØ ÐÏÌÕÞÉÔØ ÕÄÁÌ£ÎÎÙÊ IP ÁÄÒÅÓ"
 
 #: mutt_sasl.c:211
 msgid "SASL failed to parse remote IP address"
-msgstr ""
+msgstr "SASL: ÎÅ ÕÄÁÌÏÓØ ÒÁÓÐÏÚÎÁÔØ ÕÄÁÌ£ÎÎÙÊ IP ÁÄÒÅÓ"
 
 #: mutt_sasl.c:222
-#, fuzzy
 msgid "Error allocating SASL connection"
-msgstr "ÏÛÉÂËÁ ÒÁÚÍÅÝÅÎÉÑ ÏÂßÅËÔÁ ÄÁÎÎÙÈ: %s\n"
+msgstr "SASL: ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÓÏÅÄÉÎÅÎÉÑ"
 
 #: mutt_sasl.c:232
 msgid "Error setting SASL security properties"
-msgstr ""
+msgstr "SASL: ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ Ó×ÏÊÓÔ× ÂÅÚÏÐÁÓÎÏÓÔÉ"
 
 #: mutt_sasl.c:242
 msgid "Error setting SASL external security strength"
-msgstr ""
+msgstr "SASL: ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÕÒÏ×ÎÑ ×ÎÅÛÎÅÊ ÂÅÚÏÐÁÓÎÏÓÔÉ"
 
 #: mutt_sasl.c:248
 msgid "Error setting SASL external user name"
-msgstr ""
+msgstr "SASL: ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ×ÎÅÛÎÅÇÏ ÉÍÅÎÉ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
 #: mutt_socket.c:103 mutt_socket.c:174
 #, c-format
@@ -4305,7 +4311,7 @@ msgstr "
 
 #: pop_auth.c:188
 msgid "POP timestamp is invalid!"
-msgstr ""
+msgstr "APOP: ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ ×ÒÅÍÅÎÉ"
 
 #: pop_auth.c:193
 msgid "Authenticating (APOP)..."
@@ -4936,36 +4942,34 @@ msgid "Can't sign: No key specified. Use Sign As."
 msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÄÐÉÓÁÔØ: ÎÅ ÕËÁÚÁÎ ËÌÀÞ. éÓÐÏÌØÚÕÊÔÅ \"ÐÏÄÐÉÓÁÔØ ËÁË\"."
 
 #: smtp.c:113
-#, fuzzy, c-format
+#, c-format
 msgid "SMTP session failed: %s"
-msgstr "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ: %s"
+msgstr "ïÛÉÂËÁ SMTP ÓÅÓÓÉÉ: %s"
 
 #: smtp.c:269
 msgid "SMTP session failed: read error"
-msgstr ""
+msgstr "ïÛÉÂËÁ SMTP ÓÅÓÓÉÉ: ÏÛÉÂËÁ ÞÔÅÎÉÑ"
 
 #: smtp.c:271
 msgid "SMTP session failed: write error"
-msgstr ""
+msgstr "ïÛÉÂËÁ SMTP ÓÅÓÓÉÉ: ÏÛÉÂËÁ ÚÁÐÉÓÉ"
 
 #: smtp.c:294
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid SMTP URL: %s"
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ "
+msgstr "îÅ×ÅÒÎÙÊ SMTP URL: %s"
 
 #: smtp.c:400
 msgid "SMTP server does not support authentication"
-msgstr ""
+msgstr "SMTP ÓÅÒ×ÅÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÁÕÔÅÎÔÉÆÉËÁÃÉÀ"
 
 #: smtp.c:408
-#, fuzzy
 msgid "SMTP authentication requires SASL"
-msgstr "ïÛÉÂËÁ GSSAPI-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
+msgstr "SMTP ÁÕÔÅÎÔÉÆÉËÁÃÉÑ ÔÒÅÂÕÅÔ SASL"
 
 #: smtp.c:548
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "ïÛÉÂËÁ SASL-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ."
+msgstr "ïÛÉÂËÁ SASL-ÁÕÔÅÎÔÉÆÉËÁÃÉÉ"
 
 #: sort.c:263
 msgid "Sorting mailbox..."
@@ -4986,34 +4990,3 @@ msgstr "
 #: thread.c:1099
 msgid "Parent message is not available."
 msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ."
-
-#~ msgid "Getting namespaces..."
-#~ msgstr "ðÏÌÕÞÅÎÉÅ ÓÐÉÓËÁ ÐÒÏÓÔÒÁÎÓÔ× ÉÍÅÎ..."
-
-#~ msgid ""
-#~ "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-#~ "<file> ]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
-#~ "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H "
-#~ "<file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> "
-#~ "[ ... ]\n"
-#~ "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-#~ "       mutt -v[v]\n"
-#~ msgstr ""
-#~ "ÚÁÐÕÓË: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-#~ "<file> ]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
-#~ "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H "
-#~ "<file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> "
-#~ "[ ... ]\n"
-#~ "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-#~ "       mutt -v[v]\n"
-#~ "\n"