# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1360364338 0
# Node ID 7511d4df752e61fe7ae4f3682e0a0008573b0402
# Parent  cd403d6d96ef9136b866e2475ae6c3c1e02c762c# Parent  0e7b072d58ed2d1af7dcbba9835d64ee02108494
merge with i18n

diff -r cd403d6d96ef -r 7511d4df752e i18n/de.po
--- 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"