[Python-apps-commits] r7538 - in packages/mercurial/trunk/debian/patches (1 file)

[vicho-guest at users.alioth.debian.org]

    Date: Monday, September 12, 2011 @ 20:08:12
  Author: vicho-guest
Revision: 7538

Refresh patches

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

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-09-12 20:08:02 UTC (rev 7537)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-09-12 20:08:12 UTC (rev 7538)
@@ -26,7 +26,7 @@
          else:
 --- a/mercurial/ui.py
 +++ b/mercurial/ui.py
-@@ -656,7 +656,7 @@
+@@ -659,7 +659,7 @@
          return (os.environ.get("HGEDITOR") or
                  self.config("ui", "editor") or
                  os.environ.get("VISUAL") or
@@ -150,7 +150,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -8354,8 +8354,8 @@
+@@ -8372,8 +8372,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -161,7 +161,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -13783,7 +13783,7 @@
+@@ -13818,7 +13818,7 @@
  "    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"
@@ -170,7 +170,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -13791,7 +13791,7 @@
+@@ -13826,7 +13826,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -181,7 +181,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -9254,8 +9254,8 @@
+@@ -9257,8 +9257,8 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -192,7 +192,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n"
-@@ -15758,7 +15758,7 @@
+@@ -15794,7 +15794,7 @@
  "    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"
@@ -201,7 +201,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -15766,7 +15766,7 @@
+@@ -15802,7 +15802,7 @@
  "    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"
@@ -212,7 +212,7 @@
  "PYTHONPATH\n"
 --- a/i18n/sv.po
 +++ b/i18n/sv.po
-@@ -7868,7 +7868,7 @@
+@@ -7890,7 +7890,7 @@
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -221,7 +221,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13095,7 +13095,7 @@
+@@ -13126,7 +13126,7 @@
  "    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"
@@ -285,7 +285,7 @@
      This is used by Python to find imported modules and may need to be
 --- a/doc/hg.1
 +++ b/doc/hg.1
-@@ -3278,7 +3278,7 @@
+@@ -3282,7 +3282,7 @@
  editor it uses is determined by looking at the environment
  variables HGEDITOR, VISUAL and EDITOR, in that order. The first
  non\-empty one is chosen. If all of them are empty, the editor
@@ -296,7 +296,7 @@
  .
 --- a/doc/hg.1.html
 +++ b/doc/hg.1.html
-@@ -2697,7 +2697,7 @@
+@@ -2701,7 +2701,7 @@
  editor it uses is determined by looking at the environment
  variables HGEDITOR, VISUAL and EDITOR, in that order. The first
  non-empty one is chosen. If all of them are empty, the editor
@@ -307,7 +307,7 @@
  set appropriately if this Mercurial is not installed system-wide.</dd>
 --- a/doc/hgrc.5
 +++ b/doc/hgrc.5
-@@ -1252,7 +1252,8 @@
+@@ -1254,7 +1254,8 @@
  .TP
  .B \fBeditor\fP
  .sp
@@ -319,7 +319,7 @@
  .sp
 --- a/doc/hgrc.5.html
 +++ b/doc/hgrc.5.html
-@@ -975,7 +975,7 @@
+@@ -977,7 +977,7 @@
  <dt><tt class="docutils literal">debug</tt></dt>
  <dd>Print debugging information. True or False. Default is False.</dd>
  <dt><tt class="docutils literal">editor</tt></dt>