You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/02/15 13:54:19 UTC

svn commit: r1659917 - /openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml

Author: solomax
Date: Sun Feb 15 12:54:19 2015
New Revision: 1659917

URL: http://svn.apache.org/r1659917
Log:
Japaneese translation is updated (thanks to Keiji Ono)

Modified:
    openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml?rev=1659917&r1=1659916&r2=1659917&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml Sun Feb 15 12:54:19 2015
@@ -4671,7 +4671,11 @@ see http://openmeetings.apache.org/Langu
     <value>ウィジェット</value>
   </string>
   <string id="1549" name="about_title">
+<<<<<<< .mine
+    <value>OpenMeetingsについて</value>
+=======
     <value>について</value>
+>>>>>>> .r1649741
   </string>
   <string id="1550" name="about_name">
     <value>名称</value>
@@ -4824,6 +4828,6 @@ see http://openmeetings.apache.org/Langu
     <value>この会議室へは入れません</value>
   </string>
   <string id="1600" name="record-re-start">
-    <value>Re-convert</value>
+    <value>再録音開始</value>
   </string>
 </language>