OSQA-711, change the markdown tips, _italic_ should stand for italic text rather...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1073 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/templates/sidebar/markdown_help.html b/forum/skins/default/templates/sidebar/markdown_help.html
index 71dff87f3096cba5cb738c6af0da74a850c2c36e..5a00975578b71206e93912ae5b2d9be4a3f7f9e6 100644 (file)
--- a/forum/skins/default/templates/sidebar/markdown_help.html
+++ b/forum/skins/default/templates/sidebar/markdown_help.html
@@ -3,7 +3,7 @@
     <p class="subtitle darkred">{% trans "Markdown Basics" %}</p>
     <ul class="list-item">
         <li>
-            {% trans "*italic* or __italic__" %}
+            {% trans "*italic* or _italic_" %}
         </li>
         <li>
                        {% trans "**bold** or __bold__" %}

diff --git a/locale/bg/LC_MESSAGES/django.mo b/locale/bg/LC_MESSAGES/django.mo
index 461103789d7539dea749c5727000506ba543a5ba..2c95a5a9ef6c30561f305a4c2e14b0fe3aa048eb 100755 (executable)
Binary files a/locale/bg/LC_MESSAGES/django.mo and b/locale/bg/LC_MESSAGES/django.mo differ

diff --git a/locale/bg/LC_MESSAGES/django.po b/locale/bg/LC_MESSAGES/django.po
index 16b11a7ab3e16252915bee1f2b984314e31cf392..f2542d5eca18ab847176649fe9b323aa69c7469a 100755 (executable)
--- a/locale/bg/LC_MESSAGES/django.po
+++ b/locale/bg/LC_MESSAGES/django.po
@@ -5307,7 +5307,7 @@ msgid "Markdown Basics"
 msgstr "Markdown съвети"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr "*италик* или __италик__"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 11620d2ebf910a607aae71d1a719a899b5cd1c44..991b61f5d6c03f26ff9044d0a9899d4212dc2e7f 100644 (file)
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -5132,7 +5132,7 @@ msgid "Markdown Basics"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 42da2871a14b3ca7dd59997639e76db159a58394..3a57a16394f3ac83ddbaac558cd350e50c8d265c 100644 (file)
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index f8a1e171f7dedd8d3a43f3d9c667bd88696ea78b..bfbd2e350c145a9d1b3b4759c0ae74e12903c2c6 100644 (file)
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -5405,7 +5405,7 @@ msgid "Markdown Basics"
 msgstr "Markdown basics"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 67592f0c3793cc6da040bd7a0aa93292b9b5729e..f919486fffbabbf4459ac541a43c9749128ef119 100644 (file)
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fb25ca993b916eefc3ce294c421640471e4bca8d..d77c23d93344e91373eba9551a6b2e31d1b160ae 100644 (file)
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -5607,7 +5607,7 @@ msgid "Markdown Basics"
 msgstr "Trucos del editor"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr "*cursiva* o _cursiva_"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 345109f9a05f085b139f682498a5b022e61d8658..fbaada0fd2e70c78f6b1616484621203c24ecf4c 100644 (file)
Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 3927f7e47cd27434eadb703f2ce89135206ca122..caf04ad735bdb92a524bcfc5a12733e3bdd4cdba 100644 (file)
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -5176,7 +5176,7 @@ msgid "Markdown Basics"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/ja/LC_MESSAGES/django.mo b/locale/ja/LC_MESSAGES/django.mo
index 6b2180271eb57ad72a193f4211b396d413805404..c88de4d7d96a961ebffca54dd70cdce845fec539 100644 (file)
Binary files a/locale/ja/LC_MESSAGES/django.mo and b/locale/ja/LC_MESSAGES/django.mo differ

diff --git a/locale/ja/LC_MESSAGES/django.po b/locale/ja/LC_MESSAGES/django.po
index 17da9886d3bdbbe522d9284c72c180b6c9526cbd..f90cbccd5fc2df1110988cd73573335b244e3c5c 100644 (file)
--- a/locale/ja/LC_MESSAGES/django.po
+++ b/locale/ja/LC_MESSAGES/django.po
@@ -5413,8 +5413,8 @@ msgid "Markdown Basics"
 msgstr "Markdownの基礎"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
-msgstr "*斜体*または__italic__"
+msgid "*italic* or _italic_"
+msgstr "*斜体*または_italic_"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9
 msgid "**bold** or __bold__"

diff --git a/locale/l/LC_MESSAGES/django.mo b/locale/l/LC_MESSAGES/django.mo
index 345109f9a05f085b139f682498a5b022e61d8658..18cf42ca0760338ff9d051bc311cea180a84960f 100644 (file)
Binary files a/locale/l/LC_MESSAGES/django.mo and b/locale/l/LC_MESSAGES/django.mo differ

diff --git a/locale/l/LC_MESSAGES/django.po b/locale/l/LC_MESSAGES/django.po
index 4255b9e265092c3f6fd960a96a8b8415f13e3b2d..8ee4e4732d8c6190e290e90b4f47fbbd9bec90fd 100644 (file)
--- a/locale/l/LC_MESSAGES/django.po
+++ b/locale/l/LC_MESSAGES/django.po
@@ -5150,7 +5150,7 @@ msgid "Markdown Basics"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/pt/LC_MESSAGES/django.mo b/locale/pt/LC_MESSAGES/django.mo
index 345109f9a05f085b139f682498a5b022e61d8658..18cf42ca0760338ff9d051bc311cea180a84960f 100644 (file)
Binary files a/locale/pt/LC_MESSAGES/django.mo and b/locale/pt/LC_MESSAGES/django.mo differ

diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po
index 4255b9e265092c3f6fd960a96a8b8415f13e3b2d..8ee4e4732d8c6190e290e90b4f47fbbd9bec90fd 100644 (file)
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -5150,7 +5150,7 @@ msgid "Markdown Basics"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr ""
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 66452b7fb8dd50295c1b86b69a622e27c382283e..5596410a6234e9cf3ee595b9720944e5acc366e5 100644 (file)
Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 0e3426a1d87802780a6932f5f58bb3ae75b75752..e3366d89971c984334e0179a7981bd92d84bfbfb 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -5529,7 +5529,7 @@ msgstr "Markdown快速参考"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:6
 #, fuzzy
-msgid "*italic* or __italic__"
+msgid "*italic* or _italic_"
 msgstr "*斜体* 或者 _斜体_"
 
 #: forum/skins/default/templates/sidebar/markdown_help.html:9