# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1419880247 21600
# Node ID 6721199ac78a355e35d2994ea32188add4e5290b
# Parent  f8df993516d0c0977374c1ed0d12b46e7a6a4d68# Parent  b65a01a4316baabe80aa3af585feaabcf0a7b537
merge with stable

diff -r f8df993516d0 -r 6721199ac78a i18n/ja.po
--- a/i18n/ja.po	Tue Dec 23 19:48:38 2014 +0100
+++ b/i18n/ja.po	Mon Dec 29 13:10:47 2014 -0600
@@ -149,8 +149,8 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2014-11-29 14:13+0900\n"
-"PO-Revision-Date: 2014-11-29 14:23+0900\n"
+"POT-Creation-Date: 2014-12-29 15:28+0900\n"
+"PO-Revision-Date: 2014-12-29 15:55+0900\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -12872,10 +12872,10 @@
 msgstr "          hg files -0 | xargs -0 grep foo"
 
 msgid ""
-"    See :hg:`help pattern` and :hg:`help filesets` for more information\n"
+"    See :hg:`help patterns` and :hg:`help filesets` for more information\n"
 "    on specifying file patterns."
 msgstr ""
-"    ファイルの指定方法の詳細に関しては、 :hg:`help pattern` および\n"
+"    ファイルの指定方法の詳細に関しては :hg:`help patterns` および\n"
 "    :hg:`help filesets` を参照してください。"
 
 msgid "    Returns 0 if a match is found, 1 otherwise."
@@ -24477,6 +24477,10 @@
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "%s を %.1f 秒で送信しました (%s/秒)\n"
 
+#, python-format
+msgid "pushkey-abort: %s\n"
+msgstr "pushkey 処理の中止: %s\n"
+
 msgid "SMTPS requires Python 2.6 or later"
 msgstr "SMTPS の利用には Python 2.6 以降が必要です"
 
diff -r f8df993516d0 -r 6721199ac78a i18n/pt_BR.po
--- a/i18n/pt_BR.po	Tue Dec 23 19:48:38 2014 +0100
+++ b/i18n/pt_BR.po	Mon Dec 29 13:10:47 2014 -0600
@@ -13103,10 +13103,10 @@
 msgstr "          hg files -0 | xargs -0 grep foo"
 
 msgid ""
-"    See :hg:`help pattern` and :hg:`help filesets` for more information\n"
+"    See :hg:`help patterns` and :hg:`help filesets` for more information\n"
 "    on specifying file patterns."
 msgstr ""
-"    Veja :hg:`help pattern` e :hg:`help filesets` para mais\n"
+"    Veja :hg:`help patterns` e :hg:`help filesets` para mais\n"
 "    informações sobre a especificação de padrões de arquivo."
 
 msgid "    Returns 0 if a match is found, 1 otherwise."
@@ -25034,6 +25034,10 @@
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
 msgstr "transferidos %s em %.1f segundos (%s/s)\n"
 
+#, python-format
+msgid "pushkey-abort: %s\n"
+msgstr "pushkey-abortado: %s\n"
+
 msgid "SMTPS requires Python 2.6 or later"
 msgstr "SMTPS exige Python 2.6 ou posterior"