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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Mon Apr 2 20:43:39 UTC 2012


    Date: Monday, April 2, 2012 @ 20:43:37
  Author: vicho
Revision: 8417

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-04-02 20:43:30 UTC (rev 8416)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2012-04-02 20:43:37 UTC (rev 8417)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -1901,8 +1901,8 @@
+@@ -1902,8 +1902,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
-@@ -9190,8 +9190,8 @@
+@@ -10104,8 +10104,8 @@
  msgid "Checking commit editor...\n"
  msgstr "メッセージ入力用エディタの検証中...\n"
  
@@ -161,7 +161,7 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -15196,7 +15196,8 @@
+@@ -16117,7 +16117,8 @@
  
  msgid ""
  "``editor``\n"
@@ -171,7 +171,7 @@
  msgstr ""
  "``editor``\n"
  "    コミットログ入力用エディタ。 無指定の場合、 ``$EDITOR`` ないし\n"
-@@ -16185,7 +16186,7 @@
+@@ -17116,7 +17117,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"
-@@ -16193,7 +16194,7 @@
+@@ -17124,7 +17125,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -191,7 +191,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -10376,10 +10376,10 @@
+@@ -10417,10 +10417,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 ""
-@@ -16537,10 +16537,12 @@
+@@ -16580,10 +16580,12 @@
  
  msgid ""
  "``editor``\n"
@@ -219,7 +219,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -17560,7 +17562,7 @@
+@@ -17603,7 +17605,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"
-@@ -17568,7 +17570,7 @@
+@@ -17611,7 +17613,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"




More information about the Python-apps-commits mailing list