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

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

[<ge...@us...>]

Revision: 7042
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7042&view=rev
Author:   gerundt
Date:     2009-11-21 17:34:05 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Web: Show 404 error if wrong language id was committed - Include the 404 page not work from every place, so send only 404 header for search engines 

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

Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc	2009-11-21 17:22:14 UTC (rev 7041)
+++ trunk/Web/engine/engine.inc	2009-11-21 17:34:05 UTC (rev 7042)
@@ -55,7 +55,7 @@
   }
 
   if (!$translations->isValidLanguageId()) { //if NOT a valid language ID...
-    include('../404.php');
-    exit();
+    header('HTTP/1.1 404 Not Found');
+    header('Status: 404 Not Found');
   }
 ?>
\ 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:[7041] trunk/Web

[<ge...@us...>]

Revision: 7041
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7041&view=rev
Author:   gerundt
Date:     2009-11-21 17:22:14 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Web: Show 404 error if wrong language id was committed

Modified Paths:
--------------
    trunk/Web/404.php
    trunk/Web/engine/engine.inc
    trunk/Web/engine/simpletranslate.inc

Modified: trunk/Web/404.php
===================================================================
--- trunk/Web/404.php	2009-11-21 15:25:38 UTC (rev 7040)
+++ trunk/Web/404.php	2009-11-21 17:22:14 UTC (rev 7041)
@@ -3,7 +3,7 @@
   header('HTTP/1.1 404 Not Found');
   header('Status: 404 Not Found');
 
-  include('engine/engine.inc');
+  include_once('engine/engine.inc');
 
   $page = new Page;
   $page->printHead(__('Error 404 (Page Not Found)'), TAB_HOME);

Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc	2009-11-21 15:25:38 UTC (rev 7040)
+++ trunk/Web/engine/engine.inc	2009-11-21 17:22:14 UTC (rev 7041)
@@ -53,4 +53,9 @@
       echo $translations->translate($text);
     }
   }
+
+  if (!$translations->isValidLanguageId()) { //if NOT a valid language ID...
+    include('../404.php');
+    exit();
+  }
 ?>
\ No newline at end of file

Modified: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc	2009-11-21 15:25:38 UTC (rev 7040)
+++ trunk/Web/engine/simpletranslate.inc	2009-11-21 17:22:14 UTC (rev 7041)
@@ -13,11 +13,41 @@
    * ...
    */
   class SimpleTranslate {
+    /**
+     * URL parameter
+     * @var string
+     * @access private
+     */
     var $_urlparameter;
+    /**
+     * Force URL parameter?
+     * @var bool
+     * @access private
+     */
     var $_forceurlparameter;
+    /**
+     * Languages
+     * @var array
+     * @access private
+     */
     var $_languages;
+    /**
+     * ...
+     * @var string
+     * @access private
+     */
     var $_baselanguageid;
+    /**
+     * ...
+     * @var string
+     * @access private
+     */
     var $_activelanguageid;
+    /**
+     * Translations
+     * @var array
+     * @access private
+     */
     var $_translations;
 
     /**
@@ -34,6 +64,7 @@
 
     /**
      * get the URL parameter...
+     * @return string URL parameter
      */
     function getUrlParameter() {
       return $this->_urlparameter;
@@ -41,6 +72,7 @@
 
     /**
      * set the URL parameter...
+     * @param string $urlparameter URL parameter
      */
     function setUrlParameter($urlparameter) {
       $this->_urlparameter = $urlparameter;
@@ -48,6 +80,10 @@
 
     /**
      * append URL parameter to link...
+     * @param string $link Link
+     * @param string $urlparameter URL parameter
+     * @param string $id Language ID
+     * @return string Link with URL parameter
      */
     function appendUrlParameter($link, $urlparameter, $id = '') {
       $urlparts = parse_url($link);
@@ -110,6 +146,7 @@
 
     /**
      * get forcing of the URL parameter...
+     * @return bool Force URL parameter?
      */
     function getForceUrlParameter() {
       return $this->_forceurlparameter;
@@ -117,6 +154,7 @@
 
     /**
      * set forcing of the URL parameter...
+     * @param bool $force Force URL parameter?
      */
     function setForceUrlParameter($force) {
       $this->_forceurlparameter = $force;
@@ -124,6 +162,9 @@
 
     /**
      * add a language...
+     * @param string $id Language ID
+     * @param string $name Language name
+     * @param string $pofile PO file
      */
     function addLanguage($id, $name, $pofile = '') {
       $id = strtolower($id);
@@ -139,11 +180,22 @@
     }
 
     /**
+     * exists the language?
+     * @param string $id Language ID (in lower case)
+     * @return bool Exists?
+     */
+    function existsLanguage($id) {
+      return array_key_exists($id, $this->_languages);
+    }
+
+    /**
      * get the language...
+     * @param string $id Language ID
+     * @return object Language
      */
     function getLanguage($id) {
       $id = strtolower($id);
-      if (array_key_exists($id, $this->_languages)) { //if the language exists...
+      if ($this->existsLanguage($id)) { //if the language exists...
         return $this->_languages[$id];
       }
       return null;
@@ -151,6 +203,7 @@
 
     /**
      * get the languages...
+     * @return array Languages
      */
     function getLanguages() {
       return $this->_languages;
@@ -158,6 +211,7 @@
 
     /**
      * get the languages count...
+     * @return int Languages count
      */
     function getLanguagesCount() {
       return count($this->_languages);
@@ -165,6 +219,7 @@
 
     /**
      * get the base language ID...
+     * @return string Base language ID
      */
     function getBaseLanguageId() {
       return $this->_baselanguageid;
@@ -172,6 +227,7 @@
 
     /**
      * get the base language...
+     * @return object Base language
      */
     function getBaseLanguage() {
       return $this->_languages[$this->_baselanguageid];
@@ -179,6 +235,8 @@
 
     /**
      * check if the language is the base language...
+     * @param object $language Language
+     * @return bool Is base language?
      */
     function isBaseLanguage($language = null) {
       if (isset($language)) { //if language committed...
@@ -196,6 +254,7 @@
 
     /**
      * get the active language ID...
+     * @return string Active language ID
      */
     function getActiveLanguageId() {
       if ($this->_activelanguageid != '') {
@@ -206,6 +265,7 @@
 
     /**
      * get the active language...
+     * @return object Active language
      */
     function getActiveLanguage() {
       if ($this->_activelanguageid != '') {
@@ -216,12 +276,14 @@
 
     /**
      * set the active language...
+     * @param string $id Language ID
+     * @return bool Successful?
      */
-    function setActiveLanguage($activelanguage) {
-      $activelanguage = strtolower($activelanguage);
-      if (array_key_exists($activelanguage, $this->_languages)) { //if the language exists...
-        $this->_activelanguageid = $activelanguage;
-        $language = $this->_languages[$activelanguage];
+    function setActiveLanguage($id) {
+      $id = strtolower($id);
+      if ($this->existsLanguage($id)) { //if the language exists...
+        $this->_activelanguageid = $id;
+        $language = $this->_languages[$id];
         $this->_translations = $language->getTranslations();
         return true;
       }
@@ -230,6 +292,8 @@
 
     /**
      * check if the language is the active language...
+     * @param object $language Language
+     * @return bool Is active language?
      */
     function isActiveLanguage($language) {
       if ($language == $this->getActiveLanguage()) { //if active language...
@@ -239,7 +303,28 @@
     }
 
     /**
+     * check if the language ID is valid...
+     * @param string $id Language ID
+     * @return bool Is valid language ID?
+     */
+    function isValidLanguageId($id = null) {
+      if (isset($id)) { //if language ID committed...
+        if (!empty($id)) { //if language ID NOT empty...
+          return $this->existsLanguage(strtolower($id));
+        }
+        return false;
+      }
+      else { //if language ID NOT committed...
+        if (isset($_GET[$this->_urlparameter])) {
+          return $this->existsLanguage(strtolower($_GET[$this->_urlparameter]));
+        }
+        return true;
+      }
+    }
+
+    /**
      * detect the language from the url...
+     * @return bool Detected?
      */
     function detectLanguageFromUrl() {
       if (isset($_GET[$this->_urlparameter])) {
@@ -250,6 +335,7 @@
 
     /**
      * detect the language from the browser...
+     * @return bool Detected?
      */
     function detectLanguageFromBrowser() {
       if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
@@ -258,7 +344,7 @@
           $tmp = split(';', $accepted_language);
           
           $lang_id = strtolower($tmp[0]);
-          if (array_key_exists($lang_id, $this->_languages)) { //if the language exists...
+          if ($this->existsLanguage($lang_id)) { //if the language exists...
             $this->_activelanguageid = $lang_id;
             $language = $this->_languages[$lang_id];
             $this->_translations = $language->getTranslations();
@@ -271,6 +357,8 @@
 
     /**
      * prepare link...
+     * @param string $link Link
+     * @return string Prepared link
      */
     function prepareLink($link) {
       $activelanguage = $this->getActiveLanguage();
@@ -284,6 +372,9 @@
 
     /**
      * get the language link...
+     * @param object $language Language
+     * @param bool $forceurlparameter Force URL parameter?
+     * @return string Language link
      */
     function getLink($language = null, $forceurlparameter = null) {
       $phpself = str_replace('index.php', '', $_SERVER['PHP_SELF']);
@@ -301,6 +392,8 @@
 
     /**
      * translate a text...
+     * @param string $text Untranslated text
+     * @return string Translated text
      */
     function translate($text) {
       $text = str_replace("\r", '', $text);
@@ -319,12 +412,30 @@
    * ...
    */
   class SimpleTranslateLanguage {
+    /**
+     * ID
+     * @var string
+     * @access private
+     */
     var $_id;
+    /**
+     * Name
+     * @var string
+     * @access private
+     */
     var $_name;
+    /**
+     * PO file
+     * @var string
+     * @access private
+     */
     var $_pofile;
 
     /**
      * Constructor
+     * @param string $id ID
+     * @param string $name Name
+     * @param string $pofile PO file
      */
     function SimpleTranslateLanguage($id, $name, $pofile) {
       $this->_id = $id;
@@ -334,6 +445,7 @@
 
     /**
      * get the language id...
+     * @return string ID
      */
     function getId() {
       return $this->_id;
@@ -341,6 +453,7 @@
 
     /**
      * get the language name...
+     * @return string Name
      */
     function getName() {
       return $this->_name;
@@ -348,6 +461,7 @@
 
     /**
      * get the language PO file...
+     * @return string PO file
      */
     function getPoFile() {
       return $this->_pofile;
@@ -355,6 +469,7 @@
 
     /**
      * get the translations array...
+     * @return array Translations
      */
     function getTranslations() {
       $translations = array();
@@ -416,6 +531,8 @@
 
     /**
      * Constructor
+     * @param string $id ID
+     * @param string $name Name
      */
     function SimpleTranslateBaseLanguage($id, $name) {
       $this->_id = $id;
@@ -425,6 +542,7 @@
 
     /**
      * get the translations array...
+     * @return array Translations
      */
     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:[7040] trunk/Translations/Web/ja.po

[<ge...@us...>]

Revision: 7040
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7040&view=rev
Author:   gerundt
Date:     2009-11-21 15:25:38 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Fix meta data in Japanese web translation

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

Modified: trunk/Translations/Web/ja.po
===================================================================
--- trunk/Translations/Web/ja.po	2009-11-21 15:09:08 UTC (rev 7039)
+++ trunk/Translations/Web/ja.po	2009-11-21 15:25:38 UTC (rev 7040)
@@ -1,6 +1,9 @@
 # This file is part from WinMerge <http://winmerge.org/>
 # Released under the "GNU General Public License"
 #
+# Translators:
+# * Takashi Sawanaka <sawanaka at d1.dion.ne.jp>
+#
 # ID line follows -- this is updated by SVN
 # $Id$
 #
@@ -11,11 +14,11 @@
 "POT-Creation-Date: 2009-08-29 17:42+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n"
-"Language-Team: English <win...@li...>\n"
+"Language-Team: Japanese <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-Language: Japanese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: ../../Web/\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:[7039] trunk

[<ge...@us...>]

Revision: 7039
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7039&view=rev
Author:   gerundt
Date:     2009-11-21 15:09:08 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Fix wrong language code from Swedish web translation

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

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

Removed Paths:
-------------
    trunk/Translations/Web/se.po

Deleted: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po	2009-11-21 14:27:13 UTC (rev 7038)
+++ trunk/Translations/Web/se.po	2009-11-21 15:09:08 UTC (rev 7039)
@@ -1,1868 +0,0 @@
-# This file is part from WinMerge <http://winmerge.org/>
-# Released under the "GNU General Public License"
-#
-# Maintainer:
-# * Hans Eriksson <hans.ericson at bredband.net>
-#
-# 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-31 00:43+0100\n"
-"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
-"Language-Team: Swedish <win...@li...>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Swedish\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: ../../Web/\n"
-
-#: about\screenshots\index.php:26
-#, c-format
-msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
-msgstr "Många gånger är det användbart att se exakta skillnader i rader. WinMerge kan markera olika områden mellan rader."
-
-#: 404.php:13
-#, c-format
-msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
-msgstr "Denna hemsida har nyligen genomgått en stor omarbetning, så det kan förklara varför du får denna sida istället"
-
-#: 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 "Ändringsloggen är inte nu tillgänglig..."
-
-#: downloads\index.php:55
-#, c-format
-msgid "Requirements"
-msgstr "Systemkrav"
-
-#: 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 "Källkoden finns hos <a href=\"%1$s\">SourceForge.net</a> i ett <a href=\"%2$s\">Subversion</a> arkiv."
-
-#: about\license.php:35
-#, c-format
-msgid "Open Source Software"
-msgstr "Open Source programvara"
-
-#: support\mailing-lists.php:72
-#, c-format
-msgid "High Traffic"
-msgstr "Hög trafik"
-
-#: index.php:13
-#, c-format
-msgid "What is WinMerge?"
-msgstr "Vad är WinMerge?"
-
-#: support\index.php:15
-#, c-format
-msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
-msgstr "Bra information i en felrapport gör det mer sannorlikt att ditt fel fixas snabbt."
-
-#: about\index.php:30
-#, c-format
-msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
-msgstr "Flexibel editor med syntaxmarkering, radnummer och ordbrytning"
-
-#: about\index.php:22
-#, c-format
-msgid "Handles Windows, Unix and Mac text file formats"
-msgstr "Hanterar Windows, Unix och Mac textfilformat"
-
-#: engine\page.inc:324
-#: support\tracker-shortcuts.php:7
-#: support\tracker-shortcuts.php:9
-#, c-format
-msgid "Tracker Shortcuts"
-msgstr "Trackergenvägar"
-
-#: engine\page.inc:310
-#, c-format
-msgid "WinMerge Change Log"
-msgstr "WinMerges versionshistoria"
-
-#: about\screenshots\index.php:27
-#: about\screenshots\index.php:28
-#, c-format
-msgid "Location Pane"
-msgstr "Skillnadsfält"
-
-#: translations\translations.inc:177
-#, c-format
-msgid "Template"
-msgstr "Förlaga"
-
-#: links.php:27
-#, c-format
-msgid "Good site devoted for regular expressions"
-msgstr ""
-
-#: index.php:45
-#, c-format
-msgid "Developers"
-msgstr "Utvecklare"
-
-#: about\index.php:39
-#, c-format
-msgid "Regular Expression based file filters allow excluding and including items"
-msgstr "Reguljärt uttryck baserade filfilter tillåter exkluderade och inkluderade objekt"
-
-#: downloads\index.php:59
-#, c-format
-msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
-msgstr "Microsoft Visual C++ 2003 Körkomponenter (inkluderade i installationsprogrammet)"
-
-#: translations\status_branch.php:18
-#: translations\status_trunk.php:18
-#, c-format
-msgid "The translations status is currently not available..."
-msgstr "Översättningsstatusen är nu inte tillgänglig..."
-
-#: engine\page.inc:306
-#, c-format
-msgid "WinMerge Manual"
-msgstr "WinMerge manual"
-
-#: engine\page.inc:321
-#, c-format
-msgid "WinMerge Discussion Forums"
-msgstr "WinMerges Diskussionsforum"
-
-#: about\license.php:5
-#, c-format
-msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
-msgstr "WinMerge är ett Open Source program under GNU General Public License. Detta betyder att alla kan ladda ner källkoden och förbättra och ändra i den."
-
-#: downloads\pad-file.php:90
-#, c-format
-msgid "Company"
-msgstr "Företag"
-
-#: support\mailing-lists.php:13
-#: support\mailing-lists.php:30
-#, c-format
-msgid "Support List"
-msgstr "Supportlista"
-
-#: engine\page.inc:317
-#, c-format
-msgid "WinMerge PAD File"
-msgstr "WinMerge PAD-fil"
-
-#: engine\engine.inc:21
-#, c-format
-msgid "French"
-msgstr "Franska"
-
-#: translations\instructions.php:15
-#, c-format
-msgid "Source: %s"
-msgstr "Källa: %s"
-
-#: downloads\plugins.php:6
-#, c-format
-msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
-msgstr "WinMerge, gratis, ladda ner,plugins, plugin,plug-in,setup, installerare, program,7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF "
-
-#: links.php:31
-#, c-format
-msgid "Regular expressions tutorial"
-msgstr ""
-
-#: support\tracker-shortcuts.php:55
-#, c-format
-msgid "Subdomains"
-msgstr "Subdomäner"
-
-#: about\history.php:45
-#, c-format
-msgid "Withdrawn due to installer bug!"
-msgstr "Indragen pga installationsprogramfel!"
-
-#: translations\index.php:40
-#, c-format
-msgid "Unstable Version (Trunk)"
-msgstr "Instabil version (Trunk)"
-
-#: about\screenshots\index.php:32
-#, c-format
-msgid "WinMerge 2.8 has a new professional looking splash screen."
-msgstr "WinMerge 2.8 har en ny, professionell startbild."
-
-#: about\index.php:42
-#, c-format
-msgid "Can show folder compare results in a tree-style view"
-msgstr "Kan visa katalogjämförelseresultat i ett trädfönster"
-
-#: 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 "Utöver detta, har WinMerge många hjälpsamma funktioner som gör jämförande, synkronisering, och ihopläggning så enkel och användbar som möjligt:"
-
-#: support\mailing-lists.php:22
-#: support\mailing-lists.php:52
-#, c-format
-msgid "Low Traffic"
-msgstr "Låg trafik"
-
-#: about\index.php:27
-#, c-format
-msgid "File Compare"
-msgstr "Filjämförelse"
-
-#: support\mailing-lists.php:27
-#, c-format
-msgid "This list is only for announcing new releases of WinMerge."
-msgstr "Denna lista är bara för att annonsera nya releaser av WinMerge."
-
-#: 404.php:19
-#, c-format
-msgid "<a href=\"%s\">Documentation</a>?"
-msgstr "<a href=\"%s\">Dokumentation</a>?"
-
-#: engine\page.inc:329
-#, c-format
-msgid "WinMerge Translations Instructions"
-msgstr "WinMerges översättningsinstruktioner"
-
-#: downloads\pad-file.php:78
-#, c-format
-msgid "Icon"
-msgstr "Ikon"
-
-#: support\mailing-lists.php:32
-#: support\mailing-lists.php:42
-#: support\mailing-lists.php:62
-#, c-format
-msgid "Normal Traffic"
-msgstr "Normal trafik"
-
-#: downloads\index.php:28
-#: downloads\index.php:34
-#: downloads\plugins.php:22
-#: downloads\source-code.php:18
-#, c-format
-msgid "7z-Format (%s MB)"
-msgstr "7z-Format (%s MB)"
-
-#: about\license.php:34
-#, c-format
-msgid "GNU General Public License v2.0"
-msgstr "GNU General Public Licens v2.0"
-
-#: about\index.php:71
-#, c-format
-msgid "Installation"
-msgstr "Installation"
-
-#: downloads\source-code.php:15
-#, c-format
-msgid "WinMerge %s - Source Code"
-msgstr "WinMerge %s - källkod"
-
-#: about\index.php:58
-#, c-format
-msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
-msgstr "<a href=\"%s\">Onlinemanual</a> och installerad HTML-hjälpmanual"
-
-#: engine\page.inc:324
-#, c-format
-msgid "WinMerge Tracker Shortcuts"
-msgstr "WinMerge Trackergenvägar"
-
-#: support\tracker-shortcuts.php:10
-#, c-format
-msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
-msgstr "<em>Trackergenvägar</em> är kortare och vackrare URLer till <a href=\"%1$s\">Tracker</a> objekt från vår <a href=\"%2$s\">SF.net projektsida</a>."
-
-#: downloads\pad-file.php:10
-#, c-format
-msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
-msgstr "Det enklaste sättet att få information om den senaste stabila versionen av WinMerge för din hemsida är den <a href=\"%s\">Portabla Applikation Deskriptions</a> -filen, som du kan finna här:"
-
-#: 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 "Prenumerera eller avbryt prenumeration på en av följande mailinglistor: Annonsering, Support, Användare, Översätt, Utveckling och SVN"
-
-#: about\screenshots\index.php:20
-#, c-format
-msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
-msgstr "Katalogjämförelse visar alla filer och underkataloger funna från jämförda kataloger som en lista. Katalogjämförelse tillåter synkronisering av kataloger genom att kopiera och ta bort filer och underkataloger. Katalogjämförelseutseendet kan bli versantilt anpassat."
-
-#: engine\page.inc:276
-#: engine\page.inc:320
-#, 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 "Vi kräver registrering eftersom anonyma bidrag skapade mycket spam men även eftersom det inte fanns någon möjlighet att kontakta människor och fråga efter mer information."
-
-#: engine\page.inc:322
-#: support\mailing-lists.php:7
-#: support\mailing-lists.php:9
-#, c-format
-msgid "Mailing Lists"
-msgstr "Mailinglistor"
-
-#: about\index.php:41
-#, c-format
-msgid "Compares one folder or includes all subfolders"
-msgstr "Jämför en katalog eller inkluderar alla underkataloger"
-
-#: 404.php:12
-#, c-format
-msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
-msgstr "Av någon anledning (felstavad URL, felaktig referens från en annan hemsida, för gammal sökmotorlistning eller vi har bara tait bort en fil) kunde sidan du letade efter inte hittas."
-
-#: index.php:19
-#: about\index.php:11
-#, c-format
-msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr "WinMerge är ett <a href=\"%s\">Open Source</a> skillnads och hopläggningsverktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är enkelt att förstå och hantera."
-
-#: 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 "Vi skickar sällan direkta email men du får notifikationer när vi ställer frågor om fel."
-
-#: downloads\index.php:25
-#: downloads\plugins.php:20
-#, c-format
-msgid "Binaries"
-msgstr "Binärfiler"
-
-#: docs\releasenotes.php:11
-#, c-format
-msgid "The release notes are currently not available..."
-msgstr "Releasenoteringarna är nu inte tillgängliga..."
-
-#: engine\page.inc:309
-#, c-format
-msgid "WinMerge Known Issues"
-msgstr "Kända WinMerge problem"
-
-#: about\index.php:76
-#, c-format
-msgid "Using WinMerge"
-msgstr "Använda WinMerge"
-
-#: downloads\index.php:53
-#, c-format
-msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
-msgstr "Du kan även ladda ner ytterliggare <a href=\"%1$s\">plugins</a> och hela <a href=\"%2$s\">källkoden</a> från WinMerge."
-
-#: support\mailing-lists.php:57
-#, c-format
-msgid "This list is used for coordinating the translations."
-msgstr "Denna lista används för att koordinera översättningarna."
-
-#: links.php:6
-#: about\license.php:30
-#: engine\page.inc:295
-#, c-format
-msgid "Links"
-msgstr "Länkar"
-
-#: index.php:49
-#, c-format
-msgid "The WinMerge Development Team"
-msgstr "WinMerges utvecklingsteam"
-
-#: support\tracker-shortcuts.php:15
-#, c-format
-msgid "Support Request"
-msgstr "Supportäskande"
-
-#: links.php:18
-#, c-format
-msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
-msgstr ""
-
-#: links.php:22
-#, c-format
-msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
-msgstr ""
-
-#: support\tracker-shortcuts.php:16
-#, c-format
-msgid "Feature Request"
-msgstr "Funktionsäskande"
-
-#: support\index.php:11
-#, c-format
-msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
-msgstr "<a href=\"%s\">Det öppna diskussionsforumet</a> är snabbaste sättet att få hjälp. Var god och var tålmodig, det kan ta lite tid för någon att svara."
-
-#: about\index.php:31
-#, c-format
-msgid "Highlights differences inside lines"
-msgstr "Markera skillnader i rader"
-
-#: 404.php:28
-#, c-format
-msgid "<a href=\"%s\">Translations</a>?"
-msgstr "<a href=\"%s\">Översättningar</a>?"
-
-#: translations\translations.inc:38
-#, c-format
-msgid "File not valid."
-msgstr "Filen är felaktig."
-
-#: about\screenshots\index.php:6
-#, c-format
-msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
-msgstr "WinMerge, skärmdumpar, filjämförelse, öppna-dialog, katalogjämförelseresultat, markera radskillnad, skillnadsfält, startskärm"
-
-#: downloads\pad-file.php:72
-#, c-format
-msgid "Web Addresses"
-msgstr "Webaddresser"
-
-#: engine\page.inc:330
-#, c-format
-msgid "WinMerge Translations Status (Stable Branch)"
-msgstr "WinMerge Översättningsstatus (Stabil gren)"
-
-#: 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 "För mer information, var god se <a href=\"%1$s\">Installationssektionen</a> av <a href=\"%2$s\">Manualen</a>."
-
-#: about\index.php:32
-#, c-format
-msgid "Difference pane shows current difference in two vertical panes"
-msgstr "Skillnadsfältet visar aktuella skillnader i två vertikala fält"
-
-#: engine\page.inc:329
-#, c-format
-msgid "Instructions"
-msgstr "Instruktioner"
-
-#: index.php:27
-#, c-format
-msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
-msgstr "<a href=\"%1$s\">WinMerge %2$s</a> är den senaste stabila versionen, och är rekommenderad för de flesta användare."
-
-#: 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 "Utöver detta är, WinMerge översatt till ett antal olika språk. Se vår <a href=\"%s\">information om översättning av WinMerge</a> till ditt eget språk."
-
-#: engine\engine.inc:19
-#: translations\index.php:24
-#, c-format
-msgid "English"
-msgstr "Engelska"
-
-#: 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 "Önskningar i <a href=\"%s\">funktionsäskandelistan</a> kommer också i åtanke, men vi ger absolut inga löften."
-
-#: engine\engine.inc:24
-#, c-format
-msgid "Swedish"
-msgstr "Svenska"
-
-#: engine\page.inc:294
-#: engine\page.inc:299
-#: engine\page.inc:305
-#: engine\page.inc:320
-#: engine\page.inc:328
-#, c-format
-msgid "Index"
-msgstr "Index"
-
-#: downloads\plugins.php:10
-#, c-format
-msgid "7-Zip Plugin"
-msgstr "7-Zip Plugin"
-
-#: index.php:20
-#, c-format
-msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
-msgstr "<a href=\"%1$s\">Lär dig mer</a> eller <a href=\"%2$s\">Ladda ner nu!</a>"
-
-#: translations\index.php:11
-#, c-format
-msgid "We currently have WinMerge translated into the languages listed below:"
-msgstr "Vi har nu översatt WinMerge till de språk som listas nedan:"
-
-#: 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 "Du kan hitta en mer teknisk beskrivning av <a href=\"%1$s\">översättningssystemet</a> i vår <a href=\"%2$s\">Utvecklings-Wiki</a>."
-
-#: translations\translations.inc:131
-#: translations\translations.inc:288
-#: translations\translations_branch.inc:66
-#: translations\translations_branch.inc:182
-#, c-format
-msgid "Language"
-msgstr "Språk"
-
-#: support\mailing-lists.php:12
-#: support\mailing-lists.php:20
-#, c-format
-msgid "Announce List"
-msgstr "Annonseringslista"
-
-#: engine\page.inc:331
-#, c-format
-msgid "Status (Unstable Trunk)"
-msgstr "Status (Instabil Trunk)"
-
-#: engine\page.inc:275
-#, c-format
-msgid "WinMerge Downloads"
-msgstr "WinMerge nerladdning"
-
-#: downloads\index.php:70
-#, c-format
-msgid "Japanese WinMerge Version"
-msgstr "Japansk WinMerge-version"
-
-#: engine\page.inc:323
-#, c-format
-msgid "Tracker"
-msgstr "Tracker"
-
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:16
-#: engine\page.inc:310
-#, c-format
-msgid "Change Log"
-msgstr "Versionshistoria"
-
-#: support\tracker-shortcuts.php:13
-#, c-format
-msgid "Bug"
-msgstr "Fel"
-
-#: links.php:43
-#: downloads\index.php:69
-#, c-format
-msgid "WinMerge Portable"
-msgstr "WinMerge Portabel"
-
-#: translations\translations.inc:83
-#: translations\translations_branch.inc:51
-#, c-format
-msgid "Fuzzy: %d%%"
-msgstr "Oklar: %d%%"
-
-#: docs\changelog.php:5
-#, c-format
-msgid "The change log is a more complete list of changes in the last WinMerge releases."
-msgstr "Ändringsloggen är en mer komplett lista på ändringar i den senaste WinMerge releasen"
-
-#: 404.php:15
-#, c-format
-msgid "Were you looking for..."
-msgstr "Letade du efter..."
-
-#: about\index.php:19
-#, c-format
-msgid "General"
-msgstr "Generellt"
-
-#: downloads\pad-file.php:48
-#, c-format
-msgid "Type"
-msgstr "Typ:"
-
-#: links.php:40
-#, c-format
-msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
-msgstr ""
-
-#: engine\page.inc:311
-#, c-format
-msgid "WinMerge Development Wiki"
-msgstr "WinMerge Utvecklings-Wiki"
-
-#: downloads\index.php:15
-#, c-format
-msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
-msgstr "Den aktuella WinMerge versionen är <strong>%1$s</strong> och den släpptes <strong>%2$s</strong>."
-
-#: about\index.php:21
-#, c-format
-msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
-msgstr "Stöder Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
-
-#: 404.php:22
-#, c-format
-msgid "<a href=\"%s\">Release Notes</a>?"
-msgstr "<a href=\"%s\">Releasenoteringar</a>?"
-
-#: engine\page.inc:307
-#, c-format
-msgid "WinMerge Quick Tour"
-msgstr ""
-
-#: 404.php:11
-#, c-format
-msgid "Page Not Found..."
-msgstr "Sida hittades inte..."
-
-#: links.php:29
-#, c-format
-msgid "Good HOWTO document for regular expressions"
-msgstr ""
-
-#: index.php:16
-#, c-format
-msgid "More Screenshots&hellip;"
-msgstr "Mera skärmdumpar&hellip;"
-
-#: about\index.php:48
-#, c-format
-msgid "Resolve conflict files"
-msgstr "Lös konfliktfiler"
-
-#: engine\page.inc:275
-#, c-format
-msgid "Downloads"
-msgstr "Filer"
-
-#: engine\page.inc:277
-#: translations\index.php:8
-#: translations\index.php:10
-#, c-format
-msgid "Translations"
-msgstr "Översättningar"
-
-#: links.php:35
-#, c-format
-msgid "Miscellaneous"
-msgstr ""
-
-#: support\index.php:38
-#, c-format
-msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
-msgstr "Eftersom WinMerge är ett <a href=\"%s\">Open Source</a> projekt, kan du använda det gratis."
-
-#: translations\translations.inc:81
-#: translations\translations_branch.inc:49
-#, c-format
-msgid "Translated: %d%%"
-msgstr "Översatt: %d%%"
-
-#: engine\page.inc:296
-#, c-format
-msgid "Project Page"
-msgstr "Projektsida"
-
-#: about\index.php:7
-#: about\index.php:10
-#: engine\page.inc:273
-#: engine\page.inc:299
-#, c-format
-msgid "About WinMerge"
-msgstr "Om WinMerge"
-
-#: engine\page.inc:277
-#: engine\page.inc:328
-#, c-format
-msgid "WinMerge Translations"
-msgstr "WinMerge Översättningar"
-
-#: downloads\pad-file.php:6
-#, c-format
-msgid "WinMerge, PAD file, Portable Application Description"
-msgstr "WinMerge, PAD- filen, Portabla Applikation Deskriptionen"
-
-#: downloads\pad-file.php:40
-#, c-format
-msgid "Release Status"
-msgstr "Releasestatus"
-
-#: engine\page.inc:323
-#, c-format
-msgid "WinMerge Tracker"
-msgstr "WinMerge Tracker"
-
-#: 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 "Denna lista är för användarrelaterade frågor. Genom att ha frågor postade till denna lista kan  andra som har samma problem lösa det själv."
-
-#: 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 "Ladda ner den aktuella WinMerge versionen %1$s, som släpptes %2$s. För detaljerad information om vad som är nytt, läs ändringsloggen och releasenoteringarna."
-
-#: docs\index.php:12
-#: engine\page.inc:307
-#, c-format
-msgid "Quick Tour"
-msgstr ""
-
-#: translations\index.php:29
-#, c-format
-msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>&#8594; <span class=\"guimenuitem\">Language</span> menu choice."
-msgstr "För att ändra språk, välj det önskade språket från <span class=\"guimenu\">Visa</span>&#8594; <span class=\"guimenuitem\">Språk</span> menyvalet."
-
-#: translations\translations.inc:136
-#: translations\translations_branch.inc:71
-#, c-format
-msgid "Last Update"
-msgstr "Senaste uppdateringen"
-
-#: engine\page.inc:316
-#, c-format
-msgid "Source Code"
-msgstr "Källkod"
-
-#: about\screenshots\index.php:21
-#: about\screenshots\index.php:22
-#, c-format
-msgid "Folder Compare Tree View"
-msgstr "Katalogjämförelse trädfönster"
-
-#: 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: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 "Trackergenvägar är kortare och vackrare URLer till Trackerobjekt från vår SF.net projektsida. Och du kan använda denna sida för att skapa en genväg."
-
-#: support\tracker-shortcuts.php:18
-#, c-format
-msgid "Tracker Item"
-msgstr "Trackerobjekt"
-
-#: links.php:24
-#, c-format
-msgid "Regular expressions"
-msgstr ""
-
-#: translations\translations_branch.inc:183
-#, c-format
-msgid "Translator(s)"
-msgstr "Översättare"
-
-#: 404.php:21
-#, c-format
-msgid "<a href=\"%s\">Manual</a>?"
-msgstr "<a href=\"%s\">Manualen</a>?"
-
-#: docs\index.php:7
-#: docs\index.php:9
-#: engine\page.inc:274
-#, c-format
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#: about\history.php:19
-#: docs\index.php:10
-#: engine\page.inc:306
-#, c-format
-msgid "Manual"
-msgstr "Manual"
-
-#: index.php:8
-#: index.php:30
-#, c-format
-msgid "Project News"
-msgstr "Projekt-nyheter"
-
-#: links.php:20
-#, c-format
-msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
-msgstr ""
-
-#: about\license.php:6
-#, c-format
-msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
-msgstr "WinMerge, licens, Open Source, GNU General Public License, GPL, fri programvara"
-
-#: downloads\pad-file.php:94
-#, c-format
-msgid "Contact"
-msgstr "Kontakta"
-
-#: downloads\index.php:40
-#: downloads\source-code.php:24
-#, c-format
-msgid "SHA-1 Checksums"
-msgstr "SHA-1 kontrollsummor"
-
-#: engine\page.inc:242
-#, c-format
-msgid "Version %1$s; %2$s MB"
-msgstr "Version %1$s; %2$s MB"
-
-#: links.php:42
-#, c-format
-msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
-msgstr ""
-
-#: support\tracker-shortcuts.php:23
-#, c-format
-msgid "Type:"
-msgstr "Typ:"
-
-#: support\tracker-shortcuts.php:6
-#, c-format
-msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
-msgstr "WinMerge, Tracker, genvägar, sourceforge, projektsida, fel, patch, supportäskande, funktionsäskande, att göra objekt"
-
-#: links.php:38
-#, c-format
-msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
-msgstr ""
-
-#: downloads\plugins.php:32
-#, c-format
-msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
-msgstr "För mer detaljer och nerladdning gå till <a href=\"%s\">xdocdiff plugin hemsidan</a>."
-
-#: translations\index.php:39
-#, c-format
-msgid "Stable Version (Branch)"
-msgstr "Stabil version (Gren)"
-
-#: translations\translations_branch.inc:104
-#, c-format
-msgid "English (Template)"
-msgstr "Engelsk (Förlaga)"
-
-#: engine\page.inc:295
-#, c-format
-msgid "WinMerge Links"
-msgstr "WinMerge Länkar"
-
-#: about\screenshots\index.php:29
-#, c-format
-msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
-msgstr "Skillnadsfältet är en användbar sidopanel som visar en översiktlig (skillnads) bild på jämförda filer"
-
-#: docs\index.php:5
-#, c-format
-msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
-msgstr "Documentation från WinMerge som manual, releasenoteringar, ändringslog och utvecklings-Wiki."
-
-#: docs\index.php:17
-#, c-format
-msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
-msgstr "<a href=\"%s\">Ändringsloggen</a> är en mer komplett lista på ändringar i den senaste WinMerge releasen."
-
-#: engine\page.inc:315
-#, c-format
-msgid "Download WinMerge Plugins"
-msgstr "Ladda ner WinMerge Plugins"
-
-#: engine\page.inc:331
-#, c-format
-msgid "WinMerge Translations Status (Unstable Trunk)"
-msgstr "WinMerge Översättningsstatus (Instabil Trunk)"
-
-#: docs\index.php:19
-#, c-format
-msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
-msgstr "<a href=\"%s\">Utvecklings-Wiki</a> innehåller mycket information om WinMerge-utveckling."
-
-#: 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 "För detaljerad information om vad som är nytt, läs <a href=\"%1$s\">ändringsloggen</a> och <a href=\"%2$s\">releasenoteringarna</a>."
-
-#: support\mailing-lists.php:77
-#, c-format
-msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
-msgstr "Prenumeranter av denna lista får noter om varje kodändring tillhandahållen till Subversion"
-
-#: links.php:44
-#, c-format
-msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
-msgstr ""
-
-#: index.php:47
-#, c-format
-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 "Om du är intresserad att bidra med arbete i projektet, se vår <a href=\"%s\">utvecklingssida</a> för mer information om hur du kan bidra."
-
-#: downloads\plugins.php:7
-#: downloads\plugins.php:9
-#, c-format
-msgid "Download Plugins"
-msgstr "Ladda ner Plugins"
-
-#: downloads\pad-file.php:58
-#: downloads\pad-file.php:60
-#: downloads\pad-file.php:62
-#, c-format
-msgid "English Description (%d chars)"
-msgstr "Engelsk beskrivning (%d tecken)"
-
-#: about\index.php:29
-#, c-format
-msgid "Visual differencing and merging of text files"
-msgstr "Visuell urskillnad och ihopläggande av textfiler"
-
-#: engine\page.inc:296
-#, c-format
-msgid "WinMerge Project Page"
-msgstr "WinMerge Projektsida"
-
-#: downloads\index.php:60
-#, c-format
-msgid "Admin rights for the installer"
-msgstr "Administrationrättigheter för installationsprogrammet"
-
-#: downloads\plugins.php:28
-#, c-format
-msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
-msgstr "Du kan också läsa <a href=\"%1$s\">Releasenoteringarna</a> eller leta efter <a href=\"%2$s\">andra versioner</a>."
-
-#: engine\page.inc:300
-#, c-format
-msgid "WinMerge Screenshots"
-msgstr "WinMerge skärmdumpar"
-
-#: downloads\pad-file.php:42
-#, c-format
-msgid "Download"
-msgstr "Ladda ner"
-
-#: downloads\index.php:20
-#: downloads\plugins.php:15
-#, c-format
-msgid "Installer"
-msgstr "Installationsprogram"
-
-#: 404.php:26
-#, c-format
-msgid "<a href=\"%s\">Downloads</a>?"
-msgstr "<a href=\"%s\">Filer</a>?"
-
-#: about\index.php:64
-#: about\screenshots\index.php:7
-#: about\screenshots\index.php:9
-#: engine\page.inc:300
-#, c-format
-msgid "Screenshots"
-msgstr "Skärmdumpar"
-
-#: links.php:30
-#, c-format
-msgid "Tutorial"
-msgstr ""
-
-#: about\index.php:78
-#, c-format
-msgid "Here is the current <a href=\"%s\">change log</a>."
-msgstr "Här är den aktuella <a href=\"%s\">ändringsloggen</a>."
-
-#: support\tracker-shortcuts.php:11
-#, c-format
-msgid "You can use this page to create a shortcut:"
-msgstr "Du kan använda denna sida för att skapa en genväg:"
-
-#: downloads\pad-file.php:5
-#, c-format
-msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
-msgstr "Det enklaste sättet att få information om den senaste stabila versionen av WinMerge för din hemsida är den Portabla Applikation Deskriptions-filen, som du kan finna här:"
-
-#: translations\translations.inc:41
-#, c-format
-msgid "File not found."
-msgstr "Filen hittades inte."
-
-#: downloads\index.php:9
-#: downloads\index.php:73
-#, c-format
-msgid "Project File Releases"
-msgstr "Projektfil-releaser"
-
-#: 404.php:9
-#, c-format
-msgid "Error 404 (Page Not Found)"
-msgstr "Fel 404 (Sida hittades inte)"
-
-#: 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 "Det enklaste sättet att installera WinMerge är att ladda ner och köra installationsprogrammet. Läs <a href=\"%s\">onlinemanualen</a> för hjälp att använda den."
-
-#: 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 "I trädfönstret, är kataloger expanderbara och imploderbara, innehållande filer och underkataloger. Detta är användbart för enkel navigation i djupt liggande katalogstrukturer. <em>Trädfönstret är bara tillgändligt i rekursiva jämförelser."
-
-#: index.php:42
-#: downloads\pad-file.php:96
-#: engine\page.inc:276
-#: 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 "Ladda bara ner <a href=\"%s\">installationsprogrammet</a> och dubbelklicka på det."
-
-#: 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 "Du kan <a href=\"%1$s\">titta på källkoden</a> med en webläsare eller du kan hämta hela källkoden genom att klicka på en av följande länkar (om du har <a href=\"%2$s\">TortoiseSVN</a> installerad):"
-
-#: downloads\source-code.php:5
-#, c-format
-msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
-msgstr "Ladda ner källkoden för WinMerge, som är släppt under GNU General Public licensen."
-
-#: 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 "Översatt"
-
-#: index.php:46
-#, c-format
-msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
-msgstr "WinMerge är ett Open Source-projekt, vilket betyder att programmet är underhållet och utvecklat av frivilliga."
-
-#: about\index.php:24
-#, c-format
-msgid "Tabbed interface"
-msgstr "Tabbgränssnitt"
-
-#: about\index.php:33
-#, c-format
-msgid "Location pane shows map of files compared"
-msgstr "Skillnadsfält visar en karta på jämförda filer"
-
-#: about\screenshots\index.php:17
-#, c-format
-msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
-msgstr "WinMerge tillåter val/öppning av sökvägar på olika sätt. Att använda Öppna-dialogen är bara ett av dem."
-
-#: 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 "För information om att använda WinMerge, se vår <a href=\"%s\">online Manual</a>, eller använd den lokala hjälpfilen (tryck bara på <code>F1</code> i WinMerge) för fristående användning."
-
-#: 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 "Eller du kan enkelt packa upp <a href=\"%s\">det binära zip-paketet</a> till den önskade platsen, och köra <code>WinMergeU.exe</code> (utom för Windows 98/ME användare som ska använda <code>WinMerge.exe</code>)."
-
-#: downloads\pad-file.php:56
-#, c-format
-msgid "English Descriptions"
-msgstr "Engelska besrivningar"
-
-#: engine\page.inc:325
-#: support\index.php:37
-#, c-format
-msgid "Donate"
-msgstr "Donera"
-
-#: about\index.php:45
-#, c-format
-msgid "Version Control"
-msgstr "Versionskontroll"
-
-#: 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 "Det Öppna diskussionsforumet är det snabbaste sättet att få hjälp. Ett annat sätt är att prenumera på supportmailinglistan"
-
-#: about\screenshots\index.php:30
-#: about\screenshots\index.php:31
-#, c-format
-msgid "Splash Screen"
-msgstr "Startskärm"
-
-#: about\license.php:33
-#, c-format
-msgid "The Open Source Definition"
-msgstr "Open Source definitionen"
-
-#: downloads\pad-file.php:46
-#, c-format
-msgid "Supported Languages"
-msgstr "Stödda språk"
-
-#: index.php:6
-#, c-format
-msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr "WinMerge är ett Open Source skillnads och lägg ihop-verktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är lätt att förstå och hantera."
-
-#: downloads\index.php:67
-#, c-format
-msgid "Beta Versions"
-msgstr "Beta-versioner"
-
-#: downloads\pad-file.php:76
-#, c-format
-msgid "Screenshot"
-msgstr "Skärmdump"
-
-#: about\index.php:6
-#, c-format
-msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
-msgstr "WinMerge, om, funktioner, filjämförelse, katalogjämförelse, versionskontroll, skärmdumpar, installation"
-
-#: support\mailing-lists.php:15
-#: support\mailing-lists.php:50
-#, c-format
-msgid "Translate List"
-msgstr "Översättningslista"
-
-#: downloads\index.php:58
-#, c-format
-msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
-msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
-
-#: downloads\plugins.php:5
-#, c-format
-msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
-msgstr "Ladda ner ytterliggare plugins för WinMerge,som 7-Zip plugin eller xdocdiff plugin."
-
-#: translations\index.php:7
-#: translations\status_trunk.php:7
-#: translations\status_trunk.php:9
-#, c-format
-msgid "Translations Status (Unstable Trunk)"
-msgstr "Översättningsstatus (Instabil Trunk)"
-
-#: support\index.php:12
-#, c-format
-msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
-msgstr "Ett annat sätt är att prenumerera på <a href=\"%s\">supportmailinglistan</a>."
-
-#: about\screenshots\index.php:5
-#, c-format
-msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
-msgstr "Skärmdumpar från WinMerge funktioner som filjämförelse, katalogjämförelseresultat och skillnadsfält."
-
-#: translations\translations.inc:85
-#: translations\translations_branch.inc:53
-#, c-format
-msgid "Untranslated: %d%%"
-msgstr "Oöversatt: %d%%"
-
-#: index.php:43
-#, c-format
-msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
-msgstr "Om du behöver support, titta på vår <a href=\"%s\">supportsida</a> för mer information om hur du kan få det."
-
-#: engine\page.inc:330
-#, c-format
-msgid "Status (Stable Branch)"
-msgstr "Status (Stabil gren)"
-
-#: about\index.php:47
-#, c-format
-msgid "Creates patch files (Normal-, Context- and Unified formats)"
-msgstr "Skapar patchfiler (i Normal-, Context- och Unified format)"
-
-#: translations\instructions.php:9
-#, c-format
-msgid "The translations instructions are currently not available..."
-msgstr "Översättningsinstruktionerna är nu inte tillgängliga..."
-
-#: support\mailing-lists.php:17
-#: support\mailing-lists.php:70
-#, c-format
-msgid "SVN List"
-msgstr "SVN-lista"
-
-#: downloads\plugins.php:31
-#, c-format
-msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
-msgstr "Med denna plugin kan du jäföra Word,Excel,Powerpoint och några fler filer."
-
-#: 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 "Du måste <a href=\"%s\">registrera dig hos SourceForge.net</a> innan du kan posta en felrapport (registrering är gratis)."
-
-#: downloads\source-code.php:6
-#, c-format
-msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
-msgstr "WinMerge, fri, ladda ner, källkod, GPL, Subversion, SVN, TortoiseSVN"
-
-#: docs\releasenotes.php:5
-#, c-format
-msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
-msgstr "Releasenoteringarna är en kort sammanfattning av viktiga förändringar, förbättringar, felfixar och kända problem i den aktuella WinMerge releasen."
-
-#: docs\changelog.php:6
-#, c-format
-msgid "WinMerge, change log, changes, release, tracker item, revision number"
-msgstr "WinMerge, ändringslog, ändringar, releaser, trackerobjekt, revisionsnummer"
-
-#: docs\releasenotes.php:6
-#, c-format
-msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
-msgstr "WinMerge, releasenoteringar, sammanfattning, ändringar, förbättringar, felfixar, kända problem, releaser"
-
-#: downloads\pad-file.php:14
-#, c-format
-msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
-msgstr "Om du inte kan arbeta med <a href=\"%s\">PAD-filen</a>, kan du använda följande information:"
-
-#: about\index.php:57
-#, c-format
-msgid "Localizable interface"
-msgstr "Översättningsbart gränssnitt"
-
-#: about\index.php:56
-#, c-format
-msgid "Plugin support"
-msgstr "Plugin-stöd"
-
-#: about\index.php:54
-#, c-format
-msgid "Shell Integration (supports 64-bit Windows versions)"
-msgstr "Kommandoradsintegration (stöder 64-bit Windowsversioner)"
-
-#: about\index.php:55
-#, c-format
-msgid "Archive file support using 7-Zip"
-msgstr "Arkivfilstöd med 7-Zip"
-
-#: translations\index.php:6
-#: translations\status_branch.php:7
-#: translations\status_branch.php:10
-#, c-format
-msgid "Translations Status (Stable Branch)"
-msgstr "Översättningsstatus (Stabil gren)"
-
-#: support\index.php:21
-#, c-format
-msgid "Tracker Statistics"
-msgstr "Trackerstatistik"
-
-#: downloads\pad-file.php:64
-#, c-format
-msgid "English Keywords"
-msgstr "Engelska nyckelord"
-
-#: engine\page.inc:316
-#, c-format
-msgid "Download WinMerge Source Code"
-msgstr "Ladda ner WinMerges källkod"
-
-#: downloads\pad-file.php:7
-#: downloads\pad-file.php:9
-#: downloads\pad-file.php:80
-#: engine\page.inc:317
-#, c-format
-msgid "PAD File"
-msgstr "PAD-fil"
-
-#: 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 "Översättare"
-
-#: links.php:28
-#, c-format
-msgid "regex HOWTO"
-msgstr ""
-
-#: about\license.php:10
-#, c-format
-msgid ""
-"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
-"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
-msgstr ""
-"Detta betyder att alla kan ladda ner <a href=\"%s\">källkoden</a> och förbättra och ändra i den.\n"
-"Det enda vi begär är att människor skickar sina förbättringar och modifikationer till oss så att alla WinMerge användare kan få nytta av dem."
-
-#: about\history.php:5
-#, c-format
-msgid "History of WinMerge releases with version numbers, release dates and manuals."
-msgstr "Historia om WinMerge releaser med versionsnummer,releasedatum och manualer."
-
-#: downloads\plugins.php:11
-#, c-format
-msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
-msgstr "Detta är 7-Zip plugin för WinMerge och den aktuella versionen <strong>%1$s</strong> släpptes <strong>%2$s</strong>."
-
-#: 404.php:23
-#, c-format
-msgid "<a href=\"%s\">Change Log</a>?"
-msgstr "<a href=\"%s\">Ändringslog</a>?"
-
-#: about\history.php:7
-#: about\history.php:9
-#: engine\page.inc:301
-#, c-format
-msgid "History"
-msgstr "Historia"
-
-#: support\tracker-shortcuts.php:41
-#, c-format
-msgid "ID:"
-msgstr "ID:"
-
-#: about\index.php:15
-#, c-format
-msgid "Features"
-msgstr "Funktioner"
-
-#: 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 "Arkiv"
-
-#: engine\engine.inc:20
-#, c-format
-msgid "German"
-msgstr "Tyska"
-
-#: 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 "Var god och lägg till så mycket information du kan: som ett minimum, versionsnumret på WinMerge som du använder. Om du kan, lägg också till en konfigurationslog ,som du kan visa genom att klicka på <span class=\"guimenu\">Hjälp</span> &#8594; <span class=\"guimenuitem\">Konfiguration</span> i WinMerges fönster."
-
-#: engine\page.inc:272
-#: engine\page.inc:294
-#, c-format
-msgid "WinMerge Home"
-msgstr "WinMerges hemsida"
-
-#: links.php:33
-#, c-format
-msgid "PDF quick reference"
-msgstr ""
-
-#: docs\index.php:11
-#, c-format
-msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
-msgstr "<a href=\"%s\">Manualen</a> förklarar hur man ska använda WinMerge, och dokument dess kapacitet och begränsningar."
-
-#: engine\page.inc:314
-#, c-format
-msgid "WinMerge"
-msgstr "WinMerge"
-
-#: downloads\plugins.php:30
-#, c-format
-msgid "xdocdiff Plugin"
-msgstr "xdocdiff Plugin"
-
-#: support\tracker-shortcuts.php:17
-#, c-format
-msgid "Todo Item"
-msgstr "Att göra objekt"
-
-#: 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 "Detta är listan där deltagande utvecklare av WinMerge möts och diskuterar problem, kodändringar/tillägg, osv."
-
-#: downloads\index.php:22
-#: downloads\plugins.php:17
-#, c-format
-msgid "Exe-Format (%s MB)"
-msgstr "Exe-format (%s MB)"
-
-#: engine\page.inc:315
-#, c-format
-msgid "Plugins"
-msgstr "Plugins"
-
-#: support\mailing-lists.php:6
-#, c-format
-msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
-msgstr "WinMerge, mailinglistor, annonsera, support, användare, översätt, utveckling, SVN"
-
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
-#, c-format
-msgid "Folder Comparison Results"
-msgstr "Katalogjämförelseresultat"
-
-#: support\tracker-shortcuts.php:37
-#, c-format
-msgid "Generate"
-msgstr "Generera"
-
-#: about\index.php:23
-#, c-format
-msgid "Unicode support"
-msgstr "Unicode-stöd"
-
-#: 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 "Men snälla tänk på om du vill göra en <a href=\"%s\">donation</a> för att stödja den fortsatta utvecklingen av WinMerge."
-
-#: downloads\pad-file.php:74
-#, c-format
-msgid "Information"
-msgstr "Information"
-
-#: engine\page.inc:274
-#: engine\page.inc:305
-#, 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 "WinMerge är släppt under <a href=\"%s\">GNU General Public License</a>. Detta betyder att du kan hämta hela källkoden och bygga programmet själv."
-
-#: about\index.php:40
-#, c-format
-msgid "Fast compare using file sizes and dates"
-msgstr "Snabb jämförelse med filstorlek och datum"
-
-#: docs\index.php:6
-#, c-format
-msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
-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 "Avbryt prenumeration"
-
-#: about\license.php:14
-#, c-format
-msgid "GNU General Public License"
-msgstr "GNU General Public License"
-
-#: docs\index.php:15
-#, c-format
-msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
-msgstr "<a href=\"%1$s\">Releasenoteringarna</a> är en kort sammanfattning av viktiga ändringar, förbättringar, bugfixar och <a href=\"%2$s\">kända problem</a> i den aktuella WinMerge releasen."
-
-#: 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 "Oöversatt"
-
-#: about\screenshots\index.php:24
-#: about\screenshots\index.php:25
-#, c-format
-msgid "Highlight Line Diff"
-msgstr "Markera radskillnad"
-
-#: index.php:15
-#: about\index.php:66
-#: about\screenshots\index.php:12
-#: about\screenshots\index.php:13
-#, c-format
-msgid "File Comparison"
-msgstr "Filjämförelse"
-
-#: engine\page.inc:272
-#, c-format
-msgid "Home"
-msgstr "Hem"
-
-#: support\mailing-lists.php:37
-#, c-format
-msgid "You should ask all your support questions on this list."
-msgstr "Du bör ställa alla dina supportfrågor på denna lista."
-
-#: about\index.php:52
-#, c-format
-msgid "Other"
-msgstr "Andra"
-
-#: support\mailing-lists.php:14
-#: support\mailing-lists.php:40
-#, c-format
-msgid "User List"
-msgstr "Användarlista"
-
-#: 404.php:27
-#, c-format
-msgid "<a href=\"%s\">Support</a>?"
-msgstr "<a href=\"%s\">Support</a>?"
-
-#: engine\engine.inc:23
-#, c-format
-msgid "Dutch"
-msgstr "Nederländska"
-
-#: links.php:7
-#, c-format
-msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
-msgstr ""
-
-#: support\index.php:7
-#, c-format
-msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
-msgstr "WinMerge, support, discussionsforum, mailinglistor, tracker, donera, fel, supportäskanden, patchar, funktionsäskanden, att göra, Open Source, sourceforge.net"
-
-#: downloads\index.php:31
-#, c-format
-msgid "Runtimes"
-msgstr "Körfiler"
-
-#: 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 "Följande två sidor informerar dig om översättningstatus på den stabila och utvecklingsversionen av WinMerge:"
-
-#: about\index.php:49
-#, c-format
-msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
-msgstr "Enkel Visual SourceSafe och Rational ClearCase integration"
-
-#: translations\translations.inc:83
-#: translations\translations.inc:96
-#: translations\translations.inc:134
-#: translations\translations_branch.inc:51
-#: translations\translations_branch.inc:69
-#: translations\translations_branch.inc:119
-#, c-format
-msgid "Fuzzy"
-msgstr "Oklar"
-
-#: translations\translations.inc:180
-#: translations\translations_branch.inc:106
-#, c-format
-msgid "Total: %d"
-msgstr "Totalt: %d"
-
-#: downloads\index.php:8
-#, c-format
-msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
-msgstr "WinMerge, fri, ladda ner, Windows, setup, installerare, program, körfiler, stabil, beta, experimental, portabel"
-
-#: 404.php:18
-#, c-format
-msgid "<a href=\"%s\">Screenshots</a>?"
-msgstr "<a href=\"%s\">Skärmdumpar</a>?"
-
-#: docs\index.php:18
-#: engine\page.inc:311
-#, c-format
-msgid "Development Wiki"
-msgstr "UtvecklingsWiki"
-
-#: translations\translations.inc:182
-#, c-format
-msgid "Total: Unknown"
-msgstr "Totalt: Okänt"
-
-#: about\index.php:69
-#, c-format
-msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
-msgstr "Se <a href=\"%s\">skärmdumparsidan</a> för mer skärmdumpar."
-
-#: index.php:37
-#: downloads\index.php:88
-#, c-format
-msgid "Y-m-d"
-msgstr "Y.m.d"
-
-#: translations\instructions.php:5
-#: translations\instructions.php:8
-#, c-format
-msgid "Translations instructions"
-msgstr "Översättningsinstruktioner"
-
-#: engine\page.inc:322
-#, c-format
-msgid "WinMerge Mailing Lists"
-msgstr "WinMerge brevlistor"
-
-#: downloads\index.php:68
-#, c-format
-msgid "Experimental Builds"
-msgstr "Experimentella versioner"
-
-#: engine\page.inc:325
-#, c-format
-msgid "Donate money to WinMerge"
-msgstr "Donera pengar till WinMerge"
-
-#: downloads\index.php:66
-#, c-format
-msgid "Stable Versions"
-msgstr "Stabila versioner"
-
-#: engine\page.inc:273
-#, c-format
-msgid "About"
-msgstr "Om"
-
-#: downloads\pad-file.php:92
-#, c-format
-msgid "Name"
-msgstr "Namn"
-
-#: about\license.php:7
-#: about\license.php:9
-#: engine\page.inc:302
-#, c-format
-msgid "License"
-msgstr "Licens"
-
-#: downloads\index.php:63
-#, c-format
-msgid "Other Versions"
-msgstr "Andra versioner"
-
-#: engine\page.inc:321
-#, c-format
-msgid "Discussion Forums"
-msgstr "Diskussionsforum"
-
-#: downloads\pad-file.php:38
-#, c-format
-msgid "Release Date"
-msgstr "Releasedatum"
-
-#: support\index.php:13
-#, c-format
-msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
-msgstr "Om du hittar ett fel, var god och skicka den som en <a href=\"%s\">felrapport</a>."
-
-#: downloads\source-code.php:37
-#, c-format
-msgid "Developer Version"
-msgstr "Utvecklarversion"
-
-#: index.php:7
-#, c-format
-msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
-msgstr "WinMerge, fri, Open Source, Windows, windiff, skillnad, lägg samman, jämför, verktyg, nyttighet, text, fil, folder, katalog, jämför filer, jämför folder, lägg samman filer, lägg samman folder, skillnadsverktyg, lägg samman-verktyg, jämförverktyg"
-
-#: engine\page.inc:241
-#, c-format
-msgid "Download Now!"
-msgstr "Ladda ner nu!"
-
-#: index.php:39
-#, c-format
-msgid "View all news&hellip;"
-msgstr "Visa alla nyheter&hellip;"
-
-#: about\index.php:37
-#, c-format
-msgid "Folder Compare"
-msgstr "Katalogjämförelse"
-
-#: engine\page.inc:309
-#, c-format
-msgid "Known Issues"
-msgstr "Kända problem"
-
-#: docs\index.php:14
-#: docs\releasenotes.php:7
-#: docs\releasenotes.php:10
-#: engine\page.inc:308
-#, c-format
-msgid "Release Notes"
-msgstr "Releasenoteringar"
-
-#: links.php:16
-#, c-format
-msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
-msgstr ""
-
-#: engine\page.inc:308
-#, c-format
-msgid "WinMerge Release Notes"
-msgstr "WinMerge releasenoteringar"
-
-#: index.php:26
-#, c-format
-msgid "WinMerge %s - latest stable version"
-msgstr "WinMerge %s - Aktuell stabil version"
-
-#: 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 "Om du vill uppdatera någon av dessa översättningar eller lägga till en annan översättning, då snälla följ <a href=\"%s\">dessa instruktioner</a>."
-
-#: translations\index.php:31
-#, c-format
-msgid "Translating"
-msgstr "Översätter"
-
-#: about\screenshots\index.php:15
-#: about\screenshots\index.php:16
-#, c-format
-msgid "Open-dialog"
-msgstr "Öppna-dialog"
-
-#: downloads\index.php:90
-#, c-format
-msgid "View all file releases&hellip;"
-msgstr "Visa alla filreleaser&hellip;"
-
-#: links.php:14
-#, c-format
-msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
-msgstr ""
-
-#: links.php:12
-#, c-format
-msgid "<b>7-Zip</b> is a file archiver with high compression ratio."
-msgstr ""
-
-#: about\index.php:5
-#: about\index.php:12
-#, c-format
-msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
-msgstr "WinMerge är mycket användbart för att se vad som har ändrats mellan projektversioner, och sedan lägga samman ändringar mellan versioner. WinMerge kan användas som ett extern skillnads/lägga ihop-verktyg eller som en självständig applikation."
-
-#: docs\index.php:13
-#, c-format
-msgid "The <a href=\"%s\">quick tour</a> describe the main  features from WinMerge at one page."
-msgstr ""
-
-#: engine\engine.inc:22
-#, c-format
-msgid "Japanese"
-msgstr ""
-
-#: downloads\source-code.php:7
-#: downloads\source-code.php:10
-#, c-format
-msgid "Download Source Code"
-msgstr "Ladda ner källkod"
-
-#: 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 "Prenumerera"
-
-#: support\mailing-lists.php:16
-#: support\mailing-lists.php:60
-#, c-format
-msgid "Development List"
-msgstr "Utvecklingslista"
-
-#: about\index.php:34
-#, c-format
-msgid "Moved lines detection"
-msgstr "Flyttade rader detektering"
-
-#: engine\page.inc:301
-#, c-format
-msgid "WinMerge History"
-msgstr "WinMerge Historia"
-
-#: translations\translations.inc:132
-#: translations\translations_branch.inc:67
-#, c-format
-msgid "Graph"
-msgstr "Diagram"
-
-#: downloads\index.php:69
-#, c-format
-msgid "(by PortableApps.com)"
-msgstr "(av PortableApps.com)"
-
-#: about\license.php:10
-#, c-format
-msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
-msgstr "WinMerge är <a href=\"%1$s\">Open Source</a> programvara under <a href=\"%2$s\">GNU General Public License</a>."
-
-#: engine\page.inc:302
-#, c-format
-msgid "WinMerge License"
-msgstr "WinMerge licens"
-
-#: about\history.php:6
-#, c-format
-msgid "WinMerge, history, version number, release date, manual, users guide"
-msgstr "WinMerge, historia, versionsnummer, releasedatum, manual, användarguide"
-
-#: downloads\index.php:10
-#: downloads\index.php:12
-#: engine\page.inc:314
-#, c-format
-msgid "Download WinMerge"
-msgstr "Ladda ner WinMerge"
-
-#: links.php:9
-#, c-format
-msgid "Tools"
-msgstr ""
-
-#: engine\page.inc:381
-#, c-format
-msgid "Bookmark this on Delicious"
-msgstr "Bokmärk detta på Delicious"
-
-#: downloads\pad-file.php:44
-#, c-format
-msgid "Operating Systems"
-msgstr "Operativsystem"
-
-#: 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 "Filjämförfönstret är i huvudsak två filer öppnade i en editor i två horisontella fält. Editering låter användare enkelt göra små ändringar utan behov att öppna ...
 
[truncated message content]

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

[<ge...@us...>]

Revision: 7038
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7038&view=rev
Author:   gerundt
Date:     2009-11-21 14:27:13 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Web: Add "hreflang" to language links

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

Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc	2009-11-21 14:17:54 UTC (rev 7037)
+++ trunk/Web/engine/page.inc	2009-11-21 14:27:13 UTC (rev 7038)
@@ -396,10 +396,10 @@
         $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, true) . "\">" . __($language->getName()) . "</a></strong></li>\n";
+            $temp .= "  <li><strong><a href=\"" . $translations->getLink($language, true) . "\" hreflang=\"" . $language->getId() . "\">" . __($language->getName()) . "</a></strong></li>\n";
           }
           else { //if NOT current language...
-            $temp .= "  <li><a href=\"" . $translations->getLink($language, true) . "\">" . __($language->getName()) . "</a></li>\n";
+            $temp .= "  <li><a href=\"" . $translations->getLink($language, true) . "\" hreflang=\"" . $language->getId() . "\">" . __($language->getName()) . "</a></li>\n";
           }
         }
         $temp .= "</ul>\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:[7037] trunk/Translations/Web/de.po

[<ge...@us...>]

Revision: 7037
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7037&view=rev
Author:   gerundt
Date:     2009-11-21 14:17:54 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Update German web PO file

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

Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po	2009-11-20 19:16:40 UTC (rev 7036)
+++ trunk/Translations/Web/de.po	2009-11-21 14:17:54 UTC (rev 7037)
@@ -12,7 +12,7 @@
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
 "POT-Creation-Date: 2009-10-24 15:18+0000\n"
-"PO-Revision-Date: 2009-10-24 16:08+0100\n"
+"PO-Revision-Date: 2009-11-21 15:14+0100\n"
 "Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
 "Language-Team: German <win...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@
 #: links.php:27
 #, c-format
 msgid "Good site devoted for regular expressions"
-msgstr ""
+msgstr "Gute Seite gewidmet für reguläre Ausdrücke"
 
 #: index.php:45
 #, c-format
@@ -180,7 +180,7 @@
 #: links.php:31
 #, c-format
 msgid "Regular expressions tutorial"
-msgstr ""
+msgstr "Anleitung für Reguläre Ausdrücke"
 
 #: support\tracker-shortcuts.php:55
 #, c-format
@@ -291,7 +291,7 @@
 #: downloads\pad-file.php:10
 #, c-format
 msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
-msgstr ""
+msgstr "Der einfachste Weg, um Informationen über die neueste stabile Version von WinMerge für Ihre Website zu erhalten, ist die <a href=\"%s\">Portable Application Description</a>-Datei, die Sie hier finden:"
 
 #: support\tracker-shortcuts.php:14
 #, c-format
@@ -301,7 +301,7 @@
 #: 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 ""
+msgstr "Abonnieren oder Abbestellen sie eine der folgenden Verteilerlisten: Ankündigung, Support, Benutzer, Übersetzung, Entwickler und SVN"
 
 #: about\screenshots\index.php:20
 #, c-format
@@ -398,12 +398,12 @@
 #: links.php:18
 #, c-format
 msgid "<b>External diff Tool</b> is an <a href=\"%s\">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool."
-msgstr ""
+msgstr "<b>External diff Tool</b> ist ein <a href=\"%s\">Eclipse</a>-Plugin, dass das Ausführen von WinMerge (oder einem anderen externen diff-Tool) für den Dateivergleich erlaubt, statt des standardmäßig in Eclipse integrierten diff-Programm."
 
 #: links.php:22
 #, c-format
 msgid "<b>Frhed</b> is an binary file editor for Windows. It is small but has many advanced features like ability to load big files partially."
-msgstr ""
+msgstr "<b>Frhed</b> ist ein Binärdatei-Editor für Windows. Er ist klein aber hat viele fortgeschrittene Funktionen, wie z. B. die Fähigkeit große Dateien nur teilweise zuladen."
 
 #: support\tracker-shortcuts.php:16
 #, c-format
@@ -448,7 +448,7 @@
 #: 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 ""
+msgstr "Weitere Informationen finden Sie im <a href=\"%1$s\">Installations-Abschnitt</a> des englischen <a href=\"%2$s\">Handbuches</a>."
 
 #: about\index.php:32
 #, c-format
@@ -593,7 +593,7 @@
 #: links.php:40
 #, c-format
 msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
-msgstr ""
+msgstr "Bewertungen von beliebter Vergleichs-Software.  [<a href=\"%s\">WinMerge-Bewertung</a>]"
 
 #: engine\page.inc:311
 #, c-format
@@ -628,7 +628,7 @@
 #: links.php:29
 #, c-format
 msgid "Good HOWTO document for regular expressions"
-msgstr ""
+msgstr "Gutes Praxis Dokument für reguläre Ausdrücke"
 
 #: index.php:16
 #, c-format
@@ -795,7 +795,7 @@
 #: links.php:20
 #, c-format
 msgid "<b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer."
-msgstr ""
+msgstr "<b>TortoiseSVN</b> ermöglicht die Arbeit mit Dateien unter <em>Subversion</em>-Versionskontrolle direkt aus dem Windows Explorer heraus."
 
 #: about\license.php:6
 #, c-format
@@ -821,7 +821,7 @@
 #: links.php:42
 #, c-format
 msgid "Inside informations, unreleased products and articles on various soon-to-be-released software titles."
-msgstr ""
+msgstr "Insider-Informationen, unveröffentlichte Produkte und Artikeln zu verschiedenen „bald erscheinenden“ Software-Titeln."
 
 #: support\tracker-shortcuts.php:23
 #, c-format
@@ -831,17 +831,17 @@
 #: support\tracker-shortcuts.php:6
 #, c-format
 msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
-msgstr ""
+msgstr "WinMerge, Tracker, Abkürzungen, sourceforge, Projekt-Seite, Fehler, Patch, Support-Anfrage, Funktions-Anfrage, Todo-Eintrag"
 
 #: links.php:38
 #, c-format
 msgid "Map the open source world by collecting objective information on open source projects. [<a href=\"%s\">WinMerge Report</a>]"
-msgstr ""
+msgstr "Karte der Open-Source-Welt durch das Sammeln von objektiven Informationen über Open-Source-Projekte. [<a href=\"%s\">WinMerge-Bericht</a>]"
 
 #: downloads\plugins.php:32
 #, c-format
 msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
-msgstr ""
+msgstr "Für nähere Informationen und den Download gehen Sie zur <a href=\"%s\">xdocdiff Plugin Homepage</a>."
 
 #: translations\index.php:39
 #, c-format
@@ -901,7 +901,7 @@
 #: links.php:44
 #, c-format
 msgid "This is WinMerge packaged with a PortableApps.com Launcher as a <a href=\"%s\">portable app</a>, so you can compare files on the go."
-msgstr ""
+msgstr "Dies ist WinMerge mit einem PortableApps.com Launcher als eine <a href=\"%s\">portable Anwendung</a> verpackt, so können Sie Dateien unterwegs vergleichen."
 
 #: index.php:47
 #, c-format
@@ -939,7 +939,7 @@
 #: downloads\plugins.php:28
 #, c-format
 msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
-msgstr ""
+msgstr "Sie können auch die <a href=\"%1$s\">Versionshinweise</a> lesen oder nach <a href=\"%2$s\">anderen Versionen</a> suchen."
 
 #: engine\page.inc:300
 #, c-format
@@ -988,7 +988,7 @@
 #: downloads\pad-file.php:5
 #, c-format
 msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
-msgstr ""
+msgstr "Der einfachste Weg, um Informationen über die neueste stabile Version von WinMerge für Ihre Website zu erhalten, ist die Portable Application Description-Datei, die Sie hier finden."
 
 #: translations\translations.inc:41
 #, c-format
@@ -1014,7 +1014,7 @@
 #: 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 ""
+msgstr "In der Baumansicht werden Ordner mit Dateien und Unterordnern erweiter- und klappbar. Dies ist für eine einfachere Navigation in tief verschachtelten Verzeichnisstrukturen nützlich. <em>Die Baum-Ansicht ist nur in rekursiven Vergleichen verfügbar."
 
 #: index.php:42
 #: downloads\pad-file.php:96
@@ -1033,7 +1033,7 @@
 #: 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 ""
+msgstr "Sie können den <a href=\"%1$s\">Quelltext mit einem Web-Browser durchsuchen</a> oder den gesamten Code auschecken, indem Sie auf einen der folgenden Links klicken (wenn Sie <a href=\"%2$s\">TortoiseSVN</a> installiert haben):"
 
 #: downloads\source-code.php:5
 #, c-format
@@ -1068,17 +1068,17 @@
 #: 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 ""
+msgstr "WinMerge ermöglicht die Auswahl/Öffnung von Pfaden in mehrfacher Hinsicht. Der „Öffnen-Dialog“ ist nur eine der Möglichkeiten."
 
 #: 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 ""
+msgstr "Weitere Informationen zur Verwendung von WinMerge finden Sie in unserem englischen <a href=\"%s\">Online-Handbuch</a>, oder Sie können die lokale Hilfe-Datei (drücken Sie einfach <code>F1</code> in WinMerge) für die Offline-Nutzung verwenden."
 
 #: 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 ""
+msgstr "Oder Sie können einfach das <a href=\"%s\">Binärdateien-Zip-Archiv</a> an die gewünschte Stelle entpacken und führen <code>WinMergeU.exe</code> aus (außer unter Windows 98/ME, wo Sie <code>WinMerge.exe</code> nutzen sollten)."
 
 #: downloads\pad-file.php:56
 #, c-format
@@ -1140,7 +1140,7 @@
 #: about\index.php:6
 #, c-format
 msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
-msgstr ""
+msgstr "WinMerge, Über, Funktionen, Dateivergleich, Ordnervergleich, Versionskontrolle, Screenshots, Installation"
 
 #: support\mailing-lists.php:15
 #: support\mailing-lists.php:50
@@ -1307,7 +1307,7 @@
 #: links.php:28
 #, c-format
 msgid "regex HOWTO"
-msgstr ""
+msgstr "regex Praxis"
 
 #: about\license.php:10
 #, c-format
@@ -1315,16 +1315,18 @@
 "This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
 "The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
 msgstr ""
+"Das bedeutet, dass jeder den <a href=\"%s\">Quellcode</a> herunterladen kann um ihn zu verändern und zu verbessern.\n"
+"Das einzige, was wir fordern ist, dass die Menschen ihre Verbesserungen und Änderungen an uns zurückschicken, so dass alle WinMerge-Nutzer davon profitieren können."
 
 #: about\history.php:5
 #, c-format
 msgid "History of WinMerge releases with version numbers, release dates and manuals."
-msgstr ""
+msgstr "Historie der WinMerge-Veröffentlichungen mit Versionsnummern, Veröffentlichungsterminen und Handbüchern."
 
 #: downloads\plugins.php:11
 #, c-format
 msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
-msgstr ""
+msgstr "Dies ist das 7-Zip-Plugin für WinMerge und die aktuelle Version <strong>%1$s</strong> wurde am <strong>%2$s</strong> freigegeben."
 
 #: 404.php:23
 #, c-format
@@ -1377,7 +1379,7 @@
 #: links.php:33
 #, c-format
 msgid "PDF quick reference"
-msgstr ""
+msgstr "PDF-Schnelleinstieg"
 
 #: docs\index.php:11
 #, c-format
@@ -1418,7 +1420,7 @@
 #: support\mailing-lists.php:6
 #, c-format
 msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
-msgstr ""
+msgstr "WinMerge, Verteilerlisten, Ankündigung, Support, Benutzer, Übersetzung, Entwickler, SVN"
 
 #: about\index.php:67
 #: about\screenshots\index.php:18
@@ -1456,7 +1458,7 @@
 #: 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 ""
+msgstr "WinMerge ist unter der <a href=\"%s\">GNU General Public License</a> veröffentlicht. Das heißt, Sie können den gesamten Quellcode erhalten und das Programm selbst bauen."
 
 #: about\index.php:40
 #, c-format
@@ -1466,7 +1468,7 @@
 #: docs\index.php:6
 #, c-format
 msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
-msgstr ""
+msgstr "WinMerge, Dokumentation, Handbuch, Schnelleinstieg, Versionshinweise, Bekannte Probleme, Versionshistorie, Entwickler-Wiki"
 
 #: support\mailing-lists.php:24
 #: support\mailing-lists.php:34
@@ -1546,12 +1548,12 @@
 #: links.php:7
 #, c-format
 msgid "Here is a collection of links to tools and reference material that we find is generally useful when you work with WinMerge."
-msgstr ""
+msgstr "Hier ist eine Sammlung von Links zu Tools und Referenzmaterialien, die wie wir finden, generell nützlich sind, wenn Sie mit WinMerge arbeiten."
 
 #: 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 ""
+msgstr "WinMerge, Support, Diskussionsforen, Verteilerlisten, Tracker, Spenden, Fehler, Supportanfragen, Patches, Funktionsanfragen, Todo, Open-Source, sourceforge.net"
 
 #: downloads\index.php:31
 #, c-format
@@ -1667,7 +1669,7 @@
 #: docs\index.php:13
 #, c-format
 msgid "The <a href=\"%s\">quick tour</a> describes the main WinMerge features in one page."
-msgstr ""
+msgstr "Der englische <a href=\"%s\">Schnelleinstieg</a> beschreibt die wichtigsten WinMerge-Funktionen auf einer Seite."
 
 #: engine\page.inc:321
 #, c-format
@@ -1692,7 +1694,7 @@
 #: 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 ""
+msgstr "WinMerge, Frei, Open-Source, Windows, windiff, diff, zusammenführen, vergleichen, Tool, Werkzeug, Text, Datei, Ordner, Verzeichnis, Dateien vergleichen, Ordner vergleichen, Dateien zusammenführen, Ordner zusammenführen, diff tool, merge tool, compare tool"
 
 #: engine\page.inc:241
 #, c-format
@@ -1725,7 +1727,7 @@
 #: links.php:16
 #, c-format
 msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
-msgstr ""
+msgstr "<b>GnuWin32</b> bietet Win32-Portierung von Werkzeugen mit einer <a href=\"%1$s\">GNU</a>- oder ähnlichen <a href=\"%2$s\">Open-Source-Lizenz</a>."
 
 #: engine\page.inc:308
 #, c-format
@@ -1761,12 +1763,12 @@
 #: links.php:14
 #, c-format
 msgid "<b>WinSCP</b> is an open source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>, <acronym title=\"File Transfer Protocol\">FTP</acronym> and <acronym title=\"Secure Copy Protocol\">SCP</acronym> client for Windows."
-msgstr ""
+msgstr "<b>WinSCP</b> ist ein Open-Source <acronym title=\"SSH File Transfer Protocol\">SFTP</acronym>-, <acronym title=\"File Transfer Protocol\">FTP</acronym>- und <acronym title=\"Secure Copy Protocol\">SCP</acronym>-Client für Windows."
 
 #: links.php:12
 #, c-format
 msgid "<b>7-Zip</b> is a file archiver with high compression ratio."
-msgstr ""
+msgstr "<b>7-Zip</b> ist ein Dateienpacker mit hoher Kompressionsrate."
 
 #: about\index.php:5
 #: about\index.php:12
@@ -1862,5 +1864,5 @@
 #: 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 ""
+msgstr "Das Dateivergleichsfenster ist im Grunde zwei Dateien im Editor geöffnet; mit zwei horizontalen Ansichten. Das Bearbeiten erlaubt Benutzern auf einfache Weise kleine Änderungen, ohne dass Dateien in anderen Editoren oder Entwicklungsumgebungen geöffnet werden müssen."
 


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

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

[<ge...@us...>]

Revision: 7036
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7036&view=rev
Author:   gerundt
Date:     2009-11-20 19:16:40 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Web: Use new file release RSS feed from SF.net

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

Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php	2009-11-18 18:56:59 UTC (rev 7035)
+++ trunk/Web/downloads/index.php	2009-11-20 19:16:40 UTC (rev 7036)
@@ -6,7 +6,7 @@
   $stablerelease = $page->getStableRelease();
   $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->addRssFeed('http://sourceforge.net/api/file/index/project-id/13216/rss', __('Project File Releases'));
   $page->printHead(__('Download WinMerge'), TAB_DOWNLOADS, 'toggle(\'checksumslist\');');
   
   $page->printHeading(__('Download WinMerge'));
@@ -70,13 +70,13 @@
   <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/api/file/index/project-id/13216/rss');
   $feed = new SimplePie();
-  $feed->set_feed_url('http://sourceforge.net/export/rss2_projfiles.php?group_id=13216');
+  $feed->set_feed_url('http://sourceforge.net/api/file/index/project-id/13216/rss');
   $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 file releases...
+  foreach ($feed->get_items(0, 10) as $item) { //for the last 10 file releases...
     $title = $item->get_title();
     $title = preg_replace('#(\([A-Z][a-z][a-z],.*GMT\))#si', '', $title);
     $title = str_replace('1. Stable versions', 'Stable version', $title);


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

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

[<ge...@us...>]

Revision: 7035
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7035&view=rev
Author:   gerundt
Date:     2009-11-18 18:56:59 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
PATCH: [ 2898329 ] Drop MakePatchDirs tool

Removed Paths:
-------------
    trunk/Docs/Developers/readme-developers-MakePatchDirs.html
    trunk/Tools/MakePatchDirs/

Deleted: trunk/Docs/Developers/readme-developers-MakePatchDirs.html
===================================================================
--- trunk/Docs/Developers/readme-developers-MakePatchDirs.html	2009-11-14 17:02:15 UTC (rev 7034)
+++ trunk/Docs/Developers/readme-developers-MakePatchDirs.html	2009-11-18 18:56:59 UTC (rev 7035)
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-  "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <title>MakePatchDirs</title>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-  <style type="text/css">
-  <!--
-    body {
-      font-family: Verdana,Helvetica,Arial,sans-serif;
-      font-size: small;
-    }
-    code,pre {
-      font-family: "Courier New",Courier,monospace;
-      font-size: 1em;
-    }
-    h3 {
-      padding: 2px;
-      border-left: 4px solid #FFCC00;
-      border-bottom: 1px solid #FFCC00;
-    }
-  -->
-  </style>
-</head>
-<body>
-<h2>MakePatchDirs</h2>
-
-<h3>Perry's patch process with MakePatchDirs</h3>
-<p>Perry wrote a small program, which he is happy to share in source or binary form,
-that he uses to generate patch directories. Here is his process:</p>
-<ul>
-  <li><p>Update local cvs copy to ensure starting with most recent sources (optional).</p></li>
-  <li><p>Create a new directory for the patch, eg, "<code>Somewhere\WinMerge\patches\new_nifty_patch</code>".</p></li>
-  <li><p>Create a subdirectory called "<code>new_nifty_patch\original_all</code>" and copy WinMerge and common directories into it.</p></li>
-  <li><p>Copy this directory and rename the copy as "<code>new_nifty_patch\applied</code>"</p></li>
-  <li><p>Make changes to the code in the applied version and test until happy.</p></li>
-  <li>
-    <p>Run <code>MakePatchDirs</code>, and drag and drop the patch directory root
-    (<code>Somewhere\WinMerge\patches\new_nifty_patch</code>) into the edit box, then push the Go button.
-    This wipes and regenerates the directories <code>new_nifty_patch\original</code> and <code>new_nifty_patch\altered</code>, which contain all files altered
-    in the applied version, and the corresponding original files. (This purely uses timestamps;
-    it is not nearly as clever as WinMerge itself.)</p>
-  </li>
-  <li>
-    <p>Zip up the altered and original directories, and attach them to the patch. (I always
-    create the patch, then attach files afterwards, because SourceForge seems to always
-    lose attachments if they were attached when the patch is first created.)</p>
-  </li>
-</ul>
-
-<p>This process is optional; you are welcome to adopt it if you like. If you have
-a better system, please consider posting it on the developers forum so we may
-all potentially benefit.</p>
-
-<p>I, Perry, like having the applied subdirectory around to rerun tests with,
-for a little while, and like having the altered and original subdirectories
-which I can compare with WinMerge. :)</p>
-
-<p><a href="readme-developers.html">Back to readme-developers</a></p>
-</body>
-</html>
\ 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:[7034] trunk

[<ge...@us...>]

Revision: 7034
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7034&view=rev
Author:   gerundt
Date:     2009-11-14 17:02:15 +0000 (Sat, 14 Nov 2009)

Log Message:
-----------
PATCH: [ 2894123 ] Drop codepage translations

Modified Paths:
--------------
    trunk/Src/Merge.rc
    trunk/Src/resource.h
    trunk/Translations/WinMerge/English.pot

Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc	2009-11-10 15:18:11 UTC (rev 7033)
+++ trunk/Src/Merge.rc	2009-11-14 17:02:15 UTC (rev 7034)
@@ -2542,105 +2542,6 @@
     IDS_REGEXP_UNMATCHED_RPAREN "Unmatched ) or \\)"
 END
 
-// CODEPAGE GEOGRAPHIC GROUPS
-STRINGTABLE
-BEGIN
-	IDS_CPG_WESTERN_EUROPEAN        "Western European"
-	IDS_CPG_EASTERN_EUROPEAN        "Eastern European"
-	IDS_CPG_EAST_ASIAN              "East Asian"
-	IDS_CPG_SOUTH_ASIAN             "SE & SW Asian"
-	IDS_CPG_MIDDLE_EASTERN          "Middle Eastern"
-	IDS_CPG_NA                      "Not applicable"
-END
-
-// CODEPAGE PLATFORM GROUPS
-STRINGTABLE
-BEGIN
-	IDS_CPP_WINDOWS                 "MS-Windows"
-	IDS_CPP_DOS                     "MS-DOS"
-	IDS_CPP_MACINTOSH               "Macintosh"
-	IDS_CPP_IBM                     "IBM"
-	IDS_CPP_NA                      "Not applicable"
-END
-
-// CODEPAGES #1 (IBM)
-STRINGTABLE
-BEGIN
-	IDS_CP_EBCDIC                   "EBCDIC"
-	IDS_CP_IBM_EBCDIC_CYRILLIC      "IBM EBCDIC Cyrillic"
-END
-
-// CODEPAGES #1 (DOS)
-STRINGTABLE
-BEGIN
-	IDS_CP_DOS_US                   "MS-DOS Latin US"
-	IDS_CP_DOS_ARABIC               "MS-DOS Arabic"
-	IDS_CP_DOS_GREEK                "MS-DOS Greek"
-	IDS_CP_DOS_BALTIC               "MS-DOS Baltic Rim"
-	IDS_CP_DOS_LATIN1               "MS-DOS Latin 1"
-	IDS_CP_DOS_GREEK1               "MS-DOS Greek 1"
-	IDS_CP_DOS_LATIN2               "MS-DOS Latin 2"
-	IDS_CP_DOS_CYRILLIC             "MS-DOS Cyrillic"
-	IDS_CP_DOS_TURKISH              "MS-DOS Turkish"
-	IDS_CP_DOS_PORTUGUESE           "MS-DOS Portuguese"
-END
-
-// CODEPAGES #2 (more DOS)
-STRINGTABLE
-BEGIN
-	IDS_CP_DOS_ICELANDIC            "MS-DOS Icelandic"
-	IDS_CP_DOS_HEBREW               "MS-DOS Hebrew"
-	IDS_CP_DOS_FRENCH_CANADA        "MS-DOS French Canada"
-	IDS_CP_DOS_NORDIC               "MS-DOS Nordic"
-	IDS_CP_DOS_CYRILLIC_CIS1        "MS-DOS Cyrillic CIS 1"
-	IDS_CP_DOS_GREEK2               "MS-DOS Greek 2"
-END
-
-// CODEPAGES #3 (Windows)
-STRINGTABLE
-BEGIN
-	IDS_CP_WINDOWS_THAI             "Windows Thai"
-	IDS_CP_WINDOWS_JAPANESE         "Windows Japanese"
-	IDS_CP_WINDOWS_CHINESE_SIMP     "Windows Simplified Chinese"
-	IDS_CP_WINDOWS_KOREAN           "Windows Korean"
-	IDS_CP_WINDOWS_CHINESE_TRAD     "Windows Traditional Chinese"
-	IDS_CP_WINDOWS_LATIN2           "Windows Latin 2"
-	IDS_CP_WINDOWS_CYRILLIC         "Windows Cyrillic (Slavic)"
-	IDS_CP_WINDOWS_LATIN1           "Windows Latin 1"
-	IDS_CP_WINDOWS_GREEK            "Windows Greek"
-	IDS_CP_WINDOWS_TURKISH          "Windows Latin 5 (Turkish)"
-	IDS_CP_WINDOWS_HEBREW           "Windows Hebrew"
-	IDS_CP_WINDOWS_ARABIC           "Windows Arabic"
-	IDS_CP_WINDOWS_BALTIC           "Windows Baltic Rim"
-	IDS_CP_WINDOWS_VIETNAM          "Windows Vietnamese"
-END
-
-// CODEPAGES #4 (Macintosh)
-STRINGTABLE
-BEGIN
-	IDS_CP_MACINTOSH_ROMAN          "Macintosh Roman"
-	IDS_CP_MACINTOSH_GREEK          "Macintosh Greek"
-	IDS_CP_MACINTOSH_CYRILLIC       "Macintosh Cyrillic"
-	IDS_CP_MACINTOSH_CENTRAL_EUROPE "Macintosh "
-	IDS_CP_MACINTOSH_ICELANDIC      "Macintosh Central Europe"
-	IDS_CP_MACINTOSH_TURKISH        "Macintosh Turkish"
-END
-
-// CODEPAGES #5 (Extra (alias) information)
-STRINGTABLE
-BEGIN
-	IDS_CP_WINDOWS_JAPANESE_EXTRA   ""
-	IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA ""
-	IDS_CP_WINDOWS_KOREAN_EXTRA     ""
-	IDS_CP_WINDOWS_LATIN2_EXTRA     "Approximates ISO-8859-2"
-	IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA ""
-	IDS_CP_WINDOWS_CYRILLIC_EXTRA   ""
-	IDS_CP_WINDOWS_LATIN1_EXTRA     "Approximates ISO-8859-1"
-	IDS_CP_WINDOWS_GREEK_EXTRA      "Approximates ISO-8859-7"
-	IDS_CP_WINDOWS_TURKISH_EXTRA    "Approximates ISO-8859-9"
-	IDS_CP_WINDOWS_HEBREW_EXTRA     "Approximates ISO-8859-8"
-END
-
 // EOL types shown in folder compare EOL type column and in file compare statusbar
 STRINGTABLE
 BEGIN

Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h	2009-11-10 15:18:11 UTC (rev 7033)
+++ trunk/Src/resource.h	2009-11-14 17:02:15 UTC (rev 7034)
@@ -823,67 +823,6 @@
 #define IDS_UNICODING_UCS2_LE           18594
 #define IDS_UNICODING_UCS2_BE           18595
 #define IDD_LANGUAGE_SELECT             30000
-#define IDS_CPG_WESTERN_EUROPEAN        30200
-#define IDS_CPG_EASTERN_EUROPEAN        30201
-#define IDS_CPG_EAST_ASIAN              30202
-#define IDS_CPG_SOUTH_ASIAN             30203
-#define IDS_CPG_MIDDLE_EASTERN          30204
-#define IDS_CPG_NA                      30205
-#define IDS_CPP_WINDOWS                 30210
-#define IDS_CPP_DOS                     30211
-#define IDS_CPP_MACINTOSH               30212
-#define IDS_CPP_IBM                     30213
-#define IDS_CPP_NA                      30214
-#define IDS_CP_EBCDIC                   30220
-#define IDS_CP_IBM_EBCDIC_CYRILLIC      30221
-#define IDS_CP_DOS_US                   30230
-#define IDS_CP_DOS_ARABIC               30231
-#define IDS_CP_DOS_GREEK                30232
-#define IDS_CP_DOS_BALTIC               30233
-#define IDS_CP_DOS_LATIN1               30234
-#define IDS_CP_DOS_GREEK1               30235
-#define IDS_CP_DOS_LATIN2               30236
-#define IDS_CP_DOS_CYRILLIC             30237
-#define IDS_CP_DOS_TURKISH              30238
-#define IDS_CP_DOS_PORTUGUESE           30239
-#define IDS_CP_DOS_ICELANDIC            30250
-#define IDS_CP_DOS_HEBREW               30251
-#define IDS_CP_DOS_FRENCH_CANADA        30252
-#define IDS_CP_DOS_NORDIC               30253
-#define IDS_CP_DOS_CYRILLIC_CIS1        30254
-#define IDS_CP_DOS_GREEK2               30255
-#define IDS_CP_WINDOWS_THAI             30256
-#define IDS_CP_WINDOWS_JAPANESE         30257
-#define IDS_CP_WINDOWS_CHINESE_SIMP     30258
-#define IDS_CP_WINDOWS_KOREAN           30259
-#define IDS_CP_WINDOWS_CHINESE_TRAD     30270
-#define IDS_CP_WINDOWS_LATIN2           30271
-#define IDS_CP_WINDOWS_CYRILLIC         30272
-#define IDS_CP_WINDOWS_LATIN1           30273
-#define IDS_CP_WINDOWS_GREEK            30274
-#define IDS_CP_WINDOWS_TURKISH          30275
-#define IDS_CP_WINDOWS_HEBREW           30276
-#define IDS_CP_WINDOWS_ARABIC           30277
-#define IDS_CP_WINDOWS_BALTIC           30278
-#define IDS_CP_WINDOWS_VIETNAM          30279
-#define IDS_CP_MACINTOSH_ROMAN          30290
-#define IDS_CP_MACINTOSH_GREEK          30291
-#define IDS_CP_MACINTOSH_CYRILLIC       30292
-#define IDS_CP_MACINTOSH_CENTRAL_EUROPE 30293
-#define IDS_CP_MACINTOSH_ICELANDIC      30294
-#define IDS_CP_MACINTOSH_TURKISH        30295
-#define IDS_CP_UTF7                     30300
-#define IDS_CP_UTF8                     30301
-#define IDS_CP_WINDOWS_JAPANESE_EXTRA   30320
-#define IDS_CP_WINDOWS_CHINESE_SIMP_EXTRA 30321
-#define IDS_CP_WINDOWS_KOREAN_EXTRA     30322
-#define IDS_CP_WINDOWS_LATIN2_EXTRA     30323
-#define IDS_CP_WINDOWS_CHINESE_TRAD_EXTRA 30324
-#define IDS_CP_WINDOWS_CYRILLIC_EXTRA   30326
-#define IDS_CP_WINDOWS_LATIN1_EXTRA     30327
-#define IDS_CP_WINDOWS_GREEK_EXTRA      30328
-#define IDS_CP_WINDOWS_TURKISH_EXTRA    30329
-#define IDS_CP_WINDOWS_HEBREW_EXTRA     30340
 #define IDS_EOL_DOS                     30400
 #define IDS_EOL_MAC                     30401
 #define IDS_EOL_UNIX                    30402

Modified: trunk/Translations/WinMerge/English.pot
===================================================================
--- trunk/Translations/WinMerge/English.pot	2009-11-10 15:18:11 UTC (rev 7033)
+++ trunk/Translations/WinMerge/English.pot	2009-11-14 17:02:15 UTC (rev 7034)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2009-07-23 18:36+0000\n"
+"POT-Creation-Date: 2009-11-08 13:51+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -726,7 +726,7 @@
 msgstr ""
 
 #: Merge.rc:373
-#: Merge.rc:2807
+#: Merge.rc:2708
 #, c-format
 msgid "< Empty >"
 msgstr ""
@@ -3245,7 +3245,7 @@
 msgstr ""
 
 #: Merge.rc:2046
-#: Merge.rc:2671
+#: Merge.rc:2572
 #, c-format
 msgid "Name"
 msgstr ""
@@ -3266,7 +3266,7 @@
 msgstr ""
 
 #: Merge.rc:2050
-#: Merge.rc:2673
+#: Merge.rc:2574
 #, c-format
 msgid "Description"
 msgstr ""
@@ -3663,7 +3663,7 @@
 msgstr ""
 
 #: Merge.rc:2202
-#: Merge.rc:2655
+#: Merge.rc:2556
 #, c-format
 msgid "None"
 msgstr ""
@@ -4075,7 +4075,7 @@
 msgstr ""
 
 #: Merge.rc:2340
-#: Merge.rc:2651
+#: Merge.rc:2552
 #, c-format
 msgid "Binary"
 msgstr ""
@@ -4667,1001 +4667,735 @@
 
 #: Merge.rc:2548
 #, c-format
-msgid "Western European"
+msgid "Win"
 msgstr ""
 
 #: Merge.rc:2549
 #, c-format
-msgid "Eastern European"
+msgid "Mac"
 msgstr ""
 
 #: Merge.rc:2550
 #, c-format
-msgid "East Asian"
+msgid "Unix"
 msgstr ""
 
 #: Merge.rc:2551
 #, c-format
-msgid "SE & SW Asian"
+msgid "Mixed"
 msgstr ""
 
-#: Merge.rc:2552
-#, c-format
-msgid "Middle Eastern"
-msgstr ""
-
 #: Merge.rc:2553
-#: Merge.rc:2563
 #, c-format
-msgid "Not applicable"
-msgstr ""
-
-#: Merge.rc:2559
-#, c-format
-msgid "MS-Windows"
-msgstr ""
-
-#: Merge.rc:2560
-#, c-format
-msgid "MS-DOS"
-msgstr ""
-
-#: Merge.rc:2561
-#, c-format
-msgid "Macintosh"
-msgstr ""
-
-#: Merge.rc:2562
-#, c-format
-msgid "IBM"
-msgstr ""
-
-#: Merge.rc:2569
-#, c-format
-msgid "EBCDIC"
-msgstr ""
-
-#: Merge.rc:2570
-#, c-format
-msgid "IBM EBCDIC Cyrillic"
-msgstr ""
-
-#: Merge.rc:2576
-#, c-format
-msgid "MS-DOS Latin US"
-msgstr ""
-
-#: Merge.rc:2577
-#, c-format
-msgid "MS-DOS Arabic"
-msgstr ""
-
-#: Merge.rc:2578
-#, c-format
-msgid "MS-DOS Greek"
-msgstr ""
-
-#: Merge.rc:2579
-#, c-format
-msgid "MS-DOS Baltic Rim"
-msgstr ""
-
-#: Merge.rc:2580
-#, c-format
-msgid "MS-DOS Latin 1"
-msgstr ""
-
-#: Merge.rc:2581
-#, c-format
-msgid "MS-DOS Greek 1"
-msgstr ""
-
-#: Merge.rc:2582
-#, c-format
-msgid "MS-DOS Latin 2"
-msgstr ""
-
-#: Merge.rc:2583
-#, c-format
-msgid "MS-DOS Cyrillic"
-msgstr ""
-
-#: Merge.rc:2584
-#, c-format
-msgid "MS-DOS Turkish"
-msgstr ""
-
-#: Merge.rc:2585
-#, c-format
-msgid "MS-DOS Portuguese"
-msgstr ""
-
-#: Merge.rc:2591
-#, c-format
-msgid "MS-DOS Icelandic"
-msgstr ""
-
-#: Merge.rc:2592
-#, c-format
-msgid "MS-DOS Hebrew"
-msgstr ""
-
-#: Merge.rc:2593
-#, c-format
-msgid "MS-DOS French Canada"
-msgstr ""
-
-#: Merge.rc:2594
-#, c-format
-msgid "MS-DOS Nordic"
-msgstr ""
-
-#: Merge.rc:2595
-#, c-format
-msgid "MS-DOS Cyrillic CIS 1"
-msgstr ""
-
-#: Merge.rc:2596
-#, c-format
-msgid "MS-DOS Greek 2"
-msgstr ""
-
-#: Merge.rc:2602
-#, c-format
-msgid "Windows Thai"
-msgstr ""
-
-#: Merge.rc:2603
-#, c-format
-msgid "Windows Japanese"
-msgstr ""
-
-#: Merge.rc:2604
-#, c-format
-msgid "Windows Simplified Chinese"
-msgstr ""
-
-#: Merge.rc:2605
-#, c-format
-msgid "Windows Korean"
-msgstr ""
-
-#: Merge.rc:2606
-#, c-format
-msgid "Windows Traditional Chinese"
-msgstr ""
-
-#: Merge.rc:2607
-#, c-format
-msgid "Windows Latin 2"
-msgstr ""
-
-#: Merge.rc:2608
-#, c-format
-msgid "Windows Cyrillic (Slavic)"
-msgstr ""
-
-#: Merge.rc:2609
-#, c-format
-msgid "Windows Latin 1"
-msgstr ""
-
-#: Merge.rc:2610
-#, c-format
-msgid "Windows Greek"
-msgstr ""
-
-#: Merge.rc:2611
-#, c-format
-msgid "Windows Latin 5 (Turkish)"
-msgstr ""
-
-#: Merge.rc:2612
-#, c-format
-msgid "Windows Hebrew"
-msgstr ""
-
-#: Merge.rc:2613
-#, c-format
-msgid "Windows Arabic"
-msgstr ""
-
-#: Merge.rc:2614
-#, c-format
-msgid "Windows Baltic Rim"
-msgstr ""
-
-#: Merge.rc:2615
-#, c-format
-msgid "Windows Vietnamese"
-msgstr ""
-
-#: Merge.rc:2621
-#, c-format
-msgid "Macintosh Roman"
-msgstr ""
-
-#: Merge.rc:2622
-#, c-format
-msgid "Macintosh Greek"
-msgstr ""
-
-#: Merge.rc:2623
-#, c-format
-msgid "Macintosh Cyrillic"
-msgstr ""
-
-#: Merge.rc:2624
-#, c-format
-msgid "Macintosh "
-msgstr ""
-
-#: Merge.rc:2625
-#, c-format
-msgid "Macintosh Central Europe"
-msgstr ""
-
-#: Merge.rc:2626
-#, c-format
-msgid "Macintosh Turkish"
-msgstr ""
-
-#: Merge.rc:2635
-#, c-format
-msgid "Approximates ISO-8859-2"
-msgstr ""
-
-#: Merge.rc:2638
-#, c-format
-msgid "Approximates ISO-8859-1"
-msgstr ""
-
-#: Merge.rc:2639
-#, c-format
-msgid "Approximates ISO-8859-7"
-msgstr ""
-
-#: Merge.rc:2640
-#, c-format
-msgid "Approximates ISO-8859-9"
-msgstr ""
-
-#: Merge.rc:2641
-#, c-format
-msgid "Approximates ISO-8859-8"
-msgstr ""
-
-#: Merge.rc:2647
-#, c-format
-msgid "Win"
-msgstr ""
-
-#: Merge.rc:2648
-#, c-format
-msgid "Mac"
-msgstr ""
-
-#: Merge.rc:2649
-#, c-format
-msgid "Unix"
-msgstr ""
-
-#: Merge.rc:2650
-#, c-format
-msgid "Mixed"
-msgstr ""
-
-#: Merge.rc:2652
-#, c-format
 msgid "LF"
 msgstr ""
 
-#: Merge.rc:2653
+#: Merge.rc:2554
 #, c-format
 msgid "CR"
 msgstr ""
 
-#: Merge.rc:2654
+#: Merge.rc:2555
 #, c-format
 msgid "CRLF"
 msgstr ""
 
-#: Merge.rc:2661
+#: Merge.rc:2562
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2662
+#: Merge.rc:2563
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2663
+#: Merge.rc:2564
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2664
+#: Merge.rc:2565
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2665
+#: Merge.rc:2566
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2666
+#: Merge.rc:2567
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2672
+#: Merge.rc:2573
 #, c-format
 msgid "Type"
 msgstr ""
 
-#: Merge.rc:2674
+#: Merge.rc:2575
 #, c-format
 msgid "Unpacker"
 msgstr ""
 
-#: Merge.rc:2675
+#: Merge.rc:2576
 #, c-format
 msgid "Prediffer"
 msgstr ""
 
-#: Merge.rc:2676
+#: Merge.rc:2577
 #, c-format
 msgid "Editor script"
 msgstr ""
 
-#: Merge.rc:2683
+#: Merge.rc:2584
 #, c-format
 msgid "Save the left file"
 msgstr ""
 
-#: Merge.rc:2684
+#: Merge.rc:2585
 #, c-format
 msgid "Save the right file"
 msgstr ""
 
-#: Merge.rc:2685
+#: Merge.rc:2586
 #, c-format
 msgid "Save the left file with name..."
 msgstr ""
 
-#: Merge.rc:2686
+#: Merge.rc:2587
 #, c-format
 msgid "Save the right file with name..."
 msgstr ""
 
-#: Merge.rc:2687
+#: Merge.rc:2588
 #, c-format
 msgid "Change left side file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2688
+#: Merge.rc:2589
 #, c-format
 msgid "Change right side file/folder read-only status"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2590
 #, c-format
 msgid "Convert EOL to Windows mode"
 msgstr ""
 
-#: Merge.rc:2690
+#: Merge.rc:2591
 #, c-format
 msgid "Convert EOL to Unix mode"
 msgstr ""
 
-#: Merge.rc:2691
+#: Merge.rc:2592
 #, c-format
 msgid "Convert EOL to Mac mode"
 msgstr ""
 
-#: Merge.rc:2692
+#: Merge.rc:2593
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr ""
 
-#: Merge.rc:2693
+#: Merge.rc:2594
 #, c-format
 msgid "View and adjust file encoding properties\nFile encoding properties"
 msgstr ""
 
-#: Merge.rc:2694
+#: Merge.rc:2595
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2700
+#: Merge.rc:2601
 #, c-format
 msgid "Select difference area in the current line\nDifference in the Current Line"
 msgstr ""
 
-#: Merge.rc:2701
+#: Merge.rc:2602
 #, c-format
 msgid "Go to line or difference\nGo to (Ctrl+G)"
 msgstr ""
 
-#: Merge.rc:2702
+#: Merge.rc:2603
 #, c-format
 msgid "Set program options\nOptions"
 msgstr ""
 
-#: Merge.rc:2703
+#: Merge.rc:2604
 #, c-format
 msgid "Refresh display\nRefresh (F5)"
 msgstr ""
 
-#: Merge.rc:2704
+#: Merge.rc:2605
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr ""
 
-#: Merge.rc:2705
+#: Merge.rc:2606
 #, c-format
 msgid "Refresh selected items"
 msgstr ""
 
-#: Merge.rc:2706
+#: Merge.rc:2607
 #, c-format
 msgid "Toggle bookmark"
 msgstr ""
 
-#: Merge.rc:2707
+#: Merge.rc:2608
 #, c-format
 msgid "Go to next bookmark"
 msgstr ""
 
-#: Merge.rc:2708
+#: Merge.rc:2609
 #, c-format
 msgid "Go to previous bookmark"
 msgstr ""
 
-#: Merge.rc:2709
+#: Merge.rc:2610
 #, c-format
 msgid "Clear all bookmarks"
 msgstr ""
 
-#: Merge.rc:2715
+#: Merge.rc:2616
 #, c-format
 msgid "Displays items that are exactly the same\nShow Identical Items"
 msgstr ""
 
-#: Merge.rc:2716
+#: Merge.rc:2617
 #, c-format
 msgid "Displays items that have differences\nShow Different Items"
 msgstr ""
 
-#: Merge.rc:2717
+#: Merge.rc:2618
 #, c-format
 msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
 msgstr ""
 
-#: Merge.rc:2718
+#: Merge.rc:2619
 #, c-format
 msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
 msgstr ""
 
-#: Merge.rc:2719
+#: Merge.rc:2620
 #, c-format
 msgid "Displays binary files\nShow Binary Files"
 msgstr ""
 
-#: Merge.rc:2720
+#: Merge.rc:2621
 #, c-format
 msgid "Displays skipped items\nShow Skipped Items"
 msgstr ""
 
-#: Merge.rc:2726
+#: Merge.rc:2627
 #, c-format
 msgid "Select the font for the view\nSelect View Font"
 msgstr ""
 
-#: Merge.rc:2727
+#: Merge.rc:2628
 #, c-format
 msgid "Revert to using the default system font for view\nDefault Font"
 msgstr ""
 
-#: Merge.rc:2728
+#: Merge.rc:2629
 #, c-format
 msgid "Shows whitespace characters"
 msgstr ""
 
-#: Merge.rc:2729
+#: Merge.rc:2630
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr ""
 
-#: Merge.rc:2730
+#: Merge.rc:2631
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr ""
 
-#: Merge.rc:2731
+#: Merge.rc:2632
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr ""
 
-#: Merge.rc:2732
+#: Merge.rc:2633
 #, c-format
 msgid "Select the current user interface language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2733
+#: Merge.rc:2634
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
 msgstr ""
 
-#: Merge.rc:2734
+#: Merge.rc:2635
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr ""
 
-#: Merge.rc:2735
+#: Merge.rc:2636
 #, c-format
 msgid "Shows line numbers\nShow Line Numbers"
 msgstr ""
 
-#: Merge.rc:2736
+#: Merge.rc:2637
 #, c-format
 msgid "Enable word wrap\nWrap Lines"
 msgstr ""
 
-#: Merge.rc:2737
+#: Merge.rc:2638
 #, c-format
 msgid "Shows selection margins for both panes\nShow Selection Margins"
 msgstr ""
 
-#: Merge.rc:2738
+#: Merge.rc:2639
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2739
+#: Merge.rc:2640
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2740
+#: Merge.rc:2641
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2746
+#: Merge.rc:2647
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2747
+#: Merge.rc:2648
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2649
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2650
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2750
+#: Merge.rc:2651
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2751
+#: Merge.rc:2652
 #, c-format
 msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2752
+#: Merge.rc:2653
 #, c-format
 msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2753
+#: Merge.rc:2654
 #, c-format
 msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2754
+#: Merge.rc:2655
 #, c-format
 msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2755
+#: Merge.rc:2656
 #, c-format
 msgid "Copy all differences to the right file\nAll Right"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2657
 #, c-format
 msgid "Copy all differences to the left file\nAll Left"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2658
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2659
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr ""
 
-#: Merge.rc:2764
+#: Merge.rc:2665
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr ""
 
-#: Merge.rc:2765
+#: Merge.rc:2666
 #, c-format
 msgid "Generate a patch-file"
 msgstr ""
 
-#: Merge.rc:2766
+#: Merge.rc:2667
 #, c-format
 msgid "Select and modify filters"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2668
 #, c-format
 msgid "Generates a report from compare results"
 msgstr ""
 
-#: Merge.rc:2773
+#: Merge.rc:2674
 #, c-format
 msgid "Shows a list of available plugins"
 msgstr ""
 
-#: Merge.rc:2774
+#: Merge.rc:2675
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr ""
 
-#: Merge.rc:2775
+#: Merge.rc:2676
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr ""
 
-#: Merge.rc:2776
+#: Merge.rc:2677
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr ""
 
-#: Merge.rc:2777
+#: Merge.rc:2678
 #, c-format
 msgid "No prediffer (normal)"
 msgstr ""
 
-#: Merge.rc:2778
+#: Merge.rc:2679
 #, c-format
 msgid "Suggested plugins"
 msgstr ""
 
-#: Merge.rc:2779
+#: Merge.rc:2680
 #, c-format
 msgid "Other plugins"
 msgstr ""
 
-#: Merge.rc:2780
+#: Merge.rc:2681
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr ""
 
-#: Merge.rc:2786
+#: Merge.rc:2687
 #, c-format
 msgid "Activates next visible file\nActivate next File"
 msgstr ""
 
-#: Merge.rc:2787
+#: Merge.rc:2688
 #, c-format
 msgid "Closes all open windows"
 msgstr ""
 
-#: Merge.rc:2793
+#: Merge.rc:2694
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2794
+#: Merge.rc:2695
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr ""
 
-#: Merge.rc:2795
+#: Merge.rc:2696
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2796
+#: Merge.rc:2697
 #, c-format
 msgid "Private Build: %1"
 msgstr ""
 
-#: Merge.rc:2797
+#: Merge.rc:2698
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2798
+#: Merge.rc:2699
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2804
+#: Merge.rc:2705
 #, c-format
 msgid "Plugin Settings"
 msgstr ""
 
-#: Merge.rc:2805
+#: Merge.rc:2706
 #, c-format
 msgid "No prediffer"
 msgstr ""
 
-#: Merge.rc:2806
+#: Merge.rc:2707
 #, c-format
 msgid "Prediff if possible"
 msgstr ""
 
-#: Merge.rc:2808
+#: Merge.rc:2709
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr ""
 
-#: Merge.rc:2809
+#: Merge.rc:2710
 #, c-format
 msgid "<None>"
 msgstr ""
 
-#: Merge.rc:2810
+#: Merge.rc:2711
 #, c-format
 msgid "<Automatic>"
 msgstr ""
 
-#: Merge.rc:2816
+#: Merge.rc:2717
 #, c-format
 msgid "Open the file with registered application"
 msgstr ""
 
-#: Merge.rc:2817
+#: Merge.rc:2718
 #, c-format
 msgid "Open the file with external editor"
 msgstr ""
 
-#: Merge.rc:2818
+#: Merge.rc:2719
 #, c-format
 msgid "Open the file with a particular program"
 msgstr ""
 
-#: Merge.rc:2824
+#: Merge.rc:2725
 #, c-format
 msgid "Do not display moved blocks"
 msgstr ""
 
-#: Merge.rc:2825
+#: Merge.rc:2726
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2826
+#: Merge.rc:2727
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr ""
 
-#: Merge.rc:2827
+#: Merge.rc:2728
 #, c-format
 msgid "Go to diff under cursor"
 msgstr ""
 
-#: Merge.rc:2828
+#: Merge.rc:2729
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr ""
 
-#: Merge.rc:2829
+#: Merge.rc:2730
 #, c-format
 msgid "G&oto Line %1"
 msgstr ""
 
-#: Merge.rc:2835
+#: Merge.rc:2736
 #, c-format
 msgid "Disabled"
 msgstr ""
 
-#: Merge.rc:2836
+#: Merge.rc:2737
 #, c-format
 msgid "From file system"
 msgstr ""
 
-#: Merge.rc:2837
+#: Merge.rc:2738
 #, c-format
 msgid "From MRU list"
 msgstr ""
 
-#: Merge.rc:2843
+#: Merge.rc:2744
 #, c-format
 msgid "No Highlighting"
 msgstr ""
 
-#: Merge.rc:2844
+#: Merge.rc:2745
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2845
+#: Merge.rc:2746
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2846
+#: Merge.rc:2747
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2847
+#: Merge.rc:2748
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2848
+#: Merge.rc:2749
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2849
+#: Merge.rc:2750
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2850
+#: Merge.rc:2751
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2851
+#: Merge.rc:2752
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2852
+#: Merge.rc:2753
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2853
+#: Merge.rc:2754
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2854
+#: Merge.rc:2755
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2855
+#: Merge.rc:2756
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2856
+#: Merge.rc:2757
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2857
+#: Merge.rc:2758
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2858
+#: Merge.rc:2759
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2859
+#: Merge.rc:2760
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2860
+#: Merge.rc:2761
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2861
+#: Merge.rc:2762
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2862
+#: Merge.rc:2763
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2863
+#: Merge.rc:2764
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2864
+#: Merge.rc:2765
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2865
+#: Merge.rc:2766
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2866
+#: Merge.rc:2767
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2867
+#: Merge.rc:2768
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2868
+#: Merge.rc:2769
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2869
+#: Merge.rc:2770
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2870
+#: Merge.rc:2771
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2871
+#: Merge.rc:2772
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2872
+#: Merge.rc:2773
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2873
+#: Merge.rc:2774
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2874
+#: Merge.rc:2775
 #, c-format
 msgid "Verilog"
 msgstr ""
 
-#: Merge.rc:2875
+#: Merge.rc:2776
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2880
+#: Merge.rc:2781
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2881
+#: Merge.rc:2782
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2882
+#: Merge.rc:2783
 #, c-format
 msgid "Show big toolbar"
 msgstr ""


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

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

[<den...@us...>]

Revision: 7033
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7033&view=rev
Author:   denisbradford
Date:     2009-11-10 15:18:11 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
Suppress "the section called" prefix for xref links to sections.

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

Modified: trunk/Docs/Users/Manual/build/build_common.xsl
===================================================================
--- trunk/Docs/Users/Manual/build/build_common.xsl	2009-11-03 19:00:08 UTC (rev 7032)
+++ trunk/Docs/Users/Manual/build/build_common.xsl	2009-11-10 15:18:11 UTC (rev 7033)
@@ -49,6 +49,9 @@
 <xsl:param name="local.l10n.xml" select="document('')"/>
 <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
   <l:l10n language="en">
+     <l:context name="xref">
+       <l:template name="section" text="%t"/>
+     </l:context>
     <l:context name="xref-number-and-title">
       <l:template name="section" text="%t"/>
     </l:context>


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

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

[<ge...@us...>]

Revision: 7032
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7032&view=rev
Author:   gerundt
Date:     2009-11-03 19:00:08 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
BUG: [ 2884856 ] New Persian translation don't work

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

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-10-31 18:53:08 UTC (rev 7031)
+++ trunk/Docs/Users/ChangeLog.txt	2009-11-03 19:00:08 UTC (rev 7032)
@@ -3,6 +3,9 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.13.10
+  Bugfix: New Persian translation don't work (#2884856)
+
 WinMerge 2.13.9 - 2009-10-22 (r7025)
   Update PCRE to version 7.9 (r6903)
   Improve color options organization (#2818451)

Modified: trunk/Translations/WinMerge/Persian.po
===================================================================
--- trunk/Translations/WinMerge/Persian.po	2009-10-31 18:53:08 UTC (rev 7031)
+++ trunk/Translations/WinMerge/Persian.po	2009-11-03 19:00:08 UTC (rev 7032)
@@ -27,7 +27,7 @@
 #: Merge.rc:51
 #, c-format
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
-msgstr "LANG_FARSI, SUBLANG_PERSIAN_IRAN"
+msgstr "LANG_FARSI, SUBLANG_DEFAULT"
 
 #. Codepage
 #: Merge.rc:23


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

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

[<ge...@us...>]

Revision: 7031
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7031&view=rev
Author:   gerundt
Date:     2009-10-31 18:53:08 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Web: Update to SimplePie 1.2

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

Modified: trunk/Web/engine/simplepie/simplepie.inc
===================================================================
--- trunk/Web/engine/simplepie/simplepie.inc	2009-10-26 13:27:43 UTC (rev 7030)
+++ trunk/Web/engine/simplepie/simplepie.inc	2009-10-31 18:53:08 UTC (rev 7031)
@@ -5,7 +5,7 @@
  * A PHP-Based RSS and Atom Feed Framework.
  * Takes the hard work out of managing a complete RSS/Atom solution.
  *
- * Copyright (c) 2004-2008, Ryan Parman and Geoffrey Sneddon
+ * Copyright (c) 2004-2009, Ryan Parman and Geoffrey Sneddon
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
@@ -33,8 +33,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package SimplePie
- * @version 1.1.3
- * @copyright 2004-2008 Ryan Parman, Geoffrey Sneddon
+ * @version 1.2
+ * @copyright 2004-2009 Ryan Parman, Geoffrey Sneddon
  * @author Ryan Parman
  * @author Geoffrey Sneddon
  * @link http://simplepie.org/ SimplePie
@@ -51,12 +51,12 @@
 /**
  * SimplePie Version
  */
-define('SIMPLEPIE_VERSION', '1.1.3');
+define('SIMPLEPIE_VERSION', '1.2');
 
 /**
  * SimplePie Build
  */
-define('SIMPLEPIE_BUILD', 20081219);
+define('SIMPLEPIE_BUILD', '20090627192103');
 
 /**
  * SimplePie Website URL
@@ -242,6 +242,21 @@
 define('SIMPLEPIE_CONSTRUCT_ALL', 63);
 
 /**
+ * Don't change case
+ */
+define('SIMPLEPIE_SAME_CASE', 1);
+
+/**
+ * Change to lowercase
+ */
+define('SIMPLEPIE_LOWERCASE', 2);
+
+/**
+ * Change to uppercase
+ */
+define('SIMPLEPIE_UPPERCASE', 4);
+
+/**
  * PCRE for HTML attributes
  */
 define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:[\x09\x0A\x0B\x0C\x0D\x20]+[^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?)*)[\x09\x0A\x0B\x0C\x0D\x20]*');
@@ -376,11 +391,6 @@
  * SimplePie
  *
  * @package SimplePie
- * @version "Razzleberry"
- * @copyright 2004-2007 Ryan Parman, Geoffrey Sneddon
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @todo Option for type of fetching (cache, not modified header, fetch, etc.)
  */
 class SimplePie
 {
@@ -639,6 +649,13 @@
 	var $max_checked_feeds = 10;
 
 	/**
+	 * @var array All the feeds found during the autodiscovery process
+	 * @see SimplePie::get_all_discovered_feeds()
+	 * @access private
+	 */
+	var $all_discovered_feeds = array();
+
+	/**
 	 * @var string Web-accessible path to the handler_favicon.php file.
 	 * @see SimplePie::set_favicon_handler()
 	 * @access private
@@ -751,21 +768,24 @@
 	 */
 	function __destruct()
 	{
-		if (!empty($this->data['items']))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
 		{
-			foreach ($this->data['items'] as $item)
+			if (!empty($this->data['items']))
 			{
-				$item->__destruct();
+				foreach ($this->data['items'] as $item)
+				{
+					$item->__destruct();
+				}
+				unset($item, $this->data['items']);
 			}
-			unset($this->data['items']);
-		}
-		if (!empty($this->data['ordered_items']))
-		{
-			foreach ($this->data['ordered_items'] as $item)
+			if (!empty($this->data['ordered_items']))
 			{
-				$item->__destruct();
+				foreach ($this->data['ordered_items'] as $item)
+				{
+					$item->__destruct();
+				}
+				unset($item, $this->data['ordered_items']);
 			}
-			unset($this->data['ordered_items']);
 		}
 	}
 
@@ -1437,7 +1457,7 @@
 	 */
 	function set_favicon_handler($page = false, $qs = 'i')
 	{
-		if ($page != false)
+		if ($page !== false)
 		{
 			$this->favicon_handler = $page . '?' . $qs . '=';
 		}
@@ -1456,7 +1476,7 @@
 	 */
 	function set_image_handler($page = false, $qs = 'i')
 	{
-		if ($page != false)
+		if ($page !== false)
 		{
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
 		}
@@ -1479,45 +1499,31 @@
 
 	function init()
 	{
+		// Check absolute bare minimum requirements.
 		if ((function_exists('version_compare') && version_compare(PHP_VERSION, '4.3.0', '<')) || !extension_loaded('xml') || !extension_loaded('pcre'))
 		{
 			return false;
 		}
-		if (isset($_GET[$this->javascript]))
+		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
+		elseif (!extension_loaded('xmlreader'))
 		{
-			if (function_exists('ob_gzhandler'))
+			static $xml_is_sane = null;
+			if ($xml_is_sane === null)
 			{
-				ob_start('ob_gzhandler');
+				$parser_check = xml_parser_create();
+				xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+				xml_parser_free($parser_check);
+				$xml_is_sane = isset($values[0]['value']);
 			}
-			header('Content-type: text/javascript; charset: UTF-8');
-			header('Cache-Control: must-revalidate');
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
-			?>
-function embed_odeo(link) {
-	document.writeln('<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url='+link+'"></embed>');
-}
+			if (!$xml_is_sane)
+			{
+				return false;
+			}
+		}
 
-function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
-	if (placeholder != '') {
-		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
-	}
-	else {
-		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
-	}
-}
-
-function embed_flash(bgcolor, width, height, link, loop, type) {
-	document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
-}
-
-function embed_flv(width, height, link, placeholder, loop, player) {
-	document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
-}
-
-function embed_wmedia(width, height, link) {
-	document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
-}
-			<?php
+		if (isset($_GET[$this->javascript]))
+		{
+			SimplePie_Misc::output_javascript();
 			exit;
 		}
 
@@ -1547,13 +1553,13 @@
 					if (!empty($this->data))
 					{
 						// If the cache is for an outdated build of SimplePie
-						if (!isset($this->data['build']) || $this->data['build'] != SIMPLEPIE_BUILD)
+						if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
 						{
 							$cache->unlink();
 							$this->data = array();
 						}
 						// If we've hit a collision just rerun it with caching disabled
-						elseif (isset($this->data['url']) && $this->data['url'] != $this->feed_url)
+						elseif (isset($this->data['url']) && $this->data['url'] !== $this->feed_url)
 						{
 							$cache = false;
 							$this->data = array();
@@ -1565,7 +1571,7 @@
 							if ($cache->mtime() + $this->autodiscovery_cache_duration > time())
 							{
 								// Do not need to do feed autodiscovery yet.
-								if ($this->data['feed_url'] == $this->data['url'])
+								if ($this->data['feed_url'] === $this->data['url'])
 								{
 									$cache->unlink();
 									$this->data = array();
@@ -1595,7 +1601,7 @@
 								$file =& new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
 								if ($file->success)
 								{
-									if ($file->status_code == 304)
+									if ($file->status_code === 304)
 									{
 										$cache->touch();
 										return true;
@@ -1627,7 +1633,7 @@
 				// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
 				if (!isset($file))
 				{
-					if (is_a($this->file, 'SimplePie_File') && $this->file->url == $this->feed_url)
+					if (is_a($this->file, 'SimplePie_File') && $this->file->url === $this->feed_url)
 					{
 						$file =& $this->file;
 					}
@@ -1637,7 +1643,7 @@
 					}
 				}
 				// If the file connection has an error, set SimplePie::error to that and quit
-				if (!$file->success)
+				if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
 				{
 					$this->error = $file->error;
 					if (!empty($this->data))
@@ -1658,14 +1664,14 @@
 					{
 						// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 						unset($file);
-						if ($file = $locate->find($this->autodiscovery))
+						if ($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds))
 						{
 							if ($cache)
 							{
 								$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
 								if (!$cache->save($this))
 								{
-									trigger_error("$cache->name is not writeable", E_USER_WARNING);
+									trigger_error("$this->cache_location is not writeable", E_USER_WARNING);
 								}
 								$cache = call_user_func(array($this->cache_class, 'create'), $this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc');
 							}
@@ -1683,7 +1689,7 @@
 
 				$headers = $file->headers;
 				$data = $file->body;
-				$sniffer = new $this->content_type_sniffer_class($file);
+				$sniffer =& new $this->content_type_sniffer_class($file);
 				$sniffed = $sniffer->get_type();
 			}
 			else
@@ -1783,8 +1789,15 @@
 					}
 				}
 			}
-			// We have an error, just set SimplePie::error to it and quit
-			$this->error = sprintf('XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+			if(isset($parser))
+			{
+				// We have an error, just set SimplePie_Misc::error to it and quit
+				$this->error = sprintf('XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+			}
+			else
+			{
+				$this->error = 'The data could not be converted to UTF-8';
+			}
 			SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
 			return false;
 		}
@@ -1879,18 +1892,18 @@
 					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
 				}
 			}
-			elseif (isset($this->data['child']['']['rss']))
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
-				if (isset($this->data['child']['']['rss'][0]['attribs']['']['version']))
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
 				{
-					switch (trim($this->data['child']['']['rss'][0]['attribs']['']['version']))
+					switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
 					{
 						case '0.91':
 							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091;
-							if (isset($this->data['child']['']['rss'][0]['child']['']['skiphours']['hour'][0]['data']))
+							if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
 							{
-								switch (trim($this->data['child']['']['rss'][0]['child']['']['skiphours']['hour'][0]['data']))
+								switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
 								{
 									case '0':
 										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE;
@@ -1959,9 +1972,9 @@
 				{
 					$file =& new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
 
-					if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
+					if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
 					{
-						$sniffer = new $this->content_type_sniffer_class($file);
+						$sniffer =& new $this->content_type_sniffer_class($file);
 						if (substr($sniffer->get_type(), 0, 6) === 'image/')
 						{
 							if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
@@ -1974,6 +1987,11 @@
 								return $this->sanitize($favicon, SIMPLEPIE_CONSTRUCT_IRI);
 							}
 						}
+						// not an image
+						else
+						{
+							return false;
+						}
 					}
 				}
 			}
@@ -2018,7 +2036,7 @@
 	{
 		if ($this->feed_url !== null)
 		{
-			return 'outlook' . $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 2), SIMPLEPIE_CONSTRUCT_IRI);
+			return $this->sanitize('outlook' . SimplePie_Misc::fix_protocol($this->feed_url, 2), SIMPLEPIE_CONSTRUCT_IRI);
 		}
 		else
 		{
@@ -2063,12 +2081,12 @@
 	{
 		if ($this->subscribe_url())
 		{
-			$return = $this->sanitize($feed_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->feed_url);
+			$return = $feed_url . rawurlencode($this->feed_url);
 			if ($site_url !== null && $this->get_link() !== null)
 			{
-				$return .= $this->sanitize($site_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_link());
+				$return .= $site_url . rawurlencode($this->get_link());
 			}
-			return $return;
+			return $this->sanitize($return, SIMPLEPIE_CONSTRUCT_IRI);
 		}
 		else
 		{
@@ -2083,7 +2101,7 @@
 
 	function subscribe_bloglines()
 	{
-		return urldecode($this->subscribe_service('http://www.bloglines.com/sub/'));
+		return $this->subscribe_service('http://www.bloglines.com/sub/');
 	}
 
 	function subscribe_eskobo()
@@ -2177,9 +2195,9 @@
 		}
 		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
-			if (isset($this->data['child']['']['rss'][0]['child'][$namespace][$tag]))
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
 			{
-				return $this->data['child']['']['rss'][0]['child'][$namespace][$tag];
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag];
 			}
 		}
 		return null;
@@ -2217,7 +2235,7 @@
 		}
 		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
-			if ($channel = $this->get_feed_tags('', 'channel'))
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
 			{
 				if (isset($channel[0]['child'][$namespace][$tag]))
 				{
@@ -2253,7 +2271,7 @@
 		}
 		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
 		{
-			if ($image = $this->get_channel_tags('', 'image'))
+			if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
 			{
 				if (isset($image[0]['child'][$namespace][$tag]))
 				{
@@ -2303,7 +2321,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_channel_tags('', 'title'))
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
@@ -2357,9 +2375,20 @@
 			}
 			$categories[] =& new $this->category_class($term, $scheme, $label);
 		}
-		foreach ((array) $this->get_channel_tags('', 'category') as $category)
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
 		{
-			$categories[] =& new $this->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] =& new $this->category_class($term, $scheme, null);
 		}
 		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
 		{
@@ -2591,7 +2620,7 @@
 			{
 				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 			}
-			if ($links = $this->get_channel_tags('', 'link'))
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 			{
 				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 			}
@@ -2611,7 +2640,7 @@
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
 				}
-				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -2629,6 +2658,11 @@
 		}
 	}
 
+	function get_all_discovered_feeds()
+	{
+		return $this->all_discovered_feeds;
+	}
+
 	function get_description()
 	{
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
@@ -2647,9 +2681,9 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_channel_tags('', 'description'))
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
 		}
 		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
@@ -2683,7 +2717,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_channel_tags('', 'copyright'))
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -2703,7 +2737,7 @@
 
 	function get_language()
 	{
-		if ($return = $this->get_channel_tags('', 'language'))
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -2783,7 +2817,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
-		elseif ($return = $this->get_image_tags('', 'title'))
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -2823,7 +2857,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_image_tags('', 'url'))
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
 		}
@@ -2843,7 +2877,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_image_tags('', 'link'))
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
 		}
@@ -2855,11 +2889,11 @@
 
 	function get_image_width()
 	{
-		if ($return = $this->get_image_tags('', 'width'))
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
 		{
 			return round($return[0]['data']);
 		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags('', 'url'))
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 88.0;
 		}
@@ -2871,11 +2905,11 @@
 
 	function get_image_height()
 	{
-		if ($return = $this->get_image_tags('', 'height'))
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
 		{
 			return round($return[0]['data']);
 		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags('', 'url'))
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 31.0;
 		}
@@ -2887,8 +2921,9 @@
 
 	function get_item_quantity($max = 0)
 	{
+		$max = (int) $max;
 		$qty = count($this->get_items());
-		if ($max == 0)
+		if ($max === 0)
 		{
 			return $qty;
 		}
@@ -2913,58 +2948,62 @@
 
 	function get_items($start = 0, $end = 0)
 	{
-		if (!empty($this->multifeed_objects))
+		if (!isset($this->data['items']))
 		{
-			return SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
-		}
-		elseif (!isset($this->data['items']))
-		{
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
+			if (!empty($this->multifeed_objects))
 			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
-				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
-				}
+				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
 			}
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
+			else
 			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
+				$this->data['items'] = array();
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
 				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					}
 				}
-			}
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
 				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					}
 				}
-			}
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
 				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					}
 				}
-			}
-			if ($items = $this->get_channel_tags('', 'item'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
+				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
 				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					}
 				}
+				if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item'))
+				{
+					$keys = array_keys($items);
+					foreach ($keys as $key)
+					{
+						$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+					}
+				}
 			}
 		}
 
 		if (!empty($this->data['items']))
 		{
 			// If we want to order it by date, check if all items have a date, and then sort it
-			if ($this->order_by_date)
+			if ($this->order_by_date && empty($this->multifeed_objects))
 			{
 				if (!isset($this->data['ordered_items']))
 				{
@@ -2992,7 +3031,7 @@
 			}
 
 			// Slice the data as desired
-			if ($end == 0)
+			if ($end === 0)
 			{
 				return array_slice($items, $start);
 			}
@@ -3007,11 +3046,17 @@
 		}
 	}
 
+	/**
+	 * @static
+	 */
 	function sort_items($a, $b)
 	{
 		return $a->get_date('U') <= $b->get_date('U');
 	}
 
+	/**
+	 * @static
+	 */
 	function merge_items($urls, $start = 0, $end = 0, $limit = 0)
 	{
 		if (is_array($urls) && sizeof($urls) > 0)
@@ -3044,7 +3089,7 @@
 				usort($items, array('SimplePie', 'sort_items'));
 			}
 
-			if ($end == 0)
+			if ($end === 0)
 			{
 				return array_slice($items, $start);
 			}
@@ -3082,7 +3127,10 @@
 	 */
 	function __destruct()
 	{
-		unset($this->feed);
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		{
+			unset($this->feed);
+		}
 	}
 
 	function get_item_tags($namespace, $tag)
@@ -3124,7 +3172,7 @@
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 			}
-			elseif ($return = $this->get_item_tags('', 'guid'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 			}
@@ -3175,7 +3223,7 @@
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 			}
-			elseif ($return = $this->get_item_tags('', 'title'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 			}
@@ -3209,7 +3257,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_item_tags('', 'description'))
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
 		}
@@ -3299,9 +3347,20 @@
 			}
 			$categories[] =& new $this->feed->category_class($term, $scheme, $label);
 		}
-		foreach ((array) $this->get_item_tags('', 'category') as $category)
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
 		{
-			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] =& new $this->feed->category_class($term, $scheme, null);
 		}
 		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
 		{
@@ -3406,9 +3465,6 @@
 		}
 	}
 
-	/**
-	 * @todo Atom inheritance (item author, source author, feed author)
-	 */
 	function get_authors()
 	{
 		$authors = array();
@@ -3456,7 +3512,7 @@
 				$authors[] =& new $this->feed->author_class($name, $url, $email);
 			}
 		}
-		if ($author = $this->get_item_tags('', 'author'))
+		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author'))
 		{
 			$authors[] =& new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
 		}
@@ -3535,7 +3591,7 @@
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
-			elseif ($return = $this->get_item_tags('', 'pubDate'))
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
@@ -3656,13 +3712,13 @@
 			{
 				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 			}
-			if ($links = $this->get_item_tags('', 'link'))
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 			{
 				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 			}
-			if ($links = $this->get_item_tags('', 'guid'))
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
-				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) == 'true')
+				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
 				{
 					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 				}
@@ -3683,7 +3739,7 @@
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
 				}
-				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -4249,7 +4305,7 @@
 					$restriction_relationship = 'allow';
 					$restriction_type = null;
 					$restriction_value = 'itunes';
-					if (isset($restriction['data']) && strtolower($restriction['data']) == 'yes')
+					if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
 					{
 						$restriction_relationship = 'deny';
 					}
@@ -4285,7 +4341,7 @@
 					$restriction_relationship = 'allow';
 					$restriction_type = null;
 					$restriction_value = 'itunes';
-					if (isset($restriction['data']) && strtolower($restriction['data']) == 'yes')
+					if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
 					{
 						$restriction_relationship = 'deny';
 					}
@@ -5396,7 +5452,7 @@
 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
 			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] == 'enclosure')
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
 				{
 					// Attributes
 					$bitrate = null;
@@ -5431,7 +5487,7 @@
 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
 			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] == 'enclosure')
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
 				{
 					// Attributes
 					$bitrate = null;
@@ -5464,7 +5520,7 @@
 				}
 			}
 
-			if ($enclosure = $this->get_item_tags('', 'enclosure'))
+			if ($enclosure = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'enclosure'))
 			{
 				if (isset($enclosure[0]['attribs']['']['url']))
 				{
@@ -5499,7 +5555,7 @@
 				}
 			}
 
-			if (sizeof($this->data['enclosures']) == 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width))
+			if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width))
 			{
 				// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
 				$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
@@ -5578,16 +5634,16 @@
 	{
 		if ($this->get_permalink() !== null)
 		{
-			$return = $this->sanitize($item_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_permalink());
+			$return = $item_url . rawurlencode($this->get_permalink());
 			if ($title_url !== null && $this->get_title() !== null)
 			{
-				$return .= $this->sanitize($title_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_title());
+				$return .= $title_url . rawurlencode($this->get_title());
 			}
 			if ($summary_url !== null && $this->get_description() !== null)
 			{
-				$return .= $this->sanitize($summary_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_description());
+				$return .= $summary_url . rawurlencode($this->get_description());
 			}
-			return $return;
+			return $this->sanitize($return, SIMPLEPIE_CONSTRUCT_IRI);
 		}
 		else
 		{
@@ -5682,14 +5738,6 @@
 		return md5(serialize($this->data));
 	}
 
-	/**
-	 * Remove items that link back to this before destroying this object
-	 */
-	function __destruct()
-	{
-		unset($this->item);
-	}
-
 	function get_source_tags($namespace, $tag)
 	{
 		if (isset($this->data['child'][$namespace][$tag]))
@@ -5735,7 +5783,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_source_tags('', 'title'))
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
@@ -5789,9 +5837,20 @@
 			}
 			$categories[] =& new $this->item->feed->category_class($term, $scheme, $label);
 		}
-		foreach ((array) $this->get_source_tags('', 'category') as $category)
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
 		{
-			$categories[] =& new $this->item->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] =& new $this->item->feed->category_class($term, $scheme, null);
 		}
 		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
 		{
@@ -6023,7 +6082,7 @@
 			{
 				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 			}
-			if ($links = $this->get_source_tags('', 'link'))
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 			{
 				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 			}
@@ -6043,7 +6102,7 @@
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
 				}
-				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -6079,7 +6138,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_source_tags('', 'description'))
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
 		}
@@ -6115,7 +6174,7 @@
 		{
 			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
 		}
-		elseif ($return = $this->get_source_tags('', 'copyright'))
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -6135,7 +6194,7 @@
 
 	function get_language()
 	{
-		if ($return = $this->get_source_tags('', 'language'))
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -6934,11 +6993,11 @@
 		$mime = $mime[0];
 
 		// Process values for 'auto'
-		if ($width == 'auto')
+		if ($width === 'auto')
 		{
-			if ($mime == 'video')
+			if ($mime === 'video')
 			{
-				if ($height == 'auto')
+				if ($height === 'auto')
 				{
 					$width = 480;
 				}
@@ -6957,15 +7016,15 @@
 			}
 		}
 
-		if ($height == 'auto')
+		if ($height === 'auto')
 		{
-			if ($mime == 'audio')
+			if ($mime === 'audio')
 			{
 				$height = 0;
 			}
-			elseif ($mime == 'video')
+			elseif ($mime === 'video')
 			{
-				if ($width == 'auto')
+				if ($width === 'auto')
 				{
 					if ($widescreen)
 					{
@@ -6990,17 +7049,17 @@
 				$height = 376;
 			}
 		}
-		elseif ($mime == 'audio')
+		elseif ($mime === 'audio')
 		{
 			$height = 0;
 		}
 
 		// Set proper placeholder value
-		if ($mime == 'audio')
+		if ($mime === 'audio')
 		{
 			$placeholder = $audio;
 		}
-		elseif ($mime == 'video')
+		elseif ($mime === 'video')
 		{
 			$placeholder = $video;
 		}
@@ -7019,7 +7078,7 @@
 		}
 
 		// Odeo Feed MP3's
-		if ($handler == 'odeo')
+		if ($handler === 'odeo')
 		{
 			if ($native)
 			{
@@ -7032,7 +7091,7 @@
 		}
 
 		// Flash
-		elseif ($handler == 'flash')
+		elseif ($handler === 'flash')
 		{
 			if ($native)
 			{
@@ -7046,7 +7105,7 @@
 
 		// Flash Media Player file types.
 		// Preferred handler for MP3 file types.
-		elseif ($handler == 'fmedia' || ($handler == 'mp3' && $mediaplayer != ''))
+		elseif ($handler === 'fmedia' || ($handler === 'mp3' && $mediaplayer !== ''))
 		{
 			$height += 20;
 			if ($native)
@@ -7061,15 +7120,17 @@
 
 		// QuickTime 7 file types.  Need to test with QuickTime 6.
 		// Only handle MP3's if the Flash Media Player is not present.
-		elseif ($handler == 'quicktime' || ($handler == 'mp3' && $mediaplayer == ''))
+		elseif ($handler === 'quicktime' || ($handler === 'mp3' && $mediaplayer === ''))
 		{
 			$height += 16;
 			if ($native)
 			{
-				if ($placeholder != ""){
+				if ($placeholder !== '')
+				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
-				else {
+				else
+				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 			}
@@ -7080,7 +7141,7 @@
 		}
 
 		// Windows Media
-		elseif ($handler == 'wmedia')
+		elseif ($handler === 'wmedia')
 		{
 			$height += 45;
 			if ($native)
@@ -7102,7 +7163,7 @@
 	function get_real_type($find_handler = false)
 	{
 		// If it's Odeo, let's get it out of the way.
-		if (substr(strtolower($this->get_link()), 0, 15) == 'http://odeo.com')
+		if (substr(strtolower($this->get_link()), 0, 15) === 'http://odeo.com')
 		{
 			return 'odeo';
 		}
@@ -7630,7 +7691,7 @@
 				}
 
 				$this->headers = curl_exec($fp);
-				if (curl_errno($fp) == 23 || curl_errno($fp) == 61)
+				if (curl_errno($fp) === 23 || curl_errno($fp) === 61)
 				{
 					curl_setopt($fp, CURLOPT_ENCODING, 'none');
 					$this->headers = curl_exec($fp);
@@ -7652,7 +7713,7 @@
 						$this->headers = $parser->headers;
 						$this->body = $parser->body;
 						$this->status_code = $parser->status_code;
-						if (($this->status_code == 300 || $this->status_code == 301 || $this->status_code == 302 || $this->status_code == 303 || $this->status_code == 307 || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+						if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
 						{
 							$this->redirects++;
 							$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
@@ -7665,7 +7726,7 @@
 			{
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
 				$url_parts = parse_url($url);
-				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) == 'https')
+				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
 				{
 					$url_parts['host'] = "ssl://$url_parts[host]";
 					$url_parts['port'] = 443;
@@ -7733,7 +7794,7 @@
 							$this->headers = $parser->headers;
 							$this->body = $parser->body;
 							$this->status_code = $parser->status_code;
-							if (($this->status_code == 300 || $this->status_code == 301 || $this->status_code == 302 || $this->status_code == 303 || $this->status_code == 307 || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+							if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
 							{
 								$this->redirects++;
 								$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
@@ -7746,7 +7807,7 @@
 								{
 									case 'gzip':
 									case 'x-gzip':
-										$decoder = new SimplePie_gzdecode($this->body);
+										$decoder =& new SimplePie_gzdecode($this->body);
 										if (!$decoder->parse())
 										{
 											$this->error = 'Unable to decode HTTP "gzip" stream';
@@ -8440,7 +8501,7 @@
 			if ($this->flags & 8)
 			{
 				// Get the length of the filename
-				$len = strspn($this->compressed_data, "\x00", $this->position);
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
 
 				// Check the length of the string is still valid
 				$this->min_compressed_size += $len + 1;
@@ -8460,7 +8521,7 @@
 			if ($this->flags & 16)
 			{
 				// Get the length of the comment
-				$len = strspn($this->compressed_data, "\x00", $this->position);
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
 
 				// Check the length of the string is still valid
 				$this->min_compressed_size += $len + 1;
@@ -8558,7 +8619,19 @@
 	 */
 	function create($location, $filename, $extension)
 	{
-		return new SimplePie_Cache_File($location, $filename, $extension);
+		$location_iri =& new SimplePie_IRI($location);
+		switch ($location_iri->get_scheme())
+		{
+			case 'mysql':
+				if (extension_loaded('mysql'))
+				{
+					return new SimplePie_Cache_MySQL($location_iri, $filename, $extension);
+				}
+				break;
+
+			default:
+				return new SimplePie_Cache_File($location, $filename, $extension);
+		}
 	}
 }
 
@@ -8572,9 +8645,9 @@
 	function SimplePie_Cache_File($location, $filename, $extension)
 	{
 		$this->location = $location;
-		$this->filename = rawurlencode($filename);
-		$this->extension = rawurlencode($extension);
-		$this->name = "$location/$this->filename.$this->extension";
+		$this->filename = $filename;
+		$this->extension = $extension;
+		$this->name = "$this->location/$this->filename.$this->extension";
 	}
 
 	function save($data)
@@ -8643,112 +8716,398 @@
 	}
 }
 
-class SimplePie_Misc
+class SimplePie_Cache_DB
 {
-	function time_hms($seconds)
+	function prepare_simplepie_object_for_cache($data)
 	{
-		$time = '';
+		$items = $data->get_items();
+		$items_by_id = array();
 
-		$hours = floor($seconds / 3600);
-		$remainder = $seconds % 3600;
-		if ($hours > 0)
+		if (!empty($items))
 		{
-			$time .= $hours.':';
+			foreach ($items as $item)
+			{
+				$items_by_id[$item->get_id()] = $item;
+			}
+
+			if (count($items_by_id) !== count($items))
+			{
+				$items_by_id = array();
+				foreach ($items as $item)
+				{
+					$items_by_id[$item->get_id(true)] = $item;
+				}
+			}
+
+			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
+			}
+			else
+			{
+				$channel = null;
+			}
+
+			if ($channel !== null)
+			{
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']);
+				}
+			}
+			if (isset($data->data['items']))
+			{
+				unset($data->data['items']);
+			}
+			if (isset($data->data['ordered_items']))
+			{
+				unset($data->data['ordered_items']);
+			}
 		}
+		return array(serialize($data->data), $items_by_id);
+	}
+}
 
-		$minutes = floor($remainder / 60);
-		$seconds = $remainder % 60;
-		if ($minutes < 10 && $hours > 0)
+class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
+{
+	var $mysql;
+	var $options;
+	var $id;
+
+	function SimplePie_Cache_MySQL($mysql_location, $name, $extension)
+	{
+		$host = $mysql_location->get_host();
+		if (SimplePie_Misc::stripos($host, 'unix(') === 0 && substr($host, -1) === ')')
 		{
-			$minutes = '0' . $minutes;
+			$server = ':' . substr($host, 5, -1);
 		}
-		if ($seconds < 10)
+		else
 		{
-			$seconds = '0' . $seconds;
+			$server = $host;
+			if ($mysql_location->get_port() !== null)
+			{
+				$server .= ':' . $mysql_location->get_port();
+			}
 		}
 
-		$time .= $minutes.':';
-		$time .= $seconds;
+		if (strpos($mysql_location->get_userinfo(), ':') !== false)
+		{
+			list($username, $password) = explode(':', $mysql_location->get_userinfo(), 2);
+		}
+		else
+		{
+			$username = $mysql_location->get_userinfo();
+			$password = null;
+		}
 
-		return $time;
+		if ($this->mysql = mysql_connect($server, $username, $password))
+		{
+			$this->id = $name . $extension;
+			$this->options = SimplePie_Misc::parse_str($mysql_location->get_query());
+			if (!isset($this->options['prefix'][0]))
+			{
+				$this->options['prefix'][0] = '';
+			}
+
+			if (mysql_select_db(ltrim($mysql_location->get_path(), '/'))
+				&& mysql_query('SET NAMES utf8')
+				&& ($query = mysql_unbuffered_query('SHOW TABLES')))
+			{
+				$db = array();
+				while ($row = mysql_fetch_row($query))
+				{
+					$db[] = $row[0];
+				}
+
+				if (!in_array($this->options['prefix'][0] . 'cache_data', $db))
+				{
+					if (!mysql_query('CREATE TABLE `' . $this->options['prefix'][0] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))'))
+					{
+						$this->mysql = null;
+					}
+				}
+
+				if (!in_array($this->options['prefix'][0] . 'items', $db))
+				{
+					if (!mysql_query('CREATE TABLE `' . $this->options['prefix'][0] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))'))
+					{
+						$this->mysql = null;
+					}
+				}
+			}
+			else
+			{
+				$this->mysql = null;
+			}
+		}
 	}
 
-	function absolutize_url($relative, $base)
+	function save($data)
 	{
-		if ($relative !== '')
+		if ($this->mysql)
 		{
-			$relative = SimplePie_Misc::parse_url($relative);
-			if ($relative['scheme'] !== '')
+			$feed_id = "'" . mysql_real_escape_string($this->id) . "'";
+
+			if (is_a($data, 'SimplePie'))
 			{
-				$target = $relative;
-			}
-			elseif ($base !== '')
-			{
-				$base = SimplePie_Misc::parse_url($base);
-				$target = SimplePie_Misc::parse_url('');
-				if ($relative['authority'] !== '')
+				if (SIMPLEPIE_PHP5)
 				{
-					$target = $relative;
-					$target['scheme'] = $base['scheme'];
+					// This keyword needs to defy coding standards for PHP4 compatibility
+					$data = clone($data);
 				}
-				else
+
+				$prepared = $this->prepare_simplepie_object_for_cache($data);
+
+				if ($query = mysql_query('SELECT `id` FROM `' . $this->options['prefix'][0] . 'cache_data` WHERE `id` = ' . $feed_id, $this->mysql))
 				{
-					$target['scheme'] = $base['scheme'];
-					$target['authority'] = $base['authority'];
-					if ($relative['path'] !== '')
+					if (mysql_num_rows($query))
 					{
-						if (strpos($relative['path'], '/') === 0)
+						$items = count($prepared[1]);
+						if ($items)
 						{
-							$target['path'] = $relative['path'];
+							$sql = 'UPDATE `' . $this->options['prefix'][0] . 'cache_data` SET `items` = ' . $items . ', `data` = \'' . mysql_real_escape_string($prepared[0]) . '\', `mtime` = ' . time() . ' WHERE `id` = ' . $feed_id;
 						}
-						elseif ($base['authority'] !== '' && $base['path'] === '')
+						else
 						{
-							$target['path'] = '/' . $relative['path'];
+							$sql = 'UPDATE `' . $this->options['prefix'][0] . 'cache_data` SET `data` = \'' . mysql_real_escape_string($prepared[0]) . '\', `mtime` = ' . time() . ' WHERE `id` = ' . $feed_id;
 						}
-						elseif (($last_segment = strrpos($base['path'], '/')) !== false)
+
+						if (!mysql_query($sql, $this->mysql))
 						{
-							$target['path'] = substr($base['path'], 0, $last_segment + 1) . $relative['path'];
+							return false;
 						}
-						else
-						{
-							$target['path'] = $relative['path'];
-						}
-						$target['query'] = $relative['query'];
 					}
-					else
+					elseif (!mysql_query('INSERT INTO `' . $this->options['prefix'][0] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(' . $feed_id . ', ' . count($prepared[1]) . ', \'' . mysql_real_escape_string($prepared[0]) . '\', ' . time() . ')', $this->mysql))
 					{
-						$target['path'] = $base['path'];
-						if ($relative['query'] !== '')
+						return false;
+					}
+
+					$ids = array_keys($prepared[1]);
+					if (!empty($ids))
+					{
+						foreach ($ids as $id)
 						{
-							$target['query'] = $relative['query'];
+							$database_ids[] = mysql_real_escape_string($id);
 						}
-						elseif ($base['query'] !== '')
+
+						if ($query = mysql_unbuffered_query('SELECT `id` FROM `' . $this->options['prefix'][0] . 'items` WHERE `id` = \'' . implode('\' OR `id` = \'', $database_ids) . '\' AND `feed_id` = ' . $feed_id, $this->mysql))
 						{
-							$target['query'] = $base['query'];
+							$existing_ids = array();
+							while ($row = mysql_fetch_row($query))
+							{
+								$existing_ids[] = $row[0];
+							}
+
+							$new_ids = array_diff($ids, $existing_ids);
+
+							foreach ($new_ids as $new_id)
+							{
+								if (!($date = $prepared[1][$new_id]->get_date('U')))
+								{
+									$date = time();
+								}
+
+								if (!mysql_query('INSERT INTO `' . $this->options['prefix'][0] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(' . $feed_id . ', \'' . mysql_real_escape_string($new_id) . '\', \'' . mysql_real_escape_string(serialize($prepared[1][$new_id]->data)) . '\', ' . $date . ')', $this->mysql))
+								{
+									return false;
+								}
+							}
+							return true;
 						}
 					}
+					else
+					{
+						return true;
+					}
 				}
-				$target['fragment'] = $relative['fragment'];
 			}
+			elseif ($query = mysql_query('SELECT `id` FROM `' . $this->options['prefix'][0] . 'cache_data` WHERE `id` = ' . $feed_id, $this->mysql))
+			{
+				if (mysql_num_rows($query))
+				{
+					if (mysql_query('UPDATE `' . $this->options['prefix'][0] . 'cache_data` SET `items` = 0, `data` = \'' . mysql_real_escape_string(serialize($data)) . '\', `mtime` = ' . time() . ' WHERE `id` = ' . $feed_id, $this->mysql))
+					{
+						return true;
+					}
+				}
+				elseif (mysql_query('INSERT INTO `' . $this->options['prefix'][0] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(\'' . mysql_real_escape_string($this->id) . '\', 0, \'' . mysql_real_escape_string(serialize($data)) . '\', ' . time() . ')', $this->mysql))
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	function load()
+	{
+		if ($this->mysql && ($query = mysql_query('SELECT `items`, `data` FROM `' . $this->options['prefix'][0] . 'cache_data` WHERE `id` = \'' . mysql_real_escape_string($this->id) . "'", $this->mysql)) && ($row = mysql_fetch_row($query)))
+		{
+			$data = unserialize($row[1]);
+
+			if (isset($this->options['items'][0]))
+			{
+				$items = (int) $this->options['items'][0];
+			}
 			else
 			{
-				// No base URL, just return the relative URL
-				$target = $relative;
+				$items = (int) $row[0];
 			}
-			$return = SimplePie_Misc::compress_parse_url($target['scheme'], $target['authority'], $target['path'], $target['query'], $target['fragment']);
+
+			if ($items !== 0)
+			{
+				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+				}
+				else
+				{
+					$feed = null;
+				}
+
+				if ($feed !== null)
+				{
+					$sql = 'SELECT `data` FROM `' . $this->options['prefix'][0] . 'items` WHERE `feed_id` = \'' . mysql_real_escape_string($this->id) . '\' ORDER BY `posted` DESC';
+					if ($items > 0)
+					{
+						$sql .= ' LIMIT ' . $items;
+					}
+
+					if ($query = mysql_unbuffered_query($sql, $this->mysql))
+					{
+						while ($row = mysql_fetch_row($query))
+						{
+							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row[0]);
+						}
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			return $data;
 		}
+		return false;
+	}
+
+	function mtime()
+	{
+		if ($this->mysql && ($query = mysql_query('SELECT `mtime` FROM `' . $this->options['prefix'][0] . 'cache_data` WHERE `id` = \'' . mysql_real_escape_string($this->id) . "'", $this->mysql)) && ($row = mysql_fetch_row($query)))
+		{
+			return $row[0];
+		}
 		else
 		{
-			$return = $base;
+			return false;
 		}
-		$return = SimplePie_Misc::normalize_url($return);
-		return $return;
 	}
 
+	function touch()
+	{
+		if ($this->mysql && ($query = mysql_query('UPDATE `' . $this->options['prefix'][0] . 'cache_data` SET `mtime` = ' . time() . ' WHERE `id` = \'' . mysql_real_escape_string($this->id) . "'", $this->mysql)) && mysql_affected_rows($this->mysql))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	function unlink()
+	{
+		if ($this->mysql && ($query = mysql_query('DELETE FROM `' . $this->options['prefix'][0] . 'cache_data` WHERE `id` = \'' . mysql_real_escape_string($this->id) . "'", $this->mysql)) && ($query2 = mysql_query('DELETE FROM `' . $this->options['prefix'][0] . 'items` WHERE `feed_id` = \'' . mysql_real_escape_string($this->id) . "'", $this->mysql)))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+
+class SimplePie_Misc
+{
+	function time_hms($seconds)
+	{
+		$time = '';
+
+		$hours = floor($seconds / 3600);
+		$remainder = $seconds % 3600;
+		if ($hours > 0)
+		{
+			$time .= $hours.':';
+		}
+
+		$minutes = floor($remainder / 60);
+		$seconds = $remainder % 60;
+		if ($minutes < 10 && $hours > 0)
+		{
+			$minutes = '0' . $minutes;
+		}
+		if ($seconds < 10)
+		{
+			$seconds = '0' . $seconds;
+		}
+
+		$time .= $minutes.':';
+		$time .= $seconds;
+
+		return $time;
+	}
+
+	function absolutize_url($relative, $base)
+	{
+		$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
+		return $iri->get_iri();
+	}
+
 	function remove_dot_segments($input)
 	{
 		$output = '';
-		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input == '.' || $input == '..')
+		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..')
 		{
 			// A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
 			if (strpos($input, '../') === 0)
@@ -8764,7 +9123,7 @@
 			{
 				$input = substr_replace($input, '/', 0, 3);
 			}
-			elseif ($input == '/.')
+			elseif ($input === '/.')
 			{
 				$input = '/';
 			}
@@ -8774,13 +9133,13 @@
 				$input = substr_replace($input, '/', 0, 4);
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
-			elseif ($input == '/..')
+			elseif ($input === '/..')
 			{
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
 			// D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
-			elseif ($input == '.' || $input == '..')
+			elseif ($input === '.' || $input === '..')
 			{
 				$input = '';
 			}
@@ -8824,7 +9183,7 @@
 				{
 					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
 					{
-						if (count($attribs[$j]) == 2)
+						if (count($attribs[$j]) === 2)
 						{
 							$attribs[$j][2] = $attribs[$j][1];
 						}
@@ -8857,22 +9216,25 @@
 
 	function error($message, $level, $file, $line)
 	{
-		switch ($level)
+		if ((ini_get('error_reporting') & $level) > 0)
 		{
-			case E_USER_ERROR:
-				$note = 'PH...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7030] trunk/Docs/Users/Manual/tour/tour_comparingdirs .xml

[<den...@us...>]

Revision: 7030
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7030&view=rev
Author:   denisbradford
Date:     2009-10-26 13:27:43 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Minor copy edit.

Modified Paths:
--------------
    trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml

Modified: trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml
===================================================================
--- trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml	2009-10-24 14:12:59 UTC (rev 7029)
+++ trunk/Docs/Users/Manual/tour/tour_comparingdirs.xml	2009-10-26 13:27:43 UTC (rev 7030)
@@ -54,7 +54,8 @@
 
     <para>The <inlinemediaobject>
         <imageobject>
-          <imagedata contentwidth="23" fileref="screenshots/nav_uparrow_btn_tr.png" />
+          <imagedata contentwidth="23"
+                     fileref="screenshots/nav_uparrow_btn_tr.png" />
         </imageobject>
 
         <textobject>
@@ -105,26 +106,23 @@
   <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>So far we have looked at a non-recursive comparison, which includes
+    files only in the root of the two folders you select, not any subfolders
+    that they contain. To compare their subfolders, you have to launch a new
+    compare operation. For example, in the preceding comparison, double-click
+    the <filename>Common</filename> folder icon to open a new File Compare
+    window that compares the two <filename>Common</filename> folders.</para>
 
-    <para>You can also compare folders recursively. A recursive comparison
+    <para>WinMerge 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>
+    separate compare operations to navigate nested folders. </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>
+    <para>For targets with many nested folders and files, a recursive comparison
+    can can take longer than a non-recursive comparison, and the result can be
+    harder to read. In this case, consider displaying the results of recursive
+    comparisons in a hierachical tree view instead of the default tabular view.
+    Folders are initially collapsed for a compact, readable display — expand
+    just the ones whose contents you want to see:</para>
 
     <mediaobject>
       <imageobject>
@@ -140,15 +138,14 @@
   <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>Merging in the Folder Compare window involves either copying items
+    (files or folders) between folders, or deleting items.</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>
+    <para>For example, suppose you want to synchronize two folders. 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>
@@ -169,4 +166,4 @@
     displays the result in a new File Compare window, where you can see and
     merge the line-level differences.</para>
   </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:[7029] trunk/Translations/Web

[<ge...@us...>]

Revision: 7029
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7029&view=rev
Author:   gerundt
Date:     2009-10-24 14:12:59 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Web: Fix typo in quick tour description - Fix PO(T) files too

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

Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po	2009-10-24 13:17:57 UTC (rev 7028)
+++ trunk/Translations/Web/de.po	2009-10-24 14:12:59 UTC (rev 7029)
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-09-16 20:01+0100\n"
+"POT-Creation-Date: 2009-10-24 15:18+0000\n"
+"PO-Revision-Date: 2009-10-24 16:08+0100\n"
 "Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
 "Language-Team: German <win...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -306,7 +306,7 @@
 #: 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 ""
+msgstr "Der Ordnervergleich zeigt alle gefundenen Dateien und Unterordner der verglichenen Ordner als Liste. Der Ordnervergleich synchronisiert Ordner durch Kopieren und Löschen von Dateien und Unterordnern. Die Ordnervergleichs-Ansicht kann vielseitig angepasst werden.angepasst werden."
 
 #: engine\page.inc:276
 #: engine\page.inc:320
@@ -317,7 +317,7 @@
 #: 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 ""
+msgstr "Wir verlangen die Registrierung, da durch anonyme Beiträge eine Menge von Spam verursacht werden und auch, weil es keine Möglichkeit gibt, die Personen zu kontaktieren und nach weiteren Informationen zu fragen."
 
 #: engine\page.inc:322
 #: support\mailing-lists.php:7
@@ -334,7 +334,7 @@
 #: 404.php:12
 #, c-format
 msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
-msgstr ""
+msgstr "Aus irgendeinem Grund (vertippte URL, fehlerhafte Verlinkung von einer anderen Seite, nicht mehr aktuelle Einträge in Suchmaschinen oder wir haben einfach eine Datei gelöscht) konnte die Seite, die Sie suchen, nicht gefunden werden."
 
 #: index.php:19
 #: about\index.php:11
@@ -345,7 +345,7 @@
 #: 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 ""
+msgstr "Wir senden selten direkt E-Mails, aber Sie werden Mitteilungen erhalten, wenn wir Fragen in dem Fehler-Eintrag stellen."
 
 #: downloads\index.php:25
 #: downloads\plugins.php:20
@@ -510,11 +510,6 @@
 msgid "We currently have WinMerge translated into the languages listed below:"
 msgstr "Wir haben aktuell WinMerge in die folgenden Sprachen übersetzt:"
 
-#: 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
@@ -623,7 +618,7 @@
 #: engine\page.inc:307
 #, c-format
 msgid "WinMerge Quick Tour"
-msgstr ""
+msgstr "WinMerge Schnelleinstieg"
 
 #: 404.php:11
 #, c-format
@@ -721,12 +716,12 @@
 #: engine\page.inc:307
 #, c-format
 msgid "Quick Tour"
-msgstr ""
+msgstr "Schnelleinstieg"
 
 #: translations\index.php:29
 #, c-format
 msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>&#8594; <span class=\"guimenuitem\">Language</span> menu choice."
-msgstr ""
+msgstr "Um die Sprache zu ändern, wählen Sie die gewünschte Sprache aus der <span class=\"guimenu\">Ansicht</span>&#8594; <span class=\"guimenuitem\">Sprache</span> Menüauswahl."
 
 #: translations\translations.inc:136
 #: translations\translations_branch.inc:71
@@ -866,7 +861,7 @@
 #: about\screenshots\index.php:29
 #, c-format
 msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
-msgstr ""
+msgstr "Die Positionsleiste ist eine praktische Seitenleiste, die eine Karte der Unterschiede der verglichenen Dateien anzeigt."
 
 #: docs\index.php:5
 #, c-format
@@ -1104,7 +1099,7 @@
 #: 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 ""
+msgstr "Das englische Open Discussion-Forum ist der schnellste Weg um Hilfe zu bekommen. Eine andere Möglichkeit ist das Abonnieren der Support-Verteilerliste."
 
 #: about\screenshots\index.php:30
 #: about\screenshots\index.php:31
@@ -1132,6 +1127,11 @@
 msgid "Beta Versions"
 msgstr "Beta-Versionen"
 
+#: 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 "Sie können eine mehr technische Sicht über das <a href=\"%1$s\">Übersetzung-System</a> in unserem <a href=\"%2$s\">Entwickler-Wiki</a> finden."
+
 #: downloads\pad-file.php:76
 #, c-format
 msgid "Screenshot"
@@ -1156,7 +1156,7 @@
 #: downloads\plugins.php:5
 #, c-format
 msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
-msgstr ""
+msgstr "Laden Sie zusätzliche Plugins für WinMerge herunter, wie das 7-Zip-Plugin oder das xdocdiff-Plugin."
 
 #: translations\index.php:7
 #: translations\status_trunk.php:7
@@ -1173,7 +1173,7 @@
 #: about\screenshots\index.php:5
 #, c-format
 msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
-msgstr ""
+msgstr "Screenshots von WinMerge-Funktionen wie dem Dateivergleich, den Ordnervergleichs-Ergebnissen und der Positionsleiste."
 
 #: translations\translations.inc:85
 #: translations\translations_branch.inc:53
@@ -1225,17 +1225,17 @@
 #: 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 ""
+msgstr "Die Versionshinweise sind eine kurze Zusammenfassung der wichtigsten Änderungen, Verbesserungen, Fehlerbereinigungen und bekannten Problemen in der aktuellen Version von WinMerge."
 
 #: docs\changelog.php:6
 #, c-format
 msgid "WinMerge, change log, changes, release, tracker item, revision number"
-msgstr ""
+msgstr "WinMerge, Versionshistorie, Änderungen, Veröffentlichung, Tracker-Eintrag, Revisionsnummer"
 
 #: docs\releasenotes.php:6
 #, c-format
 msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
-msgstr ""
+msgstr "WinMerge, Versionshinweise, Zusammenfassung, Änderungen, Verbesserungen, Fehlerbereinigungen, bekannten Probleme, Veröffentlichung"
 
 #: downloads\pad-file.php:14
 #, c-format
@@ -1561,7 +1561,7 @@
 #: 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 ""
+msgstr "Die beiden folgenden Seiten informieren Sie über den Übersetzungs-Status der Stabilen- und der Entwickler-Version von WinMerge:"
 
 #: about\index.php:49
 #, c-format
@@ -1664,6 +1664,11 @@
 msgid "Other Versions"
 msgstr "Andere Versionen"
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%s\">quick tour</a> describes the main WinMerge features in one page."
+msgstr ""
+
 #: engine\page.inc:321
 #, c-format
 msgid "Discussion Forums"
@@ -1735,7 +1740,7 @@
 #: 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 ""
+msgstr "Wenn Sie eine dieser Übersetzungen aktualisieren oder eine andere Übersetzung hinzufügen möchten, dann befolgen Sie bitte <a href=\"%s\">diese Anweisungen</a>."
 
 #: translations\index.php:31
 #, c-format
@@ -1767,13 +1772,8 @@
 #: 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 ""
+msgstr "WinMerge ist sehr nützlich zum Bestimmen, was sich zwischen Projekt-Versionen geändert hat und zum anschließenden Zusammenführen der Änderungen zwischen den Versionen. WinMerge kann als externes Vergleichs-/Zusammenführungs-Tool oder als eigenstände Anwendung verwendet werden."
 
-#: docs\index.php:13
-#, c-format
-msgid "The <a href=\"%s\">quick tour</a> describe the main  features from WinMerge at one page."
-msgstr ""
-
 #: engine\engine.inc:22
 #, c-format
 msgid "Japanese"
@@ -1847,7 +1847,7 @@
 #: links.php:9
 #, c-format
 msgid "Tools"
-msgstr ""
+msgstr "Tools"
 
 #: engine\page.inc:381
 #, c-format

Modified: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot	2009-10-24 13:17:57 UTC (rev 7028)
+++ trunk/Translations/Web/en-US.pot	2009-10-24 14:12:59 UTC (rev 7029)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: 2009-10-23 20:39+0000\n"
+"POT-Creation-Date: 2009-10-24 15:18+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -507,11 +507,6 @@
 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
@@ -1129,6 +1124,11 @@
 msgid "Beta Versions"
 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 ""
+
 #: downloads\pad-file.php:76
 #, c-format
 msgid "Screenshot"
@@ -1659,6 +1659,11 @@
 msgid "Other Versions"
 msgstr ""
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%s\">quick tour</a> describes the main WinMerge features in one page."
+msgstr ""
+
 #: engine\page.inc:321
 #, c-format
 msgid "Discussion Forums"
@@ -1764,11 +1769,6 @@
 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 ""
 
-#: docs\index.php:13
-#, c-format
-msgid "The <a href=\"%s\">quick tour</a> describe the main  features from WinMerge at one page."
-msgstr ""
-
 #: engine\engine.inc:22
 #, c-format
 msgid "Japanese"

Modified: trunk/Translations/Web/fr.po
===================================================================
--- trunk/Translations/Web/fr.po	2009-10-24 13:17:57 UTC (rev 7028)
+++ trunk/Translations/Web/fr.po	2009-10-24 14:12:59 UTC (rev 7029)
@@ -512,8 +512,8 @@
 
 #: 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 "Nous pouvons trouver une vue plus technique sur le <a href=\"%1$s\">système de traduction</a> dans notre <a href=\"\"%2$s>Wiki Développement</a>."
+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 "Nous pouvons trouver une vue plus technique sur le <a href=\"%1$s\">système de traduction</a> dans notre <a href=\"%2$s\">Wiki Développement</a>."
 
 #: translations\translations.inc:131
 #: translations\translations.inc:288

Modified: trunk/Translations/Web/ja.po
===================================================================
--- trunk/Translations/Web/ja.po	2009-10-24 13:17:57 UTC (rev 7028)
+++ trunk/Translations/Web/ja.po	2009-10-24 14:12:59 UTC (rev 7029)
@@ -509,8 +509,8 @@
 
 #: translations\index.php:33
 #, c-format
-msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
-msgstr "私たちの<a href=\"\"%2$s>開発 Wiki</a>では、<a href=\"%1$s\">翻訳システム</a>について多くの技術的な考え方を見つけることができます。"
+msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"%2$s\">Development Wiki</a>."
+msgstr "私たちの<a href=\"%2$s\">開発 Wiki</a>では、<a href=\"%1$s\">翻訳システム</a>について多くの技術的な考え方を見つけることができます。"
 
 #: translations\translations.inc:131
 #: translations\translations.inc:288

Modified: trunk/Translations/Web/nl.po
===================================================================
--- trunk/Translations/Web/nl.po	2009-10-24 13:17:57 UTC (rev 7028)
+++ trunk/Translations/Web/nl.po	2009-10-24 14:12:59 UTC (rev 7029)
@@ -422,8 +422,8 @@
 msgstr "WinMerge wordt op dit moment vertaald in de talen die hieronder weergegeven worden:"
 
 #: translations\index.php:33
-msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
-msgstr "U kan meer technische informatie vinden over het <a href=\"%1$s\">vertaalsysteem<a> in onze <a href=\"\"%2$s>Ontwikkelingswiki</a>."
+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 "U kan meer technische informatie vinden over het <a href=\"%1$s\">vertaalsysteem<a> in onze <a href=\"%2$s\">Ontwikkelingswiki</a>."
 
 #: translations\translations.inc:131
 #: translations\translations.inc:288

Modified: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po	2009-10-24 13:17:57 UTC (rev 7028)
+++ trunk/Translations/Web/se.po	2009-10-24 14:12:59 UTC (rev 7029)
@@ -512,8 +512,8 @@
 
 #: 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 "Du kan hitta en mer teknisk beskrivning av <a href=\"%1$s\">översättningssystemet</a> i vår <a href=\"\"%2$s>Utvecklings-Wiki</a>."
+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 "Du kan hitta en mer teknisk beskrivning av <a href=\"%1$s\">översättningssystemet</a> i vår <a href=\"%2$s\">Utvecklings-Wiki</a>."
 
 #: translations\translations.inc:131
 #: translations\translations.inc:288


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

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

[<ge...@us...>]

Revision: 7028
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7028&view=rev
Author:   gerundt
Date:     2009-10-24 13:17:57 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Web: Fix typo in quick tour description

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

Modified: trunk/Web/docs/index.php
===================================================================
--- trunk/Web/docs/index.php	2009-10-24 13:14:55 UTC (rev 7027)
+++ trunk/Web/docs/index.php	2009-10-24 13:17:57 UTC (rev 7028)
@@ -10,7 +10,7 @@
   $page->printLinkedSubHeading(__('Manual'), 'manual/');
   $page->printPara(__('The <a href="%s">manual</a> explains how to use WinMerge, and documents its capabilities and limitations.', 'manual/'));
   $page->printLinkedSubHeading(__('Quick Tour'), 'tour/');
-  $page->printPara(__('The <a href="%s">quick tour</a> describe the main  features from WinMerge at one page.', 'tour/'));
+  $page->printPara(__('The <a href="%s">quick tour</a> describes the main WinMerge features in one page.', 'tour/'));
   $page->printLinkedSubHeading(__('Release Notes'), 'releasenotes.php');
   $page->printPara(__('The <a href="%1$s">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href="%2$s">known issues</a> in the current WinMerge release.', 'releasenotes.php', 'releasenotes.php#issues'));
   $page->printLinkedSubHeading(__('Change Log'), 'changelog.php');


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

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

[<ge...@us...>]

Revision: 7027
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7027&view=rev
Author:   gerundt
Date:     2009-10-24 13:14:55 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
Web: Fix a link at translations page

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

Modified: trunk/Web/translations/index.php
===================================================================
--- trunk/Web/translations/index.php	2009-10-23 18:45:27 UTC (rev 7026)
+++ trunk/Web/translations/index.php	2009-10-24 13:14:55 UTC (rev 7027)
@@ -30,7 +30,7 @@
   
   $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/'));
+                   __('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><a name="status"><?php __e('Status');?></a></h3>


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

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

[<ge...@us...>]

Revision: 7026
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7026&view=rev
Author:   gerundt
Date:     2009-10-23 18:45:27 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
Update web PO(T) files and add script for updateing PO files from POT file

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

Added Paths:
-----------
    trunk/Translations/Web/UpdatePoFilesFromPotFile.vbs

Added: trunk/Translations/Web/UpdatePoFilesFromPotFile.vbs
===================================================================
--- trunk/Translations/Web/UpdatePoFilesFromPotFile.vbs	                        (rev 0)
+++ trunk/Translations/Web/UpdatePoFilesFromPotFile.vbs	2009-10-23 18:45:27 UTC (rev 7026)
@@ -0,0 +1,239 @@
+Option Explicit
+''
+' This script updates the language PO files from the master POT file.
+'
+' Copyright (C) 2007-2008 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Dim oFSO, bRunFromCmd
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+bRunFromCmd = False
+If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
+  bRunFromCmd = True
+End If
+
+Call Main
+
+''
+' ...
+Sub Main
+  Dim oLanguages, oLanguage, sLanguage, sDir, bPotChanged
+  Dim oEnglishPotContent, oLanguagePoContent
+  Dim StartTime, EndTime, Seconds
+  
+  StartTime = Time
+  
+  InfoBox "Updating PO files from POT file...", 3
+  
+  sDir = oFSO.GetParentFolderName(Wscript.ScriptFullName)
+  Set oEnglishPotContent = GetContentFromPoFile(sDir & "\en-US.pot")
+  If oEnglishPotContent.Count = 0 Then Err.Raise vbObjectError, "Sub Main", "Error reading content from English.pot"
+  bPotChanged = GetArchiveBit("en-US.pot")
+  Set oLanguages = Wscript.Arguments
+  If oLanguages.Count = 0 Then Set oLanguages = oFSO.GetFolder(".").Files
+  For Each oLanguage In oLanguages 'For all languages...
+    sLanguage = CStr(oLanguage)
+    If LCase(oFSO.GetExtensionName(sLanguage)) = "po" Then
+      If bPotChanged Or GetArchiveBit(sLanguage) Then 'If update necessary...
+        If bRunFromCmd Then 'If run from command line...
+          Wscript.Echo oFSO.GetFileName(sLanguage)
+        End If
+        Set oLanguagePoContent = GetContentFromPoFile(sLanguage)
+        If oLanguagePoContent.Count > 0 Then 'If content exists...
+          CreateUpdatedPoFile sLanguage, oEnglishPotContent, oLanguagePoContent
+        End If
+        SetArchiveBit sLanguage, False
+      End If
+    End If
+  Next
+  
+  EndTime = Time
+  Seconds = DateDiff("s", StartTime, EndTime)
+  
+  InfoBox "All PO files updated, after " & Seconds & " second(s).", 10
+End Sub
+
+''
+' ...
+Class CSubContent
+  Dim sMsgCtxt2, sMsgId2, sMsgStr2, sTranslatorComments, sExtractedComments, sReferences, sFlags
+End Class
+
+''
+' ...
+Function GetContentFromPoFile(ByVal sPoPath)
+  Dim oContent, oSubContent, oTextFile, sLine
+  Dim oMatch, iMsgStarted, sMsgCtxt, sMsgId
+  Dim reMsgCtxt, reMsgId, reMsgContinued
+
+  Set reMsgCtxt = New RegExp
+  reMsgCtxt.Pattern = "^msgctxt ""(.*)""$"
+  reMsgCtxt.IgnoreCase = True
+
+  Set reMsgId = New RegExp
+  reMsgId.Pattern = "^msgid ""(.*)""$"
+  reMsgId.IgnoreCase = True
+
+  Set reMsgContinued = New RegExp
+  reMsgContinued.Pattern = "^""(.*)""$"
+  reMsgContinued.IgnoreCase = True
+  
+  Set oContent = CreateObject("Scripting.Dictionary")
+  
+  iMsgStarted = 0
+  sMsgCtxt = ""
+  Set oSubContent = New CSubContent
+  Set oTextFile = oFSO.OpenTextFile(sPoPath, ForReading)
+  Do Until oTextFile.AtEndOfStream 'For all lines...
+    sLine = Trim(oTextFile.ReadLine)
+    If sLine <> "" Then 'If NOT empty line...
+      If Left(sLine, 1) <> "#" Then 'If NOT comment line...
+        If reMsgCtxt.Test(sLine) Then 'If "msgctxt"...
+          iMsgStarted = 1
+          Set oMatch = reMsgCtxt.Execute(sLine)(0)
+          sMsgCtxt = oMatch.SubMatches(0)
+          oSubContent.sMsgCtxt2 = sLine & vbCrLf
+        ElseIf reMsgId.Test(sLine) Then 'If "msgid"...
+          iMsgStarted = 2
+          Set oMatch = reMsgId.Execute(sLine)(0)
+          sMsgId = oMatch.SubMatches(0)
+          oSubContent.sMsgId2 = sLine & vbCrLf
+        ElseIf Left(sLine, 8) = "msgstr """ Then 'If "msgstr"...
+          iMsgStarted = 3
+          oSubContent.sMsgStr2 = sLine & vbCrLf
+        ElseIf reMsgContinued.Test(sLine) Then 'If "msgctxt", "msgid" or "msgstr" continued...
+          If iMsgStarted = 1 Then
+            sMsgCtxt = sMsgCtxt & oMatch.SubMatches(0)
+            oSubContent.sMsgCtxt2 = oSubContent.sMsgCtxt2 & sLine & vbCrLf
+          ElseIf iMsgStarted = 2 Then
+            Set oMatch = reMsgContinued.Execute(sLine)(0)
+            sMsgId = sMsgId & oMatch.SubMatches(0)
+            oSubContent.sMsgId2 = oSubContent.sMsgId2 & sLine & vbCrLf
+          ElseIf iMsgStarted = 3 Then
+            oSubContent.sMsgStr2 = oSubContent.sMsgStr2 & sLine & vbCrLf
+          End If
+        End If
+      Else 'If comment line...
+        iMsgStarted = -1
+        Select Case Left(sLine, 2)
+          Case "#~" 'Obsolete message...
+            iMsgStarted = 0
+          Case "#." 'Extracted comment...
+            oSubContent.sExtractedComments = oSubContent.sExtractedComments & sLine & vbCrLf
+          Case "#:" 'Reference...
+            oSubContent.sReferences = oSubContent.sReferences & sLine & vbCrLf
+          Case "#," 'Flag...
+            oSubContent.sFlags = oSubContent.sFlags & sLine & vbCrLf
+          Case Else 'Translator comment...
+            oSubContent.sTranslatorComments = oSubContent.sTranslatorComments & sLine & vbCrLf
+        End Select
+      End If
+    ElseIf iMsgStarted <> 0 Then 'If empty line AND there is pending translation...
+      iMsgStarted = 0 'Don't process same translation twice
+      If sMsgId = "" Then sMsgId = "__head__"
+      If (oContent.Exists(sMsgCtxt & sMsgId) = False) Then 'If the key is NOT already used...
+        oContent.Add sMsgCtxt & sMsgId, oSubContent
+      End If
+      sMsgCtxt = ""
+      Set oSubContent = New CSubContent
+    End If
+  Loop
+  oTextFile.Close
+  Set GetContentFromPoFile = oContent
+End Function
+
+''
+' ...
+Sub CreateUpdatedPoFile(ByVal sPoPath, ByVal oEnglishPotContent, ByVal oLanguagePoContent)
+  Dim sBakPath, oPoFile, sKey, oEnglish, oLanguage
+  
+  '--------------------------------------------------------------------------------
+  ' Backup the old PO file...
+  '--------------------------------------------------------------------------------
+  sBakPath = sPoPath & ".bak"
+  If oFSO.FileExists(sBakPath) Then
+    oFSO.DeleteFile sBakPath
+  End If
+  oFSO.MoveFile sPoPath, sBakPath
+  '--------------------------------------------------------------------------------
+  
+  Set oPoFile = oFSO.CreateTextFile(sPoPath, True)
+  
+  Set oLanguage = oLanguagePoContent("__head__")
+  oPoFile.Write oLanguage.sTranslatorComments
+  oPoFile.Write oLanguage.sMsgId2
+  oPoFile.Write oLanguage.sMsgStr2
+  oPoFile.Write vbCrLf
+  For Each sKey In oEnglishPotContent.Keys 'For all English content...
+    If sKey <> "__head__" Then
+      Set oEnglish = oEnglishPotContent(sKey)
+      If oLanguagePoContent.Exists(sKey) Then 'If translation exists...
+        Set oLanguage = oLanguagePoContent(sKey)
+      Else 'If translation NOT exists...
+        Set oLanguage = oEnglish
+      End If
+      oPoFile.Write oLanguage.sTranslatorComments
+      oPoFile.Write oEnglish.sExtractedComments
+      oPoFile.Write oEnglish.sReferences
+      oPoFile.Write oLanguage.sFlags
+      oPoFile.Write oLanguage.sMsgCtxt2
+      oPoFile.Write oLanguage.sMsgId2
+      oPoFile.Write oLanguage.sMsgStr2
+      oPoFile.Write vbCrLf
+    End If
+  Next
+  oPoFile.Close
+End Sub
+
+''
+' ...
+Function InfoBox(ByVal sText, ByVal iSecondsToWait)
+  Dim oShell
+  
+  If (bRunFromCmd = False) Then 'If run from command line...
+    Set oShell = Wscript.CreateObject("WScript.Shell")
+    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
+  Else 'If NOT run from command line...
+    Wscript.Echo sText
+  End If
+End Function
+
+''
+' ...
+Function GetArchiveBit(ByVal sFilePath)
+  Dim oFile
+  
+  GetArchiveBit = False
+  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
+    Set oFile = oFSO.GetFile(sFilePath)
+    If (oFile.Attributes AND 32) Then 'If archive bit set...
+      GetArchiveBit = True
+    End If
+  End If
+End Function
+
+''
+' ...
+Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
+  Dim oFile
+  
+  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
+    Set oFile = oFSO.GetFile(sFilePath)
+    If (oFile.Attributes AND 32) Then 'If archive bit set...
+      If (bValue = False) Then
+        oFile.Attributes = oFile.Attributes - 32
+      End If
+    Else 'If archive bit NOT set...
+      If (bValue = True) Then
+        oFile.Attributes = oFile.Attributes + 32
+      End If
+    End If
+  End If
+End Sub


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

Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po	2009-10-22 18:42:45 UTC (rev 7025)
+++ trunk/Translations/Web/de.po	2009-10-23 18:45:27 UTC (rev 7026)
@@ -82,14 +82,14 @@
 msgid "Handles Windows, Unix and Mac text file formats"
 msgstr "Verarbeitet Windows-, Unix- und Mac-Textdateiformate"
 
-#: engine\page.inc:312
+#: engine\page.inc:324
 #: support\tracker-shortcuts.php:7
 #: support\tracker-shortcuts.php:9
 #, c-format
 msgid "Tracker Shortcuts"
 msgstr "Tracker-Abkürzungen"
 
-#: engine\page.inc:298
+#: engine\page.inc:310
 #, c-format
 msgid "WinMerge Change Log"
 msgstr "WinMerge Versionshistorie"
@@ -131,12 +131,12 @@
 msgid "The translations status is currently not available..."
 msgstr "Der Übersetzungs-Status ist derzeit nicht verfügbar..."
 
-#: engine\page.inc:295
+#: engine\page.inc:306
 #, c-format
 msgid "WinMerge Manual"
 msgstr "WinMerge Handbuch"
 
-#: engine\page.inc:309
+#: engine\page.inc:321
 #, c-format
 msgid "WinMerge Discussion Forums"
 msgstr "WinMerge Diskussionsforen"
@@ -157,7 +157,7 @@
 msgid "Support List"
 msgstr "Support-Liste"
 
-#: engine\page.inc:305
+#: engine\page.inc:317
 #, c-format
 msgid "WinMerge PAD File"
 msgstr "WinMerge PAD-Datei"
@@ -233,7 +233,7 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr "<a href=\"%s\">Dokumentation</a>?"
 
-#: engine\page.inc:317
+#: engine\page.inc:329
 #, c-format
 msgid "WinMerge Translations Instructions"
 msgstr "WinMerge Übersetzungsanleitung"
@@ -278,7 +278,7 @@
 msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
 msgstr "<a href=\"%s\">Online-Handbuch</a> und installierte HTML-Hilfedatei"
 
-#: engine\page.inc:312
+#: engine\page.inc:324
 #, c-format
 msgid "WinMerge Tracker Shortcuts"
 msgstr "WinMerge-Tracker-Abkürzungen"
@@ -308,8 +308,8 @@
 msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
 msgstr ""
 
-#: engine\page.inc:265
-#: engine\page.inc:308
+#: engine\page.inc:276
+#: engine\page.inc:320
 #, c-format
 msgid "WinMerge Support"
 msgstr "WinMerge Support"
@@ -319,7 +319,7 @@
 msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
 msgstr ""
 
-#: engine\page.inc:310
+#: engine\page.inc:322
 #: support\mailing-lists.php:7
 #: support\mailing-lists.php:9
 #, c-format
@@ -358,7 +358,7 @@
 msgid "The release notes are currently not available..."
 msgstr "Die Versionshinweise sind derzeit nicht verfügbar..."
 
-#: engine\page.inc:297
+#: engine\page.inc:309
 #, c-format
 msgid "WinMerge Known Issues"
 msgstr "Bekannte WinMerge Probleme"
@@ -380,7 +380,7 @@
 
 #: links.php:6
 #: about\license.php:30
-#: engine\page.inc:284
+#: engine\page.inc:295
 #, c-format
 msgid "Links"
 msgstr "Links"
@@ -440,7 +440,7 @@
 msgid "Web Addresses"
 msgstr "Internet-Adressen"
 
-#: engine\page.inc:318
+#: engine\page.inc:330
 #, c-format
 msgid "WinMerge Translations Status (Stable Branch)"
 msgstr "WinMerge Übersetzungs-Status (Stabiler „Branch“)"
@@ -455,7 +455,7 @@
 msgid "Difference pane shows current difference in two vertical panes"
 msgstr "Unterschiedsleiste zeigt Unterschiede in zwei vertikalen Fenstern"
 
-#: engine\page.inc:317
+#: engine\page.inc:329
 #, c-format
 msgid "Instructions"
 msgstr "Anleitung"
@@ -486,11 +486,11 @@
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: engine\page.inc:283
-#: engine\page.inc:288
 #: engine\page.inc:294
-#: engine\page.inc:308
-#: engine\page.inc:316
+#: engine\page.inc:299
+#: engine\page.inc:305
+#: engine\page.inc:320
+#: engine\page.inc:328
 #, c-format
 msgid "Index"
 msgstr "Index"
@@ -529,12 +529,12 @@
 msgid "Announce List"
 msgstr "Ankündigungsliste"
 
-#: engine\page.inc:319
+#: engine\page.inc:331
 #, c-format
 msgid "Status (Unstable Trunk)"
 msgstr "Status (Unstabiler „Trunk“)"
 
-#: engine\page.inc:264
+#: engine\page.inc:275
 #, c-format
 msgid "WinMerge Downloads"
 msgstr "WinMerge Downloads"
@@ -544,7 +544,7 @@
 msgid "Japanese WinMerge Version"
 msgstr "Japanische WinMerge-Version"
 
-#: engine\page.inc:311
+#: engine\page.inc:323
 #, c-format
 msgid "Tracker"
 msgstr "Tracker"
@@ -552,8 +552,8 @@
 #: about\history.php:20
 #: docs\changelog.php:7
 #: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: docs\index.php:16
+#: engine\page.inc:310
 #, c-format
 msgid "Change Log"
 msgstr "Versionshistorie"
@@ -600,7 +600,7 @@
 msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
 msgstr ""
 
-#: engine\page.inc:299
+#: engine\page.inc:311
 #, c-format
 msgid "WinMerge Development Wiki"
 msgstr "WinMerge Entwickler-Wiki"
@@ -620,6 +620,11 @@
 msgid "<a href=\"%s\">Release Notes</a>?"
 msgstr "<a href=\"%s\">Versionshinweise</a>?"
 
+#: engine\page.inc:307
+#, c-format
+msgid "WinMerge Quick Tour"
+msgstr ""
+
 #: 404.php:11
 #, c-format
 msgid "Page Not Found..."
@@ -640,12 +645,12 @@
 msgid "Resolve conflict files"
 msgstr "Konflikt-Dateien lösen"
 
-#: engine\page.inc:264
+#: engine\page.inc:275
 #, c-format
 msgid "Downloads"
 msgstr "Downloads"
 
-#: engine\page.inc:266
+#: engine\page.inc:277
 #: translations\index.php:8
 #: translations\index.php:10
 #, c-format
@@ -668,21 +673,21 @@
 msgid "Translated: %d%%"
 msgstr "Übersetzt: %d%%"
 
-#: engine\page.inc:285
+#: engine\page.inc:296
 #, c-format
 msgid "Project Page"
 msgstr "Projektseite"
 
 #: about\index.php:7
 #: about\index.php:10
-#: engine\page.inc:262
-#: engine\page.inc:288
+#: engine\page.inc:273
+#: engine\page.inc:299
 #, c-format
 msgid "About WinMerge"
 msgstr "Über WinMerge"
 
-#: engine\page.inc:266
-#: engine\page.inc:316
+#: engine\page.inc:277
+#: engine\page.inc:328
 #, c-format
 msgid "WinMerge Translations"
 msgstr "WinMerge Übersetzungen"
@@ -697,7 +702,7 @@
 msgid "Release Status"
 msgstr "Veröffentlichungsstatus"
 
-#: engine\page.inc:311
+#: engine\page.inc:323
 #, c-format
 msgid "WinMerge Tracker"
 msgstr "WinMerge Tracker"
@@ -712,10 +717,11 @@
 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 "Laden Sie das aktuelle WinMerge %1$s herunter, welches am %2$s freigegeben wurde. Für detaillierte Informationen über die Änderungen lesen Sie die Versionshistorie und die Versionshinweise."
 
-#: engine\page.inc:297
+#: docs\index.php:12
+#: engine\page.inc:307
 #, c-format
-msgid "Known Issues"
-msgstr "Bekannte Probleme"
+msgid "Quick Tour"
+msgstr ""
 
 #: translations\index.php:29
 #, c-format
@@ -728,7 +734,7 @@
 msgid "Last Update"
 msgstr "Letztes Update"
 
-#: engine\page.inc:304
+#: engine\page.inc:316
 #, c-format
 msgid "Source Code"
 msgstr "Quelltext"
@@ -773,14 +779,14 @@
 
 #: docs\index.php:7
 #: docs\index.php:9
-#: engine\page.inc:263
+#: engine\page.inc:274
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentation"
 
 #: about\history.php:19
 #: docs\index.php:10
-#: engine\page.inc:295
+#: engine\page.inc:306
 #, c-format
 msgid "Manual"
 msgstr "Handbuch"
@@ -812,7 +818,7 @@
 msgid "SHA-1 Checksums"
 msgstr "SHA-1 Prüfsummen"
 
-#: engine\page.inc:231
+#: engine\page.inc:242
 #, c-format
 msgid "Version %1$s; %2$s MB"
 msgstr "Version %1$s; %2$s MB"
@@ -852,7 +858,7 @@
 msgid "English (Template)"
 msgstr "Englisch (Vorlage)"
 
-#: engine\page.inc:284
+#: engine\page.inc:295
 #, c-format
 msgid "WinMerge Links"
 msgstr "WinMerge Links"
@@ -867,22 +873,22 @@
 msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
 msgstr "Dokumentation von WinMerge wie Handbuch, Versionshinweise, Versionshistorie und Entwickler-Wiki."
 
-#: docs\index.php:15
+#: docs\index.php:17
 #, c-format
 msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
 msgstr "Die <a href=\"%s\">Versionshistorie</a> ist eine vollständigere Liste der Änderungen in den letzten WinMerge-Veröffentlichungen."
 
-#: engine\page.inc:303
+#: engine\page.inc:315
 #, c-format
 msgid "Download WinMerge Plugins"
 msgstr "WinMerge Plugins herunterladen"
 
-#: engine\page.inc:319
+#: engine\page.inc:331
 #, c-format
 msgid "WinMerge Translations Status (Unstable Trunk)"
 msgstr "WinMerge Übersetzungs-Status (Unstabiler „Trunk“)"
 
-#: docs\index.php:17
+#: docs\index.php:19
 #, c-format
 msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
 msgstr "Das <a href=\"%s\">Entwickler-Wiki</a> enthält viele Informationen über die WinMerge-Entwicklung."
@@ -925,7 +931,7 @@
 msgid "Visual differencing and merging of text files"
 msgstr "Visuelles Vergleichen und Zusammenführen von Textdateien"
 
-#: engine\page.inc:285
+#: engine\page.inc:296
 #, c-format
 msgid "WinMerge Project Page"
 msgstr "WinMerge Projektseite"
@@ -940,7 +946,7 @@
 msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
 msgstr ""
 
-#: engine\page.inc:289
+#: engine\page.inc:300
 #, c-format
 msgid "WinMerge Screenshots"
 msgstr "WinMerge Screenshots"
@@ -964,7 +970,7 @@
 #: about\index.php:64
 #: about\screenshots\index.php:7
 #: about\screenshots\index.php:9
-#: engine\page.inc:289
+#: engine\page.inc:300
 #, c-format
 msgid "Screenshots"
 msgstr "Screenshots"
@@ -1017,7 +1023,7 @@
 
 #: index.php:42
 #: downloads\pad-file.php:96
-#: engine\page.inc:265
+#: engine\page.inc:276
 #: support\index.php:8
 #: support\index.php:10
 #, c-format
@@ -1084,7 +1090,7 @@
 msgid "English Descriptions"
 msgstr "Englische Beschreibungen"
 
-#: engine\page.inc:313
+#: engine\page.inc:325
 #: support\index.php:37
 #, c-format
 msgid "Donate"
@@ -1180,7 +1186,7 @@
 msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
 msgstr "Wenn Sie Hilfe benötigen, schauen Sie sich unsere <a href=\"%s\">Support-Seite</a> für mehr Informationen an."
 
-#: engine\page.inc:318
+#: engine\page.inc:330
 #, c-format
 msgid "Status (Stable Branch)"
 msgstr "Status (Stabiler „Branch“)"
@@ -1273,7 +1279,7 @@
 msgid "English Keywords"
 msgstr "Englische Stichwörter"
 
-#: engine\page.inc:304
+#: engine\page.inc:316
 #, c-format
 msgid "Download WinMerge Source Code"
 msgstr "WinMerge Quelltext herunterladen"
@@ -1281,7 +1287,7 @@
 #: downloads\pad-file.php:7
 #: downloads\pad-file.php:9
 #: downloads\pad-file.php:80
-#: engine\page.inc:305
+#: engine\page.inc:317
 #, c-format
 msgid "PAD File"
 msgstr "PAD-Datei"
@@ -1303,11 +1309,6 @@
 msgid "regex HOWTO"
 msgstr ""
 
-#: docs\index.php:6
-#, c-format
-msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
-msgstr "WinMerge, Dokumentation, Handbuch, Versionshinweise, Bekannte Probleme, Versionshistorie, Entwickler-Wiki"
-
 #: about\license.php:10
 #, c-format
 msgid ""
@@ -1332,7 +1333,7 @@
 
 #: about\history.php:7
 #: about\history.php:9
-#: engine\page.inc:290
+#: engine\page.inc:301
 #, c-format
 msgid "History"
 msgstr "Historie"
@@ -1367,8 +1368,8 @@
 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 "Bitte fügen Sie so viele Informationen an wie möglich: Mindestens die Versionsnummer von WinMerge, die Sie verwenden. Wenn Sie können, fügen Sie auch ein Konfigurationsprotokoll an, welches Sie über <span class=\"guimenu\">Hilfe</span> &#8594; <span class=\"guimenuitem\">Konfiguration</span> im WinMerge-Fenster aufrufen können."
 
-#: engine\page.inc:261
-#: engine\page.inc:283
+#: engine\page.inc:272
+#: engine\page.inc:294
 #, c-format
 msgid "WinMerge Home"
 msgstr "WinMerge Home"
@@ -1383,7 +1384,7 @@
 msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
 msgstr "Das <a href=\"%s\">Handbuch</a> erklärt wie man WinMerge verwendet und dokumentiert Fähigkeiten sowie Einschränkungen."
 
-#: engine\page.inc:302
+#: engine\page.inc:314
 #, c-format
 msgid "WinMerge"
 msgstr "WinMerge"
@@ -1409,7 +1410,7 @@
 msgid "Exe-Format (%s MB)"
 msgstr "Exe-Format (%s MB)"
 
-#: engine\page.inc:303
+#: engine\page.inc:315
 #, c-format
 msgid "Plugins"
 msgstr "Plugins"
@@ -1446,8 +1447,8 @@
 msgid "Information"
 msgstr "Information"
 
-#: engine\page.inc:263
-#: engine\page.inc:294
+#: engine\page.inc:274
+#: engine\page.inc:305
 #, c-format
 msgid "WinMerge Documentation"
 msgstr "WinMerge Dokumentation"
@@ -1462,6 +1463,11 @@
 msgid "Fast compare using file sizes and dates"
 msgstr "Schnelles Vergleichen mithilfe von Dateigrößen und Änderungsdaten"
 
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
+msgstr ""
+
 #: support\mailing-lists.php:24
 #: support\mailing-lists.php:34
 #: support\mailing-lists.php:44
@@ -1477,7 +1483,7 @@
 msgid "GNU General Public License"
 msgstr "GNU General Public License"
 
-#: docs\index.php:13
+#: docs\index.php:15
 #, c-format
 msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
 msgstr "Die <a href=\"%1$s\">Versionshinweise</a> sind eine kurze Zusammenfassung der wichtigsten Änderungen, Verbesserungen, Fehlerbereinigungen und <a href=\"%2$s\">bekannten Problemen</a> in der aktuellen Version von WinMerge."
@@ -1506,7 +1512,7 @@
 msgid "File Comparison"
 msgstr "Dateivergleich"
 
-#: engine\page.inc:261
+#: engine\page.inc:272
 #, c-format
 msgid "Home"
 msgstr "Home"
@@ -1588,8 +1594,8 @@
 msgid "<a href=\"%s\">Screenshots</a>?"
 msgstr "<a href=\"%s\">Screenshots</a>?"
 
-#: docs\index.php:16
-#: engine\page.inc:299
+#: docs\index.php:18
+#: engine\page.inc:311
 #, c-format
 msgid "Development Wiki"
 msgstr "Entwickler-Wiki"
@@ -1616,7 +1622,7 @@
 msgid "Translations instructions"
 msgstr "Übersetzungsanleitung"
 
-#: engine\page.inc:310
+#: engine\page.inc:322
 #, c-format
 msgid "WinMerge Mailing Lists"
 msgstr "WinMerge Verteilerlisten"
@@ -1626,7 +1632,7 @@
 msgid "Experimental Builds"
 msgstr "Experimentelle Builds"
 
-#: engine\page.inc:313
+#: engine\page.inc:325
 #, c-format
 msgid "Donate money to WinMerge"
 msgstr "Geld spenden an WinMerge"
@@ -1636,7 +1642,7 @@
 msgid "Stable Versions"
 msgstr "Stabile Versionen"
 
-#: engine\page.inc:262
+#: engine\page.inc:273
 #, c-format
 msgid "About"
 msgstr "Über"
@@ -1648,7 +1654,7 @@
 
 #: about\license.php:7
 #: about\license.php:9
-#: engine\page.inc:291
+#: engine\page.inc:302
 #, c-format
 msgid "License"
 msgstr "Lizenz"
@@ -1658,7 +1664,7 @@
 msgid "Other Versions"
 msgstr "Andere Versionen"
 
-#: engine\page.inc:309
+#: engine\page.inc:321
 #, c-format
 msgid "Discussion Forums"
 msgstr "Diskussionsforen"
@@ -1683,7 +1689,7 @@
 msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
 msgstr ""
 
-#: engine\page.inc:230
+#: engine\page.inc:241
 #, c-format
 msgid "Download Now!"
 msgstr "Jetzt herunterladen!"
@@ -1698,10 +1704,15 @@
 msgid "Folder Compare"
 msgstr "Ordnervergleich"
 
-#: docs\index.php:12
+#: engine\page.inc:309
+#, c-format
+msgid "Known Issues"
+msgstr "Bekannte Probleme"
+
+#: docs\index.php:14
 #: docs\releasenotes.php:7
 #: docs\releasenotes.php:10
-#: engine\page.inc:296
+#: engine\page.inc:308
 #, c-format
 msgid "Release Notes"
 msgstr "Versionshinweise"
@@ -1711,7 +1722,7 @@
 msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
 msgstr ""
 
-#: engine\page.inc:296
+#: engine\page.inc:308
 #, c-format
 msgid "WinMerge Release Notes"
 msgstr "WinMerge Versionshinweise"
@@ -1758,6 +1769,11 @@
 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 ""
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%s\">quick tour</a> describe the main  features from WinMerge at one page."
+msgstr ""
+
 #: engine\engine.inc:22
 #, c-format
 msgid "Japanese"
@@ -1790,7 +1806,7 @@
 msgid "Moved lines detection"
 msgstr "Erkennung von verschobenen Zeilen"
 
-#: engine\page.inc:290
+#: engine\page.inc:301
 #, c-format
 msgid "WinMerge History"
 msgstr "WinMerge Historie"
@@ -1811,7 +1827,7 @@
 msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
 msgstr "WinMerge ist <a href=\"%1$s\">Open-Source</a>-Software unter der <a href=\"%2$s\">GNU General Public License</a>."
 
-#: engine\page.inc:291
+#: engine\page.inc:302
 #, c-format
 msgid "WinMerge License"
 msgstr "WinMerge Lizenz"
@@ -1823,7 +1839,7 @@
 
 #: downloads\index.php:10
 #: downloads\index.php:12
-#: engine\page.inc:302
+#: engine\page.inc:314
 #, c-format
 msgid "Download WinMerge"
 msgstr "WinMerge herunterladen"
@@ -1833,7 +1849,7 @@
 msgid "Tools"
 msgstr ""
 
-#: engine\page.inc:369
+#: engine\page.inc:381
 #, c-format
 msgid "Bookmark this on Delicious"
 msgstr "Bookmarken Sie diese Seite bei Delicious"

Modified: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot	2009-10-22 18:42:45 UTC (rev 7025)
+++ trunk/Translations/Web/en-US.pot	2009-10-23 18:45:27 UTC (rev 7026)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: 2009-09-28 20:35+0000\n"
+"POT-Creation-Date: 2009-10-23 20:39+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <win...@li...>\n"
@@ -79,14 +79,14 @@
 msgid "Handles Windows, Unix and Mac text file formats"
 msgstr ""
 
-#: engine\page.inc:312
+#: engine\page.inc:324
 #: support\tracker-shortcuts.php:7
 #: support\tracker-shortcuts.php:9
 #, c-format
 msgid "Tracker Shortcuts"
 msgstr ""
 
-#: engine\page.inc:298
+#: engine\page.inc:310
 #, c-format
 msgid "WinMerge Change Log"
 msgstr ""
@@ -128,12 +128,12 @@
 msgid "The translations status is currently not available..."
 msgstr ""
 
-#: engine\page.inc:295
+#: engine\page.inc:306
 #, c-format
 msgid "WinMerge Manual"
 msgstr ""
 
-#: engine\page.inc:309
+#: engine\page.inc:321
 #, c-format
 msgid "WinMerge Discussion Forums"
 msgstr ""
@@ -154,7 +154,7 @@
 msgid "Support List"
 msgstr ""
 
-#: engine\page.inc:305
+#: engine\page.inc:317
 #, c-format
 msgid "WinMerge PAD File"
 msgstr ""
@@ -230,7 +230,7 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr ""
 
-#: engine\page.inc:317
+#: engine\page.inc:329
 #, c-format
 msgid "WinMerge Translations Instructions"
 msgstr ""
@@ -275,7 +275,7 @@
 msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
 msgstr ""
 
-#: engine\page.inc:312
+#: engine\page.inc:324
 #, c-format
 msgid "WinMerge Tracker Shortcuts"
 msgstr ""
@@ -305,8 +305,8 @@
 msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
 msgstr ""
 
-#: engine\page.inc:265
-#: engine\page.inc:308
+#: engine\page.inc:276
+#: engine\page.inc:320
 #, c-format
 msgid "WinMerge Support"
 msgstr ""
@@ -316,7 +316,7 @@
 msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
 msgstr ""
 
-#: engine\page.inc:310
+#: engine\page.inc:322
 #: support\mailing-lists.php:7
 #: support\mailing-lists.php:9
 #, c-format
@@ -355,7 +355,7 @@
 msgid "The release notes are currently not available..."
 msgstr ""
 
-#: engine\page.inc:297
+#: engine\page.inc:309
 #, c-format
 msgid "WinMerge Known Issues"
 msgstr ""
@@ -377,7 +377,7 @@
 
 #: links.php:6
 #: about\license.php:30
-#: engine\page.inc:284
+#: engine\page.inc:295
 #, c-format
 msgid "Links"
 msgstr ""
@@ -437,7 +437,7 @@
 msgid "Web Addresses"
 msgstr ""
 
-#: engine\page.inc:318
+#: engine\page.inc:330
 #, c-format
 msgid "WinMerge Translations Status (Stable Branch)"
 msgstr ""
@@ -452,7 +452,7 @@
 msgid "Difference pane shows current difference in two vertical panes"
 msgstr ""
 
-#: engine\page.inc:317
+#: engine\page.inc:329
 #, c-format
 msgid "Instructions"
 msgstr ""
@@ -483,11 +483,11 @@
 msgid "Swedish"
 msgstr ""
 
-#: engine\page.inc:283
-#: engine\page.inc:288
 #: engine\page.inc:294
-#: engine\page.inc:308
-#: engine\page.inc:316
+#: engine\page.inc:299
+#: engine\page.inc:305
+#: engine\page.inc:320
+#: engine\page.inc:328
 #, c-format
 msgid "Index"
 msgstr ""
@@ -526,12 +526,12 @@
 msgid "Announce List"
 msgstr ""
 
-#: engine\page.inc:319
+#: engine\page.inc:331
 #, c-format
 msgid "Status (Unstable Trunk)"
 msgstr ""
 
-#: engine\page.inc:264
+#: engine\page.inc:275
 #, c-format
 msgid "WinMerge Downloads"
 msgstr ""
@@ -541,7 +541,7 @@
 msgid "Japanese WinMerge Version"
 msgstr ""
 
-#: engine\page.inc:311
+#: engine\page.inc:323
 #, c-format
 msgid "Tracker"
 msgstr ""
@@ -549,8 +549,8 @@
 #: about\history.php:20
 #: docs\changelog.php:7
 #: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: docs\index.php:16
+#: engine\page.inc:310
 #, c-format
 msgid "Change Log"
 msgstr ""
@@ -597,7 +597,7 @@
 msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
 msgstr ""
 
-#: engine\page.inc:299
+#: engine\page.inc:311
 #, c-format
 msgid "WinMerge Development Wiki"
 msgstr ""
@@ -617,6 +617,11 @@
 msgid "<a href=\"%s\">Release Notes</a>?"
 msgstr ""
 
+#: engine\page.inc:307
+#, c-format
+msgid "WinMerge Quick Tour"
+msgstr ""
+
 #: 404.php:11
 #, c-format
 msgid "Page Not Found..."
@@ -637,12 +642,12 @@
 msgid "Resolve conflict files"
 msgstr ""
 
-#: engine\page.inc:264
+#: engine\page.inc:275
 #, c-format
 msgid "Downloads"
 msgstr ""
 
-#: engine\page.inc:266
+#: engine\page.inc:277
 #: translations\index.php:8
 #: translations\index.php:10
 #, c-format
@@ -665,21 +670,21 @@
 msgid "Translated: %d%%"
 msgstr ""
 
-#: engine\page.inc:285
+#: engine\page.inc:296
 #, c-format
 msgid "Project Page"
 msgstr ""
 
 #: about\index.php:7
 #: about\index.php:10
-#: engine\page.inc:262
-#: engine\page.inc:288
+#: engine\page.inc:273
+#: engine\page.inc:299
 #, c-format
 msgid "About WinMerge"
 msgstr ""
 
-#: engine\page.inc:266
-#: engine\page.inc:316
+#: engine\page.inc:277
+#: engine\page.inc:328
 #, c-format
 msgid "WinMerge Translations"
 msgstr ""
@@ -694,7 +699,7 @@
 msgid "Release Status"
 msgstr ""
 
-#: engine\page.inc:311
+#: engine\page.inc:323
 #, c-format
 msgid "WinMerge Tracker"
 msgstr ""
@@ -709,9 +714,10 @@
 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:297
+#: docs\index.php:12
+#: engine\page.inc:307
 #, c-format
-msgid "Known Issues"
+msgid "Quick Tour"
 msgstr ""
 
 #: translations\index.php:29
@@ -725,7 +731,7 @@
 msgid "Last Update"
 msgstr ""
 
-#: engine\page.inc:304
+#: engine\page.inc:316
 #, c-format
 msgid "Source Code"
 msgstr ""
@@ -770,14 +776,14 @@
 
 #: docs\index.php:7
 #: docs\index.php:9
-#: engine\page.inc:263
+#: engine\page.inc:274
 #, c-format
 msgid "Documentation"
 msgstr ""
 
 #: about\history.php:19
 #: docs\index.php:10
-#: engine\page.inc:295
+#: engine\page.inc:306
 #, c-format
 msgid "Manual"
 msgstr ""
@@ -809,7 +815,7 @@
 msgid "SHA-1 Checksums"
 msgstr ""
 
-#: engine\page.inc:231
+#: engine\page.inc:242
 #, c-format
 msgid "Version %1$s; %2$s MB"
 msgstr ""
@@ -849,7 +855,7 @@
 msgid "English (Template)"
 msgstr ""
 
-#: engine\page.inc:284
+#: engine\page.inc:295
 #, c-format
 msgid "WinMerge Links"
 msgstr ""
@@ -864,22 +870,22 @@
 msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
 msgstr ""
 
-#: docs\index.php:15
+#: docs\index.php:17
 #, 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:303
+#: engine\page.inc:315
 #, c-format
 msgid "Download WinMerge Plugins"
 msgstr ""
 
-#: engine\page.inc:319
+#: engine\page.inc:331
 #, c-format
 msgid "WinMerge Translations Status (Unstable Trunk)"
 msgstr ""
 
-#: docs\index.php:17
+#: docs\index.php:19
 #, c-format
 msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
 msgstr ""
@@ -922,7 +928,7 @@
 msgid "Visual differencing and merging of text files"
 msgstr ""
 
-#: engine\page.inc:285
+#: engine\page.inc:296
 #, c-format
 msgid "WinMerge Project Page"
 msgstr ""
@@ -937,7 +943,7 @@
 msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
 msgstr ""
 
-#: engine\page.inc:289
+#: engine\page.inc:300
 #, c-format
 msgid "WinMerge Screenshots"
 msgstr ""
@@ -961,7 +967,7 @@
 #: about\index.php:64
 #: about\screenshots\index.php:7
 #: about\screenshots\index.php:9
-#: engine\page.inc:289
+#: engine\page.inc:300
 #, c-format
 msgid "Screenshots"
 msgstr ""
@@ -1014,7 +1020,7 @@
 
 #: index.php:42
 #: downloads\pad-file.php:96
-#: engine\page.inc:265
+#: engine\page.inc:276
 #: support\index.php:8
 #: support\index.php:10
 #, c-format
@@ -1081,7 +1087,7 @@
 msgid "English Descriptions"
 msgstr ""
 
-#: engine\page.inc:313
+#: engine\page.inc:325
 #: support\index.php:37
 #, c-format
 msgid "Donate"
@@ -1177,7 +1183,7 @@
 msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
 msgstr ""
 
-#: engine\page.inc:318
+#: engine\page.inc:330
 #, c-format
 msgid "Status (Stable Branch)"
 msgstr ""
@@ -1270,7 +1276,7 @@
 msgid "English Keywords"
 msgstr ""
 
-#: engine\page.inc:304
+#: engine\page.inc:316
 #, c-format
 msgid "Download WinMerge Source Code"
 msgstr ""
@@ -1278,7 +1284,7 @@
 #: downloads\pad-file.php:7
 #: downloads\pad-file.php:9
 #: downloads\pad-file.php:80
-#: engine\page.inc:305
+#: engine\page.inc:317
 #, c-format
 msgid "PAD File"
 msgstr ""
@@ -1300,11 +1306,6 @@
 msgid "regex HOWTO"
 msgstr ""
 
-#: docs\index.php:6
-#, c-format
-msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
-msgstr ""
-
 #: about\license.php:10
 #, c-format
 msgid "This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\nThe only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
@@ -1327,7 +1328,7 @@
 
 #: about\history.php:7
 #: about\history.php:9
-#: engine\page.inc:290
+#: engine\page.inc:301
 #, c-format
 msgid "History"
 msgstr ""
@@ -1362,8 +1363,8 @@
 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:261
-#: engine\page.inc:283
+#: engine\page.inc:272
+#: engine\page.inc:294
 #, c-format
 msgid "WinMerge Home"
 msgstr ""
@@ -1378,7 +1379,7 @@
 msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
 msgstr ""
 
-#: engine\page.inc:302
+#: engine\page.inc:314
 #, c-format
 msgid "WinMerge"
 msgstr ""
@@ -1404,7 +1405,7 @@
 msgid "Exe-Format (%s MB)"
 msgstr ""
 
-#: engine\page.inc:303
+#: engine\page.inc:315
 #, c-format
 msgid "Plugins"
 msgstr ""
@@ -1441,8 +1442,8 @@
 msgid "Information"
 msgstr ""
 
-#: engine\page.inc:263
-#: engine\page.inc:294
+#: engine\page.inc:274
+#: engine\page.inc:305
 #, c-format
 msgid "WinMerge Documentation"
 msgstr ""
@@ -1457,6 +1458,11 @@
 msgid "Fast compare using file sizes and dates"
 msgstr ""
 
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
+msgstr ""
+
 #: support\mailing-lists.php:24
 #: support\mailing-lists.php:34
 #: support\mailing-lists.php:44
@@ -1472,7 +1478,7 @@
 msgid "GNU General Public License"
 msgstr ""
 
-#: docs\index.php:13
+#: docs\index.php:15
 #, 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 ""
@@ -1501,7 +1507,7 @@
 msgid "File Comparison"
 msgstr ""
 
-#: engine\page.inc:261
+#: engine\page.inc:272
 #, c-format
 msgid "Home"
 msgstr ""
@@ -1583,8 +1589,8 @@
 msgid "<a href=\"%s\">Screenshots</a>?"
 msgstr ""
 
-#: docs\index.php:16
-#: engine\page.inc:299
+#: docs\index.php:18
+#: engine\page.inc:311
 #, c-format
 msgid "Development Wiki"
 msgstr ""
@@ -1611,7 +1617,7 @@
 msgid "Translations instructions"
 msgstr ""
 
-#: engine\page.inc:310
+#: engine\page.inc:322
 #, c-format
 msgid "WinMerge Mailing Lists"
 msgstr ""
@@ -1621,7 +1627,7 @@
 msgid "Experimental Builds"
 msgstr ""
 
-#: engine\page.inc:313
+#: engine\page.inc:325
 #, c-format
 msgid "Donate money to WinMerge"
 msgstr ""
@@ -1631,7 +1637,7 @@
 msgid "Stable Versions"
 msgstr ""
 
-#: engine\page.inc:262
+#: engine\page.inc:273
 #, c-format
 msgid "About"
 msgstr ""
@@ -1643,7 +1649,7 @@
 
 #: about\license.php:7
 #: about\license.php:9
-#: engine\page.inc:291
+#: engine\page.inc:302
 #, c-format
 msgid "License"
 msgstr ""
@@ -1653,7 +1659,7 @@
 msgid "Other Versions"
 msgstr ""
 
-#: engine\page.inc:309
+#: engine\page.inc:321
 #, c-format
 msgid "Discussion Forums"
 msgstr ""
@@ -1678,7 +1684,7 @@
 msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
 msgstr ""
 
-#: engine\page.inc:230
+#: engine\page.inc:241
 #, c-format
 msgid "Download Now!"
 msgstr ""
@@ -1693,10 +1699,15 @@
 msgid "Folder Compare"
 msgstr ""
 
-#: docs\index.php:12
+#: engine\page.inc:309
+#, c-format
+msgid "Known Issues"
+msgstr ""
+
+#: docs\index.php:14
 #: docs\releasenotes.php:7
 #: docs\releasenotes.php:10
-#: engine\page.inc:296
+#: engine\page.inc:308
 #, c-format
 msgid "Release Notes"
 msgstr ""
@@ -1706,7 +1717,7 @@
 msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
 msgstr ""
 
-#: engine\page.inc:296
+#: engine\page.inc:308
 #, c-format
 msgid "WinMerge Release Notes"
 msgstr ""
@@ -1753,6 +1764,11 @@
 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 ""
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%s\">quick tour</a> describe the main  features from WinMerge at one page."
+msgstr ""
+
 #: engine\engine.inc:22
 #, c-format
 msgid "Japanese"
@@ -1785,7 +1801,7 @@
 msgid "Moved lines detection"
 msgstr ""
 
-#: engine\page.inc:290
+#: engine\page.inc:301
 #, c-format
 msgid "WinMerge History"
 msgstr ""
@@ -1806,7 +1822,7 @@
 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:291
+#: engine\page.inc:302
 #, c-format
 msgid "WinMerge License"
 msgstr ""
@@ -1818,7 +1834,7 @@
 
 #: downloads\index.php:10
 #: downloads\index.php:12
-#: engine\page.inc:302
+#: engine\page.inc:314
 #, c-format
 msgid "Download WinMerge"
 msgstr ""
@@ -1828,7 +1844,7 @@
 msgid "Tools"
 msgstr ""
 
-#: engine\page.inc:369
+#: engine\page.inc:381
 #, c-format
 msgid "Bookmark this on Delicious"
 msgstr ""

Modified: trunk/Translations/Web/fr.po
===================================================================
--- trunk/Translations/Web/fr.po	2009-10-22 18:42:45 UTC (rev 7025)
+++ trunk/Translations/Web/fr.po	2009-10-23 18:45:27 UTC (rev 7026)
@@ -82,14 +82,14 @@
 msgid "Handles Windows, Unix and Mac text file formats"
 msgstr "Gère les formats de fichiers textes Windows, Unix et Mac"
 
-#: engine\page.inc:312
+#: engine\page.inc:324
 #: support\tracker-shortcuts.php:7
 #: support\tracker-shortcuts.php:9
 #, c-format
 msgid "Tracker Shortcuts"
 msgstr "Raccourcis traqueurs"
 
-#: engine\page.inc:298
+#: engine\page.inc:310
 #, c-format
 msgid "WinMerge Change Log"
 msgstr "Journal des changements de Winmerge"
@@ -131,12 +131,12 @@
 msgid "The translations status is currently not available..."
 msgstr "Le statut de la traduction est actuellement indisponible..."
 
-#: engine\page.inc:295
+#: engine\page.inc:306
 #, c-format
 msgid "WinMerge Manual"
 msgstr "Manuel de Winmerge"
 
-#: engine\page.inc:309
+#: engine\page.inc:321
 #, c-format
 msgid "WinMerge Discussion Forums"
 msgstr "Forums de discussion de Winmerge"
@@ -157,7 +157,7 @@
 msgid "Support List"
 msgstr "Liste du support"
 
-#: engine\page.inc:305
+#: engine\page.inc:317
 #, c-format
 msgid "WinMerge PAD File"
 msgstr "Fichier PAD de Winmerge"
@@ -233,7 +233,7 @@
 msgid "<a href=\"%s\">Documentation</a>?"
 msgstr "<a href=\"%s\">Documentation</a>?"
 
-#: engine\page.inc:317
+#: engine\page.inc:329
 #, c-format
 msgid "WinMerge Translations Instructions"
 msgstr "Instructions de traductions de Winmerge"
@@ -278,7 +278,7 @@
 msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
 msgstr "<a href=\"%s\">manuel en ligne</a> et manuel d'aide HTML installé"
 
-#: engine\page.inc:312
+#: engine\page.inc:324
 #, c-format
 msgid "WinMerge Tracker Shortcuts"
 msgstr "Raccourcis traqueurs de Winmerge"
@@ -308,8 +308,8 @@
 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 "Le comparateur de dossiers montre tous les fichiers et sous-dossiers trouvés des dossiers comparés sous forme de listes. Le comparateur de dossiers permet la synchronisation de dossiers en copiant et supprimant les fichiers et sous-dossiers  La vue dossier du comparateur peut être particulièrement personnalisée. "
 
-#: engine\page.inc:265
-#: engine\page.inc:308
+#: engine\page.inc:276
+#: engine\page.inc:320
 #, c-format
 msgid "WinMerge Support"
 msgstr "Support de Winmerge"
@@ -319,7 +319,7 @@
 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 "Nous demandons un enregistrement car les sousmissions anonymes ont causé beaucoup de spams et aussi car il n'y a aucune possibilité de contacter les personnes pour la demande de plus d'informations."
 
-#: engine\page.inc:310
+#: engine\page.inc:322
 #: support\mailing-lists.php:7
 #: support\mailing-lists.php:9
 #, c-format
@@ -358,7 +358,7 @@
 msgid "The release notes are currently not available..."
 msgstr "Les notes de version sont actuellement indisponibles..."
 
-#: engine\page.inc:297
+#: engine\page.inc:309
 #, c-format
 msgid "WinMerge Known Issues"
 msgstr "Problèmes connus de Winmerge"
@@ -380,7 +380,7 @@
 
 #: links.php:6
 #: about\license.php:30
-#: engine\page.inc:284
+#: engine\page.inc:295
 #, c-format
 msgid "Links"
 msgstr "Liens"
@@ -440,7 +440,7 @@
 msgid "Web Addresses"
 msgstr "Adresses web"
 
-#: engine\page.inc:318
+#: engine\page.inc:330
 #, c-format
 msgid "WinMerge Translations Status (Stable Branch)"
 msgstr "Statut des traductions de Winmerge (branche stable)"
@@ -455,7 +455,7 @@
 msgid "Difference pane shows current difference in two vertical panes"
 msgstr "Le panneau des différences montre les différences actuelles entre les deux panneaux verticaux"
 
-#: engine\page.inc:317
+#: engine\page.inc:329
 #, c-format
 msgid "Instructions"
 msgstr "Instructions"
@@ -486,11 +486,11 @@
 msgid "Swedish"
 msgstr "Suédois"
 
-#: engine\page.inc:283
-#: engine\page.inc:288
 #: engine\page.inc:294
-#: engine\page.inc:308
-#: engine\page.inc:316
+#: engine\page.inc:299
+#: engine\page.inc:305
+#: engine\page.inc:320
+#: engine\page.inc:328
 #, c-format
 msgid "Index"
 msgstr "Index"
@@ -529,12 +529,12 @@
 msgid "Announce List"
 msgstr "Liste d'annonces"
 
-#: engine\page.inc:319
+#: engine\page.inc:331
 #, c-format
 msgid "Status (Unstable Trunk)"
 msgstr "Stable (tronçon instable)"
 
-#: engine\page.inc:264
+#: engine\page.inc:275
 #, c-format
 msgid "WinMerge Downloads"
 msgstr "Téléchargements Winmerge"
@@ -544,7 +544,7 @@
 msgid "Japanese WinMerge Version"
 msgstr "Version japonaise de Winmerge"
 
-#: engine\page.inc:311
+#: engine\page.inc:323
 #, c-format
 msgid "Tracker"
 msgstr "Traqueur"
@@ -552,8 +552,8 @@
 #: about\history.php:20
 #: docs\changelog.php:7
 #: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:298
+#: docs\index.php:16
+#: engine\page.inc:310
 #, c-format
 msgid "Change Log"
 msgstr "Journal des changements"
@@ -600,7 +600,7 @@
 msgid "Reviews of popular comparison software. [<a href=\"%s\">WinMerge Review</a>]"
 msgstr ""
 
-#: engine\page.inc:299
+#: engine\page.inc:311
 #, c-format
 msgid "WinMerge Development Wiki"
 msgstr "Wiki du développement de Winmerge"
@@ -620,6 +620,11 @@
 msgid "<a href=\"%s\">Release Notes</a>?"
 msgstr "<a href=\"%s\">Notes de version</a>?"
 
+#: engine\page.inc:307
+#, c-format
+msgid "WinMerge Quick Tour"
+msgstr ""
+
 #: 404.php:11
 #, c-format
 msgid "Page Not Found..."
@@ -640,12 +645,12 @@
 msgid "Resolve conflict files"
 msgstr "Résoudre les conflits de fichiers"
 
-#: engine\page.inc:264
+#: engine\page.inc:275
 #, c-format
 msgid "Downloads"
 msgstr "Téléchargements"
 
-#: engine\page.inc:266
+#: engine\page.inc:277
 #: translations\index.php:8
 #: translations\index.php:10
 #, c-format
@@ -668,21 +673,21 @@
 msgid "Translated: %d%%"
 msgstr "Traduit: %d%%"
 
-#: engine\page.inc:285
+#: engine\page.inc:296
 #, c-format
 msgid "Project Page"
 msgstr "Page du projet"
 
 #: about\index.php:7
 #: about\index.php:10
-#: engine\page.inc:262
-#: engine\page.inc:288
+#: engine\page.inc:273
+#: engine\page.inc:299
 #, c-format
 msgid "About WinMerge"
 msgstr "À propos de Winmerge"
 
-#: engine\page.inc:266
-#: engine\page.inc:316
+#: engine\page.inc:277
+#: engine\page.inc:328
 #, c-format
 msgid "WinMerge Translations"
 msgstr "Traductions de Winmerge"
@@ -697,7 +702,7 @@
 msgid "Release Status"
 msgstr "Statut de la version"
 
-#: engine\page.inc:311
+#: engine\page.inc:323
 #, c-format
 msgid "WinMerge Tracker"
 msgstr "Traqueur Winmerge"
@@ -712,10 +717,11 @@
 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 "Télécharger la version actuelle de Winmerge %1$s, qui a été publiée le %2$s. Pour une info détaillée sur les nouveautés, lisez le journal des changements et les notes de versions."
 
-#: engine\page.inc:297
+#: docs\index.php:12
+#: engine\page.inc:307
 #, c-format
-msgid "Known Issues"
-msgstr "Problèmes connus"
+msgid "Quick Tour"
+msgstr ""
 
 #: translations\index.php:29
 #, c-format
@@ -728,7 +734,7 @@
 msgid "Last Update"
 msgstr "Dernière mise à jour"
 
-#: engine\page.inc:304
+#: engine\page.inc:316
 #, c-format
 msgid "Source Code"
 msgstr "Code source"
@@ -773,14 +779,14 @@
 
 #: docs\index.php:7
 #: docs\index.php:9
-#: engine\page.inc:263
+#: engine\page.inc:274
 #, c-format
 msgid "Documentation"
 msgstr "Documentation"
 
 #: about\history.php:19
 #: docs\index.php:10
-#: engine\page.inc:295
+#: engine\page.inc:306
 #, c-format
 msgid "Manual"
 msgstr "Manuel"
@@ -812,7 +818,7 @@
 msgid "SHA-1 Checksums"
 msgstr "SHA-1 Checksums"
 
-#: engine\page.inc:231
+#: engine\page.inc:242
 #, c-format
 msgid "Version %1$s; %2$s MB"
 msgstr "Version %1$s; %2$s MB"
@@ -852,7 +858,7 @@
 msgid "English (Template)"
 msgstr "Anglais (Modèle)"
 
-#: engine\page.inc:284
+#: engine\page.inc:295
 #, c-format
 msgid "WinMerge Links"
 msgstr "Liens Winmerge"
@@ -867,22 +873,22 @@
 msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
 msgstr "La documentation de Winmerge comme la manuel, les notes de versions, le journal des changements et le wiki du développement."
 
-#: docs\index.php:15
+#: docs\index.php:17
 #, c-format
 msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
 msgstr "Le <a href=\"%s\">journal des changements</a> est une liste plus complète des changements dans la dernière version de WinMerge."
 
-#: engine\page.inc:303
+#: engine\page.inc:315
 #, c-format
 msgid "Download WinMerge Plugins"
 msgstr "Télécharger les plugins de Winmerge"
 
-#: engine\page.inc:319
+#: engine\page.inc:331
 #, c-format
 msgid "WinMerge Translations Status (Unstable Trunk)"
 msgstr "Statut de la traduction de Winmerge (Tronçon instable)"
 
-#: docs\index.php:17
+#: docs\index.php:19
 #, c-format
 msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
 msgstr "Le <a href=\"%s\">Wiki du développement</a> contient plus d'informations sur le développement de WinMerge."
@@ -925,7 +931,7 @@
 msgid "Visual differencing and merging of text files"
 msgstr "Différenciation visuelle et fusion de fichiers textes"
 
-#: engine\page.inc:285
+#: engine\page.inc:296
 #, c-format
 msgid "WinMerge Project Page"
 msgstr "Page du projet Winmerge"
@@ -940,7 +946,7 @@
 msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
 msgstr "Vous pouvez aussi lire les <a href=\"%1$s\">Notes de version</a> ou rechercher <a href=\"%2$s\">d'autres versions</a>."
 
-#: engine\page.inc:289
+#: engine\page.inc:300
 #, c-format
 msgid "WinMerge Screenshots"
 msgstr "Captures d'écran de Winmerge"
@@ -964,7 +970,7 @@
 #: about\index.php:64
 #: about\screenshots\index.php:7
 #: about\screenshots\index.php:9
-#: engine\page.inc:289
+#: engine\page.inc:300
 #, c-format
 msgid "Screenshots"
 msgstr "Captures d'écrans"
@@ -1017,7 +1023,7 @@
 
 #: index.php:42
 #: downloads\pad-file.php:96
-#: engine\page.inc:265
+#: engine\page.inc:276
 #: support\index.php:8
 #: support\index.php:10
 #, c-format
@@ -1084,7 +1090,7 @@
 msgid "English Descriptions"
 msgstr "Descriptions anglaises"
 
-#: engine\page.inc:313
+#: engine\page.inc:325
 #: support\index.php:37
 #, c-format
 msgid "Donate"
@@ -1180,7 +1186,7 @@
 msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
 msgstr "Si vous avez besoin de support, reportez vous sur <a href=\"%s\">la page de support</a> pour plus d'information sur comment vous pouvez l'obtenir."
 
-#: engine\page.inc:318
+#: engine\page.inc:330
 #, c-format
 msgid "Status (Stable Branch)"
 msgstr "Statut (branche stable)"
@@ -1273,7 +1279,7 @@
 msgid "English Keywords"
 msgstr "Mots clés anglais"
 
-#: engine\page.inc:304
+#: engine\page.inc:316
 #, c-format
 msgid "Download WinMerge Source Code"
 msgstr "Télécharger le code source de Winmerge"
@@ -1281,7 +1287,7 @@
 #: downloads\pad-file.php:7
 #: downloads\pad-file.php:9
 #: downloads\pad-file.php:80
-#: engine\page.inc:305
+#: engine\page.inc:317
 #, c-format
 msgid "PAD File"
 msgstr "Fichiers PAD"
@@ -1303,11 +1309,6 @@
 msgid "regex HOWTO"
 msgstr ""
 
-#: docs\index.php:6
-#, c-format
-msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
-msgstr "WinMerge, documentation, manuel, notes de version, problèmes connus, journal des changements, Wiki du développement"
-
 #: about\license.php:10
 #, c-format
 msgid ""
@@ -1334,7 +1335,7 @@
 
 #: about\history.php:7
 #: about\history.php:9
-#: engine\page.inc:290
+#: engine\page.inc:301
 #, c-format
 msgid "History"
 msgstr "Historique"
@@ -1369,8 +1370,8 @@
 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 "Veuillez attacher autant d'information que possible: au minimum, le numéro de la version utilisées de WinMerge. Si vous le pouvez, veuillez attacher le journal de configuration que, vous pouvez afficher en cliquant sur <span class=\"guimenu\">Aide</span> &#8594; <span class=\"guimenuitem\">Configuration</span> dans la fenêtre de WinMerge."
 
-#: engine\page.inc:261
-#: engine\page.inc:283
+#: engine\page.inc:272
+#: engine\page.inc:294
 #, c-format
 msgid "WinMerge Home"
 msgstr "Page d'accueil de Winmerge"
@@ -1385,7 +1386,7 @@
 msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
 msgstr "Le <a href=\"%s\">manuel</a> explique comment utiliser WinMerge, et les documents ses capacités et limitations."
 
-#: engine\page.inc:302
+#: engine\page.inc:314
 #, c-format
 msgid "WinMerge"
 msgstr "WinMerge"
@@ -1411,7 +1412,7 @@
 msgid "Exe-Format (%s MB)"
 msgstr "Format-exe (%s MB)"
 
-#: engine\page.inc:303
+#: engine\page.inc:315
 #, c-format
 msgid "Plugins"
 msgstr "Plugins"
@@ -1448,8 +1449,8 @@
 msgid "Information"
 msgstr "Information"
 
-#: engine\page.inc:263
-#: engine\page.inc:294
+#: engine\page.inc:274
+#: engine\page.inc:305
 #, c-format
 msgid "WinMerge Documentation"
 msgstr "Documentation de WinMerge "
@@ -1464,6 +1465,11 @@
 msgid "Fast compare using file sizes and dates"
 msgstr "Comparaison rapid en utilisant les tailles des fichiers et les dates"
 
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, quick tour, release notes, known issues, change log, Development Wiki"
+msgstr ""
+
 #: support\mailing-lists.php:24
 #: support\mailing-lists.php:34
 #: support\mailing-lists.php:44
@@ -1479,7 +1485,7 @@
 msgid "GNU General Public License"
 msgstr "GNU Licence Générale Publique"
 
-#: docs\index.php:13
+#: docs\index.php:15
 #, c-format
 msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
 msgstr "Les <a href=\"%1$s\">notes de version</a> sont un court résumé des changements importants, améliorations, corrections de bogues et <a href=\"%2$s\">problèmes connus</a> dans la version actuelle de WinMerge."
@@ -1508,7 +1514,7 @@
 msgid "File Comparison"
 msgstr "Comparaison de fichiers "
 
-#: engine\page.inc:261
+#: engine\page.inc:272
 #, c-format
 msgid "Home"
 msgstr "Page d'accueil"
@@ -1590,8 +1596,8 @@
 msgid "<a href=\"%s\">Screenshots</a>?"
 msgstr "<a href=\"%s\">Captures d'écran</a>?"
 
-#: docs\index.php:16
-#: engine\page.inc:299
+#: docs\index.php:18
+#: engine\page.inc:311
 #, c-format
 msgid "Development Wiki"
 msgstr "Wiki du dévelopment "
@@ -1618,7 +1624,7 @@
 msgid "Translations instructions"
 msgstr "Instructions de traduction"
 
-#: engine\page.inc:310
+#: engine\page.inc:322
 #, c-format
 msgid "WinMerge Mailing Lists"
 msgstr "Listes de mailing de Winmerge"
@@ -1628,7 +1634,7 @@
 msgid "Experimental Builds"
 msgstr "Versions expérimentales"
 
-#: engine\page.inc:313
+#: engine\page.inc:325
 #, c-format
 msgid "Donate money to WinMerge"
 msgstr "Donner de l'argent à Winmerge"
@@ -1638,7 +1644,7 @@
 msgid "Stable Versions"
 msgstr "Versions stables"
 
-#: engine\page.inc:262
+#: engine\page.inc:273
 #, c-format
 msgid "About"
 msgstr "À propos"
@@ -1650,7 +1656,7 @@
 
 #: about\license.php:7
 #: about\license.php:9
-#: engine\page.inc:291
+#: engine\page.inc:302
 #, c-format
 msgid "License"
 msgstr "Licence"
@@ -1660,7 +1666,7 @@
 msgid "Other Versions"
 msgstr "Autres versions"
 
-#: engine\page.inc:309
+#: engine\page.inc:321
 #, c-format
 msgid "Discussion Forums"
 msgstr "Forums de discussion "
@@ -1685,7 +1691,7 @@
 msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
 msgstr "WinMerge, libre, open source, Windows, windiff, diff, fusion, comparer, outil, utilitaire, texte, fichier, dossier, répertoire, comparaison de fichiers, comparaison de dossiers, fusion de fichiers, fusion de dossiers, outil de diff, outil de fusion, outil de comparaison"
 
-#: engine\page.inc:230
+#: engine\page.inc:241
 #, c-format
 msgid "Download Now!"
 msgstr "Télécharger maintenant !"
@@ -1700,10 +1706,15 @@
 msgid "Folder Compare"
 msgstr "Comparaison de dossiers"
 
-#: docs\index.php:12
+#: engine\page.inc:309
+#, c-format
+msgid "Known Issues"
+msgstr "Problèmes connus"
+
+#: docs\index.php:14
 #: docs\releasenotes.php:7
 #: docs\releasenotes.php:10
-#: engine\page.inc:296
+#: engine\page.inc:308
 #, c-format
 msgid "Release Notes"
 msgstr "Notes de version"
@@ -1713,7 +1724,7 @@
 msgid "<b>GnuWin32</b> provides Win32 ports of tools with a <a href=\"%1$s\">GNU</a> or similar <a href=\"%2$s\">open source license</a>."
 msgstr ""
 
-#: engine\page.inc:296
+#: engine\page.inc:308
 #, c-format
 msgid "WinMerge Release Notes"
 msgstr "Notes de versions de Winmerge"
@@ -1760,6 +1771,11 @@
 msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
 msgstr "WinMerge est très utile pour déterminer ce qui a changé entre les projets de versions, et alors fusionner les changements entre les versions. WinMerge peut être utiliser comme outil externe de différenciation/fusion ou en tant qu'application autonome."
 
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%s\">quick tour</a> describe the main  features from WinMerge at one page."
+msgstr ""
+
 #: engine\engine.inc:22
 #, c-format
 msgid "Japanese"
@@ -1792,7 +1808,7 @@
 msgid "Moved lines detection"
 msgstr "Détection des lignes déplacées"
 
-#: engine\page.inc:290
+#: engine\page.inc:301
 #, c-format
 msgid "WinMerge History"
 msgstr "Historique de Winmerge"
@@ -1813,7 +1829,7 @@
 msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
 msgstr "WinMerge est un logiciel <a href=\"%1$s\">Open Source</a> sous la <a href=\"%2$s\">Licence Générale Publique GNU</a>."
 
-#: engine\page.inc:291
+#: engine\p...
 
[truncated message content]

[Winmerge-svn] SF.net SVN: winmerge:[7025] trunk/Docs/Users/ChangeLog.txt

[<ki...@us...>]

Revision: 7025
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7025&view=rev
Author:   kimmov
Date:     2009-10-22 18:42:45 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
WinMerge experimental release 2.13.9. (SVN r7025)

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2009-10-22 18:26:45 UTC (rev 7024)
+++ trunk/Docs/Users/ChangeLog.txt	2009-10-22 18:42:45 UTC (rev 7025)
@@ -3,7 +3,7 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
-WinMerge 2.13.9
+WinMerge 2.13.9 - 2009-10-22 (r7025)
   Update PCRE to version 7.9 (r6903)
   Improve color options organization (#2818451)
   Improve character-level difference highlight accuracy (#2723613)


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

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

[<ki...@us...>]

Revision: 7024
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7024&view=rev
Author:   kimmov
Date:     2009-10-22 18:26:45 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Fix ANSI build.

Modified Paths:
--------------
    trunk/Src/Common/unicoder.cpp
    trunk/Src/DiffWrapper.cpp
    trunk/Src/FileFilterHelper.cpp
    trunk/Src/FileFilterHelper.h
    trunk/Src/FileFilterMgr.cpp
    trunk/Src/FolderCmp.cpp

Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp	2009-10-22 10:07:45 UTC (rev 7023)
+++ trunk/Src/Common/unicoder.cpp	2009-10-22 18:26:45 UTC (rev 7024)
@@ -549,7 +549,8 @@
 	{
 		// trivial case, they want the bytes in the file interpreted in our current codepage
 		// Only caveat is that input (lpd) is not zero-terminated
-		return String(lpd, len);
+		str = String(lpd, len);
+		return true;
 	}
 
 	str = CrossConvertToStringA(lpd, len, codepage, defcodepage, lossy);

Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp	2009-10-22 10:07:45 UTC (rev 7023)
+++ trunk/Src/DiffWrapper.cpp	2009-10-22 18:26:45 UTC (rev 7024)
@@ -138,7 +138,7 @@
 	{
 		m_bCreatePatchFile = TRUE;
 		m_sPatchFile = filename;
-		string_replace(m_sPatchFile, L"/", L"\\");
+		string_replace(m_sPatchFile, _T("/"), _T("\\"));
 	}
 }
 

Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp	2009-10-22 10:07:45 UTC (rev 7023)
+++ trunk/Src/FileFilterHelper.cpp	2009-10-22 18:26:45 UTC (rev 7024)
@@ -170,7 +170,7 @@
 {
 	m_sUserSelFilterPath = filterPath;
 	if (filterPath[filterPath.length() - 1] != '\\')
-		m_sUserSelFilterPath += L"\\";
+		m_sUserSelFilterPath += _T("\\");
 }
 
 /** 
@@ -247,10 +247,10 @@
 		String strFileName = szFileName;
 		strFileName = string_makelower(strFileName);
 		if (strFileName[0] != '\\')
-			strFileName = L"\\" + strFileName;
+			strFileName = _T("\\") + strFileName;
 		// append a point if there is no extension
 		if (strFileName.find('.') == -1)
-			strFileName = strFileName + L".";
+			strFileName = strFileName + _T(".");
 
 		char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName.c_str());
 		bool match = m_pMaskFilter->Match(name_utf);
@@ -474,8 +474,8 @@
 	m_fileFilterMgr->DeleteAllFilters();
 
 	// Program application directory
-	m_sGlobalFilterPath = GetModulePath() + L"\\Filters";
-	String pattern(L"*");
+	m_sGlobalFilterPath = GetModulePath() + _T("\\Filters");
+	String pattern(_T("*"));
 	pattern += FileFilterExt;
 	LoadFileFilterDirPattern(m_sGlobalFilterPath.c_str(), pattern.c_str());
 	LoadFileFilterDirPattern(m_sUserSelFilterPath.c_str(), pattern.c_str());

Modified: trunk/Src/FileFilterHelper.h
===================================================================
--- trunk/Src/FileFilterHelper.h	2009-10-22 10:07:45 UTC (rev 7023)
+++ trunk/Src/FileFilterHelper.h	2009-10-22 18:26:45 UTC (rev 7024)
@@ -35,7 +35,7 @@
 /**
  * @brief File extension of file filter files.
  */
-const TCHAR FileFilterExt[] = L".flt";
+const TCHAR FileFilterExt[] = _T(".flt");
 
 /**
  * @brief Helper structure for UI and management of filters.

Modified: trunk/Src/FileFilterMgr.cpp
===================================================================
--- trunk/Src/FileFilterMgr.cpp	2009-10-22 10:07:45 UTC (rev 7023)
+++ trunk/Src/FileFilterMgr.cpp	2009-10-22 18:26:45 UTC (rev 7024)
@@ -169,7 +169,7 @@
 		regexString, sizeof(regexString));
 	pcre_opts |= PCRE_UTF8;
 #else
-	strcpy(regexString, (LPCTSTR)str);
+	strcpy(regexString, str.c_str());
 	regexLen = strlen(regexString);
 #endif
 	pcre_opts |= PCRE_CASELESS;

Modified: trunk/Src/FolderCmp.cpp
===================================================================
--- trunk/Src/FolderCmp.cpp	2009-10-22 10:07:45 UTC (rev 7023)
+++ trunk/Src/FolderCmp.cpp	2009-10-22 18:26:45 UTC (rev 7024)
@@ -71,7 +71,7 @@
 	// Invoke unpacking plugins
 	if (!Unpack(plugCtxt->filepathUnpacked1, filteredFilenames.c_str(), plugCtxt->infoUnpacker))
 	{
-		errStr = L"Unpack Error Side 1";
+		errStr = _T("Unpack Error Side 1");
 		return false;
 	}
 
@@ -80,7 +80,7 @@
 
 	if (!Unpack(plugCtxt->filepathUnpacked2, filteredFilenames.c_str(), plugCtxt->infoUnpacker))
 	{
-		errStr = L"Unpack Error Side 2";
+		errStr = _T("Unpack Error Side 2");
 		return false;
 	}
 
@@ -91,7 +91,7 @@
 	if (!m_diffFileData.OpenFiles(plugCtxt->filepathTransformed1.c_str(),
 			plugCtxt->filepathTransformed2.c_str()))
 	{
-		errStr = L"OpenFiles Error (before tranform)";
+		errStr = _T("OpenFiles Error (before tranform)");
 		return false;
 	}
 
@@ -100,7 +100,7 @@
 			plugCtxt->filepathUnpacked1, plugCtxt->filepathTransformed1,
 			filteredFilenames.c_str(), plugCtxt->infoPrediffer))
 	{
-		errStr = L"Transform Error Side 1";
+		errStr = _T("Transform Error Side 1");
 		return false;
 	}
 
@@ -111,7 +111,7 @@
 			plugCtxt->filepathUnpacked2, plugCtxt->filepathTransformed2,
 			filteredFilenames.c_str(), plugCtxt->infoPrediffer))
 	{
-		errStr = L"Transform Error Side 2";
+		errStr = _T("Transform Error Side 2");
 		return false;
 	}
 
@@ -128,7 +128,7 @@
 		if (!m_diffFileData.OpenFiles(plugCtxt->filepathTransformed1.c_str(),
 				plugCtxt->filepathTransformed2.c_str()))
 		{
-			errStr = L"OpenFiles Error (after tranform)";
+			errStr = _T("OpenFiles Error (after tranform)");
 			return false;
 		}
 	}
@@ -191,7 +191,7 @@
 			if (!m_diffFileData.OpenFiles(plugCtxt.origFileName1.c_str(),
 					plugCtxt.origFileName2.c_str()))
 			{
-				di.errorDesc = L"Error opening compared files";
+				di.errorDesc = _T("Error opening compared files");
 				return false;
 			}
 		}
@@ -244,7 +244,7 @@
 			m_ntrivialdiffs = CDiffContext::DIFFS_UNKNOWN;
 		}
 		if (DIFFCODE::isResultError(code))
-			di.errorDesc = L"DiffUtils Error";
+			di.errorDesc = _T("DiffUtils Error");
 	}
 	else if (nCompMethod == CMP_QUICK_CONTENT)
 	{
@@ -288,7 +288,7 @@
 	{
 		// Print error since we should have handled by date compare earlier
 		_RPTF0(_CRT_ERROR, "Invalid compare type, DiffFileData can't handle it");
-		di.errorDesc = L"Bad compare type";
+		di.errorDesc = _T("Bad compare type");
 	}
 
 	m_diffFileData.Reset();


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

[Winmerge-svn] SF.net SVN: winmerge:[7023] trunk/Translations/InnoSetup/Persian.isl

[<ge...@us...>]

Revision: 7023
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7023&view=rev
Author:   gerundt
Date:     2009-10-22 10:07:45 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
PATCH: [ 2877121 ] Persian translation - Translate InnoSetup (by Abolfazl Rostamzadeh)

Modified Paths:
--------------
    trunk/Translations/InnoSetup/Persian.isl

Modified: trunk/Translations/InnoSetup/Persian.isl
===================================================================
--- trunk/Translations/InnoSetup/Persian.isl	2009-10-21 19:36:10 UTC (rev 7022)
+++ trunk/Translations/InnoSetup/Persian.isl	2009-10-22 10:07:45 UTC (rev 7023)
@@ -310,76 +310,76 @@
 
 [CustomMessages]
 ;Inno Setup Built-in Custom Messages
-NameAndVersion=%1 \xE6\xED\xD1\xC7\xED\xD4 %2
-AdditionalIcons=\xD4\xE3\xC7\xED\xE1 \xE5\xC7\xED \xC7\xD6\xC7\xDD\xED:
-OptionalFeatures=Optional Features:
-CreateDesktopIcon=\xDD\xD1\xC7\xE5\xE3 \x98\xD1\xCF\xE4 \xED\x98 \xD4\xE3\xC7\xED\xE1 \xE3\xEDҘ\xC7\xD1
-CreateQuickLaunchIcon=\xDD\xD1\xC7\xE5\xE3 \x98\xD1\xCF\xE4 \xD4\xE3\xC7\xED\xE1 Quick Launch
-ProgramOnTheWeb=%1 \xCF\xD1 \xE6\xC8
-UninstallProgram=\xCD\xD0\xDD %1
-LaunchProgram=\xC8\xC7\xD2 \x98\xD1\xCF\xE4 %1
-AssocFileExtension=\xE6\xC7\xC8\xD3\xCA\xE5 \x98\xD1\xCF\xE4 %1 \xC8\xC7 \xDE\xC7\xE1\xC8 \xDD\xC7\xED\xE1 %2
-AssocingFileExtension=\xCF\xD1 \xCD\xC7\xE1 \xE6\xC7\xC8\xD3\xCA\xE5 \x98\xD1\xCF\xE4 %1 \xC8\xC7 \xDE\xC7\xE1\xC8 \xDD\xC7\xED\xE1 %2...
+NameAndVersion= %1 \xE6\xED\xD1\xC7\xED\xD4 %2 
+AdditionalIcons= \xD4\xE3\xC7\xED\xE1\xE5\xC7\xED \xC7\xD6\xC7\xDD\xE5 : 
+OptionalFeatures= \xE6펐\xED\xE5\xC7\xED \xC7\xCE\xCA\xED\xC7\xD1\xED :
+CreateDesktopIcon= \xDD\xD1\xC7\xE5\xE3 \x98\xD1\xCF\xE4 \xED\x98 \xD4\xE3\xC7\xED\xE1 \xE3\xEDҘ\xC7\xD1 
+CreateQuickLaunchIcon= \xDD\xD1\xC7\xE5\xE3 \x98\xD1\xCF\xE4 \xD4\xE3\xC7\xED\xE1 \x98\xC7\xD1 \xCF\xD1 \x98\xE6\xC6\xED\x98 \xE1\xC7\xE4\x8D  
+ProgramOnTheWeb= %1 \xCF\xD1 \xE6\xC8 
+UninstallProgram= \xCD\xD0\xDD %1 
+LaunchProgram= \xC8\xC7\xD2 \x98\xD1\xCF\xE4 %1 
+AssocFileExtension= \xE6\xC7\xC8\xD3\xCA\xE5 \x98\xD1\xCF\xE4 %1 \xC8\xC7 \xDE\xC7\xE1\xC8 \xDD\xC7\xED\xE1 %2 
+AssocingFileExtension= \xCF\xD1 \xCD\xC7\xE1 \xE6\xC7\xC8\xD3\xCA\xE5 \x98\xD1\xCF\xE4 %1 \xC8\xC7 \xDE\xC7\xE1\xC8 \xDD\xC7\xED\xE1 %2 ... 
 
 ;Things we can also localize
-CompanyName=Thingamahoochie Software
+CompanyName= \xCA\xED\xE4\x90\xC7\xE3\xC7\xE5\xE6\x8D\xED \xD3\xC7\xDD\xCA\xE6\xD1 
 
 ;Types
-TypicalInstallation=Typical Installation
-FullInstallation=Full Installation
-CompactInstallation=Compact Installation
-CustomInstallation=Custom Installation
+TypicalInstallation= \xE4\xD5\xC8 \xE3\xDA\xE3\xE6\xE1 
+FullInstallation= \xE4\xD5\xC8 \x98\xC7\xE3\xE1 
+CompactInstallation= \xE4\xD5\xC8 \xDD\xD4\xD1\xCF\xE5 
+CustomInstallation= \xE4\xD5\xC8 \xD3\xDD\xC7\xD1\xD4\xED 
 
 ;Components
-AppCoreFiles=WinMerge Core Files
-Filters=Filters
-Plugins=Plugins
+AppCoreFiles= \x81\xD1\xE6\xE4\xCF\xE5 \xE5\xC7\xED \xE5\xD3\xCA\xE5 \xE6\xED\xE4\xE3\xD1\xCC 
+Filters= \xD5\xC7\xDD\xED\xE5\xC7 
+Plugins= \xE6\xD5\xE1 \xD4\xCF\xE4\xED\xE5\xC7 
 
 ;Localization Components
-Languages=Languages
-BulgarianLanguage=Bulgarian menus and dialogs
-CatalanLanguage=Catalan menus and dialogs
-ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs
-ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs
-CroatianLanguage=Croatian menus and dialogs
-CzechLanguage=Czech menus and dialogs
-DanishLanguage=Danish menus and dialogs
-DutchLanguage=Dutch menus and dialogs
-FrenchLanguage=French menus and dialogs
-GalicianLanguage=Galician menus and dialogs
-GermanLanguage=German menus and dialogs
-GreekLanguage=Greek menus and dialogs
-HungarianLanguage=Hungarian menus and dialogs
-ItalianLanguage=Italian menus and dialogs
-JapaneseLanguage=Japanese menus and dialogs
-KoreanLanguage=Korean menus and dialogs
-NorwegianLanguage=Norwegian menus and dialogs
-PolishLanguage=Polish menus and dialogs
-PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
-PortugueseLanguage=Portuguese menus and dialogs
-RomanianLanguage=Romanian menus and dialogs
-RussianLanguage=Russian menus and dialogs
-SlovakLanguage=Slovak menus and dialogs
-SlovenianLanguage=Slovenian menus and dialogs
-SpanishLanguage=Spanish menus and dialogs
-SwedishLanguage=Swedish menus and dialogs
-TurkishLanguage=Turkish menus and dialogs
-UkrainianLanguage=Ukrainian menus and dialogs
+Languages= \xD2\xC8\xC7\xE4\xE5\xC7 
+BulgarianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC8\xE1\xDB\xC7\xD1\xED 
+CatalanLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x98\xC7\xCA\xC7\xE1\xC7\xE4 
+ChineseSimplifiedLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x8D\xED\xE4\xED \xD3\xC7\xCF\xE5 \xD4\xCF\xE5  
+ChineseTraditionalLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x8D\xED\xE4\xED \xD3\xE4\xCA\xED  
+CroatianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x98\xD1\xE6\xC7\xCA\xED\xE4  
+CzechLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x8D\x98\xE6\xD3\xE1\xE6ǘ\xED   
+DanishLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xCF\xC7\xE4\xE3\xC7ј\xED  
+DutchLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xE5\xE1\xE4\xCF\xED  
+FrenchLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xDD\xD1\xC7\xE4\xD3\xE6\xED  
+GalicianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x90\xC7\xE1\xED\xD3\xED\xE4  
+GermanLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC2\xE1\xE3\xC7\xE4\xED  
+GreekLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xED\xE6\xE4\xC7\xE4\xED  
+HungarianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xE3\xCC\xC7\xD1\xD3\xCA\xC7\xE4\xED  
+ItalianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7\xED\xCA\xC7\xE1\xED\xC7\xED\xED  
+JapaneseLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x8Eǁ\xE4\xED  
+KoreanLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x98\xD1\xE5 \xC7\xED  
+NorwegianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xE4\xD1\xE6\x8E\xED  
+PolishLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xE1\xE5\xD3\xCA\xC7\xE4\xED  
+PortugueseBrazilLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC8\xD1\xD2\xED\xE1\xED / \x81\xD1\xCA\xDE\xC7\xE1\xED   
+PortugueseLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \x81\xD1\xCA\xDE\xC7\xE1\xED  
+RomanianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xD1\xE6\xE3\xC7\xE4\xED  
+RussianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xD1\xE6\xD3\xED  
+SlovakLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7\xD3\xE1\xE6ǘ\xED  
+SlovenianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7\xD3\xE1\xC7\xE6\xED  
+SpanishLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xC7Ӂ\xC7\xE4\xED\xC7\xED\xED  
+SwedishLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xD3\xE6\xC6\xCF\xED  
+TurkishLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 \xCAј\xED  
+UkrainianLanguage= \xDD\xE5\xD1\xD3\xCA\xE5\xC7\xED \xC7\xE4\xCA\xCE\xC7\xC8 \xE6 \xCC\xDA\xC8\xE5 \xE5\xC7\xED \xE3\xCD\xC7\xE6\xD1\xE5 ǘ\xD1\xC7\xED\xE4\xED  
 
 ;Tasks
-ExplorerContextMenu=&Enable Explorer context menu integration
-IntegrateTortoiseCVS=Integrate with &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
-IntegrateClearCase=Integrate with Rational &ClearCase
-AddToPath=&Add WinMerge folder to your system path
+ExplorerContextMenu=&E \xDD\xDA\xC7\xE1 \xE4\xE3\xE6\xCF\xE4 혁\xC7э\xE5 \xD3\xC7\xD2\xED \xDD\xE5\xD1\xD3\xCA \xCC\xD3\xCA\xCC\xE6\x90\xD1 \xE3\xCA\xE4 
+IntegrateTortoiseSVN=&T 혁\xC7\xD1\xCC\xE5 \xD3\xC7\xD2\xED \xC8\xC7 \xCA\xE6\xD1\xCA\xE6\xC6\xED\xD2 \xD3\xED \xE6\xED \xC7\xD3 
+IntegrateTortoiseSVN=&o 혁\xC7\xD1\xCC\xE5 \xD3\xC7\xD2\xED \xC8\xC7 \xCA\xE6\xD1\xCA\xE6\xC6\xED\xD2 \xC7\xD3 \xE6\xED \xC7\xE4 
+IntegrateClearCase=&C 혁\xC7э\xE5 \xD3\xC7\xD2\xED \xC8\xC7 \xD1\xD4\xE4\xC7\xE1 \x98\xE1ј\xED\xD3 
+AddToPath=&A \xC7\xD6\xC7\xDD\xE5 \xE4\xE3\xE6\xCF\xE4 \x81\xE6\xD4\xE5 \xE6\xED\xE4\xE3\xD1\xCC \xC8\xE5 \xE3\xD3\xED\xD1\xE5\xC7\xED \xD3\xED\xD3\xCA\xE3 
 
 ;Icon Labels
-ReadMe=Read Me
-UsersGuide=User's Guide
-ViewStartMenuFolder=&View the WinMerge Start Menu Folder
+ReadMe= \xE3\xD1\xC7 \xC8\xCE\xE6\xC7\xE4 
+UsersGuide= \xD1\xC7\xE5\xE4\xE3\xC7\xED \x98\xC7\xD1\xC8\xD1\xED 
+ViewStartMenuFolder=&V \xE3\xD4\xC7\xE5\xCF\xE5 \x81\xE6\xD4\xE5 \xDD\xE5\xD1\xD3\xCA \xD4\xD1\xE6\xDA \xE6\xED\xE4\xE3\xD1\xCC 
 
 ;Code Dialogs
-DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder?
+DeletePreviousStartMenu= \xE4\xD5\xC7\xC8 \xE4\xD1\xE3 \xC7\xDD\xD2\xC7\xD1 \xE3\xCA\xE6\xCC\xE5 \xD4\xCF\xE5 \xC7\xD3\xCA \x98\xE5 \xD4\xE3\xC7 \xE3\xCD\xE1 \xDD\xE5\xD1\xD3\xCA \xD4\xD1\xE6\xDA \xD1\xC7 \xCA\xDB\xED\xED\xD1 \xCF\xC7\xCF\xE5 \xC7\xED\xCF ("%s" \xC8\xE5"%s"). \xC2\xED\xC7 \xE3\xC7\xED\xE1 \xE5\xD3\xCA\xED\xCF \x98\xE5 \x81\xE6\xD4\xE5 \xDD\xE5\xD1\xD3\xCA \xDE\xC8\xE1\xED \xCD\xD0\xDD \xD4\xE6Ͽ 
 
 ; Project file description
-ProjectFileDesc=WinMerge Project file
+ProjectFileDesc= \x81\xD1\xE6\xE4\xCF\xE5 \x81\xD1\xE6\x8E\xE5 / \xD8\xD1\xCD \xE6\xED\xE4\xE3\xD1\xCC 


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

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

[<ge...@us...>]

Revision: 7022
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7022&view=rev
Author:   gerundt
Date:     2009-10-21 19:36:10 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
PATCH: [ 2877121 ] Persian translation - Translate ShellExtension (by Abolfazl Rostamzadeh)

Modified Paths:
--------------
    trunk/ShellExtension/Languages/ShellExtensionPersian.rc
    trunk/Translations/ShellExtension/Persian.po

Modified: trunk/ShellExtension/Languages/ShellExtensionPersian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionPersian.rc	2009-10-21 18:45:05 UTC (rev 7021)
+++ trunk/ShellExtension/Languages/ShellExtensionPersian.rc	2009-10-21 19:36:10 UTC (rev 7022)
@@ -38,16 +38,16 @@
 // 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "ShellExtension"
-    IDS_CONTEXT_MENU        "&WinMerge"
-    IDS_CONTEXT_HELP        "Open with WinMerge"
-    IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
-    IDS_COMPARE             "&Compare"
-    IDS_COMPARE_ELLIPSIS    "&Compare..."
-    IDS_COMPARE_TO          "&Compare To"
-    IDS_HELP_SAVETHIS       "Save this path. Select another path to compare with this path."
-    IDS_HELP_COMPARESAVED   "Compare to saved path (%1)"
-    IDS_RESELECT_FIRST      "&Re-select First"
+    IDS_PROJNAME            " \xD4\xE1 ǘ\xD3\xCA\xE4\xD4\xE4 "
+    IDS_CONTEXT_MENU        " \xE6\xED\xE4\xE3\xD1\xCC "
+    IDS_CONTEXT_HELP        " \xC8\xC7\xD2 \x98\xD1\xCF\xE4 \xC8\xC7 \xE6\xED\xE4\xE3\xD1\xCC "
+    IDS_CONTEXT_HELP_MANYITEMS " \xE1\xD8\xDD\xC7 \xC8\xED\xD4\xCA\xD1 \xC7\xD2 \xCF\xE6 \xE3\xE6\xD1\xCF \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE4\xE3\xC7\xED\xED\xCF "
+    IDS_COMPARE             " \xE5\xE3\xD3\xE4\xCC\xED / \xE3\xDE\xC7\xED\xD3\xE5 "
+    IDS_COMPARE_ELLIPSIS    " \xE5\xE3\xD3\xE4\xCC\xED ... "
+    IDS_COMPARE_TO          " \xE3\xDE\xC7\xED\xD3\xE5 \xC8\xC7 "
+    IDS_HELP_SAVETHIS       " \xC7\xED\xE4 \xE3\xD3\xED\xD1 \xD1\xC7 \xD0\xCE\xED\xD1\xE5 \x98\xE4. \xE3\xD3\xED\xD1 \xCF\xED\x90\xD1\xED \xD1\xC7 \xC8\xD1\xC7\xED \xE3\xDE\xC7\xED\xD3\xE5 \xC8\xC7 \xC7\xED\xE4 \xE3\xD3\xED\xD1 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4 "
+    IDS_HELP_COMPARESAVED   " \xE5\xE3\xD3\xE4\xCC\xED \xC8\xC7 \xE3\xD3\xED\xD1 \xD0\xCE\xED\xD1\xE5 \xD4\xCF\xE5 %1 "
+    IDS_RESELECT_FIRST      " \xCF\xD1 \xC2\xDB\xC7\xD2  \xCF\xE6\xC8\xC7\xD1\xE5 \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE3\xC7\xED\xED\xCF "
 END
 
 #endif    // Resources

Modified: trunk/Translations/ShellExtension/Persian.po
===================================================================
--- trunk/Translations/ShellExtension/Persian.po	2009-10-21 18:45:05 UTC (rev 7021)
+++ trunk/Translations/ShellExtension/Persian.po	2009-10-21 19:36:10 UTC (rev 7022)
@@ -1,6 +1,9 @@
 # This file is part from WinMerge <http://winmerge.org/>
 # Released under the "GNU General Public License"
 #
+# Translators:
+# * Abolfazl Rostamzadeh <a.rostamzadeh at gmail.com>
+#
 # ID line follows -- this is updated by SVN
 # $Id$
 #
@@ -40,50 +43,50 @@
 #: ShellExtensionTemplate.rc:41
 #, c-format
 msgid "ShellExtension"
-msgstr ""
+msgstr " \xD4\xE1 ǘ\xD3\xCA\xE4\xD4\xE4 "
 
 #: ShellExtensionTemplate.rc:42
 #, c-format
 msgid "WinMerge"
-msgstr ""
+msgstr " \xE6\xED\xE4\xE3\xD1\xCC "
 
 #: ShellExtensionTemplate.rc:43
 #, c-format
 msgid "Open with WinMerge"
-msgstr ""
+msgstr " \xC8\xC7\xD2 \x98\xD1\xCF\xE4 \xC8\xC7 \xE6\xED\xE4\xE3\xD1\xCC "
 
 #: ShellExtensionTemplate.rc:44
 #, c-format
 msgid "Please select no more than 2 items"
-msgstr ""
+msgstr " \xE1\xD8\xDD\xC7 \xC8\xED\xD4\xCA\xD1 \xC7\xD2 \xCF\xE6 \xE3\xE6\xD1\xCF \xD1\xC7 \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE4\xE3\xC7\xED\xED\xCF "
 
 #: ShellExtensionTemplate.rc:45
 #, c-format
 msgid "Compare"
-msgstr ""
+msgstr " \xE5\xE3\xD3\xE4\xCC\xED / \xE3\xDE\xC7\xED\xD3\xE5 "
 
 #: ShellExtensionTemplate.rc:46
 #, c-format
 msgid "Compare..."
-msgstr ""
+msgstr " \xE5\xE3\xD3\xE4\xCC\xED ... "
 
 #: ShellExtensionTemplate.rc:47
 #, c-format
 msgid "Compare To"
-msgstr ""
+msgstr " \xE3\xDE\xC7\xED\xD3\xE5 \xC8\xC7 "
 
 #: ShellExtensionTemplate.rc:48
 #, c-format
 msgid "Save this path. Select another path to compare with this path."
-msgstr ""
+msgstr " \xC7\xED\xE4 \xE3\xD3\xED\xD1 \xD1\xC7 \xD0\xCE\xED\xD1\xE5 \x98\xE4. \xE3\xD3\xED\xD1 \xCF\xED\x90\xD1\xED \xD1\xC7 \xC8\xD1\xC7\xED \xE3\xDE\xC7\xED\xD3\xE5 \xC8\xC7 \xC7\xED\xE4 \xE3\xD3\xED\xD1 \xC7\xE4\xCA\xCE\xC7\xC8 \x98\xE4 "
 
 #: ShellExtensionTemplate.rc:49
 #, c-format
 msgid "Compare to saved path (%1)"
-msgstr ""
+msgstr " \xE5\xE3\xD3\xE4\xCC\xED \xC8\xC7 \xE3\xD3\xED\xD1 \xD0\xCE\xED\xD1\xE5 \xD4\xCF\xE5 %1 "
 
 #: ShellExtensionTemplate.rc:50
 #, c-format
 msgid "Re-select First"
-msgstr ""
+msgstr " \xCF\xD1 \xC2\xDB\xC7\xD2  \xCF\xE6\xC8\xC7\xD1\xE5 \xC7\xE4\xCA\xCE\xC7\xC8 \xE4\xE3\xC7\xED\xED\xCF "
 


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

[Winmerge-svn] SF.net SVN: winmerge:[7021] trunk/runastyle.bat

[<ki...@us...>]

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

Log Message:
-----------
Add empty last line.

Modified Paths:
--------------
    trunk/runastyle.bat

Modified: trunk/runastyle.bat
===================================================================
--- trunk/runastyle.bat	2009-10-21 18:39:19 UTC (rev 7020)
+++ trunk/runastyle.bat	2009-10-21 18:45:05 UTC (rev 7021)
@@ -18,4 +18,4 @@
 
 REM Editor code is GNU style - 2 space indent
 astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.cpp
-astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.h
\ No newline at end of file
+astyle --style=gnu --pad-oper --unpad-paren Src/editlib/*.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:[7020] trunk

[<ki...@us...>]

Revision: 7020
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7020&view=rev
Author:   kimmov
Date:     2009-10-21 18:39:19 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
VS2005 does not know SUBLANG_GREEK so use SUBLANG_DEFAULT.

Modified Paths:
--------------
    trunk/ShellExtension/Languages/ShellExtensionGreek.rc
    trunk/Translations/WinMerge/Greek.po

Modified: trunk/ShellExtension/Languages/ShellExtensionGreek.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionGreek.rc	2009-10-21 18:31:58 UTC (rev 7019)
+++ trunk/ShellExtension/Languages/ShellExtensionGreek.rc	2009-10-21 18:39:19 UTC (rev 7020)
@@ -23,7 +23,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL)
 #ifdef _WIN32
-LANGUAGE LANG_GREEK, SUBLANG_GREEK
+LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 #pragma code_page(1253)
 #endif //_WIN32
 

Modified: trunk/Translations/WinMerge/Greek.po
===================================================================
--- trunk/Translations/WinMerge/Greek.po	2009-10-21 18:31:58 UTC (rev 7019)
+++ trunk/Translations/WinMerge/Greek.po	2009-10-21 18:39:19 UTC (rev 7020)
@@ -27,7 +27,7 @@
 #: Merge.rc:51
 #, c-format
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
-msgstr "LANG_GREEK, SUBLANG_GREEK"
+msgstr "LANG_GREEK, SUBLANG_DEFAULT"
 
 #. Codepage
 #: Merge.rc:23


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

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

[<ki...@us...>]

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

Log Message:
-----------
VS2005 does not know SUBLANG_PERSIAN_IRAN so use SUBLANG_NEUTRAL instead.

Modified Paths:
--------------
    trunk/ShellExtension/Languages/ShellExtensionPersian.rc
    trunk/ShellExtension/ShellExtension.rc
    trunk/Translations/ShellExtension/Persian.po

Modified: trunk/ShellExtension/Languages/ShellExtensionPersian.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionPersian.rc	2009-10-21 18:10:08 UTC (rev 7018)
+++ trunk/ShellExtension/Languages/ShellExtensionPersian.rc	2009-10-21 18:31:58 UTC (rev 7019)
@@ -23,7 +23,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)
 #ifdef _WIN32
-LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN
+LANGUAGE LANG_FARSI, SUBLANG_NEUTRAL
 #pragma code_page(1256)
 #endif //_WIN32
 

Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc	2009-10-21 18:10:08 UTC (rev 7018)
+++ trunk/ShellExtension/ShellExtension.rc	2009-10-21 18:31:58 UTC (rev 7019)
@@ -190,7 +190,7 @@
     "\r\n"
     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)\r\n"
     "#ifdef _WIN32\r\n"
-    "LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN\r\n"
+    "LANGUAGE LANG_FARSI, SUBLANG_NEUTRAL\r\n"
     "#pragma code_page(1256)\r\n"
     "#include ""Languages\\ShellExtensionPersian.rc""\r\n"
     "#endif //_WIN32\r\n"
@@ -519,7 +519,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)
 #ifdef _WIN32
-LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN
+LANGUAGE LANG_FARSI, SUBLANG_NEUTRAL
 #pragma code_page(1256)
 #include "Languages\ShellExtensionPersian.rc"
 #endif //_WIN32

Modified: trunk/Translations/ShellExtension/Persian.po
===================================================================
--- trunk/Translations/ShellExtension/Persian.po	2009-10-21 18:10:08 UTC (rev 7018)
+++ trunk/Translations/ShellExtension/Persian.po	2009-10-21 18:31:58 UTC (rev 7019)
@@ -29,7 +29,7 @@
 #: ShellExtensionTemplate.rc:26
 #, c-format
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
-msgstr "LANG_FARSI, SUBLANG_PERSIAN_IRAN"
+msgstr "LANG_FARSI, SUBLANG_NEUTRAL"
 
 #. Codepage
 #: ShellExtensionTemplate.rc:27


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

[Winmerge-svn] SF.net SVN: winmerge:[7018] trunk/ShellExtension/ShellExtension.rc

[<ki...@us...>]

Revision: 7018
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7018&view=rev
Author:   kimmov
Date:     2009-10-21 18:10:08 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Shellextension: Fix for including Persian translation.

Modified Paths:
--------------
    trunk/ShellExtension/ShellExtension.rc

Modified: trunk/ShellExtension/ShellExtension.rc
===================================================================
--- trunk/ShellExtension/ShellExtension.rc	2009-10-21 15:55:56 UTC (rev 7017)
+++ trunk/ShellExtension/ShellExtension.rc	2009-10-21 18:10:08 UTC (rev 7018)
@@ -521,7 +521,7 @@
 #ifdef _WIN32
 LANGUAGE LANG_FARSI, SUBLANG_PERSIAN_IRAN
 #pragma code_page(1256)
-#include "Languages\ShellExtensionPolish.rc"
+#include "Languages\ShellExtensionPersian.rc"
 #endif //_WIN32
 #endif
 


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