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

[vicho at users.alioth.debian.org]

    Date: Sunday, June 9, 2013 @ 07:45:16
  Author: vicho
Revision: 9730

Delete patch from_upstream__fix_untranslated_prompts_with_translated_responses.patch which is now included upstream

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

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2013-06-09 07:45:11 UTC (rev 9729)
+++ packages/mercurial/trunk/debian/changelog	2013-06-09 07:45:16 UTC (rev 9730)
@@ -1,6 +1,9 @@
 mercurial (2.6.2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Delete patch
+    from_upstream__fix_untranslated_prompts_with_translated_responses.patch
+    which is now included upstream
 
  -- Javi Merino <vicho at debian.org>  Sun, 09 Jun 2013 08:30:59 +0100
 

Deleted: 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	2013-06-09 07:45:11 UTC (rev 9729)
+++ packages/mercurial/trunk/debian/patches/from_upstream__fix_untranslated_prompts_with_translated_responses.patch	2013-06-09 07:45:16 UTC (rev 9730)
@@ -1,26 +0,0 @@
-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-06-09 07:45:11 UTC (rev 9729)
+++ packages/mercurial/trunk/debian/patches/series	2013-06-09 07:45:16 UTC (rev 9730)
@@ -7,4 +7,3 @@
 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