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

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

    Date: Friday, January 6, 2012 @ 22:13:10
  Author: vicho-guest
Revision: 8036

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	2012-01-06 22:12:53 UTC (rev 8035)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-01-06 22:13:10 UTC (rev 8036)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1879,8 +1879,8 @@
+@@ -1881,8 +1881,8 @@
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -150,7 +150,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -9076,8 +9076,8 @@
+@@ -9087,8 +9087,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -161,7 +161,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -14893,7 +14893,8 @@
+@@ -14937,7 +14937,8 @@
  
  msgid ""
  "``editor``\n"
@@ -171,7 +171,7 @@
  msgstr ""
  "``editor``\n"
  "    コミットログ入力用エディタ。 ç„¡æŒ‡å®šã®å ´åˆã€ ``$EDITOR`` ないし\n"
-@@ -15882,7 +15883,7 @@
+@@ -15926,7 +15927,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"
@@ -180,7 +180,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -15890,7 +15891,7 @@
+@@ -15934,7 +15935,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -191,7 +191,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -10216,10 +10216,10 @@
+@@ -10256,10 +10256,10 @@
  msgid "Checking commit editor...\n"
  msgstr "Verificando editor para consolidação...\n"
  
@@ -204,7 +204,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -16234,10 +16234,12 @@
+@@ -16273,10 +16273,12 @@
  
  msgid ""
  "``editor``\n"
@@ -219,7 +219,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -17257,7 +17259,7 @@
+@@ -17296,7 +17298,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"
@@ -228,7 +228,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -17265,7 +17267,7 @@
+@@ -17304,7 +17306,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"