merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 13 May 2013 17:47:04 -0500
changeset 19189 f7eff455da03
parent 19184 05390cfe678a (current diff)
parent 19188 ddc7a6be2021 (diff)
child 19190 b03952ee634d
merge with stable
--- a/i18n/el.po	Mon May 13 13:02:01 2013 -0500
+++ b/i18n/el.po	Mon May 13 17:47:04 2013 -0500
@@ -14181,7 +14181,7 @@
 msgstr ""
 
 msgid "&Delete"
-msgstr "&Διαγραφή"
+msgstr ""
 
 #, python-format
 msgid ""
@@ -14190,7 +14190,7 @@
 msgstr ""
 
 msgid "&Deleted"
-msgstr "&Διαγράφηκε"
+msgstr ""
 
 #, python-format
 msgid "update failed to remove %s: %s!\n"
@@ -14422,7 +14422,7 @@
 msgstr ""
 
 msgid "&Remote"
-msgstr "&Απομακρυσμένο:"
+msgstr ""
 
 #, python-format
 msgid ""
--- a/i18n/pt_BR.po	Mon May 13 13:02:01 2013 -0500
+++ b/i18n/pt_BR.po	Mon May 13 17:47:04 2013 -0500
@@ -504,12 +504,12 @@
 msgid ""
 "Logs event information to .hg/blackbox.log to help debug and diagnose problems.\n"
 "The events that get logged can be configured via the blackbox.track config key.\n"
-"Examples:"
+"Examples::"
 msgstr ""
 "Registra informação de eventos no arquivo .hg/blackbox.log para auxiliar\n"
 "depuração e diagnóstico de problemas. Os eventos que serão registrados\n"
 "podem ser configurados através da opção de configuração blackbox.track.\n"
-"Exemplos:"
+"Exemplos::"
 
 msgid ""
 "  [blackbox]\n"
--- a/i18n/ru.po	Mon May 13 13:02:01 2013 -0500
+++ b/i18n/ru.po	Mon May 13 17:47:04 2013 -0500
@@ -8053,11 +8053,11 @@
 
 # PROMPT
 msgid "&No"
-msgstr "&Нет"
+msgstr ""
 
 # PROMPT
 msgid "&Yes"
-msgstr "&Да"
+msgstr ""
 
 msgid "patchbomb canceled"
 msgstr "отправка отменена"
--- a/mercurial/pathencode.c	Mon May 13 13:02:01 2013 -0500
+++ b/mercurial/pathencode.c	Mon May 13 17:47:04 2013 -0500
@@ -696,7 +696,7 @@
 	return 0;
 }
 
-#define MAXENCODE 4096 * 3
+#define MAXENCODE 4096 * 4
 
 static PyObject *hashencode(const char *src, Py_ssize_t len)
 {