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

[vicho at users.alioth.debian.org]

    Date: Thursday, November 5, 2015 @ 10:05:54
  Author: vicho
Revision: 12561

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	2015-11-05 10:05:26 UTC (rev 12560)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2015-11-05 10:05:54 UTC (rev 12561)
@@ -170,7 +170,7 @@
  msgid ""
 --- a/i18n/ja.po
 +++ b/i18n/ja.po
-@@ -12627,8 +12627,8 @@ msgstr " (テンプレートのインス
+@@ -13073,8 +13073,8 @@ msgstr " (テンプレートのインス
  msgid "checking commit editor...\n"
  msgstr "メッセージ入力用エディタの確認中...\n"
  
@@ -181,22 +181,22 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットログ用エディタを設定ファイルで設定してください)\n"
-@@ -20372,11 +20372,12 @@ msgstr ""
+@@ -21031,10 +21031,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
--"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
-+"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
-+"    ``sensible-editor``."
+-"    The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)"
++"    The editor to use during a commit. (default: ``$EDITOR`` or\n
++"    ``sensible-editor``)"
  msgstr ""
  "``editor``\n"
- "    コミットログ入力用エディタ。 ç„¡æŒ‡å®šã®å ´åˆã€ ``$EDITOR`` または\n"
--"    ``vi`` が使用されます。"
-+"    ``sensible-editor`` が使用されます。"
+-"    コミットログ入力用エディタ。 (デフォルト値: ``$EDITOR`` または ``vi``)"
++"    コミットログ入力用エディタ。 (デフォルト値: ``$EDITOR`` または\n
++"    ``sensible-editor``)"
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -21619,7 +21620,7 @@ msgid ""
+@@ -22333,7 +22335,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"
-@@ -21627,7 +21628,7 @@ msgstr ""
+@@ -22341,7 +22343,7 @@ msgstr ""
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -216,7 +216,7 @@
  "PYTHONPATH\n"
 --- a/i18n/pt_BR.po
 +++ b/i18n/pt_BR.po
-@@ -12814,10 +12814,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -13233,10 +13233,10 @@ msgstr " (modelos parecem ter sido insta
  msgid "checking commit editor...\n"
  msgstr "verificando editor para consolidação...\n"
  
@@ -229,22 +229,22 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr ""
-@@ -20777,10 +20777,12 @@ msgstr ""
+@@ -21414,11 +21414,12 @@ msgstr ""
  
  msgid ""
  "``editor``\n"
--"    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
-+"    The editor to use during a commit. Default is ``$EDITOR`` or\n"
-+"    ``sensible-editor``."
+-"    The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)"
++"    The editor to use during a commit. (default: ``$EDITOR`` or\n
++"    ``sensible-editor``)"
  msgstr ""
  "``editor``\n"
--"    O editor usado durante um commit. O padrão é ``$EDITOR`` ou ``vi``."
-+"    O editor usado durante um commit. O padrão é ``$EDITOR`` ou\n"
-+"    ``sensible-editor``."
+ "    O editor usado durante um commit.\n"
+-"    (padrão: ``$EDITOR`` ou ``vi``)"
++"    (padrão: ``$EDITOR`` ou ``sensible-editor``)"
  
  msgid ""
  "``fallbackencoding``\n"
-@@ -22058,7 +22060,7 @@ msgid ""
+@@ -22772,7 +22773,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"
-@@ -22066,7 +22068,7 @@ msgstr ""
+@@ -22780,7 +22781,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"
@@ -338,7 +338,7 @@
  msgid ""
 --- a/mercurial/help/environment.txt
 +++ b/mercurial/help/environment.txt
-@@ -94,7 +94,7 @@ EDITOR
+@@ -100,7 +100,7 @@ EDITOR
      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