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

vicho at users.alioth.debian.org vicho at users.alioth.debian.org
Wed Nov 2 10:59:43 UTC 2016


    Date: Wednesday, November 2, 2016 @ 10:59:42
  Author: vicho
Revision: 13647

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	2016-11-02 10:59:08 UTC (rev 13646)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2016-11-02 10:59:42 UTC (rev 13647)
@@ -13,7 +13,7 @@
          EDITOR="$EDITOR -nw"
 --- a/mercurial/commands.py
 +++ b/mercurial/commands.py
-@@ -2761,15 +2761,15 @@ def debuginstall(ui, **opts):
+@@ -2781,15 +2781,15 @@ def debuginstall(ui, **opts):
      editor = util.expandpath(editor)
      fm.write('editor', _("checking commit editor... (%s)\n"), editor)
      cmdpath = util.findexe(shlex.split(editor)[0])
@@ -179,7 +179,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -22799,10 +22799,12 @@ msgstr ""
+@@ -22953,10 +22953,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -194,7 +194,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -24222,7 +24224,7 @@ msgid ""
+@@ -24376,7 +24378,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"
@@ -203,7 +203,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミットログ入力時のように、 エディタでファイルを開き、\n"
-@@ -24230,7 +24232,7 @@ msgstr ""
+@@ -24384,7 +24386,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(この順序で)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -214,7 +214,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -23359,11 +23359,12 @@ msgstr ""
+@@ -23489,11 +23489,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
@@ -229,7 +229,7 @@
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -24862,7 +24863,7 @@ msgid ""
+@@ -24992,7 +24993,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"
@@ -238,7 +238,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -24870,7 +24871,7 @@ msgstr ""
+@@ -25000,7 +25001,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"
@@ -247,7 +247,7 @@
  
  msgid ""
  "PYTHONPATH\n"
-@@ -34080,10 +34081,10 @@ msgstr "o número de cpus deve ser um in
+@@ -34428,10 +34429,10 @@ msgstr "o número de cpus deve ser um in
  #~ msgid " (check that you compiled the extensions)\n"
  #~ msgstr " (verifique se você compilou as extensões)\n"
  




More information about the Python-apps-commits mailing list