[Python-apps-commits] r7653 - in packages/mercurial/trunk/debian (2 files)

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

    Date: Sunday, October 16, 2011 @ 15:11:22
  Author: vicho-guest
Revision: 7653

Cover more uses of "defaults to sensible-editor" in the documentation
and support ru and ro translations

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2011-10-16 12:49:46 UTC (rev 7652)
+++ packages/mercurial/trunk/debian/changelog	2011-10-16 15:11:22 UTC (rev 7653)
@@ -1,3 +1,10 @@
+mercurial (1.9.3-2) UNRELEASED; urgency=low
+
+  * Cover more uses of "defaults to sensible-editor" in the
+    documentation and support ru and ro translations.
+
+ -- Javi Merino <cibervicho at gmail.com>  Sun, 16 Oct 2011 16:07:31 +0100
+
 mercurial (1.9.3-1) unstable; urgency=low
 
   * New upstream release 1.9.3.

Modified: packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-10-16 12:49:46 UTC (rev 7652)
+++ packages/mercurial/trunk/debian/patches/deb_specific__use_sensible-editor.patch	2011-10-16 15:11:22 UTC (rev 7653)
@@ -161,7 +161,17 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n"
-@@ -13820,7 +13820,7 @@
+@@ -13061,7 +13061,8 @@
+ 
+ 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``."
+ msgstr ""
+ 
+ msgid ""
+@@ -13820,7 +13821,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"
@@ -170,7 +180,7 @@
  msgstr ""
  "EDITOR\n"
  "    コミット時のメッセージのように、 エディタでファイルを開き、\n"
-@@ -13828,7 +13828,7 @@
+@@ -13828,7 +13829,7 @@
  "    そこで使用されるエディタは、 HGEDITOR、 VISUAL\n"
  "    あるいは EDITOR 環境変数に設定されたものを(ã“ã®é †åºã§)使用します。\n"
  "    最初の空で無い値に設定された環境変数の値を使用します。\n"
@@ -192,7 +202,22 @@
  
  msgid " (specify a commit editor in your configuration file)\n"
  msgstr " (especifique um editor para consolidação em seu arquivo de configuração)\n"
-@@ -15794,7 +15794,7 @@
+@@ -14785,10 +14785,12 @@
+ 
+ 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
++"    ``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
++"    ``sensible-editor``."
+ 
+ msgid ""
+ "``fallbackencoding``\n"
+@@ -15794,7 +15796,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"
@@ -201,7 +226,7 @@
  msgstr ""
  "EDITOR\n"
  "    Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -15802,7 +15802,7 @@
+@@ -15802,7 +15804,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"
@@ -221,7 +246,17 @@
  msgstr ""
  
  msgid " (specify a commit editor in your configuration file)\n"
-@@ -13126,7 +13126,7 @@
+@@ -12460,7 +12460,8 @@
+ 
+ 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
++"    ``sensible-editor``."
+ msgstr ""
+ 
+ msgid ""
+@@ -13126,7 +13127,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"
@@ -283,3 +318,86 @@
  
  PYTHONPATH
      This is used by Python to find imported modules and may need to be
+--- a/mercurial/help/config.txt
++++ b/mercurial/help/config.txt
+@@ -1012,7 +1012,8 @@
+     Print debugging information. True or False. Default is False.
+ 
+ ``editor``
+-    The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
++    The editor to use during a commit. Default is ``$EDITOR`` or
++    ``sensible-editor``.
+ 
+ ``fallbackencoding``
+     Encoding to try if it's not possible to decode the changelog using
+--- a/i18n/ro.po
++++ b/i18n/ro.po
+@@ -7720,7 +7720,7 @@
+ msgid "Checking commit editor...\n"
+ msgstr "Se verifică editorul pentru commit...\n"
+ 
+-msgid " No commit editor set and can't find vi in PATH\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
+ msgstr ""
+ 
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -11923,7 +11923,8 @@
+ 
+ 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
++"    ``sensible-editor``."
+ msgstr ""
+ 
+ msgid ""
+@@ -12568,7 +12569,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"
+-"    defaults to 'vi'."
++"    defaults to 'sensible-editor'."
+ msgstr ""
+ 
+ msgid ""
+--- a/i18n/ru.po
++++ b/i18n/ru.po
+@@ -7893,7 +7893,7 @@
+ msgid "Checking commit editor...\n"
+ msgstr ""
+ 
+-msgid " No commit editor set and can't find vi in PATH\n"
++msgid " No commit editor set and can't find sensible-editor in PATH\n"
+ msgstr ""
+ 
+ msgid " (specify a commit editor in your configuration file)\n"
+@@ -13231,10 +13231,10 @@
+ 
+ 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 ``sensible-editor``."
+ msgstr ""
+ "``editor``\n"
+-"    Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or ``vi``."
++"    Редактор, вызываетмый при коммите. По умолчанию ``$EDITOR`` or ``sensible-editor``."
+ 
+ msgid ""
+ "``fallbackencoding``\n"
+@@ -14204,14 +14204,14 @@
+ "    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"
+-"    defaults to 'vi'."
++"    defaults to 'sensible-editor'."
+ msgstr ""
+ "EDITOR\n"
+ "    Инодга требуется открыть текстовый файл в редакторе, чтобы.\n"
+ "    внести изменения, например для написания сообщения коммита.\n"
+ "    Используемый редактор определяется переменными среды HGEDITOR,\n"
+ "    VISUAL и EDITOR, именно в таком порядке. Выбирается первая\n"
+-"    непустая переменная. Если они все пусты, используется 'vi'."
++"    непустая переменная. Если они все пусты, используется 'sensible-editor'."
+ 
+ msgid ""
+ "PYTHONPATH\n"