Mercurial > hg

changeset 19198:15aef461facd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: fix untranslated prompts with translated responses (issue3936)
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 15 May 2013 21:36:19 -0500
parents 01d68fb07915
children 4b9e5b71dfa9 865beb849720
files i18n/de.po
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/i18n/de.po	Wed May 15 22:19:12 2013 +0100
+++ b/i18n/de.po	Wed May 15 21:36:19 2013 -0500
@@ -14078,13 +14078,14 @@
 
 #, python-format
 msgid "was merge of '%s' successful (yn)?"
-msgstr ""
+msgstr "ist die Zusammenführung von '%s' gelungen (jn)?"
 
 #, python-format
 msgid ""
 " output file %s appears unchanged\n"
 "was merge successful (yn)?"
-msgstr ""
+msgstr "Ausgabedatei %s scheint unverändert\n"
+"ist die Zusammenführung gelungen (jn)?"
 
 msgid "unterminated string"
 msgstr "nicht abgeschlossene Zeichenkette"