# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2014-06-01 20:58:28
# Node ID 269c80ee5b3cb3684fa8edc61501b3506d02eb10
# Parent  99ba1d082287e5d701c86dfea7e7a5f9adc9dad4
# Parent  b6cd12d6822d9e853b80517bf61ec2b53f131fa9

merge with i18n

diff --git a/i18n/de.po b/i18n/de.po
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -21,7 +21,7 @@ msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2014-01-29 16:47+0100\n"
-"PO-Revision-Date: 2013-09-30 20:52+0100\n"
+"PO-Revision-Date: 2014-05-07 09:14+0200\n"
 "Last-Translator: Simon Heimberg <simohe@besonet.ch>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -3437,11 +3437,11 @@ msgid "hg fetch [SOURCE]"
 msgstr "hg fetch [QUELLE]"
 
 msgid "commands to sign and verify changesets"
-msgstr "Nutzt eine Programm um den Fehlerstatus zu bestimmen"
+msgstr "Kommandos um Änderungssätze zu signieren und Signaturen zu verifizieren"
 
 #, python-format
 msgid "%s Unknown key ID \"%s\"\n"
-msgstr ""
+msgstr "%s unbekannte Schlüssel-ID \"%s\"\n"
 
 #, python-format
 msgid "%s Bad signature from \"%s\"\n"
diff --git a/i18n/ja.po b/i18n/ja.po
--- a/i18n/ja.po
+++ b/i18n/ja.po
@@ -149,8 +149,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2014-04-30 22:52+0900\n"
-"PO-Revision-Date: 2014-04-30 23:08+0900\n"
+"POT-Creation-Date: 2014-05-30 19:32+0900\n"
+"PO-Revision-Date: 2014-05-30 19:43+0900\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -8204,11 +8204,11 @@ msgstr "--rev と --soruce は併用できません"
 msgid "empty \"rev\" revision set - nothing to rebase\n"
 msgstr "--rev での指定対象が空です - 移動対象がありません\n"
 
-msgid "empty \"source\" revision set - nothing to rebase"
-msgstr "--soruce での指定対象が空です - 移動対象がありません"
-
-msgid "empty \"base\" revision set - can't compute rebase set"
-msgstr "--base での指定対象が空です - 移動対象を算出できません"
+msgid "empty \"source\" revision set - nothing to rebase\n"
+msgstr "--soruce での指定対象が空です - 移動対象がありません\n"
+
+msgid "empty \"base\" revision set - can't compute rebase set\n"
+msgstr "--base での指定対象が空です - 移動対象を算出できません\n"
 
 #, python-format
 msgid "nothing to rebase - %s is both \"base\" and destination\n"
diff --git a/i18n/zh_TW.po b/i18n/zh_TW.po
--- a/i18n/zh_TW.po
+++ b/i18n/zh_TW.po
@@ -8,11 +8,10 @@ msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2010-10-31 22:27+0100\n"
-"PO-Revision-Date: 2009-10-25 12:50+0100\n"
-"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>,"
-"leolarrel<leolarrel@gmail.com>\n"
+"PO-Revision-Date: 2014-05-07 09:20+0200\n"
+"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>,leolarrel<leolarrel@gmail.com>\n"
 "Language-Team: Traditional Chinese\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"