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

[vicho at users.alioth.debian.org]

    Date: Thursday, July 4, 2013 @ 19:57:02
  Author: vicho
Revision: 9845

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	2013-07-04 19:54:52 UTC (rev 9844)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2013-07-04 19:57:02 UTC (rev 9845)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2048,8 +2048,8 @@ def debuginstall(ui):
+@@ -2055,8 +2055,8 @@ def debuginstall(ui):
      editor = ui.geteditor()
      cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
      if not cmdpath:
@@ -78,7 +78,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (Gib einen Editor in der .hgrc Datei an!)\n"
-@@ -16055,7 +16055,8 @@ msgstr ""
+@@ -16050,7 +16050,8 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -88,7 +88,7 @@
  msgstr ""
  
  msgid ""
-@@ -16837,7 +16838,7 @@ msgid ""
+@@ -16832,7 +16833,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,7 +97,7 @@
  msgstr ""
  "EDITOR\n"
  "    Manchmal muss Mercurial eine Textdatei in einem Editor öffnen, damit\n"
-@@ -16845,7 +16846,7 @@ msgstr ""
+@@ -16840,7 +16841,7 @@ msgstr ""
  "    geschrieben wird. Der verwendete Editor wird aus den drei Umgebungs-\n"
  "    variablen HGEDITOR, VISUAL und EDITOR (in dieser Reihenfolge) ermittelt.\n"
  "    Der erste nicht-leere wird verwendet. Wenn alle Angaben leer sind,\n"
@@ -117,7 +117,7 @@
  msgstr ""
  
  msgid ""
-@@ -11500,7 +11500,7 @@ msgstr ""
+@@ -6364,7 +6364,7 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -137,7 +137,7 @@
  msgstr ""
  
  msgid ""
-@@ -8228,7 +8228,7 @@ msgstr ""
+@@ -8201,7 +8201,7 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -11539,8 +11539,8 @@ msgstr " (テンプレートのインス
+@@ -11548,8 +11548,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,7 +181,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -18069,11 +18069,12 @@ msgstr ""
+@@ -18078,11 +18078,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -196,7 +196,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19220,7 +19221,7 @@ msgid ""
+@@ -19240,7 +19241,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"
@@ -205,7 +205,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -19228,7 +19229,7 @@ msgstr ""
+@@ -19248,7 +19249,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -11688,10 +11688,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -11697,10 +11697,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 ""
-@@ -18386,10 +18386,12 @@ msgstr ""
+@@ -18395,10 +18395,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -244,7 +244,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -19579,7 +19581,7 @@ msgid ""
+@@ -19588,7 +19590,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"
-@@ -19587,7 +19589,7 @@ msgstr ""
+@@ -19596,7 +19598,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"
@@ -296,7 +296,7 @@
  msgid ""
 --- a/i18n/zh_CN.po
 +++ b/i18n/zh_CN.po
-@@ -5880,7 +5880,7 @@ msgstr ""
+@@ -5778,7 +5778,7 @@ msgstr ""
  msgid "Checking commit editor...\n"
  msgstr ""
  
@@ -305,7 +305,7 @@
  msgstr ""
  
  msgid " (specify a commit editor in your .hgrc file)\n"
-@@ -8768,7 +8768,7 @@ msgid ""
+@@ -8666,7 +8666,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"