[PATCH 1 of 1 STABLE] i18n: prevent note directives to interpret text as options

Simon Heimberg simohe at besonet.ch
Mon Oct 21 16:18:02 CDT 2013


# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1382388487 -7200
# Node ID 9177f7f9a3e17e57f7879bfe46ff24da61de9b74
# Parent  ab2362e1672e341d13b0f2546b672122b2eb5ced
i18n: prevent note directives to interpret text as options

directives like note may have options. They are written like this:
.. note::
  :option1: value1
  :option2: value2

When a text line in a note starts with a role like :hg:, this may be
interpreted as an option, which fails. This happened on some buildbot runs.
To prevent this the text is moved into its own block (separated by two
newlines).

diff -r ab2362e1672e -r 9177f7f9a3e1 i18n/ja.po
--- a/i18n/ja.po	Die Okt 01 17:43:54 2013 -0700
+++ b/i18n/ja.po	Mon Okt 21 22:48:07 2013 +0200
@@ -10284,6 +10284,7 @@
 "      incorrect merge."
 msgstr ""
 "    .. note::\n"
+"       \n"
 "      :hg:`backout` による打消し機能は、マージ実施リビジョンに対しては、\n"
 "      適用できません。"
 
@@ -10717,6 +10718,7 @@
 "       information about named branches and bookmarks."
 msgstr ""
 "    .. note::\n"
+"       \n"
 "       ブランチ名は永続的で且つ共有されます。\n"
 "       軽量な名前付けが必要なら、\n"
 "       :hg:`bookmark` でブックマークを作成してください。\n"
@@ -13743,6 +13745,7 @@
 "       use :hg:`update --clean .`."
 msgstr ""
 "    .. note::\n"
+"       \n"
 "       作業領域を、 別リビジョン時点の内容で更新する場合は\n"
 "       :hg:`update 対象リビジョン` を実行してください。\n"
 "       マージ実施を途中で取り消す場合は\n"
diff -r ab2362e1672e -r 9177f7f9a3e1 i18n/ru.po
--- a/i18n/ru.po	Die Okt 01 17:43:54 2013 -0700
+++ b/i18n/ru.po	Mon Okt 21 22:48:07 2013 +0200
@@ -14226,6 +14226,7 @@
 "       use :hg:`update --clean .`."
 msgstr ""
 "    .. note::\n"
+"       \n"
 "       Чтобы извлечь более ранние ревизии, необходимо использовать\n"
 "       :hg:`update РЕВИЗИЯ`. Чтобы отменить незафиксированное слияние (с "
 "потерей\n"


More information about the Mercurial-devel mailing list