[Python-apps-commits] r9694 - in packages/mercurial/trunk/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Wednesday, May 29, 2013 @ 06:46:30
  Author: vicho
Revision: 9694

Fix #707703 by adding a patch from upstream

Added:
  packages/mercurial/trunk/debian/patches/from_upstream__fix_untranslated_prompts_with_translated_responses.patch
Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/series

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-05-29 06:45:46 UTC (rev 9693)
+++ packages/mercurial/trunk/debian/changelog	2013-05-29 06:46:30 UTC (rev 9694)
@@ -6,6 +6,10 @@
   [ Javi Merino ]
   * New upstream release (Closes: #709815)
   * Blacklist test-histedit-arguments.t and test-websub.t
+  * Fix "Translation missing for yes/no question, but requires translated
+    input from user" by adding patch
+    from_upstream__fix_untranslated_prompts_with_translated_responses.patch
+    (Closes: #707703)
 
  -- Javi Merino <vicho at debian.org>  Wed, 15 May 2013 22:16:29 +0100
 

Added: packages/mercurial/trunk/debian/patches/from_upstream__fix_untranslated_prompts_with_translated_responses.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/from_upstream__fix_untranslated_prompts_with_translated_responses.patch	                        (rev 0)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_untranslated_prompts_with_translated_responses.patch	2013-05-29 06:46:30 UTC (rev 9694)
@@ -0,0 +1,26 @@
+Origin: http://selenic.com/repo/hg/rev/15aef461facd
+Description: i18n: fix untranslated prompts with translated responses (issue3936)
+Bug: http://bz.selenic.com/show_bug.cgi?id=3936
+Bug-Debian: http://bugs.debian.org/701168
+
+diff --git a/i18n/de.po b/i18n/de.po
+--- a/i18n/de.po
++++ b/i18n/de.po
+@@ -14078,13 +14078,14 @@ msgstr ""
+ 
+ #, 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"
+

Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series	2013-05-29 06:45:46 UTC (rev 9693)
+++ packages/mercurial/trunk/debian/patches/series	2013-05-29 06:46:30 UTC (rev 9694)
@@ -7,3 +7,4 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
+from_upstream__fix_untranslated_prompts_with_translated_responses.patch