[Python-apps-commits] r10043 - in packages/mercurial/trunk/debian/patches (2 files)

[vicho at users.alioth.debian.org]

    Date: Wednesday, October 2, 2013 @ 20:40:36
  Author: vicho
Revision: 10043

Refresh patches

Modified:
  packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2013-10-02 20:40:30 UTC (rev 10042)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-help-separately	2013-10-02 20:40:36 UTC (rev 10043)
@@ -14,7 +14,7 @@
      return p and p[0] != '.' and p[-1] != '~'
 --- a/mercurial/help.py
 +++ b/mercurial/help.py
-@@ -130,9 +130,11 @@ def loaddoc(topic):
+@@ -131,9 +131,11 @@ def loaddoc(topic):
              module = __file__
          base = os.path.dirname(module)
  

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-10-02 20:40:30 UTC (rev 10042)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-10-02 20:40:36 UTC (rev 10043)
@@ -67,19 +67,19 @@
  msgid ""
 --- a/i18n/de.po
 +++ b/i18n/de.po
-@@ -11328,8 +11328,8 @@ msgstr "(Vorlagen scheinen falsch instal
- msgid "checking commit editor...\n"
+@@ -13738,8 +13738,8 @@ msgid "checking commit editor...\n"
  msgstr "Prüfe Editor für Versionsmeldungen...\n"
  
+ #: mercurial/commands.py:2093
 -msgid " No commit editor set and can't find vi in PATH\n"
 -msgstr " Kein Editor für Versionsmeldungen angegeben und vi nicht im PATH\n"
 +msgid " No commit editor set and can't find sensible-editor in PATH\n"
 +msgstr " Kein Editor für Versionsmeldungen angegeben und sensible-editor nicht im PATH\n"
  
+ #: mercurial/commands.py:2094 mercurial/commands.py:2098
  msgid " (specify a commit editor in your configuration file)\n"
- msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -16933,7 +16933,8 @@ msgstr ""
- 
+@@ -20474,7 +20474,8 @@ msgstr ""
+ #: mercurial/help/config.txt:1156
  msgid ""
  "``editor``\n"
 -"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
@@ -87,8 +87,8 @@
 +"    ``sensible-editor``."
  msgstr ""
  
- msgid ""
-@@ -17815,7 +17816,7 @@ msgid ""
+ #: mercurial/help/config.txt:1159
+@@ -21471,7 +21472,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -97,15 +97,15 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -17824,7 +17825,7 @@ msgstr ""
+@@ -21480,7 +21481,7 @@ msgstr ""
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) "
  "ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
 -"    wird die Voreinstellung 'vi' verwendet."
 +"    wird die Voreinstellung 'sensible-editor' verwendet."
  
+ #: mercurial/help/environment.txt:99
  msgid ""
- "PYTHONPATH\n"
 --- a/i18n/el.po
 +++ b/i18n/el.po
 @@ -274,7 +274,7 @@ msgid ""
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11746,10 +11746,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11790,10 +11790,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,7 +229,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -18473,10 +18473,12 @@ msgstr ""
+@@ -18513,10 +18513,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19666,7 +19668,7 @@ msgid ""
+@@ -19706,7 +19708,7 @@ msgid ""
  "    editor it uses is determined by looking at the environment\n"
  "    variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
  "    non-empty one is chosen. If all of them are empty, the editor\n"
@@ -253,7 +253,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -19674,7 +19676,7 @@ msgstr ""
+@@ -19714,7 +19716,7 @@ msgstr ""
  "    mensagens de consolidação. O editor usado é determinado pela\n"
  "    consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
  "    nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"