[Winmerge-svn] SF.net SVN: winmerge: [4963] trunk

[<sdo...@us...>]

Revision: 4963
          http://winmerge.svn.sourceforge.net/winmerge/?rev=4963&view=rev
Author:   sdottaka
Date:     2008-01-26 20:38:29 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
Japanese translation - update

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/Languages/Japanese.po

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-01-27 00:31:15 UTC (rev 4962)
+++ trunk/Docs/Users/ChangeLog.txt	2008-01-27 04:38:29 UTC (rev 4963)
@@ -6,6 +6,7 @@
   Detect (and read/write) UTF-8 files without BOM (#1879271)
   Translation updates:
   - Croatian (r4952)
+  - Japanese (r4962)
 
 WinMerge 2.7.7.3 - 2008-01-23 (r4951)
   Resolve conflict files (cvs, svn...) (#1875129)

Modified: trunk/Src/Languages/Japanese.po
===================================================================
--- trunk/Src/Languages/Japanese.po	2008-01-27 00:31:15 UTC (rev 4962)
+++ trunk/Src/Languages/Japanese.po	2008-01-27 04:38:29 UTC (rev 4963)
@@ -12,7 +12,7 @@
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-11-11 17:28+0900\n"
+"PO-Revision-Date: 2008-01-27 13:21+0900\n"
 "Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n"
 "Language-Team: Japanese <win...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@
 #: Merge.rc:114
 #, c-format
 msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "\x83R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAD(&E)..."
 
 #: Merge.rc:116
 #, c-format
@@ -408,14 +408,14 @@
 #: Merge.rc:478
 #, c-format
 msgid "R&elease Notes"
-msgstr ""
+msgstr "\x83\x8A\x83\x8A\x81[\x83X\x83m\x81[\x83g(&E)"
 
 #: Merge.rc:180
 #: Merge.rc:296
 #: Merge.rc:479
 #, c-format
 msgid "&Translations"
-msgstr ""
+msgstr "\x96|\x96\xF3(&T)"
 
 #: Merge.rc:181
 #: Merge.rc:297
@@ -640,7 +640,7 @@
 #: Merge.rc:334
 #, c-format
 msgid "&Convert Line Endings to"
-msgstr "\x89\xFC\x8Ds\x83R\x81[\x83h\x82̕ϊ\xB7(&F)"
+msgstr "\x89\xFC\x8Ds\x83R\x81[\x83h\x82̕ϊ\xB7(&C)"
 
 #: Merge.rc:336
 #, c-format
@@ -665,7 +665,7 @@
 #: Merge.rc:343
 #, c-format
 msgid "&File Encoding..."
-msgstr ""
+msgstr "\x83t\x83@\x83C\x83\x8B\x83G\x83\x93\x83R\x81[\x83f\x83B\x83\x93\x83O(&F)..."
 
 #: Merge.rc:349
 #, c-format
@@ -761,12 +761,12 @@
 #: Merge.rc:387
 #, c-format
 msgid "Zoom In\tCtrl++"
-msgstr ""
+msgstr "\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x82\xF0\x8Ag\x91\xE5\tCtrl++"
 
 #: Merge.rc:388
 #, c-format
 msgid "Zoom Out\tCtrl+-"
-msgstr ""
+msgstr "\x83t\x83H\x83\x93\x83g\x83T\x83C\x83Y\x82\xF0\x8Fk\x8F\xAC\tCtrl+-"
 
 #: Merge.rc:389
 #, c-format
@@ -851,12 +851,12 @@
 #: Merge.rc:493
 #, c-format
 msgid "Co&mpare Special"
-msgstr ""
+msgstr "\x93\xC1\x8E\xEA\x82Ȕ\xE4\x8Ar(&M)"
 
 #: Merge.rc:495
 #, c-format
 msgid "&XML"
-msgstr ""
+msgstr "XML(&X)"
 
 #: Merge.rc:500
 #, c-format
@@ -1272,7 +1272,7 @@
 #: Merge.rc:759
 #, c-format
 msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "\x83t\x83@\x83C\x83\x8B\x94\xE4\x8Ar\x8E\x9E\x82̃t\x83@\x83C\x83\x8B\x8E\x9E\x8D\x8F\x82\xF0\x95ۂ\xC2(&P)"
 
 #: Merge.rc:762
 #, c-format
@@ -3413,12 +3413,12 @@
 #: Merge.rc:2008
 #, c-format
 msgid "Theirs File"
-msgstr ""
+msgstr "Theirs File"
 
 #: Merge.rc:2009
 #, c-format
 msgid "Mine File"
-msgstr ""
+msgstr "Mine File"
 
 #: Merge.rc:2015
 #, c-format
@@ -3624,7 +3624,7 @@
 #: Merge.rc:2069
 #, c-format
 msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "\x83R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82̉\xF0\x90͂Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B"
 
 #: Merge.rc:2075
 #, c-format
@@ -4634,17 +4634,17 @@
 #: Merge.rc:2377
 #, c-format
 msgid "Location Pane"
-msgstr "\x83\x8D\x83P\x81[\x83V\x83\x87\x83\x93\x83y\x83C\x83\x93"
+msgstr "Location Pane"
 
 #: Merge.rc:2378
 #, c-format
 msgid "Diff Pane"
-msgstr "Diff\x83y\x83C\x83\x93"
+msgstr "Diff Pane"
 
 #: Merge.rc:2384
 #, c-format
 msgid "Patch file successfully written."
-msgstr "\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x8F\x91\x8D\x9E\x82݂ɐ\xAC\x8C܂\xB5\x82\xBD\x81B"
+msgstr "\x83p\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82̏\x91\x82\xAB\x8D\x9E\x82݂ɐ\xAC\x8C܂\xB5\x82\xBD\x81B"
 
 #: Merge.rc:2385
 #, c-format
@@ -5900,7 +5900,7 @@
 #: Merge.rc:2750
 #, c-format
 msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "\x83R\x83\x93\x83t\x83\x8A\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82\xF0\x8AJ\x82\xAB\x89\xF0\x8C\x88\x82\xB5\x82܂\xB7\x81B"
 
 #: Merge.rc:2756
 #, c-format
@@ -6113,12 +6113,12 @@
 #: Merge.rc:2794
 #, c-format
 msgid "Increase text size"
-msgstr ""
+msgstr "\x83e\x83L\x83X\x83g\x83T\x83C\x83Y\x82\xF0\x91傫\x82\xAD\x82\xB7\x82\xE9"
 
 #: Merge.rc:2795
 #, c-format
 msgid "Decrease text size"
-msgstr ""
+msgstr "\x83e\x83L\x83X\x83g\x83T\x83C\x83Y\x82\xF0\x8F\xAC\x82\xB3\x82\xAD\x82\xB7\x82\xE9"
 
 #: Merge.rc:2801
 #, c-format
@@ -6342,13 +6342,21 @@
 
 #: Merge.rc:2853
 #, c-format
-msgid "Opens the release notes document\nRelease Notes"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
 msgstr ""
+"\x83\x8A\x83\x8A\x81[\x83X\x83m\x81[\x83g\x82\xF0\x8AJ\x82\xAD\n"
+"\x83\x8A\x83\x8A\x81[\x83X\x83m\x81[\x83g"
 
 #: Merge.rc:2854
 #, c-format
-msgid "Opens the translations website\nTranslations"
+msgid ""
+"Opens the translations website\n"
+"Translations"
 msgstr ""
+"\x96|\x96\xF3\x8F\xF3\x8B\xB5 Web\x83T\x83C\x83g\x82\xF0\x8AJ\x82\xAB\x82܂\xB7\n"
+"\x96|\x96\xF3"
 
 #: Merge.rc:2860
 #, c-format
@@ -6533,12 +6541,12 @@
 #: Merge.rc:2918
 #, c-format
 msgid "Portable Object"
-msgstr ""
+msgstr "Portable Object"
 
 #: Merge.rc:2919
 #, c-format
 msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
 
 #: Merge.rc:2920
 #, c-format


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.