From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Fri, 24 Jun 2011 10:35:04 +0000 (+0000)
Subject: OSQA-711, change the markdown tips, _italic_ should stand for italic text rather... 
X-Git-Tag: live~240
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/7884b6e497280920dc9680d4b99edd141eb410db

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

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 71dff87..5a00975 100644
--- 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 4611037..2c95a5a 100755
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 16b11a7..f2542d5 100755
--- 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 11620d2..991b61f 100644
--- 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 42da287..3a57a16 100644
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 f8a1e17..bfbd2e3 100644
--- 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 67592f0..f919486 100644
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 fb25ca9..d77c23d 100644
--- 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 345109f..fbaada0 100644
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 3927f7e..caf04ad 100644
--- 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 6b21802..c88de4d 100644
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 17da988..f90cbcc 100644
--- 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 345109f..18cf42c 100644
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 4255b9e..8ee4e47 100644
--- 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 345109f..18cf42c 100644
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 4255b9e..8ee4e47 100644
--- 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 66452b7..5596410 100644
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 0e3426a..e3366d8 100644
--- 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