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

[solomax]

Author: solomax
Date: Sun Feb 15 12:55:07 2015
New Revision: 1659918

URL: http://svn.apache.org/r1659918
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=1659918&r1=1659917&r2=1659918&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:55:07 2015
@@ -4671,11 +4671,7 @@ 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>