From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 30 Jun 2017 05:26:57 +0000 (+0000)
Subject: Merged r16729 from trunk to 3.4-stable (#26265)
X-Git-Tag: 3.4.0~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd28523d5f123c17f4d88e260d0f50bb7232f061;p=redmine.git

Merged r16729 from trunk to 3.4-stable (#26265)

Japanese wiki help translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16732 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/public/help/ja/wiki_syntax_detailed_markdown.html b/public/help/ja/wiki_syntax_detailed_markdown.html
index e8528f5d8..1078ab373 100644
--- a/public/help/ja/wiki_syntax_detailed_markdown.html
+++ b/public/help/ja/wiki_syntax_detailed_markdown.html
@@ -137,11 +137,11 @@
         </ul>
 
         <ul>
-            <li>Users:
+            <li>ユーザー:
                 <ul>
-                    <li><strong>user#2</strong> (link to user with id 2)</li>
-                    <li><strong>user:jsmith</strong> (Link to user with login jsmith)</li>
-                    <li><strong>@jsmith</strong> (Link to user with login jsmith)</li>
+                    <li><strong>user#2</strong> (id 2のユーザーへのリンク)</li>
+                    <li><strong>user:jsmith</strong> (jsmith というログインIDのユーザーへのリンク)</li>
+                    <li><strong>@jsmith</strong> (jsmith というログインIDのユーザーへのリンク)</li>
                 </ul>
             </li>
         </ul>
diff --git a/public/help/ja/wiki_syntax_detailed_textile.html b/public/help/ja/wiki_syntax_detailed_textile.html
index da784e6b4..cb5f07da8 100644
--- a/public/help/ja/wiki_syntax_detailed_textile.html
+++ b/public/help/ja/wiki_syntax_detailed_textile.html
@@ -128,11 +128,11 @@
         </ul>
 
         <ul>
-            <li>Users:
+            <li>ユーザー:
                 <ul>
-                    <li><strong>user#2</strong> (link to user with id 2)</li>
-                    <li><strong>user:jsmith</strong> (Link to user with login jsmith)</li>
-                    <li><strong>@jsmith</strong> (Link to user with login jsmith)</li>
+                    <li><strong>user#2</strong> (id 2のユーザーへのリンク)</li>
+                    <li><strong>user:jsmith</strong> (jsmith というログインIDのユーザーへのリンク)</li>
+                    <li><strong>@jsmith</strong> (jsmith というログインIDのユーザーへのリンク)</li>
                 </ul>
             </li>
         </ul>