Missing patches from VVV.

diff --git a/po/ru.po b/po/ru.po
index e5526094d16f142452b3bd7cad49c4d0bcdb9d26..6ed20bfa5ff0278901881b71865c1519a2a6451a 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -362,9 +362,8 @@ msgid "Pipe to command: "
 msgstr "ðÅÒÅÄÁÔØ ÐÒÏÇÒÁÍÍÅ: "
 
 #: commands.c:417
-#, fuzzy
 msgid "No printing command has been defined."
-msgstr "îÅ ÏÐÒÅÄÅÌÅÎÏ ÎÉ ÏÄÎÏÇÏ ÐÏÞÔÏ×ÏÇÏ ÑÝÉËÁ ÓÏ ×ÈÏÄÑÝÉÍÉ ÐÉÓØÍÁÍÉ."
+msgstr "ëÏÍÁÎÄÁ ÄÌÑ ÐÅÞÁÔÉ ÎÅ ÏÐÒÅÄÅÌÅÎÁ."
 
 #: commands.c:422
 msgid "Print message?"
@@ -383,14 +382,12 @@ msgid "Messages printed"
 msgstr "óÏÏÂÝÅÎÉÑ ÎÁÐÅÞÁÔÁÎÙ"
 
 #: commands.c:432
-#, fuzzy
 msgid "Message could not be printed"
-msgstr "óÏÏÂÝÅÎÉÅ ÎÁÐÅÞÁÔÁÎÏ"
+msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÅ"
 
 #: commands.c:433
-#, fuzzy
 msgid "Messages could not be printed"
-msgstr "óÏÏÂÝÅÎÉÑ ÎÁÐÅÞÁÔÁÎÙ"
+msgstr "îÅ ÕÄÁÌÏÓØ ÎÁÐÅÞÁÔÁÔØ ÓÏÏÂÝÅÎÉÑ"
 
 #: commands.c:442
 msgid ""
@@ -1303,9 +1300,9 @@ msgid "%s: unknown sorting method"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ÍÅÔÏÄ ÓÏÒÔÉÒÏ×ËÉ"
 
 #: init.c:744
-#, fuzzy, c-format
+#, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
-msgstr "mutt_restore_default: ÏÛÉÂËÁ × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ: %s\n"
+msgstr "mutt_restore_default(%s): ÏÛÉÂËÁ × ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ: %s\n"
 
 #: init.c:805
 #, c-format
@@ -1740,7 +1737,7 @@ msgstr "
 
 #: keymap_alldefs.h:80
 msgid "capitalize the word"
-msgstr ""
+msgstr "ÐÅÒÅ×ÅÓÔÉ ÐÅÒ×ÕÀ ÂÕË×Õ ÓÌÏ×Á × ×ÅÒÈÎÉÊ ÒÅÇÉÓÔÒ, Á ÏÓÔÁÌØÎÙÅ -- × ÎÉÖÎÉÊ"
 
 #: keymap_alldefs.h:81
 msgid "convert the word to lower case"

diff --git a/pop_lib.c b/pop_lib.c
index a49d04b7021c75f650e7219b38c65880ba0103d5..e0e32279a74a0b4c4709aea5835593682e1aca02 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -59,8 +59,9 @@ int pop_parse_path (const char* path, ACCOUNT* acct)
 /* Copy error message to err_msg buffer */
 void pop_error (POP_DATA *pop_data, char *msg)
 {
-  char *c, *c2;
+  char *t, *c, *c2;
 
+  t = strchr (pop_data->err_msg, '\0');
   c = msg;
 
   if (!mutt_strncmp (msg, "-ERR ", 5))
@@ -72,7 +73,7 @@ void pop_error (POP_DATA *pop_data, char *msg)
       c = c2;
   }
 
-  strfcpy (pop_data->err_msg, c, sizeof (pop_data->err_msg));
+  strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
   mutt_remove_trailing_ws (pop_data->err_msg);
 }
 
@@ -208,6 +209,7 @@ int pop_connect (POP_DATA *pop_data)
 
   if (mutt_strncmp (buf, "+OK", 3))
   {
+    *pop_data->err_msg = '\0';
     pop_error (pop_data, buf);
     mutt_error ("%s", pop_data->err_msg);
     return -2;
@@ -313,6 +315,7 @@ void pop_logout (CONTEXT *ctx)
 int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg)
 {
   int dbg = M_SOCK_LOG_CMD;
+  char *c;
 
   if (pop_data->status != POP_CONNECTED)
     return -1;
@@ -327,6 +330,11 @@ int pop_query_d (POP_DATA *pop_data, char *buf, size_t buflen, char *msg)
 #endif
 
   mutt_socket_write_d (pop_data->conn, buf, dbg);
+
+  c = strpbrk (buf, " \r\n");
+  *c = '\0';
+  snprintf (pop_data->err_msg, sizeof (pop_data->err_msg), "%s: ", buf);
+
   if (mutt_socket_readln (buf, buflen, pop_data->conn) < 0)
   {
     pop_data->status = POP_DISCONNECTED;