merge with i18n stable 2.5.1
authorMatt Mackall <mpm@selenic.com>
Fri, 08 Feb 2013 22:58:58 +0000
branchstable
changeset 18578 7511d4df752e
parent 18568 cd403d6d96ef (current diff)
parent 18577 0e7b072d58ed (diff)
child 18579 34c021d8dff6
merge with i18n
--- a/i18n/de.po	Wed Feb 06 07:55:29 2013 +0000
+++ b/i18n/de.po	Fri Feb 08 22:58:58 2013 +0000
@@ -21,7 +21,7 @@
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2012-09-01 14:20+0200\n"
-"PO-Revision-Date: 2012-09-10 09:39+0100\n"
+"PO-Revision-Date: 2013-02-05 22:00+0100\n"
 "Last-Translator: Martin Schröder <martinschroeder@vcp-sh.de>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -8105,7 +8105,7 @@
 msgstr ""
 "      j - Diese Änderung übernehmen\n"
 "      n - Diese Änderung überspringen\n"
-"      b - Diese Änderung manuell bearbeiten"
+"      e - Diese Änderung manuell bearbeiten"
 
 msgid ""
 "      s - skip remaining changes to this file\n"