winmerge-svn Mailing List for WinMerge (Page 26)

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 .. 24 25 26 27 28 .. 163 > >> (Page 26 of 163)

[Winmerge-svn] SF.net SVN: winmerge:[6967] trunk/Web/404.php

From: <ge...@us...> - 2009-08-21 19:10:42

Revision: 6967
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6967&view=rev
Author:   gerundt
Date:     2009-08-21 19:10:34 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Web: Make 404 error page translatable - Drop URLs from strings

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

Modified: trunk/Web/404.php
===================================================================
--- trunk/Web/404.php	2009-08-21 18:35:25 UTC (rev 6966)
+++ trunk/Web/404.php	2009-08-21 19:10:34 UTC (rev 6967)
@@ -15,17 +15,17 @@
   $page->printSubHeading(__('Were you looking for...'));
 ?>
 <ul>
-  <li><?php __e('<a href="/about/screenshots/">Screenshots</a>?');?></li>
-  <li><?php __e('<a href="/docs/">Documentation</a>?');?>
+  <li><?php __e('<a href="%s">Screenshots</a>?', '/about/screenshots/');?></li>
+  <li><?php __e('<a href="%s">Documentation</a>?', '/docs/');?>
     <ul>
-      <li><?php __e('<a href="/docs/manual/">Manual</a>?');?></li>
-      <li><?php __e('<a href="/docs/releasenotes.php">Release Notes</a>?');?></li>
-      <li><?php __e('<a href="/docs/changelog.php">Change Log</a>?');?></li>
+      <li><?php __e('<a href="%s">Manual</a>?', '/docs/manual/');?></li>
+      <li><?php __e('<a href="%s">Release Notes</a>?', '/docs/releasenotes.php');?></li>
+      <li><?php __e('<a href="%s">Change Log</a>?', '/docs/changelog.php');?></li>
     </ul>
   </li>
-  <li><?php __e('<a href="/downloads/">Downloads</a>?');?></li>
-  <li><?php __e('<a href="/support/">Support</a>?');?></li>
-  <li><?php __e('<a href="/translations/">Translations</a>?');?></li>
+  <li><?php __e('<a href="%s">Downloads</a>?', '/downloads/');?></li>
+  <li><?php __e('<a href="%s">Support</a>?', '/support/');?></li>
+  <li><?php __e('<a href="%s">Translations</a>?', '/translations/');?></li>
 </ul>
 <?php
   $page->printDownloadNow();


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

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

From: <ge...@us...> - 2009-08-21 18:35:31

Revision: 6966
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6966&view=rev
Author:   gerundt
Date:     2009-08-21 18:35:25 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Web: Make "Bookmark this on Delicious" string translatable

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

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-08-21 18:05:48 UTC (rev 6965)
+++ trunk/Web/engine/page.inc	2009-08-21 18:35:25 UTC (rev 6966)
@@ -363,7 +363,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 .= "<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 .= "<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;
     }

Modified: trunk/Web/translations/translations_branch.inc
===================================================================
--- trunk/Web/translations/translations_branch.inc	2009-08-21 18:05:48 UTC (rev 6965)
+++ trunk/Web/translations/translations_branch.inc	2009-08-21 18:35:25 UTC (rev 6966)
@@ -103,7 +103,7 @@
     $temp .= "  <tr>\n";
     $temp .= "    <td class=\"left\"><a href=\"" . $svnurl . $english_file_name . "\" rel=\"nofollow\">" . __('English (Template)') . "</a></td>\n";
     $temp .= "    <td class=\"center\"></td>\n";
-    $temp .= "    <td colspan=\"3\" class=\"center\">" . __('Total: %s', $english_strings_count) . "</td>\n";
+    $temp .= "    <td colspan=\"3\" class=\"center\">" . __('Total: %d', $english_strings_count) . "</td>\n";
     $temp .= "    <td class=\"center\">" . $english_translation_update . "</td>\n";
     $temp .= "  </tr>\n";
     $temp .= "</table>\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:[6965] trunk/Web/404.php

From: <ge...@us...> - 2009-08-21 18:05:54

Revision: 6965
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6965&view=rev
Author:   gerundt
Date:     2009-08-21 18:05:48 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Web: Make 404 error page translatable

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

Modified: trunk/Web/404.php
===================================================================
--- trunk/Web/404.php	2009-08-21 17:45:12 UTC (rev 6964)
+++ trunk/Web/404.php	2009-08-21 18:05:48 UTC (rev 6965)
@@ -6,27 +6,28 @@
   include('engine/engine.inc');
 
   $page = new Page;
-  $page->printHead('Error 404 (Page Not Found)', TAB_HOME);
+  $page->printHead(__('Error 404 (Page Not Found)'), TAB_HOME);
+
+  $page->printHeading(__('Page Not Found...'));
+  $page->printPara(__('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.'),
+                   __('This site has recently undergone a major re-working, so that might explain why you got this page instead.'));
+
+  $page->printSubHeading(__('Were you looking for...'));
 ?>
-<h2>Page Not Found...</h2>
-<p>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.
-This site has recently undergone a major re-working, so that might explain why you got this page instead.</p>
-
-<h3>Were you looking for...</h3>
 <ul>
-  <li><a href="/about/screenshots/">Screenshots</a>?</li>
-  <li><a href="/docs/">Documentation</a>?
+  <li><?php __e('<a href="/about/screenshots/">Screenshots</a>?');?></li>
+  <li><?php __e('<a href="/docs/">Documentation</a>?');?>
     <ul>
-      <li><a href="/docs/manual/">Manual</a>?</li>
-      <li><a href="/docs/releasenotes.php">Release Notes</a>?</li>
-      <li><a href="/docs/changelog.php">Change Log</a>?</li>
+      <li><?php __e('<a href="/docs/manual/">Manual</a>?');?></li>
+      <li><?php __e('<a href="/docs/releasenotes.php">Release Notes</a>?');?></li>
+      <li><?php __e('<a href="/docs/changelog.php">Change Log</a>?');?></li>
     </ul>
   </li>
-  <li><a href="/downloads/">Downloads</a>?</li>
-  <li><a href="/support/">Support</a>?</li>
-  <li><a href="/translations/">Translations</a>?</li>
+  <li><?php __e('<a href="/downloads/">Downloads</a>?');?></li>
+  <li><?php __e('<a href="/support/">Support</a>?');?></li>
+  <li><?php __e('<a href="/translations/">Translations</a>?');?></li>
 </ul>
-<?php $page->printDownloadNow(); ?>
 <?php
+  $page->printDownloadNow();
   $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:[6964] trunk/Translations/Web

From: <ge...@us...> - 2009-08-21 17:45:27

Revision: 6964
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6964&view=rev
Author:   gerundt
Date:     2009-08-21 17:45:12 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Update web POT file and add a initial German PO file

Modified Paths:
--------------
    trunk/Translations/Web/en-US.pot

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

Added: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po	                        (rev 0)
+++ trunk/Translations/Web/de.po	2009-08-21 17:45:12 UTC (rev 6964)
@@ -0,0 +1,1506 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# Maintainer:
+# * Tim Gerundt <tim at gerundt.de>
+#
+# 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: \n"
+"PO-Revision-Date: 2009-08-21 19:45+0000\n"
+"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
+"Language-Team: German <win...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../Web/\n"
+
+#: downloads\index.php:22
+#, c-format
+msgid "Exe-Format (%s MB)"
+msgstr "Exe-Format (%s MB)"
+
+#: translations\index.php:36
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: docs\changelog.php:11
+#, c-format
+msgid "The change log is currently not available..."
+msgstr ""
+
+#: downloads\index.php:55
+#, c-format
+msgid "Requirements"
+msgstr "Voraussetzungen"
+
+#: 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 ""
+
+#: about\license.php:35
+#, c-format
+msgid "Open Source Software"
+msgstr ""
+
+#: index.php:13
+#, c-format
+msgid "What is WinMerge?"
+msgstr "Was ist WinMerge?"
+
+#: 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 ""
+
+#: engine\page.inc:295
+#, c-format
+msgid "WinMerge Change Log"
+msgstr ""
+
+#: 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 "Vorlage"
+
+#: index.php:45
+#, c-format
+msgid "Developers"
+msgstr "Entwickler"
+
+#: 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 ""
+
+#: translations\status_branch.php:18
+#: translations\status_trunk.php:18
+#, c-format
+msgid "The translations status is currently not available..."
+msgstr ""
+
+#: engine\page.inc:306
+#, c-format
+msgid "WinMerge Discussion Forums"
+msgstr "WinMerge Diskussionsforen"
+
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr ""
+
+#: engine\page.inc:302
+#, c-format
+msgid "WinMerge PAD File"
+msgstr "WinMerge PAD-Datei"
+
+#: about\screenshots\index.php:26
+#, c-format
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
+msgstr ""
+
+#: translations\instructions.php:15
+#, c-format
+msgid "Source: %s"
+msgstr "Quelle: %s"
+
+#: 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 ""
+
+#: support\tracker-shortcuts.php:55
+#, c-format
+msgid "Subdomains"
+msgstr "Subdomänen"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:287
+#, c-format
+msgid "History"
+msgstr "Historie"
+
+#: support\mailing-lists.php:27
+#, c-format
+msgid "This list is only for announcing new releases of WinMerge."
+msgstr ""
+
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
+#, c-format
+msgid "Announce List"
+msgstr ""
+
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+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\source-code.php:18
+#, c-format
+msgid "7z-Format (%s MB)"
+msgstr "7z-Format (%s MB)"
+
+#: about\license.php:34
+#, c-format
+msgid "GNU General Public License v2.0"
+msgstr ""
+
+#: about\index.php:71
+#, c-format
+msgid "Installation"
+msgstr "Installation"
+
+#: about\index.php:58
+#, c-format
+msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
+msgstr ""
+
+#: engine\page.inc:309
+#, c-format
+msgid "WinMerge Tracker Shortcuts"
+msgstr ""
+
+#: 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 ""
+
+#: support\tracker-shortcuts.php:14
+#, c-format
+msgid "Patch"
+msgstr "Patch"
+
+#: 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 ""
+
+#: 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:262
+#: engine\page.inc:305
+#, c-format
+msgid "WinMerge Support"
+msgstr "WinMerge Support"
+
+#: 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:307
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
+#, c-format
+msgid "Mailing Lists"
+msgstr "Verteilerlisten"
+
+#: about\index.php:41
+#, c-format
+msgid "Compares one folder or includes all subfolders"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: downloads\index.php:25
+#, c-format
+msgid "Binaries"
+msgstr "Binärdateien"
+
+#: engine\page.inc:294
+#, c-format
+msgid "WinMerge Known Issues"
+msgstr "Bekannte WinMerge Probleme"
+
+#: about\index.php:76
+#, c-format
+msgid "Using WinMerge"
+msgstr "WinMerge verwenden"
+
+#: 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 ""
+
+#: about\license.php:30
+#: engine\page.inc:281
+#, c-format
+msgid "Links"
+msgstr "Links"
+
+#: index.php:49
+#, c-format
+msgid "The WinMerge Development Team"
+msgstr "Das WinMerge-Entwicklerteam"
+
+#: 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-Liste"
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr "Diagramm"
+
+#: 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 ""
+
+#: about\index.php:31
+#, c-format
+msgid "Highlights differences inside lines"
+msgstr ""
+
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr ""
+
+#: translations\translations.inc:38
+#, c-format
+msgid "File not valid."
+msgstr "Datei nicht gültig."
+
+#: 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 ""
+
+#: engine\page.inc:315
+#, c-format
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr ""
+
+#: 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 ""
+
+#: about\index.php:32
+#, c-format
+msgid "Difference pane shows current difference in two vertical panes"
+msgstr ""
+
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+
+#: 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 ""
+
+#: 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 ""
+
+#: engine\engine.inc:19
+#: translations\index.php:24
+#, c-format
+msgid "English"
+msgstr "Englisch"
+
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr ""
+
+#: engine\page.inc:280
+#: engine\page.inc:285
+#: engine\page.inc:291
+#: engine\page.inc:305
+#: engine\page.inc:313
+#, c-format
+msgid "Index"
+msgstr "Index"
+
+#: engine\page.inc:300
+#, c-format
+msgid "Download WinMerge Plugins"
+msgstr "WinMerge Plugins herunterladen"
+
+#: index.php:20
+#, c-format
+msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
+msgstr ""
+
+#: translations\index.php:11
+#, c-format
+msgid "We currently have WinMerge translated into the languages listed below:"
+msgstr ""
+
+#: 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 ""
+
+#: translations\translations.inc:131
+#: translations\translations.inc:288
+#: translations\translations_branch.inc:66
+#: translations\translations_branch.inc:182
+#, c-format
+msgid "Language"
+msgstr "Sprache"
+
+#: translations\instructions.php:5
+#: translations\instructions.php:8
+#, c-format
+msgid "Translations instructions"
+msgstr ""
+
+#: engine\page.inc:316
+#, c-format
+msgid "Status (Unstable Trunk)"
+msgstr ""
+
+#: engine\page.inc:261
+#, c-format
+msgid "WinMerge Downloads"
+msgstr "WinMerge Downloads"
+
+#: downloads\index.php:70
+#, c-format
+msgid "Japanese WinMerge Version"
+msgstr "Japanische WinMerge-Version"
+
+#: engine\page.inc:308
+#, c-format
+msgid "Tracker"
+msgstr ""
+
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:295
+#, c-format
+msgid "Change Log"
+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 "Unklar: %d%%"
+
+#: docs\changelog.php:5
+#, c-format
+msgid "The change log is a more complete list of changes in the last WinMerge releases."
+msgstr ""
+
+#: downloads\index.php:8
+#, c-format
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr ""
+
+#: engine\page.inc:296
+#, c-format
+msgid "WinMerge Development Wiki"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: index.php:16
+#, c-format
+msgid "More Screenshots&hellip;"
+msgstr "Mehr Screenshots&hellip;"
+
+#: about\index.php:48
+#, c-format
+msgid "Resolve conflict files"
+msgstr ""
+
+#: engine\page.inc:261
+#, c-format
+msgid "Downloads"
+msgstr "Downloads"
+
+#: translations\index.php:29
+#, c-format
+msgid "To change languages, select the desired language from the <span class=\"guimenu\">View</span>&#8594; <span class=\"guimenuitem\">Languages</span> menu choice."
+msgstr ""
+
+#: engine\page.inc:263
+#: translations\index.php:8
+#: translations\index.php:10
+#, c-format
+msgid "Translations"
+msgstr "Übersetzungen"
+
+#: engine\page.inc:282
+#, c-format
+msgid "Project Page"
+msgstr "Projektseite"
+
+#: about\index.php:7
+#: about\index.php:10
+#: engine\page.inc:259
+#: engine\page.inc:285
+#, c-format
+msgid "About WinMerge"
+msgstr "Über WinMerge"
+
+#: engine\page.inc:263
+#: engine\page.inc:313
+#, c-format
+msgid "WinMerge Translations"
+msgstr "WinMerge Übersetzungen"
+
+#: 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 ""
+
+#: 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 ""
+
+#: engine\page.inc:294
+#, c-format
+msgid "Known Issues"
+msgstr "Bekannte Probleme"
+
+#: translations\translations.inc:136
+#: translations\translations_branch.inc:71
+#, c-format
+msgid "Last Update"
+msgstr "Letztes Update"
+
+#: engine\page.inc:301
+#, c-format
+msgid "Source Code"
+msgstr "Quelltext"
+
+#: 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-Format (%s MB)"
+
+#: support\tracker-shortcuts.php:18
+#, c-format
+msgid "Tracker Item"
+msgstr ""
+
+#: translations\translations_branch.inc:183
+#, c-format
+msgid "Translator(s)"
+msgstr "Übersetzer"
+
+#: docs\index.php:7
+#: docs\index.php:9
+#: engine\page.inc:260
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: about\history.php:19
+#: docs\index.php:10
+#: engine\page.inc:292
+#, c-format
+msgid "Manual"
+msgstr "Handbuch"
+
+#: docs\index.php:17
+#, c-format
+msgid "The <a href=\"%s\">Development Wiki</a> contains many informations about the WinMerge development."
+msgstr ""
+
+#: index.php:8
+#: index.php:30
+#, c-format
+msgid "Project News"
+msgstr "Projekt-Neuigkeiten"
+
+#: 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 ""
+
+#: about\license.php:6
+#, c-format
+msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
+msgstr ""
+
+#: engine\page.inc:282
+#, c-format
+msgid "WinMerge Project Page"
+msgstr "WinMerge Projektseite"
+
+#: downloads\index.php:40
+#: downloads\source-code.php:24
+#, c-format
+msgid "SHA-1 Checksums"
+msgstr "SHA-1 Prüfsummen"
+
+#: engine\page.inc:228
+#, c-format
+msgid "Version %1$s; %2$s MB"
+msgstr "Version %1$s; %2$s MB"
+
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr ""
+
+#: 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 "Übersetzt"
+
+#: support\tracker-shortcuts.php:6
+#, c-format
+msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
+msgstr ""
+
+#: 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 ""
+
+#: translations\index.php:39
+#, c-format
+msgid "Stable Version (Branch)"
+msgstr ""
+
+#: translations\translations_branch.inc:104
+#, c-format
+msgid "English (Template)"
+msgstr "Englisch (Vorlage)"
+
+#: engine\page.inc:281
+#, c-format
+msgid "WinMerge Links"
+msgstr "WinMerge Links"
+
+#: about\screenshots\index.php:29
+#, c-format
+msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
+msgstr ""
+
+#: about\license.php:10
+#, c-format
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify them.\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 ""
+
+#: engine\page.inc:302
+#, c-format
+msgid "PAD File"
+msgstr "PAD-Datei"
+
+#: 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 ""
+
+#: engine\page.inc:316
+#, c-format
+msgid "WinMerge Translations Status (Unstable Trunk)"
+msgstr ""
+
+#: support\tracker-shortcuts.php:23
+#, c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: 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 ""
+
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "Benutzer-Liste"
+
+#: 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 ""
+
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr "Gesamt: Unbekannt"
+
+#: about\index.php:29
+#, c-format
+msgid "Visual differencing and merging of text files"
+msgstr ""
+
+#: downloads\index.php:60
+#, c-format
+msgid "Admin rights for the installer"
+msgstr ""
+
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
+#, c-format
+msgid "Translate List"
+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 "Archiv"
+
+#: 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:20
+#, c-format
+msgid "Installer"
+msgstr "Setup"
+
+#: index.php:26
+#, c-format
+msgid "WinMerge %s - latest stable version"
+msgstr "WinMerge %s - Aktuelle stabile Version"
+
+#: about\index.php:64
+#: about\screenshots\index.php:7
+#: about\screenshots\index.php:9
+#: engine\page.inc:286
+#, c-format
+msgid "Screenshots"
+msgstr "Screenshots"
+
+#: engine\page.inc:287
+#, c-format
+msgid "WinMerge History"
+msgstr "WinMerge Historie"
+
+#: about\index.php:78
+#, c-format
+msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr ""
+
+#: translations\translations.inc:41
+#, c-format
+msgid "File not found."
+msgstr "Datei nicht gefunden."
+
+#: downloads\index.php:9
+#: downloads\index.php:73
+#, c-format
+msgid "Project File Releases"
+msgstr "Projekt-Dateifreigaben"
+
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: index.php:42
+#: engine\page.inc:262
+#: support\index.php:8
+#: support\index.php:10
+#, c-format
+msgid "Support"
+msgstr "Support"
+
+#: about\index.php:72
+#, c-format
+msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
+msgstr ""
+
+#: 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 ""
+
+#: downloads\source-code.php:5
+#, c-format
+msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: engine\page.inc:309
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
+#, c-format
+msgid "Tracker Shortcuts"
+msgstr ""
+
+#: engine\page.inc:310
+#: support\index.php:37
+#, c-format
+msgid "Donate"
+msgstr "Spenden"
+
+#: 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 "Übersetzt: %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 ""
+
+#: engine\page.inc:258
+#, c-format
+msgid "Home"
+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 ""
+
+#: downloads\index.php:67
+#, c-format
+msgid "Beta Versions"
+msgstr "Beta-Versionen"
+
+#: about\index.php:6
+#, c-format
+msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
+msgstr ""
+
+#: engine\page.inc:286
+#, c-format
+msgid "WinMerge Screenshots"
+msgstr "WinMerge Screenshots"
+
+#: 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 ""
+
+#: about\screenshots\index.php:5
+#, c-format
+msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
+msgstr ""
+
+#: translations\translations.inc:85
+#: translations\translations_branch.inc:53
+#, c-format
+msgid "Untranslated: %d%%"
+msgstr "Unübersetzt: %d%%"
+
+#: about\index.php:54
+#, c-format
+msgid "Shell Integration (supports 64-bit Windows versions)"
+msgstr ""
+
+#: engine\page.inc:315
+#, 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 "Fehler"
+
+#: downloads\source-code.php:6
+#, c-format
+msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
+msgstr ""
+
+#: 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 ""
+
+#: docs\changelog.php:6
+#, c-format
+msgid "WinMerge, change log, changes, release, tracker item, revision number"
+msgstr ""
+
+#: docs\releasenotes.php:6
+#, c-format
+msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
+msgstr ""
+
+#: about\index.php:57
+#, c-format
+msgid "Localizable interface"
+msgstr ""
+
+#: about\index.php:56
+#, c-format
+msgid "Plugin support"
+msgstr "Plugin-Unterstützung"
+
+#: 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 ""
+
+#: about\index.php:55
+#, c-format
+msgid "Archive file support using 7-Zip"
+msgstr ""
+
+#: 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 ""
+
+#: engine\page.inc:301
+#, c-format
+msgid "Download WinMerge Source Code"
+msgstr "WinMerge Quelltext herunterladen"
+
+#: 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 "Ü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
+#, c-format
+msgid "Fuzzy"
+msgstr "Unklar"
+
+#: downloads\source-code.php:15
+#, c-format
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - Quelltext"
+
+#: about\history.php:5
+#, c-format
+msgid "History of WinMerge releases with version numbers, release dates and manuals."
+msgstr ""
+
+#: engine\page.inc:292
+#, c-format
+msgid "WinMerge Manual"
+msgstr "WinMerge Handbuch"
+
+#: about\index.php:27
+#, c-format
+msgid "File Compare"
+msgstr "Dateivergleich"
+
+#: support\tracker-shortcuts.php:41
+#, c-format
+msgid "ID:"
+msgstr "ID:"
+
+#: about\index.php:15
+#, c-format
+msgid "Features"
+msgstr ""
+
+#: engine\engine.inc:20
+#, c-format
+msgid "German"
+msgstr "Deutsch"
+
+#: 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 ""
+
+#: engine\page.inc:258
+#: engine\page.inc:280
+#, c-format
+msgid "WinMerge Home"
+msgstr ""
+
+#: 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 ""
+
+#: engine\page.inc:299
+#, c-format
+msgid "WinMerge"
+msgstr "WinMerge"
+
+#: support\tracker-shortcuts.php:17
+#, c-format
+msgid "Todo Item"
+msgstr ""
+
+#: 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 ""
+
+#: 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 them."
+msgstr ""
+
+#: engine\page.inc:300
+#, c-format
+msgid "Plugins"
+msgstr "Plugins"
+
+#: support\mailing-lists.php:6
+#, c-format
+msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
+msgstr ""
+
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
+#, c-format
+msgid "Folder Comparison Results"
+msgstr ""
+
+#: about\index.php:23
+#, c-format
+msgid "Unicode support"
+msgstr "Unicode-Unterstützung"
+
+#: 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 ""
+
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgstr "Unterstützt Microsoft Windows 98/2000/XP/2003/Vista/2008"
+
+#: engine\page.inc:260
+#: engine\page.inc:291
+#, c-format
+msgid "WinMerge Documentation"
+msgstr "WinMerge Dokumentation"
+
+#: 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 ""
+
+#: engine\page.inc:308
+#, c-format
+msgid "WinMerge Tracker"
+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 ""
+
+#: 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 "Dateivergleich"
+
+#: 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 ""
+
+#: about\index.php:40
+#, c-format
+msgid "Fast compare using file sizes and dates"
+msgstr ""
+
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, development wiki"
+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"
+msgstr ""
+
+#: downloads\index.php:31
+#, c-format
+msgid "Runtimes"
+msgstr "Laufzeitbibliotheken"
+
+#: about\index.php:49
+#, c-format
+msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
+msgstr ""
+
+#: translations\translations.inc:180
+#, c-format
+msgid "Total: %d"
+msgstr "Gesamt: %d"
+
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr ""
+
+#: docs\index.php:16
+#: engine\page.inc:296
+#, c-format
+msgid "Development Wiki"
+msgstr ""
+
+#: about\index.php:69
+#, c-format
+msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
+msgstr ""
+
+#: index.php:37
+#: downloads\index.php:88
+#, c-format
+msgid "Y-m-d"
+msgstr "d.m.Y"
+
+#: translations\translations_branch.inc:106
+#, c-format
+msgid "Total: %s"
+msgstr "Gesamt: %s"
+
+#: engine\page.inc:307
+#, c-format
+msgid "WinMerge Mailing Lists"
+msgstr "WinMerge Verteilerlisten"
+
+#: downloads\index.php:68
+#, c-format
+msgid "Experimental Builds"
+msgstr ""
+
+#: engine\page.inc:310
+#, c-format
+msgid "Donate money to WinMerge"
+msgstr ""
+
+#: downloads\index.php:66
+#, c-format
+msgid "Stable Versions"
+msgstr "Stabile Versionen"
+
+#: engine\page.inc:259
+#, c-format
+msgid "About"
+msgstr "Über"
+
+#: about\license.php:7
+#: about\license.php:9
+#: engine\page.inc:288
+#, c-format
+msgid "License"
+msgstr "Lizenz"
+
+#: downloads\index.php:63
+#, c-format
+msgid "Other Versions"
+msgstr "Andere Versionen"
+
+#: engine\page.inc:314
+#, c-format
+msgid "Instructions"
+msgstr ""
+
+#: engine\page.inc:306
+#, c-format
+msgid "Discussion Forums"
+msgstr "Diskussionsforen"
+
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+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 ""
+
+#: downloads\source-code.php:37
+#, c-format
+msgid "Developer Version"
+msgstr "Entwickler-Version"
+
+#: docs\index.php:5
+#, c-format
+msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
+msgstr ""
+
+#: engine\page.inc:227
+#, c-format
+msgid "Download Now!"
+msgstr "Jetzt herunterladen!"
+
+#: index.php:39
+#, c-format
+msgid "View all news&hellip;"
+msgstr "Alle Neuigkeiten ansehen&hellip;"
+
+#: about\index.php:37
+#, c-format
+msgid "Folder Compare"
+msgstr "Ordnervergleich"
+
+#: docs\index.php:12
+#: docs\releasenotes.php:7
+#: docs\releasenotes.php:10
+#: engine\page.inc:293
+#, c-format
+msgid "Release Notes"
+msgstr ""
+
+#: engine\page.inc:314
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr ""
+
+#: engine\page.inc:293
+#, c-format
+msgid "WinMerge Release Notes"
+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\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 ""
+
+#: 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 "Alle Dateifreigaben ansehen&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 ""
+
+#: downloads\source-code.php:7
+#: downloads\source-code.php:10
+#, c-format
+msgid "Download Source Code"
+msgstr "Quelltext herunterladen"
+
+#: 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 "(von 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 ""
+
+#: engine\page.inc:288
+#, c-format
+msgid "WinMerge License"
+msgstr "WinMerge Lizenz"
+
+#: about\history.php:6
+#, c-format
+msgid "WinMerge, history, version number, release date, manual, users guide"
+msgstr ""
+
+#: downloads\index.php:10
+#: downloads\index.php:12
+#: engine\page.inc:299
+#, c-format
+msgid "Download WinMerge"
+msgstr "WinMerge herunterladen"
+
+#: 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 ""
+


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

Modified: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot	2009-08-21 17:30:28 UTC (rev 6963)
+++ trunk/Translations/Web/en-US.pot	2009-08-21 17:45:12 UTC (rev 6964)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: 2009-08-17 20:36+0000\n"
+"POT-Creation-Date: 2009-08-21 19:31+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -19,307 +19,1483 @@
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: ../../Web/\n"
 
-#: engine\page.inc:236
-#: engine\page.inc:241
-#: engine\page.inc:247
-#: engine\page.inc:261
-#: engine\page.inc:269
+#: downloads\index.php:22
 #, c-format
-msgid "Index"
+msgid "Exe-Format (%s MB)"
 msgstr ""
 
-#: engine\page.inc:216
-#: engine\page.inc:247
+#: translations\index.php:36
 #, c-format
-msgid "WinMerge Documentation"
+msgid "Status"
 msgstr ""
 
-#: engine\page.inc:251
+#: 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 ""
+
+#: about\license.php:35
+#, c-format
+msgid "Open Source Software"
+msgstr ""
+
+#: index.php:13
+#, c-format
+msgid "What is WinMerge?"
+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 ""
+
+#: engine\page.inc:295
+#, c-format
 msgid "WinMerge Change Log"
 msgstr ""
 
-#: engine\page.inc:265
+#: about\screenshots\index.php:27
+#: about\screenshots\index.php:28
 #, c-format
-msgid "Tracker Shortcuts"
+msgid "Location Pane"
 msgstr ""
 
-#: engine\page.inc:262
+#: 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 ""
+
+#: translations\status_branch.php:18
+#: translations\status_trunk.php:18
+#, c-format
+msgid "The translations status is currently not available..."
+msgstr ""
+
+#: engine\page.inc:306
+#, c-format
 msgid "WinMerge Discussion Forums"
 msgstr ""
 
-#: engine\page.inc:258
+#: support\mailing-lists.php:77
 #, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr ""
+
+#: engine\page.inc:302
+#, c-format
 msgid "WinMerge PAD File"
 msgstr ""
 
-#: engine\page.inc:218
+#: about\screenshots\index.php:26
 #, c-format
-msgid "Support"
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
 msgstr ""
 
-#: engine\page.inc:272
+#: translations\instructions.php:15
 #, c-format
+msgid "Source: %s"
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:287
+#, c-format
+msgid "History"
+msgstr ""
+
+#: support\mailing-lists.php:27
+#, c-format
+msgid "This list is only for announcing new releases of WinMerge."
+msgstr ""
+
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
+#, c-format
+msgid "Announce List"
+msgstr ""
+
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+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\source-code.php:18
+#, c-format
+msgid "7z-Format (%s MB)"
+msgstr ""
+
+#: about\license.php:34
+#, c-format
+msgid "GNU General Public License v2.0"
+msgstr ""
+
+#: about\index.php:71
+#, c-format
+msgid "Installation"
+msgstr ""
+
+#: about\index.php:58
+#, c-format
+msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
+msgstr ""
+
+#: engine\page.inc:309
+#, c-format
+msgid "WinMerge Tracker Shortcuts"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:262
+#: engine\page.inc:305
+#, c-format
+msgid "WinMerge Support"
+msgstr ""
+
+#: 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:307
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: downloads\index.php:25
+#, c-format
+msgid "Binaries"
+msgstr ""
+
+#: engine\page.inc:294
+#, c-format
+msgid "WinMerge Known Issues"
+msgstr ""
+
+#: about\index.php:76
+#, c-format
+msgid "Using WinMerge"
+msgstr ""
+
+#: 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 ""
+
+#: about\license.php:30
+#: engine\page.inc:281
+#, c-format
+msgid "Links"
+msgstr ""
+
+#: index.php:49
+#, c-format
+msgid "The WinMerge Development Team"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: about\index.php:31
+#, c-format
+msgid "Highlights differences inside lines"
+msgstr ""
+
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr ""
+
+#: 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 ""
+
+#: engine\page.inc:315
+#, c-format
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr ""
+
+#: 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 ""
+
+#: about\index.php:32
+#, c-format
+msgid "Difference pane shows current difference in two vertical panes"
+msgstr ""
+
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+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 ""
+
+#: 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 ""
+
+#: engine\engine.inc:19
+#: translations\index.php:24
+#, c-format
+msgid "English"
+msgstr ""
+
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr ""
+
+#: engine\page.inc:280
+#: engine\page.inc:285
+#: engine\page.inc:291
+#: engine\page.inc:305
+#: engine\page.inc:313
+#, c-format
+msgid "Index"
+msgstr ""
+
+#: engine\page.inc:300
+#, c-format
+msgid "Download WinMerge Plugins"
+msgstr ""
+
+#: index.php:20
+#, c-format
+msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
+msgstr ""
+
+#: translations\index.php:11
+#, c-format
+msgid "We currently have WinMerge translated into the languages listed below:"
+msgstr ""
+
+#: 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 ""
+
+#: translations\translations.inc:131
+#: translations\translations.inc:288
+#: translations\translations_branch.inc:66
+#: translations\translations_branch.inc:182
+#, c-format
+msgid "Language"
+msgstr ""
+
+#: translations\instructions.php:5
+#: translations\instructions.php:8
+#, c-format
+msgid "Translations instructions"
+msgstr ""
+
+#: engine\page.inc:316
+#, c-format
 msgid "Status (Unstable Trunk)"
 msgstr ""
 
-#: engine\page.inc:264
+#: engine\page.inc:261
 #, c-format
+msgid "WinMerge Downloads"
+msgstr ""
+
+#: downloads\index.php:70
+#, c-format
+msgid "Japanese WinMerge Version"
+msgstr ""
+
+#: engine\page.inc:308
+#, c-format
 msgid "Tracker"
 msgstr ""
 
-#: engine\page.inc:250
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:295
 #, c-format
-msgid "WinMerge Known Issues"
+msgid "Change Log"
 msgstr ""
 
-#: engine\page.inc:264
+#: downloads\index.php:69
 #, c-format
-msgid "WinMerge Tracker"
+msgid "WinMerge Portable"
 msgstr ""
 
-#: engine\page.inc:266
+#: translations\translations.inc:83
+#: translations\translations_branch.inc:51
 #, c-format
-msgid "Donate"
+msgid "Fuzzy: %d%%"
 msgstr ""
 
-#: engine\page.inc:252
+#: docs\changelog.php:5
 #, c-format
+msgid "The change log is a more complete list of changes in the last WinMerge releases."
+msgstr ""
+
+#: downloads\index.php:8
+#, c-format
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr ""
+
+#: engine\page.inc:296
+#, c-format
 msgid "WinMerge Development Wiki"
 msgstr ""
 
-#: engine\page.inc:250
+#: downloads\index.php:15
 #, c-format
-msgid "Known Issues"
+msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
 msgstr ""
 
-#: engine\page.inc:270
+#: index.php:7
 #, c-format
-msgid "WinMerge Translations Instructions"
+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 ""
 
-#: engine\page.inc:252
+#: support\index.php:16
 #, c-format
-msgid "Development Wiki"
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
 msgstr ""
 
-#: engine\page.inc:242
+#: index.php:16
 #, c-format
-msgid "WinMerge Screenshots"
+msgid "More Screenshots&hellip;"
 msgstr ""
 
-#: engine\page.inc:217
+#: about\index.php:48
 #, c-format
+msgid "Resolve conflict files"
+msgstr ""
+
+#: engine\page.inc:261
+#, c-format
 msgid "Downloads"
 msgstr ""
 
-#: engine\page.inc:219
+#: translations\index.php:29
 #, c-format
+msgid "To change languages, select the desired language from the <span class=\"guimenu\">View</span>&#8594; <span class=\"guimenuitem\">Languages</span> menu choice."
+msgstr ""
+
+#: engine\page.inc:263
+#: translations\index.php:8
+#: translations\index.php:10
+#, c-format
 msgid "Translations"
 msgstr ""
 
-#: engine\page.inc:238
+#: engine\page.inc:282
 #, c-format
 msgid "Project Page"
 msgstr ""
 
-#: engine\page.inc:215
-#: engine\page.inc:241
+#: about\index.php:7
+#: about\index.php:10
+#: engine\page.inc:259
+#: engine\page.inc:285
 #, c-format
 msgid "About WinMerge"
 msgstr ""
 
-#: engine\page.inc:251
+#: engine\page.inc:263
+#: engine\page.inc:313
 #, c-format
-msgid "Change Log"
+msgid "WinMerge Translations"
 msgstr ""
 
-#: engine\page.inc:219
-#: engine\page.inc:269
+#: support\index.php:19
 #, c-format
-msgid "WinMerge Translations"
+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\page.inc:263
+#: support\mailing-lists.php:47
 #, c-format
-msgid "WinMerge Mailing Lists"
+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 ""
 
-#: engine\page.inc:244
+#: downloads\index.php:7
 #, c-format
-msgid "WinMerge License"
+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 ""
 
-#: engine\page.inc:271
+#: engine\page.inc:294
 #, c-format
-msgid "Status (Stable Branch)"
+msgid "Known Issues"
 msgstr ""
 
-#: engine\page.inc:256
+#: translations\translations.inc:136
+#: translations\translations_branch.inc:71
 #, c-format
-msgid "Download WinMerge Plugins"
+msgid "Last Update"
 msgstr ""
 
-#: engine\page.inc:266
+#: engine\page.inc:301
 #, c-format
-msgid "Donate money to WinMerge"
+msgid "Source Code"
 msgstr ""
 
-#: engine\page.inc:270
+#: about\screenshots\index.php:21
+#: about\screenshots\index.php:22
 #, c-format
-msgid "Instructions"
+msgid "Folder Compare Tree View"
 msgstr ""
 
-#: engine\page.inc:257
+#: downloads\index.php:27
+#: downloads\index.php:33
+#: downloads\source-code.php:17
 #, c-format
-msgid "Source Code"
+msgid "Zip-Format (%s MB)"
 msgstr ""
 
-#: engine\page.inc:215
+#: support\tracker-shortcuts.php:18
 #, c-format
-msgid "About"
+msgid "Tracker Item"
 msgstr ""
 
-#: engine\page.inc:262
+#: translations\translations_branch.inc:183
 #, c-format
-msgid "Discussion Forums"
+msgid "Translator(s)"
 msgstr ""
 
-#: engine\page.inc:244
+#: docs\index.php:7
+#: docs\index.php:9
+#: engine\page.inc:260
 #, c-format
-msgid "License"
+msgid "Documentation"
 msgstr ""
 
-#: engine\page.inc:265
+#: about\history.php:19
+#: docs\index.php:10
+#: engine\page.inc:292
 #, c-format
-msgid "WinMerge Tracker Shortcuts"
+msgid "Manual"
 msgstr ""
 
-#: engine\page.inc:214
-#: engine\page.inc:236
+#: docs\index.php:17
 #, c-format
-msgid "WinMerge Home"
+msgid "The <a href=\"%s\">Development Wiki</a> contains many informations about the WinMerge development."
 msgstr ""
 
-#: engine\page.inc:216
+#: index.php:8
+#: index.php:30
 #, c-format
-msgid "Documentation"
+msgid "Project News"
 msgstr ""
 
-#: engine\page.inc:248
+#: docs\index.php:13
 #, c-format
-msgid "Manual"
+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 ""
 
-#: engine\page.inc:257
+#: about\license.php:6
 #, c-format
-msgid "Download WinMerge Source Code"
+msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
 msgstr ""
 
-#: engine\page.inc:238
+#: engine\page.inc:282
 #, c-format
 msgid "WinMerge Project Page"
 msgstr ""
 
-#: engine\page.inc:263
+#: downloads\index.php:40
+#: downloads\source-code.php:24
 #, c-format
-msgid "Mailing Lists"
+msgid "SHA-1 Checksums"
 msgstr ""
 
-#: engine\engine.inc:19
+#: engine\page.inc:228
 #, c-format
-msgid "English"
+msgid "Version %1$s; %2$s MB"
 msgstr ""
 
-#: engine\page.inc:249
+#: docs\releasenotes.php:11
 #, c-format
-msgid "Release Notes"
+msgid "The release notes are currently not available..."
 msgstr ""
 
-#: engine\page.inc:248
+#: 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 "WinMerge Manual"
+msgid "Translated"
 msgstr ""
 
-#: engine\page.inc:249
+#: support\tracker-shortcuts.php:6
 #, c-format
-msgid "WinMerge Release Notes"
+msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
 msgstr ""
 
-#: engine\page.inc:243
+#: support\index.php:6
 #, c-format
-msgid "History"
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
 msgstr ""
 
-#: engine\page.inc:255
+#: translations\index.php:39
 #, c-format
-msgid "Download WinMerge"
+msgid "Stable Version (Branch)"
 msgstr ""
 
-#: engine\page.inc:272
+#: translations\translations_branch.inc:104
 #, c-format
+msgid "English (Template)"
+msgstr ""
+
+#: engine\page.inc:281
+#, c-format
+msgid "WinMerge Links"
+msgstr ""
+
+#: about\screenshots\index.php:29
+#, c-format
+msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
+msgstr ""
+
+#: about\license.php:10
+#, c-format
+msgid "This means everybody can download the <a href=\"%s\">source code</a> and improve and modify them.\nThe only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+
+#: engine\page.inc:302
+#, c-format
+msgid "PAD File"
+msgstr ""
+
+#: 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 ""
+
+#: engine\page.inc:316
+#, c-format
 msgid "WinMerge Translations Status (Unstable Trunk)"
 msgstr ""
 
-#: engine\page.inc:237
+#: support\tracker-shortcuts.php:23
 #, c-format
-msgid "Links"
+msgid "Type:"
 msgstr ""
 
+#: 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 ""
+
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr ""
+
+#: 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 ""
+
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr ""
+
+#: about\index.php:29
+#, c-format
+msgid "Visual differencing and merging of text files"
+msgstr ""
+
+#: downloads\index.php:60
+#, c-format
+msgid "Admin rights for the installer"
+msgstr ""
+
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
+#, c-format
+msgid "Translate List"
+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 ""
+
+#: 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:20
+#, c-format
+msgid "Installer"
+msgstr ""
+
+#: index.php:26
+#, c-format
+msgid "WinMerge %s - latest stable version"
+msgstr ""
+
+#: about\index.php:64
+#: about\screenshots\index.php:7
+#: about\screenshots\index.php:9
+#: engine\page.inc:286
+#, c-format
+msgid "Screenshots"
+msgstr ""
+
+#: engine\page.inc:287
+#, c-format
+msgid "WinMerge History"
+msgstr ""
+
+#: about\index.php:78
+#, c-format
+msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr ""
+
+#: 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 ""
+
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr ""
+
+#: 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 ""
+
+#: 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 directo...
 
[truncated message content]

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

From: <ge...@us...> - 2009-08-21 17:30:36

Revision: 6963
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6963&view=rev
Author:   gerundt
Date:     2009-08-21 17:30:28 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Web: Make support pages translatable

Modified Paths:
--------------
    trunk/Web/support/index.php
    trunk/Web/support/mailing-lists.php
    trunk/Web/support/tracker-shortcuts.php

Modified: trunk/Web/support/index.php
===================================================================
--- trunk/Web/support/index.php	2009-08-21 17:19:21 UTC (rev 6962)
+++ trunk/Web/support/index.php	2009-08-21 17:30:28 UTC (rev 6963)
@@ -3,35 +3,22 @@
   include('../engine/simplepie/simplepie.inc');
 
   $page = new Page;
-  $page->setDescription('The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list.');
-  $page->setKeywords('WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net');
-  $page->printHead('Support', TAB_SUPPORT);
-?>
-<h2>Support</h2>
-<p>The <a href="http://apps.sourceforge.net/phpbb/winmerge/viewforum.php?f=4">Open
-Discussion forum</a> is the fastest way to get help. Please be patient, it may take
-some time for somebody to answer. A other way is a subscription to the
-<a href="mailing-lists.php#support">support mailing list</a>.</p>
+  $page->setDescription(__('The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list.'));
+  $page->setKeywords(__('WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net'));
+  $page->printHead(__('Support'), TAB_SUPPORT);
 
-<p>If you find a bug, please submit it as a <a href="http://sourceforge.net/tracker/?group_id=13216&amp;atid=113216">bug
-report</a>. 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.
-Good information in a bug report makes it more likely that your bug will be fixed quickly.</p>
+  $page->printHeading(__('Support'));
+  $page->printPara(__('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.', 'http://apps.sourceforge.net/phpbb/winmerge/viewforum.php?f=4'),
+                   __('A other way is a subscription to the <a href="%s">support mailing list</a>.', 'mailing-lists.php#support'));
+  $page->printPara(__('If you find a bug, please submit it as a <a href="%s">bug report</a>.', 'http://bugs.winmerge.org/'),
+                   __('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.'),
+                   __('Good information in a bug report makes it more likely that your bug will be fixed quickly.'));
+  $page->printPara(__('You must <a href="%s">register with SourceForge.net</a> before posting a bug report (registration is free).', 'https://sourceforge.net/account/registration/'),
+                   __('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.'),
+                   __('We rarely sent direct emails but you will get notifications when we ask questions in the bug item.'));
+  $page->printPara(__('Wish list items on the <a href="%s">feature request list</a> will also be considered, but we make absolutely no promises.', 'http://feature-requests.winmerge.org/'));
 
-<p>You must <a href="https://sourceforge.net/account/registration/">register
-with SourceForge.net</a> before posting a bug report (registration is free).
-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. We rarely sent direct emails but you'll get notifications when we
-ask questions in the bug item.</p>
-
-<p>Wish list items on the <a href="http://sourceforge.net/tracker/?group_id=13216&amp;atid=363216">feature
-request list</a> will also be considered, but we make absolutely no promises.</p>
-
-<h3>Tracker Statistics</h3>
-<?php
+  $page->printSubHeading(__('Tracker Statistics'));
   $feed = new SimplePie();
   $feed->set_feed_url('http://sourceforge.net/export/rss2_projsummary.php?group_id=13216');
   $feed->set_cache_location('../engine/simplepie/cache');
@@ -40,18 +27,16 @@
   print("<ul class=\"rssfeeditems\">\n");
   foreach ($feed->get_items() as $item) { //for all project summary items...
     $title = $item->get_title();
-    if (stristr($title, "Tracker:")) {
+    if (stristr($title, 'Tracker:')) {
       $title = str_replace('Tracker: ', '', $title);
       print("  <li><a href=\"".$item->get_link()."\">".$title."</a></li>\n");
     }
   }
   print("</ul>\n");
-?>
 
-<h3>Donate</h3>
-<p>Since WinMerge is an <a href="/about/license.php">Open Source</a> project, you may use it free of charge.
-But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
-to support the continued development of WinMerge.</p>
-<?php
+  $page->printSubHeading(__('Donate'));
+  $page->printPara(__('Since WinMerge is an <a href="%s">Open Source</a> project, you may use it free of charge.', '/about/license.php'),
+                   __('But please consider making a <a href="%s">donation</a> to support the continued development of WinMerge.', 'http://sourceforge.net/project/project_donations.php?group_id=13216'));
+
   $page->printFoot();
 ?>
\ No newline at end of file

Modified: trunk/Web/support/mailing-lists.php
===================================================================
--- trunk/Web/support/mailing-lists.php	2009-08-21 17:19:21 UTC (rev 6962)
+++ trunk/Web/support/mailing-lists.php	2009-08-21 17:30:28 UTC (rev 6963)
@@ -2,78 +2,79 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN');
-  $page->setKeywords('WinMerge, mailing lists, announce, support, user, translate, development, SVN');
-  $page->printHead('Mailing Lists', TAB_SUPPORT);
+  $page->setDescription(__('Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN'));
+  $page->setKeywords(__('WinMerge, mailing lists, announce, support, user, translate, development, SVN'));
+  $page->printHead(__('Mailing Lists'), TAB_SUPPORT);
+  
+  $page->printHeading(__('Mailing Lists'));
 ?>
-<h2>Mailing Lists</h2>
 <ul>
-  <li><a href="#announce">Announce List</a></li>
-  <li><a href="#support">Support List</a></li>
-  <li><a href="#user">User List</a></li>
-  <li><a href="#translate">Translate List</a></li>
-  <li><a href="#development">Development List</a></li>
-  <li><a href="#svn">SVN List</a></li>
+  <li><a href="#announce"><?php __e('Announce List');?></a></li>
+  <li><a href="#support"><?php __e('Support List');?></a></li>
+  <li><a href="#user"><?php __e('User List');?></a></li>
+  <li><a href="#translate"><?php __e('Translate List');?></a></li>
+  <li><a href="#development"><?php __e('Development List');?></a></li>
+  <li><a href="#svn"><?php __e('SVN List');?></a></li>
 </ul>
 <div class="infocard">
-  <h3><a name="announce">Announce List</a></h3>
+  <h3><a name="announce"><?php __e('Announce List');?></a></h3>
   <ul>
-    <li><strong>Low Traffic</strong></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Subscribe</a></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce">Unsubscribe</a></li>
-    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-announce">Archive</a></li>
+    <li><strong><?php __e('Low Traffic');?></strong></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce"><?php __e('Subscribe');?></a></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-announce"><?php __e('Unsubscribe');?></a></li>
+    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-announce"><?php __e('Archive');?></a></li>
   </ul>
-  <p>This list is only for announcing new releases of WinMerge.</p>
+  <p><?php __e('This list is only for announcing new releases of WinMerge.');?></p>
 </div>
 <div class="infocard">
-  <h3><a name="support">Support List</a></h3>
+  <h3><a name="support"><?php __e('Support List');?></a></h3>
   <ul>
-    <li><strong>Normal Traffic</strong></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Subscribe</a></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support">Unsubscribe</a></li>
-    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-support">Archive</a></li>
+    <li><strong><?php __e('Normal Traffic');?></strong></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support"><?php __e('Subscribe');?></a></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-support"><?php __e('Unsubscribe');?></a></li>
+    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-support"><?php __e('Archive');?></a></li>
   </ul>
-  <p>You should ask all your support questions on this list.</p>
+  <p><?php __e('You should ask all your support questions on this list.');?></p>
 </div>
 <div class="infocard">
-  <h3><a name="user">User List</a></h3>
+  <h3><a name="user"><?php __e('User List');?></a></h3>
   <ul>
-    <li><strong>Normal Traffic</strong></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Subscribe</a></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user">Unsubscribe</a></li>
-    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-user">Archive</a></li>
+    <li><strong><?php __e('Normal Traffic');?></strong></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user"><?php __e('Subscribe');?></a></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-user"><?php __e('Unsubscribe');?></a></li>
+    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-user"><?php __e('Archive');?></a></li>
   </ul>
-  <p>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.</p>
+  <p><?php __e('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.');?></p>
 </div>
 <div class="infocard">
-  <h3><a name="translate">Translate List</a></h3>
+  <h3><a name="translate"><?php __e('Translate List');?></a></h3>
   <ul>
-    <li><strong>Low Traffic</strong></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Subscribe</a></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate">Unsubscribe</a></li>
-    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate">Archive</a></li>
+    <li><strong><?php __e('Low Traffic');?></strong></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate"><?php __e('Subscribe');?></a></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-translate"><?php __e('Unsubscribe');?></a></li>
+    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate"><?php __e('Archive');?></a></li>
   </ul>
-  <p>This list is used for coordinating the translations.</p>
+  <p><?php __e('This list is used for coordinating the translations.');?></p>
 </div>
 <div class="infocard">
-  <h3><a name="development">Development List</a></h3>
+  <h3><a name="development"><?php __e('Development List');?></a></h3>
   <ul>
-    <li><strong>Normal Traffic</strong></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Subscribe</a></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development">Unsubscribe</a></li>
-    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-development">Archive</a></li>
+    <li><strong><?php __e('Normal Traffic');?></strong></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development"><?php __e('Subscribe');?></a></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-development"><?php __e('Unsubscribe');?></a></li>
+    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-development"><?php __e('Archive');?></a></li>
   </ul>
-  <p>This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.</p>
+  <p><?php __e('This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc.');?></p>
 </div>
 <div class="infocard">
-  <h3><a name="svn">SVN List</a></h3>
+  <h3><a name="svn"><?php __e('SVN List');?></a></h3>
   <ul>
-    <li><strong>High Traffic</strong></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Subscribe</a></li>
-    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn">Unsubscribe</a></li>
-    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-svn">Archive</a></li>
+    <li><strong><?php __e('High Traffic');?></strong></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn"><?php __e('Subscribe');?></a></li>
+    <li><a href="http://lists.sourceforge.net/mailman/listinfo/winmerge-svn"><?php __e('Unsubscribe');?></a></li>
+    <li><a href="http://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-svn"><?php __e('Archive');?></a></li>
   </ul>
-  <p>Subscribers to this list get notices of each and every code change commited to Subversion.</p>
+  <p><?php __e('Subscribers to this list get notices of each and every code change commited to Subversion.');?></p>
 </div>
 <?php
   $page->printFoot();

Modified: trunk/Web/support/tracker-shortcuts.php
===================================================================
--- trunk/Web/support/tracker-shortcuts.php	2009-08-21 17:19:21 UTC (rev 6962)
+++ trunk/Web/support/tracker-shortcuts.php	2009-08-21 17:30:28 UTC (rev 6963)
@@ -2,26 +2,25 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('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.');
-  $page->setKeywords('WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item');
-  $page->printHead('Tracker Shortcuts', TAB_SUPPORT);
+  $page->setDescription(__('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.'));
+  $page->setKeywords(__('WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item'));
+  $page->printHead(__('Tracker Shortcuts'), TAB_SUPPORT);
+
+  $page->printHeading(__('Tracker Shortcuts'));
+  $page->printPara(__('<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>.', 'http://sourceforge.net/tracker/?group_id=13216', 'http://sourceforge.net/projects/winmerge'));
+  $page->printPara(__('You can use this page to create a shortcut:'));
+
+  $types['bug'] = __('Bug');
+  $types['patch'] = __('Patch');
+  $types['support'] = __('Support Request');
+  $types['rfe'] = __('Feature Request');
+  $types['todo'] = __('Todo Item');
+  $types['tracker'] = __('Tracker Item');
 ?>
-<h2>Tracker Shortcuts</h2>
-<p><em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href="http://sourceforge.net/tracker/?group_id=13216">Tracker</a>
-items from our <a href="http://sourceforge.net/projects/winmerge">SF.net project page</a>.</p>
-<p>You can use this page to create a shortcut:</p>
-<?php
-  $types['bug'] = 'Bug';
-  $types['patch'] = 'Patch';
-  $types['support'] = 'Support Request';
-  $types['rfe'] = 'Feature Request';
-  $types['todo'] = 'Todo Item';
-  $types['tracker'] = 'Tracker Item';
-?>
 <form action="tracker-shortcuts.php" method="post">
 <table>
   <tr>
-    <td><label for="type">Type:</label></td>
+    <td><label for="type"><?php __e('Type:');?></label></td>
     <td>
       <select name="type" id="type" size="1">
 <?php
@@ -35,11 +34,11 @@
       </select>
     </td>
     <td rowspan="2" valign="bottom">
-      <input type="submit" name="submit" value="Generate" />
+      <input type="submit" name="submit" value="<?php __e('Generate');?>" />
     </td>
   </tr>
   <tr>
-    <td><label for="id">ID:</label></td>
+    <td><label for="id"><?php __e('ID:');?></label></td>
     <td>
       <input type="text" name="id" id="id" size="8" maxlength="8" value="<?php echo htmlentities($post_id); ?>" />
     </td>
@@ -52,8 +51,9 @@
     echo "<pre class=\"code\">http://winmerge.org/" . htmlentities($post_type) . "/" . htmlentities($post_id) . "</pre>\n";
     echo "<p />\n";
   }
+
+  $page->printSubHeading(__('Subdomains'));
 ?>
-<h3>Subdomains</h3>
 <ul class="rssfeeditems">
   <li><a href="http://bugs.winmerge.org/">bugs.winmerge.org</a></li>
   <li><a href="http://feature-requests.winmerge.org/">feature-requests.winmerge.org</a></li>


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

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

From: <ge...@us...> - 2009-08-21 17:19:31

Revision: 6962
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6962&view=rev
Author:   gerundt
Date:     2009-08-21 17:19:21 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Web: Support translation links in tab navigation

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

Modified: trunk/Web/engine/tabnav.inc
===================================================================
--- trunk/Web/engine/tabnav.inc	2009-08-20 11:26:46 UTC (rev 6961)
+++ trunk/Web/engine/tabnav.inc	2009-08-21 17:19:21 UTC (rev 6962)
@@ -151,6 +151,9 @@
       elseif ($this->_link == str_replace('index.php', '', $_SERVER['PHP_SELF'])) {
         return true;
       }
+      elseif ($this->_link == $_SERVER['REQUEST_URI']) {
+        return true;
+      }
       return false;
     }
   }


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

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

From: <ge...@us...> - 2009-08-20 11:26:55

Revision: 6961
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6961&view=rev
Author:   gerundt
Date:     2009-08-20 11:26:46 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Web: Make translations pages translatable

Modified Paths:
--------------
    trunk/Web/translations/index.php
    trunk/Web/translations/instructions.php
    trunk/Web/translations/status_branch.php
    trunk/Web/translations/status_trunk.php
    trunk/Web/translations/translations.inc
    trunk/Web/translations/translations_branch.inc

Modified: trunk/Web/translations/index.php
===================================================================
--- trunk/Web/translations/index.php	2009-08-20 10:45:05 UTC (rev 6960)
+++ trunk/Web/translations/index.php	2009-08-20 11:26:46 UTC (rev 6961)
@@ -3,12 +3,13 @@
   include('translations.inc');
 
   $page = new Page;
-  $page->addRssFeed('status_branch_rss.php', 'Translations Status (Stable Branch)');
-  $page->addRssFeed('status_trunk_rss.php', 'Translations Status (Unstable Trunk)');
-  $page->printHead('Translations', TAB_TRANSLATIONS);
+  $page->addRssFeed('status_branch_rss.php', __('Translations Status (Stable Branch)'));
+  $page->addRssFeed('status_trunk_rss.php', __('Translations Status (Unstable Trunk)'));
+  $page->printHead(__('Translations'), TAB_TRANSLATIONS);
+  
+  $page->printHeading(__('Translations'));
+  $page->printPara(__('We currently have WinMerge translated into the languages listed below:'));
 ?>
-<h2>Translations</h2>
-<p>We currently have WinMerge translated into the languages listed below:</p>
 <ul class="inline">
 <?php
   try {
@@ -20,22 +21,23 @@
     }
   }
   catch (Exception $ex) { //If problems with translations status...
-    print("  <li>English</li>\n");
+    print("  <li>" . __('English') . "</li>\n");
   }
 ?>
 </ul>
-<p>To change languages, select the desired language from the <span class="guimenu">View</span>
-&#8594; <span class="guimenuitem">Languages</span> menu choice.</p>
+<?php
+  $page->printPara(__('To change languages, select the desired language from the <span class="guimenu">View</span>&#8594; <span class="guimenuitem">Languages</span> menu choice.'));
+  
+  $page->printSubHeading(__('Translating'));
+  $page->printPara(__('If you would like to update any of these translations or add another translation, then please follow <a href="%s">these instructions</a>.', 'instructions.php'),
+                   __('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>.', 'http://winmerge.org/Wiki/Translation_System', 'http://winmerge.org/Wiki/'));
+?>
 
-<h3>Translating</h3>
-<p>If you would like to update any of these translations or add another translation, then please follow <a href="instructions.php">these instructions</a>.<br />
-You can find a more technical view about the <a href="http://winmerge.org/Wiki/Translation_System">translation system</a> in our <a href="http://winmerge.org/Wiki/">Development Wiki</a>.</p>
-
-<h3><a name="status">Status</a></h3>
-<p>The following two pages inform you about the translations status of the stable and developer version of WinMerge:</p>
+<h3><a name="status"><?php __e('Status');?></a></h3>
+<p><?php __e('The following two pages inform you about the translations status of the stable and developer version of WinMerge:');?></p>
 <ul>
-  <li><a href="status_branch.php">Stable Version (Branch)</a> <?php $page->printRssFeedLink('status_branch_rss.php'); ?></li>
-  <li><a href="status_trunk.php">Unstable Version (Trunk)</a> <?php $page->printRssFeedLink('status_trunk_rss.php'); ?></li>
+  <li><a href="status_branch.php"><?php __e('Stable Version (Branch)');?></a> <?php $page->printRssFeedLink('status_branch_rss.php'); ?></li>
+  <li><a href="status_trunk.php"><?php __e('Unstable Version (Trunk)');?></a> <?php $page->printRssFeedLink('status_trunk_rss.php'); ?></li>
 </ul>
 <?php
   $page->printFoot();

Modified: trunk/Web/translations/instructions.php
===================================================================
--- trunk/Web/translations/instructions.php	2009-08-20 10:45:05 UTC (rev 6960)
+++ trunk/Web/translations/instructions.php	2009-08-20 11:26:46 UTC (rev 6961)
@@ -2,17 +2,17 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->printHead('Translations instructions', TAB_TRANSLATIONS);
+  $page->printHead(__('Translations instructions'), TAB_TRANSLATIONS);
   $instructions = $page->getContentFromHtmlFile('Translations.html', '#/winmerge/trunk/#si', '/winmerge/branches/' . $stablerelease = $page->getStableRelease()->getBranchName() . '/');
   if ($instructions == '') {
-    print("<h2>Translations instructions</h2>\n");
-    print("<p>The translations instructions are currently not available...</p>\n");
+    $page->printHeading(__('Translations instructions'));
+    $page->printPara(__('The translations instructions are currently not available...'));
   }
   else
     print($instructions);
 ?>
 <hr>
-<p><em>Source: <a href="http://winmerge.svn.sourceforge.net/viewvc/*checkout*/winmerge/branches/<?php echo $stablerelease = $page->getStableRelease()->getBranchName();?>/Docs/Developers/Translations.html">WinMerge\Docs\Developers\Translations.html</a></em></p>
+<p><em><?php __e('Source: %s', '<a href="http://winmerge.svn.sourceforge.net/viewvc/*checkout*/winmerge/branches/' . $stablerelease = $page->getStableRelease()->getBranchName() . '/Docs/Developers/Translations.html">WinMerge\Docs\Developers\Translations.html</a>');?></em></p>
 <?php
   $page->printFoot();
 ?>
\ No newline at end of file

Modified: trunk/Web/translations/status_branch.php
===================================================================
--- trunk/Web/translations/status_branch.php	2009-08-20 10:45:05 UTC (rev 6960)
+++ trunk/Web/translations/status_branch.php	2009-08-20 11:26:46 UTC (rev 6961)
@@ -4,18 +4,18 @@
 
   $page = new Page;
   $page->addRssFeed('status_branch_rss.php');
-  $page->printHead('Translations Status (Stable Branch)', TAB_TRANSLATIONS);
+  $page->printHead(__('Translations Status (Stable Branch)'), TAB_TRANSLATIONS);
   
   $status = convertXml2Array('status_branch.xml');
-  $page->printRssHeading('Translations Status (Stable Branch)', 'status_branch_rss.php');
+  $page->printRssHeading(__('Translations Status (Stable Branch)'), 'status_branch_rss.php');
   if (!empty($status)) { //If translations status available...
     printTranslationsStatus($status, 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/branches/' . $stablerelease = $page->getStableRelease()->getBranchName() . '/Src/Languages/');
     printTranslationsStatusGraphLegend();
-    print("<h3>Translators</h3>\n");
+    $page->printSubHeading(__('Translators'));
     printTranslationsTranslators($status);
   }
   else { //If translations status NOT available...
-    print("<p>The translations status is currently not available...</p>\n");
+    $page->printPara(__('The translations status is currently not available...'));
   }
   $page->printFoot();
 ?>
\ No newline at end of file

Modified: trunk/Web/translations/status_trunk.php
===================================================================
--- trunk/Web/translations/status_trunk.php	2009-08-20 10:45:05 UTC (rev 6960)
+++ trunk/Web/translations/status_trunk.php	2009-08-20 11:26:46 UTC (rev 6961)
@@ -4,9 +4,9 @@
 
   $page = new Page;
   $page->addRssFeed('status_trunk_rss.php');
-  $page->printHead('Translations Status (Unstable Trunk)', TAB_TRANSLATIONS);
+  $page->printHead(__('Translations Status (Unstable Trunk)'), TAB_TRANSLATIONS);
   
-  $page->printRssHeading('Translations Status (Unstable Trunk)', 'status_trunk_rss.php');
+  $page->printRssHeading(__('Translations Status (Unstable Trunk)'), 'status_trunk_rss.php');
   try {
     $status = New TranslationsStatus('status_trunk.xml');
     $status->svnUrl = 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/Translations/';
@@ -15,7 +15,7 @@
     $status->printTranslators();
   }
   catch (Exception $ex) { //If problems with translations status...
-    print("<p>The translations status is currently not available...</p>\n");
+    $page->printPara(__('The translations status is currently not available...'));
   }
   $page->printFoot();
 ?>
\ No newline at end of file

Modified: trunk/Web/translations/translations.inc
===================================================================
--- trunk/Web/translations/translations.inc	2009-08-20 10:45:05 UTC (rev 6960)
+++ trunk/Web/translations/translations.inc	2009-08-20 11:26:46 UTC (rev 6961)
@@ -35,10 +35,10 @@
           $this->_status = $xml;
         }
         else //if XML file was NOT valid...
-          throw new Exception('File not valid.');
+          throw new Exception(__('File not valid.'));
       }
       else //if XML file NOT exists...
-        throw new Exception('File not found.');
+        throw new Exception(__('File not found.'));
     }
     
     /**
@@ -78,11 +78,11 @@
       
       $temp = "";
       if ($wt > 0)
-        $temp .= "<img src=\"images/translated.png\" alt=\"Translated\" title=\"Translated: " . round($pt, 1) . "%\" width=\"$wt\" height=\"16\">";
+        $temp .= "<img src=\"images/translated.png\" alt=\"" . __('Translated') . "\" title=\"" . __('Translated: %d%%', round($pt, 1)) . "\" width=\"$wt\" height=\"16\">";
       if ($wf > 0)
-        $temp .= "<img src=\"images/fuzzy.png\" alt=\"Fuzzy\" title=\"Fuzzy: " . round($pf, 1) . "%\" width=\"$wf\" height=\"16\">";
+        $temp .= "<img src=\"images/fuzzy.png\" alt=\"" . __('Fuzzy') . "\" title=\"" . __('Fuzzy: %d%%', round($pf, 1)) . "\" width=\"$wf\" height=\"16\">";
       if ($wu > 0)
-        $temp .= "<img src=\"images/untranslated.png\" alt=\"Untranslated\" title=\"Untranslated: " . round($pu, 1) . "%\" width=\"$wu\" height=\"16\">";
+        $temp .= "<img src=\"images/untranslated.png\" alt=\"" . __('Untranslated') . "\" title=\"" . __('Untranslated: %d%%', round($pu, 1)) . "\" width=\"$wu\" height=\"16\">";
       
       return $temp;
     }
@@ -92,9 +92,9 @@
      */
     private function getStatusGraphLegend() {
       $temp = "<ul class=\"inline\">\n";
-      $temp .= "  <li><img src=\"images/translated.png\" alt=\"*\" width=\"16\" height=\"16\"> Translated</li>\n";
-      $temp .= "  <li><img src=\"images/fuzzy.png\" alt=\"*\" width=\"16\" height=\"16\"> Fuzzy</li>\n";
-      $temp .= "  <li><img src=\"images/untranslated.png\" alt=\"*\" width=\"16\" height=\"16\"> Untranslated</li>\n";
+      $temp .= "  <li><img src=\"images/translated.png\" alt=\"*\" width=\"16\" height=\"16\"> " . __('Translated') . "</li>\n";
+      $temp .= "  <li><img src=\"images/fuzzy.png\" alt=\"*\" width=\"16\" height=\"16\"> " . __('Fuzzy') . "</li>\n";
+      $temp .= "  <li><img src=\"images/untranslated.png\" alt=\"*\" width=\"16\" height=\"16\"> " . __('Untranslated') . "</li>\n";
       $temp .= "</ul>\n";
       return $temp;
     }
@@ -128,12 +128,12 @@
         $temp .= "<h3><a name=\"" . $project . "\">" . $project .  "</a></h3>\n";
         $temp .= "<table class=\"status\">\n";
         $temp .= "  <tr>\n";
-        $temp .= "    <th class=\"left\">Language</th>\n";
-        $temp .= "    <th class=\"center\">Graph</th>\n";
-        $temp .= "    <th class=\"right translated\">Translated</th>\n";
-        $temp .= "    <th class=\"right fuzzy\">Fuzzy</th>\n";
-        $temp .= "    <th class=\"right untranslated\">Untranslated</th>\n";
-        $temp .= "    <th class=\"center\">Last Update</th>\n";
+        $temp .= "    <th class=\"left\">" . __('Language') . "</th>\n";
+        $temp .= "    <th class=\"center\">" . __('Graph') . "</th>\n";
+        $temp .= "    <th class=\"right translated\">" . __('Translated') . "</th>\n";
+        $temp .= "    <th class=\"right fuzzy\">" . __('Fuzzy') . "</th>\n";
+        $temp .= "    <th class=\"right untranslated\">" . __('Untranslated') . "</th>\n";
+        $temp .= "    <th class=\"center\">" . __('Last Update') . "</th>\n";
         $temp .= "  </tr>\n";
         //TODO: Sort languages!?
         foreach ($translations as $translation) { //for all translations...
@@ -174,12 +174,12 @@
           }
         }
         $temp .= "  <tr>\n";
-        $temp .= "    <td class=\"left\"><a href=\"" . $this->svnUrl . $project . '/' . $template_file_name . "\" rel=\"nofollow\">" . $template_language_name . " (Template)</a></td>\n";
+        $temp .= "    <td class=\"left\"><a href=\"" . $this->svnUrl . $project . '/' . $template_file_name . "\" rel=\"nofollow\">" . $template_language_name . " (" . __('Template') . ")</a></td>\n";
         $temp .= "    <td class=\"center\"></td>\n";
         if ($template_strings_count > 0) //if KNOWN status...
-          $temp .= "    <td colspan=\"3\" class=\"center\">Total: " . $template_strings_count . "</td>\n";
+          $temp .= "    <td colspan=\"3\" class=\"center\">" . __('Total: %d' , $template_strings_count) . "</td>\n";
         else //if UNKNOWN status...
-          $temp .= "    <td colspan=\"3\" class=\"center\">Total: Unknown</td>\n";
+          $temp .= "    <td colspan=\"3\" class=\"center\">" . __('Total: Unknown') . "</td>\n";
         $temp .= "    <td class=\"center\">" . $template_translation_update . "</td>\n";
         $temp .= "  </tr>\n";
         $temp .= "</table>\n";
@@ -282,10 +282,10 @@
       }
       ksort($languages, SORT_STRING);
       
-      $temp = "<h3><a name=\"translators\">Translators</a></h3>\n";
+      $temp = "<h3><a name=\"translators\">" . __('Translators') . "</a></h3>\n";
       $temp .= "<table class=\"status\">\n";
       $temp .= "  <tr>\n";
-      $temp .= "    <th class=\"left\">Language</th>\n";
+      $temp .= "    <th class=\"left\">" . __('Language') . "</th>\n";
       foreach ($projects as $project) { //For all projects...
         $temp .= "    <th class=\"left\">" . $project . "</th>\n";
       }
@@ -294,7 +294,7 @@
         $temp .= "  <tr>\n";
         $temp .= "    <td class=\"left\">" . $language_name . "</td>\n";
         foreach ($projects as $project_key => $project_name) { //For all projects...
-          $temp .= "    <td class=\"left\">" . @$language_translators[$project_key] . "</td>";
+          $temp .= "    <td class=\"left\">" . @$language_translators[$project_key] . "</td>\n";
         }
         $temp .= "  </tr>\n";
       }

Modified: trunk/Web/translations/translations_branch.inc
===================================================================
--- trunk/Web/translations/translations_branch.inc	2009-08-20 10:45:05 UTC (rev 6960)
+++ trunk/Web/translations/translations_branch.inc	2009-08-20 11:26:46 UTC (rev 6961)
@@ -46,11 +46,11 @@
     
     $temp = "";
     if ($wt > 0)
-      $temp .= "<img src=\"images/translated.png\" alt=\"Translated\" title=\"Translated: " . round($pt, 1) . "%\" width=\"$wt\" height=\"16\">";
+      $temp .= "<img src=\"images/translated.png\" alt=\"" . __('Translated') . "\" title=\"" . __('Translated: %d%%', round($pt, 1)) . "\" width=\"$wt\" height=\"16\">";
     if ($wf > 0)
-      $temp .= "<img src=\"images/fuzzy.png\" alt=\"Fuzzy\" title=\"Fuzzy: " . round($pf, 1) . "%\" width=\"$wf\" height=\"16\">";
+      $temp .= "<img src=\"images/fuzzy.png\" alt=\"" . __('Fuzzy') . "\" title=\"" . __('Fuzzy: %d%%', round($pf, 1)) . "\" width=\"$wf\" height=\"16\">";
     if ($wu > 0)
-      $temp .= "<img src=\"images/untranslated.png\" alt=\"Untranslated\" title=\"Untranslated: " . round($pu, 1) . "%\" width=\"$wu\" height=\"16\">";
+      $temp .= "<img src=\"images/untranslated.png\" alt=\"" . __('Untranslated') . "\" title=\"" . __('Untranslated: %d%%', round($pu, 1)) . "\" width=\"$wu\" height=\"16\">";
     
     return $temp;
   }
@@ -63,12 +63,12 @@
     $temp = "<p>Status from <strong>" . $update . "</strong>:</p>\n";
     $temp .= "<table class=\"status\">\n";
     $temp .= "  <tr>\n";
-    $temp .= "    <th class=\"left\">Language</th>\n";
-    $temp .= "    <th class=\"center\">Graph</th>\n";
-    $temp .= "    <th class=\"right translated\">Translated</th>\n";
-    $temp .= "    <th class=\"right fuzzy\">Fuzzy</th>\n";
-    $temp .= "    <th class=\"right untranslated\">Untranslated</th>\n";
-    $temp .= "    <th class=\"center\">Last Update</th>\n";
+    $temp .= "    <th class=\"left\">" . __('Language') . "</th>\n";
+    $temp .= "    <th class=\"center\">" . __('Graph') . "</th>\n";
+    $temp .= "    <th class=\"right translated\">" . __('Translated') . "</th>\n";
+    $temp .= "    <th class=\"right fuzzy\">" . __('Fuzzy') . "</th>\n";
+    $temp .= "    <th class=\"right untranslated\">" . __('Untranslated') . "</th>\n";
+    $temp .= "    <th class=\"center\">" . __('Last Update') . "</th>\n";
     $temp .= "  </tr>\n";
     $translations = $xmlarray['TRANSLATIONS'][0]['TRANSLATION'];
     $translations = multisortArray($translations, 'LANGUAGE', SORT_ASC);
@@ -101,9 +101,9 @@
       }
     }
     $temp .= "  <tr>\n";
-    $temp .= "    <td class=\"left\"><a href=\"" . $svnurl . $english_file_name . "\" rel=\"nofollow\">English (Template)</a></td>\n";
+    $temp .= "    <td class=\"left\"><a href=\"" . $svnurl . $english_file_name . "\" rel=\"nofollow\">" . __('English (Template)') . "</a></td>\n";
     $temp .= "    <td class=\"center\"></td>\n";
-    $temp .= "    <td colspan=\"3\" class=\"center\">Total: " . $english_strings_count . "</td>\n";
+    $temp .= "    <td colspan=\"3\" class=\"center\">" . __('Total: %s', $english_strings_count) . "</td>\n";
     $temp .= "    <td class=\"center\">" . $english_translation_update . "</td>\n";
     $temp .= "  </tr>\n";
     $temp .= "</table>\n";
@@ -115,9 +115,9 @@
    */
   function printTranslationsStatusGraphLegend() {
     $temp = "<ul class=\"inline\">\n";
-    $temp .= "  <li><img src=\"images/translated.png\" alt=\"*\" width=\"16\" height=\"16\"> Translated</li>\n";
-    $temp .= "  <li><img src=\"images/fuzzy.png\" alt=\"*\" width=\"16\" height=\"16\"> Fuzzy</li>\n";
-    $temp .= "  <li><img src=\"images/untranslated.png\" alt=\"*\" width=\"16\" height=\"16\"> Untranslated</li>\n";
+    $temp .= "  <li><img src=\"images/translated.png\" alt=\"*\" width=\"16\" height=\"16\"> " . __('Translated') . "</li>\n";
+    $temp .= "  <li><img src=\"images/fuzzy.png\" alt=\"*\" width=\"16\" height=\"16\"> " . __('Fuzzy') . "</li>\n";
+    $temp .= "  <li><img src=\"images/untranslated.png\" alt=\"*\" width=\"16\" height=\"16\"> " . __('Untranslated') . "</li>\n";
     $temp .= "</ul>\n";
     print($temp);
   }
@@ -179,8 +179,8 @@
   function printTranslationsTranslators($xmlarray) {
     $temp = "<table class=\"status\">\n";
     $temp .= "  <tr>\n";
-    $temp .= "    <th class=\"left\">Language</th>\n";
-    $temp .= "    <th class=\"left\">Translator(s)</th>\n";
+    $temp .= "    <th class=\"left\">" . __('Language') . "</th>\n";
+    $temp .= "    <th class=\"left\">" . __('Translator(s)') . "</th>\n";
     $temp .= "  </tr>\n";
     $translations = $xmlarray['TRANSLATIONS'][0]['TRANSLATION'];
     $translations = multisortArray($translations, 'LANGUAGE', SORT_ASC);


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

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

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

Revision: 6960
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6960&view=rev
Author:   gerundt
Date:     2009-08-20 10:45:05 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Web: Make docs pages translatable

Modified Paths:
--------------
    trunk/Web/docs/changelog.php
    trunk/Web/docs/index.php
    trunk/Web/docs/releasenotes.php
    trunk/Web/engine/page.inc

Modified: trunk/Web/docs/changelog.php
===================================================================
--- trunk/Web/docs/changelog.php	2009-08-20 10:27:07 UTC (rev 6959)
+++ trunk/Web/docs/changelog.php	2009-08-20 10:45:05 UTC (rev 6960)
@@ -2,13 +2,13 @@
   include('../engine/engine.inc');
   
   $page = new Page;
-  $page->setDescription('The change log is a more complete list of changes in the last WinMerge releases.');
-  $page->setKeywords('WinMerge, change log, changes, release, tracker item, revision number');
-  $page->printHead('Change Log', TAB_DOCS);
-  print("<h2>Change Log</h2>\n");
+  $page->setDescription(__('The change log is a more complete list of changes in the last WinMerge releases.'));
+  $page->setKeywords(__('WinMerge, change log, changes, release, tracker item, revision number'));
+  $page->printHead(__('Change Log'), TAB_DOCS);
+  $page->printHeading(__('Change Log'));
   $changelog = $page->convertChangeLog2Html('ChangeLog.txt');
   if ($changelog == '')
-    print("<p>The change log is currently not available...</p>\n");
+    $page->printPara(__('The change log is currently not available...'));
   else 
     print($changelog);
   $page->printFoot();

Modified: trunk/Web/docs/index.php
===================================================================
--- trunk/Web/docs/index.php	2009-08-20 10:27:07 UTC (rev 6959)
+++ trunk/Web/docs/index.php	2009-08-20 10:45:05 UTC (rev 6960)
@@ -2,19 +2,19 @@
   include('../engine/engine.inc');
 
   $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->printHead('Documentation', TAB_DOCS);
-?>
-<h2>Documentation</h2>
-<h3><a href="manual/">Manual</a></h3>
-<p>The <a href="manual/">manual</a> explains how to use WinMerge, and documents its capabilities and limitations.</p>
-<h3><a href="releasenotes.php">Release Notes</a></h3>
-<p>The <a href="releasenotes.php">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href="releasenotes.php#issues">known issues</a> in the current WinMerge release.</p>
-<h3><a href="changelog.php">Change Log</a></h3>
-<p>The <a href="changelog.php">change log</a> is a more complete list of changes in the last WinMerge releases.</p>
-<h3><a href="/Wiki/">Development Wiki</a></h3>
-<p>The <a href="/Wiki/">Development Wiki</a> contains many informations about the WinMerge development.</p>
-<?php
+  $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->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(__('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');
+  $page->printPara(__('The <a href="%s">change log</a> is a more complete list of changes in the last WinMerge releases.', 'changelog.php'));
+  $page->printLinkedSubHeading(__('Development Wiki'), '/Wiki/');
+  $page->printPara(__('The <a href="%s">Development Wiki</a> contains many informations about the WinMerge development.', '/Wiki/'));
+
   $page->printFoot();
 ?>
\ No newline at end of file

Modified: trunk/Web/docs/releasenotes.php
===================================================================
--- trunk/Web/docs/releasenotes.php	2009-08-20 10:27:07 UTC (rev 6959)
+++ trunk/Web/docs/releasenotes.php	2009-08-20 10:45:05 UTC (rev 6960)
@@ -2,13 +2,13 @@
   include('../engine/engine.inc');
   
   $page = new Page;
-  $page->setDescription('The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release.');
-  $page->setKeywords('WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release');
-  $page->printHead('Release Notes', TAB_DOCS);
+  $page->setDescription(__('The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release.'));
+  $page->setKeywords(__('WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release'));
+  $page->printHead(__('Release Notes'), TAB_DOCS);
   $releasenotes = $page->getContentFromHtmlFile('ReleaseNotes.html', '#href="ChangeLog.txt"#si', 'href="changelog.php"');
   if ($releasenotes == '') {
-    print("<h2>Release Notes</h2>\n");
-    print("<p>The release notes are currently not available...</p>\n");
+    $page->printHeading(__('Release Notes'));
+    $page->printPara(__('The release notes are currently not available...'));
   }
   else
     print($releasenotes);

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-08-20 10:27:07 UTC (rev 6959)
+++ trunk/Web/engine/page.inc	2009-08-20 10:45:05 UTC (rev 6960)
@@ -183,6 +183,13 @@
     }
 
     /**
+     * print a linked <h3> heading
+     */
+    function printLinkedSubHeading($title, $link) {
+      print("<h3><a href=\"" . $link . "\">" . $title . "</a></h3>\n");
+    }
+
+    /**
      * print a <h3> heading with a RSS feed link
      */
     function printRssSubHeading($title, $rssfeedurl) {


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

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

From: <ge...@us...> - 2009-08-20 10:27:21

Revision: 6959
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6959&view=rev
Author:   gerundt
Date:     2009-08-20 10:27:07 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Web: Make about pages translatable

Modified Paths:
--------------
    trunk/Web/about/history.php
    trunk/Web/about/index.php
    trunk/Web/about/license.php
    trunk/Web/about/screenshots/index.php

Modified: trunk/Web/about/history.php
===================================================================
--- trunk/Web/about/history.php	2009-08-18 12:47:37 UTC (rev 6958)
+++ trunk/Web/about/history.php	2009-08-20 10:27:07 UTC (rev 6959)
@@ -2,11 +2,12 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('History of WinMerge releases with version numbers, release dates and manuals.');
-  $page->setKeywords('WinMerge, history, version number, release date, manual, user\'s guide');
-  $page->printHead('History', TAB_ABOUT);
+  $page->setDescription(__('History of WinMerge releases with version numbers, release dates and manuals.'));
+  $page->setKeywords(__('WinMerge, history, version number, release date, manual, users guide'));
+  $page->printHead(__('History'), TAB_ABOUT);
+  
+  $page->printHeading(__('History'));
 ?>
-<h2>History</h2>
 <div class="infocard">
   <h3>WinMerge 2.12</h3>
   <ul>
@@ -15,8 +16,8 @@
     <li>WinMerge 2.12.0 (2009-03-05)</li>
   </ul>
   <ul class="inline">
-    <li><a href="/docs/manual/">Manual</a></li>
-    <li><a href="/docs/changelog.php">Change Log</a></li>
+    <li><a href="/docs/manual/"><?php __e('Manual');?></a></li>
+    <li><a href="/docs/changelog.php"><?php __e('Change Log');?></a></li>
   </ul>
 </div>
 <div class="infocard">
@@ -41,7 +42,7 @@
   <ul>
     <li>WinMerge 2.6.14 (2008-01-17)</li>
     <li>WinMerge 2.6.12 (2007-09-26)</li>
-    <li><del>WinMerge 2.6.10 (2007-09-25)</del> <em>Withdrawn due to installer bug!</em></li>
+    <li><del>WinMerge 2.6.10 (2007-09-25)</del> <em><?php __e('Withdrawn due to installer bug!');?></em></li>
     <li>WinMerge 2.6.8 (2007-06-19)</li>
     <li>WinMerge 2.6.6 (2007-03-29)</li>
     <li>WinMerge 2.6.4 (2007-01-17)</li>

Modified: trunk/Web/about/index.php
===================================================================
--- trunk/Web/about/index.php	2009-08-18 12:47:37 UTC (rev 6958)
+++ trunk/Web/about/index.php	2009-08-20 10:27:07 UTC (rev 6959)
@@ -2,79 +2,80 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('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.');
-  $page->setKeywords('WinMerge, about, features, file compare, folder compare, version control, screenshots, installation');
-  $page->printHead('About WinMerge', TAB_ABOUT);
+  $page->setDescription(__('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.'));
+  $page->setKeywords(__('WinMerge, about, features, file compare, folder compare, version control, screenshots, installation'));
+  $page->printHead(__('About WinMerge'), TAB_ABOUT);
   $stablerelease = $page->getStableRelease();
+  
+  $page->printHeading(__('About WinMerge'));
+  $page->printPara(__('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.', 'license.php'));
+  $page->printPara(__('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.'));
+  $page->printDownloadNow();
+  
+  $page->printSubHeading(__('Features'));
+  $page->printPara(__('In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:'));
 ?>
-<h2>About WinMerge</h2>
-<p>WinMerge is an <a href="license.php">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.</p>
-<p>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.</p>
-<?php $page->printDownloadNow(); ?>
-
-<h3>Features</h3>
-<p>In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:</p>
 <ul>
-  <li><strong>General</strong>
+  <li><strong><?php __e('General');?></strong>
     <ul>
-      <li>Supports Microsoft Windows 98/2000/XP/2003/Vista/2008</li>
-      <li>Handles Windows, Unix and Mac text file formats</li>
-      <li>Unicode support</li>
-      <li>Tabbed interface</li>
+      <li><?php __e('Supports Microsoft Windows 98/2000/XP/2003/Vista/2008');?></li>
+      <li><?php __e('Handles Windows, Unix and Mac text file formats');?></li>
+      <li><?php __e('Unicode support');?></li>
+      <li><?php __e('Tabbed interface');?></li>
     </ul>
   </li>
-  <li><strong>File Compare</strong>
+  <li><strong><?php __e('File Compare');?></strong>
     <ul>
-      <li>Visual differencing and merging of text files</li>
-      <li>Flexible editor with syntax highlighting, line numbers and word-wrap</li>
-      <li>Highlights differences inside lines</li>
-      <li>Difference pane shows current difference in two vertical panes</li>
-      <li>Location pane shows map of files compared</li>
-      <li>Moved lines detection</li>
+      <li><?php __e('Visual differencing and merging of text files');?></li>
+      <li><?php __e('Flexible editor with syntax highlighting, line numbers and word-wrap');?></li>
+      <li><?php __e('Highlights differences inside lines');?></li>
+      <li><?php __e('Difference pane shows current difference in two vertical panes');?></li>
+      <li><?php __e('Location pane shows map of files compared');?></li>
+      <li><?php __e('Moved lines detection');?></li>
     </ul>
   </li>
-  <li><strong>Folder Compare</strong>
+  <li><strong><?php __e('Folder Compare');?></strong>
     <ul>
-      <li>Regular Expression based file filters allow excluding and including items</li>
-      <li>Fast compare using file sizes and dates</li>
-      <li>Compares one folder or includes all subfolders</li>
-      <li>Can show folder compare results in a tree-style view</li>
+      <li><?php __e('Regular Expression based file filters allow excluding and including items');?></li>
+      <li><?php __e('Fast compare using file sizes and dates');?></li>
+      <li><?php __e('Compares one folder or includes all subfolders');?></li>
+      <li><?php __e('Can show folder compare results in a tree-style view');?></li>
     </ul>
   </li>
-  <li><strong>Version Control</strong>
+  <li><strong><?php __e('Version Control');?></strong>
     <ul>
-      <li>Creates patch files (Normal-, Context- and Unified formats)</li>
-      <li>Resolve conflict files</li>
-      <li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
+      <li><?php __e('Creates patch files (Normal-, Context- and Unified formats)');?></li>
+      <li><?php __e('Resolve conflict files');?></li>
+      <li><?php __e('Rudimentary Visual SourceSafe and Rational ClearCase integration');?></li>
     </ul>
   </li>
-  <li><strong>Other</strong>
+  <li><strong><?php __e('Other');?></strong>
     <ul>
-      <li>Shell Integration (supports 64-bit Windows versions)</li>
-      <li>Archive file support using 7-Zip</li>
-      <li>Plugin support</li>
-      <li>Localizable interface</li>
-      <li><a href="/docs/manual/">Online manual</a> and installed HTML Help manual</li>
+      <li><?php __e('Shell Integration (supports 64-bit Windows versions)');?></li>
+      <li><?php __e('Archive file support using 7-Zip');?></li>
+      <li><?php __e('Plugin support');?></li>
+      <li><?php __e('Localizable interface');?></li>
+      <li><?php __e('<a href="%s">Online manual</a> and installed HTML Help manual', '/docs/manual/');?></li>
     </ul>
   </li>
 </ul>
 
-<h3>Screenshots</h3>
-<p><a href="screenshots/screenshot.png" target="_blank"><img class="thumbnail" src="screenshots/screenshot_small.png" alt="File Comparison" border="0"></a>
-<a href="screenshots/foldercmp.png" target="_blank"><img class="thumbnail" src="screenshots/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
-<p>See the <a href="screenshots/">screenshots page</a> for more screenshots.</p>
+<?php
+  $page->printSubHeading(__('Screenshots'));
+?>
+<p><a href="screenshots/screenshot.png" target="_blank"><img class="thumbnail" src="screenshots/screenshot_small.png" alt="<?php __e('File Comparison');?>" border="0"></a>
+<a href="screenshots/foldercmp.png" target="_blank"><img class="thumbnail" src="screenshots/foldercmp_small.png" alt="<?php __e('Folder Comparison Results');?>" border="0"></a></p>
+<?php
+  $page->printPara(__('See the <a href="%s">screenshots page</a> for more screenshots.', 'screenshots/'));
+  
+  $page->printSubHeading(__('Installation'));
+  $page->printPara(__('Just download the <a href="%s">installer</a> and double-click it.', $stablerelease->getDownload('setup.exe')));
+  $page->printPara(__('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>).', $stablerelease->getDownload('exe.zip')));
+  $page->printPara(__('For more information, please see the <a href="%1$s">Installation section</a> of the <a href="%2$s">Manual</a>.', '/docs/manual/Installing.html', '/docs/manual/'));
+  
+  $page->printSubHeading(__('Using WinMerge'));
+  $page->printPara(__('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.', '/docs/manual/'));
+  $page->printPara(__('Here is the current <a href="%s">change log</a>.', '/docs/changelog.php'));
 
-<h3>Installation</h3>
-<p>Just download the <a href="<?php echo $stablerelease->getDownload('setup.exe');?>">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="<?php echo $stablerelease->getDownload('exe.zip');?>">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>).</p>
-<p>For more information, please see the <a href="/docs/manual/Installing.html">Installation section</a> of the <a href="/docs/manual/">Manual</a>.</p>
-
-<h3>Using WinMerge</h3>
-<p>For information on using WinMerge, see our <a href="/docs/manual/">online Manual</a>,
-or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p>
-
-<p>Here is the current <a href="/docs/changelog.php">change log</a>.</p>
-<?php
   $page->printFoot();
 ?>

Modified: trunk/Web/about/license.php
===================================================================
--- trunk/Web/about/license.php	2009-08-18 12:47:37 UTC (rev 6958)
+++ trunk/Web/about/license.php	2009-08-20 10:27:07 UTC (rev 6959)
@@ -2,17 +2,18 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them.');
-  $page->setKeywords('WinMerge, license, open source, GNU General Public License, GPL, free software');
-  $page->printHead('License', TAB_ABOUT);
+  $page->setDescription(__('WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them.'));
+  $page->setKeywords(__('WinMerge, license, open source, GNU General Public License, GPL, free software'));
+  $page->printHead(__('License'), TAB_ABOUT);
+  
+  $page->printHeading(__('License'));
+  $page->printPara(__('WinMerge is <a href="%1$s">Open Source</a> software under the <a href="%2$s">GNU General Public License</a>.', 'http://www.opensource.org/', 'http://www.gnu.org/licenses/gpl-2.0.html'));
+  $page->printPara(__('This means everybody can download the <a href="%s">source code</a> and improve and modify them.
+The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit.', '/downloads/source-code.php'));
+  
+  $page->printSubHeading(__('GNU General Public License'));
 ?>
-<h2>License</h2>
-<p>WinMerge is <a href="http://www.opensource.org/">Open Source</a> software under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License</a>.</p>
-<p>This means everybody can download the <a href="/downloads/source-code.php">source code</a> and improve and modify them.
-The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit.</p>
-
-<h3>GNU General Public License</h3>
-<pre>WinMerge is free software: you can redistribute it and/or modify
+<pre lang="en">WinMerge is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 2 of the License, or
 (at your option) any later version.
@@ -25,11 +26,13 @@
 You should have received a copy of the GNU General Public License
 along with WinMerge.  If not, see &lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</pre>
 
-<h3>Links</h3>
+<?php
+  $page->printSubHeading(__('Links'));
+?>
 <ul>
-  <li><a href="http://www.opensource.org/">The Open Source Definition</a></li>
-  <li><a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License v2.0</a></li>
-  <li><a href="http://en.wikipedia.org/wiki/Open_source_software">Open Source Software</a></li>
+  <li><a href="http://www.opensource.org/"><?php __e('The Open Source Definition');?></a></li>
+  <li><a href="http://www.gnu.org/licenses/gpl-2.0.html"><?php __e('GNU General Public License v2.0');?></a></li>
+  <li><a href="http://en.wikipedia.org/wiki/Open_source_software"><?php __e('Open Source Software');?></a></li>
 </ul>
 <?php
   $page->printFoot();

Modified: trunk/Web/about/screenshots/index.php
===================================================================
--- trunk/Web/about/screenshots/index.php	2009-08-18 12:47:37 UTC (rev 6958)
+++ trunk/Web/about/screenshots/index.php	2009-08-20 10:27:07 UTC (rev 6959)
@@ -2,33 +2,34 @@
   include('../../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('Screenshots from WinMerge features like file comparison, folder comparison results and location pane.');
-  $page->setKeywords('WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen');
-  $page->printHead('Screenshots', TAB_ABOUT);
+  $page->setDescription(__('Screenshots from WinMerge features like file comparison, folder comparison results and location pane.'));
+  $page->setKeywords(__('WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen'));
+  $page->printHead(__('Screenshots'), TAB_ABOUT);
+  
+  $page->printHeading(__('Screenshots'));
 ?>
-<h2>Screenshots</h2>
 <div class="screenshots">
-  <h3>File Comparison</h3>
-  <a href="filecmp.png" target="_blank"><img src="filecmp_small.png" alt="File Comparison" width="305" height="200" border="0"></a>
-  <p>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.</p>
-  <h3>Open-dialog</h3>
-  <a href="open-dialog.png" target="_blank"><img src="open-dialog_small.png" alt="Open-dialog" width="300" height="126" border="0"></a>
-  <p>WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them.</p>
-  <h3>Folder Comparison Results</h3>
-  <a href="foldercmp.png" target="_blank"><img src="foldercmp_small.png" alt="Folder Comparison Results" width="316" height="200" border="0"></a>
-  <p>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.</p>
-  <h3>Folder Compare Tree View</h3>
-  <a href="foldercmp_treeview.png" target="_blank"><img src="foldercmp_treeview_small.png" alt="Folder Compare Tree View" width="285" height="200" border="0"></a>
-  <p>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.</em></p>
-  <h3>Highlight Line Diff</h3>
-  <a href="filecmp_inlinediff.png" target="_blank"><img src="filecmp_inlinediff_small.png" alt="Highlight Line Diff" width="294" height="200" border="0"></a>
-  <p>Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines.</p>
-  <h3>Location Pane</h3>
-  <a href="screenshot.png" target="_blank"><img src="screenshot_small.png" alt="Location Pane" width="300" height="200" border="0"></a>
-  <p>Location pane is a handy side-pane showing a overall (difference) map of files compared.</p>
-  <h3>Splash Screen</h3>
-  <a href="splash_screen.png" target="_blank"><img src="splash_screen_small.png" alt="Splash Screen" width="312" height="200" border="0"></a>
-  <p>WinMerge 2.8 has a new professional looking splash screen.</p>
+  <h3><?php __e('File Comparison');?></h3>
+  <a href="filecmp.png" target="_blank"><img src="filecmp_small.png" alt="<?php __e('File Comparison');?>" width="305" height="200" border="0"></a>
+  <p><?php __e('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.');?></p>
+  <h3><?php __e('Open-dialog');?></h3>
+  <a href="open-dialog.png" target="_blank"><img src="open-dialog_small.png" alt="<?php __e('Open-dialog');?>" width="300" height="126" border="0"></a>
+  <p><?php __e('WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them.');?></p>
+  <h3><?php __e('Folder Comparison Results');?></h3>
+  <a href="foldercmp.png" target="_blank"><img src="foldercmp_small.png" alt="<?php __e('Folder Comparison Results');?>" width="316" height="200" border="0"></a>
+  <p><?php __e('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.');?></p>
+  <h3><?php __e('Folder Compare Tree View');?></h3>
+  <a href="foldercmp_treeview.png" target="_blank"><img src="foldercmp_treeview_small.png" alt="<?php __e('Folder Compare Tree View');?>" width="285" height="200" border="0"></a>
+  <p><?php __e('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.');?></em></p>
+  <h3><?php __e('Highlight Line Diff');?></h3>
+  <a href="filecmp_inlinediff.png" target="_blank"><img src="filecmp_inlinediff_small.png" alt="<?php __e('Highlight Line Diff');?>" width="294" height="200" border="0"></a>
+  <p><?php __e('Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines.');?></p>
+  <h3><?php __e('Location Pane');?></h3>
+  <a href="screenshot.png" target="_blank"><img src="screenshot_small.png" alt="<?php __e('Location Pane');?>" width="300" height="200" border="0"></a>
+  <p><?php __e('Location pane is a handy side-pane showing a overall (difference) map of files compared.');?></p>
+  <h3><?php __e('Splash Screen');?></h3>
+  <a href="splash_screen.png" target="_blank"><img src="splash_screen_small.png" alt="<?php __e('Splash Screen');?>" width="312" height="200" border="0"></a>
+  <p><?php __e('WinMerge 2.8 has a new professional looking splash screen.');?></p>
   <br />
 </div>
 <?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:[6958] trunk/Web/downloads/source-code.php

From: <ge...@us...> - 2009-08-18 12:47:48

Revision: 6958
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6958&view=rev
Author:   gerundt
Date:     2009-08-18 12:47:37 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Web: Make source code page translatable

Modified Paths:
--------------
    trunk/Web/downloads/source-code.php

Modified: trunk/Web/downloads/source-code.php
===================================================================
--- trunk/Web/downloads/source-code.php	2009-08-18 12:24:03 UTC (rev 6957)
+++ trunk/Web/downloads/source-code.php	2009-08-18 12:47:37 UTC (rev 6958)
@@ -2,25 +2,26 @@
   include('../engine/engine.inc');
 
   $page = new Page;
-  $page->setDescription('Download the source code of WinMerge, which is released under the GNU General Public License.');
-  $page->setKeywords('WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN');
-  $page->printHead('Download Source Code', TAB_DOWNLOADS, 'toggle(\'checksumslist\');');
+  $page->setDescription(__('Download the source code of WinMerge, which is released under the GNU General Public License.'));
+  $page->setKeywords(__('WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN'));
+  $page->printHead(__('Download Source Code'), TAB_DOWNLOADS, 'toggle(\'checksumslist\');');
   $stablerelease = $page->getStableRelease();
+  
+  $page->printHeading(__('Download Source Code'));
+  $page->printPara(__('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.', 'http://www.gnu.org/licenses/gpl-2.0.html'));
 ?>
-<h2>Download Source Code</h2>
-<p>WinMerge is released under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself.</p>
 <div class="downloadmatrix">
 <ul>
-  <li><strong>WinMerge <?php echo $stablerelease->getVersionNumber();?> - Source Code</strong>
+  <li><strong><?php __e('WinMerge %s - Source Code', $stablerelease->getVersionNumber());?></strong>
     <ul>
-      <li><a href="<?php echo $stablerelease->getDownload('src.zip');?>">Zip-Format (<?php echo $stablerelease->getDownloadSizeMb('src.zip');?> MB)</a></li>
-      <li><a href="<?php echo $stablerelease->getDownload('src.7z');?>">7z-Format (<?php echo $stablerelease->getDownloadSizeMb('src.7z');?> MB)</a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('src.zip');?>"><?php __e('Zip-Format (%s MB)', $stablerelease->getDownloadSizeMb('src.zip'));?></a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('src.7z');?>"><?php __e('7z-Format (%s MB)', $stablerelease->getDownloadSizeMb('src.7z'));?></a></li>
     </ul>
   </li>
 </ul>
 </div> <!-- .downloadmatrix -->
 <div id="checksums">
-  <h3><a href="javascript:toggle('checksumslist')">SHA-1 Checksums</a></h3>
+  <h3><a href="javascript:toggle('checksumslist')"><?php __e('SHA-1 Checksums');?></a></h3>
 <pre id="checksumslist">
 <?php
   echo $stablerelease->getDownloadSha1Sum('src.zip') . ' ' . $stablerelease->getDownloadFileName('src.zip') . "\n";
@@ -28,12 +29,14 @@
 ?>
 </pre>
 </div> <!-- #checksums -->
-<p>The source code is hosted on <a href="http://sourceforge.net/">SourceForge.net</a> in a <a href="http://sourceforge.net/svn/?group_id=13216">Subversion</a> repository.</p>
-<p>You can <a href="http://winmerge.svn.sourceforge.net/viewvc/winmerge/">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="http://tortoisesvn.net/">TortoiseSVN</a> installed):</p>
+<?php
+  $page->printPara(__('The source code is hosted on <a href="%1$s">SourceForge.net</a> in a <a href="%2$s">Subversion</a> repository.', 'http://sourceforge.net/', 'http://sourceforge.net/svn/?group_id=13216'));
+  $page->printPara(__('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):', 'http://winmerge.svn.sourceforge.net/viewvc/winmerge/', 'http://tortoisesvn.net/'));
+?>
 <dl class="headinglist">
-  <dt>Developer Version</dt>
+  <dt><?php __e('Developer Version');?></dt>
   <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk">https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk</a></dd>
-  <dt>WinMerge <?php echo $stablerelease->getVersionNumberMajor();?></dt>
+  <dt><?php __e('WinMerge %s', $stablerelease->getVersionNumberMajor());?></dt>
   <dd><a href="tsvn:https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/<?php echo $stablerelease->getBranchName();?>">https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/<?php echo $stablerelease->getBranchName();?></a></dd>
 </dl>
 <?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:[6957] trunk/Web

From: <ge...@us...> - 2009-08-18 12:24:14

Revision: 6957
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6957&view=rev
Author:   gerundt
Date:     2009-08-18 12:24:03 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Web: Make index page translatable

Modified Paths:
--------------
    trunk/Web/downloads/index.php
    trunk/Web/index.php

Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php	2009-08-18 09:40:31 UTC (rev 6956)
+++ trunk/Web/downloads/index.php	2009-08-18 12:24:03 UTC (rev 6957)
@@ -37,7 +37,7 @@
 </ul>
 </div> <!-- .downloadmatrix -->
 <div id="checksums">
-  <h4><a href="javascript:toggle('checksumslist')">SHA-1 Checksums</a></h4>
+  <h4><a href="javascript:toggle('checksumslist')"><?php __e('SHA-1 Checksums');?></a></h4>
 <pre id="checksumslist">
 <?php
   echo $stablerelease->getDownloadSha1Sum('setup.exe') . ' ' . $stablerelease->getDownloadFileName('setup.exe') . "\n";

Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php	2009-08-18 09:40:31 UTC (rev 6956)
+++ trunk/Web/index.php	2009-08-18 12:24:03 UTC (rev 6957)
@@ -3,52 +3,50 @@
   include('engine/simplepie/simplepie.inc');
 
   $page = new Page;
-  $page->setDescription('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.');
-  $page->setKeywords('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');
-  $page->addRssFeed('http://sourceforge.net/export/rss2_projnews.php?group_id=13216', 'Project News');
+  $page->setDescription(__('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.'));
+  $page->setKeywords(__('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'));
+  $page->addRssFeed('http://sourceforge.net/export/rss2_projnews.php?group_id=13216', __('Project News'));
   $page->printHead('', TAB_HOME);
   $stablerelease = $page->getStableRelease();
 ?>
 <div class="whatisbox">
-  <h2>What is WinMerge?</h2>
+  <h2><?php __e('What is WinMerge?');?></h2>
   <p class="whatisimage">
-    <img class="thumbnail" src="about/screenshots/screenshot_small.png" alt="File Comparison" height="150" border="0"><br />
-    <a href="about/screenshots/">More Screenshots...</a>
+    <img class="thumbnail" src="about/screenshots/screenshot_small.png" alt="<?php __e('File Comparison');?>" height="150" border="0"><br />
+    <a href="about/screenshots/"><?php __e('More Screenshots&hellip;');?></a>
   </p>
   <div class="whatistext">
-    <p>WinMerge is an <a href="about/license.php">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.</p>
-    <p><strong><a href="about/">Learn More</a> or <a href="downloads/">Download Now!</a></strong></p>
+    <p><?php __e('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.', 'about/license.php');?></p>
+    <p><strong><?php __e('<a href="%1$s">Learn More</a> or <a href="%2$s">Download Now!</a>', 'about/', 'downloads/');?></strong></p>
   </div>
   <br class="whatisclear" />
 </div>
 
-<h3>WinMerge <?php echo $stablerelease->getVersionNumber();?> - latest stable version</h3>
-<p><a href="downloads/">WinMerge <?php echo $stablerelease->getVersionNumber();?></a> is the latest stable version, and is recommended for most users.</p>
-<?php $page->printDownloadNow(); ?>
-
 <?php
-  $page->printRssSubHeading('Project News', 'http://sourceforge.net/export/rss2_projnews.php?group_id=13216');
+  $page->printSubHeading(__('WinMerge %s - latest stable version', $stablerelease->getVersionNumber()));
+  $page->printPara(__('<a href="%1$s">WinMerge %2$s</a> is the latest stable version, and is recommended for most users.', 'downloads/', $stablerelease->getVersionNumber()));
+  $page->printDownloadNow();
+  
+  $page->printRssSubHeading(__('Project News'), 'http://sourceforge.net/export/rss2_projnews.php?group_id=13216');
   $feed = new SimplePie();
   $feed->set_feed_url('http://sourceforge.net/export/rss2_projnews.php?group_id=13216');
   $feed->set_cache_location('./engine/simplepie/cache');
   $feed->init();
   print("<ul class=\"rssfeeditems\">\n");
   foreach ($feed->get_items(0, 5) as $item) { //for the last 5 news items...
-    print("  <li><a href=\"".$item->get_link()."\">".$item->get_title()."</a> <em>".$item->get_date('Y-m-d')."</em></li>\n");
+    print("  <li><a href=\"".$item->get_link()."\">".$item->get_title()."</a> <em>".$item->get_date(__('Y-m-d'))."</em></li>\n");
   }
-  print("  <li><a href=\"http://sourceforge.net/news/?group_id=13216\">View all news &hellip;</a></li>\n");
+  print("  <li><a href=\"http://sourceforge.net/news/?group_id=13216\">" . __('View all news&hellip;') . "</a></li>\n");
   print("</ul>\n");
-?>
 
-<h3>Support</h3>
-<p>If you need support, look at our <a href="support/">support page</a> for more information how you can get it.</p>
+  $page->printSubHeading(__('Support'));
+  $page->printPara(__('If you need support, look at our <a href="%s">support page</a> for more information how you can get it.', 'support/'));
 
-<h3>Developers</h3>
-<p>WinMerge is an open source project, which means that the program is maintained and developed by
-volunteers. If you''re interested in contributing work to the project, see our <a href="http://winmerge.org/Wiki/Help_Needed">developer page</a>
-for further information on how you may contribute.</p>
-<p>In addition, WinMerge is translated into a number of different languages. See our <a href="translations/">information on translating WinMerge</a> into your own language.</p>
-<p><a href="http://winmerge.org/Wiki/Developers">The WinMerge Development Team</a></p>
-<?php
+  $page->printSubHeading(__('Developers'));
+  $page->printPara(__('WinMerge is an open source project, which means that the program is maintained and developed by volunteers.'),
+                   __('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.', 'http://winmerge.org/Wiki/Help_Needed'));
+  $page->printPara(__('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.', 'translations/'));
+  $page->printPara('<a href="http://winmerge.org/Wiki/Developers">' . __('The WinMerge Development Team') . '</a>');
+
   $page->printFoot();
 ?>


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

[Winmerge-svn] SF.net SVN: winmerge:[6956] trunk/Web/downloads/index.php

From: <ge...@us...> - 2009-08-18 09:40:41

Revision: 6956
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6956&view=rev
Author:   gerundt
Date:     2009-08-18 09:40:31 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Web: Make download page translatable - Cant't use \'

Modified Paths:
--------------
    trunk/Web/downloads/index.php

Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php	2009-08-18 09:32:26 UTC (rev 6955)
+++ trunk/Web/downloads/index.php	2009-08-18 09:40:31 UTC (rev 6956)
@@ -4,7 +4,7 @@
 
   $page = new Page;
   $stablerelease = $page->getStableRelease();
-  $page->setDescription(__('Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what\'s new, read the change log and the release notes.', $stablerelease->getVersionNumber(), $stablerelease->getDate()));
+  $page->setDescription(__('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.', $stablerelease->getVersionNumber(), $stablerelease->getDate()));
   $page->setKeywords(__('WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable'));
   $page->addRssFeed('http://sourceforge.net/export/rss2_projfiles.php?group_id=13216', __('Project File Releases'));
   $page->printHead(__('Download WinMerge'), TAB_DOWNLOADS, 'toggle(\'checksumslist\');');
@@ -13,7 +13,7 @@
   $page->printSubHeading(__('WinMerge %s', $stablerelease->getVersionNumber()));
   $page->printDownloadNow();
   $page->printPara(__('The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>.', $stablerelease->getVersionNumber(), $stablerelease->getDate()),
-                   __('For detailed info on what\'s new, read the <a href="%1$s">change log</a> and the <a href="%2$s">release notes</a>.', '/docs/changelog.php', '/docs/releasenotes.php'));
+                   __('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>.', '/docs/changelog.php', '/docs/releasenotes.php'));
 ?>
 <div class="downloadmatrix">
 <ul>


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

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

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

Revision: 6955
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6955&view=rev
Author:   gerundt
Date:     2009-08-18 09:32:26 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Web: Make download page translatable

Modified Paths:
--------------
    trunk/Web/downloads/index.php
    trunk/Web/engine/page.inc

Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php	2009-08-17 18:39:28 UTC (rev 6954)
+++ trunk/Web/downloads/index.php	2009-08-18 09:32:26 UTC (rev 6955)
@@ -4,32 +4,34 @@
 
   $page = new Page;
   $stablerelease = $page->getStableRelease();
-  $page->setDescription('Download the current WinMerge version ' . $stablerelease->getVersionNumber() . ', which was released at ' . $stablerelease->getDate() . '. For detailed info on what\'s new, read the change log and the release notes.');
-  $page->setKeywords('WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable');
-  $page->addRssFeed('http://sourceforge.net/export/rss2_projfiles.php?group_id=13216', 'Project File Releases');
-  $page->printHead('Download WinMerge', TAB_DOWNLOADS, 'toggle(\'checksumslist\');');
+  $page->setDescription(__('Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what\'s new, read the change log and the release notes.', $stablerelease->getVersionNumber(), $stablerelease->getDate()));
+  $page->setKeywords(__('WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable'));
+  $page->addRssFeed('http://sourceforge.net/export/rss2_projfiles.php?group_id=13216', __('Project File Releases'));
+  $page->printHead(__('Download WinMerge'), TAB_DOWNLOADS, 'toggle(\'checksumslist\');');
+  
+  $page->printHeading(__('Download WinMerge'));
+  $page->printSubHeading(__('WinMerge %s', $stablerelease->getVersionNumber()));
+  $page->printDownloadNow();
+  $page->printPara(__('The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>.', $stablerelease->getVersionNumber(), $stablerelease->getDate()),
+                   __('For detailed info on what\'s new, read the <a href="%1$s">change log</a> and the <a href="%2$s">release notes</a>.', '/docs/changelog.php', '/docs/releasenotes.php'));
 ?>
-<h2>Download WinMerge</h2>
-<h3>WinMerge <?php echo $stablerelease->getVersionNumber();?></h3>
-<?php $page->printDownloadNow(); ?>
-<p>The current WinMerge version is <strong><?php echo $stablerelease->getVersionNumber();?></strong> and was released at <strong><?php echo $stablerelease->getDate();?></strong>. For detailed info on what's new, read the <a href="/docs/changelog.php">change log</a> and the <a href="/docs/releasenotes.php">release notes</a>.</p>
 <div class="downloadmatrix">
 <ul>
-  <li><strong>Installer</strong>
+  <li><strong><?php __e('Installer');?></strong>
     <ul>
-      <li><a href="<?php echo $stablerelease->getDownload('setup.exe');?>">Exe-Format (<?php echo $stablerelease->getDownloadSizeMb('setup.exe');?> MB)</a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('setup.exe');?>"><?php __e('Exe-Format (%s MB)', $stablerelease->getDownloadSizeMb('setup.exe'));?></a></li>
     </ul>
   </li>
-  <li><strong>Binaries</strong>
+  <li><strong><?php __e('Binaries');?></strong>
     <ul>
-      <li><a href="<?php echo $stablerelease->getDownload('exe.zip');?>">Zip-Format (<?php echo $stablerelease->getDownloadSizeMb('exe.zip');?> MB)</a></li>
-      <li><a href="<?php echo $stablerelease->getDownload('exe.7z');?>">7z-Format (<?php echo $stablerelease->getDownloadSizeMb('exe.7z');?> MB)</a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('exe.zip');?>"><?php __e('Zip-Format (%s MB)', $stablerelease->getDownloadSizeMb('exe.zip'));?></a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('exe.7z');?>"><?php __e('7z-Format (%s MB)', $stablerelease->getDownloadSizeMb('exe.7z'));?></a></li>
     </ul>
   </li>
-  <li><strong>Runtimes</strong>
+  <li><strong><?php __e('Runtimes');?></strong>
     <ul>
-      <li><a href="<?php echo $stablerelease->getDownload('rt.zip');?>">Zip-Format (<?php echo $stablerelease->getDownloadSizeMb('rt.zip');?> MB)</a></li>
-      <li><a href="<?php echo $stablerelease->getDownload('rt.7z');?>">7z-Format (<?php echo $stablerelease->getDownloadSizeMb('rt.7z');?> MB)</a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('rt.zip');?>"><?php __e('Zip-Format (%s MB)', $stablerelease->getDownloadSizeMb('rt.zip'));?></a></li>
+      <li><a href="<?php echo $stablerelease->getDownload('rt.7z');?>"><?php __e('7z-Format (%s MB)', $stablerelease->getDownloadSizeMb('rt.7z'));?></a></li>
     </ul>
   </li>
 </ul>
@@ -46,24 +48,29 @@
 ?>
 </pre>
 </div> <!-- #checksums -->
-<p>The easiest way to install WinMerge is to download and run the Installer. Read the <a href="/docs/manual/Installing.html">online manual</a> for help using it.</p>
-<p>You can also download additional <a href="plugins.php">plugins</a> and the whole <a href="source-code.php">source code</a> from WinMerge.</p>
-<h4>Requirements</h4>
+<?php
+  $page->printPara(__('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.', '/docs/manual/Installing.html'));
+  $page->printPara(__('You can also download additional <a href="%1$s">plugins</a> and the whole <a href="%2$s">source code</a> from WinMerge.', 'plugins.php', 'source-code.php'));
+
+  $page->printSubSubHeading(__('Requirements'));
+?>
 <ul>
-  <li>Microsoft Windows 98/2000/XP/2003/Vista/2008</li>
-  <li>Microsoft Visual C++ 2003 Runtime Components (included in the installer)</li>
-  <li>Admin rights for the installer</li>
+  <li><?php __e('Microsoft Windows 98/2000/XP/2003/Vista/2008');?></li>
+  <li><?php __e('Microsoft Visual C++ 2003 Runtime Components (included in the installer)');?></li>
+  <li><?php __e('Admin rights for the installer');?></li>
 </ul>
-<h3><a name="other">Other Versions</a></h3>
+<?php
+  $page->printSubHeading(__('Other Versions'));
+?>
 <ul>
-  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248">Stable Versions</a></li>
-  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158">Beta Versions</a></li>
-  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=92246">Experimental Builds</a></li>
-  <li><a href="http://portableapps.com/apps/utilities/winmerge_portable">WinMerge Portable</a> (by PortableApps.com)</li>
-  <li><a href="http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html">Japanese WinMerge Version</a> (by Takashi Sawanaka)</li>
+  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248"><?php __e('Stable Versions');?></a></li>
+  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=29158"><?php __e('Beta Versions');?></a></li>
+  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=92246"><?php __e('Experimental Builds');?></a></li>
+  <li><a href="http://portableapps.com/apps/utilities/winmerge_portable"><?php __e('WinMerge Portable');?></a> <?php __e('(by PortableApps.com)');?></li>
+  <li><a href="http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html"><?php __e('Japanese WinMerge Version');?></a> (by Takashi Sawanaka)</li>
 </ul>
 <?php
-  $page->printRssSubHeading('Project File Releases', 'http://sourceforge.net/export/rss2_projfiles.php?group_id=13216');
+  $page->printRssSubHeading(__('Project File Releases'), 'http://sourceforge.net/export/rss2_projfiles.php?group_id=13216');
   $feed = new SimplePie();
   $feed->set_feed_url('http://sourceforge.net/export/rss2_projfiles.php?group_id=13216');
   $feed->set_cache_location('../engine/simplepie/cache');
@@ -78,12 +85,10 @@
     $title = str_replace('4. Beta versions', 'Beta version', $title);
     $title = str_replace('5. Experimental builds', 'Experimental build', $title);
     $title = str_replace('6. Developer tools', 'Developer tool', $title);
-    print("  <li><a href=\"".$item->get_link()."\">".$title."</a> <em>".$item->get_date('Y-m-d')."</em></li>\n");
+    print("  <li><a href=\"".$item->get_link()."\">".$title."</a> <em>".$item->get_date(__('Y-m-d'))."</em></li>\n");
   }
-  print("  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216\">View all file releases &hellip;</a></li>\n");
+  print("  <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216\">" . __('View all file releases&hellip;') . "</a></li>\n");
   print("</ul>\n");
-?>
 
-<?php
   $page->printFoot();
 ?>
\ No newline at end of file

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-08-17 18:39:28 UTC (rev 6954)
+++ trunk/Web/engine/page.inc	2009-08-18 09:32:26 UTC (rev 6955)
@@ -162,6 +162,13 @@
     }
 
     /**
+     * print a <h2> heading
+     */
+    function printHeading($title) {
+      print("<h2>" . $title . "</h2>\n");
+    }
+
+    /**
      * print a <h2> heading with a RSS feed link
      */
     function printRssHeading($title, $rssfeedurl) {
@@ -169,6 +176,13 @@
     }
 
     /**
+     * print a <h3> heading
+     */
+    function printSubHeading($title) {
+      print("<h3>" . $title . "</h3>\n");
+    }
+
+    /**
      * print a <h3> heading with a RSS feed link
      */
     function printRssSubHeading($title, $rssfeedurl) {
@@ -176,12 +190,35 @@
     }
 
     /**
+     * print a <h4> heading
+     */
+    function printSubSubHeading($title) {
+      print("<h4>" . $title . "</h4>\n");
+    }
+
+    /**
+     * print a paragraph
+     */
+    function printPara() {
+      print("<p>");
+      $numargs = func_num_args();
+      $args = func_get_args();
+      for ($i = 0; $i < $numargs; $i++) { //for all arguments...
+        if ($i > 0) //if NOT first argument...
+          print(' ' . $args[$i]);
+        else //if first argument...
+          print($args[$i]);
+      }
+      print("</p>\n");
+    }
+
+    /**
      * print the "Download Now!" link
      */
     function printDownloadNow() {
       $temp = "<p><a class=\"downloadnow\" href=\"" . $this->_stablerelease->getDownload('setup.exe') . "\">";
-      $temp .= "<strong>Download Now!</strong> ";
-      $temp .= "<em>Version " . $this->_stablerelease->getVersionNumber() . "; " . $this->_stablerelease->getDownloadSizeMb('setup.exe') . " MB</em>";
+      $temp .= "<strong>" . __('Download Now!') . "</strong> ";
+      $temp .= "<em>" . __('Version %1$s; %2$s MB', $this->_stablerelease->getVersionNumber(), $this->_stablerelease->getDownloadSizeMb('setup.exe')) . "</em>";
       $temp .= "</a></p>\n";
       print($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:[6954] trunk/Translations

From: <ge...@us...> - 2009-08-17 18:39:44

Revision: 6954
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6954&view=rev
Author:   gerundt
Date:     2009-08-17 18:39:28 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
Add python script to create website POT file

Added Paths:
-----------
    trunk/Translations/Web/
    trunk/Translations/Web/CreateMasterPotFile.py
    trunk/Translations/Web/en-US.pot


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


Added: trunk/Translations/Web/CreateMasterPotFile.py
===================================================================
--- trunk/Translations/Web/CreateMasterPotFile.py	                        (rev 0)
+++ trunk/Translations/Web/CreateMasterPotFile.py	2009-08-17 18:39:28 UTC (rev 6954)
@@ -0,0 +1,117 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-;
+
+# Python script to create the POT file for the website
+#
+# Copyright 2009 Tim Gerundt <ti...@ge...>
+#
+# This file is part of WinMerge. WinMerge is free software under the terms of the
+# GNU General Public License. You should have received a copy of the license
+# along with WinMerge.  If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id$
+
+from os import sep
+from os.path import abspath, isfile, join, splitext, walk
+from time import strftime
+import string
+import re
+
+def getPhpFiles(path):
+    ''' Get all php files from a folder and his subfolders '''
+    phpfiles = []
+    walk(path, walkPhpFiles, phpfiles)
+    return phpfiles
+
+def walkPhpFiles(phpfiles, dirpath, itemnames):
+    ''' Helper function for getPhpFiles() '''
+    for itemname in itemnames: #For all dir items...
+        fullitempath = abspath(join(dirpath, itemname))
+        if isfile(fullitempath): #If a file...
+            filename = splitext(itemname)
+            if str.lower(filename[1]) == '.php' or str.lower(filename[1]) == '.inc': #If a PHP file...
+                phpfiles.append(fullitempath)
+
+def getTranslationsFromPhpFile(filepath, translations):
+    ''' Get the translations from a php file '''
+    rGettext = re.compile('_e?\([\'](.+?)[\']', re.DOTALL)
+    rGettextTestMultiLine = re.compile('_e?\([\']([^\'\n]+)\n')
+    
+    phpfile = open(filepath, 'r')
+    lines = phpfile.readlines()
+    phpfile.close()
+    
+    i = 0
+    for line in lines: #For all lines...
+        #--------------------------------------------------------------------------------
+        # Multi-line translations...
+        #--------------------------------------------------------------------------------
+        tmps = rGettextTestMultiLine.findall(line)
+        if tmps: #If found a multi-line gettext function...
+            tmps = rGettext.findall("".join(lines[i:]))
+            for tmp in tmps: #For all translations...
+                if string.find(tmp, '\n') > 0: #If a multi-line translation...
+                    translation = string.replace(tmp, '\n', '\\n')
+                    if translation in translations: #If the translation is already exists...
+                        translations[translation] += [(filepath, i)]
+                    else: #If the translation is NOT already exists...
+                        translations[translation] = [(filepath, i)]
+                    break #Use only the FIRST multi-line translation!
+        #--------------------------------------------------------------------------------
+        
+        #--------------------------------------------------------------------------------
+        # Normal translations...
+        #--------------------------------------------------------------------------------
+        i += 1
+        tmps = rGettext.findall(line)
+        if tmps: #If found a gettext function...
+            for tmp in tmps: #For all translations...
+                translation = tmp
+                if translation in translations: #If the translation is already exists...
+                    translations[translation] += [(filepath, i)]
+                else: #If the translation is NOT already exists...
+                    translations[translation] = [(filepath, i)]
+        #--------------------------------------------------------------------------------
+
+def main():
+    translations = {}
+    php_dir = abspath('../../Web')
+    php_files = getPhpFiles(php_dir)
+    for php_file in php_files: #For all php files...
+        getTranslationsFromPhpFile(php_file, translations)
+    
+    potfile = open('en-US.pot', 'w')
+    potfile.write('# This file is part from WinMerge <http://winmerge.org/>\n')
+    potfile.write('# Released under the "GNU General Public License"\n')
+    potfile.write('#\n')
+    potfile.write('# ID line follows -- this is updated by SVN\n')
+    potfile.write('# $' + 'Id' + '$\n')
+    potfile.write('#\n')
+    potfile.write('msgid ""\n')
+    potfile.write('msgstr ""\n')
+    potfile.write('"Project-Id-Version: WinMerge\\n"\n')
+    potfile.write('"Report-Msgid-Bugs-To: http://bugs.winmerge.org\\n"\n')
+    potfile.write('"POT-Creation-Date: %s\\n"\n' % strftime('%Y-%m-%d %H:%M+0000'))
+    potfile.write('"PO-Revision-Date: \\n"\n')
+    potfile.write('"Last-Translator: \\n"\n')
+    potfile.write('"Language-Team: English <win...@li...>\\n"\n')
+    potfile.write('"MIME-Version: 1.0\\n"\n')
+    potfile.write('"Content-Type: text/plain; charset=utf-8\\n"\n')
+    potfile.write('"Content-Transfer-Encoding: 8bit\\n"\n')
+    potfile.write('"X-Poedit-Language: English\\n"\n')
+    potfile.write('"X-Poedit-SourceCharset: utf-8\\n"\n')
+    potfile.write('"X-Poedit-Basepath: ../../Web/\\n"\n')
+    potfile.write('\n')
+    for translation in translations: #For all translations...
+        references = translations[translation]
+        for reference in references: #For all references...
+            potfile.write('#: %s:%u\n' % (reference[0].replace(php_dir + sep, ''), reference[1]))
+        potfile.write('#, c-format\n')
+        potfile.write('msgid "%s"\n' % (translation.replace('"', '\\"')))
+        potfile.write('msgstr ""\n')
+        potfile.write('\n')
+    potfile.close()
+
+# MAIN #
+if __name__ == "__main__":
+    main()
\ No newline at end of file


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

Added: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot	                        (rev 0)
+++ trunk/Translations/Web/en-US.pot	2009-08-17 18:39:28 UTC (rev 6954)
@@ -0,0 +1,325 @@
+# 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-17 20:36+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \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"
+
+#: engine\page.inc:236
+#: engine\page.inc:241
+#: engine\page.inc:247
+#: engine\page.inc:261
+#: engine\page.inc:269
+#, c-format
+msgid "Index"
+msgstr ""
+
+#: engine\page.inc:216
+#: engine\page.inc:247
+#, c-format
+msgid "WinMerge Documentation"
+msgstr ""
+
+#: engine\page.inc:251
+#, c-format
+msgid "WinMerge Change Log"
+msgstr ""
+
+#: engine\page.inc:265
+#, c-format
+msgid "Tracker Shortcuts"
+msgstr ""
+
+#: engine\page.inc:262
+#, c-format
+msgid "WinMerge Discussion Forums"
+msgstr ""
+
+#: engine\page.inc:258
+#, c-format
+msgid "WinMerge PAD File"
+msgstr ""
+
+#: engine\page.inc:218
+#, c-format
+msgid "Support"
+msgstr ""
+
+#: engine\page.inc:272
+#, c-format
+msgid "Status (Unstable Trunk)"
+msgstr ""
+
+#: engine\page.inc:264
+#, c-format
+msgid "Tracker"
+msgstr ""
+
+#: engine\page.inc:250
+#, c-format
+msgid "WinMerge Known Issues"
+msgstr ""
+
+#: engine\page.inc:264
+#, c-format
+msgid "WinMerge Tracker"
+msgstr ""
+
+#: engine\page.inc:266
+#, c-format
+msgid "Donate"
+msgstr ""
+
+#: engine\page.inc:252
+#, c-format
+msgid "WinMerge Development Wiki"
+msgstr ""
+
+#: engine\page.inc:250
+#, c-format
+msgid "Known Issues"
+msgstr ""
+
+#: engine\page.inc:270
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr ""
+
+#: engine\page.inc:252
+#, c-format
+msgid "Development Wiki"
+msgstr ""
+
+#: engine\page.inc:242
+#, c-format
+msgid "WinMerge Screenshots"
+msgstr ""
+
+#: engine\page.inc:217
+#, c-format
+msgid "Downloads"
+msgstr ""
+
+#: engine\page.inc:219
+#, c-format
+msgid "Translations"
+msgstr ""
+
+#: engine\page.inc:238
+#, c-format
+msgid "Project Page"
+msgstr ""
+
+#: engine\page.inc:215
+#: engine\page.inc:241
+#, c-format
+msgid "About WinMerge"
+msgstr ""
+
+#: engine\page.inc:251
+#, c-format
+msgid "Change Log"
+msgstr ""
+
+#: engine\page.inc:219
+#: engine\page.inc:269
+#, c-format
+msgid "WinMerge Translations"
+msgstr ""
+
+#: engine\page.inc:263
+#, c-format
+msgid "WinMerge Mailing Lists"
+msgstr ""
+
+#: engine\page.inc:244
+#, c-format
+msgid "WinMerge License"
+msgstr ""
+
+#: engine\page.inc:271
+#, c-format
+msgid "Status (Stable Branch)"
+msgstr ""
+
+#: engine\page.inc:256
+#, c-format
+msgid "Download WinMerge Plugins"
+msgstr ""
+
+#: engine\page.inc:266
+#, c-format
+msgid "Donate money to WinMerge"
+msgstr ""
+
+#: engine\page.inc:270
+#, c-format
+msgid "Instructions"
+msgstr ""
+
+#: engine\page.inc:257
+#, c-format
+msgid "Source Code"
+msgstr ""
+
+#: engine\page.inc:215
+#, c-format
+msgid "About"
+msgstr ""
+
+#: engine\page.inc:262
+#, c-format
+msgid "Discussion Forums"
+msgstr ""
+
+#: engine\page.inc:244
+#, c-format
+msgid "License"
+msgstr ""
+
+#: engine\page.inc:265
+#, c-format
+msgid "WinMerge Tracker Shortcuts"
+msgstr ""
+
+#: engine\page.inc:214
+#: engine\page.inc:236
+#, c-format
+msgid "WinMerge Home"
+msgstr ""
+
+#: engine\page.inc:216
+#, c-format
+msgid "Documentation"
+msgstr ""
+
+#: engine\page.inc:248
+#, c-format
+msgid "Manual"
+msgstr ""
+
+#: engine\page.inc:257
+#, c-format
+msgid "Download WinMerge Source Code"
+msgstr ""
+
+#: engine\page.inc:238
+#, c-format
+msgid "WinMerge Project Page"
+msgstr ""
+
+#: engine\page.inc:263
+#, c-format
+msgid "Mailing Lists"
+msgstr ""
+
+#: engine\engine.inc:19
+#, c-format
+msgid "English"
+msgstr ""
+
+#: engine\page.inc:249
+#, c-format
+msgid "Release Notes"
+msgstr ""
+
+#: engine\page.inc:248
+#, c-format
+msgid "WinMerge Manual"
+msgstr ""
+
+#: engine\page.inc:249
+#, c-format
+msgid "WinMerge Release Notes"
+msgstr ""
+
+#: engine\page.inc:243
+#, c-format
+msgid "History"
+msgstr ""
+
+#: engine\page.inc:255
+#, c-format
+msgid "Download WinMerge"
+msgstr ""
+
+#: engine\page.inc:272
+#, c-format
+msgid "WinMerge Translations Status (Unstable Trunk)"
+msgstr ""
+
+#: engine\page.inc:237
+#, c-format
+msgid "Links"
+msgstr ""
+
+#: engine\page.inc:258
+#, c-format
+msgid "PAD File"
+msgstr ""
+
+#: engine\engine.inc:20
+#, c-format
+msgid "German"
+msgstr ""
+
+#: engine\page.inc:255
+#, c-format
+msgid "WinMerge"
+msgstr ""
+
+#: engine\page.inc:218
+#: engine\page.inc:261
+#, c-format
+msgid "WinMerge Support"
+msgstr ""
+
+#: engine\page.inc:271
+#, c-format
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr ""
+
+#: engine\page.inc:256
+#, c-format
+msgid "Plugins"
+msgstr ""
+
+#: engine\page.inc:214
+#, c-format
+msgid "Home"
+msgstr ""
+
+#: engine\page.inc:217
+#, c-format
+msgid "WinMerge Downloads"
+msgstr ""
+
+#: engine\page.inc:242
+#, c-format
+msgid "Screenshots"
+msgstr ""
+
+#: engine\page.inc:243
+#, c-format
+msgid "WinMerge History"
+msgstr ""
+
+#: engine\page.inc:237
+#, c-format
+msgid "WinMerge Links"
+msgstr ""
+


Property changes on: trunk/Translations/Web/en-US.pot
___________________________________________________________________
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:[6953] trunk/Web/engine

From: <ge...@us...> - 2009-08-17 18:33:00

Revision: 6953
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6953&view=rev
Author:   gerundt
Date:     2009-08-17 18:32:48 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
Web: Init system for website translation

Modified Paths:
--------------
    trunk/Web/engine/css/print.css
    trunk/Web/engine/css/screen.css
    trunk/Web/engine/engine.inc
    trunk/Web/engine/page.inc

Added Paths:
-----------
    trunk/Web/engine/languages/
    trunk/Web/engine/simpletranslate.inc

Modified: trunk/Web/engine/css/print.css
===================================================================
--- trunk/Web/engine/css/print.css	2009-08-17 14:24:12 UTC (rev 6952)
+++ trunk/Web/engine/css/print.css	2009-08-17 18:32:48 UTC (rev 6953)
@@ -63,6 +63,10 @@
 	display: none;
 }
 
+#languages {
+	display: none;
+}
+
 #poweredby {
 	display: none;
 }

Modified: trunk/Web/engine/css/screen.css
===================================================================
--- trunk/Web/engine/css/screen.css	2009-08-17 14:24:12 UTC (rev 6952)
+++ trunk/Web/engine/css/screen.css	2009-08-17 18:32:48 UTC (rev 6953)
@@ -143,6 +143,28 @@
 	text-align: right;
 }
 
+/* Languages */
+#languages {
+	margin: 0;
+	padding: .5em;
+}
+#languages ul {
+	margin: 0;
+	padding: 0;
+}
+#languages li {
+	margin: 0;
+	margin-right: 1em;
+	padding: 0;
+	display: inline;
+	list-style: none;
+}
+#languages a:link { color:black; text-decoration:none; }
+#languages a:visited { color:black; text-decoration:none; }
+#languages a:focus { color:black; text-decoration:underline; }
+#languages a:hover { color:black; text-decoration:underline; }
+#languages a:active { color:black; text-decoration:none; }
+
 #poweredby {
 	margin: 0;
 	margin-top: 1em;

Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc	2009-08-17 14:24:12 UTC (rev 6952)
+++ trunk/Web/engine/engine.inc	2009-08-17 18:32:48 UTC (rev 6953)
@@ -9,5 +9,44 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+  include('simpletranslate.inc');
   include('page.inc');
+
+  $languagesdir = dirname(__FILE__) . '/languages/';
+
+  $translations = new SimpleTranslate;
+  $translations->setUrlParameter('lang');
+  $translations->addLanguage('en', __('English'));
+  //$translations->addLanguage('de', __('German'), $languagesdir . 'de.po');
+  if (!$translations->detectLanguageFromUrl()) {
+    $translations->detectLanguageFromBrowser();
+  }
+
+  function __($text) {
+    global $translations;
+    
+    $numargs = func_num_args();
+    if ($numargs > 1 ) { //if more the one argument...
+      $args = func_get_args();
+      array_shift($args);
+      return vsprintf($translations->translate($text), $args);
+    }
+    else { //if one argument...
+      return $translations->translate($text);
+    }
+  }
+
+  function __e($text) {
+    global $translations;
+    
+    $numargs = func_num_args();
+    if ($numargs > 1 ) { //if more the one argument...
+      $args = func_get_args();
+      array_shift($args);
+      vprintf($translations->translate($text), $args);
+    }
+    else { //if one argument...
+      echo $translations->translate($text);
+    }
+  }
 ?>
\ No newline at end of file

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-08-17 14:24:12 UTC (rev 6952)
+++ trunk/Web/engine/page.inc	2009-08-17 18:32:48 UTC (rev 6953)
@@ -98,13 +98,15 @@
      * print the head from the page
      */
     function printHead($title = '', $tab = '', $onload = '') {
+      global $translations;
+      
       $this->_title = $title;
       if ($tab != '') {
         $this->_tab = $tab;
       }
       $temp = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n";
       $temp .= "  \"http://www.w3.org/TR/html4/loose.dtd\">\n";
-      $temp .= "<html>\n\n";
+      $temp .= "<html lang=\"" . $translations->getActiveLanguageId() . "\">\n\n";
       $temp .= "<head>\n";
       if ($this->_title != '') {
         $temp .= "  <title>" . $this->_title . " - WinMerge</title>\n";
@@ -147,6 +149,7 @@
     function printFoot() {
       $temp = $this->getSocialBookmarks();
       $temp .= "  </div> <!-- #content -->\n";
+      $temp .= $this->getLanguages();
       $temp .= "<p id=\"poweredby\">\n";
       $temp .= "  <a href=\"http://sourceforge.net/projects/winmerge\"><img src=\"http://sflogo.sourceforge.net/sflogo.php?group_id=13216&amp;type=11\" width=\"120\" height=\"30\" border=\"0\" alt=\"SourceForge.net\" title=\"Get WinMerge at SourceForge.net. Fast, secure and Free Open Source software downloads\" /></a>\n";
       $temp .= "  <a href=\"http://sourceforge.net/donate/index.php?group_id=13216\"><img src=\"/engine/images/project-support.jpg\" width=\"88\" height=\"32\" border=\"0\" alt=\"Donate\" title=\"Donate money to WinMerge\"></a>\n";
@@ -205,13 +208,15 @@
      * get the tabs menu from the page
      */
     function getTabs() {
+      global $translations;
+      
       /* Main Tabs */
-      $tabs[0] = new Tab(TAB_HOME, '/', 'Home', 'WinMerge Home');
-      $tabs[1] = new Tab(TAB_ABOUT, '/about/', 'About', 'About WinMerge');
-      $tabs[2] = new Tab(TAB_DOCS, '/docs/', 'Documentation', 'WinMerge Documentation');
-      $tabs[3] = new Tab(TAB_DOWNLOADS, '/downloads/', 'Downloads', 'WinMerge Downloads');
-      $tabs[4] = new Tab(TAB_SUPPORT, '/support/', 'Support', 'WinMerge Support');
-      $tabs[5] = new Tab(TAB_TRANSLATIONS, '/translations/', 'Translations', 'WinMerge Translations');
+      $tabs[0] = new Tab(TAB_HOME, $translations->prepareLink('/'), __('Home'), __('WinMerge Home'));
+      $tabs[1] = new Tab(TAB_ABOUT, $translations->prepareLink('/about/'), __('About'), __('About WinMerge'));
+      $tabs[2] = new Tab(TAB_DOCS, $translations->prepareLink('/docs/'), __('Documentation'), __('WinMerge Documentation'));
+      $tabs[3] = new Tab(TAB_DOWNLOADS, $translations->prepareLink('/downloads/'), __('Downloads'), __('WinMerge Downloads'));
+      $tabs[4] = new Tab(TAB_SUPPORT, $translations->prepareLink('/support/'), __('Support'), __('WinMerge Support'));
+      $tabs[5] = new Tab(TAB_TRANSLATIONS, $translations->prepareLink('/translations/'), __('Translations'), __('WinMerge Translations'));
       
       $temp = "<ul id=\"tabs\">\n";
       foreach ($tabs as $tab) { //for all tabs...
@@ -228,43 +233,43 @@
       $subtabs = array();
       switch ($this->_tab) {
         case TAB_HOME: //if "Home" ...
-          $subtabs[0] = new Subtab('/', 'Index', 'WinMerge Home');
-          $subtabs[1] = new Subtab('/links.php', 'Links', 'WinMerge Links');
-          $subtabs[2] = new Subtab('http://sourceforge.net/projects/winmerge', 'Project Page', 'WinMerge Project Page');
+          $subtabs[0] = new Subtab($translations->prepareLink('/'), __('Index'), __('WinMerge Home'));
+          $subtabs[1] = new Subtab($translations->prepareLink('/links.php'), __('Links'), __('WinMerge Links'));
+          $subtabs[2] = new Subtab('http://sourceforge.net/projects/winmerge', __('Project Page'), __('WinMerge Project Page'));
           break;
         case TAB_ABOUT: //if "About" ...
-          $subtabs[0] = new Subtab('/about/', 'Index', 'About WinMerge');
-          $subtabs[1] = new Subtab('/about/screenshots/', 'Screenshots', 'WinMerge Screenshots');
-          $subtabs[2] = new Subtab('/about/history.php', 'History', 'WinMerge History');
-          $subtabs[3] = new Subtab('/about/license.php', 'License', 'WinMerge License');
+          $subtabs[0] = new Subtab($translations->prepareLink('/about/'), __('Index'), __('About WinMerge'));
+          $subtabs[1] = new Subtab($translations->prepareLink('/about/screenshots/'), __('Screenshots'), __('WinMerge Screenshots'));
+          $subtabs[2] = new Subtab($translations->prepareLink('/about/history.php'), __('History'), __('WinMerge History'));
+          $subtabs[3] = new Subtab($translations->prepareLink('/about/license.php'), __('License'), __('WinMerge License'));
           break;
         case TAB_DOCS: //if "Documentation" ...
-          $subtabs[0] = new Subtab('/docs/', 'Index', 'WinMerge Documentation');
-          $subtabs[1] = new Subtab('/docs/manual/', 'Manual', 'WinMerge Manual');
-          $subtabs[2] = new Subtab('/docs/releasenotes.php', 'Release Notes', 'WinMerge Release Notes');
-          $subtabs[3] = new Subtab('/docs/releasenotes.php#issues', 'Known Issues', 'WinMerge Known Issues');
-          $subtabs[4] = new Subtab('/docs/changelog.php', 'Change Log', 'WinMerge Change Log');
-          $subtabs[5] = new Subtab('/Wiki/', 'Development Wiki', 'WinMerge Development Wiki');
+          $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'));
           break;
         case TAB_DOWNLOADS: //if "Downloads" ...
-          $subtabs[0] = new Subtab('/downloads/', 'WinMerge', 'Download WinMerge');
-          $subtabs[1] = new Subtab('/downloads/plugins.php', 'Plugins', 'Download WinMerge Plugins');
-          $subtabs[2] = new Subtab('/downloads/source-code.php', 'Source Code', 'Download WinMerge Source Code');
-          $subtabs[3] = new Subtab('/downloads/pad-file.php', 'PAD File', 'WinMerge PAD File');
+          $subtabs[0] = new Subtab($translations->prepareLink('/downloads/'), __('WinMerge'), __('Download WinMerge'));
+          $subtabs[1] = new Subtab($translations->prepareLink('/downloads/plugins.php'), __('Plugins'), __('Download WinMerge Plugins'));
+          $subtabs[2] = new Subtab($translations->prepareLink('/downloads/source-code.php'), __('Source Code'), __('Download WinMerge Source Code'));
+          $subtabs[3] = new Subtab($translations->prepareLink('/downloads/pad-file.php'), __('PAD File'), __('WinMerge PAD File'));
           break;
         case TAB_SUPPORT: //if "Support" ...
-          $subtabs[0] = new Subtab('/support/', 'Index', 'WinMerge Support');
-          $subtabs[1] = new Subtab('http://forums.winmerge.org/', 'Discussion Forums', 'WinMerge Discussion Forums');
-          $subtabs[2] = new Subtab('/support/mailing-lists.php', 'Mailing Lists', 'WinMerge Mailing Lists');
-          $subtabs[3] = new Subtab('http://sourceforge.net/tracker/?group_id=13216', 'Tracker', 'WinMerge Tracker');
-          $subtabs[4] = new Subtab('/support/tracker-shortcuts.php', 'Tracker Shortcuts', 'WinMerge Tracker Shortcuts');
-          $subtabs[5] = new Subtab('http://sourceforge.net/donate/index.php?group_id=13216', 'Donate', 'Donate money to WinMerge');
+          $subtabs[0] = new Subtab($translations->prepareLink('/support/'), __('Index'), __('WinMerge Support'));
+          $subtabs[1] = new Subtab('http://forums.winmerge.org/', __('Discussion Forums'), __('WinMerge Discussion Forums'));
+          $subtabs[2] = new Subtab($translations->prepareLink('/support/mailing-lists.php'), __('Mailing Lists'), __('WinMerge Mailing Lists'));
+          $subtabs[3] = new Subtab('http://sourceforge.net/tracker/?group_id=13216', __('Tracker'), __('WinMerge Tracker'));
+          $subtabs[4] = new Subtab($translations->prepareLink('/support/tracker-shortcuts.php'), __('Tracker Shortcuts'), __('WinMerge Tracker Shortcuts'));
+          $subtabs[5] = new Subtab('http://sourceforge.net/donate/index.php?group_id=13216', __('Donate'), __('Donate money to WinMerge'));
           break;
         case TAB_TRANSLATIONS: //if "Translations" ...
-          $subtabs[0] = new Subtab('/translations/', 'Index', 'WinMerge Translations');
-          $subtabs[1] = new Subtab('/translations/instructions.php', 'Instructions', 'WinMerge Translations Instructions');
-          $subtabs[2] = new Subtab('/translations/status_branch.php', 'Status (Stable Branch)', 'WinMerge Translations Status (Stable Branch)');
-          $subtabs[3] = new Subtab('/translations/status_trunk.php', 'Status (Unstable Trunk)', 'WinMerge Translations Status (Unstable Trunk)');
+          $subtabs[0] = new Subtab($translations->prepareLink('/translations/'), __('Index'), __('WinMerge Translations'));
+          $subtabs[1] = new Subtab($translations->prepareLink('/translations/instructions.php'), __('Instructions'), __('WinMerge Translations Instructions'));
+          $subtabs[2] = new Subtab($translations->prepareLink('/translations/status_branch.php'), __('Status (Stable Branch)'), __('WinMerge Translations Status (Stable Branch)'));
+          $subtabs[3] = new Subtab($translations->prepareLink('/translations/status_trunk.php'), __('Status (Unstable Trunk)'), __('WinMerge Translations Status (Unstable Trunk)'));
           break;
       }
       
@@ -320,6 +325,28 @@
     }
 
     /**
+     * get the languages from the page
+     */
+    function getLanguages() {
+      global $translations;
+      
+      $temp = "<div id=\"languages\">\n";
+      $temp .= "<ul>\n";
+      $languages = $translations->getLanguages();
+      foreach ($languages as $language) { //for all languages...
+        if ($translations->isActiveLanguage($language)) { //if current language...
+          $temp .= "  <li><strong><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></strong></li>\n";
+        }
+        else { //if NOT current language...
+          $temp .= "  <li><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></li>\n";
+        }
+      }
+      $temp .= "</ul>\n";
+      $temp .= "</div> <!-- #languages -->\n";
+      return $temp;
+    }
+
+    /**
      * get the Piwik java script code
      */
     function getPiwikCode() {

Added: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc	                        (rev 0)
+++ trunk/Web/engine/simpletranslate.inc	2009-08-17 18:32:48 UTC (rev 6953)
@@ -0,0 +1,398 @@
+<?php
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+  /**
+   * ...
+   */
+  class SimpleTranslate {
+    var $_urlparameter;
+    var $_languages;
+    var $_baselanguageid;
+    var $_activelanguageid;
+    var $_translations;
+
+    /**
+     * Constructor
+     */
+    function SimpleTranslate() {
+      $this->_urlparameter = 'lang';
+      $this->_languages = array();
+      $this->_baselanguageid = '';
+      $this->_activelanguageid = '';
+      $this->_translations = array();
+    }
+
+    /**
+     * get the URL parameter...
+     */
+    function getUrlParameter() {
+      return $this->_urlparameter;
+    }
+
+    /**
+     * set the URL parameter...
+     */
+    function setUrlParameter($urlparameter) {
+      $this->_urlparameter = $urlparameter;
+    }
+
+    /**
+     * append URL parameter to link...
+     */
+    function appendUrlParameter($link, $urlparameter, $id = '') {
+      $urlparts = parse_url($link);
+      
+      $url = '';
+      if (isset($urlparts['scheme']) && $urlparts['scheme'] != '') { //if "scheme" exists...
+        $url .= $urlparts['scheme'] . '://';
+      }
+      if (isset($urlparts['user']) && $urlparts['user'] != '' && isset($urlparts['pass']) && $urlparts['pass'] != '') { //if "username" AND "password" exists...
+        $url .= $urlparts['user'] . ':' . $urlparts['pass'] . '@';
+      }
+      if (isset($urlparts['host']) && $urlparts['host'] != '') { //if "hostname" exists...
+        $url .= $urlparts['host'];
+      }
+      if (isset($urlparts['path']) && $urlparts['path'] != '') { //if "path" exists...
+        $url .= $urlparts['path'];
+      }
+      if (isset($urlparts['query']) && $urlparts['query'] != '') { //if "query" exists...
+        $found = false;
+        
+        $temp = '';
+        $queries = explode('&', $urlparts['query']);
+        foreach ($queries as $query) { //for all queries...
+          @list($key, $value) = explode('=', $query);
+          if (strtolower($key) == strtolower($urlparameter)) { //if language URL parameter...
+            if ($id != '') { //if a language id exists...
+              if ($temp == '')
+                $temp .= '?' . $urlparameter . '=' . $id;
+              else
+                $temp .= '&' . $urlparameter . '=' . $id;
+            }
+            $found = true;
+          }
+          else { //if NOT language URL parameter...
+            if ($temp == '')
+              $temp .= '?' . $key . '=' . $value;
+            else
+              $temp .= '&' . $key . '=' . $value;
+          }
+        }
+        $url .= $temp;
+        
+        if ($found == false) {
+          if ($id != '') { //if a language id exists...
+            $url .= '&' . $urlparameter . '=' . $id;
+          }
+        }
+      }
+      else { //if NO "query" exists...
+        if ($id != '') { //if a language id exists...
+          $url .= '?' . $urlparameter . '=' . $id;
+        }
+      }
+      if (isset($urlparts['fragment']) && $urlparts['fragment'] != '') { //if "fragment" exists...
+        $url .= '#' . $urlparts['fragment'];
+      }
+      
+      return $url;
+    }
+
+    /**
+     * add a language...
+     */
+    function addLanguage($id, $name, $pofile = '') {
+      $id = strtolower($id);
+      if ($pofile == '') { //if base language...
+        $this->_languages[$id] = new SimpleTranslateBaseLanguage($id, $name);
+        $this->_baselanguageid = $id;
+      }
+      else { //if normal language...
+        $this->_languages[$id] = new SimpleTranslateLanguage($id, $name, $pofile);
+      }
+    }
+
+    /**
+     * get the language...
+     */
+    function getLanguage($id) {
+      $id = strtolower($id);
+      if (array_key_exists($id, $this->_languages)) { //if the language exists...
+        return $this->_languages[$id];
+      }
+      return null;
+    }
+
+    /**
+     * get the languages...
+     */
+    function getLanguages() {
+      return $this->_languages;
+    }
+
+    /**
+     * get the base language ID...
+     */
+    function getBaseLanguageId() {
+      return $this->_baselanguageid;
+    }
+
+    /**
+     * get the base language...
+     */
+    function getBaseLanguage() {
+      return $this->_languages[$this->_baselanguageid];
+    }
+
+    /**
+     * check if the language is the base language...
+     */
+    function isBaseLanguage($language) {
+      if ($language == $this->getBaseLanguage()) { //if base language...
+        return true;
+      }
+      return false;
+    }
+
+
+    /**
+     * get the active language ID...
+     */
+    function getActiveLanguageId() {
+      if ($this->_activelanguageid != '') {
+        return $this->_activelanguageid;
+      }
+      return $this->_baselanguageid;
+    }
+
+    /**
+     * get the active language...
+     */
+    function getActiveLanguage() {
+      if ($this->_activelanguageid != '') {
+        return $this->_languages[$this->_activelanguageid];
+      }
+      return $this->_languages[$this->_baselanguageid];
+    }
+
+    /**
+     * set the active language...
+     */
+    function setActiveLanguage($activelanguage) {
+      $activelanguage = strtolower($activelanguage);
+      if (array_key_exists($activelanguage, $this->_languages)) { //if the language exists...
+        $this->_activelanguageid = $activelanguage;
+        $language = $this->_languages[$activelanguage];
+        $this->_translations = $language->getTranslations();
+        return true;
+      }
+      return false;
+    }
+
+    /**
+     * check if the language is the active language...
+     */
+    function isActiveLanguage($language) {
+      if ($language == $this->getActiveLanguage()) { //if active language...
+        return true;
+      }
+      return false;
+    }
+
+    /**
+     * detect the language from the url...
+     */
+    function detectLanguageFromUrl() {
+      if (isset($_GET[$this->_urlparameter])) {
+        return $this->setActiveLanguage($_GET[$this->_urlparameter]);
+      }
+      return false;
+    }
+
+    /**
+     * detect the language from the browser...
+     */
+    function detectLanguageFromBrowser() {
+      if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        $accepted_languages = split(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+        foreach ($accepted_languages as $accepted_language) { //for all accepted languages...
+          $tmp = split(';', $accepted_language);
+          
+          $lang_id = strtolower($tmp[0]);
+          if (array_key_exists($lang_id, $this->_languages)) { //if the language exists...
+            $this->_activelanguageid = $lang_id;
+            $language = $this->_languages[$lang_id];
+            $this->_translations = $language->getTranslations();
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    /**
+     * prepare link...
+     */
+    function prepareLink($link) {
+      $activelanguage = $this->getActiveLanguage();
+      if (strtolower(get_class($activelanguage)) == 'simpletranslatelanguage') { //if normal language...
+        return $this->appendUrlParameter($link, $this->_urlparameter, $activelanguage->getId());
+      }
+      else { //if base language...
+        return $this->appendUrlParameter($link, $this->_urlparameter);
+      }
+    }
+
+    /**
+     * get the language link...
+     */
+    function getLink($language) {
+      $phpself = str_replace('index.php', '', $_SERVER['PHP_SELF']);
+      if (strtolower(get_class($language)) == 'simpletranslatelanguage') { //if normal language...
+        return $phpself . '?' . $this->_urlparameter . '=' . $language->getId();
+      }
+      else { //if base language...
+        return $phpself;
+      }
+    }
+
+    /**
+     * translate a text...
+     */
+    function translate($text) {
+      $text = str_replace("\r", '', $text);
+      $text = str_replace("\n", '\n', $text);
+      if (array_key_exists($text, $this->_translations)) { //if the translation exists...
+        $translation = $this->_translations[$text];
+        if ($translation != '') { //if the translation is NOT empty...
+          return str_replace('\n', "\n", $translation);
+        }
+      }
+      return str_replace('\n', "\n", $text);
+    }
+  }
+
+  /**
+   * ...
+   */
+  class SimpleTranslateLanguage {
+    var $_id;
+    var $_name;
+    var $_pofile;
+
+    /**
+     * Constructor
+     */
+    function SimpleTranslateLanguage($id, $name, $pofile) {
+      $this->_id = $id;
+      $this->_name = $name;
+      $this->_pofile = $pofile;
+    }
+
+    /**
+     * get the language id...
+     */
+    function getId() {
+      return $this->_id;
+    }
+
+    /**
+     * get the language name...
+     */
+    function getName() {
+      return $this->_name;
+    }
+
+    /**
+     * get the language PO file...
+     */
+    function getPoFile() {
+      return $this->_pofile;
+    }
+
+    /**
+     * get the translations array...
+     */
+    function getTranslations() {
+      $translations = array();
+      if (file_exists($this->_pofile) == true) { //if the file exists...
+        $msgstarted = 0;
+        $msgid = '';
+        $msgstr = '';
+        
+        $lines = file($this->_pofile);
+        $linescount = sizeof($lines);
+        
+        for ($i = 0; $i < $linescount; $i++) { //for all lines...
+          $line = trim($lines[$i]);
+          
+          if ($line != '') { //if NOT empty line...
+            if ($line[0] != '#') { //if NOT comment line...
+              if (preg_match('#^msgid "(.*)"$#si', $line, $matches)) { //if "msgid"...
+                $msgstarted = 1;
+                $msgid = $matches[1];
+              }
+              elseif (preg_match('#^msgstr "(.*)"$#si', $line, $matches)) { //if "msgstr"...
+                $msgstarted = 2;
+                $msgstr = $matches[1];
+              }
+              elseif (preg_match('#^"(.*)"$#si', $line, $matches)) { //if "msgid" or "msgstr" continued...
+                if ($msgstarted == 1)
+                  $msgid = $msgid . $matches[1];
+                elseif ($msgstarted == 2)
+                  $msgstr = $msgstr . $matches[1];
+              }
+            }
+            else { //if comment line...
+              $msgstarted = -1;
+            }
+          }
+          else { //if empty line
+            $msgstarted = 0;
+          }
+          
+          if ($msgstarted == 0) { //if NOT inside a translation...
+            if ($msgid != '') {
+              $msgid = str_replace('\"', '"', $msgid);
+              $msgstr = str_replace('\"', '"', $msgstr);
+              $translations[$msgid] = $msgstr;
+            }
+            $msgid = '';
+            $msgstr = '';
+          }
+        }
+      }
+      return $translations;
+    }
+  }
+
+  /**
+   * ...
+   */
+  class SimpleTranslateBaseLanguage extends SimpleTranslateLanguage {
+
+    /**
+     * Constructor
+     */
+    function SimpleTranslateBaseLanguage($id, $name) {
+      $this->_id = $id;
+      $this->_name = $name;
+      $this->_pofile = '';
+    }
+
+    /**
+     * get the translations array...
+     */
+    function getTranslations() {
+      return array();
+    }
+  }
+?>


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

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

From: <den...@us...> - 2009-08-17 14:24:24

Revision: 6952
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6952&view=rev
Author:   denisbradford
Date:     2009-08-17 14:24:12 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
Add Compare_bin stub topic, update build.
Mention new compare type in existing compare topics.

Modified Paths:
--------------
    trunk/Docs/Users/Manual/Compare_files.xml
    trunk/Docs/Users/Manual/Intro_diffs.xml
    trunk/Docs/Users/Manual/WinMerge_help.xml

Added Paths:
-----------
    trunk/Docs/Users/Manual/Compare_bin.xml

Added: trunk/Docs/Users/Manual/Compare_bin.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_bin.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/Compare_bin.xml	2009-08-17 14:24:12 UTC (rev 6952)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="Compare_bin">
+  <?target dbhh topicname="IDH_Compare_bin" topicid ="002"?>
+
+  <title>Comparing binary files</title>
+
+  <indexterm>
+    <primary>comparing files</primary>
+
+    <secondary>binary</secondary>
+  </indexterm>
+
+  <para>WinMerge can detect whether files are in text or binary format. When you
+  launch a file compare operation on two binary files, WinMerge opens each file
+  in the binary file editor.</para>
+</article>
\ No newline at end of file

Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml	2009-08-14 11:31:48 UTC (rev 6951)
+++ trunk/Docs/Users/Manual/Compare_files.xml	2009-08-17 14:24:12 UTC (rev 6952)
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article id="Compare_files">
-  <title>Comparing and merging files<indexterm>
+  <?target dbhh topicname="IDH_Compare_files" topicid ="001"?>
+
+  <title>Comparing and merging text files<indexterm>
       <primary>comparing files</primary>
     </indexterm></title>
 
   <para>This topic describes how to use the WinMerge File Compare window to
-  compare and merge files. To understand the basic concepts about differences
-  used here, we suggest you read <xref linkend="Intro_diffs" /> first.</para>
+  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
+  files. </para>
 
   <xi:include href="Text_encoding.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />

Modified: trunk/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- trunk/Docs/Users/Manual/Intro_diffs.xml	2009-08-14 11:31:48 UTC (rev 6951)
+++ trunk/Docs/Users/Manual/Intro_diffs.xml	2009-08-17 14:24:12 UTC (rev 6952)
@@ -3,8 +3,9 @@
   <title>Overview of file comparing and merging</title>
 
   <para>This topic describes how WinMerge detects and displays differences
-  within files, and demonstrates simple file comparing and merging
-  operations.</para>
+  within text files, and demonstrates simple file comparing and merging
+  operations. See <xref linkend="Intro_diffs" /> for related information about
+  hex files. </para>
 
   <section id="Intro_diffs_comparing">
     <title>Comparing files<indexterm>

Modified: trunk/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_help.xml	2009-08-14 11:31:48 UTC (rev 6951)
+++ trunk/Docs/Users/Manual/WinMerge_help.xml	2009-08-17 14:24:12 UTC (rev 6952)
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "./build/dtd/docbookx.dtd" [
-<!ENTITY AboutDoc SYSTEM "About_Doc.xml">
-<!ENTITY QuickStart SYSTEM "Quick_start.xml">
+<!ENTITY About_Doc SYSTEM "About_Doc.xml">
+<!ENTITY Quick_start SYSTEM "Quick_start.xml">
 <!ENTITY Introduction SYSTEM "Introduction.xml">
 <!ENTITY Install SYSTEM "Install.xml">
-<!ENTITY IntroductDiffing SYSTEM "Intro_diffs.xml">
-<!ENTITY OpenPaths SYSTEM "Open_paths.xml">
-<!ENTITY CompareDirs SYSTEM "Compare_dirs.xml">
-<!ENTITY CompareFiles SYSTEM "Compare_files.xml">
+<!ENTITY Intro_diffs SYSTEM "Intro_diffs.xml">
+<!ENTITY Open_paths SYSTEM "Open_paths.xml">
+<!ENTITY Compare_dirs SYSTEM "Compare_dirs.xml">
+<!ENTITY Compare_files SYSTEM "Compare_files.xml">
+<!ENTITY Compare_bin SYSTEM "Compare_bin.xml">
 <!ENTITY Configuration SYSTEM "Configuration.xml">
 <!ENTITY Locales SYSTEM "Locales.xml">
 <!ENTITY Plugins SYSTEM "Plugins.xml">
 <!ENTITY Filters SYSTEM "Filters.xml">
-<!ENTITY VersionControl SYSTEM "Version_control.xml">
-<!ENTITY CommandLine SYSTEM "Command_line.xml">
-<!ENTITY FAQ SYSTEM "Faq.xml">
-<!ENTITY ShortCuts SYSTEM "Shortcut_keys.xml">
+<!ENTITY Version_control SYSTEM "Version_control.xml">
+<!ENTITY Command_line SYSTEM "Command_line.xml">
+<!ENTITY Faq SYSTEM "Faq.xml">
+<!ENTITY Shortcut_keys SYSTEM "Shortcut_keys.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -88,22 +89,24 @@
 level. For example, several files include elements from replaceables.xml. Other fragment files are select-unpacker.xml 
 and Text_encoding.xml. Pleaes do not delete xml files in this directory unless you know for sure that they are not used.-->
 
-  &AboutDoc;
+  &About_Doc;
 
-  &QuickStart;
+  &Quick_start;
 
   &Introduction;
 
   &Install;
 
-  &IntroductDiffing;
+  &Intro_diffs;
 
-  &OpenPaths;
+  &Open_paths;
 
-  &CompareDirs;
+  &Compare_dirs;
 
-  &CompareFiles;
+  &Compare_files;
 
+  &Compare_bin;
+
   &Configuration;
 
   &Locales;
@@ -112,13 +115,13 @@
 
   &Filters;
 
-  &VersionControl;
+  &Version_control;
 
-  &CommandLine;
+  &Command_line;
 
-  &FAQ;
+  &Faq;
 
-  &ShortCuts;
+  &Shortcut_keys;
 
   <index id="word_index"></index>
 </book>


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

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

From: <den...@us...> - 2009-08-14 11:32:04

Revision: 6951
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6951&view=rev
Author:   denisbradford
Date:     2009-08-14 11:31:48 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Files moved to tour dir, not used in manual

Removed Paths:
-------------
    trunk/Docs/Users/Manual/WinMerge_tour.xml
    trunk/Docs/Users/Manual/screenshots/ctx_menu_advanced_2wins.png
    trunk/Docs/Users/Manual/screenshots/dragndrop-files.png
    trunk/Docs/Users/Manual/screenshots/filecomp_diffpane2.png
    trunk/Docs/Users/Manual/screenshots/filecomp_diffpanesel.png
    trunk/Docs/Users/Manual/screenshots/filecomp_merged.png
    trunk/Docs/Users/Manual/screenshots/filecompwin01.png
    trunk/Docs/Users/Manual/screenshots/mergebtns-on.png
    trunk/Docs/Users/Manual/tour_comparingdirs.xml
    trunk/Docs/Users/Manual/tour_comparingfiles.xml
    trunk/Docs/Users/Manual/tour_sel_targets.xml

Deleted: trunk/Docs/Users/Manual/WinMerge_tour.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_tour.xml	2009-08-11 14:13:27 UTC (rev 6950)
+++ trunk/Docs/Users/Manual/WinMerge_tour.xml	2009-08-14 11:31:48 UTC (rev 6951)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"./build/dtd/docbookx.dtd">
-<book id="WinMerge_tour">
-  <bookinfo>
-    <title>WinMerge <xi:include href="replaceables.xml"
-    xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(version)" />
-    Quick Tour</title>
-
-    <abstract>
-      <para>WinMerge is an Open Source differencing and merging tool for
-      Windows. Use it to detect changes between files and folders, and then to
-      merge changes selectively. You can use WinMerge by itself, or launch it
-      from a version control system or another application.</para>
-
-      <para>When you compare two files or folders, the result is displayed in
-      the WinMerge window. The WinMerge window's visual display and functions
-      are designed to help you see differences between your targets, and to
-      merge selected differences if you want to.</para>
-
-      <formalpara>
-        <title>In a file comparison</title>
-
-        <para>WinMerge shows differences between lines. The built-in text editor
-        provides syntax highlighting for several programming languages and other
-        file formats.</para>
-      </formalpara>
-
-      <formalpara>
-        <title>In a folder comparison</title>
-
-        <para>WinMerge indicates various kinds of differences between the files
-        that the folders contain.</para>
-      </formalpara>
-
-      <para>Take this brief, guided tour if you are considering installing
-      WinMerge, or if you just want to see what the tool looks like and what you
-      can do with it. The topics below describe the main WinMerge features. They
-      include some simple examples of comparing files and folders, and merging
-      differences between them.</para>
-
-      <para>This tour just scratches the surface. For detailed information and
-      guidance about using WinMerge, see the Help that is installed with
-      WinMerge and available <ulink url="http://winmerge.org/docs/manual/">on
-      our Web site</ulink>.</para>
-    </abstract>
-  </bookinfo>
-
-  <toc></toc>
-
-  <xi:include href="tour_sel_targets.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(/1)" />
-
-  <xi:include href="tour_comparingfiles.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-  <xi:include href="tour_comparingdirs.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>

Deleted: trunk/Docs/Users/Manual/screenshots/ctx_menu_advanced_2wins.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/screenshots/dragndrop-files.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/screenshots/filecomp_diffpane2.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/screenshots/filecomp_diffpanesel.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/screenshots/filecomp_merged.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/screenshots/filecompwin01.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/screenshots/mergebtns-on.png
===================================================================
(Binary files differ)

Deleted: trunk/Docs/Users/Manual/tour_comparingdirs.xml
===================================================================
--- trunk/Docs/Users/Manual/tour_comparingdirs.xml	2009-08-11 14:13:27 UTC (rev 6950)
+++ trunk/Docs/Users/Manual/tour_comparingdirs.xml	2009-08-14 11:31:48 UTC (rev 6951)
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<article id="tour_comparingdirs">
-  <title>Comparing Folders</title>
-
-  <para>In addition to comparing files in WinMerge, you can compare the contents
-  of folders. WinMerge shows which files are different, and provides functions
-  to merge files between folders.</para>
-
-  <section>
-    <title>The Folder Compare window</title>
-
-    <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
-    operation</link> on two folders, the Folder Compare window opens:</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/foldercomp1.png" format="PNG" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Folder Compare window</phrase>
-      </textobject>
-    </mediaobject>
-
-    <para>The Folder Compare window lists the files and subfolders found in the
-    target folders. Each row compares a file or subfolder in the two selected
-    folder targets. As with the File Compare window, the targets are represented
-    on <quote>left</quote> and <quote>right</quote> sides.</para>
-
-    <para>These columns tells you whether corresponding right and left items in
-    each row are identical, different, or exist on only one side. The asterisk
-    in either the left or right date highlights the more recent date. The icons
-    in the Filename column provide visual cues for each type of file, like text
-    or binary files, and how the two sides are different. Icons are also used to
-    mark files and folders that are found only on one side.</para>
-
-    <para>The columns are sortable. By default, rows are sorted by filename in
-    descending alphabetical order. Click the Filename column title to reverse
-    the sorting. Or, maybe you're only interested in rows that are different. If
-    so, click the Comparison result column title to sort by result type. This
-    groups different files together so they're easy to see.</para>
-
-    <para>If you want to display more information, a simple customization lets
-    you add additional columns, including file creation time, file encoding
-    type, file size, and even the number of differences found.</para>
-
-    <para>The Folder Compare window supports common operations on files, like
-    editing, copying, deleting, moving, and renaming (moving is equivalent to a
-    copy operation followed by a delete). You can use these file operations and
-    WinMerge functions to merge the contents of folders. You can also open files
-    using associated programs or external editors. You can even launch file
-    compare operations on individual files from the Folder Compare
-    window.</para>
-
-    <para>The <inlinemediaobject>
-        <imageobject>
-          <imagedata contentwidth="23" fileref="screenshots/nav_uparrow_btn.png" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Navigator up arrow button</phrase>
-        </textobject>
-      </inlinemediaobject> <guibutton>up arrow</guibutton> button at the top of
-    the Filename column navigates to the parent folder of each target.</para>
-
-    <para>As we mentioned earlier, the WinMerge main window can contain multiple
-    Folder Compare or File Compare windows, and each Compare window displays the
-    result of a single comparison. In the preceding screen shot, the File
-    Compare window is maximized within the main window:</para>
-  </section>
-
-  <section>
-    <title>Navigating folder differences</title>
-
-    <para>To navigate differences at the folder level:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Use conventional keyboard and mouse actions to move between rows.
-        To select a difference, simply click its row.</para>
-      </listitem>
-
-      <listitem>
-        <para>Use the Difference buttons in the toolbar to select differences
-        systematically. For example, click the <inlinemediaobject>
-            <imageobject>
-              <imagedata contentdepth="15"
-                         fileref="screenshots/nextdiff_btn.png" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Next Difference button</phrase>
-            </textobject>
-          </inlinemediaobject> <guibutton>Next Difference</guibutton> button in
-        the toolbar (or press <keycombo>
-            <keycap>Alt</keycap>
-
-            <keycap>Enter</keycap>
-          </keycombo>) to select the next row that is different, automatically
-        skipping identical rows.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section>
-    <title>Comparing subfolders</title>
-
-    <para>So far we have looked at a non-recursive comparison, meaning that it
-    includes only files in the root target folders. It shows subfolders, but not
-    their contents. If you want to see the files in a subfolder, you have to
-    launch a new compare operation. For example, if double-click the
-    <filename>Common</filename> folder in the preceding comparison, WinMerge
-    opens a new File Compare window that compares the two
-    <filename>Common</filename> folders.</para>
-
-    <para>You can also compare folders recursively. A recursive comparison
-    includes all the files in all subfolders, so you don't need to launch
-    separate compare operations to navigate nested folders. You can As you might
-    expect, a recursive comparison can can take longer than a non-recursive
-    comparison for targets with a lot of nested files, and the result can be
-    harder to read.</para>
-
-    <para>To address these drawbacks, a handy alternative is to display the
-    results of recursive comparisons in a hierachical tree view, instead of the
-    default tabular view. In the tree view, subfolders are initially collapsed
-    for a compact, readable display, but you can expand them to see their
-    contents:</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/treeview-01.png" format="PNG" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Folder Compare window</phrase>
-      </textobject>
-    </mediaobject>
-  </section>
-
-  <section>
-    <title>Merging folder differences</title>
-
-    <para>You merge differences in the Folder Compare window by copying one or
-    more files or folders from one side to the other, or by deleting
-    them.</para>
-
-    <para>For example, suppose you want to update files in two folders to the
-    most recent version. In the preceding screen shot, you can tell from the
-    asterisk that the left version of <filename>AboutDlg.h</filename> is more
-    recent. So, to merge <filename>AboutDlg.h</filename> select the row and
-    click the <inlinemediaobject>
-        <imageobject>
-          <imagedata contentwidth="17" fileref="screenshots/copyr_button.png" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Copy Right button</phrase>
-        </textobject>
-      </inlinemediaobject> <guibutton>Copy Right</guibutton> button in the
-    toolbar.</para>
-
-    <para>When you merge a file or folder, the value in the <guilabel>Comparison
-    result</guilabel> column changes to <literal>Identical</literal>.</para>
-
-    <para>Of course, you might not always want to merge entire files or folders.
-    For example, you might want to merge selected differences within the files,
-    or to examine the differences within files before merging them. In such
-    cases, you can double-click a file to launch a file comparison. WinMerge
-    displays the result in a new File Compare window, where you can see and
-    merge the line-level differences.</para>
-  </section>
-</article>
\ No newline at end of file

Deleted: trunk/Docs/Users/Manual/tour_comparingfiles.xml
===================================================================
--- trunk/Docs/Users/Manual/tour_comparingfiles.xml	2009-08-11 14:13:27 UTC (rev 6950)
+++ trunk/Docs/Users/Manual/tour_comparingfiles.xml	2009-08-14 11:31:48 UTC (rev 6951)
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<article id="tour_comparingfiles">
-  <title>Comparing Files</title>
-
-  <para>When you compare two files, WinMerge shows the differences between their
-  lines. To demonstrate comparing and merging files, consider these two small
-  text files named <filename>File1</filename> and
-  <filename>File2</filename>:</para>
-
-  <formalpara>
-    <title>File1:</title>
-
-    <para><screen>You can cage a swallow,
-can't you? 
-But you can't swallow 
-a cage, can you?</screen></para>
-  </formalpara>
-
-  <formalpara>
-    <title>File2:</title>
-
-    <para><screen>You can cage a swallow.
-But you can't swallow 
-a cage. Can you?</screen></para>
-  </formalpara>
-
-  <section>
-    <title>The File Compare window</title>
-
-    <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
-    operation</link> on two files, the File Compare window opens. This screen
-    shot compares our two sample files:</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/filecompwin01.png" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Compare Files screen shot</phrase>
-      </textobject>
-    </mediaobject>
-
-    <para>The File Compare window makes it easy to see differences between lines
-    in your files. It also has special functions for merging different lines
-    from one file to the other, and basic editing capabilities for more detailed
-    merging within lines. Notice these basic features of the File Compare
-    window:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>In the bottom right corner of the window, the status bar tells you
-        how many differences WinMerge detects.</para>
-
-        <para>The Location pane indicates where the differences are located in
-        the files. The Location pane is helpful for working with long files,
-        where you can't see all the differences at once in the File
-        panes.</para>
-      </listitem>
-
-      <listitem>
-        <para>Differences are marked in the File panes by a gold background
-        color. In this comparison, the first difference is a block of two lines;
-        the second difference is a single line at the end.</para>
-      </listitem>
-
-      <listitem>
-        <para>Notice that the first difference has an extra blank line on the
-        right side. Why does this blank line appear, since it doesn't exist in
-        the source file?</para>
-
-        <para>The empty line is a placeholder in WinMerge that does not change
-        the source file. WinMerge inserts blank lines on one side of a
-        difference whenever the other side has more lines. The extra lines,
-        marked with a gray background color by default, keep the left and right
-        sides vertically aligned for ease of comparison. That is, every
-        difference begins on the same line in the File panes, even when they are
-        on different lines in the source files. Without this feature, files of
-        different lengths would be hard to compare.</para>
-      </listitem>
-
-      <listitem>
-        <para>The third line is identical in both files, so it has no difference
-        color (its background is white).</para>
-      </listitem>
-
-      <listitem>
-        <para>Within differences, WinMerge highlights the text that makes the
-        lines different. By default, different words are highlighted. To see
-        more detail you can highlight changes at the character level; to see
-        less, you can turn off all highlighting within lines.</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>The WinMerge main window can contain multiple File Compare (and
-      Folder compare) windows. Each File Compare window displays the result of a
-      single comparison, representing the two files in the left and right File
-      panes. In our screen shot, the File Compare window is maximized within the
-      main window:</para>
-    </note>
-  </section>
-
-  <section>
-    <title>Navigating line differences</title>
-
-    <para>In the File Compare window you can use standard mouse and cursor
-    actions to select and edit text in either File pane. But in WinMerge,
-    working with text and working with differences are not the same thing.
-    WinMerge provides special functions to navigate differences.</para>
-
-    <para>For example, click anywhere in an area that is marked as a difference,
-    then click the <inlinemediaobject>
-        <imageobject>
-          <imagedata contentdepth="15" fileref="screenshots/currentdiff_btn.png" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Current Difference button</phrase>
-        </textobject>
-      </inlinemediaobject> <guibutton>Current Difference</guibutton> button in
-    the toolbar.</para>
-
-    <para>The next two screen shots show the first difference in our sample
-    comparison, after it's selected. When you select a difference, several
-    things happen:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>The Selected Difference background color (red by default)
-        highlights the difference in the File panes. The Location Pane also
-        highlights the selected difference and marks its location with arrows.
-        :</para>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="screenshots/filecomp_diffpanesel.png" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Difference selected in Compare Files panes</phrase>
-          </textobject>
-        </mediaobject>
-      </listitem>
-
-      <listitem>
-        <para>The selected difference is loaded in the Diff pane, where you can
-        examine it in isolation from other differences.</para>
-
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="screenshots/filecomp_diffpane2.png" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Compare Files Diff Pane</phrase>
-          </textobject>
-        </mediaobject>
-      </listitem>
-
-      <listitem>
-        <para>All the merge buttons in the toolbar are enabled:
-        <inlinemediaobject>
-            <imageobject>
-              <imagedata fileref="screenshots/mergebtns-on.png" />
-            </imageobject>
-          </inlinemediaobject></para>
-      </listitem>
-
-      <listitem>
-        <para>The status bar confirms which difference is selected.</para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-  <section>
-    <title>Merging differences in files</title>
-
-    <para>You can merge differences at two levels in the File Compare
-    window:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>Line-level differences</term>
-
-        <listitem>
-          <para>As we have seen, a difference includes one or more lines. Use
-          the WinMerge merge functions to copy an entire selected difference
-          from one side to the other. For example, click the <inlinemediaobject>
-              <imageobject>
-                <imagedata contentdepth="15"
-                           fileref="screenshots/copyr_adv_btn.png" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Copy Right and Advance button</phrase>
-              </textobject>
-            </inlinemediaobject> <guibutton>Copy Right and Advance</guibutton>
-          button.</para>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="screenshots/filecomp_merged.png" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Compare Files window after merge</phrase>
-            </textobject>
-          </mediaobject>
-
-          <para>Notice the changes:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>The first difference is gone: the lines are now identical
-              and have no difference color.</para>
-            </listitem>
-
-            <listitem>
-              <para>WinMerge automatically selects the next difference, skipping
-              over the identical line. The Location Pane also moves its
-              indicator.</para>
-            </listitem>
-
-            <listitem>
-              <para>The status bar indicates that only one difference
-              remains.</para>
-            </listitem>
-          </itemizedlist>
-
-          <para>You can see that the navigation and merge functions provide a
-          good way to systematically step through all the differences in a
-          comparison.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Differences within lines</term>
-
-        <listitem>
-          <para>Instead of merging entire differences using the Merge functions,
-          you can change text within them by manually editing either file
-          directly in the File Compare window. For example, if you don't want to
-          use either side of the first difference, you can delete the line. Or,
-          you might replace <quote>words</quote> on the right side with
-          <quote>text</quote>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>After you finish merging, you can click <menuchoice>
-        <guimenu>File</guimenu>
-
-        <guimenuitem>Save</guimenuitem>
-      </menuchoice> to save changes to both sides. Or, to save just one side,
-    click <menuchoice>
-        <guimenu>File</guimenu>
-
-        <guimenuitem>Save Left</guimenuitem>
-      </menuchoice> or <menuchoice>
-        <guimenu>File</guimenu>
-
-        <guimenuitem>Save</guimenuitem>
-      </menuchoice>.</para>
-
-    <para>This was a trivial example — there were only two differences and we
-    only merged one of them. But you can use the methods shown here to navigate
-    and merge line differences between files of any length.</para>
-
-    <!--
-  <para>When you launch a file compare operation, WinMerge opens the File
-  Compare window. The window features two columns representing the
-  <quote>left</quote> and <quote>right</quote> files that you are comparing, and
-  indicates whether the corresponding lines on each side are identical or
-  different. WinMerge can also highlight the content within lines that makes
-  them different.</para>
-
-  <para>You can tailor how differences are detected and displayed. For example,
-  if whitespace differences are not meaningful to your comparison, you can
-  choose to ignore whitespace or different line ending encodings. You can change
-  the colors used to highlight line differences and the text within them.</para>
-
-  <para>The Compare window has special functions that make it easy to step
-  through line differences quickly and systematically, and functions to merge
-  differences from one file to the other if you want to. You can also edit the
-  files directly in the Compare window.</para>
--->
-  </section>
-</article>
\ No newline at end of file

Deleted: trunk/Docs/Users/Manual/tour_sel_targets.xml
===================================================================
--- trunk/Docs/Users/Manual/tour_sel_targets.xml	2009-08-11 14:13:27 UTC (rev 6950)
+++ trunk/Docs/Users/Manual/tour_sel_targets.xml	2009-08-14 11:31:48 UTC (rev 6951)
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"build/dtd/docbookx.dtd">
-<article id="tour_sel_targets">
-  <title>Starting WinMerge compare operations</title>
-
-  <para>Every WinMerge compare operation has two targets: either two files or
-  two folders. WinMerge makes it easy to select targets and launch comparisons
-  from different places in your Windows environment. Here are some commonly used
-  methods:</para>
-
-  <section>
-    <title>Drag and drop</title>
-
-    <para>Select two files or two folders in Windows Explorer and drag them to
-    the WinMerge shortcut on your desktop, or into the WinMerge window if it's
-    already open.</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/dragndrop-files.png" format="PNG" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Drag and drop to WinMerge Desktop icon</phrase>
-      </textobject>
-    </mediaobject>
-
-    <note>
-      <para>If you drop only one file or folder into the WinMerge icon or
-      window, WinMerge opens the <xref linkend="sel_targets_dialog" />, where
-      you can specify the other target.</para>
-    </note>
-  </section>
-
-  <section>
-    <title>Windows Explorer context menu shortcuts</title>
-
-    <para>WinMerge has an option that adds a <guimenuitem>WinMerge</guimenuitem>
-    shortcut to the context menu when you select one or two files or folders in
-    Windows Explorer. Choosing the shortcut opens WinMerge and compares the
-    selected items:</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/ctx_menu_simple.png" format="PNG" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Windows Explorer basic context menu integration</phrase>
-      </textobject>
-    </mediaobject>
-
-    <para>For even more flexibility, you can replace the basic
-    <guimenuitem>WinMerge</guimenuitem> shortcut with a set of advanced
-    shortcuts. Use these shortcuts to select objects separately, even from
-    different Explorer folders or windows. The next screen shot shows a typical
-    sequence: we choose the first compare target in one Explorer view, then the
-    second target in another Explorer view.</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/ctx_menu_advanced_2wins.png"
-                   format="PNG" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Windows Explorer advanced context menu integration</phrase>
-      </textobject>
-    </mediaobject>
-  </section>
-
-  <section id="sel_targets_dialog">
-    <title>Select Files or Folder dialog</title>
-
-    <para>For maximum flexibility in launching compare operations, click
-    <menuchoice>
-        <guimenu>File</guimenu>
-
-        <guimenuitem>Open</guimenuitem>
-      </menuchoice> in the main WinMerge window to open the Select Files or
-    Folders dialog:</para>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="screenshots/OpenDlg1.png" format="PNG" />
-      </imageobject>
-
-      <textobject>
-        <phrase>Select Files or Folders window</phrase>
-      </textobject>
-    </mediaobject>
-
-    <para>This dialog lets you browse anywhere for the files or folders to
-    compare. Alternatively, you might choose a recently-used file or folder from
-    the <guilabel>Left</guilabel> and <guilabel>Right</guilabel> drop-down
-    controls. You can even drag a file or folder from Windows Explorer into the
-    <guilabel>Left</guilabel> or <guilabel>Right</guilabel> field. A message
-    prompts you if either target is not found, or if you entered a combination
-    of file and folder (WinMerge can't compare files to folders!) in the two
-    fields.</para>
-
-    <para>The dialog contains several options to tailor your compare operation,
-    including these:</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>Filter</term>
-
-        <listitem>
-          <para>Use this option to apply a filter to narrow the scope of the
-          comparison. There two kinds of filters:</para>
-
-          <formalpara>
-            <title>File filters</title>
-
-            <para>include or exclude files that match regular expressions. For
-            example, the expression <code>^test</code> matches files that start
-            with the string, <literal>test</literal>, like
-            <filename>testheaders.h</filename>. WinMerge installs a number of
-            filter files that specify commonly-excluded files for various
-            languages, like C#, C++, and Visual Basic. You can edit these files
-            and, of course, add your own.</para>
-          </formalpara>
-
-          <formalpara>
-            <title>Line filters</title>
-
-            <para>ignore lines <emphasis>within</emphasis> files that match
-            patterns. For example, the expression <code>^[1-5]00</code> ignores
-            lines beginning with numbers <literal>100</literal>,
-            <literal>200</literal>, <literal>300</literal>,
-            <literal>400</literal>, and <literal>500</literal>.</para>
-          </formalpara>
-
-          <para>WinMerge provides the Filters dialog for creating and managing
-          filters.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>Include Subfolders</term>
-
-        <listitem>
-          <para>This option lets you control the depth of a folder comparison.
-          Enabling it compares all folder levels, which might take a while if
-          there are a lot of files. Disable it to compare only the top level of
-          the target folders. This is the fastest option, and you can
-          <quote>drill down</quote> into nested folders later in the Compare
-          Folders window.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </section>
-
-  <section>
-    <title>Command line</title>
-
-    <para>The WinMerge CLI includes commands with a full set of parameters and
-    options that you can use in a script or Command Prompt window to launch
-    comparisons. This example compares two folders recursively and displays the
-    result in the WinMerge window:</para>
-
-    <para><userinput>WinMergeU <filename>/r C:\folder1</filename> <filename
-    class="directory"><filename>C:\folder2</filename>
-    </filename></userinput></para>
-  </section>
-
-  <section>
-    <title>Version control systems</title>
-
-    <para>If you run TortoiseSVN, TortoiseCVS, or Rational ClearCase, you can
-    configure your version control system to open WinMerge directly. That is, if
-    you compare files using one of these VCS tools, WinMerge opens instead of
-    the tool's native diff utility.</para>
-
-    <note>
-      <para>Another handy VCS integration automatically launches your version
-      control system's checkout dialog whenever you change a managed file in the
-      WinMerge window. This integration works with version control systems that
-      lock files, specifically ClearCase and Visual Source Safe.</para>
-    </note>
-  </section>
-</article>
\ 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:[6950] trunk/Docs/Users/Manual

From: <den...@us...> - 2009-08-11 14:13:39

Revision: 6950
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6950&view=rev
Author:   denisbradford
Date:     2009-08-11 14:13:27 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Fix formalpara rendering

Modified Paths:
--------------
    trunk/Docs/Users/Manual/build/build_common.xsl
    trunk/Docs/Users/Manual/tour/tour_sel_targets.xml

Modified: trunk/Docs/Users/Manual/build/build_common.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_common.xsl	2009-08-10 21:47:13 UTC (rev 6949)
+++ trunk/Docs/Users/Manual/build/build_common.xsl	2009-08-11 14:13:27 UTC (rev 6950)
@@ -40,6 +40,7 @@
 <xsl:param name="chunk.section.depth" select="0" />
 <xsl:param name="generate.toc">book toc,title article nop</xsl:param>
 <xsl:param name="toc.section.depth">1</xsl:param>
+<xsl:param name="runinhead.default.title.end.punct">:</xsl:param>
 
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 common/local.l10n.xml 

Modified: trunk/Docs/Users/Manual/tour/tour_sel_targets.xml
===================================================================
--- trunk/Docs/Users/Manual/tour/tour_sel_targets.xml	2009-08-10 21:47:13 UTC (rev 6949)
+++ trunk/Docs/Users/Manual/tour/tour_sel_targets.xml	2009-08-11 14:13:27 UTC (rev 6950)
@@ -58,8 +58,7 @@
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="screenshots/ctx_menu_advanced_tr.png"
-                   format="PNG" />
+        <imagedata fileref="screenshots/ctx_menu_advanced_tr.png" format="PNG" />
       </imageobject>
 
       <textobject>
@@ -112,7 +111,7 @@
           <formalpara>
             <title>File filters</title>
 
-            <para>include or exclude files that match regular expressions. For
+            <para>Include or exclude files that match regular expressions. For
             example, the expression <code>^test</code> matches files that start
             with the string, <literal>test</literal>, like
             <filename>testheaders.h</filename>. WinMerge installs a number of
@@ -124,7 +123,7 @@
           <formalpara>
             <title>Line filters</title>
 
-            <para>ignore lines <emphasis>within</emphasis> files that match
+            <para>Ignore lines <emphasis>within</emphasis> files that match
             patterns. For example, the expression <code>^[1-5]00</code> ignores
             lines beginning with numbers <literal>100</literal>,
             <literal>200</literal>, <literal>300</literal>,
@@ -179,4 +178,4 @@
       lock files, specifically ClearCase and Visual Source Safe.</para>
     </note>
   </section>
-</article>
+</article>
\ 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:[6949] trunk/Docs/Users/Manual

From: <den...@us...> - 2009-08-10 21:47:21

Revision: 6949
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6949&view=rev
Author:   denisbradford
Date:     2009-08-10 21:47:13 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
re patch 2817443: separate Quick Tour files and output from Manual.

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/tour/
    trunk/Docs/Users/Manual/tour/WinMerge_tour.xml
    trunk/Docs/Users/Manual/tour/screenshots/
    trunk/Docs/Users/Manual/tour/screenshots/OpenDlg_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/copyr_adv_btn_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/copyr_button_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/ctx_menu_advanced_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/ctx_menu_simple_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/currentdiff_btn_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/dragndrop_files_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/filecomp_diffpane_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/filecomp_diffpanesel_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/filecomp_merged_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/filecompwin_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/foldercomp_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/mergebtns_on_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/nav_uparrow_btn_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/nextdiff_btn_tr.png
    trunk/Docs/Users/Manual/tour/screenshots/treeview_tr.png
    trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml
    trunk/Docs/Users/Manual/tour/tour_comparingfiles.xml
    trunk/Docs/Users/Manual/tour/tour_sel_targets.xml

Modified: trunk/Docs/Users/Manual/build/build_html.bat
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.bat	2009-08-10 13:16:23 UTC (rev 6948)
+++ trunk/Docs/Users/Manual/build/build_html.bat	2009-08-10 21:47:13 UTC (rev 6949)
@@ -3,10 +3,11 @@
 call configuration.bat
 
 set docbook_inputfile=..\WinMerge_help.xml
-set tour_inputfile=..\WinMerge_tour.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
@@ -25,8 +26,9 @@
 
 :start
 if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
+if not exist "%docbook_outputdir%" mkdir "%tour_outputdir%"
 
-echo Copy images...
+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\."
@@ -34,6 +36,8 @@
 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"
@@ -42,13 +46,12 @@
 echo Copy stylesheets...
 if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"
 copy "..\css\*.css" "%docbook_outputdir%\css"
-rem copy "..\css\print.css" "%docbook_outputdir%\css\print.css"
 
 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 %docbook_outputdir%/WinMerge_tour.html %tour_inputfile% %tour_use_stylesheet% headtitle.suffix="' - WinMerge 2.12 Tour'" withads=%ads% 
+%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!
 

Modified: trunk/Docs/Users/Manual/build/build_html_page.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-08-10 13:16:23 UTC (rev 6948)
+++ trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-08-10 21:47:13 UTC (rev 6949)
@@ -45,14 +45,14 @@
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
 <!-- 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" />
+  <link rel="stylesheet" type="text/css" href="../html/css/onepage.css" />
+  <link rel="stylesheet" type="text/css" media="print" href="../html/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>
+      <img src="../html/images/head.gif" alt="winmerge.org"/></a>
     </div>
     <xsl:if test="$withads = 'true'">
       <xsl:call-template name="header.ads"/>


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


Added: trunk/Docs/Users/Manual/tour/WinMerge_tour.xml
===================================================================
--- trunk/Docs/Users/Manual/tour/WinMerge_tour.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour/WinMerge_tour.xml	2009-08-10 21:47:13 UTC (rev 6949)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"../build/dtd/docbookx.dtd">
+<book id="WinMerge_tour">
+  <bookinfo>
+    <title>WinMerge <xi:include href="../replaceables.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(version)" /> Quick Tour</title>
+
+    <abstract>
+      <para>WinMerge is an Open Source differencing and merging tool for
+      Windows. Use it to detect changes between files and folders, and then to
+      merge changes selectively. You can use WinMerge by itself, or launch it
+      from a version control system or another application.</para>
+
+      <para>When you compare two files or folders, the result is displayed in
+      the WinMerge window. The WinMerge window's visual display and functions
+      are designed to help you see differences between your targets, and to
+      merge selected differences if you want to.</para>
+
+      <formalpara>
+        <title>In a file comparison</title>
+
+        <para>WinMerge shows differences between lines. The built-in text editor
+        provides syntax highlighting for several programming languages and other
+        file formats.</para>
+      </formalpara>
+
+      <formalpara>
+        <title>In a folder comparison</title>
+
+        <para>WinMerge indicates various kinds of differences between the files
+        that the folders contain.</para>
+      </formalpara>
+
+      <para>Take this brief, guided tour if you are considering installing
+      WinMerge, or if you just want to see what the tool looks like and what you
+      can do with it. The topics below describe the main WinMerge features. They
+      include some simple examples of comparing files and folders, and merging
+      differences between them.</para>
+
+      <para>This tour just scratches the surface. For detailed information and
+      guidance about using WinMerge, see the Help that is installed with
+      WinMerge and available <ulink url="http://winmerge.org/docs/manual/">on
+      our Web site</ulink>.</para>
+    </abstract>
+  </bookinfo>
+
+  <toc></toc>
+
+  <xi:include href="tour_sel_targets.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(/1)" />
+
+  <xi:include href="tour_comparingfiles.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="tour_comparingdirs.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>


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


Added: trunk/Docs/Users/Manual/tour/screenshots/OpenDlg_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/OpenDlg_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/copyr_adv_btn_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/copyr_adv_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/copyr_button_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/copyr_button_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/ctx_menu_advanced_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/ctx_menu_advanced_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/ctx_menu_simple_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/ctx_menu_simple_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/currentdiff_btn_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/currentdiff_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/dragndrop_files_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/dragndrop_files_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/filecomp_diffpane_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/filecomp_diffpane_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/filecomp_diffpanesel_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/filecomp_diffpanesel_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/filecomp_merged_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/filecomp_merged_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/filecompwin_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/filecompwin_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/foldercomp_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/foldercomp_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/mergebtns_on_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/mergebtns_on_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/nav_uparrow_btn_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/nav_uparrow_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/nextdiff_btn_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/nextdiff_btn_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/screenshots/treeview_tr.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/tour/screenshots/treeview_tr.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml
===================================================================
--- trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml	2009-08-10 21:47:13 UTC (rev 6949)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_comparingdirs">
+  <title>Comparing Folders</title>
+
+  <para>In addition to comparing files in WinMerge, you can compare the contents
+  of folders. WinMerge shows which files are different, and provides functions
+  to merge files between folders.</para>
+
+  <section>
+    <title>The Folder Compare window</title>
+
+    <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
+    operation</link> on two folders, the Folder Compare window opens:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/foldercomp_tr.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Folder Compare window</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>The Folder Compare window lists the files and subfolders found in the
+    target folders. Each row compares a file or subfolder in the two selected
+    folder targets. As with the File Compare window, the targets are represented
+    on <quote>left</quote> and <quote>right</quote> sides.</para>
+
+    <para>These columns tells you whether corresponding right and left items in
+    each row are identical, different, or exist on only one side. The asterisk
+    in either the left or right date highlights the more recent date. The icons
+    in the Filename column provide visual cues for each type of file, like text
+    or binary files, and how the two sides are different. Icons are also used to
+    mark files and folders that are found only on one side.</para>
+
+    <para>The columns are sortable. By default, rows are sorted by filename in
+    descending alphabetical order. Click the Filename column title to reverse
+    the sorting. Or, maybe you're only interested in rows that are different. If
+    so, click the Comparison result column title to sort by result type. This
+    groups different files together so they're easy to see.</para>
+
+    <para>If you want to display more information, a simple customization lets
+    you add additional columns, including file creation time, file encoding
+    type, file size, and even the number of differences found.</para>
+
+    <para>The Folder Compare window supports common operations on files, like
+    editing, copying, deleting, moving, and renaming (moving is equivalent to a
+    copy operation followed by a delete). You can use these file operations and
+    WinMerge functions to merge the contents of folders. You can also open files
+    using associated programs or external editors. You can even launch file
+    compare operations on individual files from the Folder Compare
+    window.</para>
+
+    <para>The <inlinemediaobject>
+        <imageobject>
+          <imagedata contentwidth="23" fileref="screenshots/nav_uparrow_btn_tr.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Navigator up arrow button</phrase>
+        </textobject>
+      </inlinemediaobject> <guibutton>up arrow</guibutton> button at the top of
+    the Filename column navigates to the parent folder of each target.</para>
+
+    <para>As we mentioned earlier, the WinMerge main window can contain multiple
+    Folder Compare or File Compare windows, and each Compare window displays the
+    result of a single comparison. In the preceding screen shot, the File
+    Compare window is maximized within the main window:</para>
+  </section>
+
+  <section>
+    <title>Navigating folder differences</title>
+
+    <para>To navigate differences at the folder level:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use conventional keyboard and mouse actions to move between rows.
+        To select a difference, simply click its row.</para>
+      </listitem>
+
+      <listitem>
+        <para>Use the Difference buttons in the toolbar to select differences
+        systematically. For example, click the <inlinemediaobject>
+            <imageobject>
+              <imagedata contentdepth="15"
+                         fileref="screenshots/nextdiff_btn_tr.png" />
+            </imageobject>
+
+            <textobject>
+              <phrase>Next Difference button</phrase>
+            </textobject>
+          </inlinemediaobject> <guibutton>Next Difference</guibutton> button in
+        the toolbar (or press <keycombo>
+            <keycap>Alt</keycap>
+
+            <keycap>Enter</keycap>
+          </keycombo>) to select the next row that is different, automatically
+        skipping identical rows.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section>
+    <title>Comparing subfolders</title>
+
+    <para>So far we have looked at a non-recursive comparison, meaning that it
+    includes only files in the root target folders. It shows subfolders, but not
+    their contents. If you want to see the files in a subfolder, you have to
+    launch a new compare operation. For example, if double-click the
+    <filename>Common</filename> folder in the preceding comparison, WinMerge
+    opens a new File Compare window that compares the two
+    <filename>Common</filename> folders.</para>
+
+    <para>You can also compare folders recursively. A recursive comparison
+    includes all the files in all subfolders, so you don't need to launch
+    separate compare operations to navigate nested folders. You can As you might
+    expect, a recursive comparison can can take longer than a non-recursive
+    comparison for targets with a lot of nested files, and the result can be
+    harder to read.</para>
+
+    <para>To address these drawbacks, a handy alternative is to display the
+    results of recursive comparisons in a hierachical tree view, instead of the
+    default tabular view. In the tree view, subfolders are initially collapsed
+    for a compact, readable display, but you can expand them to see their
+    contents:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/treeview_tr.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Folder Compare window</phrase>
+      </textobject>
+    </mediaobject>
+  </section>
+
+  <section>
+    <title>Merging folder differences</title>
+
+    <para>You merge differences in the Folder Compare window by copying one or
+    more files or folders from one side to the other, or by deleting
+    them.</para>
+
+    <para>For example, suppose you want to update files in two folders to the
+    most recent version. In the preceding screen shot, you can tell from the
+    asterisk that the left version of <filename>AboutDlg.h</filename> is more
+    recent. So, to merge <filename>AboutDlg.h</filename> select the row and
+    click the <inlinemediaobject>
+        <imageobject>
+          <imagedata contentwidth="17" fileref="screenshots/copyr_button_tr.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Copy Right button</phrase>
+        </textobject>
+      </inlinemediaobject> <guibutton>Copy Right</guibutton> button in the
+    toolbar.</para>
+
+    <para>When you merge a file or folder, the value in the <guilabel>Comparison
+    result</guilabel> column changes to <literal>Identical</literal>.</para>
+
+    <para>Of course, you might not always want to merge entire files or folders.
+    For example, you might want to merge selected differences within the files,
+    or to examine the differences within files before merging them. In such
+    cases, you can double-click a file to launch a file comparison. WinMerge
+    displays the result in a new File Compare window, where you can see and
+    merge the line-level differences.</para>
+  </section>
+</article>

Added: trunk/Docs/Users/Manual/tour/tour_comparingfiles.xml
===================================================================
--- trunk/Docs/Users/Manual/tour/tour_comparingfiles.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour/tour_comparingfiles.xml	2009-08-10 21:47:13 UTC (rev 6949)
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_comparingfiles">
+  <title>Comparing Files</title>
+
+  <para>When you compare two files, WinMerge shows the differences between their
+  lines. To demonstrate comparing and merging files, consider these two small
+  text files named <filename>File1</filename> and
+  <filename>File2</filename>:</para>
+
+  <formalpara>
+    <title>File1:</title>
+
+    <para><screen>You can cage a swallow,
+can't you? 
+But you can't swallow 
+a cage, can you?</screen></para>
+  </formalpara>
+
+  <formalpara>
+    <title>File2:</title>
+
+    <para><screen>You can cage a swallow.
+But you can't swallow 
+a cage. Can you?</screen></para>
+  </formalpara>
+
+  <section>
+    <title>The File Compare window</title>
+
+    <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
+    operation</link> on two files, the File Compare window opens. This screen
+    shot compares our two sample files:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/filecompwin_tr.png" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Compare Files screen shot</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>The File Compare window makes it easy to see differences between lines
+    in your files. It also has special functions for merging different lines
+    from one file to the other, and basic editing capabilities for more detailed
+    merging within lines. Notice these basic features of the File Compare
+    window:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>In the bottom right corner of the window, the status bar tells you
+        how many differences WinMerge detects.</para>
+
+        <para>The Location pane indicates where the differences are located in
+        the files. The Location pane is helpful for working with long files,
+        where you can't see all the differences at once in the File
+        panes.</para>
+      </listitem>
+
+      <listitem>
+        <para>Differences are marked in the File panes by a gold background
+        color. In this comparison, the first difference is a block of two lines;
+        the second difference is a single line at the end.</para>
+      </listitem>
+
+      <listitem>
+        <para>Notice that the first difference has an extra blank line on the
+        right side. Why does this blank line appear, since it doesn't exist in
+        the source file?</para>
+
+        <para>The empty line is a placeholder in WinMerge that does not change
+        the source file. WinMerge inserts blank lines on one side of a
+        difference whenever the other side has more lines. The extra lines,
+        marked with a gray background color by default, keep the left and right
+        sides vertically aligned for ease of comparison. That is, every
+        difference begins on the same line in the File panes, even when they are
+        on different lines in the source files. Without this feature, files of
+        different lengths would be hard to compare.</para>
+      </listitem>
+
+      <listitem>
+        <para>The third line is identical in both files, so it has no difference
+        color (its background is white).</para>
+      </listitem>
+
+      <listitem>
+        <para>Within differences, WinMerge highlights the text that makes the
+        lines different. By default, different words are highlighted. To see
+        more detail you can highlight changes at the character level; to see
+        less, you can turn off all highlighting within lines.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>The WinMerge main window can contain multiple File Compare (and
+      Folder compare) windows. Each File Compare window displays the result of a
+      single comparison, representing the two files in the left and right File
+      panes. In our screen shot, the File Compare window is maximized within the
+      main window:</para>
+    </note>
+  </section>
+
+  <section>
+    <title>Navigating line differences</title>
+
+    <para>In the File Compare window you can use standard mouse and cursor
+    actions to select and edit text in either File pane. But in WinMerge,
+    working with text and working with differences are not the same thing.
+    WinMerge provides special functions to navigate differences.</para>
+
+    <para>For example, click anywhere in an area that is marked as a difference,
+    then click the <inlinemediaobject>
+        <imageobject>
+          <imagedata contentdepth="15" fileref="screenshots/currentdiff_btn_tr.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Current Difference button</phrase>
+        </textobject>
+      </inlinemediaobject> <guibutton>Current Difference</guibutton> button in
+    the toolbar.</para>
+
+    <para>The next two screen shots show the first difference in our sample
+    comparison, after it's selected. When you select a difference, several
+    things happen:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The Selected Difference background color (red by default)
+        highlights the difference in the File panes. The Location Pane also
+        highlights the selected difference and marks its location with arrows.
+        :</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="screenshots/filecomp_diffpanesel_tr.png" />
+          </imageobject>
+
+          <textobject>
+            <phrase>Difference selected in Compare Files panes</phrase>
+          </textobject>
+        </mediaobject>
+      </listitem>
+
+      <listitem>
+        <para>The selected difference is loaded in the Diff pane, where you can
+        examine it in isolation from other differences.</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="screenshots/filecomp_diffpane_tr.png" />
+          </imageobject>
+
+          <textobject>
+            <phrase>Compare Files Diff Pane</phrase>
+          </textobject>
+        </mediaobject>
+      </listitem>
+
+      <listitem>
+        <para>All the merge buttons in the toolbar are enabled:
+        <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="screenshots/mergebtns_on_tr.png" />
+            </imageobject>
+          </inlinemediaobject></para>
+      </listitem>
+
+      <listitem>
+        <para>The status bar confirms which difference is selected.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section>
+    <title>Merging differences in files</title>
+
+    <para>You can merge differences at two levels in the File Compare
+    window:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term>Line-level differences</term>
+
+        <listitem>
+          <para>As we have seen, a difference includes one or more lines. Use
+          the WinMerge merge functions to copy an entire selected difference
+          from one side to the other. For example, click the <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15"
+                           fileref="screenshots/copyr_adv_btn_tr.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Copy Right and Advance button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Copy Right and Advance</guibutton>
+          button.</para>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="screenshots/filecomp_merged_tr.png" />
+            </imageobject>
+
+            <textobject>
+              <phrase>Compare Files window after merge</phrase>
+            </textobject>
+          </mediaobject>
+
+          <para>Notice the changes:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>The first difference is gone: the lines are now identical
+              and have no difference color.</para>
+            </listitem>
+
+            <listitem>
+              <para>WinMerge automatically selects the next difference, skipping
+              over the identical line. The Location Pane also moves its
+              indicator.</para>
+            </listitem>
+
+            <listitem>
+              <para>The status bar indicates that only one difference
+              remains.</para>
+            </listitem>
+          </itemizedlist>
+
+          <para>You can see that the navigation and merge functions provide a
+          good way to systematically step through all the differences in a
+          comparison.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Differences within lines</term>
+
+        <listitem>
+          <para>Instead of merging entire differences using the Merge functions,
+          you can change text within them by manually editing either file
+          directly in the File Compare window. For example, if you don't want to
+          use either side of the first difference, you can delete the line. Or,
+          you might replace <quote>words</quote> on the right side with
+          <quote>text</quote>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>After you finish merging, you can click <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Save</guimenuitem>
+      </menuchoice> to save changes to both sides. Or, to save just one side,
+    click <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Save Left</guimenuitem>
+      </menuchoice> or <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Save</guimenuitem>
+      </menuchoice>.</para>
+
+    <para>This was a trivial example — there were only two differences and we
+    only merged one of them. But you can use the methods shown here to navigate
+    and merge line differences between files of any length.</para>
+
+    <!--
+  <para>When you launch a file compare operation, WinMerge opens the File
+  Compare window. The window features two columns representing the
+  <quote>left</quote> and <quote>right</quote> files that you are comparing, and
+  indicates whether the corresponding lines on each side are identical or
+  different. WinMerge can also highlight the content within lines that makes
+  them different.</para>
+
+  <para>You can tailor how differences are detected and displayed. For example,
+  if whitespace differences are not meaningful to your comparison, you can
+  choose to ignore whitespace or different line ending encodings. You can change
+  the colors used to highlight line differences and the text within them.</para>
+
+  <para>The Compare window has special functions that make it easy to step
+  through line differences quickly and systematically, and functions to merge
+  differences from one file to the other if you want to. You can also edit the
+  files directly in the Compare window.</para>
+-->
+  </section>
+</article>

Added: trunk/Docs/Users/Manual/tour/tour_sel_targets.xml
===================================================================
--- trunk/Docs/Users/Manual/tour/tour_sel_targets.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour/tour_sel_targets.xml	2009-08-10 21:47:13 UTC (rev 6949)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_sel_targets">
+  <title>Starting WinMerge compare operations</title>
+
+  <para>Every WinMerge compare operation has two targets: either two files or
+  two folders. WinMerge makes it easy to select targets and launch comparisons
+  from different places in your Windows environment. Here are some commonly used
+  methods:</para>
+
+  <section>
+    <title>Drag and drop</title>
+
+    <para>Select two files or two folders in Windows Explorer and drag them to
+    the WinMerge shortcut on your desktop, or into the WinMerge window if it's
+    already open.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/dragndrop_files_tr.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Drag and drop to WinMerge Desktop icon</phrase>
+      </textobject>
+    </mediaobject>
+
+    <note>
+      <para>If you drop only one file or folder into the WinMerge icon or
+      window, WinMerge opens the <xref linkend="sel_targets_dialog" />, where
+      you can specify the other target.</para>
+    </note>
+  </section>
+
+  <section>
+    <title>Windows Explorer context menu shortcuts</title>
+
+    <para>WinMerge has an option that adds a <guimenuitem>WinMerge</guimenuitem>
+    shortcut to the context menu when you select one or two files or folders in
+    Windows Explorer. Choosing the shortcut opens WinMerge and compares the
+    selected items:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/ctx_menu_simple_tr.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Windows Explorer basic context menu integration</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>For even more flexibility, you can replace the basic
+    <guimenuitem>WinMerge</guimenuitem> shortcut with a set of advanced
+    shortcuts. Use these shortcuts to select objects separately, even from
+    different Explorer folders or windows. The next screen shot shows a typical
+    sequence: we choose the first compare target in one Explorer view, then the
+    second target in another Explorer view.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/ctx_menu_advanced_tr.png"
+                   format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Windows Explorer advanced context menu integration</phrase>
+      </textobject>
+    </mediaobject>
+  </section>
+
+  <section id="sel_targets_dialog">
+    <title>Select Files or Folder dialog</title>
+
+    <para>For maximum flexibility in launching compare operations, click
+    <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Open</guimenuitem>
+      </menuchoice> in the main WinMerge window to open the Select Files or
+    Folders dialog:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/OpenDlg_tr.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Select Files or Folders window</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>This dialog lets you browse anywhere for the files or folders to
+    compare. Alternatively, you might choose a recently-used file or folder from
+    the <guilabel>Left</guilabel> and <guilabel>Right</guilabel> drop-down
+    controls. You can even drag a file or folder from Windows Explorer into the
+    <guilabel>Left</guilabel> or <guilabel>Right</guilabel> field. A message
+    prompts you if either target is not found, or if you entered a combination
+    of file and folder (WinMerge can't compare files to folders!) in the two
+    fields.</para>
+
+    <para>The dialog contains several options to tailor your compare operation,
+    including these:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term>Filter</term>
+
+        <listitem>
+          <para>Use this option to apply a filter to narrow the scope of the
+          comparison. There two kinds of filters:</para>
+
+          <formalpara>
+            <title>File filters</title>
+
+            <para>include or exclude files that match regular expressions. For
+            example, the expression <code>^test</code> matches files that start
+            with the string, <literal>test</literal>, like
+            <filename>testheaders.h</filename>. WinMerge installs a number of
+            filter files that specify commonly-excluded files for various
+            languages, like C#, C++, and Visual Basic. You can edit these files
+            and, of course, add your own.</para>
+          </formalpara>
+
+          <formalpara>
+            <title>Line filters</title>
+
+            <para>ignore lines <emphasis>within</emphasis> files that match
+            patterns. For example, the expression <code>^[1-5]00</code> ignores
+            lines beginning with numbers <literal>100</literal>,
+            <literal>200</literal>, <literal>300</literal>,
+            <literal>400</literal>, and <literal>500</literal>.</para>
+          </formalpara>
+
+          <para>WinMerge provides the Filters dialog for creating and managing
+          filters.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Include Subfolders</term>
+
+        <listitem>
+          <para>This option lets you control the depth of a folder comparison.
+          Enabling it compares all folder levels, which might take a while if
+          there are a lot of files. Disable it to compare only the top level of
+          the target folders. This is the fastest option, and you can
+          <quote>drill down</quote> into nested folders later in the Compare
+          Folders window.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+
+  <section>
+    <title>Command line</title>
+
+    <para>The WinMerge CLI includes commands with a full set of parameters and
+    options that you can use in a script or Command Prompt window to launch
+    comparisons. This example compares two folders recursively and displays the
+    result in the WinMerge window:</para>
+
+    <para><userinput>WinMergeU <filename>/r C:\folder1</filename> <filename
+    class="directory"><filename>C:\folder2</filename>
+    </filename></userinput></para>
+  </section>
+
+  <section>
+    <title>Version control systems</title>
+
+    <para>If you run TortoiseSVN, TortoiseCVS, or Rational ClearCase, you can
+    configure your version control system to open WinMerge directly. That is, if
+    you compare files using one of these VCS tools, WinMerge opens instead of
+    the tool's native diff utility.</para>
+
+    <note>
+      <para>Another handy VCS integration automatically launches your version
+      control system's checkout dialog whenever you change a managed file in the
+      WinMerge window. This integration works with version control systems that
+      lock files, specifically ClearCase and Visual Source Safe.</para>
+    </note>
+  </section>
+</article>


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

[Winmerge-svn] SF.net SVN: winmerge:[6948] branches/R2_12

From: <ge...@us...> - 2009-08-10 13:16:30

Revision: 6948
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6948&view=rev
Author:   gerundt
Date:     2009-08-10 13:16:23 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
PATCH: [ 2834192 ] Add missing keywords to Pascal highlighter

Modified Paths:
--------------
    branches/R2_12/Docs/Users/ChangeLog.txt
    branches/R2_12/Src/editlib/pascal.cpp

Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt	2009-08-10 13:13:58 UTC (rev 6947)
+++ branches/R2_12/Docs/Users/ChangeLog.txt	2009-08-10 13:16:23 UTC (rev 6948)
@@ -4,6 +4,7 @@
 http://winmerge.org/tracker/[tracker-id]
 
 WinMerge 2.12.6
+  Add missing keywords to Pascal highlighter (#2834192)
   Translation updates:
   - Dutch (#2804979)
   - Turkish (#2825132, #2827817)

Modified: branches/R2_12/Src/editlib/pascal.cpp
===================================================================
--- branches/R2_12/Src/editlib/pascal.cpp	2009-08-10 13:13:58 UTC (rev 6947)
+++ branches/R2_12/Src/editlib/pascal.cpp	2009-08-10 13:16:23 UTC (rev 6948)
@@ -25,7 +25,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-//  C++ keywords (MSVC5.0 + POET5.0)
+//  Pascal keywords
 static LPTSTR s_apszPascalKeywordList[] =
   {
     _T ("program"),
@@ -79,6 +79,35 @@
     _T ("assembler"),
     _T ("near"),
     _T ("inherited"),
+    //Object Pascal Keywords
+    _T ("As"),
+    _T ("Class"),
+    _T ("Except"),
+    _T ("Finally"),
+    _T ("In"),
+    _T ("Is"),
+    _T ("On"),
+    _T ("Packed"),
+    _T ("Property"),
+    _T ("Raise"),
+    _T ("Shl"),
+    _T ("Shr"),
+    _T ("ThreadVar"),
+    _T ("Try"),
+    //Object Pascal Directives
+    _T ("Abstract"),
+    _T ("Default"),
+    _T ("Dynamic"),
+    _T ("Export"),
+    _T ("Index"),
+    _T ("Out"),
+    _T ("Overload"),
+    _T ("Override"),
+    _T ("Private"),
+    _T ("Protected"),
+    _T ("Public"),
+    _T ("Published"),
+    _T ("Virtual"),
     NULL
   };
 


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

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

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

Revision: 6947
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6947&view=rev
Author:   gerundt
Date:     2009-08-10 13:13:58 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
PATCH: [ 2834192 ] Add missing keywords to Pascal highlighter

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/editlib/pascal.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-08-05 03:36:21 UTC (rev 6946)
+++ trunk/Docs/Users/ChangeLog.txt	2009-08-10 13:13:58 UTC (rev 6947)
@@ -13,6 +13,7 @@
   Add accelerator keys for Shell context menu (#2823536)
   Add /xq command line switch for closing WinMerge after identical files
     and not showing message (#2827836)
+  Add missing keywords to Pascal highlighter (#2834192)
   Bugfix: Did not export changed options values (#2799149)
   Bugfix: Don't highlight identical words if whitespaces are ignored (#2798360)
   Bugfix: Did not reset folder compare method back to original (#2803152)

Modified: trunk/Src/editlib/pascal.cpp
===================================================================
--- trunk/Src/editlib/pascal.cpp	2009-08-05 03:36:21 UTC (rev 6946)
+++ trunk/Src/editlib/pascal.cpp	2009-08-10 13:13:58 UTC (rev 6947)
@@ -26,7 +26,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-//  C++ keywords (MSVC5.0 + POET5.0)
+//  Pascal keywords
 static LPTSTR s_apszPascalKeywordList[] =
   {
     _T ("program"),
@@ -80,6 +80,35 @@
     _T ("assembler"),
     _T ("near"),
     _T ("inherited"),
+    //Object Pascal Keywords
+    _T ("As"),
+    _T ("Class"),
+    _T ("Except"),
+    _T ("Finally"),
+    _T ("In"),
+    _T ("Is"),
+    _T ("On"),
+    _T ("Packed"),
+    _T ("Property"),
+    _T ("Raise"),
+    _T ("Shl"),
+    _T ("Shr"),
+    _T ("ThreadVar"),
+    _T ("Try"),
+    //Object Pascal Directives
+    _T ("Abstract"),
+    _T ("Default"),
+    _T ("Dynamic"),
+    _T ("Export"),
+    _T ("Index"),
+    _T ("Out"),
+    _T ("Overload"),
+    _T ("Override"),
+    _T ("Private"),
+    _T ("Protected"),
+    _T ("Public"),
+    _T ("Published"),
+    _T ("Virtual"),
     NULL
   };
 


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

[Winmerge-svn] SF.net SVN: winmerge:[6946] trunk/Externals

From: <mar...@us...> - 2009-08-05 03:36:35

Revision: 6946
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6946&view=rev
Author:   marcelgosselin
Date:     2009-08-05 03:36:21 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Add visual studio generated files to ignore list

Property Changed:
----------------
    trunk/Externals/expat/
    trunk/Externals/pcre/Win32/
    trunk/Externals/scew/win32/


Property changes on: trunk/Externals/expat
___________________________________________________________________
Added: svn:ignore
   + *.ncb
*.suo



Property changes on: trunk/Externals/pcre/Win32
___________________________________________________________________
Added: svn:ignore
   + *.ncb
*.suo



Property changes on: trunk/Externals/scew/win32
___________________________________________________________________
Added: svn:ignore
   + *.ncb
*.suo



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

[Winmerge-svn] SF.net SVN: winmerge:[6945] trunk/Src

From: <mar...@us...> - 2009-08-05 03:35:03

Revision: 6945
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6945&view=rev
Author:   marcelgosselin
Date:     2009-08-05 03:34:52 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Fix compilation errors in VS2003

Modified Paths:
--------------
    trunk/Src/CompareStats.cpp
    trunk/Src/FileFilterHelper.cpp

Modified: trunk/Src/CompareStats.cpp
===================================================================
--- trunk/Src/CompareStats.cpp	2009-08-04 11:53:13 UTC (rev 6944)
+++ trunk/Src/CompareStats.cpp	2009-08-05 03:34:52 UTC (rev 6945)
@@ -8,6 +8,7 @@
 
 #include <windows.h>
 #include <assert.h>
+#include <crtdbg.h>
 #include "DiffItem.h"
 #include "CompareStats.h"
 

Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp	2009-08-04 11:53:13 UTC (rev 6944)
+++ trunk/Src/FileFilterHelper.cpp	2009-08-05 03:34:52 UTC (rev 6945)
@@ -24,6 +24,7 @@
 
 #include <windows.h>
 #include <tchar.h>
+#include <crtdbg.h>
 #include "Ucs2Utf8.h"
 #include "UnicodeString.h"
 #include "FilterList.h"


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

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

From: <den...@us...> - 2009-08-04 11:53:23

Revision: 6944
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6944&view=rev
Author:   denisbradford
Date:     2009-08-04 11:53:13 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Add comments to documents recent changes in build scripts.

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

Modified: trunk/Docs/Users/Manual/build/build_common.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_common.xsl	2009-08-03 13:04:02 UTC (rev 6943)
+++ trunk/Docs/Users/Manual/build/build_common.xsl	2009-08-04 11:53:13 UTC (rev 6944)
@@ -20,6 +20,7 @@
      ******************************************************************** 
      Changes
      Created July 2008
+     3 Aug 2009: Added 'header.ads' custom template
      ******************************************************************** -->
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/param.xsl  parameters
@@ -115,6 +116,9 @@
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 WinMerge custom templates 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<!-- This template adds ads to the top of HTML pages when you use the 
+     'build html withads' command line to generate commercialized 
+     pages for the WinMerge web site. -->
 <xsl:template name="header.ads">
   <div id="ads">
     <script type="text/javascript">&lt;!--

Modified: trunk/Docs/Users/Manual/build/build_html.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.xsl	2009-08-03 13:04:02 UTC (rev 6943)
+++ trunk/Docs/Users/Manual/build/build_html.xsl	2009-08-04 11:53:13 UTC (rev 6944)
@@ -13,6 +13,7 @@
      ******************************************************************** 
      Changes:
      Created July 2008
+     3 Aug 2009: Added 'user.header.content' template
      ******************************************************************** -->
 
 <xsl:import href="../build/xsl/html/chunk.xsl"/>
@@ -115,7 +116,8 @@
   <xsl:apply-templates select="." mode="head.keywords.content"/>
 </xsl:template>
 
-<!-- For web pages add banner image and Google ad scripts -->
+<!-- For web pages add banner image. Add Google ad scripts 
+     if 'withads' param is set  to true. -->
 <xsl:template name="user.header.content">
     <xsl:if test="$withads = 'true'">
       <xsl:call-template name="header.ads"/>


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

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

From: <den...@us...> - 2009-08-03 13:04:15

Revision: 6943
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6943&view=rev
Author:   denisbradford
Date:     2009-08-03 13:04:02 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
Add WinMerge tour files per Patch 2817443 and related build script. Update build scripts to include tour, add "withads" functionality, eliminate unneeded build_html_withads.xsl script.

Modified Paths:
--------------
    trunk/Docs/Users/Manual/build/build_common.xsl
    trunk/Docs/Users/Manual/build/build_html.bat
    trunk/Docs/Users/Manual/build/build_html.xsl
    trunk/Docs/Users/Manual/screenshots/OpenDlg1.png
    trunk/Docs/Users/Manual/screenshots/ctx_menu_simple.png
    trunk/Docs/Users/Manual/screenshots/equal.png
    trunk/Docs/Users/Manual/screenshots/treeview-01.png

Added Paths:
-----------
    trunk/Docs/Users/Manual/WinMerge_tour.xml
    trunk/Docs/Users/Manual/build/build_html_page.xsl
    trunk/Docs/Users/Manual/css/onepage.css
    trunk/Docs/Users/Manual/screenshots/ctx_menu_advanced_2wins.png
    trunk/Docs/Users/Manual/screenshots/dragndrop-files.png
    trunk/Docs/Users/Manual/screenshots/filecomp_diffpane2.png
    trunk/Docs/Users/Manual/screenshots/filecomp_diffpanesel.png
    trunk/Docs/Users/Manual/screenshots/filecomp_merged.png
    trunk/Docs/Users/Manual/screenshots/filecompwin01.png
    trunk/Docs/Users/Manual/screenshots/foldercomp2.png
    trunk/Docs/Users/Manual/screenshots/mergebtns-on.png
    trunk/Docs/Users/Manual/tour_comparingdirs.xml
    trunk/Docs/Users/Manual/tour_comparingfiles.xml
    trunk/Docs/Users/Manual/tour_sel_targets.xml

Removed Paths:
-------------
    trunk/Docs/Users/Manual/build/build_html_withads.xsl

Added: trunk/Docs/Users/Manual/WinMerge_tour.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_tour.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/WinMerge_tour.xml	2009-08-03 13:04:02 UTC (rev 6943)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"./build/dtd/docbookx.dtd">
+<book id="WinMerge_tour">
+  <bookinfo>
+    <title>WinMerge <xi:include href="replaceables.xml"
+    xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(version)" />
+    Quick Tour</title>
+
+    <abstract>
+      <para>WinMerge is an Open Source differencing and merging tool for
+      Windows. Use it to detect changes between files and folders, and then to
+      merge changes selectively. You can use WinMerge by itself, or launch it
+      from a version control system or another application.</para>
+
+      <para>When you compare two files or folders, the result is displayed in
+      the WinMerge window. The WinMerge window's visual display and functions
+      are designed to help you see differences between your targets, and to
+      merge selected differences if you want to.</para>
+
+      <formalpara>
+        <title>In a file comparison</title>
+
+        <para>WinMerge shows differences between lines. The built-in text editor
+        provides syntax highlighting for several programming languages and other
+        file formats.</para>
+      </formalpara>
+
+      <formalpara>
+        <title>In a folder comparison</title>
+
+        <para>WinMerge indicates various kinds of differences between the files
+        that the folders contain.</para>
+      </formalpara>
+
+      <para>Take this brief, guided tour if you are considering installing
+      WinMerge, or if you just want to see what the tool looks like and what you
+      can do with it. The topics below describe the main WinMerge features. They
+      include some simple examples of comparing files and folders, and merging
+      differences between them.</para>
+
+      <para>This tour just scratches the surface. For detailed information and
+      guidance about using WinMerge, see the Help that is installed with
+      WinMerge and available <ulink url="http://winmerge.org/docs/manual/">on
+      our Web site</ulink>.</para>
+    </abstract>
+  </bookinfo>
+
+  <toc></toc>
+
+  <xi:include href="tour_sel_targets.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(/1)" />
+
+  <xi:include href="tour_comparingfiles.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="tour_comparingdirs.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>

Modified: trunk/Docs/Users/Manual/build/build_common.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_common.xsl	2009-08-02 17:02:17 UTC (rev 6942)
+++ trunk/Docs/Users/Manual/build/build_common.xsl	2009-08-03 13:04:02 UTC (rev 6943)
@@ -21,7 +21,6 @@
      Changes
      Created July 2008
      ******************************************************************** -->
-
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/param.xsl  parameters
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
@@ -57,6 +56,7 @@
 <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 html/docbook.xsl 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<!-- Link to the appropriate css stylesheets -->
 <xsl:template name="user.head.content">
   <link rel="stylesheet" type="text/css" href="css/all.css" />
   <link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
@@ -112,4 +112,28 @@
   </span>
 </xsl:template>
 
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
+WinMerge custom templates 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
+<xsl:template name="header.ads">
+  <div id="ads">
+    <script type="text/javascript">&lt;!--
+      google_ad_client = "pub-1411904495533584";
+      google_ad_width = 728;
+      google_ad_height = 90;
+      google_ad_format = "728x90_as";
+      google_ad_type = "text";
+      google_ad_channel ="";
+      google_color_border = "FFCC00";
+      google_color_bg = "FFFFCC";
+      google_color_link = "0000FF";
+      google_color_text = "000000";
+      google_color_url = "008000";
+    //--&gt;</script>
+    <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+    </script>
+  </div>
+</xsl:template>
+
+
 </xsl:stylesheet>

Modified: trunk/Docs/Users/Manual/build/build_html.bat
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.bat	2009-08-02 17:02:17 UTC (rev 6942)
+++ trunk/Docs/Users/Manual/build/build_html.bat	2009-08-03 13:04:02 UTC (rev 6943)
@@ -3,14 +3,17 @@
 call configuration.bat
 
 set docbook_inputfile=..\WinMerge_help.xml
+set tour_inputfile=..\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 ads=false
 if "%1" == "withads" goto withads
 if not "%1" == "" goto withadserror
 goto start
 
 :withads
-set docbook_use_stylesheet=build_html_withads.xsl
+set ads=true
 echo **************************************
 echo * The manual includes advertisements *
 echo **************************************
@@ -38,12 +41,15 @@
 
 echo Copy stylesheets...
 if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"
-copy "..\css\all.css" "%docbook_outputdir%\css\all.css"
-copy "..\css\print.css" "%docbook_outputdir%\css\print.css"
+copy "..\css\*.css" "%docbook_outputdir%\css"
+rem copy "..\css\print.css" "%docbook_outputdir%\css\print.css"
 
-echo Create 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%\
+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 %docbook_outputdir%/WinMerge_tour.html %tour_inputfile% %tour_use_stylesheet% headtitle.suffix="' - WinMerge 2.12 Tour'" withads=%ads% 
+
 echo Finished!
 
 :end

Modified: trunk/Docs/Users/Manual/build/build_html.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.xsl	2009-08-02 17:02:17 UTC (rev 6942)
+++ trunk/Docs/Users/Manual/build/build_html.xsl	2009-08-03 13:04:02 UTC (rev 6943)
@@ -17,15 +17,22 @@
 
 <xsl:import href="../build/xsl/html/chunk.xsl"/>
 <xsl:import href="build_common.xsl"/>
-<!-- Define suffix to appear after title text in head/title element of every topic -->
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
+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/docbook.xsl 
-  Add suffix to head title text
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
 
+<!--   Add headtitle.suffix to head title text -->
 <xsl:template name="head.content">
   <xsl:param name="node" select="."/>
   <xsl:param name="title">
@@ -108,4 +115,11 @@
   <xsl:apply-templates select="." mode="head.keywords.content"/>
 </xsl:template>
 
+<!-- For web pages add banner image and Google ad scripts -->
+<xsl:template name="user.header.content">
+    <xsl:if test="$withads = 'true'">
+      <xsl:call-template name="header.ads"/>
+    </xsl:if>
+</xsl:template>
+
 </xsl:stylesheet>

Added: trunk/Docs/Users/Manual/build/build_html_page.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html_page.xsl	                        (rev 0)
+++ trunk/Docs/Users/Manual/build/build_html_page.xsl	2009-08-03 13:04:02 UTC (rev 6943)
@@ -0,0 +1,62 @@
+<?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>

Deleted: trunk/Docs/Users/Manual/build/build_html_withads.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_html_withads.xsl	2009-08-02 17:02:17 UTC (rev 6942)
+++ trunk/Docs/Users/Manual/build/build_html_withads.xsl	2009-08-03 13:04:02 UTC (rev 6943)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<!-- ********************************************************************
-     build_html_withads.xsl
-     WinMerge customization of the XSL DocBook stylesheet distribution.
-     Contains customized templates and parameters for the Web site version 
-     of help; 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 2008
-     ******************************************************************** -->
-
-<xsl:import href="build_html.xsl"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
-html/docbook.xsl 		
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->  
-<!-- WinMerge: commercialize the header -->
-<xsl:template name="user.header.content">
-  <div id="ads">
-    <script type="text/javascript">&lt;!--
-    google_ad_client = "pub-1411904495533584";
-    google_ad_width = 728;
-    google_ad_height = 90;
-    google_ad_format = "728x90_as";
-    google_ad_type = "text";
-    google_ad_channel ="";
-    google_color_border = "FFCC00";
-    google_color_bg = "FFFFCC";
-    google_color_link = "0000FF";
-    google_color_text = "000000";
-    google_color_url = "008000";
-    //--&gt;</script>
-    <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-    </script>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>

Added: trunk/Docs/Users/Manual/css/onepage.css
===================================================================
--- trunk/Docs/Users/Manual/css/onepage.css	                        (rev 0)
+++ trunk/Docs/Users/Manual/css/onepage.css	2009-08-03 13:04:02 UTC (rev 6943)
@@ -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;
+}
+

Modified: trunk/Docs/Users/Manual/screenshots/OpenDlg1.png
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/ctx_menu_advanced_2wins.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/ctx_menu_advanced_2wins.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Docs/Users/Manual/screenshots/ctx_menu_simple.png
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/dragndrop-files.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/dragndrop-files.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Docs/Users/Manual/screenshots/equal.png
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/screenshots/filecomp_diffpane2.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_diffpane2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/filecomp_diffpanesel.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_diffpanesel.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/filecomp_merged.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_merged.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/filecompwin01.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/filecompwin01.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/foldercomp2.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/foldercomp2.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Docs/Users/Manual/screenshots/mergebtns-on.png
===================================================================
(Binary files differ)


Property changes on: trunk/Docs/Users/Manual/screenshots/mergebtns-on.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Docs/Users/Manual/screenshots/treeview-01.png
===================================================================
(Binary files differ)

Added: trunk/Docs/Users/Manual/tour_comparingdirs.xml
===================================================================
--- trunk/Docs/Users/Manual/tour_comparingdirs.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour_comparingdirs.xml	2009-08-03 13:04:02 UTC (rev 6943)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_comparingdirs">
+  <title>Comparing Folders</title>
+
+  <para>In addition to comparing files in WinMerge, you can compare the contents
+  of folders. WinMerge shows which files are different, and provides functions
+  to merge files between folders.</para>
+
+  <section>
+    <title>The Folder Compare window</title>
+
+    <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
+    operation</link> on two folders, the Folder Compare window opens:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/foldercomp1.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Folder Compare window</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>The Folder Compare window lists the files and subfolders found in the
+    target folders. Each row compares a file or subfolder in the two selected
+    folder targets. As with the File Compare window, the targets are represented
+    on <quote>left</quote> and <quote>right</quote> sides.</para>
+
+    <para>These columns tells you whether corresponding right and left items in
+    each row are identical, different, or exist on only one side. The asterisk
+    in either the left or right date highlights the more recent date. The icons
+    in the Filename column provide visual cues for each type of file, like text
+    or binary files, and how the two sides are different. Icons are also used to
+    mark files and folders that are found only on one side.</para>
+
+    <para>The columns are sortable. By default, rows are sorted by filename in
+    descending alphabetical order. Click the Filename column title to reverse
+    the sorting. Or, maybe you're only interested in rows that are different. If
+    so, click the Comparison result column title to sort by result type. This
+    groups different files together so they're easy to see.</para>
+
+    <para>If you want to display more information, a simple customization lets
+    you add additional columns, including file creation time, file encoding
+    type, file size, and even the number of differences found.</para>
+
+    <para>The Folder Compare window supports common operations on files, like
+    editing, copying, deleting, moving, and renaming (moving is equivalent to a
+    copy operation followed by a delete). You can use these file operations and
+    WinMerge functions to merge the contents of folders. You can also open files
+    using associated programs or external editors. You can even launch file
+    compare operations on individual files from the Folder Compare
+    window.</para>
+
+    <para>The <inlinemediaobject>
+        <imageobject>
+          <imagedata contentwidth="23" fileref="screenshots/nav_uparrow_btn.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Navigator up arrow button</phrase>
+        </textobject>
+      </inlinemediaobject> <guibutton>up arrow</guibutton> button at the top of
+    the Filename column navigates to the parent folder of each target.</para>
+
+    <para>As we mentioned earlier, the WinMerge main window can contain multiple
+    Folder Compare or File Compare windows, and each Compare window displays the
+    result of a single comparison. In the preceding screen shot, the File
+    Compare window is maximized within the main window:</para>
+  </section>
+
+  <section>
+    <title>Navigating folder differences</title>
+
+    <para>To navigate differences at the folder level:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use conventional keyboard and mouse actions to move between rows.
+        To select a difference, simply click its row.</para>
+      </listitem>
+
+      <listitem>
+        <para>Use the Difference buttons in the toolbar to select differences
+        systematically. For example, click the <inlinemediaobject>
+            <imageobject>
+              <imagedata contentdepth="15"
+                         fileref="screenshots/nextdiff_btn.png" />
+            </imageobject>
+
+            <textobject>
+              <phrase>Next Difference button</phrase>
+            </textobject>
+          </inlinemediaobject> <guibutton>Next Difference</guibutton> button in
+        the toolbar (or press <keycombo>
+            <keycap>Alt</keycap>
+
+            <keycap>Enter</keycap>
+          </keycombo>) to select the next row that is different, automatically
+        skipping identical rows.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section>
+    <title>Comparing subfolders</title>
+
+    <para>So far we have looked at a non-recursive comparison, meaning that it
+    includes only files in the root target folders. It shows subfolders, but not
+    their contents. If you want to see the files in a subfolder, you have to
+    launch a new compare operation. For example, if double-click the
+    <filename>Common</filename> folder in the preceding comparison, WinMerge
+    opens a new File Compare window that compares the two
+    <filename>Common</filename> folders.</para>
+
+    <para>You can also compare folders recursively. A recursive comparison
+    includes all the files in all subfolders, so you don't need to launch
+    separate compare operations to navigate nested folders. You can As you might
+    expect, a recursive comparison can can take longer than a non-recursive
+    comparison for targets with a lot of nested files, and the result can be
+    harder to read.</para>
+
+    <para>To address these drawbacks, a handy alternative is to display the
+    results of recursive comparisons in a hierachical tree view, instead of the
+    default tabular view. In the tree view, subfolders are initially collapsed
+    for a compact, readable display, but you can expand them to see their
+    contents:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/treeview-01.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Folder Compare window</phrase>
+      </textobject>
+    </mediaobject>
+  </section>
+
+  <section>
+    <title>Merging folder differences</title>
+
+    <para>You merge differences in the Folder Compare window by copying one or
+    more files or folders from one side to the other, or by deleting
+    them.</para>
+
+    <para>For example, suppose you want to update files in two folders to the
+    most recent version. In the preceding screen shot, you can tell from the
+    asterisk that the left version of <filename>AboutDlg.h</filename> is more
+    recent. So, to merge <filename>AboutDlg.h</filename> select the row and
+    click the <inlinemediaobject>
+        <imageobject>
+          <imagedata contentwidth="17" fileref="screenshots/copyr_button.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Copy Right button</phrase>
+        </textobject>
+      </inlinemediaobject> <guibutton>Copy Right</guibutton> button in the
+    toolbar.</para>
+
+    <para>When you merge a file or folder, the value in the <guilabel>Comparison
+    result</guilabel> column changes to <literal>Identical</literal>.</para>
+
+    <para>Of course, you might not always want to merge entire files or folders.
+    For example, you might want to merge selected differences within the files,
+    or to examine the differences within files before merging them. In such
+    cases, you can double-click a file to launch a file comparison. WinMerge
+    displays the result in a new File Compare window, where you can see and
+    merge the line-level differences.</para>
+  </section>
+</article>
\ No newline at end of file

Added: trunk/Docs/Users/Manual/tour_comparingfiles.xml
===================================================================
--- trunk/Docs/Users/Manual/tour_comparingfiles.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour_comparingfiles.xml	2009-08-03 13:04:02 UTC (rev 6943)
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<article id="tour_comparingfiles">
+  <title>Comparing Files</title>
+
+  <para>When you compare two files, WinMerge shows the differences between their
+  lines. To demonstrate comparing and merging files, consider these two small
+  text files named <filename>File1</filename> and
+  <filename>File2</filename>:</para>
+
+  <formalpara>
+    <title>File1:</title>
+
+    <para><screen>You can cage a swallow,
+can't you? 
+But you can't swallow 
+a cage, can you?</screen></para>
+  </formalpara>
+
+  <formalpara>
+    <title>File2:</title>
+
+    <para><screen>You can cage a swallow.
+But you can't swallow 
+a cage. Can you?</screen></para>
+  </formalpara>
+
+  <section>
+    <title>The File Compare window</title>
+
+    <para>If you <link linkend="tour_sel_targets">launch a WinMerge compare
+    operation</link> on two files, the File Compare window opens. This screen
+    shot compares our two sample files:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/filecompwin01.png" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Compare Files screen shot</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>The File Compare window makes it easy to see differences between lines
+    in your files. It also has special functions for merging different lines
+    from one file to the other, and basic editing capabilities for more detailed
+    merging within lines. Notice these basic features of the File Compare
+    window:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>In the bottom right corner of the window, the status bar tells you
+        how many differences WinMerge detects.</para>
+
+        <para>The Location pane indicates where the differences are located in
+        the files. The Location pane is helpful for working with long files,
+        where you can't see all the differences at once in the File
+        panes.</para>
+      </listitem>
+
+      <listitem>
+        <para>Differences are marked in the File panes by a gold background
+        color. In this comparison, the first difference is a block of two lines;
+        the second difference is a single line at the end.</para>
+      </listitem>
+
+      <listitem>
+        <para>Notice that the first difference has an extra blank line on the
+        right side. Why does this blank line appear, since it doesn't exist in
+        the source file?</para>
+
+        <para>The empty line is a placeholder in WinMerge that does not change
+        the source file. WinMerge inserts blank lines on one side of a
+        difference whenever the other side has more lines. The extra lines,
+        marked with a gray background color by default, keep the left and right
+        sides vertically aligned for ease of comparison. That is, every
+        difference begins on the same line in the File panes, even when they are
+        on different lines in the source files. Without this feature, files of
+        different lengths would be hard to compare.</para>
+      </listitem>
+
+      <listitem>
+        <para>The third line is identical in both files, so it has no difference
+        color (its background is white).</para>
+      </listitem>
+
+      <listitem>
+        <para>Within differences, WinMerge highlights the text that makes the
+        lines different. By default, different words are highlighted. To see
+        more detail you can highlight changes at the character level; to see
+        less, you can turn off all highlighting within lines.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>The WinMerge main window can contain multiple File Compare (and
+      Folder compare) windows. Each File Compare window displays the result of a
+      single comparison, representing the two files in the left and right File
+      panes. In our screen shot, the File Compare window is maximized within the
+      main window:</para>
+    </note>
+  </section>
+
+  <section>
+    <title>Navigating line differences</title>
+
+    <para>In the File Compare window you can use standard mouse and cursor
+    actions to select and edit text in either File pane. But in WinMerge,
+    working with text and working with differences are not the same thing.
+    WinMerge provides special functions to navigate differences.</para>
+
+    <para>For example, click anywhere in an area that is marked as a difference,
+    then click the <inlinemediaobject>
+        <imageobject>
+          <imagedata contentdepth="15" fileref="screenshots/currentdiff_btn.png" />
+        </imageobject>
+
+        <textobject>
+          <phrase>Current Difference button</phrase>
+        </textobject>
+      </inlinemediaobject> <guibutton>Current Difference</guibutton> button in
+    the toolbar.</para>
+
+    <para>The next two screen shots show the first difference in our sample
+    comparison, after it's selected. When you select a difference, several
+    things happen:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>The Selected Difference background color (red by default)
+        highlights the difference in the File panes. The Location Pane also
+        highlights the selected difference and marks its location with arrows.
+        :</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="screenshots/filecomp_diffpanesel.png" />
+          </imageobject>
+
+          <textobject>
+            <phrase>Difference selected in Compare Files panes</phrase>
+          </textobject>
+        </mediaobject>
+      </listitem>
+
+      <listitem>
+        <para>The selected difference is loaded in the Diff pane, where you can
+        examine it in isolation from other differences.</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="screenshots/filecomp_diffpane2.png" />
+          </imageobject>
+
+          <textobject>
+            <phrase>Compare Files Diff Pane</phrase>
+          </textobject>
+        </mediaobject>
+      </listitem>
+
+      <listitem>
+        <para>All the merge buttons in the toolbar are enabled:
+        <inlinemediaobject>
+            <imageobject>
+              <imagedata fileref="screenshots/mergebtns-on.png" />
+            </imageobject>
+          </inlinemediaobject></para>
+      </listitem>
+
+      <listitem>
+        <para>The status bar confirms which difference is selected.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section>
+    <title>Merging differences in files</title>
+
+    <para>You can merge differences at two levels in the File Compare
+    window:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term>Line-level differences</term>
+
+        <listitem>
+          <para>As we have seen, a difference includes one or more lines. Use
+          the WinMerge merge functions to copy an entire selected difference
+          from one side to the other. For example, click the <inlinemediaobject>
+              <imageobject>
+                <imagedata contentdepth="15"
+                           fileref="screenshots/copyr_adv_btn.png" />
+              </imageobject>
+
+              <textobject>
+                <phrase>Copy Right and Advance button</phrase>
+              </textobject>
+            </inlinemediaobject> <guibutton>Copy Right and Advance</guibutton>
+          button.</para>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="screenshots/filecomp_merged.png" />
+            </imageobject>
+
+            <textobject>
+              <phrase>Compare Files window after merge</phrase>
+            </textobject>
+          </mediaobject>
+
+          <para>Notice the changes:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para>The first difference is gone: the lines are now identical
+              and have no difference color.</para>
+            </listitem>
+
+            <listitem>
+              <para>WinMerge automatically selects the next difference, skipping
+              over the identical line. The Location Pane also moves its
+              indicator.</para>
+            </listitem>
+
+            <listitem>
+              <para>The status bar indicates that only one difference
+              remains.</para>
+            </listitem>
+          </itemizedlist>
+
+          <para>You can see that the navigation and merge functions provide a
+          good way to systematically step through all the differences in a
+          comparison.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Differences within lines</term>
+
+        <listitem>
+          <para>Instead of merging entire differences using the Merge functions,
+          you can change text within them by manually editing either file
+          directly in the File Compare window. For example, if you don't want to
+          use either side of the first difference, you can delete the line. Or,
+          you might replace <quote>words</quote> on the right side with
+          <quote>text</quote>.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>After you finish merging, you can click <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Save</guimenuitem>
+      </menuchoice> to save changes to both sides. Or, to save just one side,
+    click <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Save Left</guimenuitem>
+      </menuchoice> or <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Save</guimenuitem>
+      </menuchoice>.</para>
+
+    <para>This was a trivial example — there were only two differences and we
+    only merged one of them. But you can use the methods shown here to navigate
+    and merge line differences between files of any length.</para>
+
+    <!--
+  <para>When you launch a file compare operation, WinMerge opens the File
+  Compare window. The window features two columns representing the
+  <quote>left</quote> and <quote>right</quote> files that you are comparing, and
+  indicates whether the corresponding lines on each side are identical or
+  different. WinMerge can also highlight the content within lines that makes
+  them different.</para>
+
+  <para>You can tailor how differences are detected and displayed. For example,
+  if whitespace differences are not meaningful to your comparison, you can
+  choose to ignore whitespace or different line ending encodings. You can change
+  the colors used to highlight line differences and the text within them.</para>
+
+  <para>The Compare window has special functions that make it easy to step
+  through line differences quickly and systematically, and functions to merge
+  differences from one file to the other if you want to. You can also edit the
+  files directly in the Compare window.</para>
+-->
+  </section>
+</article>
\ No newline at end of file

Added: trunk/Docs/Users/Manual/tour_sel_targets.xml
===================================================================
--- trunk/Docs/Users/Manual/tour_sel_targets.xml	                        (rev 0)
+++ trunk/Docs/Users/Manual/tour_sel_targets.xml	2009-08-03 13:04:02 UTC (rev 6943)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"build/dtd/docbookx.dtd">
+<article id="tour_sel_targets">
+  <title>Starting WinMerge compare operations</title>
+
+  <para>Every WinMerge compare operation has two targets: either two files or
+  two folders. WinMerge makes it easy to select targets and launch comparisons
+  from different places in your Windows environment. Here are some commonly used
+  methods:</para>
+
+  <section>
+    <title>Drag and drop</title>
+
+    <para>Select two files or two folders in Windows Explorer and drag them to
+    the WinMerge shortcut on your desktop, or into the WinMerge window if it's
+    already open.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/dragndrop-files.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Drag and drop to WinMerge Desktop icon</phrase>
+      </textobject>
+    </mediaobject>
+
+    <note>
+      <para>If you drop only one file or folder into the WinMerge icon or
+      window, WinMerge opens the <xref linkend="sel_targets_dialog" />, where
+      you can specify the other target.</para>
+    </note>
+  </section>
+
+  <section>
+    <title>Windows Explorer context menu shortcuts</title>
+
+    <para>WinMerge has an option that adds a <guimenuitem>WinMerge</guimenuitem>
+    shortcut to the context menu when you select one or two files or folders in
+    Windows Explorer. Choosing the shortcut opens WinMerge and compares the
+    selected items:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/ctx_menu_simple.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Windows Explorer basic context menu integration</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>For even more flexibility, you can replace the basic
+    <guimenuitem>WinMerge</guimenuitem> shortcut with a set of advanced
+    shortcuts. Use these shortcuts to select objects separately, even from
+    different Explorer folders or windows. The next screen shot shows a typical
+    sequence: we choose the first compare target in one Explorer view, then the
+    second target in another Explorer view.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/ctx_menu_advanced_2wins.png"
+                   format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Windows Explorer advanced context menu integration</phrase>
+      </textobject>
+    </mediaobject>
+  </section>
+
+  <section id="sel_targets_dialog">
+    <title>Select Files or Folder dialog</title>
+
+    <para>For maximum flexibility in launching compare operations, click
+    <menuchoice>
+        <guimenu>File</guimenu>
+
+        <guimenuitem>Open</guimenuitem>
+      </menuchoice> in the main WinMerge window to open the Select Files or
+    Folders dialog:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="screenshots/OpenDlg1.png" format="PNG" />
+      </imageobject>
+
+      <textobject>
+        <phrase>Select Files or Folders window</phrase>
+      </textobject>
+    </mediaobject>
+
+    <para>This dialog lets you browse anywhere for the files or folders to
+    compare. Alternatively, you might choose a recently-used file or folder from
+    the <guilabel>Left</guilabel> and <guilabel>Right</guilabel> drop-down
+    controls. You can even drag a file or folder from Windows Explorer into the
+    <guilabel>Left</guilabel> or <guilabel>Right</guilabel> field. A message
+    prompts you if either target is not found, or if you entered a combination
+    of file and folder (WinMerge can't compare files to folders!) in the two
+    fields.</para>
+
+    <para>The dialog contains several options to tailor your compare operation,
+    including these:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term>Filter</term>
+
+        <listitem>
+          <para>Use this option to apply a filter to narrow the scope of the
+          comparison. There two kinds of filters:</para>
+
+          <formalpara>
+            <title>File filters</title>
+
+            <para>include or exclude files that match regular expressions. For
+            example, the expression <code>^test</code> matches files that start
+            with the string, <literal>test</literal>, like
+            <filename>testheaders.h</filename>. WinMerge installs a number of
+            filter files that specify commonly-excluded files for various
+            languages, like C#, C++, and Visual Basic. You can edit these files
+            and, of course, add your own.</para>
+          </formalpara>
+
+          <formalpara>
+            <title>Line filters</title>
+
+            <para>ignore lines <emphasis>within</emphasis> files that match
+            patterns. For example, the expression <code>^[1-5]00</code> ignores
+            lines beginning with numbers <literal>100</literal>,
+            <literal>200</literal>, <literal>300</literal>,
+            <literal>400</literal>, and <literal>500</literal>.</para>
+          </formalpara>
+
+          <para>WinMerge provides the Filters dialog for creating and managing
+          filters.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Include Subfolders</term>
+
+        <listitem>
+          <para>This option lets you control the depth of a folder comparison.
+          Enabling it compares all folder levels, which might take a while if
+          there are a lot of files. Disable it to compare only the top level of
+          the target folders. This is the fastest option, and you can
+          <quote>drill down</quote> into nested folders later in the Compare
+          Folders window.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+
+  <section>
+    <title>Command line</title>
+
+    <para>The WinMerge CLI includes commands with a full set of parameters and
+    options that you can use in a script or Command Prompt window to launch
+    comparisons. This example compares two folders recursively and displays the
+    result in the WinMerge window:</para>
+
+    <para><userinput>WinMergeU <filename>/r C:\folder1</filename> <filename
+    class="directory"><filename>C:\folder2</filename>
+    </filename></userinput></para>
+  </section>
+
+  <section>
+    <title>Version control systems</title>
+
+    <para>If you run TortoiseSVN, TortoiseCVS, or Rational ClearCase, you can
+    configure your version control system to open WinMerge directly. That is, if
+    you compare files using one of these VCS tools, WinMerge opens instead of
+    the tool's native diff utility.</para>
+
+    <note>
+      <para>Another handy VCS integration automatically launches your version
+      control system's checkout dialog whenever you change a managed file in the
+      WinMerge window. This integration works with version control systems that
+      lock files, specifically ClearCase and Visual Source Safe.</para>
+    </note>
+  </section>
+</article>
\ No newline at end of file


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 .. 24 25 26 27 28 .. 163 > >> (Page 26 of 163)