winmerge-svn Mailing List for WinMerge (Page 24)

Windows visual diff and merge for files and directories

Brought to you by: christianlist, grimmdp

winmerge-svn — Subscribe to this list if you wish to receive notifications from Subversion

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (148)	Oct (84)	Nov (130)	Dec (121)
2007	Jan (89)	Feb (50)	Mar (81)	Apr (45)	May (42)	Jun (46)	Jul (40)	Aug (98)	Sep (80)	Oct (101)	Nov (128)	Dec (46)
2008	Jan (132)	Feb (117)	Mar (118)	Apr (112)	May (69)	Jun (140)	Jul (164)	Aug (159)	Sep (115)	Oct (65)	Nov (80)	Dec (128)
2009	Jan (145)	Feb (97)	Mar (118)	Apr (87)	May (96)	Jun (83)	Jul (50)	Aug (42)	Sep (18)	Oct (32)	Nov (12)	Dec (35)
2010	Jan (38)	Feb (8)	Mar (5)	Apr (19)	May (23)	Jun (39)	Jul (16)	Aug (4)	Sep (60)	Oct (100)	Nov (57)	Dec (43)
2011	Jan (25)	Feb (1)	Mar (3)	Apr	May (13)	Jun (19)	Jul	Aug (6)	Sep (5)	Oct (6)	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2013	Jan	Feb	Mar (19)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 22 23 24 25 26 .. 163 > >> (Page 24 of 163)

[Winmerge-svn] SF.net SVN: winmerge:[7017] trunk/Docs/Users/Manual

From: <den...@us...> - 2009-10-21 15:56:12

Revision: 7017
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7017&view=rev
Author:   denisbradford
Date:     2009-10-21 15:55:56 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Generate toc in tour; eliminate null id attribute in Compare_files.

Modified Paths:
--------------
    trunk/Docs/Users/Manual/Compare_files.xml
    trunk/Docs/Users/Manual/build/build_tour.xsl

Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml	2009-10-20 18:00:37 UTC (rev 7016)
+++ trunk/Docs/Users/Manual/Compare_files.xml	2009-10-21 15:55:56 UTC (rev 7017)
@@ -6,7 +6,7 @@
       <primary>comparing files</primary>
     </indexterm></title>
 
-  <para>This topic describes how to use the WinMerge File Compare window to
+  <para id="">This topic describes how to use the WinMerge File Compare window to
   compare and merge text files. To understand the basic concepts about
   differences discussed here, we suggest you read <xref linkend="Intro_diffs" />
   first. See <xref linkend="Intro_diffs" /> for related information about hex
@@ -1938,4 +1938,4 @@
       conflict file is also accepted in command line.</para>
     </section>
   </section>
-</article>
\ No newline at end of file
+</article>

Modified: trunk/Docs/Users/Manual/build/build_tour.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_tour.xsl	2009-10-20 18:00:37 UTC (rev 7016)
+++ trunk/Docs/Users/Manual/build/build_tour.xsl	2009-10-21 15:55:56 UTC (rev 7017)
@@ -36,7 +36,7 @@
      html/param.xsl  parameters
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
 <xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="generate.toc">book nop</xsl:param> 
+<xsl:param name="generate.toc">book toc</xsl:param> 
 <xsl:param name="generate.meta.abstract" select="0"/>
 
 


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

[Winmerge-svn] SF.net SVN: winmerge:[7016] trunk/versions.ini

From: <ki...@us...> - 2009-10-20 18:00:43

Revision: 7016
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7016&view=rev
Author:   kimmov
Date:     2009-10-20 18:00:37 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Update version numbers for 2.13.9 experimental release.

Modified Paths:
--------------
    trunk/versions.ini

Modified: trunk/versions.ini
===================================================================
--- trunk/versions.ini	2009-10-20 17:31:42 UTC (rev 7015)
+++ trunk/versions.ini	2009-10-20 18:00:37 UTC (rev 7016)
@@ -7,23 +7,23 @@
 description = WinMerge InnoSetup installer
 path = Installer/InnoSetup/WinMerge.iss
 macro = AppVersion
-version = "2.13.8"
+version = "2.13.9"
 
 [Executable]
 type = WinRC
 description = WinMerge executable
 path = Src/Merge.rc
-version = "2.13.8"
+version = "2.13.9"
 
 [Dll]
 type = WinRC
 description = ShellExtension
 path = ShellExtension/ShellExtension.rc
-version = "1.16.0"
+version = "1.16.1"
 
 [Manual]
 type = Docbook
 description = WinMerge manual
 path = Docs/Users/Manual/WinMerge_help.xml
 tag = releaseinfo
-versionstring = <emphasis>Revision 1.6.2</emphasis>
+versionstring = <emphasis>Revision 1.6.3</emphasis>


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

[Winmerge-svn] SF.net SVN: winmerge:[7015] branches/R2_12/versions.ini

From: <ki...@us...> - 2009-10-20 17:31:48

Revision: 7015
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7015&view=rev
Author:   kimmov
Date:     2009-10-20 17:31:42 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Update version numbers for 2.12.6 stable release.

Modified Paths:
--------------
    branches/R2_12/versions.ini

Modified: branches/R2_12/versions.ini
===================================================================
--- branches/R2_12/versions.ini	2009-10-20 17:25:43 UTC (rev 7014)
+++ branches/R2_12/versions.ini	2009-10-20 17:31:42 UTC (rev 7015)
@@ -7,19 +7,19 @@
 description = WinMerge InnoSetup installer
 path = Installer/InnoSetup/WinMerge.iss
 macro = AppVersion
-version = "2.12.4"
+version = "2.12.6"
 
 [Executable]
 type = WinRC
 description = WinMerge executable
 path = Src/Merge.rc
-version = "2.12.4"
+version = "2.12.6"
 
 [Dll]
 type = WinRC
 description = ShellExtension
 path = ShellExtension/ShellExtension.rc
-version = "1.15.2"
+version = "1.15.3"
 
 [Manual]
 type = Docbook


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

[Winmerge-svn] SF.net SVN: winmerge:[7014] branches/R2_12/Docs/Users/ReleaseNotes.html

From: <ki...@us...> - 2009-10-20 17:25:58

Revision: 7014
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7014&view=rev
Author:   kimmov
Date:     2009-10-20 17:25:43 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Update date to the release notes.

Modified Paths:
--------------
    branches/R2_12/Docs/Users/ReleaseNotes.html

Modified: branches/R2_12/Docs/Users/ReleaseNotes.html
===================================================================
--- branches/R2_12/Docs/Users/ReleaseNotes.html	2009-10-19 20:39:37 UTC (rev 7013)
+++ branches/R2_12/Docs/Users/ReleaseNotes.html	2009-10-20 17:25:43 UTC (rev 7014)
@@ -61,7 +61,7 @@
   <li><a href="#new2112">What Is New in 2.11.2 beta?</a></li>
   <li><a href="#issues">Known Issues</a></li>
 </ul>
-<p>June 2009</p>
+<p>October 2009</p>
 
 <h3><a name="about">About This Release</a></h3>
 


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

[Winmerge-svn] SF.net SVN: winmerge:[7013] trunk/Web/robots.txt

From: <ge...@us...> - 2009-10-19 20:39:45

Revision: 7013
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7013&view=rev
Author:   gerundt
Date:     2009-10-19 20:39:37 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Web: Drop "/docs/old" path for robots.txt

Modified Paths:
--------------
    trunk/Web/robots.txt

Modified: trunk/Web/robots.txt
===================================================================
--- trunk/Web/robots.txt	2009-10-19 20:28:49 UTC (rev 7012)
+++ trunk/Web/robots.txt	2009-10-19 20:39:37 UTC (rev 7013)
@@ -1,3 +1,2 @@
 User-agent: *
 Disallow: /engine/
-Disallow: /docs/old/


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

[Winmerge-svn] SF.net SVN: winmerge:[7012] trunk/Web

From: <ge...@us...> - 2009-10-19 20:29:00

Revision: 7012
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7012&view=rev
Author:   gerundt
Date:     2009-10-19 20:28:49 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Web: Add quick tour

Modified Paths:
--------------
    trunk/Web/docs/index.php
    trunk/Web/engine/page.inc
    trunk/Web/sitemap.txt

Added Paths:
-----------
    trunk/Web/docs/tour/

Modified: trunk/Web/docs/index.php
===================================================================
--- trunk/Web/docs/index.php	2009-10-19 19:59:07 UTC (rev 7011)
+++ trunk/Web/docs/index.php	2009-10-19 20:28:49 UTC (rev 7012)
@@ -3,12 +3,14 @@
 
   $page = new Page;
   $page->setDescription(__('Documentation from WinMerge like manual, release notes, change log and Development Wiki.'));
-  $page->setKeywords(__('WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki'));
+  $page->setKeywords(__('WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki'));
   $page->printHead(__('Documentation'), TAB_DOCS);
 
   $page->printHeading(__('Documentation'));
   $page->printLinkedSubHeading(__('Manual'), 'manual/');
   $page->printPara(__('The <a href="%s">manual</a> explains how to use WinMerge, and documents its capabilities and limitations.', 'manual/'));
+  $page->printLinkedSubHeading(__('Quick Tour'), 'tour/');
+  $page->printPara(__('The <a href="%s">quick tour</a> describe the main  features from WinMerge at one page.', 'tour/'));
   $page->printLinkedSubHeading(__('Release Notes'), 'releasenotes.php');
   $page->printPara(__('The <a href="%1$s">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href="%2$s">known issues</a> in the current WinMerge release.', 'releasenotes.php', 'releasenotes.php#issues'));
   $page->printLinkedSubHeading(__('Change Log'), 'changelog.php');


Property changes on: trunk/Web/docs/tour
___________________________________________________________________
Added: bugtraq:url
   + http://sourceforge.net/support/tracker.php?aid=%BUGID%
Added: bugtraq:logregex
   + (\d{6,})


Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-10-19 19:59:07 UTC (rev 7011)
+++ trunk/Web/engine/page.inc	2009-10-19 20:28:49 UTC (rev 7012)
@@ -304,10 +304,11 @@
         case TAB_DOCS: //if "Documentation" ...
           $subtabs[0] = new Subtab($translations->prepareLink('/docs/'), __('Index'), __('WinMerge Documentation'));
           $subtabs[1] = new Subtab($translations->prepareLink('/docs/manual/'), __('Manual'), __('WinMerge Manual'));
-          $subtabs[2] = new Subtab($translations->prepareLink('/docs/releasenotes.php'), __('Release Notes'), __('WinMerge Release Notes'));
-          $subtabs[3] = new Subtab($translations->prepareLink('/docs/releasenotes.php#issues'), __('Known Issues'), __('WinMerge Known Issues'));
-          $subtabs[4] = new Subtab($translations->prepareLink('/docs/changelog.php'), __('Change Log'), __('WinMerge Change Log'));
-          $subtabs[5] = new Subtab('/Wiki/', __('Development Wiki'), __('WinMerge Development Wiki'));
+          $subtabs[2] = new Subtab($translations->prepareLink('/docs/tour/'), __('Quick Tour'), __('WinMerge Quick Tour'));
+          $subtabs[3] = new Subtab($translations->prepareLink('/docs/releasenotes.php'), __('Release Notes'), __('WinMerge Release Notes'));
+          $subtabs[4] = new Subtab($translations->prepareLink('/docs/releasenotes.php#issues'), __('Known Issues'), __('WinMerge Known Issues'));
+          $subtabs[5] = new Subtab($translations->prepareLink('/docs/changelog.php'), __('Change Log'), __('WinMerge Change Log'));
+          $subtabs[6] = new Subtab('/Wiki/', __('Development Wiki'), __('WinMerge Development Wiki'));
           break;
         case TAB_DOWNLOADS: //if "Downloads" ...
           $subtabs[0] = new Subtab($translations->prepareLink('/downloads/'), __('WinMerge'), __('Download WinMerge'));

Modified: trunk/Web/sitemap.txt
===================================================================
--- trunk/Web/sitemap.txt	2009-10-19 19:59:07 UTC (rev 7011)
+++ trunk/Web/sitemap.txt	2009-10-19 20:28:49 UTC (rev 7012)
@@ -26,6 +26,7 @@
 http://winmerge.org/docs/manual/Shortcuts.html
 http://winmerge.org/docs/manual/VersionControl.html
 http://winmerge.org/docs/manual/word_index.html
+http://winmerge.org/docs/tour/
 http://winmerge.org/downloads/
 http://winmerge.org/downloads/pad-file.php
 http://winmerge.org/downloads/plugins.php


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

[Winmerge-svn] SF.net SVN: winmerge:[7011] trunk/Docs/Users/Manual

From: <ge...@us...> - 2009-10-19 19:59:23

Revision: 7011
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7011&view=rev
Author:   gerundt
Date:     2009-10-19 19:59:07 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Manual: Rename quicktour files from "*page" to "*tour"

Modified Paths:
--------------
    trunk/Docs/Users/Manual/build/build_tour.bat

Added Paths:
-----------
    trunk/Docs/Users/Manual/build/build_tour.xsl
    trunk/Docs/Users/Manual/css/tour.css

Removed Paths:
-------------
    trunk/Docs/Users/Manual/build/build_html_page.xsl
    trunk/Docs/Users/Manual/css/onepage.css

Deleted: trunk/Docs/Users/Manual/build/build_html_page.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-10-19 19:55:00 UTC (rev 7010)
+++ trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-10-19 19:59:07 UTC (rev 7011)
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<!-- ********************************************************************
-     build_html_page.xsl
-     WinMerge customization of the XSL DocBook stylesheet distribution.
-     Contains customized templates and parameters for generating 
-     a single HTML document; all other styles are inherited from the WinMerge 
-     build_common.xsl and the stock DocBook stylesheets in ../build/xsl. 
- 
-     See build_common.xsl for editing instructions.
-     ******************************************************************** 
-     Changes:
-     Created July 2009
-     ******************************************************************** -->
-
-<xsl:import href="../build/xsl/html/docbook.xsl"/>
-<xsl:import href="build_common.xsl"/>
-
-<xsl:output method="html"
-            encoding="ISO-8859-1"
-            indent="yes"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
-Custom parameters
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
-<!-- Define suffix to appear after title text in head/title element of 
-every topic -->
-<xsl:param name="headtitle.suffix" select="' - WinMerge 2.12 Manual'"/>
-
-<!-- Detect if we're displaying ads for the Web pages -->
-<xsl:param name="withads">false</xsl:param>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
-     html/param.xsl  parameters
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
-<xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="generate.toc">book nop</xsl:param> 
-<xsl:param name="generate.meta.abstract" select="0"/>
-
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
-html/docbook.xsl 
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
-<!-- Link to the appropriate css stylesheets -->
-<xsl:template name="user.head.content">
-  <link rel="stylesheet" type="text/css" href="css/onepage.css" />
-  <link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
-</xsl:template>
-
-<!-- For web pages add banner image and Google ad scripts -->
-<xsl:template name="user.header.content">
-    <div class="header"><a href="http://www.winmerge.org">
-      <img src="images/head.gif" alt="winmerge.org"/></a>
-    </div>
-    <xsl:if test="$withads = 'true'">
-      <xsl:call-template name="header.ads"/>
-    </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>

Modified: trunk/Docs/Users/Manual/build/build_tour.bat
===================================================================
--- trunk/Docs/Users/Manual/build/build_tour.bat	2009-10-19 19:55:00 UTC (rev 7010)
+++ trunk/Docs/Users/Manual/build/build_tour.bat	2009-10-19 19:59:07 UTC (rev 7011)
@@ -3,7 +3,7 @@
 call configuration.bat
 
 set docbook_inputfile=..\tour\WinMerge_tour.xml
-set docbook_use_stylesheet=build_html_page.xsl
+set docbook_use_stylesheet=build_tour.xsl
 set docbook_outputdir=%docbook_build_path%\tour
 set docbook_outputfile=index.html
 set ads=false

Copied: trunk/Docs/Users/Manual/build/build_tour.xsl (from rev 7010, trunk/Docs/Users/Manual/build/build_html_page.xsl)
===================================================================
--- trunk/Docs/Users/Manual/build/build_tour.xsl	                        (rev 0)
+++ trunk/Docs/Users/Manual/build/build_tour.xsl	2009-10-19 19:59:07 UTC (rev 7011)
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		version="1.0">
+
+<!-- ********************************************************************
+     build_tour.xsl
+     WinMerge customization of the XSL DocBook stylesheet distribution.
+     Contains customized templates and parameters for generating 
+     a single HTML document; all other styles are inherited from the WinMerge 
+     build_common.xsl and the stock DocBook stylesheets in ../build/xsl. 
+ 
+     See build_common.xsl for editing instructions.
+     ******************************************************************** 
+     Changes:
+     Created July 2009
+     ******************************************************************** -->
+
+<xsl:import href="../build/xsl/html/docbook.xsl"/>
+<xsl:import href="build_common.xsl"/>
+
+<xsl:output method="html"
+            encoding="ISO-8859-1"
+            indent="yes"/>
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
+Custom parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<!-- Define suffix to appear after title text in head/title element of 
+every topic -->
+<xsl:param name="headtitle.suffix" select="' - WinMerge 2.12 Quicktour'"/>
+
+<!-- Detect if we're displaying ads for the Web pages -->
+<xsl:param name="withads">false</xsl:param>
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
+     html/param.xsl  parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<xsl:param name="section.autolabel" select="0"/>
+<xsl:param name="generate.toc">book nop</xsl:param> 
+<xsl:param name="generate.meta.abstract" select="0"/>
+
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
+html/docbook.xsl 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<!-- Link to the appropriate css stylesheets -->
+<xsl:template name="user.head.content">
+  <link rel="stylesheet" type="text/css" href="css/tour.css" />
+  <link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
+</xsl:template>
+
+<!-- For web pages add banner image and Google ad scripts -->
+<xsl:template name="user.header.content">
+    <div class="header"><a href="http://www.winmerge.org">
+      <img src="images/head.gif" alt="winmerge.org"/></a>
+    </div>
+    <xsl:if test="$withads = 'true'">
+      <xsl:call-template name="header.ads"/>
+    </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>

Deleted: trunk/Docs/Users/Manual/css/onepage.css
===================================================================
--- trunk/Docs/Users/Manual/css/onepage.css	2009-10-19 19:55:00 UTC (rev 7010)
+++ trunk/Docs/Users/Manual/css/onepage.css	2009-10-19 19:59:07 UTC (rev 7011)
@@ -1,33 +0,0 @@
-@import url("all.css");
-
-div.titlepage hr {display: none;}
-
-div.abstract p.title  {display: none;}
-
-div.article {
-    margin: 10px 0 0 0;
-    padding: 0 20px 0 100px;
-    border: 1px dotted #004080;
-}
-
-div.header {
-  height: 50px;
-  background: #FFCC00;
-  border-top: 1px solid black;
-  border-bottom: 1px solid black;
-  padding: 1px 0 1px 0; 
-  text-align: center;
-}
-
-div.header img {
-  border: none;
-}
-
-div.article h2 {
-    margin-left: -90px;
-}
-
-div.section h2 {
-    background-color: inherit;
-}
-

Copied: trunk/Docs/Users/Manual/css/tour.css (from rev 7009, trunk/Docs/Users/Manual/css/onepage.css)
===================================================================
--- trunk/Docs/Users/Manual/css/tour.css	                        (rev 0)
+++ trunk/Docs/Users/Manual/css/tour.css	2009-10-19 19:59:07 UTC (rev 7011)
@@ -0,0 +1,33 @@
+@import url("all.css");
+
+div.titlepage hr {display: none;}
+
+div.abstract p.title  {display: none;}
+
+div.article {
+    margin: 10px 0 0 0;
+    padding: 0 20px 0 100px;
+    border: 1px dotted #004080;
+}
+
+div.header {
+  height: 50px;
+  background: #FFCC00;
+  border-top: 1px solid black;
+  border-bottom: 1px solid black;
+  padding: 1px 0 1px 0; 
+  text-align: center;
+}
+
+div.header img {
+  border: none;
+}
+
+div.article h2 {
+    margin-left: -90px;
+}
+
+div.section h2 {
+    background-color: inherit;
+}
+


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

[Winmerge-svn] SF.net SVN: winmerge:[7010] trunk/Docs/Users/Manual/build

From: <ge...@us...> - 2009-10-19 19:55:10

Revision: 7010
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7010&view=rev
Author:   gerundt
Date:     2009-10-19 19:55:00 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Manual: Move tour to a own build file

Modified Paths:
--------------
    trunk/Docs/Users/Manual/build/build_html.bat
    trunk/Docs/Users/Manual/build/build_html_page.xsl

Added Paths:
-----------
    trunk/Docs/Users/Manual/build/build_tour.bat

Modified: trunk/Docs/Users/Manual/build/build_html.bat
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.bat	2009-10-18 13:57:00 UTC (rev 7009)
+++ trunk/Docs/Users/Manual/build/build_html.bat	2009-10-19 19:55:00 UTC (rev 7010)
@@ -5,9 +5,7 @@
 set docbook_inputfile=..\WinMerge_help.xml
 set tour_inputfile=..\tour\WinMerge_tour.xml
 set docbook_use_stylesheet=build_html.xsl
-set tour_use_stylesheet=build_html_page.xsl
 set docbook_outputdir=%docbook_build_path%\html
-set tour_outputdir=%docbook_build_path%\tour
 set ads=false
 if "%1" == "withads" goto withads
 if not "%1" == "" goto withadserror
@@ -26,7 +24,6 @@
 
 :start
 if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
-if not exist "%docbook_outputdir%" mkdir "%tour_outputdir%"
 
 echo Copy images ...
 if not exist "%docbook_outputdir%\images" mkdir "%docbook_outputdir%\images"
@@ -36,8 +33,6 @@
 echo Copy screenshots...
 if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
 copy "..\screenshots\*.*" "%docbook_outputdir%\screenshots\."
-if not exist "%tour_outputdir%\screenshots" mkdir "%tour_outputdir%\screenshots"
-copy "..\tour\screenshots\*.*" "%tour_outputdir%\screenshots\."
 
 echo Copy art...
 if not exist "%docbook_outputdir%\art" mkdir "%docbook_outputdir%\art"
@@ -50,9 +45,6 @@
 echo Create Manual HTML files...
 %docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ withads=%ads%
 
-echo Create tour HTML file...
-%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet -o %tour_outputdir%/WinMerge_tour.html %tour_inputfile% %tour_use_stylesheet% headtitle.suffix="' - WinMerge 2.12 Tour'" withads=%ads% admon.graphics.path="../html/images/"
-
 echo Finished!
 
 :end

Modified: trunk/Docs/Users/Manual/build/build_html_page.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-10-18 13:57:00 UTC (rev 7009)
+++ trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-10-19 19:55:00 UTC (rev 7010)
@@ -45,14 +45,14 @@
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
 <!-- Link to the appropriate css stylesheets -->
 <xsl:template name="user.head.content">
-  <link rel="stylesheet" type="text/css" href="../html/css/onepage.css" />
-  <link rel="stylesheet" type="text/css" media="print" href="../html/css/print.css" />
+  <link rel="stylesheet" type="text/css" href="css/onepage.css" />
+  <link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
 </xsl:template>
 
 <!-- For web pages add banner image and Google ad scripts -->
 <xsl:template name="user.header.content">
     <div class="header"><a href="http://www.winmerge.org">
-      <img src="../html/images/head.gif" alt="winmerge.org"/></a>
+      <img src="images/head.gif" alt="winmerge.org"/></a>
     </div>
     <xsl:if test="$withads = 'true'">
       <xsl:call-template name="header.ads"/>

Added: trunk/Docs/Users/Manual/build/build_tour.bat
===================================================================
--- trunk/Docs/Users/Manual/build/build_tour.bat	                        (rev 0)
+++ trunk/Docs/Users/Manual/build/build_tour.bat	2009-10-19 19:55:00 UTC (rev 7010)
@@ -0,0 +1,47 @@
+@echo off
+
+call configuration.bat
+
+set docbook_inputfile=..\tour\WinMerge_tour.xml
+set docbook_use_stylesheet=build_html_page.xsl
+set docbook_outputdir=%docbook_build_path%\tour
+set docbook_outputfile=index.html
+set ads=false
+if "%1" == "withads" goto withads
+if not "%1" == "" goto withadserror
+goto start
+
+:withads
+set ads=true
+echo **************************************
+echo * The manual includes advertisements *
+echo **************************************
+goto start
+
+:withadserror
+echo "%1" is a invalid argument. Please use "withads", if you want advertisements in the manual.
+goto end
+
+:start
+if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
+
+echo Copy images ...
+if not exist "%docbook_outputdir%\images" mkdir "%docbook_outputdir%\images"
+copy "..\images\*.gif" "%docbook_outputdir%\images\."
+copy "..\images\*.png" "%docbook_outputdir%\images\."
+
+echo Copy screenshots...
+if not exist "%docbook_outputdir%\screenshots" mkdir "%docbook_outputdir%\screenshots"
+copy "..\tour\screenshots\*.*" "%docbook_outputdir%\screenshots\."
+
+echo Copy stylesheets...
+if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"
+copy "..\css\*.css" "%docbook_outputdir%\css"
+
+echo Create Tour HTML file...
+%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet -o %docbook_outputdir%/%docbook_outputfile% %docbook_inputfile% %docbook_use_stylesheet% withads=%ads%"
+
+echo Finished!
+
+:end
+@echo on
\ No newline at end of file


Property changes on: trunk/Docs/Users/Manual/build/build_tour.bat
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

[Winmerge-svn] SF.net SVN: winmerge:[7009] trunk/Installer/WiX/Fragments

From: <ge...@us...> - 2009-10-18 13:57:08

Revision: 7009
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7009&view=rev
Author:   gerundt
Date:     2009-10-18 13:57:00 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
PATCH: [ 2877121 ] Persian translation - WiX setup changes

Modified Paths:
--------------
    trunk/Installer/WiX/Fragments/Features.wxs
    trunk/Installer/WiX/Fragments/Languages.wxs

Modified: trunk/Installer/WiX/Fragments/Features.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Features.wxs	2009-10-18 13:43:56 UTC (rev 7008)
+++ trunk/Installer/WiX/Fragments/Features.wxs	2009-10-18 13:57:00 UTC (rev 7009)
@@ -78,6 +78,7 @@
         <ComponentRef Id="Japanese" />
         <ComponentRef Id="Korean" />
         <ComponentRef Id="Norwegian" />
+        <ComponentRef Id="Persian" />
         <ComponentRef Id="Polish" />
         <ComponentRef Id="Portuguese" />
         <ComponentRef Id="Romanian" />

Modified: trunk/Installer/WiX/Fragments/Languages.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Languages.wxs	2009-10-18 13:43:56 UTC (rev 7008)
+++ trunk/Installer/WiX/Fragments/Languages.wxs	2009-10-18 13:57:00 UTC (rev 7009)
@@ -136,6 +136,13 @@
           Vital="no" />
       </Component>
       
+      <Component Id="Persian" Guid="*" Win64="$(var.Win64)">
+        <File Id="PersianPO" 
+          Name="Persian.po" 
+          Source="..\..\Translations\WinMerge\Persian.po" 
+          Vital="no" />
+      </Component>
+      
       <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)">
         <File Id="PortuguesePO" 
           Name="Portuguese.po" 


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

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

From: <ge...@us...> - 2009-10-18 13:44:07

Revision: 7008
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7008&view=rev
Author:   gerundt
Date:     2009-10-18 13:43:56 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
PATCH: [ 2877121 ] Persian translation

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Docs/Users/Contributors.txt
    trunk/Installer/InnoSetup/WinMerge.iss
    trunk/ShellExtension/ShellExtension.rc
    trunk/ShellExtension/ShellExtension.vcproj
    trunk/ShellExtension/ShellExtensionX64.vcproj
    trunk/Translations/InnoSetup/Brazilian_Portuguese.isl
    trunk/Translations/InnoSetup/Bulgarian.isl
    trunk/Translations/InnoSetup/Catalan.isl
    trunk/Translations/InnoSetup/Chinese_Simplified.isl
    trunk/Translations/InnoSetup/Chinese_Traditional.isl
    trunk/Translations/InnoSetup/Croatian.isl
    trunk/Translations/InnoSetup/Czech.isl
    trunk/Translations/InnoSetup/Danish.isl
    trunk/Translations/InnoSetup/Dutch.isl
    trunk/Translations/InnoSetup/English.isl
    trunk/Translations/InnoSetup/French.isl
    trunk/Translations/InnoSetup/Galician.isl
    trunk/Translations/InnoSetup/German.isl
    trunk/Translations/InnoSetup/Greek.isl
    trunk/Translations/InnoSetup/Hungarian.isl
    trunk/Translations/InnoSetup/Italian.isl
    trunk/Translations/InnoSetup/Japanese.isl
    trunk/Translations/InnoSetup/Korean.isl
    trunk/Translations/InnoSetup/Norwegian.isl
    trunk/Translations/InnoSetup/Polish.isl
    trunk/Translations/InnoSetup/Portuguese.isl
    trunk/Translations/InnoSetup/Romanian.isl
    trunk/Translations/InnoSetup/Russian.isl
    trunk/Translations/InnoSetup/Slovak.isl
    trunk/Translations/InnoSetup/Slovenian.isl
    trunk/Translations/InnoSetup/Spanish.isl
    trunk/Translations/InnoSetup/Swedish.isl
    trunk/Translations/InnoSetup/Turkish.isl
    trunk/Translations/InnoSetup/Ukrainian.isl

Added Paths:
-----------
    trunk/ShellExtension/Languages/ShellExtensionPersian.rc
    trunk/Translations/InnoSetup/Persian.isl
    trunk/Translations/ShellExtension/Persian.po
    trunk/Translations/WinMerge/Persian.po

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Docs/Users/ChangeLog.txt	2009-10-18 13:43:56 UTC (rev 7008)
@@ -19,6 +19,7 @@
   Bugfix: Did not reset folder compare method back to original (#2803152)
   Bugfix: Added EOL chars between copied file/path names (#2817546)
   Bugfix: In-line difference highlight fixes (#2824173)
+  New translation: Persian (#2877121)
   Translation updates:
   - Dutch (#2801690, #2804979, #2828310)
   - French (#2850842)

Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Docs/Users/Contributors.txt	2009-10-18 13:43:56 UTC (rev 7008)
@@ -89,6 +89,9 @@
 * Norwegian:
   Hans Fredrik Nordhaug <ha...@us...>
 
+* Persian:
+  Abolfazl Rostamzadeh <a.rostamzadeh at gmail.com>
+
 * Polish:
   M.T <mt...@us...>
   Skiff <ski...@us...>

Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Installer/InnoSetup/WinMerge.iss	2009-10-18 13:43:56 UTC (rev 7008)
@@ -137,6 +137,7 @@
 Name: Japanese; MessagesFile: ..\..\Translations\InnoSetup\Japanese.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt
 Name: Korean; MessagesFile: ..\..\Translations\InnoSetup\Korean.isl
 Name: Norwegian; MessagesFile: ..\..\Translations\InnoSetup\Norwegian.isl
+Name: Persian; MessagesFile: ..\..\Translations\InnoSetup\Persian.isl
 Name: Polish; MessagesFile: ..\..\Translations\InnoSetup\Polish.isl
 Name: Portuguese; MessagesFile: ..\..\Translations\InnoSetup\Portuguese.isl
 Name: PortugueseBrazilian; MessagesFile: ..\..\Translations\InnoSetup\Brazilian_Portuguese.isl; InfoAfterFile: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt
@@ -224,6 +225,9 @@
 Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Norwegian
 Name: Languages\Norwegian; Description: {cm:NorwegianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Norwegian
 
+Name: Languages\Persian; Description: {cm:PersianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Persian
+Name: Languages\Persian; Description: {cm:PersianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Persian
+
 Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Polish
 Name: Languages\Polish; Description: {cm:PolishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Polish
 
@@ -302,6 +306,7 @@
 Name: {app}\Languages\MergeJapanese.lang; Type: files
 Name: {app}\Languages\MergeKorean.lang; Type: files
 Name: {app}\Languages\MergeNorwegian.lang; Type: files
+Name: {app}\Languages\MergePersian.lang; Type: files
 Name: {app}\Languages\MergePolish.lang; Type: files
 Name: {app}\Languages\MergePortuguese.lang; Type: files
 Name: {app}\Languages\MergeSlovak.lang; Type: files
@@ -414,6 +419,7 @@
 Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese
 Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp
 Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp
 Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp
 Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp
 Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp
@@ -554,6 +560,7 @@
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000411; Flags: deletevalue; Languages: Japanese
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000412; Flags: deletevalue; Languages: Korean
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000414; Flags: deletevalue; Languages: Norwegian
+Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000429; Flags: deletevalue; Languages: Persian
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000415; Flags: deletevalue; Languages: Polish
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000816; Flags: deletevalue; Languages: Portuguese
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge\Locale; ValueType: dword; ValueName: LanguageId; ValueData: $00000416; Flags: deletevalue; Languages: PortugueseBrazilian

Added: trunk/ShellExtension/Languages/ShellExtensionPersian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionPersian.rc	                        (rev 0)
+++ trunk/ShellExtension/Languages/ShellExtensionPersian.rc	2009-10-18 13:43:56 UTC (rev 7008)
@@ -0,0 +1,54 @@
+//Microsoft Developer Studio generated resource script.
+//
+// This is an *automatic* generated file for the ShellExtension translation.
+// Please edit the PO file instead of this RC file for translation updates:
+//   ..\..\Translations\ShellExtension\<Languagename>.po
+//
+// $Id$
+
+#include "../resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)
+#ifdef _WIN32
+LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN
+#pragma code_page(1256)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+//
+//  ***  TRANSLATED STRINGS ***
+// Translate strings  below
+// 
+STRINGTABLE 
+BEGIN
+    IDS_PROJNAME            "ShellExtension"
+    IDS_CONTEXT_MENU        "&WinMerge"
+    IDS_CONTEXT_HELP        "Open with WinMerge"
+    IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
+    IDS_COMPARE             "&Compare"
+    IDS_COMPARE_ELLIPSIS    "&Compare..."
+    IDS_COMPARE_TO          "&Compare To"
+    IDS_HELP_SAVETHIS       "Save this path. Select another path to compare with this path."
+    IDS_HELP_COMPARESAVED   "Compare to saved path (%1)"
+    IDS_RESELECT_FIRST      "&Re-select First"
+END
+
+#endif    // Resources
+/////////////////////////////////////////////////////////////////////////////


Property changes on: trunk/ShellExtension/Languages/ShellExtensionPersian.rc
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/ShellExtension/ShellExtension.rc	2009-10-18 13:43:56 UTC (rev 7008)
@@ -188,6 +188,14 @@
     "#endif //_WIN32\r\n"
     "#endif\r\n"
     "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN\r\n"
+    "#pragma code_page(1256)\r\n"
+    "#include ""Languages\\ShellExtensionPersian.rc""\r\n"
+    "#endif //_WIN32\r\n"
+    "#endif\r\n"
+    "\r\n"
     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)\r\n"
     "#ifdef _WIN32\r\n"
     "LANGUAGE LANG_POLISH, SUBLANG_DEFAULT\r\n"
@@ -509,6 +517,14 @@
 #endif //_WIN32
 #endif
 
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)
+#ifdef _WIN32
+LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN
+#pragma code_page(1256)
+#include "Languages\ShellExtensionPolish.rc"
+#endif //_WIN32
+#endif
+
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
 #ifdef _WIN32
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

Modified: trunk/ShellExtension/ShellExtension.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtension.vcproj	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/ShellExtension/ShellExtension.vcproj	2009-10-18 13:43:56 UTC (rev 7008)
@@ -1832,6 +1832,57 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="Languages\ShellExtensionPersian.rc">
+				<FileConfiguration
+					Name="Unicode Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release MinSize|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release MinDependency|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release MinDependency|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release MinSize|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="Languages\ShellExtensionPolish.rc">
 				<FileConfiguration
 					Name="Unicode Debug|Win32"

Modified: trunk/ShellExtension/ShellExtensionX64.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtensionX64.vcproj	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/ShellExtension/ShellExtensionX64.vcproj	2009-10-18 13:43:56 UTC (rev 7008)
@@ -684,6 +684,44 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="Languages\ShellExtensionPersian.rc">
+				<FileConfiguration
+					Name="Debug X64|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="_DEBUG;_AFXDLL"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release X64|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="NDEBUG;_AFXDLL"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="Languages\ShellExtensionPortuguese.rc">
+				<FileConfiguration
+					Name="Debug X64|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="_DEBUG;_AFXDLL"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release X64|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="NDEBUG;_AFXDLL"
+						AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="Languages\ShellExtensionPolish.rc">
 				<FileConfiguration
 					Name="Debug X64|Win32"

Modified: trunk/Translations/InnoSetup/Brazilian_Portuguese.isl
===================================================================
--- trunk/Translations/InnoSetup/Brazilian_Portuguese.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Brazilian_Portuguese.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -351,6 +351,7 @@
 JapaneseLanguage=Menus e di\xE1logos japoneses
 KoreanLanguage=Menus e di\xE1logos coreanos
 NorwegianLanguage=Menus e di\xE1logos noruegueses
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Menus e di\xE1logos poloneses
 PortugueseBrazilLanguage=Menus e di\xE1logos portugueses (brasileiros)
 PortugueseLanguage=Menus e di\xE1logos portugueses

Modified: trunk/Translations/InnoSetup/Bulgarian.isl
===================================================================
--- trunk/Translations/InnoSetup/Bulgarian.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Bulgarian.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -353,6 +353,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Catalan.isl
===================================================================
--- trunk/Translations/InnoSetup/Catalan.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Catalan.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -336,6 +336,7 @@
 JapaneseLanguage=Men\xFAs i di\xE0legs en Japon\xE8s
 KoreanLanguage=Men\xFAs i di\xE0legs en Kore\xE0
 NorwegianLanguage=Men\xFAs i di\xE0legs en Noruec
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Men\xFAs i di\xE0legs en Polon\xE8s
 PortugueseBrazilLanguage=Men\xFAs i di\xE0legs en Portugu\xE8s (Brasiler)
 PortugueseLanguage=Men\xFAs i di\xE0legs en Portugu\xE8s

Modified: trunk/Translations/InnoSetup/Chinese_Simplified.isl
===================================================================
--- trunk/Translations/InnoSetup/Chinese_Simplified.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Chinese_Simplified.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -343,6 +343,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Chinese_Traditional.isl
===================================================================
--- trunk/Translations/InnoSetup/Chinese_Traditional.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Chinese_Traditional.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -350,6 +350,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Croatian.isl
===================================================================
--- trunk/Translations/InnoSetup/Croatian.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Croatian.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -346,6 +346,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Czech.isl
===================================================================
--- trunk/Translations/InnoSetup/Czech.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Czech.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -351,6 +351,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Danish.isl
===================================================================
--- trunk/Translations/InnoSetup/Danish.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Danish.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -352,6 +352,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Dutch.isl
===================================================================
--- trunk/Translations/InnoSetup/Dutch.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Dutch.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -330,6 +330,7 @@
 JapaneseLanguage=Japanse menu\x92s en vensters
 KoreanLanguage=Koreaanse menu\x92s en vensters
 NorwegianLanguage=Noorse menu\x92s en vensters
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Poolse menu\x92s en vensters
 PortugueseBrazilLanguage=Portugese (Braziliaanse) menu\x92s en vensters
 PortugueseLanguage=Portugese menu\x92s en vensters

Modified: trunk/Translations/InnoSetup/English.isl
===================================================================
--- trunk/Translations/InnoSetup/English.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/English.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -353,6 +353,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/French.isl
===================================================================
--- trunk/Translations/InnoSetup/French.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/French.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -345,6 +345,7 @@
 JapaneseLanguage=Menus et dialogues Japonais
 KoreanLanguage=Menus et dialogues Cor\xE9en
 NorwegianLanguage=Menus et dialogues Norv\xE9gien
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Menus et dialogues Polonais
 PortugueseBrazilLanguage=Menus et dialogues Portugais (Br\xE9silien)
 PortugueseLanguage=Menus et dialogues Portugais

Modified: trunk/Translations/InnoSetup/Galician.isl
===================================================================
--- trunk/Translations/InnoSetup/Galician.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Galician.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -352,6 +352,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/German.isl
===================================================================
--- trunk/Translations/InnoSetup/German.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/German.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -342,6 +342,7 @@
 JapaneseLanguage=Japanische Men\xFCs und Dialoge
 KoreanLanguage=Koreanische Men\xFCs und Dialoge
 NorwegianLanguage=Norwegische Men\xFCs und Dialoge
+PersianLanguage=Persische Men\xFCs und Dialoge
 PolishLanguage=Polnische Men\xFCs und Dialoge
 PortugueseBrazilLanguage=Portugiesische (brasilianische) Men\xFCs und Dialoge
 PortugueseLanguage=Portugiesische Men\xFCs und Dialoge

Modified: trunk/Translations/InnoSetup/Greek.isl
===================================================================
--- trunk/Translations/InnoSetup/Greek.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Greek.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -353,6 +353,7 @@
 JapaneseLanguage=\xC9\xE1\xF0\xF9\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 KoreanLanguage=\xCA\xEF\xF1\xE5\xE1\xF4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 NorwegianLanguage=\xCD\xEF\xF1\xE2\xE7\xE3\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=\xD0\xEF\xEB\xF9\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 PortugueseBrazilLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC (\xC2\xF1\xE1\xE6\xE9\xEB\xDF\xE1\xF2) \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 PortugueseLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9

Modified: trunk/Translations/InnoSetup/Hungarian.isl
===================================================================
--- trunk/Translations/InnoSetup/Hungarian.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Hungarian.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -372,6 +372,7 @@
 JapaneseLanguage=Jap\xE1n men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 KoreanLanguage=Koreai men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 NorwegianLanguage=Norv\xE9g men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Lengyel men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 PortugueseBrazilLanguage=Portug\xE1l (Braz\xEDliai) men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 PortugueseLanguage=Portug\xE1l men\xFCk \xE9s p\xE1rbesz\xE9dablakok

Modified: trunk/Translations/InnoSetup/Italian.isl
===================================================================
--- trunk/Translations/InnoSetup/Italian.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Italian.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -356,6 +356,7 @@
 JapaneseLanguage=Menu e finestre di dialogo in giapponese
 KoreanLanguage=Menu e finestre di dialogo in coreano
 NorwegianLanguage=Menu e finestre di dialogo in norvegese
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Menu e finestre di dialogo in polacco
 PortugueseBrazilLanguage=Menu e finestre di dialogo in portoghese (brasiliano)
 PortugueseLanguage=Menu e finestre di dialogo in portoghese

Modified: trunk/Translations/InnoSetup/Japanese.isl
===================================================================
--- trunk/Translations/InnoSetup/Japanese.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Japanese.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -345,6 +345,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Korean.isl
===================================================================
--- trunk/Translations/InnoSetup/Korean.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Korean.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -357,6 +357,7 @@
 JapaneseLanguage=Japanese menus and dialogs
 KoreanLanguage=Korean menus and dialogs
 NorwegianLanguage=Norwegian menus and dialogs
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polish menus and dialogs
 PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
 PortugueseLanguage=Portuguese menus and dialogs

Modified: trunk/Translations/InnoSetup/Norwegian.isl
===================================================================
--- trunk/Translations/InnoSetup/Norwegian.isl	2009-10-18 10:55:44 UTC (rev 7007)
+++ trunk/Translations/InnoSetup/Norwegian.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -349,6 +349,7 @@
 JapaneseLanguage=Japanske menyer og dialoger
 KoreanLanguage=Koreanske menyer og dialoger
 NorwegianLanguage=Norske menyer og dialoger
+PersianLanguage=Persian menus and dialogs
 PolishLanguage=Polske menyer og dialoger
 PortugueseBrazilLanguage=Portugisiske (Brasilianske) menyer og dialoger
 PortugueseLanguage=Portugisiske menyer og dialoger

Added: trunk/Translations/InnoSetup/Persian.isl
===================================================================
--- trunk/Translations/InnoSetup/Persian.isl	                        (rev 0)
+++ trunk/Translations/InnoSetup/Persian.isl	2009-10-18 13:43:56 UTC (rev 7008)
@@ -0,0 +1,385 @@
+; mos...@gm...
+; *** Inno Setup version 5.1.11+ Farsi(Persian) messages ***
+; Farsi(Persian) 
+; Translator: Mostafa Sedaghat joo 
+; mostafa [dot] sedaghat [at] gmail [dot] com
+
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/is3rdparty.php
+;
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Farsi
+LanguageID=$0429
+LanguageCodePage=1256
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+DialogFontName=Tahoma
+DialogFontSize=8
+WelcomeFontName=Tahoma
+WelcomeFontSize=12
+TitleFontName=Tahoma
+TitleFontSize=29
+CopyrightFontName=Tahoma
+CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=\xE4\xD5\xC8
+SetupWindowTitle=\xE4\xD5\xC8 - %1
+UninstallAppTitle=\xCD\xD0\xDD \xC8\xD1\xE4\xC7\xE3\xE5
+UninstallAppFullTitle=\xCD\xD0\xDD \xC8\xD1\xE4\xC7\xE3\xE5 %1
+
+; *** Misc. common
+InformationTitle=\xC7\xD8\xE1\xC7\xDA\xC7\xCA
+ConfirmTitle=\xCA\xC7\xED\xED\xCF\xED\xE5
+ErrorTitle=\xCE\xD8\xC7
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=%1 \xE4\xD5\xC8 \xCE\xE6\xC7\xE5\xCF \xD4\xCF. \xC2\xED\xC7 \xC7\xCF\xC7\xE3\xE5 \xE3\xED\x9D\xCF\xE5\xEDϿ
+LdrCannotCreateTemp=\xDD\xC7\xED\xE1 \xE3\xE6\xDE\xCA\xED \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \xD3\xC7\xCE\xCA\xE5 \xD4\xE6\xCF. \xE4\xD5\xC8 \xE1\xDB\xE6 \xD4\xCF
+LdrCannotExecTemp=\xDD\xC7\xED\xE1 \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \xCF\xD1 \x81\xE6\xD4\xE5\x9D\xED \xE3\xE6\xDE\xCA\xED \xC7\xCC\xD1\xC7 \xD4\xE6\xCF. \xE4\xD5\xC8 \xE1\xDB\xE6 \xD4\xCF
+LastErrorMessage=%1.%n%n\xCE\xD8\xC7 %2: %3
+
+; *** Startup error messages
+SetupFileMissing=\xDD\xC7\xED\xE1 %1 \xC7\xD2 \x81\xE6\xD4\xE5 \xE4\xD5\xC8 \xED\xC7\xDD\xCA \xE4\xE3\xED\x9D\xD4\xE6\xCF. \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE3Ԙ\xE1 \xD1\xC7 \xC8\xD1\xD8\xD1\xDD \xE4\xE3\xC7\xED\xED\xCF \xED\xC7 \xE4\xD3\xCE\xE5\x9D\xED \xCC\xCF\xED\xCF\xED \xC7\xD2 \xC8\xD1\xE4\xC7\xE3\xE5 \xD1\xC7 \xDD\xD1\xC7\xE5\xE3 \xE4\xE3\xC7\xED\xED\xCF.
+SetupFileCorrupt=\xDD\xC7\xED\xE1\x9D\xE5\xC7\xED \xE4\xD5\xC8 \xCE\xD1\xC7\xC8 \xD4\xCF\xE5\x9D\xC7\xE4\xCF. \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE4\xD3\xCE\xE5\x9D\xED \xCC\xCF\xED\xCF\xED \xC7\xD2 \xC8\xD1\xE4\xC7\xE3\xE5 \xD1\xC7 \xDD\xD1\xC7\xE5\xE3 \xE4\xE3\xC7\xED\xED\xCF.
+SetupFileCorruptOrWrongVer=\xDD\xC7\xED\xE1\x9D\xE5\xC7\xED \xE4\xD5\xC8 \xCE\xD1\xC7\xC8 \xD4\xCF\xE5\x9D\xC7\xE4ϡ \xED\xC7 \xC8\xC7 \xC7\xED\xE4 \xE4\xD3\xCE\xE5 \xC7\xD2 \xE4\xD5\xC8 \xE4\xC7\xE5\xE3\xC7\xE5\xE4\x90 \xE3\xED\x9D\xC8\xC7\xD4\xE4\xCF. \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE3Ԙ\xE1 \xD1\xC7 \xC8\xD1\xD8\xD1\xDD \xE4\xE3\xC7\xED\xED\xCF \xED\xC7 \xE4\xD3\xCE\xE5\x9D\xED \xCC\xCF\xED\xCF\xED \xC7\xD2 \xC8\xD1\xE4\xC7\xE3\xE5 \xD1\xC7 \xDD\xD1\xC7\xE5\xE3 \xE4\xE3\xC7\xED\xED\xCF.
+NotOnThisPlatform=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xCF\xD1 %1 \xC7\xCC\xD1\xC7 \xE4\xE3\xED\x9D\xD4\xE6\xCF.
+OnlyOnThisPlatform=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xC8\xC7\xED\xCF \xCF\xD1 %1 \xC7\xCC\xD1\xC7 \xD4\xE6\xCF.
+OnlyOnTheseArchitectures=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xCA\xE4\xE5\xC7 \xCF\xD1 \xE4\xD3\xCE\xE5\x9D\xE5\xC7\xED\xED \xC7\xD2 \xE6\xED\xE4\xCF\xE6\xD2 \x98\xE5 \xC8\xD1\xC7\xED \x81\xD1\xCF\xC7\xD2Ԑ\xD1\xE5\xC7\xED\xED \xC8\xC7 \xE3\xDA\xE3\xC7\xD1\xED\x9D\xE5\xC7\xED \xD2\xED\xD1 \xD8\xD1\xC7\xCD\xED \xD4\xCF\xE5 \xC7\xD3ʡ \xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \xE4\xD5\xC8 \xD4\xE6\xCF:%n%n%1
+MissingWOW64APIs=\xC7\xED\xE4 \xE4\xD3\xCE\xE5 \xC7\xD2 \xE6\xED\xE4\xCF\xE6\xD2 \xD4\xE3\xC7 \x98\xE5 \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xCF\xD1 \xCD\xC7\xE1 \xC7\xCC\xD1\xC7 \xE3\xED\x9D\xC8\xC7\xD4ϡ \xCA\xE6\xC7\xE4\xC7\xED\xED \xE1\xC7\xD2\xE3 \xC8\xD1\xC7\xED \xE4\xD5\xC8 64 \xC8\xED\xCA\xED \xD1\xC7 \xC7\xD1\xC7\xED\xE5 \xE4\xE3\xED\x9D\xCF\xE5\xCF. \xC8\xD1\xC7\xED \xCD\xE1 \xC7\xED\xE4 \xE3Ԙ\xE1 \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xC8\xD3\xCA\xE5 \xCE\xCF\xE3\xC7\xCA\xED \xE3\xC7\xED\x98\xD1\xE6\xD3\xC7\xDD\xCA  %1 \xD1\xC7 \xE4\xD5\xC8 \x98\xE4\xED\xCF.
+WinVersionTooLowError=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xC8\xE5 %1 \xE6\xED\xD1\xC7\xED\xD4 %2 \xED\xC7 \xC8\xC7\xE1\xC7\xCA\xD1 \xC7\xCD\xCA\xED\xC7\xCC \xCF\xC7\xD1\xCF.
+WinVersionTooHighError=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \xCF\xD1 %1 \xE6\xED\xD1\xC7\xED\xD4 %2 \xED\xC7 \xC8\xC7\xE1\xC7\xCA\xD1 \xC7\xCC\xD1\xC7 \xD4\xE6\xCF.
+AdminPrivilegesRequired=\xC8\xD1\xC7\xED \xE4\xD5\xC8 \xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5\xA1 \xD4\xE3\xC7 \xE3\xED\x9D\xC8\xC7\xED\xD3\xCA \xC8\xE5 \xDA\xE4\xE6\xC7\xE4 \xE3\xCF\xED\xD1 \xD3\xED\xD3\xCA\xE3 \xE6\xC7\xD1\xCF \xD4\xE6\xED\xCF.
+PowerUserPrivilegesRequired=\xC8\xD1\xC7\xED \xE4\xD5\xC8 \xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5\xA1 \xD4\xE3\xC7 \xE3\xED\x9D\xC8\xC7\xED\xD3\xCA \xC8\xE5 \xDA\xE4\xE6\xC7\xE4 \xE3\xCF\xED\xD1 \xD3\xED\xD3\xCA\xE3 \xED\xC7 \xDA\xD6\xE6\xED \xC7\xD2 \x98\xC7\xD1\xC8\xD1\xC7\xE4 \xE3\xCC\xC7\xD2 \xE6\xC7\xD1\xCF \xD4\xE6\xED\xCF.
+SetupAppRunningError=\xE4\xD5\xC8 \xCA\xD4\xCE\xED\xD5 \xCF\xC7\xCF\xE5 \xC7\xD3\xCA \x98\xE5 %1 \xCF\xD1 \xCD\xC7\xE1 \xC7\xCC\xD1\xC7\xD3\xCA.%n%n\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE5\xE3\xE5\x9D\xED \xE4\xE3\xE6\xE4\xE5\x9D\xE5\xC7\xED \xCF\xD1 \xCD\xC7\xE1 \xC7\xCC\xD1\xC7\xED \xC2\xE4 \xD1\xC7 \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xC8\xC8\xE4\xCF\xED\xCF \xE6 Ӂ\xD3 \xCA\xC7\xED\xED\xCF \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF \xED\xC7 \xC8\xD1\xC7\xED \xE1\xDB\xE6\xA1 \xC7\xE4\xD5\xD1\xC7\xDD \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+UninstallAppRunningError=\xCD\xD0\xDD \xCA\xD4\xCE\xED\xD5 \xCF\xC7\xCF\xE5 \xC7\xD3\xCA \x98\xE5 %1 \xCF\xD1 \xCD\xC7\xE1 \xC7\xCC\xD1\xC7\xD3\xCA.%n%n\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE5\xE3\xE5\x9D\xED \xE4\xE3\xE6\xE4\xE5\x9D\xE5\xC7\xED \xCF\xD1 \xCD\xC7\xE1 \xC7\xCC\xD1\xC7\xED \xC2\xE4 \xD1\xC7 \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xC8\xC8\xE4\xCF\xED\xCF \xE6 Ӂ\xD3 \xCA\xC7\xED\xED\xCF \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF \xED\xC7 \xC8\xD1\xC7\xED \xE1\xDB\xE6\xA1 \xC7\xE4\xD5\xD1\xC7\xDD \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+
+; *** Misc. errors
+ErrorCreatingDir=\xE4\xD5\xC8 \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \x81\xE6\xD4\xE5\x9D\xED "%1" \xD1\xC7 \xC8\xD3\xC7\xD2\xCF
+ErrorTooManyFilesInDir=\xED\x98 \xDD\xC7\xED\xE1 \xCF\xD1 \x81\xE6\xD4\xE5\x9D\xED "%1" \xD3\xC7\xCE\xCA\xE5 \xE4\xE3\xED\x9D\xD4\xE6\xCF%n\xD2\xED\xD1\xC7 \xCF\xD1 \xC7\xED\xE4 \x81\xE6\xD4\xE5 \xCA\xDA\xCF\xC7\xCF \xC8\xED\xD4\xE3\xC7\xD1\xED \xDD\xC7\xED\xE1 \xE6\xCC\xE6\xCF \xCF\xC7\xD1\xCF
+
+; *** Setup common messages
+ExitSetupTitle=\xCE\xD1\xE6\xCC \xC7\xD2 \xE4\xD5\xC8
+ExitSetupMessage=\xE4\xD5\xC8 \x98\xC7\xE3\xE1 \xE4\xD4\xCF. ǐ\xD1 \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xCE\xC7\xD1\xCC \xD4\xE6\xEDϡ \xC8\xD1\xE4\xC7\xE3\xE5 \xE4\xD5\xC8 \xE4\xCE\xE6\xC7\xE5\xCF \xD4\xCF.%n%n\xD4\xE3\xC7 \xE3\xED\xCA\xE6\xC7\xE4\xED\xCF \xE4\xD5\xC8 \xD1\xC7 \xCF\xD1 \xE6\xDE\xCA\xED \xCF\xED\x90\xD1 \xCF\xE6\xC8\xC7\xD1\xE5 \xC7\xCC\xD1\xC7 \x98\xE4\xED\xCF \xCA\xC7 \xE4\xD5\xC8 \x98\xC7\xE3\xE1 \x90\xD1\xCF\xCF. \xCE\xC7\xD1\xCC \xE3\xED\x9D\xD4\xE6\xEDϿ
+AboutSetupMenuItem=...\xCF\xD1\xC8\xC7\xD1\xE5 \xE4\xD5\xC8&
+AboutSetupTitle=\xCF\xD1\xC8\xC7\xD1\xE5 \xE4\xD5\xC8
+AboutSetupMessage=%1 \xE6\xED\xD1\xC7\xED\xD4 %2%n%3%n%n%1 \xD5\xDD\xCD\xE5 \xCE\xC7\xE4\x90\xED:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< \x81\xED&\xD4\xED\xE4
+ButtonNext=\x81&\xD3\xED\xE4 >
+ButtonInstall=&\xE4\xD5\xC8
+ButtonOK=&\xCA\xC7\xED\xED\xCF
+ButtonCancel=\xC7\xE4&\xD5\xD1\xC7\xDD
+ButtonYes=\xC2&\xD1\xED
+ButtonYesToAll=\xC2\xD1\xED \xC8&\xE5 \xE5\xE3\xE5
+ButtonNo=&\xCE\xED\xD1
+ButtonNoToAll=\xCE\xED\xD1 \xC8\xE5 \xE5&\xE3\xE5
+ButtonFinish=\x81&\xC7\xED\xC7\xE4
+ButtonBrowse=&\xE3\x98\xC7\xE4 \xCF\xED\x90\xD1
+ButtonWizardBrowse=\xE3&\x98\xC7\xE4 \xCF\xED\x90\xD1
+ButtonNewFolder=\xD3\xC7\xCE\xCA\xE4 \x81\xE6\xD4\xE5 \xCC\xCF\xED\xCF
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=\xC7\xE4\xCA\xCE\xC7\xC8 \xD2\xC8\xC7\xE4 \xE4\xD5\xC8
+SelectLanguageLabel=\xD2\xC8\xC7\xE4\xED \x98\xE5 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xCF\xD1 \xCC\xD1\xED\xC7\xE4 \xE4\xD5\xC8  \xC7\xD3\xCA\xDD\xC7\xCF\xE5 \x98\xE4\xED\xCF \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4\xED\xCF:
+
+; *** Common wizard text
+ClickNext=\xC8\xD1\xC7\xED \xC7\xCF\xC7\xE3\xE5 \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xEDϡ \xED\xC7 \xC7\xE4\xD5\xD1\xC7\xDD \xD1\xC7 \xC8\xD1\xC7\xED \xCE\xD1\xE6\xCC \xC7\xD2 \xE4\xD5\xC8 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+BeveledLabel=
+BrowseDialogTitle=\xE3\x98\xC7\xE4 \xED\xC7\xC8\xED \xC8\xD1\xC7\xED \x81\xE6\xD4\xE5
+BrowseDialogLabel=\xC7\xD2 \xE1\xED\xD3\xCA \xD2\xED\xD1 \xED\x98 \x81\xE6\xD4\xE5 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4\xEDϡ Ӂ\xD3 \xCA\xC7\xED\xED\xCF \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+NewFolderName=\x81\xE6\xD4\xE5 \xCC\xCF\xED\xCF
+
+; *** "Welcome" wizard page
+WelcomeLabel1=\xC8\xE5 \xCC\xC7\xCF\xE6\x90\xD1 \xE4\xD5\xC8 [name] \xCE\xE6\xD4 \xC2\xE3\xCF\xED\xCF
+WelcomeLabel2=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 [name] \xD1\xC7 \xCF\xD1 \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xE4\xD5\xC8 \xE3\xED\x98\xE4\xCF.%n%n\x81\xED\xD4\xE4\xE5\xC7\xCF \xE3\xED\x9D\xD4\xE6\xCF \x98\xE5 \xCA\xE3\xC7\xE3 \xC8\xD1\xE4\xC7\xE3\xE5\x9D\xE5\xC7\xED\xED \x98\xE5 \xC8\xC7\xD2 \xC7\xD3\xCA \xD1\xC7 \xDE\xC8\xE1 \xC7\xD2 \xD4\xD1\xE6\xDA \xE4\xD5\xC8 \xC8\xC8\xE4\xCF\xED\xCF.
+
+; *** "Password" wizard page
+WizardPassword=\x90\xD0\xD1\xE6ǎ\xE5
+PasswordLabel1=\xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xE4\xD5\xC8 \xC8\xC7 \x90\xD0\xD1\xE6ǎ\xE5 \x81\xC7\xD3\xCF\xC7\xD1\xED \xE3\xED\x9D\xD4\xE6\xCF.
+PasswordLabel3=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \x90\xD0\xD1\xE6ǎ\xE5 \xD1\xC7 \xE6\xC7\xD1\xCF \x98\xE4\xED\xCF \xE6 Ӂ\xD3 \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF. \x90\xD0\xD1\xE6ǎ\xE5\x9D\xE5\xC7 \xC8\xE5 \x98捘 \xED\xC7 \xC8\xD2ѐ \xC8\xE6\xCF\xE4 \xCD\xD1\xE6\xDD \xCD\xD3\xC7\xD3 \xE5\xD3\xCA\xE4\xCF.
+PasswordEditLabel=&\x90\xD0\xD1\xE6ǎ\xE5:
+IncorrectPassword=\x90\xD0\xD1\xE6ǎ\xE5\x9D\xED \xE6\xC7\xD1\xCF \xD4\xCF\xE5 \xD5\xCD\xED\xCD \xE4\xE3\xED\x9D\xC8\xC7\xD4\xCF. \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xCF\xE6\xC8\xC7\xD1\xE5 \xCA\xE1\xC7\xD4 \x98\xE4\xED\xCF.
+
+; *** "License Agreement" wizard page
+WizardLicense=\xE3\xCC\xE6\xD2 \xC7\xD3\xCA\xDD\xC7\xCF\xE5
+LicenseLabel=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xC7\xD8\xE1\xC7\xDA\xC7\xCA \xE3\xE5\xE3 \xD2\xED\xD1 \xD1\xC7 \x81\xED\xD4 \xC7\xD2 \xC2\xE4\x98\xE5 \xC7\xCF\xC7\xE3\xE5 \xCF\xE5\xEDϡ \xC8\xCE\xE6\xC7\xE4\xED\xCF.
+LicenseLabel3=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE3\xCC\xE6\xD2 \xC7\xD3\xCA\xDD\xC7\xCF\xE5\x9D\xED \xD2\xED\xD1 \xD1\xC7 \xC8\xCE\xE6\xC7\xE4\xED\xCF. \xD4\xE3\xC7 \xC8\xC7\xED\xCF \xC8\xC7 \xD4\xD1\xC7\xED\xD8 \xC7\xED\xE4 \xE3\xE6\xC7\xDD\xDEʝ\xE4\xC7\xE3\xE5\xA1 \x81\xED\xD4 \xC7\xD2 \xC7\xCF\xC7\xE3\xE5 \xE4\xD5ȡ \xE3\xE6\xC7\xDD\xDE\xCA \x98\xE4\xED\xCF.
+LicenseAccepted=\xE3\xE6\xC7\xDD\xDEʝ\xE4\xC7\xE3\xE5 \xD1\xC7 &\xE3흁\xD0\xED\xD1\xE3
+LicenseNotAccepted=\xE3\xE6\xC7\xDD\xDEʝ\xE4\xC7\xE3\xE5 \xD1\xC7 &\xE4\xE3흁\xD0\xED\xD1\xE3
+
+; *** "Information" wizard pages
+WizardInfoBefore=\xC7\xD8\xE1\xC7\xDA\xC7\xCA
+InfoBeforeLabel=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \x81\xED\xD4 \xC7\xD2 \xC7\xCF\xC7\xE3\xE5 \xC7\xD8\xE1\xC7\xDA\xC7\xCA \xE3\xE5\xE3\xED \x98\xE5 \xCF\xD1 \xD2\xED\xD1 \xE3\xED\x9D\xC2\xED\xCF \xD1\xC7 \xC8\xCE\xE6\xC7\xE4\xED\xCF.
+InfoBeforeClickLabel=\xE5\xE4\x90\xC7\xE3\xED \x98\xE5 \xC2\xE3\xC7\xCF\xE5 \xC7\xCF\xC7\xE3\xE5 \xE4\xD5\xC8 \xD4\xCF\xEDϡ \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+WizardInfoAfter=\xC7\xD8\xE1\xC7\xDA\xC7\xCA
+InfoAfterLabel=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \x81\xED\xD4 \xC7\xD2 \xC7\xCF\xC7\xE3\xE5 \xC7\xD8\xE1\xC7\xDA\xC7\xCA \xE3\xE5\xE3\xED \x98\xE5 \xCF\xD1 \xD2\xED\xD1 \xE3\xED\x9D\xC2\xED\xCF \xD1\xC7 \xC8\xCE\xE6\xC7\xE4\xED\xCF.
+InfoAfterClickLabel=\xE5\xE4\x90\xC7\xE3\xED \x98\xE5 \xC2\xE3\xC7\xCF\xE5 \xC7\xCF\xC7\xE3\xE5 \xE4\xD5\xC8 \xD4\xCF\xEDϡ \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+
+; *** "User Information" wizard page
+WizardUserInfo=\xC7\xD8\xE1\xC7\xDA\xC7\xCA \x98\xC7\xD1\xC8\xD1
+UserInfoDesc=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xC7\xD8\xE1\xC7\xDA\xC7\xCA \xCE\xE6\xCF \xD1\xC7 \xE6\xC7\xD1\xCF \x98\xE4\xED\xCF.
+UserInfoName=&\xE4\xC7\xE3 \x98\xC7\xD1\xC8\xD1:
+UserInfoOrg=&\xD4ј\xCA:
+UserInfoSerial=&\xD4\xE3\xC7\xD1\xE5 \xD3\xD1\xED\xC7\xE1:
+UserInfoNameRequired=\xD4\xE3\xC7 \xC8\xC7\xED\xCF \xED\x98 \xE4\xC7\xE3 \xE6\xC7\xD1\xCF \x98\xE4\xED\xCF.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=\xE3\xDE\xD5\xCF \xE4\xD5\xC8 \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE3\xC7\xED\xED\xCF
+SelectDirDesc=[name] \x98\xCC\xC7 \xC8\xC7\xED\xCF \xE4\xD5\xC8 \xD4\xE6Ͽ
+SelectDirLabel3=[name] \xCF\xD1 \x81\xE6\xD4\xE5 \xD2\xED\xD1 \xE4\xD5\xC8 \xCE\xE6\xC7\xE5\xCF \xD4\xCF.
+SelectDirBrowseLabel=\xC8\xD1\xC7\xED \xC7\xCF\xC7\xE3\xE5\xA1 \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF. ǐ\xD1 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \x81\xE6\xD4\xE5 \xCF\xED\x90\xD1\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE3\xC7\xED\xEDϡ \xE3\x98\xC7\xE4 \xCF\xED\x90\xD1 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+DiskSpaceMBLabel= \xCF\xD3ʝ\x98\xE3 \xC8\xE5 [mb] \xE3\x90\xC7\xC8\xC7\xED\xCA \xDD\xD6\xC7\xED \xCE\xC7\xE1\xED \xE4\xED\xC7\xD2 \xCE\xE6\xC7\xE5\xCF \xC8\xE6\xCF.
+ToUNCPathname=Setup cannot install to a UNC pathname. If you are trying to install to a network, you will need to map a network drive.
+InvalidPath=\xD4\xE3\xC7 \xC8\xC7\xED\xCF \xED\x98 \xE3\xD3\xED\xD1 \x98\xC7\xE3\xE1 \xC8\xE5 \xE5\xE3\xD1\xC7\xE5 \xE4\xC7\xE3 \xCF\xD1\xC7\xED\xE6 \xD1\xC7 \xE6\xC7\xD1\xCF \x98\xE4\xEDϺ \xC8\xD1\xC7\xED \xE3\xCB\xC7\xE1:%n%nC:\APP%n%n\xED\xC7 \xC8\xE5 Ԙ\xE1 \xE3\xD3\xED\xD1 UNC:%n%n\\server\share
+InvalidDrive=\xC7\xED\xE4 \xCF\xD1\xC7\xED\xE6 \xED\xC7 \xE3\xD3\xED\xD1 UNC \x98\xE5 \xD4\xE3\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE3\xE6\xCF\xE5\x9D\xC7\xED\xCF \xE6\xCC\xE6\xCF \xE4\xCF\xC7\xD1\xCF \xED\xC7 \xDE\xC7\xC8\xE1 \xCF\xD3\xCA\xD1\xD3\xED \xE4\xED\xD3\xCA. \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE3\xD3\xED\xD1 \xCF\xED\x90\xD1\xED \xE6\xC7\xD1\xCF \x98\xE4\xED\xCF.
+DiskSpaceWarningTitle=\xC8\xE5 \xC7\xE4\xCF\xC7\xD2\xE5 \x98\xC7\xDD\xED \xDD\xD6\xC7\xED \xCE\xC7\xE1\xED \xE6\xCC\xE6\xCF \xE4\xCF\xC7\xD1\xCF
+DiskSpaceWarning=\xCF\xD3ʝ\x98\xE3 \xC8\xE5 %1 \x98\xED\xE1\xE6\xC8\xC7\xED\xCA \xDD\xD6\xC7\xED \xCE\xC7\xE1\xED \xC8\xD1\xC7\xED \xE4\xD5\xC8 \xC8\xD1\xE4\xC7\xE3\xE5 \xE4\xED\xC7\xD2 \xC7\xD3ʡ \xE6\xE1\xED \xCF\xD1 \xCF\xD1\xC7\xED\xE6 \xC7\xE4\xCA\xCE\xC7\xC8 \xD4\xCF\xE5 \xCA\xE4\xE5\xC7 %2 \x98\xED\xE1\xE6\xC8\xC7\xED\xCA \xDE\xC7\xC8\xE1 \xC7\xD3\xCA\xDD\xC7\xCF\xE5 \xC7\xD3\xCA.%n%n\xC8\xC7 \xC7\xED\xE4 \xE6\xCC\xE6\xCF \xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xC7\xCF\xC7\xE3\xE5 \xCF\xE5\xEDϿ
+DirNameTooLong=\xE4\xC7\xE3 \x81\xE6\xD4\xE5 \xED\xC7 \xE3\xD3\xED\xD1 \xCE\xED\xE1\xED \xD8\xE6\xE1\xC7\xE4\xED \xC7\xD3\xCA.
+InvalidDirName=\xE4\xC7\xE3 \x81\xE6\xD4\xE5 \xDB\xED\xD1 \xE3\xDA\xCA\xC8\xD1 \xC7\xD3\xCA.
+BadDirName32=\xE4\xC7\xE3 \x81\xE6\xD4\xE5\x9D\xE5\xC7 \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \x98\xC7\xD1ǘ\xCA\xD1\xE5\xC7\xED \xD2\xED\xD1 \xD1\xC7 \xCF\xD1\xC8\xD1 Ȑ\xED\xD1\xCF:%n%n%1
+DirExistsTitle=\x81\xE6\xD4\xE5 \xE6\xCC\xE6\xCF \xCF\xC7\xD1\xCF
+DirExists=\x81\xE6\xD4\xE5\x9D\xED:%n%n%1%n%n\xCF\xD1 \xCD\xC7\xE1 \xCD\xC7\xD6\xD1 \xE6\xCC\xE6\xCF \xCF\xC7\xD1\xCF. \xC8\xC7 \xC7\xED\xE4 \xE6\xCC\xE6\xCF \xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xCF\xD1 \xE5\xE3\xED\xE4 \x81\xE6\xD4\xE5 \xE4\xD5\xC8 \xD1\xC7 \xC7\xCF\xC7\xE3\xE5 \xCF\xE5\xEDϿ
+DirDoesntExistTitle=\x81\xE6\xD4\xE5 \xE6\xCC\xE6\xCF \xE4\xCF\xC7\xD1\xCF
+DirDoesntExist=\x81\xE6\xD4\xE5\x9D\xED:%n%n%1%n%n\xE6\xCC\xE6\xCF \xE4\xCF\xC7\xD1\xCF. \xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xC7\xED\xE4 \x81\xE6\xD4\xE5 \xCF\xD1\xD3\xCA \xD4\xE6Ͽ
+
+; *** "Select Components" wizard page
+WizardSelectComponents=\xC7\xE4\xCA\xCE\xC7\xC8 \xC7\xCC\xD2\xC7
+SelectComponentsDesc=\x98\xCF\xC7\xE3 \xED\x98 \xC7\xD2 \xC7\xCC\xD2\xC7\xED \xD2\xED\xD1 \xC8\xC7\xED\xCF \xE4\xD5\xC8 \xD4\xE6\xE4Ͽ
+SelectComponentsLabel2=\xC7\xCC\xD2\xC7\xED\xED \x98\xE5 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xE4\xD5\xC8 \xD4\xE6\xCF \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4\xEDϺ \xC2\xE4\x9D\xCF\xD3\xCA\xE5 \xC7\xD2 \xC7\xCC\xD2\xC7\xED \xC8\xD1\xE4\xC7\xE3\xE5 \xD1\xC7 \x98\xE5 \xCA\xE3\xC7\xED\xE1 \xE4\xCF\xC7\xD1\xED\xCF \xE4\xD5\xC8 \xD4\xE6ϡ \xC7\xD2 \xCD\xC7\xE1\xCA \xC7\xE4\xCA\xCE\xC7\xC8 \xCF\xD1\xC2\xE6\xD1\xED\xCF. \xE5\xE4\x90\xC7\xE3\xED \x98\xE5 \xC2\xE3\xC7\xCF\xE5\x9D\xED \xC7\xCF\xC7\xE3\xE5 \xC8\xE6\xCF\xED\xCF \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+FullInstallation=\xE4\xD5\xC8 \x98\xC7\xE3\xE1
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=\xE4\xD5\xC8 \xDD\xD4\xD1\xCF\xE5
+CustomInstallation=\xE4\xD5\xC8 \xD3\xDD\xC7\xD1\xD4\xED
+NoUninstallWarningTitle=\xC7\xCC\xD2\xC7 \xE6\xCC\xE6\xCF \xCF\xC7\xD1\xE4\xCF
+NoUninstallWarning=\xCA\xD4\xCE\xED\xD5 \xCF\xC7\xCF\xE5 \xD4\xCF \x98\xE5 \xCF\xD1 \xCD\xC7\xE1 \xCD\xC7\xD6\xD1 \xC7\xCC\xD2\xC7\xED \xD2\xED\xD1 \xCF\xD1 \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xE4\xD5\xC8 \xD4\xCF\xE5\x9D\xC7\xE4\xCF:%n%n%1%n%n\xDA\xCF\xE3 \xC7\xE4\xCA\xCE\xC7\xC8 \xC7\xED\xE4 \xC7\xCC\xD2\xC7 \xC2\xE4\xE5\xC7 \xD1\xC7 \xCD\xD0\xDD \xE4\xCE\xE6\xC7\xE5\xCF \x98\xD1\xCF.%n%n\xC8\xC7 \xC7\xED\xE4 \xE6\xCC\xE6\xCF \xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xC7\xCF\xC7\xE3\xE5 \xCF\xE5\xEDϿ
+ComponentSize1=%1 \x98\xED\xE1\xE6\xC8\xC7\xED\xCA
+ComponentSize2=%1 \xE3\x90\xC7\xC8\xC7\xED\xCA
+ComponentsDiskSpaceMBLabel=\xC7\xE4\xCA\xCE\xC7\xC8 \xCC\xC7\xD1\xED\xA1 \xCF\xD3ʝ\x98\xE3 \xC8\xE5 [mb] \xE3\x90\xC7\xC8\xC7\xED\xCA \xDD\xD6\xC7\xED \xCE\xC7\xE1\xED \xCF\xD1 \xCF\xEDӘ \xE4\xED\xC7\xD2 \xCF\xC7\xD1\xCF.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=\xC7\xE4\xCA\xCE\xC7\xC8 \xC7\xE3\xE6\xD1 ʘ\xE3\xED\xE1\xED
+SelectTasksDesc=\x98\xCF\xC7\xE3\xED\x98 \xC7\xD2 \xC7\xE3\xE6\xD1 ʘ\xE3\xED\xE1\xED \xD2\xED\xD1 \xC8\xC7\xED\xCF \xC7\xE4\xCC\xC7\xE3 \xD4\xE6\xE4Ͽ
+SelectTasksLabel2=\xC7\xE3\xE6\xD1 ʘ\xE3\xED\xE1\xED \x98\xE5 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xCF\xD1 \xCC\xD1\xED\xC7\xE4 \xE4\xD5\xC8 [name] \xC7\xE4\xCC\xC7\xE3 \xD4\xE6\xE4\xCF \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4\xEDϡ Ӂ\xD3 \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=\xC7\xE4\xCA\xCE\xC7\xC8 \x81\xE6\xD4\xE5 \xE3\xE4\xE6\xED Start
+SelectStartMenuFolderDesc=\xE3\xED\xC7\xE4\xC8\xD1\xE5\xC7\xED \xC8\xD1\xE4\xC7\xE3\xE5 \x98\xCC\xC7 \xC8\xC7\xED\xCF \xDE\xD1\xC7\xD1 \x90\xED\xD1\xE4Ͽ
+SelectStartMenuFolderLabel3=\xE3\xED\xC7\xE4\xC8\xD1\xE5\xC7\xED \xC8\xD1\xE4\xC7\xE3\xE5 \xCF\xD1 \x81\xE6\xD4\xE5 \xD2\xED\xD1 \xCF\xD1 \xE3\xE4\xE6 Start \xD3\xC7\xCE\xCA\xE5 \xCE\xE6\xC7\xE5\xE4\xCF \xD4\xCF.
+SelectStartMenuFolderBrowseLabel=\xC8\xD1\xC7\xED \xC7\xCF\xC7\xE3\xE5 \xA1 \x81\xD3\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF. ǐ\xD1 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \x81\xE6\xD4\xE5\x9D\xED \xCF\xED\x90\xD1\xED \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4\xEDϡ \xD1\xE6\xED \xE3\x98\xC7\xE4 \xCF\xED\x90\xD1 \x98\xE1\xED\x98 \x98\xE4\xED\xCF.
+MustEnterGroupName=\xC8\xC7\xED\xCF \xE4\xC7\xE3 \xED\x98 \x81\xE6\xD4\xE5 \xD1\xC7 \xE6\xC7\xD1\xCF \x98\xE4\xED\xCF.
+GroupNameTooLong=\xE4\xC7\xE3 \x81\xE6\xD4\xE5 \xED\xC7 \xE3\xD3\xED\xD1 \xCE\xED\xE1\xED \xD8\xE6\xE1\xC7\xE4\xED \xC7\xD3\xCA.
+InvalidGroupName=\xE4\xC7\xE3 \x81\xE6\xD4\xE5 \xDB\xED\xD1 \xE3\xDA\xCA\xC8\xD1 \xC7\xD3\xCA.
+BadGroupName=\xE4\xC7\xE3 \x81\xE6\xD4\xE5 \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \x98\xC7\xD1ǘ\xCA\xD1\xE5\xC7\xED \xD2\xED\xD1 \xD1\xC7 \xCF\xD1\xC8\xD1 Ȑ\xED\xD1\xCF:%n%n%1
+NoProgramGroupCheck2=&\x81\xE6\xD4\xE5\x9D\xC7\xED \xCF\xD1 \xE3\xE4\xE6\xED Start \xCF\xD1\xD3\xCA \xE4\x98\xE4
+
+; *** "Ready to Install" wizard page
+WizardReady=\xC2\xE3\xC7\xCF\xE5\x9D\xED \xE4\xD5\xC8
+ReadyLabel1=\xE4\xD5\xC7ȡ \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xC2\xE3\xC7\xCF\xE5 \xE4\xD5\xC8 [name] \xCF\xD1 \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xE3\xED\x9D\xC8\xC7\xD4\xCF.
+ReadyLabel2a=\xE4\xD5\xC8 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF \xCA\xC7 \xD1\xE6\xE4\xCF \xE4\xD5\xC8 \xC7\xCF\xC7\xE3\xE5 \xED\xC7\xC8ϡ \xED\xC7  \x81\xED\xD4\xED\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF ǐ\xD1 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xCA\xE4\xD9\xED\xE3\xC7\xCA \xD1\xC7 \xC8\xC7\xD2\xC8\xED\xE4\xED \xED\xC7 \xCA\xDB\xED\xED\xD1 \xCF\xE5\xED\xCF.
+ReadyLabel2b=\xE4\xD5\xC8 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF \xCA\xC7 \xD1\xE6\xE4\xCF \xE4\xD5\xC8 \xC7\xCF\xC7\xE3\xE5 \xED\xC7\xC8\xCF.
+ReadyMemoUserInfo=\xC7\xD8\xE1\xC7\xDA\xC7\xCA \x98\xC7\xD1\xC8\xD1:
+ReadyMemoDir=\xE3\x98\xC7\xE4 \xE3\xDE\xD5\xCF:
+ReadyMemoType=\xE4\xE6\xDA \xE4\xD5\xC8:
+ReadyMemoComponents=\xC7\xCC\xD2\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xD4\xCF\xE5:
+ReadyMemoGroup=\x81\xE6\xD4\xE5\x9D\xED \xE3\xE4\xE6\xED Start:
+ReadyMemoTasks=\xC7\xE3\xE6\xD1 ʘ\xE3\xED\xE1\xED:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=\xCF\xD1 \xCD\xC7\xE1 \xC2\xE3\xC7\xCF\xE5 \xD4\xCF\xE4 \xC8\xD1\xC7\xED \xE4\xD5\xC8
+PreparingDesc=[name] \xC2\xE3\xC7\xCF\xE5 \xE4\xD5\xC8 \xD1\xE6\xED \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xE3\xED\x9D\xC8\xC7\xD4\xCF.
+PreviousInstallNotCompleted=\xDD\xD1\xC2\xED\xE4\xCF \xE4\xD5\xC8/\xCD\xD0\xDD \xC8\xD1\xE4\xC7\xE3\xE5\x9D\xED \xDE\xC8\xE1\xED \x98\xC7\xE3\xE1 \xE4\xD4\xCF\xE5 \xC7\xD3\xCA. \xC8\xD1\xC7\xED \x98\xC7\xE3\xE1 \x98\xD1\xCF\xE4 \xE4\xD5\xC8 \xC8\xC7\xED\xCF \xD3\xED\xD3\xCA\xE3 \xCE\xE6\xCF \xD1\xC7 \xE3\xCC\xCF\xCF\xC7\xF0 \xD1\xC7\xE5 \xC7\xE4\xCF\xC7\xD2\xED \x98\xE4\xED\xCF.%n%n\x81\xD3 \xC7\xD2 \xD1\xC7\xE5 \xC7\xE4\xCF\xC7\xD2\xED \xE3\xCC\xCF\xCF \xD1\xC7\xED\xC7\xE4\xE5\x9D\xED \xD4\xE3ǡ \xE4\xD5\xC8 \xD1\xC7 \xCF\xE6\xC8\xC7\xD1\xE5 \xC7\xCC\xD1\xC7 \x98\xE4\xED\xCF \xCA\xC7 \xE4\xD5\xC8 [name] \x98\xC7\xE3\xE1 \xD4\xE6\xCF.
+CannotContinue=\xE4\xD5\xC8 \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \xC7\xCF\xC7\xE3\xE5 \x81\xED\xCF\xC7 \x98\xE4\xCF. \xC8\xD1\xC7\xED \xCE\xD1\xE6\xCC \xC7\xE4\xD5\xD1\xC7\xDD \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF .
+
+; *** "Installing" wizard page
+WizardInstalling=\xCF\xD1 \xCD\xC7\xE1 \xE4\xD5\xC8
+InstallingLabel=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xD5\xC8\xD1 \x98\xE4\xED\xCF \xCA\xC7 [name] \xCF\xD1 \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xE4\xD5\xC8 \xD4\xE6\xCF.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=\xE4\xD5\xC8 [name] \x98\xC7\xE3\xE1 \xD4\xCF
+FinishedLabelNoIcons=\xE4\xD5\xC8 \xC8\xD1\xE4\xC7\xE3\xE5 [name] \xCF\xD1 \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xC8\xE5 \xC7\xCA\xE3\xC7\xE3 \xD1\xD3\xED\xCF\xE5 \xC7\xD3\xCA.
+FinishedLabel=\xE4\xD5\xC8 \xC8\xD1\xE4\xC7\xE3\xE5 [name] \xCF\xD1 \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xC8\xE5 \xC7\xCA\xE3\xC7\xE3 \xD1\xD3\xED\xCF\xE5 \xC7\xD3\xCA. \xE3\xE3\x98\xE4 \xC7\xD3\xCA \xC7\xED\xE4 \xC8\xD1\xE4\xC7\xE3\xE5 \xC8\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \xC2\xED\x98\xE6\xE4\x9D\xE5\xC7\xED \xE4\xD5\xC8 \xD4\xCF\xE5 \xD4\xD1\xE6\xDA \xD4\xE6\xCF.
+ClickFinish=\xC8\xD1\xC7\xED \xCE\xD1\xE6\xCC \xC7\xD2 \xE4\xD5\xC8 \x81\xC7\xED\xC7\xE4 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+FinishedRestartLabel=\xC8\xD1\xC7\xED \xC7\xCA\xE3\xC7\xE3 \xE4\xD5\xC8 [name]\xA1 \xC8\xC7\xED\xCF \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xE3\xCC\xCF\xCF\xC7\xF0 \xD1\xC7\xE5\x9D\xC7\xE4\xCF\xC7\xD2\xED \xD4\xE6\xCF. \xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xD1\xC7\xED\xC7\xE4\xE5 \xCE\xE6\xCF \xD1\xC7 \xD1\xC7\xE5\x9D\xC7\xE4\xCF\xC7\xD2\xED \x98\xE4\xEDϿ
+FinishedRestartMessage=\xC8\xD1\xC7\xED \xC7\xCA\xE3\xC7\xE3 \xE4\xD5\xC8 [name]\xA1 \xC8\xC7\xED\xCF \xD1\xC7\xED\xC7\xE4\xE5 \xD4\xE3\xC7 \xD1\xC7\xE5\x9D\xC7\xE4\xCF\xC7\xD2\xED \xE3\xCC\xCF\xCF \xD4\xE6\xCF. \xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xD1\xC7\xED\xC7\xE4\xE5 \xCE\xE6\xCF \xD1\xC7 \xD1\xC7\xE5\x9D\xC7\xE4\xCF\xC7\xD2\xED \xE3\xCC\xCF\xCF \x98\xE4\xEDϿ
+ShowReadmeCheck=\xC8\xE1\xE5\xA1 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xE3 \xDD\xC7\xED\xE1 \xAB\xE3\xD1\xC7 \xC8\xCE\xE6\xC7\xE4\xBB \xD1\xC7 \xC8\xCE\xE6\xC7\xE4\xE3.
+YesRadio=\xC2\xD1\xED\xA1 \xD3\xED\xD3\xCA\xE3 \xE5\xE3\x9Dǘ\xE4\xE6\xE4 \xD1\xC7\xE5\x9D\xC7\xE4\xCF\xC7\xD2\xED \xE3\xCC\xCF\xCF \xD4\xE6\xCF
+NoRadio=\xCE\xEDѡ \xC8\xDA\xCF\xC7\xF0 \xD1\xC7\xE5\x9D\xC7\xE4\xCF\xC7\xD2\xED \xE3\xCC\xCF\xCF \xE3\xED\x98\xE4\xE3.
+; used for example as 'Run MyProg.exe'
+RunEntryExec=\xC7\xCC\xD1\xC7\xED %1
+RunEntryShellExec=\xE3\xD4\xC7\xE5\xCF\xE5\x9D\xED %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=\xE4\xD5\xC8 \xC8\xE5 \xCF\xEDӘ \xC8\xDA\xCF\xED \xC7\xCD\xCA\xED\xC7\xCC \xCF\xC7\xD1\xCF
+SelectDiskLabel2=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xCF\xEDӘ %1 \xD1\xC7 \xDE\xD1\xC7\xD1 \xCF\xE5\xED\xCF \xE6 \xCA\xC7\xED\xED\xCF \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.%n%nǐ\xD1 \xDD\xC7\xED\xE1\x9D\xE5\xC7\xED \xCF\xD1\xE6\xE4 \xC7\xED\xE4 \xCF\xEDӘ \x81\xE6\xD4\xE5\x9D\xED \xCF\xED\x90\xD1\xED \xDB\xED\xD1 \xC7\xD2 \xC7\xED\xE4\x98\xE5 \xCF\xD1 \xD2\xED\xD1 \xE4\xE3\xC7\xED\xD4 \xCF\xC7\xCF\xE5\xA1 \x81\xED\xCF\xC7 \xE3\xED\x9D\xD4\xE6\xE4ϡ \xE3\xD3\xED\xD1 \xCF\xD1\xD3\xCA \xD1\xC7 \xE6\xC7\xD1\xCF \x98\xE4\xED\xCF \xED\xC7 \xE3\x98\xC7\xE4 \xCF\xED\x90\xD1 \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+PathLabel=&\xE3\xD3\xED\xD1:
+FileNotInDir2=\xDD\xC7\xED\xE1 "%1" \xE4\xE3\xED\x9D\xCA\xE6\xC7\xE4\xCF \xCF\xD1 "%2" \x81\xED\xCF\xC7 \xD4\xE6\xCF. \xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xCF\xEDӘ \xCF\xD1\xD3\xCA \xD1\xC7 \xDE\xD1\xC7\xD1 \xCF\xE5\xED\xCF \xED\xC7 \x81\xE6\xD4\xE5\x9D\xED \xCF\xED\x90\xD1\xED \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4\xED\xCF.
+SelectDirectoryLabel=\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE3\xD3\xED\xD1 \xCF\xEDӘ \xC8\xDA\xCF\xED \xD1\xC7 \xE3\xD4\xCE\xD5 \x98\xE4\xED\xCF.
+
+; *** Installation phase messages
+SetupAborted=\xE4\xD5\xC8 \x98\xC7\xE3\xE1 \xE4\xD4\xCF.%n%n\xCE\xE6\xC7\xE5\xD4\xE3\xE4\xCF \xC7\xD3\xCA \xE4\xD3\xC8\xCA \xC8\xE5 \xD1\xDD\xDA \xE3Ԙ\xE1 \xC7\xDE\xCF\xC7\xE3 \xE6 \xE4\xD5\xC8 \xD1\xC7 \xCF\xE6\xC8\xC7\xD1\xE5 \xC7\xCC\xD1\xC7 \xE4\xE3\xC7\xED\xED\xCF.
+;EntryAbortRetryIgnore=\xC8\xD1\xC7\xED \xCA\xE1\xC7\xD4\xED \xCF\xED\x90\xD1 Retry\xA1 \xC8\xD1\xC7\xED \xC7\xCF\xC7\xE3\xE5 \x98\xC7\xD1 \xC8\xE5 \xE5\xD1 \xCA\xD1\xCA\xED\xC8 Ignore \xED\xC7 \xC8\xD1\xC7\xED \xE1\xDB\xE6 \x98\xD1\xCF\xE4 \xE4\xD5\xC8 Abort \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+EntryAbortRetryIgnore=Click Retry to try again, Ignore to proceed anyway, or Abort to cancel installation.
+
+; *** Installation status messages
+StatusCreateDirs=\xCF\xD1 \xCD\xC7\xE1 \xD3\xC7\xCE\xCA\xE4 \x81\xE6\xD4\xE5\x9D\xE5\xC7...
+StatusExtractFiles=\xCF\xD1 \xCD\xC7\xE1 \xC7\xD3\xCA\xCE\xD1\xC7\xCC \xDD\xC7\xED\xE1\x9D\xE5\xC7...
+StatusCreateIcons=\xCF\xD1 \xCD\xC7\xE1 \xD3\xC7\xCE\xCA\xE4 \xE3\xED\xC7\xE4\xC8\xD1\xE5\xC7...
+StatusCreateIniEntries=\xCF\xD1 \xCD\xC7\xE1 \xD3\xC7\xCE\xCA\xE4 \xE3\xCD\xCA\xE6\xED\xC7\xCAINI...
+StatusCreateRegistryEntries=\xCF\xD1 \xCD\xC7\xE1 \xD3\xC7\xCE\xCA\xE4 \xE3\xCD\xCA\xE6\xED\xC7\xCA \xC8\xC7\xED\x90\xC7\xE4\xED(\xD1\xCC\xED\xD3\xCA\xD1\xED)...
+StatusRegisterFiles=\xCF\xD1 \xCD\xC7\xE1 \xCB\xC8\xCA \xDD\xC7\xED\xE1\x9D\xE5\xC7...
+StatusSavingUninstall=\xCF\xD1 \xCD\xC7\xE1 \xD0\xCE\xED\xD1\xE5 \xC7\xD8\xE1\xC7\xDA\xC7\xCA \xCD\xD0\xDD \xC8\xD1\xE4\xC7\xE3\xE5...
+StatusRunProgram=\xCF\xD1 \xCD\xC7\xE1 \xC7\xCA\xE3\xC7\xE3 \xE4\xD5\xC8...
+StatusRollback=\xCF\xD1 \xCD\xC7\xE1 \xC8\xC7Ґ\xD1\xCF\xC7\xE4\xCF\xE4 \xCA\xDB\xED\xED\xD1\xC7\xCA...
+
+; *** Misc. errors
+ErrorInternal2=\xE3Ԙ\xE1 \xCF\xC7\xCE\xE1\xED %1
+ErrorFunctionFailedNoCode=%1 \xE4\xC7\xE3\xE6\xDD\xDE \xC8\xE6\xCF
+ErrorFunctionFailed=%1 \xE4\xC7\xE3\xE6\xDD\xDE \xC8\xE6Ϻ \x98\xCF %2
+ErrorFunctionFailedWithMessage=%1 \xE4\xC7\xE3\xE6\xDD\xDE \xC8\xE6ϡ \x98\xCF %2%n%3
+ErrorExecutingProgram=\xDA\xCF\xE3 \xCA\xE6\xC7\xE4\xC7\xED\xED \xCF\xD1 \xC7\xCC\xD1\xC7\xED \xDD\xC7\xED\xE1:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=\xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xC8\xC7Ҙ\xD1\xCF\xE4 \x98\xE1\xED\xCF \xC8\xC7\xED\x90\xC7\xE4\xED (\xD1\xCC\xED\xD3\xCA\xD1\xED):%n%1\%2
+ErrorRegCreateKey=\xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xD3\xC7\xCE\xCA\xE4 \x98\xE1\xED\xCF \xC8\xC7\xED\x90\xC7\xE4\xED (\xD1\xCC\xED\xD3\xCA\xD1\xED):%n%1\%2
+ErrorRegWriteKey=\xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xE4\xE6\xD4\xCA\xE4 \x98\xE1\xED\xCF \xC8\xC7\xED\x90\xC7\xE4\xED (\xD1\xCC\xED\xD3\xCA\xD1\xED):%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=\xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xD3\xC7\xCE\xCA\xE4 \xE3\xCD\xCA\xE6\xC7\xED INI \xCF\xD1 \xDD\xC7\xED\xE1 "%1".
+
+; *** File copying errors
+;FileAbortRetryIgnore=\xC8\xD1\xC7\xED \xCA\xE1\xC7\xD4\xED \xCF\xED\x90\xD1 Retry\xA1 \xC8\xD1\xC7\xED \xC7\xD2 \xDE\xE1\xE3 \xC7\xE4\xCF\xC7\xCE\xCA\xE4 \xC7\xED\xE4 \xDD\xC7\xED\xE1 (\xCA\xE6\xD5\xED\xE5 \xE4\xE3\xED\x9D\xD4\xE6\xCF) Ignore \xED\xC7 \xC8\xD1\xC7\xED \xE1\xDB\xE6 \x98\xD1\xCF\xE4 \xE4\xD5\xC8 Abort \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+;FileAbortRetryIgnore2=\xC8\xD1\xC7\xED \xCA\xE1\xC7\xD4\xED \xCF\xED\x90\xD1 Retry\xA1 \xC8\xD1\xC7\xED \xC7\xD2 \xDE\xE1\xE3 \xC7\xE4\xCF\xC7\xCE\xCA\xE4 \x81\xD1\xCF\xC7\xD2\xD4 \xC8\xE5 \xE5\xD1 \xCA\xD1\xCA\xED\xC8 (\xCA\xE6\xD5\xED\xE5 \xE4\xE3\xED\x9D\xD4\xE6\xCF) Ignore \xED\xC7 \xC8\xD1\xC7\xED \xE1\xDB\xE6 \x98\xD1\xCF\xE4 \xE4\xD5\xC8 Abort \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+FileAbortRetryIgnore=Click Retry to try again, Ignore to skip this file (not recommended), or Abort to cancel installation.
+FileAbortRetryIgnore2=Click Retry to try again, Ignore to proceed anyway (not recommended), or Abort to cancel installation.
+SourceIsCorrupted=\xDD\xC7\xED\xE1 \xE3\xE4\xC8\xDA \xCE\xD1\xC7\xC8 \xD4\xCF\xE5 \xC8\xE6\xCF
+SourceDoesntExist=\xDD\xC7\xED\xE1 \xE3\xE4\xC8\xDA "1%" \xE6\xCC\xE6\xCF \xE4\xCF\xC7\xD1\xCF
+;ExistingFileReadOnly=\xDD\xC7\xED\xE1 \xE3\xE6\xCC\xE6\xCF \xC8\xD5\xE6\xD1\xCA \xDD\xDE\xD8-\xCE\xE6\xC7\xE4\xCF\xE4\xED \xCA\xE4\xD9\xED\xE3 \xD4\xCF\xE5 \xC7\xD3\xCA.%n%n.\xC8\xD1\xC7\xED \xCD\xD0\xDD \xE6펐\xED \xDD\xDE\xD8-\xCE\xE6\xC7\xE4\xCF\xE4\xED Retry\xA1 \xC8\xD1\xC7\xED \xC7\xD2 \xDE\xE1\xE3 \xC7\xE4\xCF\xC7\xCE\xCA\xE4 \xC7\xED\xE4 \xDD\xC7\xED\xE1 Ignore \xED\xC7 \xC8\xD1\xC7\xED \xE1\xDB\xE6 \x98\xD1\xCF\xE4 \xE4\xD5\xC8 Abort \xD1\xC7 \xC8\xDD\xD4\xC7\xD1\xED\xCF.
+ExistingFileReadOnly=The existing file is marked as read-only.%n%nClick Retry to remove the read-only attribute and try again, Ignore to skip this file, or Abort to cancel installation.
+ErrorReadingExistingDest=\xED\x98 \xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xCE\xE6\xC7\xE4\xCF\xE4 \xDD\xC7\xED\xE1 \xE3\xE6\xCC\xE6\xCF \xD1\xCE \xCF\xC7\xCF :
+FileExists=\xC7\xED\xE4 \xDD\xC7\xED\xE1 \xCF\xD1 \xCD\xC7\xE1 \xCD\xC7\xD6\xD1 \xE6\xCC\xE6\xCF \xCF\xC7\xD1\xCF.%n%n\xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \xC7\xED\xE4 \xDD\xC7\xED\xE1 \xD1\xE6\xE4\xE6\xED\xD3\xED \xD4\xE6Ͽ
+ExistingFileNewer=\xDD\xC7\xED\xE1 \xE3\xE6\xCC\xE6\xCF \xCC\xCF\xED\xCF\xCA\xD1 \xC7\xD2 \xDD\xC7\xED\xE1\xED \xC7\xD3\xCA \x98\xE5 \xCF\xD1 \xE4\xD5\xC8 \xC8\xD1\xE4\xC7\xE3\xE5 \xE6\xCC\xE6\xCF \xCF\xC7\xD1\xCF. \xCA\xE6\xD5\xED\xE5 \xE3\xED\x9D\xD4\xE6\xCF \x98\xE5 \xDD\xC7\xED\xE1 \xE3\xE6\xCC\xE6\xCF \xD1\xC7 \xE4\x90\xE5 \xCF\xC7\xD1\xED\xCF.%n%n\xC2\xED\xC7 \xE3\xED\x9D\xCE\xE6\xC7\xE5\xED\xCF \x98\xE5 \xC7\xED\xE4 \xDD\xC7\xED\xE1 \xE3\xE6\xCC\xE6\xCF \xD1\xC7 \xE4\x90\xE5 \xCF\xC7\xD1\xEDϿ
+ErrorChangingAttr=\xED\x98 \xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xCA\xE1\xC7\xD4 \xC8\xD1\xC7\xED \xCA\xDB\xED\xED\xD1 \xE6펐\xED\x9D\xE5\xC7\xED \xC7\xED\xE4 \xDD\xC7\xED\xE1 \xE3\xE6\xCC\xE6\xCF \xD1\xCE \xCF\xC7\xCF:
+ErrorCreatingTemp=\xED\x98 \xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xCA\xE1\xC7\xD4 \xC8\xD1\xC7\xED \xD3\xC7\xCE\xCA\xE4 \xED\x98 \xDD\xC7\xED\xE1 \xCF\xD1 \x81\xE6\xD4\xE5 \xE3\xDE\xD5\xCF \xD1\xCE \xCF\xC7\xCF:
+ErrorReadingSource=\xED\x98 \xCE\xD8\xC7 \xCF\xD1 \xE5\xE4\x90\xC7\xE3 \xCA\xE1\xC7\xD4 \xC8\xD1\xC7\xED \xCE\xE6\xC7\xE4\xCF\xE4 \xDD\xC7\xED\xE1 \xE3\xE4\xC8\xDA \xD1\xCE \xC...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7007] branches/R2_12/Docs/Users/ReleaseNotes.html

From: <ki...@us...> - 2009-10-18 10:55:52

Revision: 7007
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7007&view=rev
Author:   kimmov
Date:     2009-10-18 10:55:44 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
Release notes update for 2.12.6 stable release.

Modified Paths:
--------------
    branches/R2_12/Docs/Users/ReleaseNotes.html

Modified: branches/R2_12/Docs/Users/ReleaseNotes.html
===================================================================
--- branches/R2_12/Docs/Users/ReleaseNotes.html	2009-10-18 10:31:05 UTC (rev 7006)
+++ branches/R2_12/Docs/Users/ReleaseNotes.html	2009-10-18 10:55:44 UTC (rev 7007)
@@ -51,9 +51,10 @@
 </head>
 <body>
 
-<h2>WinMerge 2.12.4 Release Notes</h2>
+<h2>WinMerge 2.12.6 Release Notes</h2>
 <ul>
   <li><a href="#about">About This Release</a></li>
+  <li><a href="#new2126">What Is New in 2.12.6?</a></li>
   <li><a href="#new2124">What Is New in 2.12.4?</a></li>
   <li><a href="#new2122">What Is New in 2.12.2?</a></li>
   <li><a href="#new2120">What Is New in 2.12.0?</a></li>
@@ -65,7 +66,7 @@
 <h3><a name="about">About This Release</a></h3>
 
 <p>
-This is a WinMerge 2.12.4 stable release. This release replaces earlier WinMerge
+This is a WinMerge 2.12.6 stable release. This release replaces earlier WinMerge
 stable releases as a recommended release.
 </p>
 
@@ -73,6 +74,20 @@
 Please submit bug reports to our <a href="http://bugs.winmerge.org">bug-tracker</a>.
 </p>
 
+<h3><a name="#new2126">What Is New in 2.12.6?</a></h3>
+<p>
+WinMerge 2.12.6 updates few translations for WinMerge. For a complete changelog
+history, see the <code><a href="ChangeLog.txt">ChangeLog.txt</a></code> file
+located in the <code>Docs</code> folder under the WinMerge program folder.</p>
+
+<h4>Translation updates</h4>
+<ul>
+  <li>Dutch</li>
+  <li>French</li>
+  <li>Turkish</li>
+  <li>Ukrainian</li>
+</ul>
+
 <h3><a name="#new2124">What Is New in 2.12.4?</a></h3>
 <p>
 WinMerge 2.12.4 is an bug-fix release fixing few important bugs found


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

[Winmerge-svn] SF.net SVN: winmerge:[7006] branches/R2_12/Src/ConfigLog.cpp

From: <ki...@us...> - 2009-10-18 10:31:13

Revision: 7006
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7006&view=rev
Author:   kimmov
Date:     2009-10-18 10:31:05 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
PATCH: [ 2834543 ] Wrong message for open ConfigLog
 Submitted by Matthias Mayer

Modified Paths:
--------------
    branches/R2_12/Src/ConfigLog.cpp

Modified: branches/R2_12/Src/ConfigLog.cpp
===================================================================
--- branches/R2_12/Src/ConfigLog.cpp	2009-10-18 10:30:09 UTC (rev 7005)
+++ branches/R2_12/Src/ConfigLog.cpp	2009-10-18 10:31:05 UTC (rev 7006)
@@ -389,7 +389,7 @@
 		sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
 		m_sFileName = sFileName.c_str();
 
-		if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite))
+		if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite, &e))
 		{
 			TCHAR szError[1024];
 			e.GetErrorMessage(szError, 1024);


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

[Winmerge-svn] SF.net SVN: winmerge:[7005] trunk/Src/ConfigLog.cpp

From: <ki...@us...> - 2009-10-18 10:30:17

Revision: 7005
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7005&view=rev
Author:   kimmov
Date:     2009-10-18 10:30:09 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
PATCH: [ 2834543 ] Wrong message for open ConfigLog
 Submitted by Matthias Mayer

Modified Paths:
--------------
    trunk/Src/ConfigLog.cpp

Modified: trunk/Src/ConfigLog.cpp
===================================================================
--- trunk/Src/ConfigLog.cpp	2009-10-12 18:47:16 UTC (rev 7004)
+++ trunk/Src/ConfigLog.cpp	2009-10-18 10:30:09 UTC (rev 7005)
@@ -389,7 +389,7 @@
 		sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt"));
 		m_sFileName = sFileName.c_str();
 
-		if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite))
+		if (!m_file.Open(m_sFileName, CFile::modeCreate | CFile::modeWrite, &e))
 		{
 			TCHAR szError[1024];
 			e.GetErrorMessage(szError, 1024);


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

[Winmerge-svn] SF.net SVN: winmerge:[7004] trunk/Translations/Web/nl.po

From: <ge...@us...> - 2009-10-12 18:47:32

Revision: 7004
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7004&view=rev
Author:   gerundt
Date:     2009-10-12 18:47:16 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
Update Dutch website translation by Thomas De Rocker

Modified Paths:
--------------
    trunk/Translations/Web/nl.po

Modified: trunk/Translations/Web/nl.po
===================================================================
--- trunk/Translations/Web/nl.po	2009-10-12 10:56:10 UTC (rev 7003)
+++ trunk/Translations/Web/nl.po	2009-10-12 18:47:16 UTC (rev 7004)
@@ -24,11 +24,11 @@
 
 #: about\screenshots\index.php:26
 msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
-msgstr ""
+msgstr "Het is dikwijls handig om exacte verschillen binnen regels te zien. WinMerge kan verschillende gebieden tussen regels markeren."
 
 #: 404.php:13
 msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
-msgstr ""
+msgstr "Deze site heeft recent een grote aanpassing ondergaan, zodat dit kan verklaren waarom u deze pagina in de plaats kreeg."
 
 #: translations\index.php:36
 msgid "Status"
@@ -36,7 +36,7 @@
 
 #: docs\changelog.php:11
 msgid "The change log is currently not available..."
-msgstr ""
+msgstr "De lijst van aanpassingen is op dit moment niet beschikbaar..."
 
 #: downloads\index.php:55
 msgid "Requirements"
@@ -44,7 +44,7 @@
 
 #: downloads\source-code.php:33
 msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
-msgstr ""
+msgstr "De broncode wordt gehost op <a href=\"%1$s\">SourceForge.net</a> in een <a href=\"%2$s\">Subversion</a>-repositorium."
 
 #: about\license.php:35
 msgid "Open Source Software"
@@ -56,7 +56,7 @@
 
 #: index.php:13
 msgid "What is WinMerge?"
-msgstr ""
+msgstr "Wat is WinMerge?"
 
 #: support\index.php:15
 msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
@@ -100,28 +100,28 @@
 
 #: about\index.php:39
 msgid "Regular Expression based file filters allow excluding and including items"
-msgstr ""
+msgstr "Bestandsfilters gebaseerd op reguliere expressies staan toe om items te excluderen of includeren"
 
 #: downloads\index.php:59
 msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
-msgstr ""
+msgstr "Microsoft Visual C++ 2003 Runtime Components (bij de installer bijgevoegd)"
 
 #: translations\status_branch.php:18
 #: translations\status_trunk.php:18
 msgid "The translations status is currently not available..."
-msgstr ""
+msgstr "De vertaalstatus is op dit moment niet beschikbaar..."
 
 #: engine\page.inc:295
 msgid "WinMerge Manual"
-msgstr ""
+msgstr "WinMerge handleiding"
 
 #: engine\page.inc:309
 msgid "WinMerge Discussion Forums"
-msgstr ""
+msgstr "WinMerge discussieforums"
 
 #: about\license.php:5
 msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
-msgstr ""
+msgstr "WinMerge is Open Source software onder de GNU General Public License. Dit betekent dat iedereen de broncode kan downloaden en ze verbeteren en aanpassen."
 
 #: downloads\pad-file.php:90
 msgid "Company"
@@ -134,7 +134,7 @@
 
 #: engine\page.inc:305
 msgid "WinMerge PAD File"
-msgstr ""
+msgstr "WinMerge PAD-bestand"
 
 #: engine\engine.inc:21
 msgid "French"
@@ -146,7 +146,7 @@
 
 #: downloads\plugins.php:6
 msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
-msgstr ""
+msgstr "WinMerge, gratis, download, plugins, plugin, plug-in, setup, installer, installatiebestanden, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 
 #: links.php:31
 #, c-format
@@ -159,7 +159,7 @@
 
 #: about\history.php:45
 msgid "Withdrawn due to installer bug!"
-msgstr ""
+msgstr "Teruggehaald vanwege een installer-bug!"
 
 #: translations\index.php:40
 msgid "Unstable Version (Trunk)"
@@ -167,7 +167,7 @@
 
 #: about\screenshots\index.php:32
 msgid "WinMerge 2.8 has a new professional looking splash screen."
-msgstr ""
+msgstr "WinMerge 2.8 heeft een nieuw professioneel ogend opstartvenster."
 
 #: about\index.php:42
 msgid "Can show folder compare results in a tree-style view"
@@ -175,7 +175,7 @@
 
 #: about\index.php:16
 msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
-msgstr ""
+msgstr "Daarenboven heeft WinMerge vele handige ondersteunende functies die vergelijken, synchroniseren en samenvoegen zo gemakkelijk en bruikbaar mogelijk maken:"
 
 #: support\mailing-lists.php:22
 #: support\mailing-lists.php:52
@@ -188,7 +188,7 @@
 
 #: support\mailing-lists.php:27
 msgid "This list is only for announcing new releases of WinMerge."
-msgstr ""
+msgstr "Deze lijst is alleen voor het aankondigen van nieuwe releases van WinMerge."
 
 #: 404.php:19
 msgid "<a href=\"%s\">Documentation</a>?"
@@ -196,7 +196,7 @@
 
 #: engine\page.inc:317
 msgid "WinMerge Translations Instructions"
-msgstr ""
+msgstr "WinMerge vertaalinstructies"
 
 #: downloads\pad-file.php:78
 msgid "Icon"
@@ -233,7 +233,7 @@
 
 #: engine\page.inc:312
 msgid "WinMerge Tracker Shortcuts"
-msgstr ""
+msgstr "WinMerge tracker-snelkoppelingen"
 
 #: support\tracker-shortcuts.php:10
 msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
@@ -241,7 +241,7 @@
 
 #: downloads\pad-file.php:10
 msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
-msgstr ""
+msgstr "De gemakkelijkste manier om informatie te krijgen over de laatste stabiele versie van WinMerge voor uw website is het <a href=\"%s\">Portable Application Description</a>-bestand, dat u hier terugvindt:"
 
 #: support\tracker-shortcuts.php:14
 msgid "Patch"
@@ -249,7 +249,7 @@
 
 #: support\mailing-lists.php:5
 msgid "Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN"
-msgstr ""
+msgstr "Inschrijven of uitschrijven op een van de volgende maillijsten: Announce, Support, User, Translate, Development en SVN"
 
 #: about\screenshots\index.php:20
 msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
@@ -258,11 +258,11 @@
 #: engine\page.inc:265
 #: engine\page.inc:308
 msgid "WinMerge Support"
-msgstr ""
+msgstr "WinMerge ondersteuning"
 
 #: support\index.php:17
 msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
-msgstr ""
+msgstr "We vereisen registratie omdat anonieme inzendingen veel spam veroorzaakten, en ook omdat er geen mogelijkheid was om mensen te contacteren om meer informatie te vragen."
 
 #: engine\page.inc:310
 #: support\mailing-lists.php:7
@@ -281,11 +281,11 @@
 #: index.php:19
 #: about\index.php:11
 msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr ""
+msgstr "WinMerge is een <a href=\"%s\">Open Source</a> vergelijkings- en samenvoegingstool voor Windows. WinMerge kan mappen en bestanden vergelijken, verschillen voorstellend in een visueel tekstformaat dat gemakkelijk te begrijpen en behandelen is."
 
 #: support\index.php:18
 msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
-msgstr ""
+msgstr "We verzenden sporadisch directe e-mails maar u zal berichten krijgen wanneer we vragen stellen in het bug-item."
 
 #: downloads\index.php:25
 #: downloads\plugins.php:20
@@ -294,11 +294,11 @@
 
 #: docs\releasenotes.php:11
 msgid "The release notes are currently not available..."
-msgstr ""
+msgstr "De vrijgave-opmerkingen zijn op dit moment niet beschikbaar..."
 
 #: engine\page.inc:297
 msgid "WinMerge Known Issues"
-msgstr ""
+msgstr "WinMerge gekende problemen"
 
 #: about\index.php:76
 msgid "Using WinMerge"
@@ -306,11 +306,11 @@
 
 #: downloads\index.php:53
 msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
-msgstr ""
+msgstr "U kan ook bijkomende <a href=\"%1$s\">plugins</a> downloaden en de hele <a href=\"%2$s\">broncode</a> van WinMerge."
 
 #: support\mailing-lists.php:57
 msgid "This list is used for coordinating the translations."
-msgstr ""
+msgstr "Deze lijst wordt gebruikt om de vertalingen te coördineren."
 
 #: links.php:6
 #: about\license.php:30
@@ -320,7 +320,7 @@
 
 #: index.php:49
 msgid "The WinMerge Development Team"
-msgstr ""
+msgstr "Het WinMerge-ontwikkelingsteam"
 
 #: support\tracker-shortcuts.php:15
 msgid "Support Request"
@@ -342,7 +342,7 @@
 
 #: support\index.php:11
 msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
-msgstr ""
+msgstr "Het <a href=\"%s\">Open Discussion forum</a> is de snelste manier om hulp te krijgen. Wees geduldig, het kan even duren voordat iemand antwoordt."
 
 #: about\index.php:31
 msgid "Highlights differences inside lines"
@@ -358,7 +358,7 @@
 
 #: about\screenshots\index.php:6
 msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
-msgstr ""
+msgstr "WinMerge, screenshots, bestandsvergelijking, open-dialoog, mapvergelijkingsresultaten, regelverschil markeren, locatievenster, splashvenster"
 
 #: downloads\pad-file.php:72
 msgid "Web Addresses"
@@ -366,7 +366,7 @@
 
 #: engine\page.inc:318
 msgid "WinMerge Translations Status (Stable Branch)"
-msgstr ""
+msgstr "WinMerge vertaalstatus (stabiele branch)"
 
 #: about\index.php:74
 msgid "For more information, please see the <a href=\"%1$s\">Installation section</a> of the <a href=\"%2$s\">Manual</a>."
@@ -386,7 +386,7 @@
 
 #: index.php:48
 msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
-msgstr ""
+msgstr "Daarnaast is WinMerge vertaald in een aantal verschillende talen. Zie onze <a href=\"%s\">informatie over het vertalen van WinMerge</a> in uw eigen taal."
 
 #: engine\engine.inc:19
 #: translations\index.php:24
@@ -395,7 +395,7 @@
 
 #: support\index.php:19
 msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
-msgstr ""
+msgstr "Wenslijst-items op de <a href=\"%s\">functie-aanvragenlijst</a> zullen ook in overweging genomen worden, maar we maken absoluut geen beloften."
 
 #: engine\engine.inc:24
 msgid "Swedish"
@@ -419,11 +419,11 @@
 
 #: translations\index.php:11
 msgid "We currently have WinMerge translated into the languages listed below:"
-msgstr ""
+msgstr "WinMerge wordt op dit moment vertaald in de talen die hieronder weergegeven worden:"
 
 #: translations\index.php:33
 msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
-msgstr ""
+msgstr "U kan meer technische informatie vinden over het <a href=\"%1$s\">vertaalsysteem<a> in onze <a href=\"\"%2$s>Ontwikkelingswiki</a>."
 
 #: translations\translations.inc:131
 #: translations\translations.inc:288
@@ -443,7 +443,7 @@
 
 #: engine\page.inc:264
 msgid "WinMerge Downloads"
-msgstr ""
+msgstr "WinMerge downloads"
 
 #: downloads\index.php:70
 msgid "Japanese WinMerge Version"
@@ -468,7 +468,7 @@
 #: links.php:43
 #: downloads\index.php:69
 msgid "WinMerge Portable"
-msgstr ""
+msgstr "WinMerge portable"
 
 #: translations\translations.inc:83
 #: translations\translations_branch.inc:51
@@ -477,11 +477,11 @@
 
 #: docs\changelog.php:5
 msgid "The change log is a more complete list of changes in the last WinMerge releases."
-msgstr ""
+msgstr "De aanpassingslog is een meer complete lijst van aanpassingen in de laatste releases van WinMerge."
 
 #: 404.php:15
 msgid "Were you looking for..."
-msgstr ""
+msgstr "Was u op zoek naar..."
 
 #: about\index.php:19
 msgid "General"
@@ -498,11 +498,11 @@
 
 #: engine\page.inc:299
 msgid "WinMerge Development Wiki"
-msgstr ""
+msgstr "WinMerge ontwikkelingswiki"
 
 #: downloads\index.php:15
 msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
-msgstr ""
+msgstr "De huidige WinMerge-versie is <strong>%1$s</strong> en werd vrijgegeven op <strong>%2$s</strong>."
 
 #: about\index.php:21
 msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
@@ -523,7 +523,7 @@
 
 #: index.php:16
 msgid "More Screenshots&hellip;"
-msgstr ""
+msgstr "Meer screenshots&hellip;"
 
 #: about\index.php:48
 msgid "Resolve conflict files"
@@ -546,7 +546,7 @@
 
 #: support\index.php:38
 msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
-msgstr ""
+msgstr "Omdat WinMerge een <a href=\"%s\">Open Source</a>-project is, mag u het gratis gebruiken."
 
 #: translations\translations.inc:81
 #: translations\translations_branch.inc:49
@@ -567,11 +567,11 @@
 #: engine\page.inc:266
 #: engine\page.inc:316
 msgid "WinMerge Translations"
-msgstr ""
+msgstr "WinMerge vertalingen"
 
 #: downloads\pad-file.php:6
 msgid "WinMerge, PAD file, Portable Application Description"
-msgstr ""
+msgstr "WinMerge, PAD-bestand, Portable Application Description"
 
 #: downloads\pad-file.php:40
 msgid "Release Status"
@@ -579,11 +579,11 @@
 
 #: engine\page.inc:311
 msgid "WinMerge Tracker"
-msgstr ""
+msgstr "WinMerge tracker"
 
 #: support\mailing-lists.php:47
 msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
-msgstr ""
+msgstr "Deze lijst is voor gebruikersgerelateerde vragen. Vragen die in deze lijst gesteld worden kunnen anderen met hetzelfde probleem toestaan om het zelf op te lossen."
 
 #: downloads\index.php:7
 msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
@@ -595,7 +595,7 @@
 
 #: translations\index.php:29
 msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>&#8594; <span class=\"guimenuitem\">Language</span> menu choice."
-msgstr ""
+msgstr "Om de taal aan te passen selecteert u de gewenste taal van de <span class=\"guimenu\">Beeld</span>&#8594; <span class=\"guimenuitem\">Taal</span> menukeuze."
 
 #: translations\translations.inc:136
 #: translations\translations_branch.inc:71
@@ -615,11 +615,11 @@
 #: downloads\index.php:33
 #: downloads\source-code.php:17
 msgid "Zip-Format (%s MB)"
-msgstr ""
+msgstr "Zip-Formaat (%s MB)"
 
 #: support\tracker-shortcuts.php:5
 msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
-msgstr ""
+msgstr "Trackerkoppelingen zijn kortere en leukere URL's naar tracker-items van onze SF.net projectpagina. U kan deze pagina gebruiken om een koppeling aan te maken."
 
 #: support\tracker-shortcuts.php:18
 msgid "Tracker Item"
@@ -662,7 +662,7 @@
 
 #: about\license.php:6
 msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
-msgstr ""
+msgstr "WinMerge, licentie, open source, GNU General Public License, GPL, vrije software"
 
 #: downloads\pad-file.php:94
 msgid "Contact"
@@ -671,7 +671,7 @@
 #: downloads\index.php:40
 #: downloads\source-code.php:24
 msgid "SHA-1 Checksums"
-msgstr ""
+msgstr "SHA-1-checksums"
 
 #: engine\page.inc:231
 msgid "Version %1$s; %2$s MB"
@@ -688,7 +688,7 @@
 
 #: support\tracker-shortcuts.php:6
 msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
-msgstr ""
+msgstr "WinMerge, tracker, koppelingen, sourceforge, projectpagina, bug, patch, ondersteuningsaanvraag, functie-aanvraag, item te doen"
 
 #: links.php:38
 #, c-format
@@ -709,7 +709,7 @@
 
 #: engine\page.inc:284
 msgid "WinMerge Links"
-msgstr ""
+msgstr "WinMerge links"
 
 #: about\screenshots\index.php:29
 msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
@@ -721,7 +721,7 @@
 
 #: docs\index.php:15
 msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
-msgstr ""
+msgstr "De <a href=\"%s\">aanpassingslog</a> is een meer complete lijst van aanpassingen in de laatste releases van WinMerge."
 
 #: engine\page.inc:303
 msgid "Download WinMerge Plugins"
@@ -729,11 +729,11 @@
 
 #: engine\page.inc:319
 msgid "WinMerge Translations Status (Unstable Trunk)"
-msgstr ""
+msgstr "WinMerge vertaalstatus (instabiele trunk)"
 
 #: docs\index.php:17
 msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
-msgstr ""
+msgstr "De <a href=\"%s\">ontwikkelingswiki</a> bevat veel informatie over de ontwikkeling van WinMerge."
 
 #: downloads\index.php:16
 msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
@@ -741,7 +741,7 @@
 
 #: support\mailing-lists.php:77
 msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
-msgstr ""
+msgstr "Abonnees van deze lijst krijgen berichten van elke codeverandering die toegepast wordt op Subversion."
 
 #: links.php:44
 #, c-format
@@ -765,11 +765,11 @@
 
 #: about\index.php:29
 msgid "Visual differencing and merging of text files"
-msgstr ""
+msgstr "Visueel zien van verschillen en samenvoegen van tekstbestanden"
 
 #: engine\page.inc:285
 msgid "WinMerge Project Page"
-msgstr ""
+msgstr "WinMerge projectpagina"
 
 #: downloads\index.php:60
 msgid "Admin rights for the installer"
@@ -777,11 +777,11 @@
 
 #: downloads\plugins.php:28
 msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
-msgstr ""
+msgstr "U kan ook de <a href=\"%1$s\">vrijgave-opmerkingen</a> lezen of zoeken naar <a href=\"%2$s\">andere versies</a>."
 
 #: engine\page.inc:289
 msgid "WinMerge Screenshots"
-msgstr ""
+msgstr "WinMerge screenshots"
 
 #: downloads\pad-file.php:42
 msgid "Download"
@@ -814,11 +814,11 @@
 
 #: support\tracker-shortcuts.php:11
 msgid "You can use this page to create a shortcut:"
-msgstr ""
+msgstr "U kan deze pagina gebruiken om een snelkoppeling aan te maken:"
 
 #: downloads\pad-file.php:5
 msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
-msgstr ""
+msgstr "De gemakkelijkste manier om informatie te krijgen over de laatste stabiele versie van WinMerge voor uw website is het Portable Application Description-bestand, dat u hier terugvindt."
 
 #: translations\translations.inc:41
 msgid "File not found."
@@ -835,11 +835,11 @@
 
 #: downloads\index.php:52
 msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
-msgstr ""
+msgstr "De gemakkelijkste manier om WinMerge te installeren is de installer te downloaden en openen. Lees de <a href=\"%s\">online handleiding</a> voor hulp om hem te gebruiken."
 
 #: about\screenshots\index.php:23
 msgid "In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares."
-msgstr ""
+msgstr "In de boomweergave zijn mappen in- en uitklapbaar, en bevatten ze bestanden en submappen. Dit is bruikbaar voor een gemakkelijkere navigatie in diep geneste mapstructuren. <em>De boomweergave is alleen beschikbaar in recursieve vergelijkingen."
 
 #: index.php:42
 #: downloads\pad-file.php:96
@@ -851,11 +851,11 @@
 
 #: about\index.php:72
 msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
-msgstr ""
+msgstr "Download gewoon de <a href=\"%s\">installer</a> en dubbelklik erop."
 
 #: downloads\source-code.php:34
 msgid "You can <a href=\"%1$s\">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href=\"%2$s\">TortoiseSVN</a> installed):"
-msgstr ""
+msgstr "U kan <a href=\"%1$s\">door de broncode surfen</a> met een webbrowser of u kan de hele code nachecken door op een van de volgende links te klikken (als u <a href=\"%2$s\">TortoiseSVN</a> geinstalleerd heeft):"
 
 #: downloads\source-code.php:5
 msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
@@ -872,7 +872,7 @@
 
 #: index.php:46
 msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
-msgstr ""
+msgstr "WinMerge is een open source project, wat betekent dat het programma onderhouden en ontwikkeld wordt door vrijwilligers."
 
 #: about\index.php:24
 msgid "Tabbed interface"
@@ -880,11 +880,11 @@
 
 #: about\index.php:33
 msgid "Location pane shows map of files compared"
-msgstr ""
+msgstr "Het locatievenster toont een kaart van de vergeleken bestanden"
 
 #: about\screenshots\index.php:17
 msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
-msgstr ""
+msgstr "WinMerge staat toe om paden op verschillende manieren te selecteren/openen. Een ervan is het gebruiken van het Openen-dialoogvenster."
 
 #: about\index.php:77
 msgid "For information on using WinMerge, see our <a href=\"%s\">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use."
@@ -892,7 +892,7 @@
 
 #: about\index.php:73
 msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
-msgstr ""
+msgstr "Of u kan gewoon het <a href=\"%s\">zipbestand</a> uitpakken in de gewenste locatie en <code>WinMergeU.exe</code> starten (behalve voor gebruikers van Windows 98/ME, die <code>WinMerge.exe</code> moeten gebruiken)."
 
 #: downloads\pad-file.php:56
 msgid "English Descriptions"
@@ -909,7 +909,7 @@
 
 #: support\index.php:6
 msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
-msgstr ""
+msgstr "Het Open Discussion-forum is de snelste manier om hulp te krijgen. Een andere manier is een inschrijving op de ondersteuningsmaillijst."
 
 #: about\screenshots\index.php:30
 #: about\screenshots\index.php:31
@@ -926,7 +926,7 @@
 
 #: index.php:6
 msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr ""
+msgstr "WinMerge is een Open Source vergelijkings- en samenvoegingstool voor Windows. WinMerge kan mappen en bestanden vergelijken, de verschillen voorstellend in een visueel tekstformaat dat gemakkelijk te begrijpen en behandelen is."
 
 #: downloads\index.php:67
 msgid "Beta Versions"
@@ -938,7 +938,7 @@
 
 #: about\index.php:6
 msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
-msgstr ""
+msgstr "WinMerge, over, functies, bestandsvergelijking, mapvergelijking, versicontrole, screenshots, installatie"
 
 #: support\mailing-lists.php:15
 #: support\mailing-lists.php:50
@@ -947,7 +947,7 @@
 
 #: downloads\index.php:58
 msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
-msgstr ""
+msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
 
 #: downloads\plugins.php:5
 msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
@@ -965,7 +965,7 @@
 
 #: about\screenshots\index.php:5
 msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
-msgstr ""
+msgstr "Screenshots van WinMerge-functies zoals bestandsvergelijking, mapvergelijkingsresultaten en locatievenster."
 
 #: translations\translations.inc:85
 #: translations\translations_branch.inc:53
@@ -974,7 +974,7 @@
 
 #: index.php:43
 msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
-msgstr ""
+msgstr "Als u ondersteuning nodig heeft, kan u kijken op onze <a href=\"%s\">ondersteuningspagina</a> voor meer informatie over hoe u ondersteuning kan krijgen."
 
 #: engine\page.inc:318
 msgid "Status (Stable Branch)"
@@ -986,7 +986,7 @@
 
 #: translations\instructions.php:9
 msgid "The translations instructions are currently not available..."
-msgstr ""
+msgstr "De vertaalinstructies zijn op dit moment niet beschikbaar..."
 
 #: support\mailing-lists.php:17
 #: support\mailing-lists.php:70
@@ -995,27 +995,27 @@
 
 #: downloads\plugins.php:31
 msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
-msgstr ""
+msgstr "Met deze plugin kan u Word-, Excel-, PowerPoint-, PDF- en andere bestanden vergelijken."
 
 #: support\index.php:16
 msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
-msgstr ""
+msgstr "U moet <a href=\"%s\">registreren bij SourceForge.net</a> voordat u een bugrapport kan posten (registratie is gratis)."
 
 #: downloads\source-code.php:6
 msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
-msgstr ""
+msgstr "WinMerge, gratis, download, broncode, GPL, subversie, SVN, TortoiseSVN"
 
 #: docs\releasenotes.php:5
 msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
-msgstr ""
+msgstr "De vrijgave-opmerkingen zijn een korte opsomming van belangrijke aanpassingen, verbeteringen, bugfixes en gekende problemen in de huidige WinMerge-vrijgave."
 
 #: docs\changelog.php:6
 msgid "WinMerge, change log, changes, release, tracker item, revision number"
-msgstr ""
+msgstr "WinMerge, aanpassingslog, aanpassingen, vrijgave, tracker item, revisienummer"
 
 #: docs\releasenotes.php:6
 msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
-msgstr ""
+msgstr "WinMerge, vrijgave-opmerkingen, opsomming, aanpassingen, verbeteringen, bugfixes, gekende problemen, vrijgave"
 
 #: downloads\pad-file.php:14
 msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
@@ -1031,7 +1031,7 @@
 
 #: about\index.php:54
 msgid "Shell Integration (supports 64-bit Windows versions)"
-msgstr ""
+msgstr "Shell-integratie (ondersteunt 64-bit Windowsversies)"
 
 #: about\index.php:55
 msgid "Archive file support using 7-Zip"
@@ -1079,13 +1079,15 @@
 
 #: docs\index.php:6
 msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
-msgstr ""
+msgstr "WinMerge, documentatie, handleiding, vrijgave-opmerkingen, gekende problemen, aanpassingslog, ontwikkelingswiki"
 
 #: about\license.php:10
 msgid ""
 "This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
 "The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
 msgstr ""
+"Dit betekent dat iedereen de <a href=\"%s\">broncode</a> kan downloaden en ze verbeteren en aanpassen.\n"
+"Het enige dat we vragen is dat mensen hun verbeteringen en aanpassingen terug naar ons sturen zodat alle WinMerge-gebruikers er voordeel van hebben."
 
 #: about\history.php:5
 msgid "History of WinMerge releases with version numbers, release dates and manuals."
@@ -1093,7 +1095,7 @@
 
 #: downloads\plugins.php:11
 msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
-msgstr ""
+msgstr "Dit is de 7-Zip-plugin voor WinMerge en de huidige versie <strong>%1$s</strong> werd vrijgegeven op <strong>%2$s</strong>."
 
 #: 404.php:23
 msgid "<a href=\"%s\">Change Log</a>?"
@@ -1128,12 +1130,12 @@
 
 #: support\index.php:14
 msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> &#8594; <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
-msgstr ""
+msgstr "Gelieve zoveel mogelijk informatie bij te voegen: minimum het versienummer van de WinMerge-versie die u gebruikt. Voeg indien mogelijk ook een configuratielog bij, die u kan verkrijgen door te klikken op <span class=\"guimenu\">Help</span> &#8594; <span class=\"guimenuitem\">Configuratie</span> in het WinMerge-venster."
 
 #: engine\page.inc:261
 #: engine\page.inc:283
 msgid "WinMerge Home"
-msgstr ""
+msgstr "WinMerge home"
 
 #: links.php:33
 #, c-format
@@ -1142,7 +1144,7 @@
 
 #: docs\index.php:11
 msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
-msgstr ""
+msgstr "De <a href=\"%s\">handleiding</a> legt uit hoe WinMerge gebruikt wordt, en documenteert zijn mogelijkheden en limitaties."
 
 #: engine\page.inc:302
 msgid "WinMerge"
@@ -1150,7 +1152,7 @@
 
 #: downloads\plugins.php:30
 msgid "xdocdiff Plugin"
-msgstr ""
+msgstr "xdocdiff-plugin"
 
 #: support\tracker-shortcuts.php:17
 msgid "Todo Item"
@@ -1158,7 +1160,7 @@
 
 #: support\mailing-lists.php:67
 msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
-msgstr ""
+msgstr "Dit is de lijst waar deelnemende ontwikkelaars van de WinMerge elkaar ontmoeten en problemen, code-aanpassingen en -toevoegingen bespreken, enzovoort."
 
 #: downloads\index.php:22
 #: downloads\plugins.php:17
@@ -1171,7 +1173,7 @@
 
 #: support\mailing-lists.php:6
 msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
-msgstr ""
+msgstr "WinMerge, mailing lists, aankondiging, ondersteuning, gebruiker, vertalen, ontwikkeling, SVN"
 
 #: about\index.php:67
 #: about\screenshots\index.php:18
@@ -1198,11 +1200,11 @@
 #: engine\page.inc:263
 #: engine\page.inc:294
 msgid "WinMerge Documentation"
-msgstr ""
+msgstr "WinMerge documentatie"
 
 #: downloads\source-code.php:11
 msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
-msgstr ""
+msgstr "WinMerge is vrijgegeven onder de <a href=\"%s\">GNU General Public License</a>. Dat betekent dat u de hele broncode kan verkrijgen en het programma zelf kan compileren."
 
 #: about\index.php:40
 msgid "Fast compare using file sizes and dates"
@@ -1223,7 +1225,7 @@
 
 #: docs\index.php:13
 msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
-msgstr ""
+msgstr "De <a href=\"%1$s\">vrijgave-opmerkingen</a> zijn een korte opsomming van belangrijke aanpassingen, verbeteringen, bugfixes en <a href=\"%2$s\">gekende problemen</a> in de huidige release van WinMerge."
 
 #: translations\translations.inc:85
 #: translations\translations.inc:97
@@ -1252,7 +1254,7 @@
 
 #: support\mailing-lists.php:37
 msgid "You should ask all your support questions on this list."
-msgstr ""
+msgstr "U kan al uw ondersteuningsvragen stellen op deze lijst."
 
 #: about\index.php:52
 msgid "Other"
@@ -1278,7 +1280,7 @@
 
 #: support\index.php:7
 msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
-msgstr ""
+msgstr "WinMerge, ondersteuning, discussieforums, maillijsten, tracker, doneren, bugs, ondersteuningsaanvragen, patches, functie-aanvragen,te doen, open source, sourceforge.net"
 
 #: downloads\index.php:31
 msgid "Runtimes"
@@ -1286,11 +1288,11 @@
 
 #: translations\index.php:37
 msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
-msgstr ""
+msgstr "De volgende twee pagina's geven informatie over de vertaalstatus van de stabiele versie en ontwikkelingsversie van WinMerge:"
 
 #: about\index.php:49
 msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
-msgstr ""
+msgstr "Rudimentaire Visual SourceSafe en Rational ClearCase integratie"
 
 #: translations\translations.inc:83
 #: translations\translations.inc:96
@@ -1308,7 +1310,7 @@
 
 #: downloads\index.php:8
 msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
-msgstr ""
+msgstr "WinMerge, gratis, download, Windows, setup, installer, installatiebestanden, runtimes, stabiel, beta, experimenteel, portable"
 
 #: 404.php:18
 msgid "<a href=\"%s\">Screenshots</a>?"
@@ -1325,12 +1327,12 @@
 
 #: about\index.php:69
 msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
-msgstr ""
+msgstr "Zie de <a href=\"%s\">screenshots-pagina</a> voor meer screenshots."
 
 #: index.php:37
 #: downloads\index.php:88
 msgid "Y-m-d"
-msgstr ""
+msgstr "d-m-Y"
 
 #: translations\instructions.php:5
 #: translations\instructions.php:8
@@ -1339,7 +1341,7 @@
 
 #: engine\page.inc:310
 msgid "WinMerge Mailing Lists"
-msgstr ""
+msgstr "WinMerge maillijsten"
 
 #: downloads\index.php:68
 msgid "Experimental Builds"
@@ -1389,7 +1391,7 @@
 
 #: index.php:7
 msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
-msgstr ""
+msgstr "WinMerge, vrij, open source, Windows, windiff, diff, samenvoegen, vergelijken, tool, utility, tekt, bestand, map, bestanden vergelijken, mappen vergelijken, bestanden samenvoegen, mappen samenvoegen, diff tool, samenvoegingstool, vergelijkingstool"
 
 #: engine\page.inc:230
 msgid "Download Now!"
@@ -1417,7 +1419,7 @@
 
 #: engine\page.inc:296
 msgid "WinMerge Release Notes"
-msgstr ""
+msgstr "WinMerge vrijgave-opmerkingen"
 
 #: index.php:26
 msgid "WinMerge %s - latest stable version"
@@ -1425,7 +1427,7 @@
 
 #: translations\index.php:32
 msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
-msgstr ""
+msgstr "Als u een van deze vertalingen wilt updaten of een andere vertaling toevoegen, gelieve dan <a href=\"%s\">deze instructies</a> te volgen."
 
 #: translations\index.php:31
 msgid "Translating"
@@ -1453,7 +1455,7 @@
 #: about\index.php:5
 #: about\index.php:12
 msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
-msgstr ""
+msgstr "WinMerge is vooral bruikbaar voor het onderzoeken van welke dingen veranderd zijn tussen projectversies, en nadien de veranderingen tussen versies samen te voegen. WinMerge kan gebruikt worden als een externe vergelijkings-/samenvoegingstool of als een standalone toepassing."
 
 #: engine\engine.inc:22
 #, c-format
@@ -1481,11 +1483,11 @@
 
 #: about\index.php:34
 msgid "Moved lines detection"
-msgstr ""
+msgstr "Detectie van verplaatste regels"
 
 #: engine\page.inc:290
 msgid "WinMerge History"
-msgstr ""
+msgstr "WinMerge geschiedenis"
 
 #: translations\translations.inc:132
 #: translations\translations_branch.inc:67
@@ -1498,15 +1500,15 @@
 
 #: about\license.php:10
 msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
-msgstr ""
+msgstr "WinMerge is <a href=\"%1$s\">Open Source</a> software onder de <a href=\"%2$s\">GNU General Public License</a>."
 
 #: engine\page.inc:291
 msgid "WinMerge License"
-msgstr ""
+msgstr "WinMerge licentie"
 
 #: about\history.php:6
 msgid "WinMerge, history, version number, release date, manual, users guide"
-msgstr ""
+msgstr "WinMerge, geschiedenis, versienummer, vrijgave-datum, handleiding, gebruikersgids"
 
 #: downloads\index.php:10
 #: downloads\index.php:12


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

[Winmerge-svn] SF.net SVN: winmerge:[7003] trunk/Web/.htaccess

From: <ge...@us...> - 2009-10-12 10:56:20

Revision: 7003
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7003&view=rev
Author:   gerundt
Date:     2009-10-12 10:56:10 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
Web: Add expires dates to some file types

Modified Paths:
--------------
    trunk/Web/.htaccess

Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess	2009-10-11 12:15:17 UTC (rev 7002)
+++ trunk/Web/.htaccess	2009-10-12 10:56:10 UTC (rev 7003)
@@ -2,6 +2,31 @@
   CheckSpelling Off
 </IfModule>
 
+#Set expires dates...
+<IfModule mod_expires.c>
+  ExpiresActive on
+
+  #Icon files (1 month)...
+  ExpiresByType image/vnd.microsoft.icon "access plus 1 month"
+  ExpiresByType image/x-icon "access plus 1 month"
+
+  #Images files (7 days)...
+  ExpiresByType image/jpg "access plus 7 days"
+  ExpiresByType image/gif "access plus 7 days"
+  ExpiresByType image/jpeg "access plus 7 days"
+  ExpiresByType image/png "access plus 7 days"
+
+  #CSS files (3 days)...
+  ExpiresByType text/css "access plus 3 days"
+
+  #JavaScript files (3 days)...
+  ExpiresByType application/javascript "access plus 3 days"
+  ExpiresByType application/x-javascript "access plus 3 days"
+
+  #All other files (24 hours)...
+  ExpiresDefault "access plus 24 hours"
+</IfModule>
+
 ErrorDocument 404 /404.php
 
 <FilesMatch "\.inc$">


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

[Winmerge-svn] SF.net SVN: winmerge:[7002] trunk/Web/engine

From: <ge...@us...> - 2009-10-11 12:15:53

Revision: 7002
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7002&view=rev
Author:   gerundt
Date:     2009-10-11 12:15:17 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Web: Load delicious icon from own websever

Modified Paths:
--------------
    trunk/Web/engine/page.inc

Added Paths:
-----------
    trunk/Web/engine/images/delicious.small.gif

Added: trunk/Web/engine/images/delicious.small.gif
===================================================================
(Binary files differ)


Property changes on: trunk/Web/engine/images/delicious.small.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-10-11 12:04:38 UTC (rev 7001)
+++ trunk/Web/engine/page.inc	2009-10-11 12:15:17 UTC (rev 7002)
@@ -376,7 +376,7 @@
      */
     function getSocialBookmarks() {
       $temp = "<div id=\"bookmarks\">\n";
-      $temp .= "<img src=\"http://static.delicious.com/img/delicious.small.gif\" height=\"10\" width=\"10\" alt=\"Delicious\">\n";
+      $temp .= "<img src=\"/engine/images/delicious.small.gif\" height=\"10\" width=\"10\" alt=\"Delicious\">\n";
       $temp .= "<a href=\"http://delicious.com/save\" onclick=\"window.open('http://delicious.com/save?v=5&amp;noui&amp;jump=close&amp;url='+encodeURIComponent(location.href)+'&amp;title='+encodeURIComponent(document.title), 'delicious','toolbar=no,width=550,height=550'); return false;\"> " . __('Bookmark this on Delicious') . "</a>\n";
       $temp .= "</div> <!-- #bookmarks -->\n";
       return $temp;


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

[Winmerge-svn] SF.net SVN: winmerge:[7001] trunk/Web/engine/page.inc

From: <ge...@us...> - 2009-10-11 12:04:49

Revision: 7001
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7001&view=rev
Author:   gerundt
Date:     2009-10-11 12:04:38 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Web: Load JavaScript file only if necessary

Modified Paths:
--------------
    trunk/Web/engine/page.inc

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-10-07 11:40:48 UTC (rev 7000)
+++ trunk/Web/engine/page.inc	2009-10-11 12:04:38 UTC (rev 7001)
@@ -24,7 +24,8 @@
    */
   class Page {
     var $_title, $_charset;
-    var $_description, $_keywords, $_rssfeeds;
+    var $_description, $_keywords;
+    var $_javascript, $_rssfeeds;
     var $_tab;
     var $_stablerelease;
 
@@ -36,6 +37,7 @@
       $this->_charset = 'UTF-8';
       $this->_description = '';
       $this->_keywords = '';
+      $this->_javascript = false;
       $this->_rssfeeds = array();
       $this->_tab = TAB_HOME;
       /* _Stable Release */
@@ -81,6 +83,13 @@
     }
 
     /**
+     * enable/disable JacaScript from the page
+     */
+    function setJavaScript($value) {
+      $this->_javascript = $value;
+    }
+
+    /**
      * add RSS feed to the page head
      */
     function addRssFeed($url, $title = 'RSS') {
@@ -123,7 +132,9 @@
       }
       $temp .= "  <style type=\"text/css\" media=\"screen\">@import \"/engine/css/screen.css\";</style>\n";
       $temp .= "  <link rel=\"stylesheet\" type=\"text/css\" media=\"print\" href=\"/engine/css/print.css\">\n";
-      $temp .= "  <script src=\"/engine/javascript/winmerge.js\" type=\"text/javascript\"></script>\n";
+      if ($this->_javascript == true || $onload != '') { //if JavaScript is needed...
+        $temp .= "  <script src=\"/engine/javascript/winmerge.js\" type=\"text/javascript\"></script>\n";
+      }
       $temp .= "  <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/favicon.ico\">\n";
       foreach ($this->_rssfeeds as $rssurl => $rsstitle) { //for all RSS feeds...
         $temp .= "  <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n";


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

[Winmerge-svn] SF.net SVN: winmerge:[7000] trunk/Translations/Web/de.po

From: <ge...@us...> - 2009-10-07 11:40:58

Revision: 7000
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7000&view=rev
Author:   gerundt
Date:     2009-10-07 11:40:48 +0000 (Wed, 07 Oct 2009)

Log Message:
-----------
Fix funny typo in German website translation ;-)

Modified Paths:
--------------
    trunk/Translations/Web/de.po

Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po	2009-09-28 18:40:14 UTC (rev 6999)
+++ trunk/Translations/Web/de.po	2009-10-07 11:40:48 UTC (rev 7000)
@@ -25,12 +25,12 @@
 #: about\screenshots\index.php:26
 #, c-format
 msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
-msgstr ""
+msgstr "Oft ist es sinnvoll, genaue Unterschiede innerhalb von Linien zu sehen. WinMerge kann unterschiediche Bereiche zwischen den Linien hervorheben."
 
 #: 404.php:13
 #, c-format
 msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
-msgstr ""
+msgstr "Diese Seite wurde kürzlich einer großen Überarbeitung unterzogen, was erklären könnte, warum Sie diese Seite angezeigt bekommen."
 
 #: translations\index.php:36
 #, c-format
@@ -503,7 +503,7 @@
 #: index.php:20
 #, c-format
 msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
-msgstr "<a href=\"%1$s\">Mehr erfahren</a> oder <a href=\"%2$s\">jetzt herunterfahren!</a>"
+msgstr "<a href=\"%1$s\">Mehr erfahren</a> oder <a href=\"%2$s\">jetzt herunterladen!</a>"
 
 #: translations\index.php:11
 #, c-format
@@ -655,7 +655,7 @@
 #: links.php:35
 #, c-format
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Verschiedenes"
 
 #: support\index.php:38
 #, c-format
@@ -759,7 +759,7 @@
 #: links.php:24
 #, c-format
 msgid "Regular expressions"
-msgstr ""
+msgstr "Reguläre Ausdrücke"
 
 #: translations\translations_branch.inc:183
 #, c-format
@@ -972,7 +972,7 @@
 #: links.php:30
 #, c-format
 msgid "Tutorial"
-msgstr ""
+msgstr "Anleitung"
 
 #: about\index.php:78
 #, c-format
@@ -1761,7 +1761,7 @@
 #: engine\engine.inc:22
 #, c-format
 msgid "Japanese"
-msgstr ""
+msgstr "Japanisch"
 
 #: downloads\source-code.php:7
 #: downloads\source-code.php:10


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

[Winmerge-svn] SF.net SVN: winmerge:[6999] trunk/Translations/Web

From: <ge...@us...> - 2009-09-28 18:40:23

Revision: 6999
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6999&view=rev
Author:   gerundt
Date:     2009-09-28 18:40:14 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
Update web PO(T) files

Modified Paths:
--------------
    trunk/Translations/Web/de.po
    trunk/Translations/Web/en-US.pot
    trunk/Translations/Web/fr.po
    trunk/Translations/Web/ja.po
    trunk/Translations/Web/nl.po
    trunk/Translations/Web/se.po

Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po	2009-09-28 18:33:49 UTC (rev 6998)
+++ trunk/Translations/Web/de.po	2009-09-28 18:40:14 UTC (rev 6999)
@@ -57,6 +57,11 @@
 msgid "Open Source Software"
 msgstr "Open-Source-Software"
 
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr "Viel Verkehr"
+
 #: index.php:13
 #, c-format
 msgid "What is WinMerge?"
@@ -100,6 +105,11 @@
 msgid "Template"
 msgstr "Vorlage"
 
+#: links.php:27
+#, c-format
+msgid "Good site devoted for regular expressions"
+msgstr ""
+
 #: index.php:45
 #, c-format
 msgid "Developers"
@@ -167,9 +177,9 @@
 msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 msgstr "WinMerge, Frei, Download, Plugins, Plugin, Plug-In, Setup, Installer, Binärdateien, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 
-#: translations\index.php:37
+#: links.php:31
 #, c-format
-msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgid "Regular expressions tutorial"
 msgstr ""
 
 #: support\tracker-shortcuts.php:55
@@ -208,12 +218,10 @@
 msgid "Low Traffic"
 msgstr "Wenig Verkehr"
 
-#: about\history.php:7
-#: about\history.php:9
-#: engine\page.inc:290
+#: about\index.php:27
 #, c-format
-msgid "History"
-msgstr "Historie"
+msgid "File Compare"
+msgstr "Dateivergleich"
 
 #: support\mailing-lists.php:27
 #, c-format
@@ -225,6 +233,11 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr "<a href=\"%s\">Dokumentation</a>?"
 
+#: engine\page.inc:317
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr "WinMerge Übersetzungsanleitung"
+
 #: downloads\pad-file.php:78
 #, c-format
 msgid "Icon"
@@ -340,6 +353,11 @@
 msgid "Binaries"
 msgstr "Binärdateien"
 
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr "Die Versionshinweise sind derzeit nicht verfügbar..."
+
 #: engine\page.inc:297
 #, c-format
 msgid "WinMerge Known Issues"
@@ -360,6 +378,7 @@
 msgid "This list is used for coordinating the translations."
 msgstr "Diese Liste wird für die Koordinierung der Übersetzungen verwendet."
 
+#: links.php:6
 #: about\license.php:30
 #: engine\page.inc:284
 #, c-format
@@ -376,17 +395,15 @@
 msgid "Support Request"
 msgstr "Support-Anfrage"
 
-#: support\mailing-lists.php:17
-#: support\mailing-lists.php:70
+#: links.php:18
 #, c-format
-msgid "SVN List"
-msgstr "SVN-Liste"
+msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
+msgstr ""
 
-#: translations\translations.inc:132
-#: translations\translations_branch.inc:67
+#: links.php:22
 #, c-format
-msgid "Graph"
-msgstr "Diagramm"
+msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
+msgstr ""
 
 #: support\tracker-shortcuts.php:16
 #, c-format
@@ -464,7 +481,7 @@
 msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
 msgstr "Wünsche auf der <a href=\"%s\">Funktionsanfragen-Liste</a> werden auch in Betracht gezogen, aber wir machen keinerlei Versprechen."
 
-#: engine\engine.inc:23
+#: engine\engine.inc:24
 #, c-format
 msgid "Swedish"
 msgstr "Schwedisch"
@@ -532,13 +549,21 @@
 msgid "Tracker"
 msgstr "Tracker"
 
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
 #, c-format
-msgid "Folder Comparison Results"
-msgstr "Ordnervergleichs-Ergebnisse"
+msgid "Change Log"
+msgstr "Versionshistorie"
 
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr "Fehler"
+
+#: links.php:43
 #: downloads\index.php:69
 #, c-format
 msgid "WinMerge Portable"
@@ -560,16 +585,21 @@
 msgid "Were you looking for..."
 msgstr "Suchten Sie..."
 
-#: downloads\index.php:8
+#: about\index.php:19
 #, c-format
-msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
-msgstr "WinMerge, Frei, Download, Windows, Setup, Installer, Binärdateien, Laufzeitbibliotheken, Stabil, Beta, Experimentell, Portable"
+msgid "General"
+msgstr "Allgemein"
 
 #: downloads\pad-file.php:48
 #, c-format
 msgid "Type"
 msgstr "Typ"
 
+#: links.php:40
+#, c-format
+msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
+msgstr ""
+
 #: engine\page.inc:299
 #, c-format
 msgid "WinMerge Development Wiki"
@@ -595,10 +625,10 @@
 msgid "Page Not Found..."
 msgstr "Seite nicht gefunden..."
 
-#: support\index.php:16
+#: links.php:29
 #, c-format
-msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
-msgstr "Sie müssen Sich bei <a href=\"%s\">SourceForge.net kostenlos registrieren</a>, bevor Sie einen Fehlerbericht einreichen können."
+msgid "Good HOWTO document for regular expressions"
+msgstr ""
 
 #: index.php:16
 #, c-format
@@ -622,11 +652,22 @@
 msgid "Translations"
 msgstr "Übersetzungen"
 
+#: links.php:35
+#, c-format
+msgid "Miscellaneous"
+msgstr ""
+
 #: support\index.php:38
 #, c-format
 msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
 msgstr "Da WinMerge ein <a href=\"%s\">Open-Source</a>-Projekt ist, können Sie es kostenlos verwenden."
 
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr "Übersetzt: %d%%"
+
 #: engine\page.inc:285
 #, c-format
 msgid "Project Page"
@@ -715,6 +756,11 @@
 msgid "Tracker Item"
 msgstr "Tracker-Eintrag"
 
+#: links.php:24
+#, c-format
+msgid "Regular expressions"
+msgstr ""
+
 #: translations\translations_branch.inc:183
 #, c-format
 msgid "Translator(s)"
@@ -745,10 +791,10 @@
 msgid "Project News"
 msgstr "Projekt-Neuigkeiten"
 
-#: docs\index.php:13
+#: links.php:20
 #, c-format
-msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
-msgstr "Die <a href=\"%1$s\">Versionshinweise</a> sind eine kurze Zusammenfassung der wichtigsten Änderungen, Verbesserungen, Fehlerbereinigungen und <a href=\"%2$s\">bekannten Problemen</a> in der aktuellen Version von WinMerge."
+msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
+msgstr ""
 
 #: about\license.php:6
 #, c-format
@@ -771,10 +817,10 @@
 msgid "Version %1$s; %2$s MB"
 msgstr "Version %1$s; %2$s MB"
 
-#: docs\releasenotes.php:11
+#: links.php:42
 #, c-format
-msgid "The release notes are currently not available..."
-msgstr "Die Versionshinweise sind derzeit nicht verfügbar..."
+msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
+msgstr ""
 
 #: support\tracker-shortcuts.php:23
 #, c-format
@@ -786,9 +832,9 @@
 msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
 msgstr ""
 
-#: support\index.php:6
+#: links.php:38
 #, c-format
-msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
 msgstr ""
 
 #: downloads\plugins.php:32
@@ -851,11 +897,10 @@
 msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
 msgstr "Abonnenten dieser Liste erhalten Nachrichten über jede Quelltext-Änderung im Subversion-Repository."
 
-#: support\mailing-lists.php:14
-#: support\mailing-lists.php:40
+#: links.php:44
 #, c-format
-msgid "User List"
-msgstr "Benutzer-Liste"
+msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
+msgstr ""
 
 #: index.php:47
 #, c-format
@@ -924,10 +969,10 @@
 msgid "Screenshots"
 msgstr "Screenshots"
 
-#: engine\page.inc:290
+#: links.php:30
 #, c-format
-msgid "WinMerge History"
-msgstr "WinMerge Historie"
+msgid "Tutorial"
+msgstr ""
 
 #: about\index.php:78
 #, c-format
@@ -1050,11 +1095,10 @@
 msgid "Version Control"
 msgstr "Versionskontrolle"
 
-#: translations\translations.inc:81
-#: translations\translations_branch.inc:49
+#: support\index.php:6
 #, c-format
-msgid "Translated: %d%%"
-msgstr "Übersetzt: %d%%"
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr ""
 
 #: about\screenshots\index.php:30
 #: about\screenshots\index.php:31
@@ -1151,16 +1195,22 @@
 msgid "The translations instructions are currently not available..."
 msgstr "Der Übersetzungs-Status ist derzeit nicht verfügbar..."
 
-#: support\tracker-shortcuts.php:13
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
 #, c-format
-msgid "Bug"
-msgstr "Fehler"
+msgid "SVN List"
+msgstr "SVN-Liste"
 
 #: downloads\plugins.php:31
 #, c-format
 msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
 msgstr "Mit diesem Plugin können Sie Word-, Excel-, PowerPoint- und PDF-Dateien vergleichen, sowie einige Formate mehr."
 
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr "Sie müssen Sich bei <a href=\"%s\">SourceForge.net kostenlos registrieren</a>, bevor Sie einen Fehlerbericht einreichen können."
+
 #: downloads\source-code.php:6
 #, c-format
 msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1248,15 +1298,10 @@
 msgid "Translators"
 msgstr "Übersetzer"
 
-#: translations\translations.inc:83
-#: translations\translations.inc:96
-#: translations\translations.inc:134
-#: translations\translations_branch.inc:51
-#: translations\translations_branch.inc:69
-#: translations\translations_branch.inc:119
+#: links.php:28
 #, c-format
-msgid "Fuzzy"
-msgstr "Unklar"
+msgid "regex HOWTO"
+msgstr ""
 
 #: docs\index.php:6
 #, c-format
@@ -1285,10 +1330,12 @@
 msgid "<a href=\"%s\">Change Log</a>?"
 msgstr "<a href=\"%s\">Versionshistorie</a>?"
 
-#: about\index.php:27
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
 #, c-format
-msgid "File Compare"
-msgstr "Dateivergleich"
+msgid "History"
+msgstr "Historie"
 
 #: support\tracker-shortcuts.php:41
 #, c-format
@@ -1326,10 +1373,10 @@
 msgid "WinMerge Home"
 msgstr "WinMerge Home"
 
-#: about\index.php:19
+#: links.php:33
 #, c-format
-msgid "General"
-msgstr "Allgemein"
+msgid "PDF quick reference"
+msgstr ""
 
 #: docs\index.php:11
 #, c-format
@@ -1372,14 +1419,12 @@
 msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
 msgstr ""
 
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
 #, c-format
-msgid "Change Log"
-msgstr "Versionshistorie"
+msgid "Folder Comparison Results"
+msgstr "Ordnervergleichs-Ergebnisse"
 
 #: support\tracker-shortcuts.php:37
 #, c-format
@@ -1432,6 +1477,11 @@
 msgid "GNU General Public License"
 msgstr "GNU General Public License"
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr "Die <a href=\"%1$s\">Versionshinweise</a> sind eine kurze Zusammenfassung der wichtigsten Änderungen, Verbesserungen, Fehlerbereinigungen und <a href=\"%2$s\">bekannten Problemen</a> in der aktuellen Version von WinMerge."
+
 #: translations\translations.inc:85
 #: translations\translations.inc:97
 #: translations\translations.inc:135
@@ -1471,16 +1521,27 @@
 msgid "Other"
 msgstr "Weitere"
 
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "Benutzer-Liste"
+
 #: 404.php:27
 #, c-format
 msgid "<a href=\"%s\">Support</a>?"
 msgstr "<a href=\"%s\">Support</a>?"
 
-#: engine\engine.inc:22
+#: engine\engine.inc:23
 #, c-format
 msgid "Dutch"
 msgstr "Niederländisch"
 
+#: links.php:7
+#, c-format
+msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
+msgstr ""
+
 #: support\index.php:7
 #, c-format
 msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
@@ -1491,21 +1552,36 @@
 msgid "Runtimes"
 msgstr "Laufzeitbibliotheken"
 
+#: translations\index.php:37
+#, c-format
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr ""
+
 #: about\index.php:49
 #, c-format
 msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
 msgstr "Rudimentäre <em>Visual SourceSafe</em>- und <em>Rational ClearCase</em>-Integration"
 
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+#, c-format
+msgid "Fuzzy"
+msgstr "Unklar"
+
 #: translations\translations.inc:180
 #: translations\translations_branch.inc:106
 #, c-format
 msgid "Total: %d"
 msgstr "Gesamt: %d"
 
-#: support\mailing-lists.php:72
+#: downloads\index.php:8
 #, c-format
-msgid "High Traffic"
-msgstr "Viel Verkehr"
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr "WinMerge, Frei, Download, Windows, Setup, Installer, Binärdateien, Laufzeitbibliotheken, Stabil, Beta, Experimentell, Portable"
 
 #: 404.php:18
 #, c-format
@@ -1630,10 +1706,10 @@
 msgid "Release Notes"
 msgstr "Versionshinweise"
 
-#: engine\page.inc:317
+#: links.php:16
 #, c-format
-msgid "WinMerge Translations Instructions"
-msgstr "WinMerge Übersetzungsanleitung"
+msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
+msgstr ""
 
 #: engine\page.inc:296
 #, c-format
@@ -1666,12 +1742,27 @@
 msgid "View all file releases&hellip;"
 msgstr "Alle Dateifreigaben ansehen&hellip;"
 
+#: links.php:14
+#, c-format
+msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
+msgstr ""
+
+#: links.php:12
+#, c-format
+msgid "<b>7-Zip</b> is a file archiver with high compression ratio."
+msgstr ""
+
 #: about\index.php:5
 #: about\index.php:12
 #, c-format
 msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
 msgstr ""
 
+#: engine\engine.inc:22
+#, c-format
+msgid "Japanese"
+msgstr ""
+
 #: downloads\source-code.php:7
 #: downloads\source-code.php:10
 #, c-format
@@ -1699,6 +1790,17 @@
 msgid "Moved lines detection"
 msgstr "Erkennung von verschobenen Zeilen"
 
+#: engine\page.inc:290
+#, c-format
+msgid "WinMerge History"
+msgstr "WinMerge Historie"
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr "Diagramm"
+
 #: downloads\index.php:69
 #, c-format
 msgid "(by PortableApps.com)"
@@ -1726,6 +1828,11 @@
 msgid "Download WinMerge"
 msgstr "WinMerge herunterladen"
 
+#: links.php:9
+#, c-format
+msgid "Tools"
+msgstr ""
+
 #: engine\page.inc:369
 #, c-format
 msgid "Bookmark this on Delicious"
@@ -1741,6 +1848,3 @@
 msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
 msgstr ""
 
-#~ msgid "Total: %s"
-#~ msgstr "Gesamt: %s"
-

Modified: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot	2009-09-28 18:33:49 UTC (rev 6998)
+++ trunk/Translations/Web/en-US.pot	2009-09-28 18:40:14 UTC (rev 6999)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: 2009-08-29 17:42+0000\n"
+"POT-Creation-Date: 2009-09-28 20:35+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -54,6 +54,11 @@
 msgid "Open Source Software"
 msgstr ""
 
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr ""
+
 #: index.php:13
 #, c-format
 msgid "What is WinMerge?"
@@ -97,6 +102,11 @@
 msgid "Template"
 msgstr ""
 
+#: links.php:27
+#, c-format
+msgid "Good site devoted for regular expressions"
+msgstr ""
+
 #: index.php:45
 #, c-format
 msgid "Developers"
@@ -164,9 +174,9 @@
 msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 msgstr ""
 
-#: translations\index.php:37
+#: links.php:31
 #, c-format
-msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgid "Regular expressions tutorial"
 msgstr ""
 
 #: support\tracker-shortcuts.php:55
@@ -205,11 +215,9 @@
 msgid "Low Traffic"
 msgstr ""
 
-#: about\history.php:7
-#: about\history.php:9
-#: engine\page.inc:290
+#: about\index.php:27
 #, c-format
-msgid "History"
+msgid "File Compare"
 msgstr ""
 
 #: support\mailing-lists.php:27
@@ -222,6 +230,11 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr ""
 
+#: engine\page.inc:317
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr ""
+
 #: downloads\pad-file.php:78
 #, c-format
 msgid "Icon"
@@ -337,6 +350,11 @@
 msgid "Binaries"
 msgstr ""
 
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr ""
+
 #: engine\page.inc:297
 #, c-format
 msgid "WinMerge Known Issues"
@@ -357,6 +375,7 @@
 msgid "This list is used for coordinating the translations."
 msgstr ""
 
+#: links.php:6
 #: about\license.php:30
 #: engine\page.inc:284
 #, c-format
@@ -373,16 +392,14 @@
 msgid "Support Request"
 msgstr ""
 
-#: support\mailing-lists.php:17
-#: support\mailing-lists.php:70
+#: links.php:18
 #, c-format
-msgid "SVN List"
+msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
 msgstr ""
 
-#: translations\translations.inc:132
-#: translations\translations_branch.inc:67
+#: links.php:22
 #, c-format
-msgid "Graph"
+msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
 msgstr ""
 
 #: support\tracker-shortcuts.php:16
@@ -461,7 +478,7 @@
 msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
 msgstr ""
 
-#: engine\engine.inc:23
+#: engine\engine.inc:24
 #, c-format
 msgid "Swedish"
 msgstr ""
@@ -529,13 +546,21 @@
 msgid "Tracker"
 msgstr ""
 
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
 #, c-format
-msgid "Folder Comparison Results"
+msgid "Change Log"
 msgstr ""
 
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr ""
+
+#: links.php:43
 #: downloads\index.php:69
 #, c-format
 msgid "WinMerge Portable"
@@ -557,9 +582,9 @@
 msgid "Were you looking for..."
 msgstr ""
 
-#: downloads\index.php:8
+#: about\index.php:19
 #, c-format
-msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgid "General"
 msgstr ""
 
 #: downloads\pad-file.php:48
@@ -567,6 +592,11 @@
 msgid "Type"
 msgstr ""
 
+#: links.php:40
+#, c-format
+msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
+msgstr ""
+
 #: engine\page.inc:299
 #, c-format
 msgid "WinMerge Development Wiki"
@@ -592,9 +622,9 @@
 msgid "Page Not Found..."
 msgstr ""
 
-#: support\index.php:16
+#: links.php:29
 #, c-format
-msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgid "Good HOWTO document for regular expressions"
 msgstr ""
 
 #: index.php:16
@@ -619,11 +649,22 @@
 msgid "Translations"
 msgstr ""
 
+#: links.php:35
+#, c-format
+msgid "Miscellaneous"
+msgstr ""
+
 #: support\index.php:38
 #, c-format
 msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
 msgstr ""
 
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr ""
+
 #: engine\page.inc:285
 #, c-format
 msgid "Project Page"
@@ -712,6 +753,11 @@
 msgid "Tracker Item"
 msgstr ""
 
+#: links.php:24
+#, c-format
+msgid "Regular expressions"
+msgstr ""
+
 #: translations\translations_branch.inc:183
 #, c-format
 msgid "Translator(s)"
@@ -742,9 +788,9 @@
 msgid "Project News"
 msgstr ""
 
-#: docs\index.php:13
+#: links.php:20
 #, c-format
-msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
 msgstr ""
 
 #: about\license.php:6
@@ -768,9 +814,9 @@
 msgid "Version %1$s; %2$s MB"
 msgstr ""
 
-#: docs\releasenotes.php:11
+#: links.php:42
 #, c-format
-msgid "The release notes are currently not available..."
+msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
 msgstr ""
 
 #: support\tracker-shortcuts.php:23
@@ -783,9 +829,9 @@
 msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
 msgstr ""
 
-#: support\index.php:6
+#: links.php:38
 #, c-format
-msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
 msgstr ""
 
 #: downloads\plugins.php:32
@@ -848,10 +894,9 @@
 msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
 msgstr ""
 
-#: support\mailing-lists.php:14
-#: support\mailing-lists.php:40
+#: links.php:44
 #, c-format
-msgid "User List"
+msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
 msgstr ""
 
 #: index.php:47
@@ -921,9 +966,9 @@
 msgid "Screenshots"
 msgstr ""
 
-#: engine\page.inc:290
+#: links.php:30
 #, c-format
-msgid "WinMerge History"
+msgid "Tutorial"
 msgstr ""
 
 #: about\index.php:78
@@ -1047,10 +1092,9 @@
 msgid "Version Control"
 msgstr ""
 
-#: translations\translations.inc:81
-#: translations\translations_branch.inc:49
+#: support\index.php:6
 #, c-format
-msgid "Translated: %d%%"
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
 msgstr ""
 
 #: about\screenshots\index.php:30
@@ -1148,9 +1192,10 @@
 msgid "The translations instructions are currently not available..."
 msgstr ""
 
-#: support\tracker-shortcuts.php:13
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
 #, c-format
-msgid "Bug"
+msgid "SVN List"
 msgstr ""
 
 #: downloads\plugins.php:31
@@ -1158,6 +1203,11 @@
 msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
 msgstr ""
 
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr ""
+
 #: downloads\source-code.php:6
 #, c-format
 msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1245,14 +1295,9 @@
 msgid "Translators"
 msgstr ""
 
-#: translations\translations.inc:83
-#: translations\translations.inc:96
-#: translations\translations.inc:134
-#: translations\translations_branch.inc:51
-#: translations\translations_branch.inc:69
-#: translations\translations_branch.inc:119
+#: links.php:28
 #, c-format
-msgid "Fuzzy"
+msgid "regex HOWTO"
 msgstr ""
 
 #: docs\index.php:6
@@ -1280,9 +1325,11 @@
 msgid "<a href=\"%s\">Change Log</a>?"
 msgstr ""
 
-#: about\index.php:27
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
 #, c-format
-msgid "File Compare"
+msgid "History"
 msgstr ""
 
 #: support\tracker-shortcuts.php:41
@@ -1321,9 +1368,9 @@
 msgid "WinMerge Home"
 msgstr ""
 
-#: about\index.php:19
+#: links.php:33
 #, c-format
-msgid "General"
+msgid "PDF quick reference"
 msgstr ""
 
 #: docs\index.php:11
@@ -1367,13 +1414,11 @@
 msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
 msgstr ""
 
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
 #, c-format
-msgid "Change Log"
+msgid "Folder Comparison Results"
 msgstr ""
 
 #: support\tracker-shortcuts.php:37
@@ -1427,6 +1472,11 @@
 msgid "GNU General Public License"
 msgstr ""
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr ""
+
 #: translations\translations.inc:85
 #: translations\translations.inc:97
 #: translations\translations.inc:135
@@ -1466,16 +1516,27 @@
 msgid "Other"
 msgstr ""
 
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr ""
+
 #: 404.php:27
 #, c-format
 msgid "<a href=\"%s\">Support</a>?"
 msgstr ""
 
-#: engine\engine.inc:22
+#: engine\engine.inc:23
 #, c-format
 msgid "Dutch"
 msgstr ""
 
+#: links.php:7
+#, c-format
+msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
+msgstr ""
+
 #: support\index.php:7
 #, c-format
 msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
@@ -1486,20 +1547,35 @@
 msgid "Runtimes"
 msgstr ""
 
+#: translations\index.php:37
+#, c-format
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr ""
+
 #: about\index.php:49
 #, c-format
 msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
 msgstr ""
 
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+#, c-format
+msgid "Fuzzy"
+msgstr ""
+
 #: translations\translations.inc:180
 #: translations\translations_branch.inc:106
 #, c-format
 msgid "Total: %d"
 msgstr ""
 
-#: support\mailing-lists.php:72
+#: downloads\index.php:8
 #, c-format
-msgid "High Traffic"
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
 msgstr ""
 
 #: 404.php:18
@@ -1625,9 +1701,9 @@
 msgid "Release Notes"
 msgstr ""
 
-#: engine\page.inc:317
+#: links.php:16
 #, c-format
-msgid "WinMerge Translations Instructions"
+msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
 msgstr ""
 
 #: engine\page.inc:296
@@ -1661,12 +1737,27 @@
 msgid "View all file releases&hellip;"
 msgstr ""
 
+#: links.php:14
+#, c-format
+msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
+msgstr ""
+
+#: links.php:12
+#, c-format
+msgid "<b>7-Zip</b> is a file archiver with high compression ratio."
+msgstr ""
+
 #: about\index.php:5
 #: about\index.php:12
 #, c-format
 msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
 msgstr ""
 
+#: engine\engine.inc:22
+#, c-format
+msgid "Japanese"
+msgstr ""
+
 #: downloads\source-code.php:7
 #: downloads\source-code.php:10
 #, c-format
@@ -1694,6 +1785,17 @@
 msgid "Moved lines detection"
 msgstr ""
 
+#: engine\page.inc:290
+#, c-format
+msgid "WinMerge History"
+msgstr ""
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr ""
+
 #: downloads\index.php:69
 #, c-format
 msgid "(by PortableApps.com)"
@@ -1721,6 +1823,11 @@
 msgid "Download WinMerge"
 msgstr ""
 
+#: links.php:9
+#, c-format
+msgid "Tools"
+msgstr ""
+
 #: engine\page.inc:369
 #, c-format
 msgid "Bookmark this on Delicious"

Modified: trunk/Translations/Web/fr.po
===================================================================
--- trunk/Translations/Web/fr.po	2009-09-28 18:33:49 UTC (rev 6998)
+++ trunk/Translations/Web/fr.po	2009-09-28 18:40:14 UTC (rev 6999)
@@ -57,6 +57,11 @@
 msgid "Open Source Software"
 msgstr "Logiciel open source"
 
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr "Trafic élevé"
+
 #: index.php:13
 #, c-format
 msgid "What is WinMerge?"
@@ -100,6 +105,11 @@
 msgid "Template"
 msgstr "Modèle"
 
+#: links.php:27
+#, c-format
+msgid "Good site devoted for regular expressions"
+msgstr ""
+
 #: index.php:45
 #, c-format
 msgid "Developers"
@@ -167,10 +177,10 @@
 msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 msgstr "Winmerge, libre télécharger, plugins, plugin, plug-in, installation, installeur, binaires, 7-zip, xdocdiff, Word, Excel, Powerpoint, PDF"
 
-#: translations\index.php:37
+#: links.php:31
 #, c-format
-msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
-msgstr "Les deux pages suivantes vous informent sur le statut des traduction des versions stables et développeur de Winmerge:"
+msgid "Regular expressions tutorial"
+msgstr ""
 
 #: support\tracker-shortcuts.php:55
 #, c-format
@@ -208,12 +218,10 @@
 msgid "Low Traffic"
 msgstr "Trafic faible"
 
-#: about\history.php:7
-#: about\history.php:9
-#: engine\page.inc:290
+#: about\index.php:27
 #, c-format
-msgid "History"
-msgstr "Historique"
+msgid "File Compare"
+msgstr "Comparer les fichiers"
 
 #: support\mailing-lists.php:27
 #, c-format
@@ -225,6 +233,11 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr "<a href=\"%s\">Documentation</a>?"
 
+#: engine\page.inc:317
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr "Instructions de traductions de Winmerge"
+
 #: downloads\pad-file.php:78
 #, c-format
 msgid "Icon"
@@ -340,6 +353,11 @@
 msgid "Binaries"
 msgstr "Binaires"
 
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr "Les notes de version sont actuellement indisponibles..."
+
 #: engine\page.inc:297
 #, c-format
 msgid "WinMerge Known Issues"
@@ -360,6 +378,7 @@
 msgid "This list is used for coordinating the translations."
 msgstr "La liste est utilisée pour la coordination des traductions."
 
+#: links.php:6
 #: about\license.php:30
 #: engine\page.inc:284
 #, c-format
@@ -376,17 +395,15 @@
 msgid "Support Request"
 msgstr "Requête de support"
 
-#: support\mailing-lists.php:17
-#: support\mailing-lists.php:70
+#: links.php:18
 #, c-format
-msgid "SVN List"
-msgstr "Liste SVN"
+msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
+msgstr ""
 
-#: translations\translations.inc:132
-#: translations\translations_branch.inc:67
+#: links.php:22
 #, c-format
-msgid "Graph"
-msgstr "Graphe"
+msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
+msgstr ""
 
 #: support\tracker-shortcuts.php:16
 #, c-format
@@ -464,7 +481,7 @@
 msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
 msgstr "Les objets de la liste des voeux <a href=\"%s\">fonction liste des requêtes</a>  seront également considérés, mais nous ne faisons absolument aucune promesse."
 
-#: engine\engine.inc:23
+#: engine\engine.inc:24
 #, c-format
 msgid "Swedish"
 msgstr "Suédois"
@@ -532,13 +549,21 @@
 msgid "Tracker"
 msgstr "Traqueur"
 
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
 #, c-format
-msgid "Folder Comparison Results"
-msgstr "Résultats de la comparaison des dossiers"
+msgid "Change Log"
+msgstr "Journal des changements"
 
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr "Bogue"
+
+#: links.php:43
 #: downloads\index.php:69
 #, c-format
 msgid "WinMerge Portable"
@@ -560,16 +585,21 @@
 msgid "Were you looking for..."
 msgstr "Nous recherchons..."
 
-#: downloads\index.php:8
+#: about\index.php:19
 #, c-format
-msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
-msgstr "WinMerge, libre, télécharger, Windows, installation, installeur, binaires, runtimes, stable, beta, expérimental, portable"
+msgid "General"
+msgstr "Général"
 
 #: downloads\pad-file.php:48
 #, c-format
 msgid "Type"
 msgstr "Type"
 
+#: links.php:40
+#, c-format
+msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
+msgstr ""
+
 #: engine\page.inc:299
 #, c-format
 msgid "WinMerge Development Wiki"
@@ -595,10 +625,10 @@
 msgid "Page Not Found..."
 msgstr "Page non trouvée..."
 
-#: support\index.php:16
+#: links.php:29
 #, c-format
-msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
-msgstr "Vous devez <a href=\"%s\">vous enregistrer auprés de SourceForge.net</a> avant de poster un rapport de bogue (l'enregistrement est gratuit)."
+msgid "Good HOWTO document for regular expressions"
+msgstr ""
 
 #: index.php:16
 #, c-format
@@ -622,11 +652,22 @@
 msgid "Translations"
 msgstr "Traductions"
 
+#: links.php:35
+#, c-format
+msgid "Miscellaneous"
+msgstr ""
+
 #: support\index.php:38
 #, c-format
 msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
 msgstr "Depuis que Winmerge est un projet <a href=\"%s\">Open Source</a> , vous pouvez l'utiliser gratuitement."
 
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr "Traduit: %d%%"
+
 #: engine\page.inc:285
 #, c-format
 msgid "Project Page"
@@ -715,6 +756,11 @@
 msgid "Tracker Item"
 msgstr "Traqueur d'objet"
 
+#: links.php:24
+#, c-format
+msgid "Regular expressions"
+msgstr ""
+
 #: translations\translations_branch.inc:183
 #, c-format
 msgid "Translator(s)"
@@ -745,10 +791,10 @@
 msgid "Project News"
 msgstr "Nouvelles du projet"
 
-#: docs\index.php:13
+#: links.php:20
 #, c-format
-msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
-msgstr "Les <a href=\"%1$s\">notes de version</a> sont un court résumé des changements importants, améliorations, corrections de bogues et <a href=\"%2$s\">problèmes connus</a> dans la version actuelle de WinMerge."
+msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
+msgstr ""
 
 #: about\license.php:6
 #, c-format
@@ -771,10 +817,10 @@
 msgid "Version %1$s; %2$s MB"
 msgstr "Version %1$s; %2$s MB"
 
-#: docs\releasenotes.php:11
+#: links.php:42
 #, c-format
-msgid "The release notes are currently not available..."
-msgstr "Les notes de version sont actuellement indisponibles..."
+msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
+msgstr ""
 
 #: support\tracker-shortcuts.php:23
 #, c-format
@@ -786,10 +832,10 @@
 msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
 msgstr "WinMerge, traqueur, raccourcis, sourceforge, page projet, bogue, patch, requête de support, requête de fonction, objet \"à faire\""
 
-#: support\index.php:6
+#: links.php:38
 #, c-format
-msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
-msgstr "Le forum de discussion du libre est la manière la plus rapide d'obtenir de l'aide. Une aure manière est l'inscription à une liste de mailing."
+msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
+msgstr ""
 
 #: downloads\plugins.php:32
 #, c-format
@@ -851,11 +897,10 @@
 msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
 msgstr "Les souscripteurs à cette liste obtiennent des informations sur chacun et tous les changements du code intervenus dans la sous-version."
 
-#: support\mailing-lists.php:14
-#: support\mailing-lists.php:40
+#: links.php:44
 #, c-format
-msgid "User List"
-msgstr "Liste utilisateur"
+msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
+msgstr ""
 
 #: index.php:47
 #, c-format
@@ -924,10 +969,10 @@
 msgid "Screenshots"
 msgstr "Captures d'écrans"
 
-#: engine\page.inc:290
+#: links.php:30
 #, c-format
-msgid "WinMerge History"
-msgstr "Historique de Winmerge"
+msgid "Tutorial"
+msgstr ""
 
 #: about\index.php:78
 #, c-format
@@ -1050,11 +1095,10 @@
 msgid "Version Control"
 msgstr "Contrôle de la version"
 
-#: translations\translations.inc:81
-#: translations\translations_branch.inc:49
+#: support\index.php:6
 #, c-format
-msgid "Translated: %d%%"
-msgstr "Traduit: %d%%"
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr "Le forum de discussion du libre est la manière la plus rapide d'obtenir de l'aide. Une aure manière est l'inscription à une liste de mailing."
 
 #: about\screenshots\index.php:30
 #: about\screenshots\index.php:31
@@ -1151,16 +1195,22 @@
 msgid "The translations instructions are currently not available..."
 msgstr "Les instructions de traduction sont actuellement indisponibles..."
 
-#: support\tracker-shortcuts.php:13
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
 #, c-format
-msgid "Bug"
-msgstr "Bogue"
+msgid "SVN List"
+msgstr "Liste SVN"
 
 #: downloads\plugins.php:31
 #, c-format
 msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
 msgstr "Avec ce plugin vous pouvez comparer Word, Excel, Powerpoint, PDF et quelques autres fichiers."
 
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr "Vous devez <a href=\"%s\">vous enregistrer auprés de SourceForge.net</a> avant de poster un rapport de bogue (l'enregistrement est gratuit)."
+
 #: downloads\source-code.php:6
 #, c-format
 msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1248,15 +1298,10 @@
 msgid "Translators"
 msgstr "traducteurs"
 
-#: translations\translations.inc:83
-#: translations\translations.inc:96
-#: translations\translations.inc:134
-#: translations\translations_branch.inc:51
-#: translations\translations_branch.inc:69
-#: translations\translations_branch.inc:119
+#: links.php:28
 #, c-format
-msgid "Fuzzy"
-msgstr "Flou"
+msgid "regex HOWTO"
+msgstr ""
 
 #: docs\index.php:6
 #, c-format
@@ -1287,10 +1332,12 @@
 msgid "<a href=\"%s\">Change Log</a>?"
 msgstr "<a href=\"%s\">Journal des changements</a>?"
 
-#: about\index.php:27
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
 #, c-format
-msgid "File Compare"
-msgstr "Comparer les fichiers"
+msgid "History"
+msgstr "Historique"
 
 #: support\tracker-shortcuts.php:41
 #, c-format
@@ -1328,10 +1375,10 @@
 msgid "WinMerge Home"
 msgstr "Page d'accueil de Winmerge"
 
-#: about\index.php:19
+#: links.php:33
 #, c-format
-msgid "General"
-msgstr "Général"
+msgid "PDF quick reference"
+msgstr ""
 
 #: docs\index.php:11
 #, c-format
@@ -1374,14 +1421,12 @@
 msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
 msgstr "WinMerge, listes de mailing, annonce, support, utilisateur, traduction, développement, SVN"
 
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
 #, c-format
-msgid "Change Log"
-msgstr "Journal des changements"
+msgid "Folder Comparison Results"
+msgstr "Résultats de la comparaison des dossiers"
 
 #: support\tracker-shortcuts.php:37
 #, c-format
@@ -1434,6 +1479,11 @@
 msgid "GNU General Public License"
 msgstr "GNU Licence Générale Publique"
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr "Les <a href=\"%1$s\">notes de version</a> sont un court résumé des changements importants, améliorations, corrections de bogues et <a href=\"%2$s\">problèmes connus</a> dans la version actuelle de WinMerge."
+
 #: translations\translations.inc:85
 #: translations\translations.inc:97
 #: translations\translations.inc:135
@@ -1473,16 +1523,27 @@
 msgid "Other"
 msgstr "Autres"
 
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "Liste utilisateur"
+
 #: 404.php:27
 #, c-format
 msgid "<a href=\"%s\">Support</a>?"
 msgstr "<a href=\"%s\">Support</a>?"
 
-#: engine\engine.inc:22
+#: engine\engine.inc:23
 #, c-format
 msgid "Dutch"
 msgstr "Hollandais"
 
+#: links.php:7
+#, c-format
+msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
+msgstr ""
+
 #: support\index.php:7
 #, c-format
 msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
@@ -1493,21 +1554,36 @@
 msgid "Runtimes"
 msgstr "Runtimes"
 
+#: translations\index.php:37
+#, c-format
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr "Les deux pages suivantes vous informent sur le statut des traduction des versions stables et développeur de Winmerge:"
+
 #: about\index.php:49
 #, c-format
 msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
 msgstr "Visual Sourcesafe rudimentaire et intégration de ClearCase rationnel"
 
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+#, c-format
+msgid "Fuzzy"
+msgstr "Flou"
+
 #: translations\translations.inc:180
 #: translations\translations_branch.inc:106
 #, c-format
 msgid "Total: %d"
 msgstr "Total: %d"
 
-#: support\mailing-lists.php:72
+#: downloads\index.php:8
 #, c-format
-msgid "High Traffic"
-msgstr "Trafic élevé"
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr "WinMerge, libre, télécharger, Windows, installation, installeur, binaires, runtimes, stable, beta, expérimental, portable"
 
 #: 404.php:18
 #, c-format
@@ -1632,10 +1708,10 @@
 msgid "Release Notes"
 msgstr "Notes de version"
 
-#: engine\page.inc:317
+#: links.php:16
 #, c-format
-msgid "WinMerge Translations Instructions"
-msgstr "Instructions de traductions de Winmerge"
+msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
+msgstr ""
 
 #: engine\page.inc:296
 #, c-format
@@ -1668,12 +1744,27 @@
 msgid "View all file releases&hellip;"
 msgstr "Voir toutes les versions de fichier&hellip;"
 
+#: links.php:14
+#, c-format
+msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
+msgstr ""
+
+#: links.php:12
+#, c-format
+msgid "<b>7-Zip</b> is a file archiver with high compression ratio."
+msgstr ""
+
 #: about\index.php:5
 #: about\index.php:12
 #, c-format
 msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
 msgstr "WinMerge est très utile pour déterminer ce qui a changé entre les projets de versions, et alors fusionner les changements entre les versions. WinMerge peut être utiliser comme outil externe de différenciation/fusion ou en tant qu'application autonome."
 
+#: engine\engine.inc:22
+#, c-format
+msgid "Japanese"
+msgstr ""
+
 #: downloads\source-code.php:7
 #: downloads\source-code.php:10
 #, c-format
@@ -1701,6 +1792,17 @@
 msgid "Moved lines detection"
 msgstr "Détection des lignes déplacées"
 
+#: engine\page.inc:290
+#, c-format
+msgid "WinMerge History"
+msgstr "Historique de Winmerge"
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr "Graphe"
+
 #: downloads\index.php:69
 #, c-format
 msgid "(by PortableApps.com)"
@@ -1728,6 +1830,11 @@
 msgid "Download WinMerge"
 msgstr "Télécharger Winmerge"
 
+#: links.php:9
+#, c-format
+msgid "Tools"
+msgstr ""
+
 #: engine\page.inc:369
 #, c-format
 msgid "Bookmark this on Delicious"

Modified: trunk/Translations/Web/ja.po
===================================================================
--- trunk/Translations/Web/ja.po	2009-09-28 18:33:49 UTC (rev 6998)
+++ trunk/Translations/Web/ja.po	2009-09-28 18:40:14 UTC (rev 6999)
@@ -54,6 +54,11 @@
 msgid "Open Source Software"
 msgstr "オープンソースソフトウェア"
 
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr "多い投稿量"
+
 #: index.php:13
 #, c-format
 msgid "What is WinMerge?"
@@ -97,6 +102,11 @@
 msgid "Template"
 msgstr "テンプレート"
 
+#: links.php:27
+#, c-format
+msgid "Good site devoted for regular expressions"
+msgstr ""
+
 #: index.php:45
 #, c-format
 msgid "Developers"
@@ -164,10 +174,10 @@
 msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 msgstr "WinMerge, フリー, ダウンロード, プラグイン, plugin, plug-in, セットアップ, インストーラ, バイナリ, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
 
-#: translations\index.php:37
+#: links.php:31
 #, c-format
-msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
-msgstr "次の2つのページでは、WinMerge の安定版と開発版の翻訳状況をお知らせします:"
+msgid "Regular expressions tutorial"
+msgstr ""
 
 #: support\tracker-shortcuts.php:55
 #, c-format
@@ -205,12 +215,10 @@
 msgid "Low Traffic"
 msgstr "少ない投稿量"
 
-#: about\history.php:7
-#: about\history.php:9
-#: engine\page.inc:290
+#: about\index.php:27
 #, c-format
-msgid "History"
-msgstr "履歴"
+msgid "File Compare"
+msgstr "ファイル比較"
 
 #: support\mailing-lists.php:27
 #, c-format
@@ -222,6 +230,11 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr "<a href=\"%s\">ドキュメント</a>?"
 
+#: engine\page.inc:317
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr "WinMerge 翻訳インストラクション"
+
 #: downloads\pad-file.php:78
 #, c-format
 msgid "Icon"
@@ -337,6 +350,11 @@
 msgid "Binaries"
 msgstr "バイナリ"
 
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr "リリースノートページは、現在ご利用できません..."
+
 #: engine\page.inc:297
 #, c-format
 msgid "WinMerge Known Issues"
@@ -357,6 +375,7 @@
 msgid "This list is used for coordinating the translations."
 msgstr "このリストは、翻訳をまとめるのに使用されます。"
 
+#: links.php:6
 #: about\license.php:30
 #: engine\page.inc:284
 #, c-format
@@ -373,17 +392,15 @@
 msgid "Support Request"
 msgstr "サポートリクエスト"
 
-#: support\mailing-lists.php:17
-#: support\mailing-lists.php:70
+#: links.php:18
 #, c-format
-msgid "SVN List"
-msgstr "SVN リスト"
+msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
+msgstr ""
 
-#: translations\translations.inc:132
-#: translations\translations_branch.inc:67
+#: links.php:22
 #, c-format
-msgid "Graph"
-msgstr "グラフ"
+msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
+msgstr ""
 
 #: support\tracker-shortcuts.php:16
 #, c-format
@@ -461,7 +478,7 @@
 msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
 msgstr "<a href=\"%s\">機能リクエストリスト</a>のウィッシュリスト項目も考慮されます。しかしながら、機能追加の必ずのお約束はできかねます。"
 
-#: engine\engine.inc:23
+#: engine\engine.inc:24
 #, c-format
 msgid "Swedish"
 msgstr "Swedish"
@@ -529,13 +546,21 @@
 msgid "Tracker"
 msgstr "トラッカー"
 
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
 #, c-format
-msgid "Folder Comparison Results"
-msgstr "フォルダ比較結果"
+msgid "Change Log"
+msgstr "変更履歴"
 
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr "バグ"
+
+#: links.php:43
 #: downloads\index.php:69
 #, c-format
 msgid "WinMerge Portable"
@@ -557,16 +582,21 @@
 msgid "Were you looking for..."
 msgstr "お探しなのは..."
 
-#: downloads\index.php:8
+#: about\index.php:19
 #, c-format
-msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
-msgstr "WinMerge, フリー, ダウンロード, Windows, セットアップ, インストーラ, バイナリ, ランタイム, 安定版, ベータ版, 実験版l, portable"
+msgid "General"
+msgstr "一般"
 
 #: downloads\pad-file.php:48
 #, c-format
 msgid "Type"
 msgstr "種別"
 
+#: links.php:40
+#, c-format
+msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
+msgstr ""
+
 #: engine\page.inc:299
 #, c-format
 msgid "WinMerge Development Wiki"
@@ -592,10 +622,10 @@
 msgid "Page Not Found..."
 msgstr "ページが見つかりません..."
 
-#: support\index.php:16
+#: links.php:29
 #, c-format
-msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
-msgstr "バグ報告をポストする前に、<a href=\"%s\">SourceForge.netへの登録</a>が必要です(登録は無料です)。"
+msgid "Good HOWTO document for regular expressions"
+msgstr ""
 
 #: index.php:16
 #, c-format
@@ -619,11 +649,22 @@
 msgid "Translations"
 msgstr "翻訳"
 
+#: links.php:35
+#, c-format
+msgid "Miscellaneous"
+msgstr ""
+
 #: support\index.php:38
 #, c-format
 msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
 msgstr "WinMerge は、<a href=\"%s\">オープンソース</a>プロジェクトですから、無償でご使用いただけます。"
 
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr "翻訳済み: %d%%"
+
 #: engine\page.inc:285
 #, c-format
 msgid "Project Page"
@@ -712,6 +753,11 @@
 msgid "Tracker Item"
 msgstr "トラッカー項目"
 
+#: links.php:24
+#, c-format
+msgid "Regular expressions"
+msgstr ""
+
 #: translations\translations_branch.inc:183
 #, c-format
 msgid "Translator(s)"
@@ -742,10 +788,10 @@
 msgid "Project News"
 msgstr "プロジェクトニュース"
 
-#: docs\index.php:13
+#: links.php:20
 #, c-format
-msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
-msgstr "この<a href=\"%1$s\">リリースノート</a>は、現在の WinMerge のバージョンでの重要な変更や機能の強化、バグ修正、<a href=\"%2$s\">既知の問題</a>の短い概要です。"
+msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
+msgstr ""
 
 #: about\license.php:6
 #, c-format
@@ -768,10 +814,10 @@
 msgid "Version %1$s; %2$s MB"
 msgstr "バージョン %1$s; %2$s MB"
 
-#: docs\releasenotes.php:11
+#: links.php:42
 #, c-format
-msgid "The release notes are currently not available..."
-msgstr "リリースノートページは、現在ご利用できません..."
+msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
+msgstr ""
 
 #: support\tracker-shortcuts.php:23
 #, c-format
@@ -783,10 +829,10 @@
 msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
 msgstr "WinMerge, トラッカー, ショートカット, sourceforge, プロジェクトページ, バグ, パッチ, サポート要求, 機能要求, todo 項目"
 
-#: support\index.php:6
+#: links.php:38
 #, c-format
-msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
-msgstr "オープンディスカッションフォーラムは、助けを得るもっとも早い方法です。他の方法は、サポートメーリングリストを購読することです。"
+msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
+msgstr ""
 
 #: downloads\plugins.php:32
 #, c-format
@@ -848,11 +894,10 @@
 msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
 msgstr "このリストの購読者は、コードの変更がSubversionにコミットされる毎に通知を受けられます。"
 
-#: support\mailing-lists.php:14
-#: support\mailing-lists.php:40
+#: links.php:44
 #, c-format
-msgid "User List"
-msgstr "ユーザーリスト"
+msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
+msgstr ""
 
 #: index.php:47
 #, c-format
@@ -921,10 +966,10 @@
 msgid "Screenshots"
 msgstr "スクリーンショット"
 
-#: engine\page.inc:290
+#: links.php:30
 #, c-format
-msgid "WinMerge History"
-msgstr "WinMerge の履歴"
+msgid "Tutorial"
+msgstr ""
 
 #: about\index.php:78
 #, c-format
@@ -1047,11 +1092,10 @@
 msgid "Version Control"
 msgstr "バージョン管理"
 
-#: translations\translations.inc:81
-#: translations\translations_branch.inc:49
+#: support\index.php:6
 #, c-format
-msgid "Translated: %d%%"
-msgstr "翻訳済み: %d%%"
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr "オープンディスカッションフォーラムは、助けを得るもっとも早い方法です。他の方法は、サポートメーリングリストを購読することです。"
 
 #: about\screenshots\index.php:30
 #: about\screenshots\index.php:31
@@ -1148,16 +1192,22 @@
 msgid "The translations instructions are currently not available..."
 msgstr "翻訳インストラクションページは、現在ご利用できません..."
 
-#: support\tracker-shortcuts.php:13
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
 #, c-format
-msgid "Bug"
-msgstr "バグ"
+msgid "SVN List"
+msgstr "SVN リスト"
 
 #: downloads\plugins.php:31
 #, c-format
 msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
 msgstr "このプラグインを使用すると Word、Excel、PowerPoint、PDF やその他のファイルを比較することができます。"
 
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr "バグ報告をポストする前に、<a href=\"%s\">SourceForge.netへの登録</a>が必要です(登録は無料です)。"
+
 #: downloads\source-code.php:6
 #, c-format
 msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1245,15 +1295,10 @@
 msgid "Translators"
 msgstr "翻訳者"
 
-#: translations\translations.inc:83
-#: translations\translations.inc:96
-#: translations\translations.inc:134
-#: translations\translations_branch.inc:51
-#: translations\translations_branch.inc:69
-#: translations\translations_branch.inc:119
+#: links.php:28
 #, c-format
-msgid "Fuzzy"
-msgstr "あいまい"
+msgid "regex HOWTO"
+msgstr ""
 
 #: docs\index.php:6
 #, c-format
@@ -1284,10 +1329,12 @@
 msgid "<a href=\"%s\">Change Log</a>?"
 msgstr "<a href=\"%s\">変更履歴</a>?"
 
-#: about\index.php:27
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
 #, c-format
-msgid "File Compare"
-msgstr "ファイル比較"
+msgid "History"
+msgstr "履歴"
 
 #: support\tracker-shortcuts.php:41
 #, c-format
@@ -1325,10 +1372,10 @@
 msgid "WinMerge Home"
 msgstr "WinMerge ホーム"
 
-#: about\index.php:19
+#: links.php:33
 #, c-format
-msgid "General"
-msgstr "一般"
+msgid "PDF quick reference"
+msgstr ""
 
 #: docs\index.php:11
 #, c-format
@@ -1371,14 +1418,12 @@
 msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
 msgstr "WinMerge, メーリングリスト, アナウンス, サポート, ユーザー, 翻訳, 開発, SVN"
 
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
 #, c-format
-msgid "Change Log"
-msgstr "変更履歴"
+msgid "Folder Comparison Results"
+msgstr "フォルダ比較結果"
 
 #: support\tracker-shortcuts.php:37
 #, c-format
@@ -1431,6 +1476,11 @@
 msgid "GNU General Public License"
 msgstr "GNU 一般公衆利用許諾契約書"
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr "この<a href=\"%1$s\">リリースノート</a>は、現在の WinMerge のバージョンでの重要な変更や機能の強化、バグ修正、<a href=\"%2$s\">既知の問題</a>の短い概要です。"
+
 #: translations\translations.inc:85
 #: translations\translations.inc:97
 #: translations\translations.inc:135
@@ -1470,16 +1520,27 @@
 msgid "Other"
 msgstr "その他"
 
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "ユーザーリスト"
+
 #: 404.php:27
 #, c-format
 msgid "<a href=\"%s\">Support</a>?"
 msgstr "<a href=\"%s\">サポート</a>?"
 
-#: engine\engine.inc:22
+#: engine\engine.inc:23
 #, c-format
 msgid "Dutch"
 msgstr "Dutch"
 
+#: links.php:7
+#, c-format
+msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
+msgstr ""
+
 #: support\index.php:7
 #, c-format
 msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
@@ -1...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[6998] trunk/Web/engine/engine.inc

From: <ge...@us...> - 2009-09-28 18:34:01

Revision: 6998
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6998&view=rev
Author:   gerundt
Date:     2009-09-28 18:33:49 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
Web: Add Japanese website translation

Modified Paths:
--------------
    trunk/Web/engine/engine.inc

Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc	2009-09-28 18:31:59 UTC (rev 6997)
+++ trunk/Web/engine/engine.inc	2009-09-28 18:33:49 UTC (rev 6998)
@@ -19,6 +19,7 @@
   $translations->addLanguage('en', __('English'));
   $translations->addLanguage('de', __('German'), $languagesdir . 'de.po');
   $translations->addLanguage('fr', __('French'), $languagesdir . 'fr.po');
+  $translations->addLanguage('ja', __('Japanese'), $languagesdir . 'ja.po');
   $translations->addLanguage('nl', __('Dutch'), $languagesdir . 'nl.po');
   $translations->addLanguage('se', __('Swedish'), $languagesdir . 'se.po');
   if (!$translations->detectLanguageFromUrl()) { //if NOT detect language from URL...


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

[Winmerge-svn] SF.net SVN: winmerge:[6997] trunk/Web/links.php

From: <ge...@us...> - 2009-09-28 18:32:09

Revision: 6997
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6997&view=rev
Author:   gerundt
Date:     2009-09-28 18:31:59 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
Web: Make links page translatable - Base on a patch from Takashi Sawanka

Modified Paths:
--------------
    trunk/Web/links.php

Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php	2009-09-27 13:10:27 UTC (rev 6996)
+++ trunk/Web/links.php	2009-09-28 18:31:59 UTC (rev 6997)
@@ -3,46 +3,46 @@
 
   $page = new Page;
   $page->printHead('Links', TAB_HOME);
+  $page->printHeading(__('Links'));
+  $page->printPara(__('Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge.'));
 ?>
-<h2>Links</h2>
-<p>Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge.</p>
-<h3>Tools</h3>
+<h3><?php __e('Tools');?></h3>
 <dl>
   <dt><a href="http://www.7-zip.org/">7-Zip</a></dt>
-  <dd><b>7-Zip</b> is a file archiver with high compression ratio.</dd>
+  <dd><?php __e('<b>7-Zip</b> is a file archiver with high compression ratio.') ;?></dd>
   <dt><a href="http://winscp.sourceforge.net/">WinSCP</a></dt>
-  <dd><b>WinSCP</b> is an open source <acronym title="SSH File Transfer Protocol">SFTP</acronym>, <acronym title="File Transfer Protocol">FTP</acronym> and <acronym title="Secure Copy Protocol">SCP</acronym> client for Windows.</dd>
+  <dd><?php __e('<b>WinSCP</b> is an open source <acronym title="SSH File Transfer Protocol">SFTP</acronym>, <acronym title="File Transfer Protocol">FTP</acronym> and <acronym title="Secure Copy Protocol">SCP</acronym> client for Windows.');?></dd>
   <dt><a href="http://gnuwin32.sourceforge.net/">GnuWin32</a></dt>
-  <dd><b>GnuWin32</b> provides Win32 ports of tools with a <a href="http://www.gnu.org/">GNU</a> or similar <a href="http://opensource.org/licenses/">open source license</a>.</dd>
+  <dd><?php __e('<b>GnuWin32</b> provides Win32 ports of tools with a <a href="%1$s">GNU</a> or similar <a href="%2$s">open source license</a>.', 'http://www.gnu.org/', 'http://opensource.org/licenses/');?></dd>
   <dt><a href="https://sourceforge.net/projects/externaldiff">External diff Tool</a></dt>
-  <dd><b>External diff Tool</b> is an <a href="http://www.eclipse.org/">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool.</dd>
+  <dd><?php __e('<b>External diff Tool</b> is an <a href="%s">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool.', 'http://www.eclipse.org/');?></dd>
   <dt><a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a></dt>
-  <dd><b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer.</dd>
+  <dd><?php __e('<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer.');?></dd>
   <dt><a href="http://frhed.sourceforge.net/">Frhed</a></dt>
-  <dd><b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially.</dd>
+  <dd><?php __e('<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially.');?></dd>
 </dl>
-<h3>Regular expressions</h3>
+<h3><?php __e('Regular expressions');?></h3>
 <dl>
   <dt><a href="http://www.regular-expressions.info/">regular-expressions.info</a></dt>
-  <dd>Good site devoted for regular expressions</dd>
-  <dt><a href="http://www.amk.ca/python/howto/regex/">regex HOWTO</a></dt>
-  <dd>Good HOWTO document for regular expressions</dd>
-  <dt><a href="http://www.zvon.org/other/PerlTutorial/Output/index.html">Tutorial</a></dt>
-  <dd>Regular expressions tutorial</dd>
+  <dd><?php __e('Good site devoted for regular expressions');?></dd>
+  <dt><a href="http://www.amk.ca/python/howto/regex/"><?php __e('regex HOWTO');?></a></dt>
+  <dd><?php __e('Good HOWTO document for regular expressions');?></dd>
+  <dt><a href="http://www.zvon.org/other/PerlTutorial/Output/index.html"><?php __e('Tutorial');?></a></dt>
+  <dd><?php __e('Regular expressions tutorial');?></dd>
   <dt><a href="http://www.night-ray.com/regex.pdf">regex.pdf</a></dt>
-  <dd>PDF quick reference</dd>
+  <dd><?php __e('PDF quick reference');?></dd>
 </dl>
-<h3>Miscellaneous</h3>
+<h3><?php __e('Miscellaneous');?></h3>
 <dl>
   <dt><a href="http://ohloh.net/">ohloh.net</a></dt>
-  <dd>Map the open source world by collecting objective information on open source projects. [<a href="http://www.ohloh.net/projects/225">WinMerge Report</a>]</dd>
+  <dd><?php __e('Map the open source world by collecting objective information on open source projects. [<a href="%s">WinMerge Report</a>]', 'http://www.ohloh.net/projects/225');?></dd>
   <dt><a href="http://www.diffutils.com/">diffutils.com</a></dt>
-  <dd>Reviews of popular comparison software. [<a href="http://www.diffutils.com/project-revision-control/winmerge.html">WinMerge Review</a>]</dd>
+  <dd><?php __e('Reviews of popular comparison software. [<a href="%s">WinMerge Review</a>]', 'http://www.diffutils.com/project-revision-control/winmerge.html');?></dd>
   <dt><a href="http://www.betanews.com/">BetaNews.com</a></dt>
-  <dd>Inside informations, unreleased products and articles on various soon-to-be-released software titles.</dd>
-  <dt><a href="http://portableapps.com/apps/utilities/winmerge_portable">WinMerge Portable</a></dt>
-  <dd>This is WinMerge packaged with a PortableApps.com Launcher as a <a href="http://portableapps.com/about/what_is_a_portable_app">portable app</a>, so you can compare files on the go.</dd>
+  <dd><?php __e('Inside informations, unreleased products and articles on various soon-to-be-released software titles.');?></dd>
+  <dt><a href="http://portableapps.com/apps/utilities/winmerge_portable"><?php __e('WinMerge Portable');?></a></dt>
+  <dd><?php __e('This is WinMerge packaged with a PortableApps.com Launcher as a <a href="%s">portable app</a>, so you can compare files on the go.', 'http://portableapps.com/about/what_is_a_portable_app');?></dd>
 </dl>
 <?php
   $page->printFoot();
-?>
\ No newline at end of file
+?>


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

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

From: <sdo...@us...> - 2009-09-27 13:10:41

Revision: 6996
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6996&view=rev
Author:   sdottaka
Date:     2009-09-27 13:10:27 +0000 (Sun, 27 Sep 2009)

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

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Translations/WinMerge/Japanese.po

Added Paths:
-----------
    trunk/Translations/Web/ja.po

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-09-21 08:32:26 UTC (rev 6995)
+++ trunk/Docs/Users/ChangeLog.txt	2009-09-27 13:10:27 UTC (rev 6996)
@@ -23,6 +23,7 @@
   - Dutch (#2801690, #2804979, #2828310)
   - French (#2850842)
   - German (r6942)
+  - Japanese (r6996)
   - Polish (#2858673)
   - Swedish (#2805726, #2845755)
   - Turkish (#2825130, #2825132, #2827820)

Added: trunk/Translations/Web/ja.po
===================================================================
--- trunk/Translations/Web/ja.po	                        (rev 0)
+++ trunk/Translations/Web/ja.po	2009-09-27 13:10:27 UTC (rev 6996)
@@ -0,0 +1,1742 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge\n"
+"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
+"POT-Creation-Date: 2009-08-29 17:42+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n"
+"Language-Team: English <win...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../Web/\n"
+
+#: about\screenshots\index.php:26
+#, c-format
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
+msgstr "行内の正確な違いを見れると便利なことがよくあります。WinMerge は、行内の異なっている部分を強調表示できます。"
+
+#: 404.php:13
+#, c-format
+msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
+msgstr "このサイトは、最近大きな改訂を行っています。代わりにこのページが表示されているのはそれが原因かもしれません。"
+
+#: translations\index.php:36
+#, c-format
+msgid "Status"
+msgstr "現在の状態"
+
+#: docs\changelog.php:11
+#, c-format
+msgid "The change log is currently not available..."
+msgstr "変更履歴は、現在ご利用できません..."
+
+#: downloads\index.php:55
+#, c-format
+msgid "Requirements"
+msgstr "システム要件"
+
+#: downloads\source-code.php:33
+#, c-format
+msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
+msgstr "ソースコードは、<a href=\"%1$s\">SourceForge.net</a> でホストされている<a href=\"%2$s\">Subversion</a> リポジトリの中にあります。"
+
+#: about\license.php:35
+#, c-format
+msgid "Open Source Software"
+msgstr "オープンソースソフトウェア"
+
+#: index.php:13
+#, c-format
+msgid "What is WinMerge?"
+msgstr "WinMerge とは?"
+
+#: support\index.php:15
+#, c-format
+msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgstr "バグ報告に含まれた良い情報は、あなたのバグを素早く修正する助けになります。"
+
+#: about\index.php:30
+#, c-format
+msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
+msgstr "文法強調、行番号、行折り返しができる柔軟なエディタ"
+
+#: about\index.php:22
+#, c-format
+msgid "Handles Windows, Unix and Mac text file formats"
+msgstr "Windows、Unix、Macのテキストファイルフォーマットを扱えます"
+
+#: engine\page.inc:312
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
+#, c-format
+msgid "Tracker Shortcuts"
+msgstr "トラッカーショートカット"
+
+#: engine\page.inc:298
+#, c-format
+msgid "WinMerge Change Log"
+msgstr "WinMerge 変更履歴"
+
+#: about\screenshots\index.php:27
+#: about\screenshots\index.php:28
+#, c-format
+msgid "Location Pane"
+msgstr "ロケーションペイン"
+
+#: translations\translations.inc:177
+#, c-format
+msgid "Template"
+msgstr "テンプレート"
+
+#: index.php:45
+#, c-format
+msgid "Developers"
+msgstr "開発者"
+
+#: about\index.php:39
+#, c-format
+msgid "Regular Expression based file filters allow excluding and including items"
+msgstr "正規表現ベースのファイルフィルタは、項目の除外、包含を可能にします"
+
+#: downloads\index.php:59
+#, c-format
+msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
+msgstr "Microsoft Visual C++ 2003 ランタイムコンポーネント (インストーラに含まれる)"
+
+#: translations\status_branch.php:18
+#: translations\status_trunk.php:18
+#, c-format
+msgid "The translations status is currently not available..."
+msgstr "翻訳状況ページは、現在ご利用できません..."
+
+#: engine\page.inc:295
+#, c-format
+msgid "WinMerge Manual"
+msgstr "WinMergeマニュアル"
+
+#: engine\page.inc:309
+#, c-format
+msgid "WinMerge Discussion Forums"
+msgstr "WinMerge ディスカッションフォーラム"
+
+#: about\license.php:5
+#, c-format
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
+msgstr "WinMerge は、GPL のオープンソースソフトウェアです。これは誰もがソースコードをダウンロードして改良したり変更したりすることを意味します。"
+
+#: downloads\pad-file.php:90
+#, c-format
+msgid "Company"
+msgstr "会社"
+
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr "サポートリスト"
+
+#: engine\page.inc:305
+#, c-format
+msgid "WinMerge PAD File"
+msgstr "WinMerge PAD ファイル"
+
+#: engine\engine.inc:21
+#, c-format
+msgid "French"
+msgstr "French"
+
+#: translations\instructions.php:15
+#, c-format
+msgid "Source: %s"
+msgstr "ソース: %s"
+
+#: downloads\plugins.php:6
+#, c-format
+msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+msgstr "WinMerge, フリー, ダウンロード, プラグイン, plugin, plug-in, セットアップ, インストーラ, バイナリ, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+
+#: translations\index.php:37
+#, c-format
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr "次の2つのページでは、WinMerge の安定版と開発版の翻訳状況をお知らせします:"
+
+#: support\tracker-shortcuts.php:55
+#, c-format
+msgid "Subdomains"
+msgstr "サブドメイン"
+
+#: about\history.php:45
+#, c-format
+msgid "Withdrawn due to installer bug!"
+msgstr "インストーラバグのため取り消されました!"
+
+#: translations\index.php:40
+#, c-format
+msgid "Unstable Version (Trunk)"
+msgstr "不安定版 (トランク)"
+
+#: about\screenshots\index.php:32
+#, c-format
+msgid "WinMerge 2.8 has a new professional looking splash screen."
+msgstr "WinMerge 2.8 では、新しいプロフェッショナルなスプラッシュスクリーンが表示されます。"
+
+#: about\index.php:42
+#, c-format
+msgid "Can show folder compare results in a tree-style view"
+msgstr "フォルダ比較結果をツリースタイルビューで表示できます"
+
+#: about\index.php:16
+#, c-format
+msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
+msgstr "その上、WinMerge には、比較、同期、マージをできる限り簡単・使いやすくするたくさんの役立つ機能があります。"
+
+#: support\mailing-lists.php:22
+#: support\mailing-lists.php:52
+#, c-format
+msgid "Low Traffic"
+msgstr "少ない投稿量"
+
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
+#, c-format
+msgid "History"
+msgstr "履歴"
+
+#: support\mailing-lists.php:27
+#, c-format
+msgid "This list is only for announcing new releases of WinMerge."
+msgstr "このリストは、WinMergeの新しいリリースのアナウンス専用です。"
+
+#: 404.php:19
+#, c-format
+msgid "<a href=\"%s\">Documentation</a>?"
+msgstr "<a href=\"%s\">ドキュメント</a>?"
+
+#: downloads\pad-file.php:78
+#, c-format
+msgid "Icon"
+msgstr "アイコン"
+
+#: support\mailing-lists.php:32
+#: support\mailing-lists.php:42
+#: support\mailing-lists.php:62
+#, c-format
+msgid "Normal Traffic"
+msgstr "普通の投稿量"
+
+#: downloads\index.php:28
+#: downloads\index.php:34
+#: downloads\plugins.php:22
+#: downloads\source-code.php:18
+#, c-format
+msgid "7z-Format (%s MB)"
+msgstr "7z-形式 (%s MB)"
+
+#: about\license.php:34
+#, c-format
+msgid "GNU General Public License v2.0"
+msgstr "GNU 一般公衆利用許諾契約書 v2.0"
+
+#: about\index.php:71
+#, c-format
+msgid "Installation"
+msgstr "インストール"
+
+#: downloads\source-code.php:15
+#, c-format
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - ソースコード"
+
+#: about\index.php:58
+#, c-format
+msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
+msgstr "<a href=\"%s\">オンラインマニュアル</a>とインストールされたHTMLヘルプマニュアル"
+
+#: engine\page.inc:312
+#, c-format
+msgid "WinMerge Tracker Shortcuts"
+msgstr "WinMerge トラッカーショートカット"
+
+#: support\tracker-shortcuts.php:10
+#, c-format
+msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
+msgstr "<em>トラッカーショートカット</em> は、<a href=\"%2$s\">SF.net プロジェクトページ</a>の<a href=\"%1$s\">トラッカー</a>項目への短く快適なURLです。"
+
+#: downloads\pad-file.php:10
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
+msgstr "あなたのWebサイトのために WinMerge 最新安定版に関する情報を得るもっとも簡単な方法は、以下で見つけられる<a href=\"%s\">Portable Application Description</a> ファイルを参照することです:"
+
+#: support\tracker-shortcuts.php:14
+#, c-format
+msgid "Patch"
+msgstr "パッチ"
+
+#: support\mailing-lists.php:5
+#, c-format
+msgid "Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN"
+msgstr "次のメーリングリストの購読と購読解除: アナウンス, サポート, ユーザー, 翻訳, 開発とSVN"
+
+#: about\screenshots\index.php:20
+#, c-format
+msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
+msgstr "フォルダ比較では、比較したフォルダ内のすべてのファイルとサブフォルダをリストとして表示します。フォルダ比較では、コピーや削除をすることによってフォルダやファイルの同期をとることができます。フォルダ比較ビューは、多方面にわたるカスタマイズができます。"
+
+#: engine\page.inc:265
+#: engine\page.inc:308
+#, c-format
+msgid "WinMerge Support"
+msgstr "WinMerge サポート"
+
+#: support\index.php:17
+#, c-format
+msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
+msgstr "匿名の報告を許すとたくさんのスパムが発生したり、もっと情報をいただくためにコンタクトすることが不可能になるため登録をお願いしています。"
+
+#: engine\page.inc:310
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
+#, c-format
+msgid "Mailing Lists"
+msgstr "メーリングリスト"
+
+#: about\index.php:41
+#, c-format
+msgid "Compares one folder or includes all subfolders"
+msgstr "一つのフォルダまたは、すべてのサブフォルダを含んだ比較"
+
+#: 404.php:12
+#, c-format
+msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
+msgstr "いくつかの理由(ミスタイプしたURL、他のサイトからの間違った参照、古くなった検索エンジンのリスト、または私たちが単にファイルを消した)のため、お探しのページは見つかりません。"
+
+#: index.php:19
+#: about\index.php:11
+#, c-format
+msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr "WinMerge は、 <a href=\"%s\">オープンソース</a>のWindows 用比較・マージツールです。WinMerge は、フォルダとファイル両方が比較でき、理解しやすく扱いやすいテキスト形式で差異をビジュアルに表現します。"
+
+#: support\index.php:18
+#, c-format
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
+msgstr "私たちがバグ項目の中で質問をしたときにあなたが通知を受けとること以外に、稀に直接電子メールを送ることがありました。"
+
+#: downloads\index.php:25
+#: downloads\plugins.php:20
+#, c-format
+msgid "Binaries"
+msgstr "バイナリ"
+
+#: engine\page.inc:297
+#, c-format
+msgid "WinMerge Known Issues"
+msgstr "WinMerge 既知の問題"
+
+#: about\index.php:76
+#, c-format
+msgid "Using WinMerge"
+msgstr "WinMerge の使用"
+
+#: downloads\index.php:53
+#, c-format
+msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
+msgstr "追加<a href=\"%1$s\">プラグイン</a>と、WinMerge の全<a href=\"%2$s\">ソースコード</a>もダウンロードできます。"
+
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+msgstr "このリストは、翻訳をまとめるのに使用されます。"
+
+#: about\license.php:30
+#: engine\page.inc:284
+#, c-format
+msgid "Links"
+msgstr "リンク"
+
+#: index.php:49
+#, c-format
+msgid "The WinMerge Development Team"
+msgstr "WinMerge 開発チーム"
+
+#: support\tracker-shortcuts.php:15
+#, c-format
+msgid "Support Request"
+msgstr "サポートリクエスト"
+
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
+#, c-format
+msgid "SVN List"
+msgstr "SVN リスト"
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr "グラフ"
+
+#: support\tracker-shortcuts.php:16
+#, c-format
+msgid "Feature Request"
+msgstr "機能追加リクエスト"
+
+#: support\index.php:11
+#, c-format
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgstr "<a href=\"%s\">オープンディスカッションフォーラム</a>は、助けを得るもっとも早い方法です。どなたかが回答するまで時間がかかるかもしれませんので辛抱強くお待ちください。"
+
+#: about\index.php:31
+#, c-format
+msgid "Highlights differences inside lines"
+msgstr "行内差異の強調"
+
+#: 404.php:28
+#, c-format
+msgid "<a href=\"%s\">Translations</a>?"
+msgstr "<a href=\"%s\">翻訳</a>?"
+
+#: translations\translations.inc:38
+#, c-format
+msgid "File not valid."
+msgstr "ファイルは正しくありません。"
+
+#: about\screenshots\index.php:6
+#, c-format
+msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
+msgstr "WinMerge, スクリーンショット, ファイル比較, 開く-ダイアログ, フォルダ比較結果, 行内差異強調, ロケーションペイン, スプラッシュスクリーン"
+
+#: downloads\pad-file.php:72
+#, c-format
+msgid "Web Addresses"
+msgstr "Web アドレス"
+
+#: engine\page.inc:318
+#, c-format
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr "WinMerge の翻訳状況 (安定ブランチ)"
+
+#: about\index.php:74
+#, c-format
+msgid "For more information, please see the <a href=\"%1$s\">Installation section</a> of the <a href=\"%2$s\">Manual</a>."
+msgstr "<a href=\"%2$s\">マニュアル</a>の<a href=\"%1$s\">インストールセクション</a>でより多くの情報をご覧いただけます。"
+
+#: about\index.php:32
+#, c-format
+msgid "Difference pane shows current difference in two vertical panes"
+msgstr "Diff ペインは、2つの縦に並べたペインで現在の差異を表示します"
+
+#: engine\page.inc:317
+#, c-format
+msgid "Instructions"
+msgstr "インストラクション"
+
+#: index.php:27
+#, c-format
+msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
+msgstr "<a href=\"%1$s\">WinMerge %2$s</a> が最新の安定版です。ほとんどの方にお勧めです。"
+
+#: index.php:48
+#, c-format
+msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
+msgstr "その上、WinMerge はいくつかの言語に翻訳されています。<a href=\"%s\">WinMerge を母国語に翻訳することについての情報</a>をご覧ください。"
+
+#: engine\engine.inc:19
+#: translations\index.php:24
+#, c-format
+msgid "English"
+msgstr "English"
+
+#: support\index.php:19
+#, c-format
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr "<a href=\"%s\">機能リクエストリスト</a>のウィッシュリスト項目も考慮されます。しかしながら、機能追加の必ずのお約束はできかねます。"
+
+#: engine\engine.inc:23
+#, c-format
+msgid "Swedish"
+msgstr "Swedish"
+
+#: engine\page.inc:283
+#: engine\page.inc:288
+#: engine\page.inc:294
+#: engine\page.inc:308
+#: engine\page.inc:316
+#, c-format
+msgid "Index"
+msgstr "索引"
+
+#: downloads\plugins.php:10
+#, c-format
+msgid "7-Zip Plugin"
+msgstr "7-Zip プラグイン"
+
+#: index.php:20
+#, c-format
+msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
+msgstr "<a href=\"%1$s\">もっとよく知る</a> または、 <a href=\"%2$s\">今すぐダウンロード!</a>"
+
+#: translations\index.php:11
+#, c-format
+msgid "We currently have WinMerge translated into the languages listed below:"
+msgstr "私たちは、以下にリストされた言語に WinMerge を翻訳しています:"
+
+#: translations\index.php:33
+#, c-format
+msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
+msgstr "私たちの<a href=\"\"%2$s>開発 Wiki</a>では、<a href=\"%1$s\">翻訳システム</a>について多くの技術的な考え方を見つけることができます。"
+
+#: translations\translations.inc:131
+#: translations\translations.inc:288
+#: translations\translations_branch.inc:66
+#: translations\translations_branch.inc:182
+#, c-format
+msgid "Language"
+msgstr "言語"
+
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
+#, c-format
+msgid "Announce List"
+msgstr "アナウンスリスト"
+
+#: engine\page.inc:319
+#, c-format
+msgid "Status (Unstable Trunk)"
+msgstr "状況 (不安定トランク)"
+
+#: engine\page.inc:264
+#, c-format
+msgid "WinMerge Downloads"
+msgstr "WinMerge ダウンロード"
+
+#: downloads\index.php:70
+#, c-format
+msgid "Japanese WinMerge Version"
+msgstr "WinMerge 日本語版"
+
+#: engine\page.inc:311
+#, c-format
+msgid "Tracker"
+msgstr "トラッカー"
+
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
+#, c-format
+msgid "Folder Comparison Results"
+msgstr "フォルダ比較結果"
+
+#: downloads\index.php:69
+#, c-format
+msgid "WinMerge Portable"
+msgstr "WinMerge Portable"
+
+#: translations\translations.inc:83
+#: translations\translations_branch.inc:51
+#, c-format
+msgid "Fuzzy: %d%%"
+msgstr "あいまい: %d%%"
+
+#: docs\changelog.php:5
+#, c-format
+msgid "The change log is a more complete list of changes in the last WinMerge releases."
+msgstr "この変更履歴は、最近の WinMerge のリリース間で行われた、より完全な変更のリストです。"
+
+#: 404.php:15
+#, c-format
+msgid "Were you looking for..."
+msgstr "お探しなのは..."
+
+#: downloads\index.php:8
+#, c-format
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr "WinMerge, フリー, ダウンロード, Windows, セットアップ, インストーラ, バイナリ, ランタイム, 安定版, ベータ版, 実験版l, portable"
+
+#: downloads\pad-file.php:48
+#, c-format
+msgid "Type"
+msgstr "種別"
+
+#: engine\page.inc:299
+#, c-format
+msgid "WinMerge Development Wiki"
+msgstr "WinMerge 開発 Wiki"
+
+#: downloads\index.php:15
+#, c-format
+msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
+msgstr "現在のWinMerge のバージョンは、<strong>%1$s</strong> で、<strong>%2$s</strong> にリリースされています。"
+
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008 をサポートします"
+
+#: 404.php:22
+#, c-format
+msgid "<a href=\"%s\">Release Notes</a>?"
+msgstr "<a href=\"%s\">リリースノート</a>?"
+
+#: 404.php:11
+#, c-format
+msgid "Page Not Found..."
+msgstr "ページが見つかりません..."
+
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr "バグ報告をポストする前に、<a href=\"%s\">SourceForge.netへの登録</a>が必要です(登録は無料です)。"
+
+#: index.php:16
+#, c-format
+msgid "More Screenshots&hellip;"
+msgstr "もっとスクリーンショットを見る&hellip;"
+
+#: about\index.php:48
+#, c-format
+msgid "Resolve conflict files"
+msgstr "コンフリクトファイルの解決"
+
+#: engine\page.inc:264
+#, c-format
+msgid "Downloads"
+msgstr "ダウンロード"
+
+#: engine\page.inc:266
+#: translations\index.php:8
+#: translations\index.php:10
+#, c-format
+msgid "Translations"
+msgstr "翻訳"
+
+#: support\index.php:38
+#, c-format
+msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgstr "WinMerge は、<a href=\"%s\">オープンソース</a>プロジェクトですから、無償でご使用いただけます。"
+
+#: engine\page.inc:285
+#, c-format
+msgid "Project Page"
+msgstr "プロジェクトページ"
+
+#: about\index.php:7
+#: about\index.php:10
+#: engine\page.inc:262
+#: engine\page.inc:288
+#, c-format
+msgid "About WinMerge"
+msgstr "WinMerge について"
+
+#: engine\page.inc:266
+#: engine\page.inc:316
+#, c-format
+msgid "WinMerge Translations"
+msgstr "WinMerge の翻訳"
+
+#: downloads\pad-file.php:6
+#, c-format
+msgid "WinMerge, PAD file, Portable Application Description"
+msgstr "WinMerge, PAD ファイル, Portable Application Description"
+
+#: downloads\pad-file.php:40
+#, c-format
+msgid "Release Status"
+msgstr "リリース状況"
+
+#: engine\page.inc:311
+#, c-format
+msgid "WinMerge Tracker"
+msgstr "WinMerge トラッカー"
+
+#: support\mailing-lists.php:47
+#, c-format
+msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
+msgstr "このリストは、ユーザーに関連した質問をするところです。このリストに質問をポストしておけば他の人達が同じ問題を解決できるかもしれません。"
+
+#: downloads\index.php:7
+#, c-format
+msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
+msgstr "%2$s にリリースされた現在の WinMerge バージョン %1$s のダウンロード。詳細な最新情報を知るためには、変更履歴とリリースノートをお読みください。"
+
+#: engine\page.inc:297
+#, c-format
+msgid "Known Issues"
+msgstr "既知の問題"
+
+#: translations\index.php:29
+#, c-format
+msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>&#8594; <span class=\"guimenuitem\">Language</span> menu choice."
+msgstr "言語を変更するには、<span class=\"guimenu\">表示</span>&#8594; <span class=\"guimenuitem\">言語</span>を選択し、お望みの言語を選択してください。"
+
+#: translations\translations.inc:136
+#: translations\translations_branch.inc:71
+#, c-format
+msgid "Last Update"
+msgstr "最終更新"
+
+#: engine\page.inc:304
+#, c-format
+msgid "Source Code"
+msgstr "ソースコード"
+
+#: about\screenshots\index.php:21
+#: about\screenshots\index.php:22
+#, c-format
+msgid "Folder Compare Tree View"
+msgstr "フォルダ比較ツリービュー"
+
+#: downloads\index.php:27
+#: downloads\index.php:33
+#: downloads\source-code.php:17
+#, c-format
+msgid "Zip-Format (%s MB)"
+msgstr "Zip 形式 (%s MB)"
+
+#: support\tracker-shortcuts.php:5
+#, c-format
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr "トラッカーショートカットは、SF.net プロジェクトページのトラッカー項目への短く快適なURLです。このページでこのショートカットを生成することができます。"
+
+#: support\tracker-shortcuts.php:18
+#, c-format
+msgid "Tracker Item"
+msgstr "トラッカー項目"
+
+#: translations\translations_branch.inc:183
+#, c-format
+msgid "Translator(s)"
+msgstr "翻訳者(達)"
+
+#: 404.php:21
+#, c-format
+msgid "<a href=\"%s\">Manual</a>?"
+msgstr "<a href=\"%s\">マニュアル</a>?"
+
+#: docs\index.php:7
+#: docs\index.php:9
+#: engine\page.inc:263
+#, c-format
+msgid "Documentation"
+msgstr "ドキュメント"
+
+#: about\history.php:19
+#: docs\index.php:10
+#: engine\page.inc:295
+#, c-format
+msgid "Manual"
+msgstr "マニュアル"
+
+#: index.php:8
+#: index.php:30
+#, c-format
+msgid "Project News"
+msgstr "プロジェクトニュース"
+
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr "この<a href=\"%1$s\">リリースノート</a>は、現在の WinMerge のバージョンでの重要な変更や機能の強化、バグ修正、<a href=\"%2$s\">既知の問題</a>の短い概要です。"
+
+#: about\license.php:6
+#, c-format
+msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
+msgstr "WinMerge, ライセンス, オープンソース, GNU General Public License, GPL, フリーソフトウェア"
+
+#: downloads\pad-file.php:94
+#, c-format
+msgid "Contact"
+msgstr "連絡先"
+
+#: downloads\index.php:40
+#: downloads\source-code.php:24
+#, c-format
+msgid "SHA-1 Checksums"
+msgstr "SHA-1 チェックサム"
+
+#: engine\page.inc:231
+#, c-format
+msgid "Version %1$s; %2$s MB"
+msgstr "バージョン %1$s; %2$s MB"
+
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr "リリースノートページは、現在ご利用できません..."
+
+#: support\tracker-shortcuts.php:23
+#, c-format
+msgid "Type:"
+msgstr "タイプ:"
+
+#: support\tracker-shortcuts.php:6
+#, c-format
+msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
+msgstr "WinMerge, トラッカー, ショートカット, sourceforge, プロジェクトページ, バグ, パッチ, サポート要求, 機能要求, todo 項目"
+
+#: support\index.php:6
+#, c-format
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr "オープンディスカッションフォーラムは、助けを得るもっとも早い方法です。他の方法は、サポートメーリングリストを購読することです。"
+
+#: downloads\plugins.php:32
+#, c-format
+msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
+msgstr "詳細とダウンロードは、<a href=\"%s\">xdocdiff plugin ホームページ</a>へ。"
+
+#: translations\index.php:39
+#, c-format
+msgid "Stable Version (Branch)"
+msgstr "安定版(ブランチ)"
+
+#: translations\translations_branch.inc:104
+#, c-format
+msgid "English (Template)"
+msgstr "English (テンプレート)"
+
+#: engine\page.inc:284
+#, c-format
+msgid "WinMerge Links"
+msgstr "WinMerge リンク"
+
+#: about\screenshots\index.php:29
+#, c-format
+msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
+msgstr "ロケーションペインは、比較するファイルの全体的な(差異の)マップを表示する便利なサイドペインです。"
+
+#: docs\index.php:5
+#, c-format
+msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
+msgstr "マニュアルのような WinMerge のドキュメント, リリースノート, 変更履歴と開発 Wiki."
+
+#: docs\index.php:15
+#, c-format
+msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
+msgstr "この<a href=\"%s\">変更履歴</a>は、最近の WinMerge のリリース間で行われた、より完全な変更のリストです。"
+
+#: engine\page.inc:303
+#, c-format
+msgid "Download WinMerge Plugins"
+msgstr "WinMerge プラグインをダウンロード"
+
+#: engine\page.inc:319
+#, c-format
+msgid "WinMerge Translations Status (Unstable Trunk)"
+msgstr "WinMerge の翻訳状況 (不安定トランク)"
+
+#: docs\index.php:17
+#, c-format
+msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
+msgstr "この<a href=\"%s\">開発 Wiki</a>は、WinMerge の開発についてかなりの情報を含んでいます。"
+
+#: downloads\index.php:16
+#, c-format
+msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
+msgstr "詳細な最新情報を知るためには、<a href=\"%1$s\">変更履歴</a>と<a href=\"%2$s\">リリースノート</a>をお読みください。"
+
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr "このリストの購読者は、コードの変更がSubversionにコミットされる毎に通知を受けられます。"
+
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "ユーザーリスト"
+
+#: index.php:47
+#, c-format
+msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
+msgstr "このプロジェクトに協力していただけるのであれば、どのような協力ができるかについて詳しくは<a href=\"%s\">開発者ページ</a>をご覧ください。"
+
+#: downloads\plugins.php:7
+#: downloads\plugins.php:9
+#, c-format
+msgid "Download Plugins"
+msgstr "プラグインのダウンロード"
+
+#: downloads\pad-file.php:58
+#: downloads\pad-file.php:60
+#: downloads\pad-file.php:62
+#, c-format
+msgid "English Description (%d chars)"
+msgstr "英語での説明 (%d 文字)"
+
+#: about\index.php:29
+#, c-format
+msgid "Visual differencing and merging of text files"
+msgstr "ビジュアルなテキストファイルの差異表示とマージ機能"
+
+#: engine\page.inc:285
+#, c-format
+msgid "WinMerge Project Page"
+msgstr "WinMerge プロジェクトページ"
+
+#: downloads\index.php:60
+#, c-format
+msgid "Admin rights for the installer"
+msgstr "インストールするための管理者権限"
+
+#: downloads\plugins.php:28
+#, c-format
+msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
+msgstr "<a href=\"%1$s\">リリースノート</a>もお読みいただけます。また、<a href=\"%2$s\">その他のバージョン</a>も見つけることができます。"
+
+#: engine\page.inc:289
+#, c-format
+msgid "WinMerge Screenshots"
+msgstr "WinMerge スクリーンショット"
+
+#: downloads\pad-file.php:42
+#, c-format
+msgid "Download"
+msgstr "ダウンロード"
+
+#: downloads\index.php:20
+#: downloads\plugins.php:15
+#, c-format
+msgid "Installer"
+msgstr "インストーラ"
+
+#: 404.php:26
+#, c-format
+msgid "<a href=\"%s\">Downloads</a>?"
+msgstr "<a href=\"%s\">ダウンロード</a>?"
+
+#: about\index.php:64
+#: about\screenshots\index.php:7
+#: about\screenshots\index.php:9
+#: engine\page.inc:289
+#, c-format
+msgid "Screenshots"
+msgstr "スクリーンショット"
+
+#: engine\page.inc:290
+#, c-format
+msgid "WinMerge History"
+msgstr "WinMerge の履歴"
+
+#: about\index.php:78
+#, c-format
+msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr "現在の<a href=\"%s\">変更履歴はこちら</a>です。"
+
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr "このページでショートカットを生成することができます。"
+
+#: downloads\pad-file.php:5
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
+msgstr "あなたのWebサイトのために WinMerge 最新安定版に関する情報を得るもっとも簡単な方法は、ここで見つけられるPortable Application Description ファイルを参照することです:"
+
+#: translations\translations.inc:41
+#, c-format
+msgid "File not found."
+msgstr "ファイルが見つかりません。"
+
+#: downloads\index.php:9
+#: downloads\index.php:73
+#, c-format
+msgid "Project File Releases"
+msgstr "プロジェクトのファイルリリース"
+
+#: 404.php:9
+#, c-format
+msgid "Error 404 (Page Not Found)"
+msgstr "エラー 404 (ページが見つかりません)"
+
+#: downloads\index.php:52
+#, c-format
+msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
+msgstr "WinMerge をインストールするもっとも簡単な方法は、インストーラをダウンロードし、実行することです。インストーラ使用時の使い方については、<a href=\"%s\">オンラインマニュアル</a>をお読みください。"
+
+#: about\screenshots\index.php:23
+#, c-format
+msgid "In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares."
+msgstr "ツリー表示モードでは、フォルダはファイルやサブフォルダを含んだ展開や折り畳みが可能です。深くネストされたディレクトリ構造でも操作が容易になります。<em>ツリー表示は、再帰的比較のときのみ利用可能です。"
+
+#: index.php:42
+#: downloads\pad-file.php:96
+#: engine\page.inc:265
+#: support\index.php:8
+#: support\index.php:10
+#, c-format
+msgid "Support"
+msgstr "サポート"
+
+#: about\index.php:72
+#, c-format
+msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
+msgstr "<a href=\"%s\">インストーラ</a>をダウンロードし、ダブルクリックしていただくだけです。"
+
+#: downloads\source-code.php:34
+#, c-format
+msgid "You can <a href=\"%1$s\">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href=\"%2$s\">TortoiseSVN</a> installed):"
+msgstr "Web ブラウザで<a href=\"%1$s\">ソースコードのブラウズ</a>ができます。また、次のリンクをクリックすると全てのコードをチェックアウトすることができます。(もし、<a href=\"%2$s\">TortoiseSVN</a>がインストールされている場合)"
+
+#: downloads\source-code.php:5
+#, c-format
+msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
+msgstr "GNU General Public Licenseの下でリリースされている WinMerge のソースコードをダウンロード。"
+
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+#, c-format
+msgid "Translated"
+msgstr "翻訳済み"
+
+#: index.php:46
+#, c-format
+msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
+msgstr "WinMerge は、ボランティアによって開発・保守されているオープンソースのプロジェクトです。"
+
+#: about\index.php:24
+#, c-format
+msgid "Tabbed interface"
+msgstr "タブインターフェース"
+
+#: about\index.php:33
+#, c-format
+msgid "Location pane shows map of files compared"
+msgstr "ロケーションペインは、比較されたファイルのマップを表示します"
+
+#: about\screenshots\index.php:17
+#, c-format
+msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
+msgstr "WinMerge は、何通りかの方法でパスの選択・オープンができます。開く-ダイアログは、その内の一つです。"
+
+#: about\index.php:77
+#, c-format
+msgid "For information on using WinMerge, see our <a href=\"%s\">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use."
+msgstr "WinMerge の使用についての情報は、<a href=\"%s\">オンラインマニュアル</a>をご覧になるか、オフライン用のローカルヘルプファイル(WinMerge 内で<code>F1</code>を押下)をご使用ください。"
+
+#: about\index.php:73
+#, c-format
+msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
+msgstr "もしくは、単に<a href=\"%s\">バイナリ zip パッケージ</a>を目的のフォルダに展開し、 <code>WinMergeU.exe</code>(Windows98/MEユーザーは、<code>WinMerge.exe</code>)を実行するのでもかまいません。"
+
+#: downloads\pad-file.php:56
+#, c-format
+msgid "English Descriptions"
+msgstr "英語での説明"
+
+#: engine\page.inc:313
+#: support\index.php:37
+#, c-format
+msgid "Donate"
+msgstr "寄付"
+
+#: about\index.php:45
+#, c-format
+msgid "Version Control"
+msgstr "バージョン管理"
+
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr "翻訳済み: %d%%"
+
+#: about\screenshots\index.php:30
+#: about\screenshots\index.php:31
+#, c-format
+msgid "Splash Screen"
+msgstr "スプラッシュスクリーン"
+
+#: about\license.php:33
+#, c-format
+msgid "The Open Source Definition"
+msgstr "オープンソースの定義"
+
+#: downloads\pad-file.php:46
+#, c-format
+msgid "Supported Languages"
+msgstr "サポートしている言語"
+
+#: index.php:6
+#, c-format
+msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr "WinMerge は、オープンソースの Windows 用比較・マージツールです。WinMerge は、フォルダとファイル両方が比較でき、理解しやすく扱いやすいテキスト形式で差異をビジュアルに表現します。"
+
+#: downloads\index.php:67
+#, c-format
+msgid "Beta Versions"
+msgstr "ベータ版"
+
+#: downloads\pad-file.php:76
+#, c-format
+msgid "Screenshot"
+msgstr "スクリーンショット"
+
+#: about\index.php:6
+#, c-format
+msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
+msgstr "WinMerge, about, 機能, ファイル比較, フォルダ比較, バージョン管理, スクリーンショット, インストール"
+
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
+#, c-format
+msgid "Translate List"
+msgstr "翻訳リスト"
+
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
+#: downloads\plugins.php:5
+#, c-format
+msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
+msgstr "7-Zip プラグインや xdocdiff Plugin のような WinMerge 用追加プラグインをダウンロード。"
+
+#: translations\index.php:7
+#: translations\status_trunk.php:7
+#: translations\status_trunk.php:9
+#, c-format
+msgid "Translations Status (Unstable Trunk)"
+msgstr "翻訳状況 (不安定トランク)"
+
+#: support\index.php:12
+#, c-format
+msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
+msgstr "他の方法は、<a href=\"%s\">サポートメーリングリスト</a>を購読することです。"
+
+#: about\screenshots\index.php:5
+#, c-format
+msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
+msgstr "ファイル比較や、フォルダ比較結果、ロケーションペインのような WinMerge の機能のスクリーンショット"
+
+#: translations\translations.inc:85
+#: translations\translations_branch.inc:53
+#, c-format
+msgid "Untranslated: %d%%"
+msgstr "未翻訳: %d%%"
+
+#: index.php:43
+#, c-format
+msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
+msgstr "サポートが必要な場合は、より多くの情報が得られる<a href=\"%s\">サポートページ</a>をご覧ください。"
+
+#: engine\page.inc:318
+#, c-format
+msgid "Status (Stable Branch)"
+msgstr "状況 (安定ブランチ)"
+
+#: about\index.php:47
+#, c-format
+msgid "Creates patch files (Normal-, Context- and Unified formats)"
+msgstr "パッチファイル生成 (ノーマル、コンテキスト、ユニファイドフォーマット)"
+
+#: translations\instructions.php:9
+#, c-format
+msgid "The translations instructions are currently not available..."
+msgstr "翻訳インストラクションページは、現在ご利用できません..."
+
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr "バグ"
+
+#: downloads\plugins.php:31
+#, c-format
+msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
+msgstr "このプラグインを使用すると Word、Excel、PowerPoint、PDF やその他のファイルを比較することができます。"
+
+#: downloads\source-code.php:6
+#, c-format
+msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
+msgstr "WinMerge, フリー, ダウンロード, ソースコード, GPL, Subversion, SVN, TortoiseSVN"
+
+#: docs\releasenotes.php:5
+#, c-format
+msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
+msgstr "このリリースノートは、現在の WinMerge のバージョンでの重要な変更や機能の強化、バグ修正、既知の問題の短い概要です。"
+
+#: docs\changelog.php:6
+#, c-format
+msgid "WinMerge, change log, changes, release, tracker item, revision number"
+msgstr "WinMerge, 変更履歴, 変更, リリース, トラッカーアイテム, リビジョン番号"
+
+#: docs\releasenotes.php:6
+#, c-format
+msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
+msgstr "WinMerge, リリースノート, 概要, 変更, 機能強化, バグ修正, 既知の問題, リリース"
+
+#: downloads\pad-file.php:14
+#, c-format
+msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
+msgstr "<a href=\"%s\">PAD ファイル</a>と連携することができなかった場合、次の情報をご利用ください:"
+
+#: about\index.php:57
+#, c-format
+msgid "Localizable interface"
+msgstr "ローカライズ可能なインターフェース"
+
+#: about\index.php:56
+#, c-format
+msgid "Plugin support"
+msgstr "プラグインサポート"
+
+#: about\index.php:54
+#, c-format
+msgid "Shell Integration (supports 64-bit Windows versions)"
+msgstr "シェル統合 (64-bit Windows 版もサポート)"
+
+#: about\index.php:55
+#, c-format
+msgid "Archive file support using 7-Zip"
+msgstr "7-Zip を使用したアーカイブファイルサポート"
+
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
+#, c-format
+msgid "Translations Status (Stable Branch)"
+msgstr "翻訳状況 (安定ブランチ)"
+
+#: support\index.php:21
+#, c-format
+msgid "Tracker Statistics"
+msgstr "トラッカー統計"
+
+#: downloads\pad-file.php:64
+#, c-format
+msgid "English Keywords"
+msgstr "英語キーワード"
+
+#: engine\page.inc:304
+#, c-format
+msgid "Download WinMerge Source Code"
+msgstr "WinMerge のソースコードをダウンロード"
+
+#: downloads\pad-file.php:7
+#: downloads\pad-file.php:9
+#: downloads\pad-file.php:80
+#: engine\page.inc:305
+#, c-format
+msgid "PAD File"
+msgstr "PAD ファイル"
+
+#: downloads\index.php:13
+#: downloads\source-code.php:39
+#, c-format
+msgid "WinMerge %s"
+msgstr "WinMerge %s"
+
+#: translations\status_branch.php:14
+#: translations\translations.inc:285
+#, c-format
+msgid "Translators"
+msgstr "翻訳者"
+
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+#, c-format
+msgid "Fuzzy"
+msgstr "あいまい"
+
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
+msgstr "WinMerge, ドキュメント, マニュアル, リリースノート, 既知の問題, 変更履歴, 開発 Wiki"
+
+#: about\license.php:10
+#, c-format
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
+"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+"これは誰もが<a href=\"%s\">ソースコード</a>をダウンロードして改良したり変更したりすることができることを意味します。\n"
+"私たちが要求する事は、全ての WinMerge ユーザーが恩恵を受けられるように人々が行った改良や変更を私たちにフィードバックしていただくことだけです。"
+
+#: about\history.php:5
+#, c-format
+msgid "History of WinMerge releases with version numbers, release dates and manuals."
+msgstr "バージョン番号を伴った WinMerge リリースの履歴, リリース日付とマニュアル"
+
+#: downloads\plugins.php:11
+#, c-format
+msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
+msgstr "これは WinMerge 用の７-Zipプラグインです。現在のバージョンは、<strong>%1$s</strong> で、<strong>%2$s</strong> にリリースされています。"
+
+#: 404.php:23
+#, c-format
+msgid "<a href=\"%s\">Change Log</a>?"
+msgstr "<a href=\"%s\">変更履歴</a>?"
+
+#: about\index.php:27
+#, c-format
+msgid "File Compare"
+msgstr "ファイル比較"
+
+#: support\tracker-shortcuts.php:41
+#, c-format
+msgid "ID:"
+msgstr "ID:"
+
+#: about\index.php:15
+#, c-format
+msgid "Features"
+msgstr "機能"
+
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+#, c-format
+msgid "Archive"
+msgstr "アーカイブ"
+
+#: engine\engine.inc:20
+#, c-format
+msgid "German"
+msgstr "German"
+
+#: support\index.php:14
+#, c-format
+msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> &#8594; <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
+msgstr "できる限り多くの情報を添付してください。 ご使用の WinMerge のバージョン番号は必須です。可能であれば、WinMerge ウインドウで<span class=\"guimenu\">ヘルプ</span> &#8594; <span class=\"guimenuitem\">設定</span> をクリックして表示できる設定ログも添付してください。"
+
+#: engine\page.inc:261
+#: engine\page.inc:283
+#, c-format
+msgid "WinMerge Home"
+msgstr "WinMerge ホーム"
+
+#: about\index.php:19
+#, c-format
+msgid "General"
+msgstr "一般"
+
+#: docs\index.php:11
+#, c-format
+msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
+msgstr "この<a href=\"%s\">マニュアル</a>では、WinMerge の使い方や能力、制限を記載しています。"
+
+#: engine\page.inc:302
+#, c-format
+msgid "WinMerge"
+msgstr "WinMerge"
+
+#: downloads\plugins.php:30
+#, c-format
+msgid "xdocdiff Plugin"
+msgstr "xdocdiff Plugin"
+
+#: support\tracker-shortcuts.php:17
+#, c-format
+msgid "Todo Item"
+msgstr "Todo 項目"
+
+#: support\mailing-lists.php:67
+#, c-format
+msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
+msgstr "これは 参加している WinMerge の開発者が会って、問題やコードの変更/追加等を議論するリストです。"
+
+#: downloads\index.php:22
+#: downloads\plugins.php:17
+#, c-format
+msgid "Exe-Format (%s MB)"
+msgstr "Exe 形式 (%s MB)"
+
+#: engine\page.inc:303
+#, c-format
+msgid "Plugins"
+msgstr "プラグイン"
+
+#: support\mailing-lists.php:6
+#, c-format
+msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
+msgstr "WinMerge, メーリングリスト, アナウンス, サポート, ユーザー, 翻訳, 開発, SVN"
+
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
+#, c-format
+msgid "Change Log"
+msgstr "変更履歴"
+
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+msgstr "生成"
+
+#: about\index.php:23
+#, c-format
+msgid "Unicode support"
+msgstr "ユニコードサポート"
+
+#: support\index.php:39
+#, c-format
+msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
+msgstr "しかしながら、WinMerge の開発継続をサポートするために<a href=\"%s\">寄付</a>をご考慮ください。"
+
+#: downloads\pad-file.php:74
+#, c-format
+msgid "Information"
+msgstr "情報"
+
+#: engine\page.inc:263
+#: engine\page.inc:294
+#, c-format
+msgid "WinMerge Documentation"
+msgstr "WinMerge ドキュメント"
+
+#: downloads\source-code.php:11
+#, c-format
+msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
+msgstr "WinMerge は、<a href=\"%s\">GNU 一般公衆利用許諾契約書</a>の下でリリースされています。このことは、全ソースコードを取得し、ご自身でプログラムをビルドできることを意味しています。"
+
+#: about\index.php:40
+#, c-format
+msgid "Fast compare using file sizes and dates"
+msgstr "ファイルサイズと日付を使用した高速な比較"
+
+#: support\mailing-lists.php:24
+#: support\mailing-lists.php:34
+#: support\mailing-lists.php:44
+#: support\mailing-lists.php:54
+#: support\mailing-lists.php:64
+#: support\mailing-lists.php:74
+#, c-format
+msgid "Unsubscribe"
+msgstr "購読停止"
+
+#: about\license.php:14
+#, c-format
+msgid "GNU General Public License"
+msgstr "GNU 一般公衆利用許諾契約書"
+
+#: translations\translations.inc:85
+#: translations\translations.inc:97
+#: translations\translations.inc:135
+#: translations\translations_branch.inc:53
+#: translations\translations_branch.inc:70
+#: translations\translations_branch.inc:120
+#, c-format
+msgid "Untranslated"
+msgstr "未訳"
+
+#: about\screenshots\index.php:24
+#: about\screenshots\index.php:25
+#, c-format
+msgid "Highlight Line Diff"
+msgstr "行内差異の強調表示"
+
+#: index.php:15
+#: about\index.php:66
+#: about\screenshots\index.php:12
+#: about\screenshots\index.php:13
+#, c-format
+msgid "File Comparison"
+msgstr "ファイル比較"
+
+#: engine\page.inc:261
+#, c-format
+msgid "Home"
+msgstr "ホーム"
+
+#: support\mailing-lists.php:37
+#, c-format
+msgid "You should ask all your support questions on this list."
+msgstr "このリストでサポートを受けるための質問をすべきです。"
+
+#: about\index.php:52
+#, c-format
+msgid "Other"
+msgstr "その他"
+
+#: 404.php:27
+#, c-format
+msgid "<a href=\"%s\">Support</a>?"
+msgstr "<a href=\"%s\">サポート</a>?"
+
+#: engine\engine.inc:22
+#, c-format
+msgid "Dutch"
+msgstr "Dutch"
+
+#: support\index.php:7
+#, c-format
+msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
+msgstr "WinMerge, サポート, ディスカッションフォーラム, メーリングリスト, トラッカー, 寄付, バグ, サポート要求, パッチ, 機能要求, todo, オープンソース, sourceforge.net"
+
+#: downloads\index.php:31
+#, c-format
+msgid "Runtimes"
+msgstr "ランタイムライブラリ"
+
+#: about\index.php:49
+#, c-format
+msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
+msgstr "基本的な Visual SourceSafe と Rational ClearCase 統合"
+
+#: translations\translations.inc:180
+#: translations\translations_branch.inc:106
+#, c-format
+msgid "Total: %d"
+msgstr "合計: %d"
+
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr "多い投稿量"
+
+#: 404.php:18
+#, c-format
+msgid "<a href=\"%s\">Screenshots</a>?"
+msgstr "<a href=\"%s\">スクリーンショット</a>?"
+
+#: docs\index.php:16
+#: engine\page.inc:299
+#, c-format
+msgid "Development Wiki"
+msgstr "開発 Wiki"
+
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr "合計: 不明"
+
+#: about\index.php:69
+#, c-format
+msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
+msgstr "<a href=\"%s\">スクリーンショットページ</a>でより多くのスクリーンショットをご覧いただけます。"
+
+#: index.php:37
+#: downloads\index.php:88
+#, c-format
+msgid "Y-m-d"
+msgstr "Y-m-d"
+
+#: translations\instructions.php:5
+#: translations\instructions.php:8
+#, c-format
+msgid "Translations instructions"
+msgstr "翻訳インストラクション"
+
+#: engine\page.inc:310
+#, c-format
+msgid "WinMerge Mailing Lists"
+msgstr "WinMerge メーリングリスト"
+
+#: downloads\index.php:68
+#, c-format
+msgid "Experimental Builds"
+msgstr "実験版ビルド"
+
+#: engine\page.inc:313
+#, c-format
+msgid "Donate money to WinMerge"
+msgstr "WinMerge に寄付する"
+
+#: downloads\index.php:66
+#, c-format
+msgid "Stable Versions"
+msgstr "安定版"
+
+#: engine\page.inc:262
+#, c-format
+msgid "About"
+msgstr "WinMerge について"
+
+#: downloads\pad-file.php:92
+#, c-format
+msgid "Name"
+msgstr "名前"
+
+#: about\license.php:7
+#: about\license.php:9
+#: engine\page.inc:291
+#, c-format
+msgid "License"
+msgstr "ライセンス"
+
+#: downloads\index.php:63
+#, c-format
+msgid "Other Versions"
+msgstr "その他のバージョン"
+
+#: engine\page.inc:309
+#, c-format
+msgid "Discussion Forums"
+msgstr "ディスカッションフォーラム"
+
+#: downloads\pad-file.php:38
+#, c-format
+msgid "Release Date"
+msgstr "リリース日"
+
+#: support\index.php:13
+#, c-format
+msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
+msgstr "バグを発見した場合、<a href=\"%s\">バグ報告</a>としてご報告ください。"
+
+#: downloads\source-code.php:37
+#, c-format
+msgid "Developer Version"
+msgstr "開発版"
+
+#: index.php:7
+#, c-format
+msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
+msgstr "WinMerge, フリー, オープンソース, Windows, windiff, diff, マージ, 比較, ツール, ユーティリティ, テキスト, ファイル, フォルダ, ディレクトリ, ファイル比較, フォルダ比較, ファイルのマージ, フォルダのマージ, diff ツール, マージツール, 比較ツール"
+
+#: engine\page.inc:230
+#, c-format
+msgid "Download Now!"
+msgstr "今すぐダウンロード!"
+
+#: index.php:39
+#, c-format
+msgid "View all news&hellip;"
+msgstr "すべてのニュースを表示する &hellip;"
+
+#: about\index.php:37
+#, c-format
+msgid "Folder Compare"
+msgstr "フォルダ比較"
+
+#: docs\index.php:12
+#: docs\releasenotes.php:7
+#: docs\releasenotes.php:10
+#: engine\page.inc:296
+#, c-format
+msgid "Release Notes"
+msgstr "リリースノート"
+
+#: engine\page.inc:317
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr "WinMerge 翻訳インストラクション"
+
+#: engine\page.inc:296
+#, c-format
+msgid "WinMerge Release Notes"
+msgstr "WinMerge リリースノート"
+
+#: index.php:26
+#, c-format
+msgid "WinMerge %s - latest stable version"
+msgstr "WinMerge %s - 最新安定版"
+
+#: translations\index.php:32
+#, c-format
+msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
+msgstr "これらの翻訳を更新したり、別の翻訳を追加していただけるのであれば、<a href=\"%s\">このインストラクション</a>に従って行っていただくようお願いします。"
+
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr "翻訳する"
+
+#: about\screenshots\index.php:15
+#: about\screenshots\index.php:16
+#, c-format
+msgid "Open-dialog"
+msgstr "開く-ダイアログ"
+
+#: downloads\index.php:90
+#, c-format
+msgid "View all file releases&hellip;"
+msgstr "すべてのリリースされたファイルをみる&hellip;"
+
+#: about\index.php:5
+#: about\index.php:12
+#, c-format
+msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
+msgstr "WinMerge は、プロジェクトのバージョン間で何が変更されたかを調べたり、バージョン間で変更をマージするのに非常に役立ちます。WinMerge は、外部比較/マージツールやスタンドアロンアプリケーションとしてご使用いただけます。"
+
+#: downloads\source-code.php:7
+#: downloads\source-code.php:10
+#, c-format
+msgid "Download Source Code"
+msgstr "ソースコードのダウンロード"
+
+#: support\mailing-lists.php:23
+#: support\mailing-lists.php:33
+#: support\mailing-lists.php:43
+#: support\mailing-lists.php:53
+#: support\mailing-lists.php:63
+#: support\mailing-lists.php:73
+#, c-format
+msgid "Subscribe"
+msgstr "購読"
+
+#: support\mailing-lists.php:16
+#: support\mailing-lists.php:60
+#, c-format
+msgid "Development List"
+msgstr "開発リスト"
+
+#: about\index.php:34
+#, c-format
+msgid "Moved lines detection"
+msgstr "移動行検出"
+
+#: downloads\index.php:69
+#, c-format
+msgid "(by PortableApps.com)"
+msgstr "(by PortableApps.com)"
+
+#: about\license.php:10
+#, c-format
+msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
+msgstr "WinMerge は、<a href=\"%2$s\">GNU一般公衆利用許諾契約書</a>の下の<a href=\"%1$s\">オープンソース</a>ソフトウェアです。 "
+
+#: engine\page.inc:291
+#, c-format
+msgid "WinMerge License"
+msgstr "WinMerge のライセンス"
+
+#: about\history.php:6
+#, c-format
+msgid "WinMerge, history, version number, release date, manual, users guide"
+msgstr "WinMerge, 履歴, バージョン番号, リリース日付, マニュアルl, ユーザーガイド"
+
+#: downloads\index.php:10
+#: downloads\index.php:12
+#: engine\page.inc:302
+#, c-format
+msgid "Download WinMerge"
+msgstr "WinMerge のダウンロード"
+
+#: engine\page.inc:369
+#, c-format
+msgid "Bookmark this on Delicious"
+msgstr "このページを Delicious へブックマークする"
+
+#: downloads\pad-file.php:44
+#, c-format
+msgid "Operating Systems"
+msgstr "オペレーションシステム"
+
+#: about\screenshots\index.php:14
+#, c-format
+msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
+msgstr "ファイル比較ウインドウでは、基本的には2つの横に並んだエディタペインで、開いた2つのファイルを表示します。小さな変更を簡単に行える編集機能があるため、他のエディタや開発環境でファイルを開く必要がありません。"
+


Property changes on: trunk/Translations/Web/ja.po
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/Translations/WinMerge/Japanese.po
===================================================================
--- trunk/Translations/WinMerge/Japanese.po	2009-09-21 08:32:26 UTC (rev 6995)
+++ trunk/Translations/WinMerge/Japanese.po	2009-09-27 13:10:27 UTC (rev 6996)
@@ -290,12 +290,12 @@
 #: Merge.rc:152
 #, c-format
 msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "\x8E蓮\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D(&N)"
 
 #: Merge.rc:153
 #, c-format
 msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "\x8E\xA9\x93\xAE\x94\xE4\x8Ar\x91O\x8F\x88\x97\x9D(&U)"
 
 #: Merge.rc:155
 #: Merge.rc:276
@@ -1951,7 +1951,7 @@
 #: Merge.rc:1226
 #, c-format
 msgid "W&ord break characters:"
-msgstr ""
+msgstr "\x92P\x8C\xEA\x8B\xE6\x90؂蕶\x8E\x9A(&O)"
 
 #: Merge.rc:1239
 #, c-format
@@ -2021,7 +2021,7 @@
 #: Merge.rc:1272
 #, c-format
 msgid "Disca&rd All"
-msgstr ""
+msgstr "\x82\xB7\x82ׂĔj\x8A\xFC\x82\xB7\x82\xE9(&R)"
 
 #: Merge.rc:1279
 #: Merge.rc:1527


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


...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[6995] trunk/Translations/GetTranslationsStatus.py

From: <ge...@us...> - 2009-09-21 08:32:32

Revision: 6995
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6995&view=rev
Author:   gerundt
Date:     2009-09-21 08:32:26 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
PATCH: [ 2802270 ] GetTranslationsStatus script in Python - Switch to UTF-8 output

Modified Paths:
--------------
    trunk/Translations/GetTranslationsStatus.py

Modified: trunk/Translations/GetTranslationsStatus.py
===================================================================
--- trunk/Translations/GetTranslationsStatus.py	2009-09-21 08:25:38 UTC (rev 6994)
+++ trunk/Translations/GetTranslationsStatus.py	2009-09-21 08:32:26 UTC (rev 6995)
@@ -32,6 +32,7 @@
 import string
 import re
 import time
+import codecs
 
 class TranslationsStatus(object):
     def __init__(self):
@@ -70,8 +71,8 @@
         self._projects.append(project)
     
     def writeToXmlFile(self, xmlpath):
-        xmlfile = open(xmlpath, 'w')
-        xmlfile.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n')
+        xmlfile = codecs.open(xmlpath, 'w', 'utf-8')
+        xmlfile.write('<?xml version="1.0" encoding="UTF-8"?>\n')
         xmlfile.write('<status>\n')
         xmlfile.write('  <update>%s</update>\n' % (time.strftime('%Y-%m-%d')))
         for project in self._projects: #For all projects...
@@ -118,14 +119,14 @@
         xmlfile.close()
     
     def writeToHtmlFile(self, htmlpath):
-        htmlfile = open(htmlpath, 'w')
+        htmlfile = codecs.open(htmlpath, 'w', 'utf-8')
         
         htmlfile.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"\n')
         htmlfile.write('  "http://www.w3.org/TR/html4/loose.dtd">\n')
         htmlfile.write('<html>\n')
         htmlfile.write('<head>\n')
         htmlfile.write('  <title>Translations Status</title>\n')
-        htmlfile.write('  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">\n')
+        htmlfile.write('  <meta http-equiv="content-type" content="text/html; charset=UTF-8">\n')
         htmlfile.write('  <style type="text/css">\n')
         htmlfile.write('  <!--\n')
         htmlfile.write('    body {\n')
@@ -285,6 +286,10 @@
         return self._template
     
     @property
+    def charset(self):
+        return self._charset
+    
+    @property
     def language(self):
         if self._poeditlanguage: #If "X-Poedit-Language"...
             return self._poeditlanguage
@@ -341,6 +346,7 @@
     def __init__(self, filepath, template):
         self._filepath = filepath
         self._template = template
+        self._charset = self._getCharsetFromPoFile(filepath)
         self._count = 0
         self._translated = 0
         self._untranslated = 0
@@ -365,7 +371,8 @@
           bIsFuzzy = False
           bIsMaintainer = False
           
-          pofile = open(filepath, 'r')
+          encoding = self._charset.lower()
+          pofile = codecs.open(filepath, 'r', encoding)
           for line in pofile: #For all lines...
               line = line.strip()
               if line: #If NOT empty line...
@@ -439,6 +446,27 @@
             return self._potcreationdate
         else: #if NOT template...
             return self._porevisiondate
+    
+    def _getCharsetFromPoFile(self, filepath):
+        charset = ''
+        if os.access(filepath, os.R_OK): #If PO(T) file can read...
+            reContentTypeCharset = re.compile('charset=([A-Z0-9\-]+)', re.IGNORECASE)
+            rePoeditSourceCharset = re.compile('X-Poedit-SourceCharset: ([A-Z0-9\-]+)', re.IGNORECASE)
+            
+            pofile = open(filepath, 'r')
+            for line in pofile: #For all lines...
+                line = line.strip()
+                
+                tmp = reContentTypeCharset.findall(line)
+                if tmp: #If "Content-Type-Charset"...
+                    charset = tmp[0]
+                    break
+                tmp = rePoeditSourceCharset.findall(line)
+                if tmp: #If "X-Poedit-SourceCharset"...
+                    charset = tmp[0]
+                    break
+            pofile.close()
+        return charset
 
 class InnoSetupProject(Project):
     def __init__(self, name, templatefile, translationsdir):


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

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

From: <ge...@us...> - 2009-09-21 08:25:48

Revision: 6994
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6994&view=rev
Author:   gerundt
Date:     2009-09-21 08:25:38 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
Fix name form Croatian translator "Hasan Osmanagi?\196?\135"

Modified Paths:
--------------
    trunk/Docs/Users/Contributors.txt
    trunk/Translations/WinMerge/Croatian.po

Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt	2009-09-21 08:11:28 UTC (rev 6993)
+++ trunk/Docs/Users/Contributors.txt	2009-09-21 08:25:38 UTC (rev 6994)
@@ -40,7 +40,7 @@
   Koko <kok...@gi...>
 
 * Croatian:
-  Hasan Osmanag\xE6 <has...@pu...>
+  Hasan Osmanagi\xE6 <has...@pu...>
 
 * Czech:
   Jiri Tax <jt...@ta...>

Modified: trunk/Translations/WinMerge/Croatian.po
===================================================================
--- trunk/Translations/WinMerge/Croatian.po	2009-09-21 08:11:28 UTC (rev 6993)
+++ trunk/Translations/WinMerge/Croatian.po	2009-09-21 08:25:38 UTC (rev 6994)
@@ -2,7 +2,7 @@
 # Released under the "GNU General Public License"
 #
 # Translators:
-# * Hasan Osmanag\xE6 <hasan.osmanagic at public.carnet.hr>
+# * Hasan Osmanagi\xE6 <hasan.osmanagic at public.carnet.hr>
 #
 # ID line follows -- this is updated by SVN
 # $Id$


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

[Winmerge-svn] SF.net SVN: winmerge:[6993] trunk/Translations/Web/nl.po

From: <ge...@us...> - 2009-09-21 08:11:40

Revision: 6993
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6993&view=rev
Author:   gerundt
Date:     2009-09-21 08:11:28 +0000 (Mon, 21 Sep 2009)

Log Message:
-----------
Fix Maintainer entry in Dutch website PO file

Modified Paths:
--------------
    trunk/Translations/Web/nl.po

Modified: trunk/Translations/Web/nl.po
===================================================================
--- trunk/Translations/Web/nl.po	2009-09-21 07:43:18 UTC (rev 6992)
+++ trunk/Translations/Web/nl.po	2009-09-21 08:11:28 UTC (rev 6993)
@@ -2,7 +2,7 @@
 # Released under the "GNU General Public License"
 #
 # Maintainer:
-# * Thomas De Rocker <tho...@ya...
+# * Thomas De Rocker <tho...@ya...>
 #
 # ID line follows -- this is updated by SVN
 # $Id$


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

1 message has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 22 23 24 25 26 .. 163 > >> (Page 24 of 163)