Japanese translation - update

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index e246085..feffc8e 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -6,6 +6,7 @@ WinMerge 2.7.7.4
   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)

diff --git a/Src/Languages/Japanese.po b/Src/Languages/Japanese.po
index 14d3830..09fcdfe 100644 (file)
--- a/Src/Languages/Japanese.po
+++ b/Src/Languages/Japanese.po
@@ -12,7 +12,7 @@ msgstr ""
 "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 <winmerge-translate@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr "
 #: Merge.rc:114
 #, c-format
 msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "\83R\83\93\83t\83\8a\83N\83g\83t\83@\83C\83\8b\82ð\8aJ\82­(&E)..."
 
 #: Merge.rc:116
 #, c-format
@@ -408,14 +408,14 @@ msgstr "
 #: Merge.rc:478
 #, c-format
 msgid "R&elease Notes"
-msgstr ""
+msgstr "\83\8a\83\8a\81[\83X\83m\81[\83g(&E)"
 
 #: Merge.rc:180
 #: Merge.rc:296
 #: Merge.rc:479
 #, c-format
 msgid "&Translations"
-msgstr ""
+msgstr "\96|\96ó(&T)"
 
 #: Merge.rc:181
 #: Merge.rc:297
@@ -640,7 +640,7 @@ msgstr "
 #: Merge.rc:334
 #, c-format
 msgid "&Convert Line Endings to"
-msgstr "\89ü\8ds\83R\81[\83h\82Ì\95Ï\8a·(&F)"
+msgstr "\89ü\8ds\83R\81[\83h\82Ì\95Ï\8a·(&C)"
 
 #: Merge.rc:336
 #, c-format
@@ -665,7 +665,7 @@ msgstr "
 #: Merge.rc:343
 #, c-format
 msgid "&File Encoding..."
-msgstr ""
+msgstr "\83t\83@\83C\83\8b\83G\83\93\83R\81[\83f\83B\83\93\83O(&F)..."
 
 #: Merge.rc:349
 #, c-format
@@ -761,12 +761,12 @@ msgstr "
 #: Merge.rc:387
 #, c-format
 msgid "Zoom In\tCtrl++"
-msgstr ""
+msgstr "\83t\83H\83\93\83g\83T\83C\83Y\82ð\8ag\91å\tCtrl++"
 
 #: Merge.rc:388
 #, c-format
 msgid "Zoom Out\tCtrl+-"
-msgstr ""
+msgstr "\83t\83H\83\93\83g\83T\83C\83Y\82ð\8fk\8f¬\tCtrl+-"
 
 #: Merge.rc:389
 #, c-format
@@ -851,12 +851,12 @@ msgstr "
 #: Merge.rc:493
 #, c-format
 msgid "Co&mpare Special"
-msgstr ""
+msgstr "\93Á\8eê\82È\94ä\8ar(&M)"
 
 #: Merge.rc:495
 #, c-format
 msgid "&XML"
-msgstr ""
+msgstr "XML(&X)"
 
 #: Merge.rc:500
 #, c-format
@@ -1272,7 +1272,7 @@ msgstr "
 #: Merge.rc:759
 #, c-format
 msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "\83t\83@\83C\83\8b\94ä\8ar\8e\9e\82Ì\83t\83@\83C\83\8b\8e\9e\8d\8f\82ð\95Û\82Â(&P)"
 
 #: Merge.rc:762
 #, c-format
@@ -3413,12 +3413,12 @@ msgstr "
 #: 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 @@ msgstr ""
 #: Merge.rc:2069
 #, c-format
 msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "\83R\83\93\83t\83\8a\83N\83g\83t\83@\83C\83\8b\82Ì\89ð\90Í\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B"
 
 #: Merge.rc:2075
 #, c-format
@@ -4634,17 +4634,17 @@ msgstr "
 #: Merge.rc:2377
 #, c-format
 msgid "Location Pane"
-msgstr "\83\8d\83P\81[\83V\83\87\83\93\83y\83C\83\93"
+msgstr "Location Pane"
 
 #: Merge.rc:2378
 #, c-format
 msgid "Diff Pane"
-msgstr "Diff\83y\83C\83\93"
+msgstr "Diff Pane"
 
 #: Merge.rc:2384
 #, c-format
 msgid "Patch file successfully written."
-msgstr "\83p\83b\83`\83t\83@\83C\83\8b\8f\91\8d\9e\82Ý\82É\90¬\8c÷\82µ\82Ü\82µ\82½\81B"
+msgstr "\83p\83b\83`\83t\83@\83C\83\8b\82Ì\8f\91\82«\8d\9e\82Ý\82É\90¬\8c÷\82µ\82Ü\82µ\82½\81B"
 
 #: Merge.rc:2385
 #, c-format
@@ -5900,7 +5900,7 @@ msgstr ""
 #: Merge.rc:2750
 #, c-format
 msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "\83R\83\93\83t\83\8a\83N\83g\83t\83@\83C\83\8b\82ð\8aJ\82«\89ð\8c\88\82µ\82Ü\82·\81B"
 
 #: Merge.rc:2756
 #, c-format
@@ -6113,12 +6113,12 @@ msgstr ""
 #: Merge.rc:2794
 #, c-format
 msgid "Increase text size"
-msgstr ""
+msgstr "\83e\83L\83X\83g\83T\83C\83Y\82ð\91å\82«\82­\82·\82é"
 
 #: Merge.rc:2795
 #, c-format
 msgid "Decrease text size"
-msgstr ""
+msgstr "\83e\83L\83X\83g\83T\83C\83Y\82ð\8f¬\82³\82­\82·\82é"
 
 #: Merge.rc:2801
 #, c-format
@@ -6342,13 +6342,21 @@ msgstr ""
 
 #: Merge.rc:2853
 #, c-format
-msgid "Opens the release notes document\nRelease Notes"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
 msgstr ""
+"\83\8a\83\8a\81[\83X\83m\81[\83g\82ð\8aJ\82­\n"
+"\83\8a\83\8a\81[\83X\83m\81[\83g"
 
 #: Merge.rc:2854
 #, c-format
-msgid "Opens the translations website\nTranslations"
+msgid ""
+"Opens the translations website\n"
+"Translations"
 msgstr ""
+"\96|\96ó\8fó\8bµ Web\83T\83C\83g\82ð\8aJ\82«\82Ü\82·\n"
+"\96|\96ó"
 
 #: Merge.rc:2860
 #, c-format
@@ -6533,12 +6541,12 @@ msgstr "PHP"
 #: 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