WinMerge

Revision: 5952
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5952&view=rev
Author:   sdottaka
Date:     2008-09-14 12:47:59 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
PATCH: [2110218] Customized colors aren't used in some areas.

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/LocationView.cpp
    branches/R2_10/Src/MergeDiffDetailView.cpp
    branches/R2_10/Src/MergeEditView.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-14 12:46:28 UTC (rev 5951)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-14 12:47:59 UTC (rev 5952)
@@ -18,6 +18,7 @@
    dialog (#2056741)
   BugFix: Displayed a blank time when file last modified time is 00:00:00
    (#2098626)
+  BugFix: Customized colors weren't used in some areas (#2110218)
   Translation updates:
   - Brazilian (#2059836)
   - German (#2045666)

Modified: branches/R2_10/Src/LocationView.cpp
===================================================================
--- branches/R2_10/Src/LocationView.cpp	2008-09-14 12:46:28 UTC (rev 5951)
+++ branches/R2_10/Src/LocationView.cpp	2008-09-14 12:47:59 UTC (rev 5952)
@@ -40,6 +40,7 @@
 #include "MergeLineFlags.h"
 #include "Bitmap.h"
 #include "memdc.h"
+#include "SyntaxColors.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -303,8 +304,11 @@
 
 	// Draw bar outlines
 	CPen* oldObj = (CPen*)dc.SelectStockObject(BLACK_PEN);
+	CBrush brush(m_view[0]->GetColor(COLORINDEX_WHITESPACE));
+	CBrush* oldBrush = (CBrush*)dc.SelectObject(&brush);
 	dc.Rectangle(m_leftBar);
 	dc.Rectangle(m_rightBar);
+	dc.SelectObject(oldBrush);
 	dc.SelectObject(oldObj);
 
 	// Iterate the differences list and draw differences as colored blocks.

Modified: branches/R2_10/Src/MergeDiffDetailView.cpp
===================================================================
--- branches/R2_10/Src/MergeDiffDetailView.cpp	2008-09-14 12:46:28 UTC (rev 5951)
+++ branches/R2_10/Src/MergeDiffDetailView.cpp	2008-09-14 12:47:59 UTC (rev 5952)
@@ -290,8 +290,8 @@
 		// If no syntax hilighting
 		if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT))
 		{
-			crBkgnd = GetSysColor (COLOR_WINDOW);
-			crText = GetSysColor (COLOR_WINDOWTEXT);
+			crBkgnd = GetColor (COLORINDEX_BKGND);
+			crText = GetColor (COLORINDEX_NORMALTEXT);
 			bDrawWhitespace = FALSE;
 		}
 		else
@@ -301,8 +301,8 @@
 	}
 	if (nLineIndex < m_lineBegin || nLineIndex > m_lineEnd)
 		{
-			crBkgnd = GetSysColor (COLOR_WINDOW);
-			crText = GetSysColor (COLOR_WINDOW);
+			crBkgnd = GetColor (COLORINDEX_WHITESPACE);
+			crText = GetColor (COLORINDEX_WHITESPACE);
 			bDrawWhitespace = FALSE;
 	}
 }

Modified: branches/R2_10/Src/MergeEditView.cpp
===================================================================
--- branches/R2_10/Src/MergeEditView.cpp	2008-09-14 12:46:28 UTC (rev 5951)
+++ branches/R2_10/Src/MergeEditView.cpp	2008-09-14 12:47:59 UTC (rev 5952)
@@ -510,8 +510,8 @@
 		if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT))
 		{
 			// If no syntax hilighting, get windows default colors
-			crBkgnd = GetSysColor (COLOR_WINDOW);
-			crText = GetSysColor (COLOR_WINDOWTEXT);
+			crBkgnd = GetColor (COLORINDEX_BKGND);
+			crText = GetColor (COLORINDEX_NORMALTEXT);
 			bDrawWhitespace = FALSE;
 		}
 		else


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

Revision: 5954
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5954&view=rev
Author:   sdottaka
Date:     2008-09-14 14:25:53 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
BUG: [ 2110350 ] Files are extracted into wrong folder

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/Environment.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-14 14:24:23 UTC (rev 5953)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-14 14:25:53 UTC (rev 5954)
@@ -3,6 +3,10 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.10
+  BugFix: Customized colors weren't used in some areas (#2110218)
+  BugFix: Zip files were extracted into wrong folder (#2110350)
+
 WinMerge 2.10 RC - 2008-09-09 (r5933)
   Add icon for "Plugins->List" menu item (#2060771)
   Use external editor to edit file filters (#2082774)
@@ -18,7 +22,6 @@
    dialog (#2056741)
   BugFix: Displayed a blank time when file last modified time is 00:00:00
    (#2098626)
-  BugFix: Customized colors weren't used in some areas (#2110218)
   Translation updates:
   - Brazilian (#2059836)
   - German (#2045666)

Modified: branches/R2_10/Src/Environment.cpp
===================================================================
--- branches/R2_10/Src/Environment.cpp	2008-09-14 14:24:23 UTC (rev 5953)
+++ branches/R2_10/Src/Environment.cpp	2008-09-14 14:25:53 UTC (rev 5954)
@@ -45,6 +45,8 @@
 		else
 		{
 			strTempPath = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH);
+			if (!paths_EndsWithSlash(strTempPath.c_str()))
+				strTempPath += '\\';
 		}
 		strTempPath = paths_GetLongPath(strTempPath.c_str());
 	}


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

Revision: 5974
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5974&view=rev
Author:   sdottaka
Date:     2008-09-25 15:02:03 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
PATCH: [ 1991259 ] Convert editor find/replace to use PCRE regexps
- case-sensitive regexp search didn't work.

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/editlib/ccrystaltextview.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-25 15:00:51 UTC (rev 5973)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-25 15:02:03 UTC (rev 5974)
@@ -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.10.2
+  BugFix: Case-sensitive regexp search didn't work (#1991259)
+
 WinMerge 2.10 - 2008-09-17 (r5967)
   Change Manual url to http://winmerge.org/docs/manual/ (r5957)
   Manual updates

Modified: branches/R2_10/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_10/Src/editlib/ccrystaltextview.cpp	2008-09-25 15:00:51 UTC (rev 5973)
+++ branches/R2_10/Src/editlib/ccrystaltextview.cpp	2008-09-25 15:02:03 UTC (rev 5974)
@@ -4532,22 +4532,21 @@
         }
 
       int ovector[30];
-      char compString[200] = {0};
+      int compStringBufLen = _tcslen(pszFindWhere) * sizeof(TCHAR) + 1;
+      char *compString = new char[compStringBufLen];
       int stringLen = 0;
-      TCHAR * tempName = _tcsdup(pszFindWhere); // Create temp copy for conversions
-      TCHAR * cmpStr = _tcsupr(tempName);
 
 #ifdef UNICODE
-      stringLen = TransformUcs2ToUtf8(cmpStr, _tcslen(cmpStr),
-          compString, sizeof(compString));
+      stringLen = TransformUcs2ToUtf8(pszFindWhere, _tcslen(pszFindWhere),
+          compString, compStringBufLen);
+      compString[stringLen] = '\0';
 #else
-      strcpy(compString, cmpStr);
+      strncpy(compString, pszFindWhere, compStringBufLen);
       stringLen = strlen(compString);
 #endif
 
       int result = pcre_exec(regexp, pe, compString, stringLen,
           0, 0, ovector, 30);
-      free(tempName);
 
       if (result >= 0)
         {
@@ -4562,6 +4561,7 @@
       else
         pos = -1;
 
+      delete [] compString;
       pcre_free(regexp);
       pcre_free(pe);
       return pos;


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

Revision: 5979
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5979&view=rev
Author:   kimmov
Date:     2008-09-27 17:25:48 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
PATCH: [ 2131753 ] Updated Ukrainian Translation
 Submitted by Warrior

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/Languages/Ukrainian.po

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-27 17:23:38 UTC (rev 5978)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-27 17:25:48 UTC (rev 5979)
@@ -5,6 +5,8 @@
 
 WinMerge 2.10.2
   BugFix: Case-sensitive regexp search didn't work (#1991259)
+  Translation updates:
+  - Ukrainian (#2131753)
 
 WinMerge 2.10 - 2008-09-17 (r5967)
   Change Manual url to http://winmerge.org/docs/manual/ (r5957)

Modified: branches/R2_10/Src/Languages/Ukrainian.po
===================================================================
--- branches/R2_10/Src/Languages/Ukrainian.po	2008-09-27 17:23:38 UTC (rev 5978)
+++ branches/R2_10/Src/Languages/Ukrainian.po	2008-09-27 17:25:48 UTC (rev 5979)
@@ -13,7 +13,7 @@
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-05-18 00:10+0200\n"
+"PO-Revision-Date: 2008-09-26 22:47+0200\n"
 "Last-Translator: Warrior <warr11r at rambler.ru>\n"
 "Language-Team: Ukrainian <winmerge-translate@..."
 "MIME-Version: 1.0\n"
@@ -175,7 +175,7 @@
 #: Merge.rc:349
 #, c-format
 msgid "&Edit"
-msgstr "&\xD0\xE5\xE4\xE0\xE3\xF3\xE2\xE0\xF2\xE8"
+msgstr "&\xD0\xE5\xE4\xE0\xEA\xF6\xB3\xFF"
 
 #: Merge.rc:125
 #: Merge.rc:211
@@ -203,7 +203,7 @@
 #: Merge.rc:388
 #, c-format
 msgid "Use Default F&ont"
-msgstr "\xC2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xE0\xF2\xE8 &\xE7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9 \xF8\xF0\xE8\xF4\xF2 "
+msgstr "\xC2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xEE\xE2\xF3\xE2\xE0\xF2\xE8 &\xE7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9 \xF8\xF0\xE8\xF4\xF2 "
 
 #: Merge.rc:132
 #: Merge.rc:227
@@ -217,21 +217,21 @@
 #: Merge.rc:411
 #, c-format
 msgid "&None"
-msgstr "&\xCD\xE5\xEC\xE0\xBA"
+msgstr "\xC2\xE8\xEC&\xEA\xED\xF3\xF2\xE8"
 
 #: Merge.rc:135
 #: Merge.rc:230
 #: Merge.rc:412
 #, c-format
 msgid "&Small"
-msgstr "&\xCC\xE0\xEB\xE5\xED\xFC\xEA\xB3 \xE7\xED\xE0\xF7\xEA\xE8"
+msgstr "&\xCC\xE0\xEB\xE5\xED\xFC\xEA\xB3 \xEF\xB3\xEA\xF2\xEE\xE3\xF0\xE0\xEC\xE8"
 
 #: Merge.rc:136
 #: Merge.rc:231
 #: Merge.rc:413
 #, c-format
 msgid "&Big"
-msgstr "&\xC2\xE5\xEB\xE8\xEA\xB3 \xE7\xED\xE0\xF7\xEA\xE8"
+msgstr "&\xC2\xE5\xEB\xE8\xEA\xB3 \xEF\xB3\xEA\xF2\xEE\xE3\xF0\xE0\xEC\xE8"
 
 #: Merge.rc:138
 #: Merge.rc:233
@@ -245,7 +245,7 @@
 #: Merge.rc:416
 #, c-format
 msgid "Ta&b Bar"
-msgstr "\xCF\xE0\xED\xE5\xEB\xFC \xF2\xE0\xE1\xB3\xE2"
+msgstr "\xCF\xE0\xED\xE5\xEB\xFC \xE7\xE0\xEA\xEB\xE0\xE4\xEE\xEA"
 
 #: Merge.rc:141
 #: Merge.rc:237
@@ -287,7 +287,7 @@
 #: Merge.rc:450
 #, c-format
 msgid "&List..."
-msgstr ""
+msgstr "&\xD1\xEF\xE8\xF1\xEE\xEA..."
 
 #: Merge.rc:152
 #: Merge.rc:269
@@ -315,7 +315,7 @@
 #: Merge.rc:462
 #, c-format
 msgid "&Reload plugins"
-msgstr "&\xCF\xE5\xF0\xE5\xE2\xE0\xED\xF2\xE0\xE6\xE8\xF2\xE8 \xE2\xF1\xB3 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
+msgstr "&\xCF\xE5\xF0\xE5\xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xE8\xF2\xE8 \xE2\xF1\xB3 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
 
 #: Merge.rc:159
 #: Merge.rc:276
@@ -364,7 +364,7 @@
 #: Merge.rc:474
 #, c-format
 msgid "Change &Pane\tF6"
-msgstr "\xCF\xE5\xF0\xE5\xEC\xEA\xED\xF3\xF2\xE8 &\xE2\xB3\xEA\xED\xEE\tF6"
+msgstr "\xCF\xE5\xF0\xE5\xEC\xEA\xED\xF3\xF2\xE8 \xE2&\xB3\xEA\xED\xEE\tF6"
 
 #: Merge.rc:171
 #: Merge.rc:288
@@ -442,7 +442,7 @@
 #: Merge.rc:490
 #, c-format
 msgid "&About WinMerge..."
-msgstr "&\xCF\xF0\xEE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xF3 WinMerge..."
+msgstr "\xCF\xF0\xEE \xEF\xF0\xEE&\xE3\xF0\xE0\xEC\xF3 WinMerge..."
 
 #: Merge.rc:200
 #: Merge.rc:333
@@ -511,12 +511,12 @@
 #: Merge.rc:422
 #, c-format
 msgid "Refre&sh\tF5"
-msgstr "&\xCE\xED\xEE\xE2\xE8\xF2\xE8\tF5"
+msgstr "&\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8\tF5"
 
 #: Merge.rc:240
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
-msgstr "\xCE\xED\xEE\xE2\xE8\xF2\xE8 &\xE2\xB3\xE4\xE7\xED\xE0\xF7\xE5\xED\xB3\tCtrl+F5"
+msgstr "\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8 &\xE2\xE8\xE1\xF0\xE0\xED\xB3\tCtrl+F5"
 
 #: Merge.rc:242
 #: Merge.rc:424
@@ -563,7 +563,7 @@
 #: Merge.rc:433
 #, c-format
 msgid "Copy to &Right\tAlt+Right"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xED\xE0 &\xEF\xF0\xE0\xE2\xF3 \xEF\xE0\xED\xE5\xEB\xFC\tAlt+Right"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xED\xE0 \xEF\xF0\xE0&\xE2\xF3 \xEF\xE0\xED\xE5\xEB\xFC\tAlt+Right"
 
 #: Merge.rc:254
 #: Merge.rc:434
@@ -805,7 +805,7 @@
 #: Merge.rc:405
 #, c-format
 msgid "W&rap Lines"
-msgstr "\xCF\xE5\xF0\xE5\xED\xE5\xF1\xE5\xED\xED\xFF \xE7\xE0 \xF1\xEB\xEE\xE2\xE0\xEC\xE8"
+msgstr "\xCF\xE5\xF0\xE5\xED\xEE\xF1\xE8\xF2\xE8 \xE7\xE0 \xF1\xEB\xEE\xE2\xE0\xEC\xE8"
 
 #: Merge.rc:407
 #, c-format
@@ -994,7 +994,7 @@
 #: Merge.rc:554
 #, c-format
 msgid "&Refresh"
-msgstr "&\xCE\xED\xEE\xE2\xE8\xF2\xE8"
+msgstr "&\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8"
 
 #: Merge.rc:566
 #, c-format
@@ -1081,12 +1081,12 @@
 #: Merge.rc:670
 #, c-format
 msgid "Contributors"
-msgstr "\xCC\xE5\xF6\xE5\xED\xE0\xF2\xE8"
+msgstr "\xC0\xE2\xF2\xEE\xF0\xE8"
 
 #: Merge.rc:677
 #, c-format
 msgid "Select Files or Folders"
-msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xF4\xE0\xE9\xEB\xE8 \xE0\xE1\xEE \xEF\xE0\xEF\xEA\xE8..."
+msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xF4\xE0\xE9\xEB\xE8 \xE0\xE1\xEE \xF2\xE5\xEA\xE8..."
 
 #: Merge.rc:680
 #: Merge.rc:1595
@@ -1100,7 +1100,7 @@
 #: Merge.rc:1020
 #, c-format
 msgid "&Browse..."
-msgstr "&\xCE\xE3\xEB\xFF\xE4..."
+msgstr "&\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
 
 #: Merge.rc:685
 #: Merge.rc:1599
@@ -1112,7 +1112,7 @@
 #: Merge.rc:1031
 #, c-format
 msgid "Bro&wse..."
-msgstr "\xCE&\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5&\xE3\xEB\xFF\xE4..."
 
 #: Merge.rc:690
 #: Merge.rc:1603
@@ -1140,7 +1140,7 @@
 #: Merge.rc:1606
 #, c-format
 msgid "&Include Subfolders"
-msgstr "&\xC2\xF0\xE0\xF5\xEE\xE2\xF3\xFE\xF7\xE8 \xEF\xB3\xE4\xEF\xE0\xEF\xEA\xE8"
+msgstr "&\xC2\xF0\xE0\xF5\xEE\xE2\xF3\xFE\xF7\xE8 \xEF\xB3\xE4\xF2\xE5\xEA\xE8"
 
 #: Merge.rc:700
 #, c-format
@@ -1175,7 +1175,7 @@
 #: Merge.rc:704
 #, c-format
 msgid "Files or Folders to Compare"
-msgstr "\xD4\xE0\xE9\xEB\xE8 \xE0\xE1\xEE \xEF\xE0\xEF\xEA\xE8 \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
+msgstr "\xD4\xE0\xE9\xEB\xE8 \xE0\xE1\xEE \xF2\xE5\xEA\xE8 \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
 
 #: Merge.rc:711
 #, c-format
@@ -1294,7 +1294,7 @@
 #: Merge.rc:1618
 #, c-format
 msgid "&Folder compare"
-msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF &\xEF\xE0\xEF\xEE\xEA"
+msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF &\xF2\xE5\xEA"
 
 #: Merge.rc:777
 #: Merge.rc:1620
@@ -1467,7 +1467,7 @@
 #: Merge.rc:892
 #, c-format
 msgid "Edit"
-msgstr "\xD0\xE5\xE4\xE0\xE3\xF3\xE2\xE0\xF2\xE8"
+msgstr "\xD0\xE5\xE4\xE0\xEA\xF6\xB3\xFF"
 
 #: Merge.rc:893
 #, c-format
@@ -1558,7 +1558,7 @@
 #: Merge.rc:987
 #, c-format
 msgid "&Send deleted files to Recycle Bin"
-msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF9\xF3\xE2\xE0\xF2\xE8 \xE2\xE8\xEB\xF3\xF7\xE5\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xE4\xEE \xEA\xEE\xF8\xE8\xEA\xF3"
+msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF9\xF3\xE2\xE0\xF2\xE8 \xE2\xE8\xEB\xF3\xF7\xE5\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xE4\xEE \xEA\xEE\xF8\xE8\xEA\xE0"
 
 #: Merge.rc:989
 #, c-format
@@ -1578,7 +1578,7 @@
 #: Merge.rc:994
 #, c-format
 msgid "In&clude subfolders by default"
-msgstr "\xCE\xE1\xF0\xEE\xE1\xEB\xFE\xE2\xE0\xF2\xE8 \xEF\xB3\xE4\xEF\xE0\xEF\xEA\xE8 \xE7\xE0\xE2\xE6\xE4\xE8"
+msgstr "\xCE\xEF\xF0\xE0\xF6\xFC\xEE\xE2\xF3\xE2\xE0\xF2\xE8 \xEF\xB3\xE4\xF2\xE5\xEA\xE8 \xE7\xE0\xE2\xE6\xE4\xE8"
 
 #: Merge.rc:996
 #, c-format
@@ -1593,28 +1593,28 @@
 #: Merge.rc:1001
 #, c-format
 msgid "B&rowse..."
-msgstr "\xCE\xE3\xEB\xFF\xE4"
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4"
 
 #: Merge.rc:1002
 #, c-format
 msgid "Temporary files folder"
-msgstr "\xCF\xE0\xEF\xEA\xE0 \xE4\xEB\xFF \xF2\xE8\xEC\xF7\xE0\xF1\xEE\xE2\xE8\xF5 \xF4\xE0\xE9\xEB\xB3\xE2"
+msgstr "\xD2\xE5\xEA\xE0 \xE4\xEB\xFF \xF2\xE8\xEC\xF7\xE0\xF1\xEE\xE2\xE8\xF5 \xF4\xE0\xE9\xEB\xB3\xE2"
 
 #: Merge.rc:1003
 #, c-format
 msgid "S&ystem's temp folder"
-msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE0 \xEF\xE0\xEF\xEA\xE0 Temp"
+msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE0 \xF2\xE5\xEA\xE0 Temp"
 
 #: Merge.rc:1005
 #, c-format
 msgid "C&ustom folder:"
-msgstr "\xC2\xEB\xE0\xF1\xED\xE0 \xEF\xE0\xEF\xEA\xE0:"
+msgstr "\xC2\xEB\xE0\xF1\xED\xE0 \xF2\xE5\xEA\xE0:"
 
 #: Merge.rc:1008
 #: Merge.rc:1024
 #, c-format
 msgid "Br&owse..."
-msgstr "\xCE\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
 
 #: Merge.rc:1014
 #, c-format
@@ -1674,12 +1674,12 @@
 #: Merge.rc:1042
 #, c-format
 msgid "I&gnore changes"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xE7\xEC\xB3\xED\xE8"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xE7\xEC\xB3\xED\xE0\xEC\xE8"
 
 #: Merge.rc:1044
 #, c-format
 msgid "Ig&nore all"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xE2\xF1\xFE\xE4\xE8"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xE2\xF1\xFE\xE4\xE8"
 
 #: Merge.rc:1046
 #, c-format
@@ -1744,7 +1744,7 @@
 #: Merge.rc:1114
 #, c-format
 msgid " Folder Compare Progress"
-msgstr " \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xEF\xE0\xEF\xEE\xEA"
+msgstr " \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA"
 
 #: Merge.rc:1117
 #: Merge.rc:1874
@@ -1760,7 +1760,7 @@
 #: Merge.rc:1123
 #, c-format
 msgid "Items compared:"
-msgstr "\xCE\xE1\xF0\xEE\xE1\xEB\xE5\xED\xE8\xF5:"
+msgstr "\xCE\xEF\xF0\xE0\xF6\xFC\xEE\xE2\xE0\xED\xE8\xF5:"
 
 #: Merge.rc:1124
 #, c-format
@@ -1821,27 +1821,27 @@
 #: Merge.rc:1157
 #, c-format
 msgid "&Ignore change"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xE7\xEC\xB3\xED\xE5\xED\xB3 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE8"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xE7\xEC\xB3\xED\xE5\xED\xE8\xEC\xE8 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC\xE8"
 
 #: Merge.rc:1159
 #, c-format
 msgid "I&gnore all"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 &\xE2\xF1\xB3 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE8"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 &\xE2\xF1\xB3\xEC\xE0 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC\xE8"
 
 #: Merge.rc:1161
 #, c-format
 msgid "Ignore blan&k lines"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xEF\xEE\xF0\xEE\xE6\xED\xB3 &\xEB\xB3\x{DCFF}"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xEF\xEE\xF0\xEE\xE6\xED\xB3\xEC\xE8 &\xEB\xB3\xED\xB3\xFF\xEC\xE8"
 
 #: Merge.rc:1163
 #, c-format
 msgid "Ignore &case"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xF0&\xE5\xE3\xB3\xF1\xF2\xF0"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xF0&\xE5\xE3\xB3\xF1\xF2\xF0"
 
 #: Merge.rc:1165
 #, c-format
 msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xF0\xB3\xE7\xED\xE8\xF6\xFE \xE2 \xEA\xB3\xED\xF6\xFF\xF5 \xF0\xFF\xE4\xEA\xB3\xE2 (Win/Unix/Mac)"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xF0\xB3\xE7\xED\xE8\xF6\xE5\xFE \xE2 \xEA\xB3\xED\xF6\xFF\xF5 \xF0\xFF\xE4\xEA\xB3\xE2 (Win/Unix/Mac)"
 
 #: Merge.rc:1168
 #, c-format
@@ -1856,7 +1856,7 @@
 #: Merge.rc:1172
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xF0\xB3\xE7\xED\xE8\xF6\xFE \xF7\xE0\xF1\xF3, \xEC\xE5\xED\xF8\xF3 3 \xF1\xE5\xEA\xF3\xED\xE4"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xF0\xB3\xE7\xED\xE8\xF6\xE5\xFE \xF7\xE0\xF1\xF3, \xEC\xE5\xED\xF8\xEE\xFE 3 \xF1\xE5\xEA\xF3\xED\xE4"
 
 #: Merge.rc:1175
 #, c-format
@@ -2060,12 +2060,12 @@
 msgid ""
 "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
 "essential components to be copied to the program directory for standalone operation."
-msgstr "\xC4\xEB\xFF \xF0\xEE\xE1\xEE\xF2\xE8 \xE7 \xE0\xF0\xF5\xB3\xE2\xE0\xEC\xE8 \xEF\xEE\xF2\xF0\xB3\xE1\xED\xE8\xE9 \xE0\xE1\xEE \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xE8\xE9 7-Zip \xE2\xE5\xF0\xF1\xB3\xE9 3.11 \xB3 \xE2\xE8\xF9\xE5, \xE0\xE1\xEE \xE9\xEE\xE3\xEE \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8 \xE2 \xEF\xE0\xEF\xF6\xB3 \xE7 WinMerge."
+msgstr "\xC4\xEB\xFF \xF0\xEE\xE1\xEE\xF2\xE8 \xE7 \xE0\xF0\xF5\xB3\xE2\xE0\xEC\xE8 \xEF\xEE\xF2\xF0\xB3\xE1\xED\xE8\xE9 \xE0\xE1\xEE \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xE8\xE9 7-Zip \xE2\xE5\xF0\xF1\xB3\xE9 3.11 \xB3 \xE2\xE8\xF9\xE5, \xE0\xE1\xEE \xE9\xEE\xE3\xEE \xEA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8 \xE2 \xF2\xE5\xF6\xB3 \xE7 WinMerge."
 
 #: Merge.rc:1295
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "\xC0\xED\xE0\xEB\xEE\xE3\xB3\xF7\xED\xEE \xEF\xEE\xF2\xF0\xB3\xE1\xED\xE5 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF (Merge7z*.dll)"
+msgstr "\xD2\xE0\xEA\xEE\xE6 \xED\xE5\xEE\xE1\xF5\xB3\xE4\xED\xE5 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF (Merge7z*.dll)"
 
 #: Merge.rc:1297
 #, c-format
@@ -2123,7 +2123,7 @@
 #: Merge.rc:1315
 #, c-format
 msgid "7-Zip components for standalone operation:"
-msgstr "\xCA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8 7-Zip \xF3 \xEF\xE0\xEF\xF6\xB3 \xE7 WinMerge:"
+msgstr "\xCA\xEE\xEC\xEF\xEE\xED\xE5\xED\xF2\xE8 7-Zip \xF3 \xF2\xE5\xF6\xB3 \xE7 WinMerge:"
 
 #: Merge.rc:1319
 #, c-format
@@ -2137,8 +2137,12 @@
 
 #: Merge.rc:1321
 #, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xE1\xB3\xEB\xFC\xF8\xE5 \xF6\xE5 \xEF\xEE\xE2\xB3\xE4\xEE\xEC\xEB\xE5\xED\xED\xFF.\n(\xC2\xE8 \xE7\xE0\xE2\xE6\xE4\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE8\xEA\xEB\xE8\xEA\xE0\xF2\xE8 \xE9\xEE\xE3\xEE \xF7\xE5\xF0\xE5\xE7 \xEC\xE5\xED\xFE \xC4\xEE\xE2\xB3\xE4\xEA\xE0)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xE1\xB3\xEB\xFC\xF8\xE5 \xF6\xE5 \xEF\xEE\xE2\xB3\xE4\xEE\xEC\xEB\xE5\xED\xED\xFF.\n"
+"(\xC2\xE8 \xE7\xE0\xE2\xE6\xE4\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE8\xEA\xEB\xE8\xEA\xE0\xF2\xE8 \xE9\xEE\xE3\xEE \xF7\xE5\xF0\xE5\xE7 \xEC\xE5\xED\xFE \xC4\xEE\xE2\xB3\xE4\xEA\xE0)"
 
 #: Merge.rc:1325
 #, c-format
@@ -2221,12 +2225,12 @@
 #: Merge.rc:1409
 #, c-format
 msgid "Bold"
-msgstr "\xC6\xE8\xF0\xED\xE8\xE9"
+msgstr "\xC3\xF0\xF3\xE1\xE8\xE9"
 
 #: Merge.rc:1417
 #, c-format
 msgid "Folder Compare Report"
-msgstr "\xC7\xE2\xB3\xF2 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xEF\xE0\xEF\xEE\xEA"
+msgstr "\xC7\xE2\xB3\xF2 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA"
 
 #: Merge.rc:1420
 #, c-format
@@ -2239,7 +2243,7 @@
 #: Merge.rc:1628
 #, c-format
 msgid "Browse..."
-msgstr "\xCE\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
 
 #: Merge.rc:1424
 #, c-format
@@ -2280,7 +2284,7 @@
 #: Merge.rc:1453
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE2\xE8\xEC\xE0\xE3\xE0\xBA \xED\xE0\xFF\xE2\xED\xB3\xF1\xF2\xFC \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF  7-Zip:"
+msgstr "ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE2\xE8\xEC\xE0\xE3\xE0\xBA \xED\xE0\xFF\xE2\xED\xEE\xF1\xF2\xB3 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF  7-Zip:"
 
 #: Merge.rc:1455
 #, c-format
@@ -2300,12 +2304,12 @@
 #: Merge.rc:1461
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
-msgstr "&\xC2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xE0\xF2\xE8 7-Zip \xE7 \xEF\xE0\xEF\xEA\xE8 WinMerge"
+msgstr "&\xC2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xE0\xF2\xE8 7-Zip \xE7 \xF2\xE5\xEA\xE8 WinMerge"
 
 #: Merge.rc:1463
 #, c-format
 msgid "&Detect archive type from file signature"
-msgstr "&\xC2\xE8\xE7\xED\xE0\xF7\xE0\xF2\xE8 \xF2\xE8\xEF \xE0\xF0\xF5\xB3\xE2\xF3 \xE7\xE0 \xF1\xE8\xE3\xED\xE0\xF2\xF3\xF0\xEE\xFE/\xE7\xE0\xE3\xEE\xEB\xEE\xE2\xEA\xEE\xEC \xF4\xE0\xE9\xEB\xF3"
+msgstr "&\xC2\xE8\xE7\xED\xE0\xF7\xE0\xF2\xE8 \xF2\xE8\xEF \xE0\xF0\xF5\xB3\xE2\xF3 \xE7\xE0 \xF1\xE8\xE3\xED\xE0\xF2\xF3\xF0\xEE\xFE \xE0\xE1\xEE \xE7\xE0\xE3\xEE\xEB\xEE\xE2\xEA\xEE\xEC \xF4\xE0\xE9\xEB\xF3"
 
 #: Merge.rc:1471
 #, c-format
@@ -2315,7 +2319,7 @@
 #: Merge.rc:1474
 #, c-format
 msgid "Folders:"
-msgstr "\xCF\xE0\xEF\xEA\xE8:"
+msgstr "\xD2\xE5\xEA\xE8:"
 
 #: Merge.rc:1475
 #, c-format
@@ -2436,7 +2440,7 @@
 #: Merge.rc:1547
 #, c-format
 msgid "&Folder Name"
-msgstr "\xCF\xE0\xEF\xEA\xE0"
+msgstr "\xD2\xE5\xEA\xE0"
 
 #: Merge.rc:1549
 #, c-format
@@ -2522,12 +2526,12 @@
 #: Merge.rc:1623
 #, c-format
 msgid "&Original file's folder"
-msgstr "\xE2 \xEF\xE0\xEF\xF6\xB3 \xE7 &\xEE\xF0\xE8\xE3\xB3\xED\xE0\xEB\xFC\xED\xE8\xEC \xF4\xE0\xE9\xEB\xEE\xEC"
+msgstr "\xE2 \xF2\xE5\xF6\xB3 \xE7 &\xEE\xF0\xE8\xE3\xB3\xED\xE0\xEB\xFC\xED\xE8\xEC \xF4\xE0\xE9\xEB\xEE\xEC"
 
 #: Merge.rc:1625
 #, c-format
 msgid "&Global backup folder:"
-msgstr "\xE2 &\xE7\xE0\xE3\xE0\xEB\xFC\xED\xB3\xE9 \xEF\xE0\xEF\xF6\xB3:"
+msgstr "\xE2 &\xE7\xE0\xE3\xE0\xEB\xFC\xED\xB3\xE9 \xF2\xE5\xF6\xB3:"
 
 #: Merge.rc:1629
 #, c-format
@@ -2578,12 +2582,12 @@
 #: Merge.rc:1658
 #, c-format
 msgid "Plugins"
-msgstr ""
+msgstr "\xC4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
 
 #: Merge.rc:1661
 #, c-format
 msgid "&Enable plugins"
-msgstr ""
+msgstr "&\xC2\xE2\xB3\xEC\xEA\xED\xF3\xF2\xE8 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
 
 #. StringFileInfo.Block
 #: Merge.rc:1691
@@ -2949,13 +2953,17 @@
 "Show or hide the tab bar\n"
 "Toggle TabBar"
 msgstr ""
-"\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE0\xE1\xEE \xF1\xF5\xEE\xE2\xE0\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xFC \xF2\xE0\xE1\xB3\xE2\n"
-"\xCF\xE0\xED\xE5\xEB\xFC \xF2\xE0\xE1\xB3\xE2"
+"\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE0\xE1\xEE \xF1\xF5\xEE\xE2\xE0\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xFC \xE7\xE0\xEA\xEB\xE0\xE4\xEE\xEA\n"
+"\xCF\xE0\xED\xE5\xEB\xFC \xE7\xE0\xEA\xEB\xE0\xE4\xEE\xEA"
 
 #: Merge.rc:1828
 #, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xE7\xEC\xB3\xED\xFE\xE2\xE0\xF2\xE8 \xF0\xEE\xE7\xEC\xB3\xF0 \xEF\xE0\xED\xE5\xEB\xE5\xE9\n\xC7\xE0\xE1\xEB\xEE\xEA\xF3\xE2\xE0\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xB3"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE \xE7\xEC\xB3\xED\xFE\xE2\xE0\xF2\xE8 \xF0\xEE\xE7\xEC\xB3\xF0 \xEF\xE0\xED\xE5\xEB\xE5\xE9\n"
+"\xC7\xE0\xE1\xEB\xEE\xEA\xF3\xE2\xE0\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xB3"
 
 #: Merge.rc:1834
 #, c-format
@@ -3018,13 +3026,41 @@
 
 #: Merge.rc:1860
 #, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF4\xE0\xE9\xEB\xB3\xE2"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
+msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF4\xE0\xE9\xEB\xB3\xE2"
 
 #: Merge.rc:1861
 #, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xEF\xE0\xEF\xEE\xEA"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA"
 
 #: Merge.rc:1868
 #, c-format
@@ -3044,8 +3080,12 @@
 
 #: Merge.rc:1888
 #, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "\xD0\xEE\xE7\xF0\xEE\xE1\xED\xE8\xEA\xE8:\nij\xED \xC3\xF0\xB3\xEC (Dean Grimm), \xCA\xF0\xB3\xF1\xF2\xB3\xE0\xED ˳\xF1\xF2 (Christian List), ʳ\xEC\xEE \xC2\xE0\xF0\xB3\xF1 (Kimmo Varis), \xC9\xEE\xF5\xE5\xED \xD2\xF3\xF5\xF2 (Jochen Tucht), ҳ\xEC \xC3\xE5\xF0\xF3\xED\xE4\xF2 (Tim Gerundt), \xD2\xE0\xEA\xE0\xF8\xB3 \xD1\xE0\xE2\xE0\xED\xE0\xEA\xB3 (Takashi Sawanaki), \xC3\xE5\xEB \xD5\xE0\xEC\xEC\xE5\xF0 (Gal Hammer), \xCE\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0 \xD1\xEA\xB3\xED\xED\xE5\xF0 (Alexander Skinner)"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"\xD0\xEE\xE7\xF0\xEE\xE1\xED\xE8\xEA\xE8:\n"
+"ij\xED \xC3\xF0\xB3\xEC (Dean Grimm), \xCA\xF0\xB3\xF1\xF2\xB3\xE0\xED ˳\xF1\xF2 (Christian List), ʳ\xEC\xEE \xC2\xE0\xF0\xB3\xF1 (Kimmo Varis), \xC9\xEE\xF5\xE5\xED \xD2\xF3\xF5\xF2 (Jochen Tucht), ҳ\xEC \xC3\xE5\xF0\xF3\xED\xE4\xF2 (Tim Gerundt), \xD2\xE0\xEA\xE0\xF8\xB3 \xD1\xE0\xE2\xE0\xED\xE0\xEA\xB3 (Takashi Sawanaki), \xC3\xE5\xEB \xD5\xE0\xEC\xEC\xE5\xF0 (Gal Hammer), \xCE\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0 \xD1\xEA\xB3\xED\xED\xE5\xF0 (Alexander Skinner)"
 
 #: Merge.rc:1889
 #, c-format
@@ -3070,12 +3110,12 @@
 #: Merge.rc:1899
 #, c-format
 msgid "&Ignore"
-msgstr "&\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8"
+msgstr "&\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8"
 
 #: Merge.rc:1900
 #, c-format
 msgid "Ignore &all"
-msgstr "\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 &\xE2\xF1\xE5"
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 &\xE2\xF1\xB3\xEC"
 
 #: Merge.rc:1901
 #, c-format
@@ -3346,7 +3386,7 @@
 msgstr ""
 "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE7\xED\xE0\xE9\xF2\xE8 \xF4\xE0\xE9\xEB \xF4\xB3\xEB\xFC\xF2\xF0\xE0!\n"
 "\n"
-"\xD1\xEA\xEE\xEF\xB3\xFE\xE9\xF2\xE5 \xF4\xE0\xE9\xEB %1 \xF3 \xEF\xE0\xEF\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8:\n"
+"\xD1\xEA\xEE\xEF\xB3\xFE\xE9\xF2\xE5 \xF4\xE0\xE9\xEB %1 \xF3 \xF2\xE5\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8:\n"
 "%2."
 
 #: Merge.rc:2016
@@ -3357,10 +3397,10 @@
 "\n"
 "Please make sure the folder exists and is writable."
 msgstr ""
-"\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xF4\xE0\xE9\xEB \xF4\xB3\xEB\xFC\xF2\xF0\xE0 \xE2 \xEF\xE0\xEF\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8:\n"
+"\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xF4\xE0\xE9\xEB \xF4\xB3\xEB\xFC\xF2\xF0\xE0 \xE2 \xF2\xE5\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8:\n"
 "%1\n"
 "\n"
-"\xCF\xE5\xF0\xE5\xEA\xEE\xED\xE0\xE9\xF2\xE5\xF1\xFF, \xF9\xEE \xEF\xE0\xEF\xEA\xE0 \xB3\xF1\xED\xF3\xBA \xB3 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE0 \xE4\xEB\xFF \xE7\xE0\xEF\xE8\xF1\xF3."
+"\xCF\xE5\xF0\xE5\xEA\xEE\xED\xE0\xE9\xF2\xE5\xF1\xFF, \xF9\xEE \xF2\xE5\xEA\xE0 \xB3\xF1\xED\xF3\xBA \xB3 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE0 \xE4\xEB\xFF \xE7\xE0\xEF\xE8\xF1\xF3."
 
 #: Merge.rc:2018
 #, c-format
@@ -3369,9 +3409,9 @@
 "\n"
 "Please select filter folder in Options/System."
 msgstr ""
-"\xCF\xE0\xEF\xEA\xE0 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8 \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0 \xED\xE5 \xE2\xE8\xE7\xED\xE0\xF7\xE5\xED\xE0!\n"
+"\xD2\xE5\xEA\xE0 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8 \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0 \xED\xE5 \xE2\xE8\xE7\xED\xE0\xF7\xE5\xED\xE0!\n"
 "\n"
-"\xC2\xEA\xE0\xE6\xB3\xF2\xFC \xEF\xE0\xEF\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8 \xED\xE0 \xE2\xEA\xEB\xE0\xE4\xF6\xB3 \xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xE2 \xCD\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xF5."
+"\xC2\xEA\xE0\xE6\xB3\xF2\xFC \xF2\xE5\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8 \xED\xE0 \xE2\xEA\xEB\xE0\xE4\xF6\xB3 \xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xE2 \xCD\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xF5."
 
 #: Merge.rc:2020
 #, c-format
@@ -3400,7 +3440,7 @@
 msgstr ""
 "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xEB\xE5\xED\xED\xFF \xF4\xB3\xEB\xFC\xF2\xF0\xE0.\n"
 "\n"
-"\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xF4\xE0\xE9\xEB \xF4\xB3\xEB\xFC\xF2\xF0\xE0 \xE2 \xEF\xE0\xEF\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8."
+"\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xF4\xE0\xE9\xEB \xF4\xB3\xEB\xFC\xF2\xF0\xE0 \xE2 \xF2\xE5\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8."
 
 #: Merge.rc:2025
 #, c-format
@@ -3414,8 +3454,14 @@
 
 #: Merge.rc:2037
 #, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
+"Գ\xEB\xFC\xF2\xF0\xE8 \xE1\xF3\xEB\xE8 \xEF\xEE\xED\xEE\xE2\xEB\xE5\xED\xB3. \xC2\xE8 \xF5\xEE\xF7\xE5\xF2\xE5 \xEF\xEE\xED\xEE\xE2\xE8\xF2\xE8 \xE2\xF1\xB3 \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xB3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA?\n"
+"\n"
+"\xDF\xEA\xF9\xEE \xE2\xE8 \xED\xE5 \xF5\xEE\xF7\xE5\xF2\xE5 \xEF\xEE\xED\xEE\xE2\xEB\xFE\xE2\xE0\xF2\xE8 \xE2\xF1\xB3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xE7\xE0\xF0\xE0\xE7, \xC2\xE8 \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE8\xE1\xF0\xE0\xF2\xE8 ͳ \xB3 \xEF\xEE\xED\xEE\xE2\xE8\xF2\xE8 \xBF\xF5 \xE7\xE3\xEE\xE4\xEE\xEC."
 
 #: Merge.rc:2043
 #, c-format
@@ -3430,7 +3476,7 @@
 #: Merge.rc:2050
 #, c-format
 msgid "Folder Comparison Results"
-msgstr "\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xEF\xE0\xEF\xEE\xEA"
+msgstr "\xD0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA"
 
 #: Merge.rc:2051
 #, c-format
@@ -3465,7 +3511,7 @@
 #: Merge.rc:2062
 #, c-format
 msgid "Opening selection"
-msgstr "³\xE4\xEA\xF0\xE8\xE2\xE0\xFE \xE2\xB3\xE4\xE7\xED\xE0\xF7\xE5\xED\xE5"
+msgstr "³\xE4\xEA\xF0\xE8\xE2\xE0\xFE \xE2\xE8\xE1\xF0\xE0\xED\xE5"
 
 #: Merge.rc:2063
 #, c-format
@@ -3510,12 +3556,12 @@
 #: Merge.rc:2071
 #, c-format
 msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xD1\xEA\xE0\xF1\xF3\xE2\xE0\xED\xED\xFF \xEE\xF1\xF2\xE0\xED\xED\xFC\xEE\xBF 䳿..."
 
 #: Merge.rc:2072
 #, c-format
 msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "\xCF\xEE\xE2\xF2\xEE\xF0\xE5\xED\xED\xFF \xEE\xF1\xF2\xE0\xED\xED\xFC\xEE\xBF 䳿..."
 
 #: Merge.rc:2078
 #, c-format
@@ -3571,17 +3617,17 @@
 #: Merge.rc:2098
 #, c-format
 msgid "Select two existing folders or files to compare"
-msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xE4\xE2\xB3 \xB2\xD1\xCD\xD3\xDEײ \xEF\xE0\xEF\xEA\xE8 \xE0\xE1\xEE \xF4\xE0\xE9\xEB\xE8 \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
+msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xE4\xE2\xB3 \xB2\xD1\xCD\xD3\xDEײ \xF2\xE5\xEA\xE8 \xE0\xE1\xEE \xF4\xE0\xE9\xEB\xE8 \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
 
 #: Merge.rc:2099
 #, c-format
 msgid "Folder Selection"
-msgstr "\xC2\xE8\xE1\xB3\xF0 \xEF\xE0\xEF\xEA\xE8"
+msgstr "\xC2\xE8\xE1\xB3\xF0 \xF2\xE5\xEA\xE8"
 
 #: Merge.rc:2100
 #, c-format
 msgid "Select two folders or two files to compare."
-msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xE4\xE2\xB3 \xEF\xE0\xEF\xEA\xE8 \xE0\xE1\xEE \xF4\xE0\xE9\xEB\xE8"
+msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xE4\xE2\xB3 \xF2\xE5\xEA\xE8 \xE0\xE1\xEE \xF4\xE0\xE9\xEB\xE8"
 
 #: Merge.rc:2101
 #, c-format
@@ -3606,7 +3652,7 @@
 #: Merge.rc:2105
 #, c-format
 msgid "Cannot compare file and folder!"
-msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xE5 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF4\xE0\xE9\xEB\xF3 \xB3 \xEF\xE0\xEF\xEA\xE8!"
+msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xE5 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF4\xE0\xE9\xEB\xF3 \xB3 \xF2\xE5\xEA\xE8!"
 
 #: Merge.rc:2111
 #, c-format
@@ -3638,8 +3684,14 @@
 
 #: Merge.rc:2115
 #, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "\xD4\xE0\xE9\xEB\n%1\n\xED\xE5 \xBA \xF4\xE0\xE9\xEB\xEE\xEC \xEA\xEE\xED\xF4\xEB\xB3\xEA\xF2\xB3\xE2"
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"\xD4\xE0\xE9\xEB\n"
+"%1\n"
+"\xED\xE5 \xBA \xF4\xE0\xE9\xEB\xEE\xEC \xEA\xEE\xED\xF4\xEB\xB3\xEA\xF2\xB3\xE2"
 
 #: Merge.rc:2121
 #, c-format
@@ -3761,7 +3813,7 @@
 "%1\n"
 "\xE7 \xF7\xE0\xF1\xF3 \xEE\xF1\xF2\xE0\xED\xED\xFC\xEE\xE3\xEE \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xF2\xFF \xE2 WinMerge.\n"
 "\n"
-"\xDF\xEA\xF9\xEE \xE2\xE8 \xF5\xEE\xF7\xE5\xF2\xE5 \xEE\xED\xEE\xE2\xE8\xF2\xE8 \xF4\xE0\xE9\xEB\xE8, \xF2\xEE \xE7\xE0\xEA\xF0\xE8\xE9\xF2\xE5 \xEF\xEE\xF2\xEE\xF7\xED\xE5 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xB3 \xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xF2\xE5 \xF4\xE0\xE9\xEB\xE8 \xE7\xED\xEE\xE2\xF3."
+"\xDF\xEA\xF9\xEE \xE2\xE8 \xF5\xEE\xF7\xE5\xF2\xE5 \xEF\xEE\xED\xEE\xE2\xE8\xF2\xE8 \xF4\xE0\xE9\xEB\xE8, \xF2\xEE \xE7\xE0\xEA\xF0\xE8\xE9\xF2\xE5 \xEF\xEE\xF2\xEE\xF7\xED\xE5 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xB3 \xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xF2\xE5 \xF4\xE0\xE9\xEB\xE8 \xE7\xED\xEE\xE2\xF3."
 
 #: Merge.rc:2134
 #, c-format
@@ -3807,7 +3859,7 @@
 #: Merge.rc:2151
 #, c-format
 msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "\xD0\xEE\xE1\xEE\xF7\xE0 \xEF\xE0\xEF\xEA\xE0 VSS \xB3 \xEC\xB3\xF1\xF6\xE5 \xF0\xEE\xE7\xF2\xE0\xF8\xF3\xE2\xE0\xED\xED\xFF \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3 \xED\xE5 \xE7\xE1\xB3\xE3\xE0\xFE\xF2\xFC\xF1\xFF. \xCF\xF0\xEE\xE4\xEE\xE2\xE6\xE8\xF2\xE8 ?"
+msgstr "\xD0\xEE\xE1\xEE\xF7\xE0 \xF2\xE5\xEA\xE0 VSS \xB3 \xEC\xB3\xF1\xF6\xE5 \xF0\xEE\xE7\xF2\xE0\xF8\xF3\xE2\xE0\xED\xED\xFF \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3 \xED\xE5 \xE7\xE1\xB3\xE3\xE0\xFE\xF2\xFC\xF1\xFF. \xCF\xF0\xEE\xE4\xEE\xE2\xE6\xE8\xF2\xE8 ?"
 
 #: Merge.rc:2152
 #, c-format
@@ -3858,24 +3910,24 @@
 #: Merge.rc:2165
 #, c-format
 msgid "Break at whitespace"
-msgstr "\xD0\xEE\xE7\xE1\xE8\xE2\xE0\xF2\xE8 \xEF\xEE \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC"
+msgstr "\xD0\xEE\xE7\xE1\xE8\xE2\xE0\xF2\xE8 \xE7\xE0 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC\xE8"
 
 #: Merge.rc:2166
 #, c-format
 msgid "Break at whitespace or punctuation"
-msgstr "\xD0\xEE\xE7\xE1\xE8\xE2\xE0\xF2\xE8 \xEF\xEE \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC \xB3 \xE7\xED\xE0\xEA\xE0\xF5 \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xB3\xBF"
+msgstr "\xD0\xEE\xE7\xE1\xE8\xE2\xE0\xF2\xE8 \xE7\xE0 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC\xE8 \xB3 \xE7\xED\xE0\xEA\xE0\xEC\xE8 \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xB3\xBF"
 
 #: Merge.rc:2172
 #: Merge.rc:2174
 #, c-format
 msgid "Copy selected item to named directory"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xE2 \xE7\xE0\xE7\xED\xE0\xF7\xE5\xED\xF3 \xEF\xE0\xEF\xEA\xF3"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xE2 \xE7\xE0\xE7\xED\xE0\xF7\xE5\xED\xF3 \xF2\xE5\xEA\xF3"
 
 #: Merge.rc:2173
 #: Merge.rc:2175
 #, c-format
 msgid "Copy selected item to custom directory"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xE2 \xE7\xE0\xE7\xED\xE0\xF7\xE5\xED\xF3 \xEF\xE0\xEF\xEA\xF3"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xE2 \xE7\xE0\xE7\xED\xE0\xF7\xE5\xED\xF3 \xF2\xE5\xEA\xF3"
 
 #: Merge.rc:2176
 #, c-format
@@ -3979,27 +4031,27 @@
 #: Merge.rc:2200
 #, c-format
 msgid "Select destination folder"
-msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xEF\xE0\xEF\xEA\xF3 \xEF\xF0\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF"
+msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xF2\xE5\xEA\xF3 \xEF\xF0\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF"
 
 #: Merge.rc:2205
 #, c-format
 msgid "Left side - select destination folder:"
-msgstr "˳\xE2\xE0 \xF1\xF2\xEE\xF0\xEE\xED\xE0 - \xE2\xE8\xE1\xB3\xF0 \xEF\xE0\xEF\xEA\xE8 \xEF\xF0\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF:"
+msgstr "˳\xE2\xE0 \xF1\xF2\xEE\xF0\xEE\xED\xE0 - \xE2\xE8\xE1\xB3\xF0 \xF2\xE5\xEA\xE8 \xEF\xF0\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF:"
 
 #: Merge.rc:2206
 #, c-format
 msgid "Right side - select destination folder:"
-msgstr "\xCF\xF0\xE0\xE2\xE0 \xF1\xF2\xEE\xF0\xEE\xED\xE0 - \xE2\xE8\xE1\xB3\xF0 \xEF\xE0\xEF\xEA\xE8 \xEF\xF0\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF:"
+msgstr "\xCF\xF0\xE0\xE2\xE0 \xF1\xF2\xEE\xF0\xEE\xED\xE0 - \xE2\xE8\xE1\xB3\xF0 \xF2\xE5\xEA\xE8 \xEF\xF0\xE8\xE7\xED\xE0\xF7\xE5\xED\xED\xFF:"
 
 #: Merge.rc:2207
 #, c-format
 msgid "(%1 Files Affected)"
-msgstr "(%1 \xF4\xE0\xE9\xEB\xB3\xE2 \xEE\xE1\xF0\xEE\xE1\xEB\xE5\xED\xB3)"
+msgstr "(%1 \xF4\xE0\xE9\xEB\xB3\xE2 \xEE\xEF\xF0\xE0\xF6\xFC\xEE\xE2\xE0\xED\xB3)"
 
 #: Merge.rc:2208
 #, c-format
 msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 \xE7 %2 \xF4\xE0\xE9\xEB\xB3\xE2 \xEE\xE1\xF0\xEE\xE1\xEB\xE5\xED\xB3)"
+msgstr "(%1 \xE7 %2 \xF4\xE0\xE9\xEB\xB3\xE2 \xEE\xEF\xF0\xE0\xF6\xFC\xEE\xE2\xE0\xED\xB3)"
 
 #: Merge.rc:2214
 #, c-format
@@ -4035,7 +4087,7 @@
 msgstr ""
 "\xCE\xEF\xE5\xF0\xE0\xF6\xB3\xFF \xEF\xE5\xF0\xE5\xF0\xE2\xE0\xED\xE0!\n"
 "\n"
-"\xC2\xEC\xB3\xF1\xF2 \xEF\xE0\xEF\xEA\xE8 \xE7\xEC\xB3\xED\xE5\xED\xE8\xE9, \xF8\xEB\xFF\xF5\n"
+"\xC2\xEC\xB3\xF1\xF2 \xF2\xE5\xEA\xE8 \xE7\xEC\xB3\xED\xE5\xED\xE8\xE9, \xF8\xEB\xFF\xF5\n"
 "%1\n"
 "\xED\xE5 \xE1\xF3\xE2 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9.\n"
 "\n"
@@ -4044,17 +4096,17 @@
 #: Merge.rc:2218
 #, c-format
 msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\xC2\xE8 \xE4\xB3\xE9\xF1\xED\xEE \xF5\xEE\xF7\xE5\xF2\xE5 \xEF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8:"
 
 #: Merge.rc:2219
 #, c-format
 msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "\xC2\xE8 \xE4\xB3\xE9\xF1\xED\xEE \xF5\xEE\xF7\xE5\xF2\xE5 \xEF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 %d \xE5\xEB\xE5\xEC\xE5\xED\xF2\xB3\xE2:"
 
 #: Merge.rc:2221
 #, c-format
 msgid "Confirm Move"
-msgstr ""
+msgstr "ϳ\xE4\xF2\xE2\xE5\xF0\xE4\xE6\xE5\xED\xED\xFF \xEF\xE5\xF0\xE5\xEC\xB3\xF9\xE5\xED\xED\xFF"
 
 #: Merge.rc:2227
 #, c-format
@@ -4144,12 +4196,12 @@
 #: Merge.rc:2250
 #, c-format
 msgid "Move selected file on left to custom directory"
-msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xEB\xB3\xE2\xEE\xF0\xF3\xF7 \xF4\xE0\xE9\xEB\xE8 \xE2 \xB3\xED\xF8\xF3 \xEF\xE0\xEF\xEA\xF3"
+msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xEB\xB3\xE2\xEE\xF0\xF3\xF7 \xF4\xE0\xE9\xEB\xE8 \xE2 \xB3\xED\xF8\xF3 \xF2\xE5\xEA\xF3"
 
 #: Merge.rc:2252
 #, c-format
 msgid "Move selected file on right to custom directory"
-msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7 \xF4\xE0\xE9\xEB\xE8 \xE2 \xB3\xED\xF8\xF3 \xEF\xE0\xEF\xEA\xF3"
+msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7 \xF4\xE0\xE9\xEB\xE8 \xE2 \xB3\xED\xF8\xF3 \xF2\xE5\xEA\xF3"
 
 #: Merge.rc:2258
 #, c-format
@@ -4159,7 +4211,7 @@
 #: Merge.rc:2259
 #, c-format
 msgid "Folder"
-msgstr "\xCF\xE0\xEF\xEA\xE0"
+msgstr "\xD2\xE5\xEA\xE0"
 
 #: Merge.rc:2260
 #, c-format
@@ -4264,7 +4316,7 @@
 #: Merge.rc:2290
 #, c-format
 msgid "Ignored Diff."
-msgstr "\xB2\xE3\xED\xEE\xF0. \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3"
+msgstr "\xC7\xED\xE5\xF5. \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3"
 
 #: Merge.rc:2291
 #, c-format
@@ -4295,7 +4347,7 @@
 #: Merge.rc:2301
 #, c-format
 msgid "Folder skipped"
-msgstr "\xCF\xE0\xEF\xEA\xE0 \xEF\xF0\xEE\xEF\xF3\xF9\xE5\xED\xE0"
+msgstr "\xD2\xE5\xEA\xE0 \xEF\xF0\xEE\xEF\xF3\xF9\xE5\xED\xE0"
 
 #: Merge.rc:2302
 #, c-format
@@ -4355,12 +4407,12 @@
 #: Merge.rc:2325
 #, c-format
 msgid "Filename or folder name."
-msgstr "\xB2\xEC'\xFF \xF4\xE0\xE9\xEB\xF3 \xE0\xE1\xEE \xEF\xE0\xEF\xEA\xE8"
+msgstr "\xB2\xEC'\xFF \xF4\xE0\xE9\xEB\xF3 \xE0\xE1\xEE \xF2\xE5\xEA\xE8"
 
 #: Merge.rc:2326
 #, c-format
 msgid "Subfolder name when subfolders are included."
-msgstr "\xB2\xEC\xE5\xED\xE0 \xEF\xB3\xE4\xEF\xE0\xEF\xEE\xEA, \xFF\xEA\xF9\xEE \xEF\xB3\xE4\xEF\xE0\xEF\xEA\xE8 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xB3"
+msgstr "\xB2\xEC\xE5\xED\xE0 \xEF\xB3\xE4\xF2\xE5\xEA, \xFF\xEA\xF9\xEE \xEF\xB3\xE4\xF2\xE5\xEA\xE8 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xB3"
 
 #: Merge.rc:2327
 #, c-format
@@ -4465,7 +4517,7 @@
 #: Merge.rc:2357
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "ʳ\xEB\xFC\xEA\xB3\xF1\xF2\xFC \xB3\xE3\xED\xEE\xF0\xEE\xE2\xE0\xED\xE8\xF5 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9 \xF3 \xF4\xE0\xE9\xEB\xB3. ֳ \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xE1\xF3\xEB\xE8 \xB3\xE3\xED\xEE\xF0\xEE\xE2\xE0\xED\xB3 WinMerge \xB3 \xED\xE5 \xEC\xEE\xE6\xF3\xF2\xFC \xE1\xF3\xF2\xE8 \xEE\xE1\xF0\xEE\xE1\xEB\xE5\xED\xB3."
+msgstr "ʳ\xEB\xFC\xEA\xB3\xF1\xF2\xFC \xB3\xE3\xED\xEE\xF0\xEE\xE2\xE0\xED\xE8\xF5 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9 \xF3 \xF4\xE0\xE9\xEB\xB3. ֳ \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xE1\xF3\xEB\xE8 \xB3\xE3\xED\xEE\xF0\xEE\xE2\xE0\xED\xB3 WinMerge \xB3 \xED\xE5 \xEC\xEE\xE6\xF3\xF2\xFC \xE1\xF3\xF2\xE8 \xEE\xEF\xF0\xE0\xF6\xFC\xEE\xE2\xE0\xED\xB3."
 
 #: Merge.rc:2358
 #, c-format
@@ -4554,12 +4606,18 @@
 "\n"
 "\xD5\xEE\xF7\xE5\xF2\xE5, \xF9\xEE\xE1 \xE2 \xF6\xFC\xEE\xEC\xF3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xB3 \xE2\xEE\xED\xE8 \xB3\xE3\xED\xEE\xF0\xF3\xE2\xE0\xEB\xE8\xF1\xFF (\xE2\xE2\xE0\xE6\xE0\xEB\xE8\xF1\xFF \xF0\xB3\xE2\xED\xEE\xE7\xED\xE0\xF7\xED\xE8\xEC\xE8) ?\n"
 "\n"
-"\xD3\xE2\xE0\xE3\xE0: \xDF\xEA\xF9\xEE \xE2\xE0\xF1 \xED\xE5 \xF6\xB3\xEA\xE0\xE2\xEB\xFF\xF2\xFC \xF0\xEE\xE7\xF5\xEE\xE4\xE6\xE5\xED\xED\xFF \xE2 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF\xF5 \xF0\xFF\xE4\xEA\xE0, \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE9\xF2\xE5 \xEE\xEF\xF6\xB3\xFE '\xB2\xE3\xED\xEE\xF0\xF3\xE2\xE0\xF2\xE8 \xF0\xEE\xE7\xF5\xEE\xE4\xE6\xE5\xED\xED\xFF \xE2 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF\xF5 \xF0\xFF\xE4\xEA\xE0' \xED\xE0 \xE2\xEA\xEB\xE0\xE4\xF6\xB3 \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xE2 \xCD\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xF5."
+"\xD3\xE2\xE0\xE3\xE0: \xDF\xEA\xF9\xEE \xE2\xE0\xF1 \xED\xE5 \xF6\xB3\xEA\xE0\xE2\xEB\xFF\xF2\xFC \xF0\xEE\xE7\xF5\xEE\xE4\xE6\xE5\xED\xED\xFF \xE2 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF\xF5 \xF0\xFF\xE4\xEA\xE0, \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE9\xF2\xE5 \xEE\xEF\xF6\xB3\xFE '\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF2\xE8 \xF0\xB3\xE7\xED\xE8\xF6\xE5\xFE \xE2 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF\xF5 \xF0\xFF\xE4\xEA\xB3\xE2' \xED\xE0 \xE2\xEA\xEB\xE0\xE4\xF6\xB3 \xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xE2 \xCD\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xF5."
 
 #: Merge.rc:2384
 #, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr "\xCF\xEE\xE7\xED\xE0\xF7\xEA\xE8 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xE0 \xF0\xB3\xE7\xED\xE8\xF5 \xF2\xE8\xEF\xB3\xE2 (Windows/Unix/Mac) \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xF3 '%1'.\n \xC7 \xEF\xEE\xF2\xEE\xF7\xED\xE8\xEC\xE8 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xEC\xE8 \xE2\xEE\xED\xE8 \xE1\xF3\xE4\xF3\xF2\xFC \xE7\xEC\xB3\xED\xE5\xED\xB3 \xED\xE0 \xEE\xF1\xED\xEE\xE2\xED\xE8\xE9 \xF2\xE8\xEF.\n \xD5\xEE\xF7\xE5\xF2\xE5 \xE7\xEC\xB3\xED\xE8\xF2\xE8 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF, \xF9\xEE\xE1 \xE7\xE1\xE5\xF0\xB3\xE3\xE0\xF2\xE8 \xEA\xB3\xED\xF6\xB3 \xF0\xFF\xE4\xEA\xB3\xE2 \xFF\xEA \xBA, \xF2\xEE\xE1\xF2\xEE \xF0\xB3\xE7\xED\xE8\xEC\xE8?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
+msgstr ""
+"\xCF\xEE\xE7\xED\xE0\xF7\xEA\xE8 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xE0 \xF0\xB3\xE7\xED\xE8\xF5 \xF2\xE8\xEF\xB3\xE2 (Windows/Unix/Mac) \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xF3 '%1'.\n"
+" \xC7 \xEF\xEE\xF2\xEE\xF7\xED\xE8\xEC\xE8 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xEC\xE8 \xE2\xEE\xED\xE8 \xE1\xF3\xE4\xF3\xF2\xFC \xE7\xEC\xB3\xED\xE5\xED\xB3 \xED\xE0 \xEE\xF1\xED\xEE\xE2\xED\xE8\xE9 \xF2\xE8\xEF.\n"
+" \xD5\xEE\xF7\xE5\xF2\xE5 \xE7\xEC\xB3\xED\xE8\xF2\xE8 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF, \xF9\xEE\xE1 \xE7\xE1\xE5\xF0\xB3\xE3\xE0\xF2\xE8 \xEA\xB3\xED\xF6\xB3 \xF0\xFF\xE4\xEA\xB3\xE2 \xFF\xEA \xBA, \xF2\xEE\xE1\xF2\xEE \xF0\xB3\xE7\xED\xE8\xEC\xE8?"
 
 #: Merge.rc:2385
 #, c-format
@@ -4569,7 +4627,7 @@
 #: Merge.rc:2386
 #, c-format
 msgid "The selected folder is invalid."
-msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xF3 \xEF\xE0\xEF\xEA\xF3."
+msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xF3 \xF2\xE5\xEA\xF3."
 
 #: Merge.rc:2387
 #, c-format
@@ -4578,8 +4636,18 @@
 
 #: Merge.rc:2388
 #, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "\xCF\xE0\xEF\xEA\xE0 \xB3\xF1\xED\xF3\xBA \xF2\xB3\xEB\xFC\xEA\xE8 \xE7 \xEE\xE4\xED\xEE\xBF \xF1\xF2\xEE\xF0\xEE\xED\xE8 \xB3 \xED\xE5 \xEC\xEE\xE6\xE5 \xE1\xF3\xF2\xE8 \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE0.\n\n\xD5\xEE\xF7\xE5\xF2\xE5 \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xE2\xB3\xE4\xEF\xEE\xE2\xB3\xE4\xED\xF3 \xEF\xE0\xEF\xEA\xF3:\n%1\n\xE7 \xB3\xED\xF8\xEE\xBF \xF1\xF2\xEE\xF0\xEE\xED\xE8 \xB3 \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8 \xEE\xE1\xE8\xE4\xE2\xB3?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
+msgstr ""
+"\xD2\xE5\xEA\xE0 \xB3\xF1\xED\xF3\xBA \xF2\xB3\xEB\xFC\xEA\xE8 \xE7 \xEE\xE4\xED\xEE\xBF \xF1\xF2\xEE\xF0\xEE\xED\xE8 \xB3 \xED\xE5 \xEC\xEE\xE6\xE5 \xE1\xF3\xF2\xE8 \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE0.\n"
+"\n"
+"\xD5\xEE\xF7\xE5\xF2\xE5 \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xE2\xB3\xE4\xEF\xEE\xE2\xB3\xE4\xED\xF3 \xF2\xE5\xEA\xF3:\n"
+"%1\n"
+"\xE7 \xB3\xED\xF8\xEE\xBF \xF1\xF2\xEE\xF0\xEE\xED\xE8 \xB3 \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8 \xEE\xE1\xE8\xE4\xE2\xB3?"
 
 #: Merge.rc:2394
 #, c-format
@@ -4660,12 +4728,12 @@
 #: Merge.rc:2433
 #, c-format
 msgid "1. item is not found or is directory!"
-msgstr "1. \xC5\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9 \xE0\xE1\xEE \xF6\xE5 \xEF\xE0\xEF\xEA\xE0"
+msgstr "1. \xC5\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9 \xE0\xE1\xEE \xF6\xE5 \xF2\xE5\xEA\xE0"
 
 #: Merge.rc:2434
 #, c-format
 msgid "2. item is not found or is directory!"
-msgstr "2. \xC5\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9 \xE0\xE1\xEE \xF6\xE5 \xEF\xE0\xEF\xEA\xE0"
+msgstr "2. \xC5\xEB\xE5\xEC\xE5\xED\xF2 \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9 \xE0\xE1\xEE \xF6\xE5 \xF2\xE5\xEA\xE0"
 
 #: Merge.rc:2435
 #, c-format
@@ -4675,7 +4743,7 @@
 #: Merge.rc:2436
 #, c-format
 msgid "[%1 files selected]"
-msgstr "[%1 \xF4\xE0\xE9\xEB\xB3\xE2 \xE2\xB3\xE4\xE7\xED\xE0\xF7\xE5\xED\xB3]"
+msgstr "[%1 \xF4\xE0\xE9\xEB\xB3\xE2 \xE2\xE8\xE1\xF0\xE0\xED\xB3]"
 
 #: Merge.rc:2437
 #, c-format
@@ -4715,7 +4783,7 @@
 #: Merge.rc:2444
 #, c-format
 msgid "Cannot create a patch file from directories."
-msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEF\xE0\xF2\xF7 \xE7 \xEF\xE0\xEF\xEE\xEA"
+msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEF\xE0\xF2\xF7 \xE7 \xF2\xE5\xEA"
 
 #: Merge.rc:2445
 #, c-format
@@ -4731,12 +4799,12 @@
 #: Merge.rc:2446
 #, c-format
 msgid "Folder does not exist."
-msgstr "\xCF\xE0\xEF\xEA\xE0 \xED\xE5 \xB3\xF1\xED\xF3\xBA"
+msgstr "\xD2\xE5\xEA\xE0 \xED\xE5 \xB3\xF1\xED\xF3\xBA"
 
 #: Merge.rc:2451
 #, c-format
 msgid "Current directory comparison results will be cleared."
-msgstr "\xCF\xEE\xF2\xEE\xF7\xED\xB3 \xF0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xEF\xE0\xEF\xEE\xEA \xE1\xF3\xE4\xF3\xF2\xFC \xEE\xF7\xE8\xF9\xE5\xED\xB3."
+msgstr "\xCF\xEE\xF2\xEE\xF7\xED\xB3 \xF0\xE5\xE7\xF3\xEB\xFC\xF2\xE0\xF2\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA \xE1\xF3\xE4\xF3\xF2\xFC \xEE\xF7\xE8\xF9\xE5\xED\xB3."
 
 #: Merge.rc:2452
 #, c-format
@@ -5228,22 +5296,22 @@
 #: Merge.rc:2617
 #, c-format
 msgid "Type"
-msgstr ""
+msgstr "\xD2\xE8\xEF"
 
 #: Merge.rc:2619
 #, c-format
 msgid "Unpacker"
-msgstr ""
+msgstr "\xD0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xEB\xFC\xED\xE8\xEA"
 
 #: Merge.rc:2620
 #, c-format
 msgid "Prediffer"
-msgstr ""
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF7"
 
 #: Merge.rc:2621
 #, c-format
 msgid "Editor script"
-msgstr ""
+msgstr "\xD1\xF6\xE5\xED\xE0\xF0\xB3\xE9 \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xE0"
 
 #: Merge.rc:2628
 #, c-format
@@ -5268,12 +5336,12 @@
 #: Merge.rc:2632
 #, c-format
 msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xC7\xEC\xB3\xED\xE8\xF2\xE8 \xF1\xF2\xE0\xF2\xF3\xF1 \"\xEB\xE8\xF8\xE5 \xF7\xE8\xF2\xE0\xED\xED\xFF\" \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xF3 \xE0\xE1\xEE \xF2\xE5\xEA\xE8 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
 
 #: Merge.rc:2633
 #, c-format
 msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xC7\xEC\xB3\xED\xE8\xF2\xE8 \xF1\xF2\xE0\xF2\xF3\xF1 \"\xEB\xE8\xF8\xE5 \xF7\xE8\xF2\xE0\xED\xED\xFF\" \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xF3 \xE0\xE1\xEE \xF2\xE5\xEA\xE8 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
 
 #: Merge.rc:2634
 #, c-format
@@ -5342,8 +5410,8 @@
 "Refresh display\n"
 "Refresh (F5)"
 msgstr ""
-"\xCE\xED\xEE\xE2\xE8\xF2\xE8 \xE5\xEA\xF0\xE0\xED\n"
-"\xCE\xED\xEE\xE2\xE8\xF2\xE8 (F5)"
+"\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8 \xE5\xEA\xF0\xE0\xED\n"
+"\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8 (F5)"
 
 #: Merge.rc:2649
 #, c-format
@@ -5353,7 +5421,7 @@
 #: Merge.rc:2650
 #, c-format
 msgid "Refresh selected items"
-msgstr "\xCE\xED\xEE\xE2\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8"
+msgstr "\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8"
 
 #: Merge.rc:2651
 #, c-format
@@ -5444,7 +5512,7 @@
 "Revert to using the default system font for view\n"
 "Default Font"
 msgstr ""
-"\xC2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xE0\xF2\xE8 \xE7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xED\xE8\xE9 \xF8\xF0\xE8\xF4\xF2 \xE4\xEB\xFF \xE2\xB3\xE4\xEE\xE1\xF0\xE0\xE6\xE5\xED\xED\xFF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9 \n"
+"\xC2\xE8\xEA\xEE\xF0\xE8\xF1\xF2\xEE\xE2\xF3\xE2\xE0\xF2\xE8 \xE7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xED\xE8\xE9 \xF8\xF0\xE8\xF4\xF2 \xE4\xEB\xFF \xE2\xB3\xE4\xEE\xE1\xF0\xE0\xE6\xE5\xED\xED\xFF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9 \n"
 "\xC7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9 \xF8\xF0\xE8\xF4\xF2"
 
 #: Merge.rc:2673
@@ -5465,17 +5533,25 @@
 #: Merge.rc:2676
 #, c-format
 msgid "Show folder compare statistics dialog"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE4\xB3\xE0\xEB\xEE\xE3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF1\xF2\xE0\xF2\xE8\xF1\xF2\xE8\xEA \xEF\xE0\xEF\xEE\xEA"
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE4\xB3\xE0\xEB\xEE\xE3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF1\xF2\xE0\xF2\xE8\xF1\xF2\xE8\xEA \xF2\xE5\xEA"
 
 #: Merge.rc:2677
 #, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xEC\xEE\xE2\xF3 \xB3\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xF3 \xE4\xEB\xFF \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0\n\xCC\xEE\xE2\xE0"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xEC\xEE\xE2\xF3 \xB3\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xF3 \xE4\xEB\xFF \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0\n"
+"\xCC\xEE\xE2\xE0"
 
 #: Merge.rc:2678
 #, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xE2\xF1\xE5\xF0\xE5\xE4\xE8\xED\xB3 \xF0\xFF\xE4\xEA\xB3\xE2 \xB3\xED\xF8\xE8\xEC\xE8 \xEA\xEE\xEB\xFC\xEE\xF0\xE0\xEC\xE8\n\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xE2 \xF0\xFF\xE4\xEA\xF3"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xE2\xF1\xE5\xF0\xE5\xE4\xE8\xED\xB3 \xF0\xFF\xE4\xEA\xB3\xE2 \xB3\xED\xF8\xE8\xEC\xE8 \xEA\xEE\xEB\xFC\xEE\xF0\xE0\xEC\xE8\n"
+"\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xE8 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xE2 \xF0\xFF\xE4\xEA\xF3"
 
 #: Merge.rc:2679
 #, c-format
@@ -5526,28 +5602,48 @@
 
 #: Merge.rc:2691
 #, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xFC\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n\xCF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xFF \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xFC\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n"
+"\xCF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xFF \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Up)"
 
 #: Merge.rc:2692
 #, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xED\xE0\xF1\xF2\xF3\xEF\xED\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n\xCD\xE0\xF1\xF2\xF3\xEF\xED\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xED\xE0\xF1\xF2\xF3\xEF\xED\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n"
+"\xCD\xE0\xF1\xF2\xF3\xEF\xED\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Down)"
 
 #: Merge.rc:2693
 #, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEF\xE5\xF0\xF8\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n\xCF\xE5\xF0\xF8\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEF\xE5\xF0\xF8\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n"
+"\xCF\xE5\xF0\xF8\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Home)"
 
 #: Merge.rc:2694
 #, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEF\xEE\xF2\xEE\xF7\xED\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n\xCF\xEE\xF2\xEE\xF7\xED\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEF\xEE\xF2\xEE\xF7\xED\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n"
+"\xCF\xEE\xF2\xEE\xF7\xED\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+Enter)"
 
 #: Merge.rc:2695
 #, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEE\xF1\xF2\xE0\xED\xED\xFC\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n\xCE\xF1\xF2\xE0\xED\xED\xFF \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xEE\xF1\xF2\xE0\xED\xED\xFC\xEE\xBF \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3\n"
+"\xCE\xF1\xF2\xE0\xED\xED\xFF \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC (Alt+End)"
 
 #: Merge.rc:2696
 #, c-format
@@ -5606,17 +5702,17 @@
 #: Merge.rc:2702
 #, c-format
 msgid "Delete selected items from both directories"
-msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7 \xEE\xE1\xEE\xF5 \xEF\xE0\xEF\xEE\xEA"
+msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7 \xEE\xE1\xEE\xF5 \xF2\xE5\xEA"
 
 #: Merge.rc:2703
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8 \xE2\xB3\xE4\xE7\xED\xE0\xF7\xE5\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 (\xEF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8 \xEF\xE5\xF0\xF8\xE8\xE9 \xE5\xEB\xE5\xEC\xE5\xED\xF2, \xFF\xEA\xF9\xEE \xE2\xB3\xE4\xE7\xED\xE0\xF7\xE5\xED\xEE \xE1\xB3\xEB\xFC\xF8\xE5 \xEE\xE4\xED\xEE\xE3\xEE)"
+msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 (\xEF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8 \xEF\xE5\xF0\xF8\xE8\xE9 \xE5\xEB\xE5\xEC\xE5\xED\xF2, \xFF\xEA\xF9\xEE \xE2\xE8\xE1\xF0\xE0\xED\xEE \xE1\xB3\xEB\xFC\xF8\xE5 \xEE\xE4\xED\xEE\xE3\xEE)"
 
 #: Merge.rc:2709
 #, c-format
 msgid "Select and reorder directory compare columns"
-msgstr "\xC2\xE8\xE1\xF0\xE0\xF2\xE8 \xB3 \xEF\xE5\xF0\xE5\xF1\xF2\xE0\xE2\xE8\xF2\xE8 \xEC\xB3\xF1\xF6\xFF\xEC\xE8 \xF1\xF2\xEE\xE2\xEF\xF7\xE8\xEA\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xEF\xE0\xEF\xEE\xEA"
+msgstr "\xC2\xE8\xE1\xF0\xE0\xF2\xE8 \xB3 \xEF\xE5\xF0\xE5\xF1\xF2\xE0\xE2\xE8\xF2\xE8 \xEC\xB3\xF1\xF6\xFF\xEC\xE8 \xF1\xF2\xEE\xE2\xEF\xF7\xE8\xEA\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA"
 
 #: Merge.rc:2710
 #, c-format
@@ -5636,12 +5732,12 @@
 #: Merge.rc:2718
 #, c-format
 msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xF3\xBA \xF1\xEF\xE8\xF1\xEE\xEA \xE4\xEE\xF1\xF2\xF3\xEF\xED\xE8\xF5 \xE4\xEE\xEF\xEE\xE2\xED\xE5\xED\xFC \xE4\xEE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE8"
 
 #: Merge.rc:2719
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
-msgstr "\xCE\xE1\xF0\xE0\xED\xE8\xE9 \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE5\xEC \xF0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xEB\xFC\xED\xE8\xEA (\xED\xE5 䳺 \xEF\xF0\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xB3 \xEF\xE0\xEF\xEE\xEA)"
+msgstr "\xCE\xE1\xF0\xE0\xED\xE8\xE9 \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE5\xEC \xF0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xEB\xFC\xED\xE8\xEA (\xED\xE5 \xEF\xF0\xE0\xF6\xFE\xBA \xEF\xF0\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xB3 \xF2\xE5\xEA)"
 
 #: Merge.rc:2720
 #, c-format
@@ -5675,8 +5771,12 @@
 
 #: Merge.rc:2731
 #, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "\xC0\xEA\xF2\xE8\xE2\xF3\xBA \xED\xE0\xF1\xF2\xF3\xEF\xED\xE8\xE9 \xE2\xE8\xE4\xE8\xEC\xE8\xE9 \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xF3\xE2\xE0\xF2\xE8 \xED\xE0\xF1\xF2\xF3\xEF\xED\xE8\xE9 \xF4\xE0\xE9\xEB"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"\xC0\xEA\xF2\xE8\xE2\xF3\xBA \xED\xE0\xF1\xF2\xF3\xEF\xED\xE8\xE9 \xE2\xE8\xE4\xE8\xEC\xE8\xE9 \xF4\xE0\xE9\xEB\n"
+"\xC0\xEA\xF2\xE8\xE2\xF3\xE2\xE0\xF2\xE8 \xED\xE0\xF1\xF2\xF3\xEF\xED\xE8\xE9 \xF4\xE0\xE9\xEB"
 
 #: Merge.rc:2732
 #, c-format
@@ -5685,8 +5785,12 @@
 
 #: Merge.rc:2738
 #, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xE4\xEE\xE2\xB3\xE4\xEA\xF3 WinMerge\n\xC4\xEE\xE2\xB3\xE4\xEA\xE0 WinMerge"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"³\xE4\xEA\xF0\xE8\xF2\xE8 \xE4\xEE\xE2\xB3\xE4\xEA\xF3 WinMerge\n"
+"\xC4\xEE\xE2\xB3\xE4\xEA\xE0 WinMerge"
 
 #: Merge.rc:2739
 #, c-format
@@ -5705,13 +5809,21 @@
 
 #: Merge.rc:2742
 #, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xE7 \xE7\xE0\xF3\xE2\xE0\xE6\xE5\xED\xED\xFF\xEC\xE8 \xE4\xEE \xF0\xE5\xEB\xB3\xE7\xF3\n\xC7\xE0\xF3\xE2\xE0\xE6\xE5\xED\xED\xFF \xE4\xEE \xF0\xE5\xEB\xB3\xE7\xF3"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"³\xE4\xEA\xF0\xE8\xF2\xE8 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xE7 \xE7\xE0\xF3\xE2\xE0\xE6\xE5\xED\xED\xFF\xEC\xE8 \xE4\xEE \xF0\xE5\xEB\xB3\xE7\xF3\n"
+"\xC7\xE0\xF3\xE2\xE0\xE6\xE5\xED\xED\xFF \xE4\xEE \xF0\xE5\xEB\xB3\xE7\xF3"
 
 #: Merge.rc:2743
 #, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xF1\xF2\xEE\xF0\xB3\xED\xEA\xF3 \xE7 \xEF\xE5\xF0\xE5\xEA\xEB\xE0\xE4\xE0\xEC\xE8\n\xCF\xE5\xF0\xE5\xEA\xEB\xE0\xE4\xE8"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xF1\xF2\xEE\xF0\xB3\xED\xEA\xF3 \xE7 \xEF\xE5\xF0\xE5\xEA\xEB\xE0\xE4\xE0\xEC\xE8\n"
+"\xCF\xE5\xF0\xE5\xEA\xEB\xE0\xE4\xE8"
 
 #: Merge.rc:2749
 #, c-format
@@ -5791,7 +5903,7 @@
 #: Merge.rc:2780
 #, c-format
 msgid "Disabled"
-msgstr "\xC2\xE8\xEC\xEA\xED\xE5\xED\xE5"
+msgstr "\xC2\xE8\xEC\xEA\xED\xE5\xED\xE8\xE9"
 
 #: Merge.rc:2781
 #, c-format
@@ -5806,7 +5918,7 @@
 #: Merge.rc:2788
 #, c-format
 msgid "No Highlighting"
-msgstr ""
+msgstr "\xCD\xE5 \xEF\xB3\xE4\xF1\xE2\xB3\xF7\xF3\xE2\xE0\xF2\xE8"
 
 #: Merge.rc:2789
 #, c-format
@@ -5971,10 +6083,10 @@
 #: Merge.rc:2825
 #, c-format
 msgid "Show small toolbar"
-msgstr "\xCC\xE0\xEB\xE5\xED\xFC\xEA\xB3 \xE7\xED\xE0\xF7\xEA\xE8"
+msgstr "\xCC\xE0\xEB\xE5\xED\xFC\xEA\xB3 \xEF\xB3\xEA\xF2\xEE\xE3\xF0\xE0\xEC\xE8"
 
 #: Merge.rc:2826
 #, c-format
 msgid "Show big toolbar"
-msgstr "\xC2\xE5\xEB\xE8\xEA\xB3 \xE7\xED\xE0\xF7\xEA\xE8"
+msgstr "\xC2\xE5\xEB\xE8\xEA\xB3 \xEF\xB3\xEA\xF2\xEE\xE3\xF0\xE0\xEC\xE8"
 


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

Revision: 5990
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5990&view=rev
Author:   gerundt
Date:     2008-09-30 21:35:18 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
PATCH: [ 2136765 ] Change DownloadUrl[] constant to current URL

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/Constants.h

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-30 21:33:01 UTC (rev 5989)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-09-30 21:35:18 UTC (rev 5990)
@@ -4,6 +4,7 @@
 http://winmerge.org/tracker/[tracker-id]
 
 WinMerge 2.10.2
+  Change download URL to current URL (#2136765)
   BugFix: Case-sensitive regexp search didn't work (#1991259)
   Translation updates:
   - Ukrainian (#2131753)

Modified: branches/R2_10/Src/Constants.h
===================================================================
--- branches/R2_10/Src/Constants.h	2008-09-30 21:33:01 UTC (rev 5989)
+++ branches/R2_10/Src/Constants.h	2008-09-30 21:35:18 UTC (rev 5990)
@@ -26,7 +26,7 @@
 const TCHAR LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
 
 /** @brief WinMerge download page URL. */
-const TCHAR DownloadUrl[] = _T("http://winmerge.org/downloads.php");
+const TCHAR DownloadUrl[] = _T("http://winmerge.org/downloads/");
 
 /** @brief Relative (to WinMerge executable ) path to local help file. */
 const TCHAR DocsPath[] = _T("\\Docs\\WinMerge.chm");


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

Revision: 6000
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6000&view=rev
Author:   kimmov
Date:     2008-10-06 19:31:59 +0000 (Mon, 06 Oct 2008)

Log Message:
-----------
PATCH: [ 2120685 ] Galician translation
 Submitted by Medulio

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

Added Paths:
-----------
    branches/R2_10/Installer/InnoSetup/Languages/Galician.isl
    branches/R2_10/Src/Languages/Galician.po

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-06 19:31:59 UTC (rev 6000)
@@ -6,6 +6,7 @@
 WinMerge 2.10.2
   Change download URL to current URL (#2136765)
   BugFix: Case-sensitive regexp search didn't work (#1991259)
+  New translation: Galician (#2120685)
   Translation updates:
   - Ukrainian (#2131753)
 

Modified: branches/R2_10/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_10/Docs/Users/Contributors.txt	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Docs/Users/Contributors.txt	2008-10-06 19:31:59 UTC (rev 6000)
@@ -57,7 +57,10 @@
   Gil Andre 
   Laurent Ganier
   Matthieu Pupat
-    
+
+* Galician:
+  Medulio
+
 * German:	
   Tim Gerundt
   Winfried Peter

Modified: branches/R2_10/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -344,6 +344,7 @@
 DanishLanguage=Menus e di\xE1logos dinamarqueses
 DutchLanguage=Menus e di\xE1logos holandeses
 FrenchLanguage=Menus e di\xE1logos franceses
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Menus e di\xE1logos alem\xE3es
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Hungarian menus and dialogs

Modified: branches/R2_10/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Bulgarian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Bulgarian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -346,6 +346,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Catalan.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Catalan.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -329,6 +329,7 @@
 DanishLanguage=Men\xFAs i di\xE0legs en Dan\xE8s
 DutchLanguage=Men\xFAs i di\xE0legs en Neerland\xE8s
 FrenchLanguage=Men\xFAs i di\xE0legs en Franc\xE8s
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Men\xFAs i di\xE0legs en Alemany
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Men\xFAs i di\xE0legs en Hongar\xE8s

Modified: branches/R2_10/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Chinese_Simplified.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Chinese_Simplified.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -336,6 +336,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Chinese_Traditional.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Chinese_Traditional.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -343,6 +343,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Croatian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Croatian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Croatian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -339,6 +339,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Czech.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Czech.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -344,6 +344,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Danish.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Danish.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -345,6 +345,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -323,6 +323,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/English.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/English.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/English.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -346,6 +346,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/French.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/French.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/French.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -338,6 +338,7 @@
 DanishLanguage=Menus et dialogues Danois
 DutchLanguage=Menus et dialogues N\xE9erlandais
 FrenchLanguage=Menus et dialogues Fran\xE7ais
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Menus et dialogues Allemand
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Menus et dialogues Hongrois

Copied: branches/R2_10/Installer/InnoSetup/Languages/Galician.isl (from rev 5997, trunk/Installer/InnoSetup/Languages/Galician.isl)
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Galician.isl	                        (rev 0)
+++ branches/R2_10/Installer/InnoSetup/Languages/Galician.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -0,0 +1,382 @@
+; *** Inno Setup version 5.1.11+ Galician messages ***
+;
+; Translated by Jos\xE9 Antonio Cidre Bardel\xE1s (Medulio) - (medulio@...)
+;
+; To download user-contributed translations of this file, go to:
+;   http://www.jrsoftware.org/is3rdparty.php
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=Galego
+LanguageID=$0456
+LanguageCodePage=1252
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Instalaci\xF3n
+SetupWindowTitle=Instalaci\xF3n de %1
+UninstallAppTitle=Desinstalaci\xF3n
+UninstallAppFullTitle=Desinstalaci\xF3n de %1
+
+; *** Misc. common
+InformationTitle=Informaci\xF3n
+ConfirmTitle=Confirmaci\xF3n
+ErrorTitle=Erro
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=Vaise instalar %1. Queres continuar?
+LdrCannotCreateTemp=Non se puido crear un arquivo temporal. Instalaci\xF3n cancelada
+LdrCannotExecTemp=Non se puido executa-lo arquivo no directorio temporal. Instalaci\xF3n cancelada
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nErro %2: %3
+SetupFileMissing=Non se atopou o arquivo %1 no directorio da instalaci\xF3n. Por favor, corrixe o problema ou consegue unha nova copia do programa.
+SetupFileCorrupt=Os arquivos de instalaci\xF3n est\xE1n danados. Por favor, consegue unha nova copia do programa.
+SetupFileCorruptOrWrongVer=Os arquivos de instalaci\xF3n est\xE1n danados ou sonche incompatibles con esta versi\xF3n do Instalador. Por favor, corrixe o problema ou consegue unha nova copia do programa.
+NotOnThisPlatform=Este programa non funcionar\xE1 baixo %1.
+OnlyOnThisPlatform=Este programa s\xF3 funcionar\xE1 baixo %1.
+OnlyOnTheseArchitectures=Este programa s\xF3 se pode instalar en versi\xF3ns do Windows dese\xF1adas para as seguintes arquitecturas de procesadores:%n%n%1
+MissingWOW64APIs=A versi\xF3n do Windows que est\xE1s a utilizar non incl\xFAe as funcionalidades requeridas polo Instalador para efectuar unha instalaci\xF3n de 64 bits. Para corrixir este problema, por favor, instala o Service Pack %1.
+WinVersionTooLowError=Este programa require %1 versi\xF3n %2 ou posterior.
+WinVersionTooHighError=Este programa non se pode instalar baixo %1 versi\xF3n %2 ou posterior.
+AdminPrivilegesRequired=T\xE9s que entrar no sistema coma administrador para poder instalar este programa.
+PowerUserPrivilegesRequired=T\xE9s que entrar no sistema coma administrador ou ben coma membro do grupo de usuarios con privilexios para poder instalar este programa.
+SetupAppRunningError=O Instalador detectou que %1 est\xE1 execut\xE1ndose nestes intres.%n%nPor favor, pecha o programa e logo preme Aceptar para continuar ou Cancelar para sair.
+UninstallAppRunningError=O Instalador detectou que %1 est\xE1 execut\xE1ndose nestes intres.%n%nPor favor, pecha o programa e logo preme Aceptar para continuar ou Cancelar para sair.
+
+; *** Misc. errors
+ErrorCreatingDir=O Instalador non puido crea-lo directorio "%1"
+ErrorTooManyFilesInDir=Non se puido crear un arquivo no directorio "%1" xa que cont\xE9n arquivos de m\xE1is
+
+; *** Setup common messages
+ExitSetupTitle=Sair do Instalador
+ExitSetupMessage=A instalaci\xF3n non se completou. Se saes agora o programa non ser\xE1 instalado.%n%nPodes volver executa-lo programa de Instalaci\xF3n noutro intre para completa-la mesma.%n%nQueres sair do Instalador?
+AboutSetupMenuItem=&Verbo do Instalador...
+AboutSetupTitle=Verbo do Instalador
+AboutSetupMessage=%1 versi\xF3n %2%n%3%n%nP\xE1xina web de %1:%n%4
+AboutSetupNote=
+TranslatorNote=
+
+; *** Buttons
+ButtonBack=< &Volver
+ButtonNext=&Seguinte >
+ButtonInstall=&Instalar
+ButtonOK=Aceptar
+ButtonCancel=Cancelar
+ButtonYes=&Si
+ButtonYesToAll=Confirmar &Todo
+ButtonNo=&Non
+ButtonNoToAll=N&on a Todo
+ButtonFinish=&Rematar
+ButtonBrowse=&Explorar...
+ButtonWizardBrowse=Explo&rar...
+ButtonNewFolder=&Crear Novo Cartafol
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Escolle-lo Idioma de Instalaci\xF3n
+SelectLanguageLabel=Selecciona o Idioma a usar durante a Instalaci\xF3n:
+
+; *** Common wizard text
+ClickNext=Preme Seguinte para continuar, ou Cancelar para sair do Instalador.
+BeveledLabel=
+BrowseDialogTitle=Explorar Cartafol
+BrowseDialogLabel=Selecciona un cartafol da seguinte lista e pulsa Aceptar.
+NewFolderName=Novo Cartafol
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Benvido \xF3 asistente de instalaci\xF3n de [name]
+WelcomeLabel2=Vaise instalar [name/ver] no teu ordenador.%n%n\xC9 recomendable que peches t\xF3dalas outras aplicaci\xF3ns que se estean a executar denantes de inicia-la Instalaci\xF3n.
+
+; *** "Password" wizard page
+WizardPassword=Contrasinal
+PasswordLabel1=Esta Instalaci\xF3n est\xE1 protexida por contrasinal.
+PasswordLabel3=Por favor, introduce o contrasinal e logo preme Seguinte para continuar. Os contrasinais son sensibles \xE1s mai\xFAsculas/min\xFAsculas.
+PasswordEditLabel=&Contrasinal:
+IncorrectPassword=O contrasinal introducido \xE9 incorrecto. Por favor, proba outra vez.
+
+; *** "License Agreement" wizard page
+WizardLicense=Conformidade coa Licencia de Uso
+LicenseLabel=Por favor, le a seguinte informaci\xF3n de importancia antes de continuar.
+LicenseLabel3=Por favor, lee a seguinte Conformidade coa Licencia de Uso. T\xE9s que acepta-los termos deste acordo antes de continuar coa Instalaci\xF3n.
+LicenseAccepted=&Acepto os termos do acordo
+LicenseNotAccepted=&Non acepto os termos do acordo
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informaci\xF3n
+InfoBeforeLabel=Por favor, le a seguinte informaci\xF3n de importancia antes de continuar.
+InfoBeforeClickLabel=Cando est\xE9s preparado para continuar coa Instalaci\xF3n, preme Seguinte.
+WizardInfoAfter=Informaci\xF3n
+InfoAfterLabel=Por favor, le a seguinte informaci\xF3n de importancia antes de continuar.
+InfoAfterClickLabel=Cando est\xE9s preparado para continuar coa Instalaci\xF3n, preme Seguinte.
+
+; *** "User Information" wizard page
+WizardUserInfo=Informaci\xF3n do Usuario
+UserInfoDesc=Por favor, introduce a t\xFAa informaci\xF3n.
+UserInfoName=Nome de &Usuario:
+UserInfoOrg=&Organizaci\xF3n:
+UserInfoSerial=N\xFAmero de &Serie:
+UserInfoNameRequired=T\xE9s que introducir un nome.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Selecciona o Directorio de Desti\xF1o
+SelectDirDesc=Onde queres instalar [name]?
+SelectDirLabel3=O Instalador vai instalar [name] no seguinte cartafol.
+SelectDirBrowseLabel=Para continuar, preme Seguinte. Se queres seleccionar outro cartafol, preme Explorar.
+DiskSpaceMBLabel=O programa require polo menos [mb] MB de espazo ceibe no disco.
+ToUNCPathname=O Instalador non pode instala-lo programa nun nome de directorio UNC. Se est\xE1s tentando face-la instalaci\xF3n nunha rede, ter\xE1s que asignar unha letra (D:, E:, F:, etc) \xF3 disco de desti\xF1o.
+InvalidPath=T\xE9s que introducir un enderezo completo con letra da unidade de disco; por exemplo:%n%nC:\Aplicaci\xF3n%n%nou ben unha ruta UNC do seguinte xeito:%n%n\\servidor\compartido
+InvalidDrive=O disco ou enderezo UNC de rede que seleccionaches non \xE9 accesible. Por favor, selecciona outro.
+DiskSpaceWarningTitle=Non hai Espazo dabondo no Disco
+DiskSpaceWarning=O Instalador require polo menos %1 KB de espazo ceibe para a instalaci\xF3n, pero o disco que escolleches s\xF3 ten %2 KB dispo\xF1ibles.%n%nQueres continuar de t\xF3dolos xeitos?
+DirNameTooLong=O nome do cartafol ou da ruta e longo de m\xE1is.
+InvalidDirName=O nome de cartafol non \xE9 v\xE1lido.
+BadDirName32=Os nomes de directorio non poden incluir calquera dos caracteis seguintes:%n%n%1
+DirExistsTitle=O Directorio Xa Existe
+DirExists=O directorio:%n%n%1%n%nxa existe. Queres instala-lo programa neste directorio de t\xF3dolos xeitos?
+DirDoesntExistTitle=O Directorio Non Existe
+DirDoesntExist=O directorio:%n%n%1%n%nnon existe. Queres crealo?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Elixir Compo\xF1entes
+SelectComponentsDesc=C\xE1les dos compo\xF1entes queres instalar?
+SelectComponentsLabel2=Selecciona \xFAnicamente os compo\xF1entes que queres instalar. Preme seguinte para continuar.
+FullInstallation=Instalaci\xF3n Completa
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Instalaci\xF3n Compacta
+CustomInstallation=Instalaci\xF3n Persoalizada
+NoUninstallWarningTitle=Os Compo\xF1entes Xa Existen
+NoUninstallWarning=O Instalador detectou que os seguintes compo\xF1entes xa est\xE1n instalados no teu ordenador:%n%n%1%n%nDeseleciona-los compo\xF1entes non os vai desinstalar.%n%nQueres continuar de t\xF3dolos xeitos?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=A selecci\xF3n que fixeches require polo menos [mb] MB de espazo ceibe no disco.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Seleccionar Procesos Adicionais
+SelectTasksDesc=Que procesos adicionais deben efectuarse?
+SelectTasksLabel2=Selecciona os procesos adicionais que queres que o Instalador leve a cabo durante a instalaci\xF3n de [name], logo preme Seguinte.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Seleccionar Cartafol do Men\xFA de Inicio
+SelectStartMenuFolderDesc=Onde queres que o Instalador xere as ligaz\xF3ns do programa?
+SelectStartMenuFolderLabel3=O Instalador vai crea-las ligaz\xF3ns \xF3s programas no seguinte cartafol do Men\xFA de Inicio.
+SelectStartMenuFolderBrowseLabel=Para continuar, preme Seguinte. Se queres seleccionar outro cartafol, preme Explorar.
+MustEnterGroupName=T\xE9s que introducir un nome de cartafol.
+GroupNameTooLong=O nome do cartafol ou da ruta e longo de m\xE1is.
+InvalidGroupName=O nome de cartafol non \xE9 v\xE1lido.
+BadGroupName=O nome de cartafol non pode incluir ning\xFAn dos seguintes caracteis:%n%n%1
+NoProgramGroupCheck2=&Non crear cartafol no Men\xFA de Inicio
+
+; *** "Ready to Install" wizard page
+WizardReady=Preparado para Instalar
+ReadyLabel1=O Instalador est\xE1 preparado para comezar instalar [name] no teu ordenador.
+ReadyLabel2a=Preme Instalar para continuar coa instalaci\xF3n ou preme Volver se queres revisar ou troca-las opci\xF3ns escollidas.
+ReadyLabel2b=Preme Instalar para continuar coa instalaci\xF3n.
+ReadyMemoUserInfo=Informaci\xF3n de Usuario:
+ReadyMemoDir=Directorio de desti\xF1o:
+ReadyMemoType=Tipo de Instalaci\xF3n:
+ReadyMemoComponents=Compe\xF1entes seleccionados:
+ReadyMemoGroup=Cartafol do Men\xFA Inicio:
+ReadyMemoTasks=Procesos adicionais:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Preparando a Instalaci\xF3n
+PreparingDesc=O Instalador est\xE1 a prepara-la instalaci\xF3n de [name] no teu ordenador.
+PreviousInstallNotCompleted=A instalaci\xF3n/desinstalaci\xF3n dun programa anterior non foi completada. Ter\xE1s que reinicia-lo teu ordenador para completar este instalaci\xF3n.%n%nLogo de ter reiniciado o teu ordenador, executa o Instalador outra vez para completa-la instalaci\xF3n de [name].
+CannotContinue=O Instalador non pode continuar. Por favor, preme Cancelar para sair.
+
+; *** "Installing" wizard page
+WizardInstalling=Instalando
+InstallingLabel=Por favor, agarda mentres o Instalador instala [name] no teu ordenador.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Rematando o Asistente de Instalaci\xF3n de [name]
+FinishedLabelNoIcons=O Instalador rematou de instalar [name] no teu ordenador.
+FinishedLabel=O Instalador rematou de instalar [name] no teu ordenador. Podes executa-la aplicaci\xF3n seleccionado as iconas instaladas.
+ClickFinish=Preme Rematar para sair do Instalador.
+FinishedRestartLabel=Para completa-la instalaci\xF3n de [name] o Instalador t\xE9n que reinicia-lo teu ordenador. Queres reinicialo agora?
+FinishedRestartMessage=Para completa-la instalaci\xF3n de [name] o Instalador t\xE9n que reinicia-lo teu ordenador. %n%nQueres reinicialo agora?
+ShowReadmeCheck=Si, quero ve-lo arquivo LEME agora
+YesRadio=&Si, quero reinicia-lo ordenador agora
+NoRadio=&Non, reiniciarei o ordenador logo
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Executar %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Ver %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=O Instalador Precisa o Disco Seguinte
+SelectDiskLabel2=Por favor, inserta o Disco %1 e preme Aceptar.%n%nSe os arquivos deste disco se poden atopar noutro cartafol diferente \xF3 amosado a continuaci\xF3n, introduce a ruta correcta ou preme Explorar.
+PathLabel=&Ruta:
+FileNotInDir2=Non se puido atopa-lo arquivo "%1" en "%2". Por favor, inserta o disco correcto ou escolle outro cartafol.
+SelectDirectoryLabel=Por favor, indica onde se atopa o disco seguinte.
+
+; *** Installation phase messages
+SetupAborted=A Instalaci\xF3n non foi completada.%n%nPor favor, corrixe o problema e executa o Instalador de novo.
+EntryAbortRetryIgnore=Preme Reintentar para volta-lo tentar, Ignorar para continuar de t\xF3dolos xeitos, ou Abortar para cancela-la instalaci\xF3n.
+
+; *** Installation status messages
+StatusCreateDirs=Creando directorios...
+StatusExtractFiles=Extraendo arquivos...
+StatusCreateIcons=Creando iconas do programa...
+StatusCreateIniEntries=Creando entradas de arquivo INI...
+StatusCreateRegistryEntries=Creando entradas de rexistro...
+StatusRegisterFiles=Rexistrando arquivos...
+StatusSavingUninstall=Gardando informaci\xF3n de desinstalaci\xF3n...
+StatusRunProgram=Rematando instalaci\xF3n...
+StatusRollback=Desfacendo trocos...
+
+; *** Misc. errors
+ErrorInternal2=Erro Interno: %1
+ErrorFunctionFailedNoCode=%1 fallou
+ErrorFunctionFailed=%1 fallou; c\xF3digo %2
+ErrorFunctionFailedWithMessage=%1 fallou; c\xF3digo %2.%n%3
+ErrorExecutingProgram=Non se pode executa-lo arquivo:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Erro \xF3 abri-la chave de rexistro:%n%1\%2
+ErrorRegCreateKey=Erro \xF3 crea-la chave de rexistro:%n%1\%2
+ErrorRegWriteKey=Erro \xF3 escribi-la chave de rexistro:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Erro \xF3 crea-la entrada INI no arquivo "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Preme Reintentar para tentalo de novo, Ignorar para saltar este arquivo (non recomendado), ou Abortar para cancela-la instalaci\xF3n.
+FileAbortRetryIgnore2=Preme Reintentar para tentalo de novo, Ignorar para continuar de t\xF3dolos xeitos (non recomendado), ou Abortar para cancela-la instalaci\xF3n.
+SourceIsCorrupted=O arquivo de orixe est\xE1 corrupto
+SourceDoesntExist=O arquivo de orixe "%1" non existe
+ExistingFileReadOnly=O arquivo existente \xE9 s\xF3 de lectura.%n%nPreme Reintentar para tira-lo atributo de s\xF3 lectura e tentalo de novo, Ignorar para saltar este arquivo, ou Abortar para cancela-la instalaci\xF3n.
+ErrorReadingExistingDest=Houbo un erro \xF3 tentar le-lo arquivo:
+FileExists=O arquivo xa existe.%n%nQueres sobreescribilo?
+ExistingFileNewer=O arquivo existente \xE9 m\xE1is novo que o que est\xE1s tentando instalar. Recom\xE9ndase que conserves o arquivo existente.%n%nQueres mante-lo arquivo existente?
+ErrorChangingAttr=Houbo un erro o tentar de muda-los atributos do arquivo:
+ErrorCreatingTemp=Houbo un erro o tentar crea-lo arquivo no directorio de desti\xF1o:
+ErrorReadingSource=Houbo un erro o tentar le-lo arquivo de orixe:
+ErrorCopying=Houbo un erro o tentar copia-lo arquivo:
+ErrorReplacingExistingFile=Houbo un erro o tentar de reemplaza-lo arquivo:
+ErrorRestartReplace=Reemplazar fallou:
+ErrorRenamingTemp=Houbo un erro o tentar renomea-lo arquivo no directorio de desti\xF1o:
+ErrorRegisterServer=Non se puido rexistra-lo DLL/OCX: %1
+ErrorRegSvr32Failed=O RegSvr32 fallou indicando este c\xF3digo de sa\xEDda: %1
+ErrorRegisterTypeLib=Non se puido rexistra-la librar\xEDa de tipo: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Houbo un erro o tentar abri-lo arquivo LEME.
+ErrorRestartingComputer=O Instalador non puido reinicia-lo ordenador. Por favor, faino manualmente.
+
+; *** Uninstaller messages
+UninstallNotFound=O arquivo "%1" non existe. Non se pode desinstalar.
+UninstallOpenError=O arquivo "%1" non se puido abrir. Non se pode desinstalar
+UninstallUnsupportedVer=O arquivo de desinstalaci\xF3n "%1" est\xE1 nun formato non reco\xF1ecible por esta versi\xF3n no desinstalador. Non se pode desinstalar
+UninstallUnknownEntry=Atopouse unha entrada desco\xF1ecida (%1) no arquivo de desinstalaci\xF3n
+ConfirmUninstall=Seguro que queres desinstalar completamente %1 e t\xF3dolos seus compo\xF1entes?
+UninstallOnlyOnWin64=Esta instalaci\xF3n s\xF3 pode desinstalarse nun Windows de 64 bits.
+OnlyAdminCanUninstall=Esta instalaci\xF3n s\xF3 a pode desinstalar un usuario con privilexios de administrador.
+UninstallStatusLabel=Por favor, agarda mentres se elimina %1 do teu ordenador.
+UninstalledAll=%1 foi correctamente desinstalado do teu ordenador.
+UninstalledMost=Desinstalaci\xF3n de %1 completa.%n%nAlg\xFAns elementos non puideron ser eliminados. Ter\xE1s que borralos manualmente.
+UninstalledAndNeedsRestart=Para completa-la desinstalaci\xF3n de %1, ter\xE1s que reinicia-lo teu ordenador.%n%nQueres reinicia-lo agora?
+UninstallDataCorrupted=O arquivo "%1" est\xE1 corrupto. Non se pode desinstalar
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=Queres elimina-lo arquivo compartido?
+ConfirmDeleteSharedFile2=O sistema indica que o seguinte arquivo compartido xa non se usa por parte de ning\xFAn programa. Queres que o desinstalador elimine este arquivo compartido?%n%nSe alg\xFAn programa necesita este arquivo e o eliminas, eses programas poden non funcionar correctamente. Se non est\xE1s seguro escolle Non. Deixa-lo arquivo no teu sistema non causar\xE1 problemas.
+SharedFileNameLabel=Nome do arquivo:
+SharedFileLocationLabel=Localizaci\xF3n:
+WizardUninstalling=Estado da Desinstalaci\xF3n
+StatusUninstalling=Desinstalando %1...
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 versi\xF3n %2
+AdditionalIcons=Iconas adicionais
+OptionalFeatures=Optional Features::
+CreateDesktopIcon=Crear unha icona no &escritorio
+CreateQuickLaunchIcon=Crear unha icona no Inicio &R\xE1pido
+ProgramOnTheWeb=%1 na Web
+UninstallProgram=Desinstalar %1
+LaunchProgram=Iniciar %1
+AssocFileExtension=&Asociar %1 coa extensi\xF3n de arquivo %2
+AssocingFileExtension=Asociando %1 coa extensi\xF3n de arquivo %2...
+
+;Things we can also localize
+CompanyName=Thingamahoochie Software
+
+;Types
+TypicalInstallation=Typical Installation
+FullInstallation=Full Installation
+CompactInstallation=Compact Installation
+CustomInstallation=Custom Installation
+
+;Components
+AppCoreFiles=WinMerge Core Files
+Filters=Filters
+Plugins=Plugins
+
+;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
+
+;Tasks
+ExplorerContextMenu=&Enable Explorer context menu integration
+IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
+
+;Icon Labels
+ReadMe=Read Me
+UsersGuide=User's Guide
+ViewStartMenuFolder=&View the WinMerge Start Menu Folder
+
+;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?
+
+; Project file description
+ProjectFileDesc=WinMerge Project file


Property changes on: branches/R2_10/Installer/InnoSetup/Languages/Galician.isl
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Modified: branches/R2_10/Installer/InnoSetup/Languages/German.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/German.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/German.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -335,6 +335,7 @@
 DanishLanguage=D\xE4nische Men\xFCs und Dialoge
 DutchLanguage=Holl\xE4ndische Men\xFCs und Dialoge
 FrenchLanguage=Franz\xF6sische Men\xFCs und Dialoge
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Deutsche Men\xFCs und Dialoge
 GreekLanguage=Griechische Men\xFCs und Dialoge
 HungarianLanguage=Ungarische Men\xFCs und Dialoge

Modified: branches/R2_10/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Greek.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Greek.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -346,6 +346,7 @@
 DanishLanguage=\xC4\xE1\xED\xDD\xE6\xE9\xEA\xE1 \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 DutchLanguage=\xCF\xEB\xEB\xE1\xED\xE4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 FrenchLanguage=\xC3\xE1\xEB\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=\xC3\xE5\xF1\xEC\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=\xCF\xF5\xE3\xE3\xF1\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9

Modified: branches/R2_10/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Hungarian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Hungarian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -365,6 +365,7 @@
 DanishLanguage=D\xE1n men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 DutchLanguage=Holland men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 FrenchLanguage=Francia men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=N\xE9met men\xFCk \xE9s p\xE1rbesz\xE9dablakok
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Magyar men\xFCk \xE9s p\xE1rbesz\xE9dablakok

Modified: branches/R2_10/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Italian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Italian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -349,6 +349,7 @@
 DanishLanguage=Menu e finestre di dialogo in danese
 DutchLanguage=Menu e finestre di dialogo in olandese
 FrenchLanguage=Menu e finestre di dialogo in francese
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Menu e finestre di dialogo in tedesco
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Menu e finestre di dialogo in ungherese

Modified: branches/R2_10/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Japanese.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Japanese.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -338,6 +338,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Korean.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Korean.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -350,6 +350,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Norwegian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Norwegian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -342,6 +342,7 @@
 DanishLanguage=Danske menyer og dialoger
 DutchLanguage=Nederlandske menyer og dialoger
 FrenchLanguage=Franske menyer og dialoger
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Tyske menyer og dialoger
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Ungarske menyer og dialoger

Modified: branches/R2_10/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Polish.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Polish.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -335,6 +335,7 @@
 DanishLanguage=Dunski interfejs
 DutchLanguage=Holenderski interfejs
 FrenchLanguage=Francuski interfejs
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Niemiecki interfejs
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Wegierski interfejs

Modified: branches/R2_10/Installer/InnoSetup/Languages/Portuguese.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Portuguese.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Portuguese.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -327,6 +327,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Romanian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Romanian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Romanian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -346,6 +346,7 @@
 DanishLanguage=Meniuri si dialoguri \xEEn Daneza
 DutchLanguage=Meniuri si dialoguri \xEEn Olandeza
 FrenchLanguage=Meniuri si dialoguri \xEEn Franceza
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Meniuri si dialoguri \xEEn Germana
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Meniuri si dialoguri \xEEn Maghiara

Modified: branches/R2_10/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Russian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Russian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -333,6 +333,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Slovak.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Slovak.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -274,6 +274,7 @@
 DanishLanguage=D\xE1nske ponuky a dial\xF3gy
 DutchLanguage=Holandsk\xE9 ponuky a dial\xF3gy
 FrenchLanguage=Franc\xFAzske ponuky a dial\xF3gy
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Nemeck\xE9 ponuky a dial\xF3gy
 GreekLanguage=Greek menus and dialogs
 HungarianLanguage=Ma\xEFarsk\xE9 ponuky a dial\xF3gy

Modified: branches/R2_10/Installer/InnoSetup/Languages/Slovenian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Slovenian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Slovenian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -333,6 +333,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Spanish.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Spanish.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -342,6 +342,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -336,6 +336,7 @@
 DanishLanguage=Danska menyer och dialoger
 DutchLanguage=Nederl\xE4ndska menyer och dialoger
 FrenchLanguage=Franska menyer och dialoger
+GalicianLanguage=Galician menus and dialogs
 GermanLanguage=Tyska menyer och dialoger
 GreekLanguage=Grekiska menyer och dialoger
 HungarianLanguage=Ungerska menyer och dialoger

Modified: branches/R2_10/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Turkish.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Turkish.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -338,6 +338,7 @@
 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

Modified: branches/R2_10/Installer/InnoSetup/Languages/Ukrainian.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Ukrainian.isl	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/Languages/Ukrainian.isl	2008-10-06 19:31:59 UTC (rev 6000)
@@ -342,6 +342,7 @@
    DanishLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xE4\xE0\xF2\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
    DutchLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xE3\xEE\xEB\xEB\xE0\xED\xE4\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
    FrenchLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF4\xF0\xE0\xED\xF6\xF3\xE7\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
+   GalicianLanguage=Galician menus and dialogs
    GermanLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xED\xB3\xEC\xE5\xF6\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
    GreekLanguage=Greek menus and dialogs
    HungarianLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xE1\xEE\xEB\xE3\xE0\xF0\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE

Modified: branches/R2_10/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-10-05 20:43:14 UTC (rev 5999)
+++ branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-10-06 19:31:59 UTC (rev 6000)
@@ -124,6 +124,7 @@
 Name: Danish; MessagesFile: Languages\Danish.isl
 Name: Dutch; MessagesFile: Languages\Dutch.isl
 Name: French; MessagesFile: Languages\French.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-French.txt
+Name: Galician; MessagesFile: Languages\Galician.isl
 Name: German; MessagesFile: Languages\German.isl
 Name: Greek; MessagesFile: Languages\Greek.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Greek.txt
 Name: Hungarian; MessagesFile: Languages\Hungarian.isl
@@ -194,6 +195,9 @@
 Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not French
 Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: French
 
+Name: Languages\Galician; Description: {cm:GalicianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Galician
+Name: Languages\Galician; Description: {cm:GalicianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Galician
+
 Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not German
 Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: German
 
@@ -385,6 +389,7 @@
 Source: ..\..\Src\Languages\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp
 Source: ..\..\Docs\Users\Languages\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French
+Source: ..\..\Src\Languages\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp
 Source: ..\..\Docs\Users\Languages\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek

Copied: branches/R2_10/Src/Languages/Galician.po (from rev 5997, trunk/Src/Languages/Galician.po)
===================================================================
--- branches/R2_10/Src/Languages/Galician.po	                        (rev 0)
+++ branches/R2_10/Src/Languages/Galician.po	2008-10-06 19:31:59 UTC (rev 6000)
@@ -0,0 +1,6503 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Medulio <medulio@..."
+"Language-Team: Galician-CiberIrmandade <traducions@..."
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Galician\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+"X-Generator: CreateMasterPotFile.vbs\n"
+"X-Poedit-Country: Galiza\n"
+
+#. LANGUAGE, SUBLANGUAGE
+#: Merge.rc:22
+#: Merge.rc:51
+#, c-format
+msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
+msgstr "LANG_GALICIAN, SUBLANG_DEFAULT"
+
+#. Codepage
+#: Merge.rc:23
+#: Merge.rc:52
+#, c-format
+msgid "1252"
+msgstr "1252"
+
+#: Merge.rc:72
+#: Merge.rc:99
+#, c-format
+msgid "C&opy to Right"
+msgstr "C&opiar para a dereita"
+
+#: Merge.rc:73
+#: Merge.rc:100
+#, c-format
+msgid "Cop&y to Left"
+msgstr "Cop&iar para a esquerda"
+
+#: Merge.rc:75
+#, c-format
+msgid "&Select Line Difference"
+msgstr "&Seleccionar diferenzas de li\xF1a"
+
+#: Merge.rc:77
+#, c-format
+msgid "&Undo"
+msgstr "&Desfacer"
+
+#: Merge.rc:78
+#, c-format
+msgid "&Redo"
+msgstr "&Refacer"
+
+#: Merge.rc:80
+#: Merge.rc:102
+#, c-format
+msgid "Cu&t"
+msgstr "Cor&tar"
+
+#: Merge.rc:81
+#: Merge.rc:103
+#: Merge.rc:504
+#, c-format
+msgid "&Copy"
+msgstr "&Copiar"
+
+#: Merge.rc:82
+#: Merge.rc:104
+#, c-format
+msgid "&Paste"
+msgstr "&Colar"
+
+#: Merge.rc:84
+#: Merge.rc:585
+#, c-format
+msgid "&Goto..."
+msgstr "&Ir a..."
+
+#: Merge.rc:86
+#, c-format
+msgid "Op&en"
+msgstr "&Abrir"
+
+#: Merge.rc:88
+#: Merge.rc:527
+#: Merge.rc:533
+#, c-format
+msgid "with &Registered Application"
+msgstr "coa Aplicaci\xF3n &Rexistrada"
+
+#: Merge.rc:89
+#: Merge.rc:528
+#: Merge.rc:534
+#, c-format
+msgid "with &External Editor"
+msgstr "cun editor externo"
+
+#: Merge.rc:90
+#: Merge.rc:529
+#: Merge.rc:535
+#, c-format
+msgid "&with..."
+msgstr "&con..."
+
+#: Merge.rc:110
+#: Merge.rc:191
+#: Merge.rc:308
+#, c-format
+msgid "&File"
+msgstr "&Arquivo"
+
+#: Merge.rc:112
+#: Merge.rc:193
+#: Merge.rc:310
+#, c-format
+msgid "&New\tCtrl+N"
+msgstr "&Novo\tCtrl+N"
+
+#: Merge.rc:113
+#: Merge.rc:194
+#: Merge.rc:311
+#, c-format
+msgid "&Open...\tCtrl+O"
+msgstr "&Abrir...\tCtrl+O"
+
+#: Merge.rc:114
+#: Merge.rc:195
+#: Merge.rc:312
+#, c-format
+msgid "Op&en Conflict File..."
+msgstr "Abrir Arquivo de C&onflito..."
+
+#: Merge.rc:116
+#: Merge.rc:197
+#: Merge.rc:314
+#, c-format
+msgid "Open Pro&ject...\tCtrl+J"
+msgstr "Abrir Pro&xecto...\tCtrl+J"
+
+#: Merge.rc:117
+#: Merge.rc:198
+#: Merge.rc:315
+#, c-format
+msgid "Sa&ve Project..."
+msgstr "Gar&dar proxecto..."
+
+#: Merge.rc:119
+#, c-format
+msgid "Recent Projects"
+msgstr "Proxectos recentes"
+
+#: Merge.rc:121
+#: Merge.rc:205
+#: Merge.rc:347
+#, c-format
+msgid "E&xit"
+msgstr "Sa\xEDr"
+
+#: Merge.rc:123
+#: Merge.rc:207
+#: Merge.rc:349
+#, c-format
+msgid "&Edit"
+msgstr "&Editar"
+
+#: Merge.rc:125
+#: Merge.rc:211
+#: Merge.rc:383
+#, c-format
+msgid "&Options..."
+msgstr "&Opci\xF3ns..."
+
+#: Merge.rc:127
+#: Merge.rc:213
+#: Merge.rc:385
+#, c-format
+msgid "&View"
+msgstr "&Ver"
+
+#: Merge.rc:129
+#: Merge.rc:224
+#: Merge.rc:387
+#, c-format
+msgid "Select &Font..."
+msgstr "Escoller &fonte..."
+
+#: Merge.rc:130
+#: Merge.rc:225
+#: Merge.rc:388
+#, c-format
+msgid "Use Default F&ont"
+msgstr "Empregar fonte pr&edefinida"
+
+#: Merge.rc:132
+#: Merge.rc:227
+#: Merge.rc:409
+#, c-format
+msgid "&Toolbar"
+msgstr "&Barra de ferramentas"
+
+#: Merge.rc:134
+#: Merge.rc:229
+#: Merge.rc:411
+#, c-format
+msgid "&None"
+msgstr "&Ning\xFAn"
+
+#: Merge.rc:135
+#: Merge.rc:230
+#: Merge.rc:412
+#, c-format
+msgid "&Small"
+msgstr "&Pequeno"
+
+#: Merge.rc:136
+#: Merge.rc:231
+#: Merge.rc:413
+#, c-format
+msgid "&Big"
+msgstr "&Grande"
+
+#: Merge.rc:138
+#: Merge.rc:233
+#: Merge.rc:415
+#, c-format
+msgid "&Status Bar"
+msgstr "&Barra de estado"
+
+#: Merge.rc:139
+#: Merge.rc:234
+#: Merge.rc:416
+#, c-format
+msgid "Ta&b Bar"
+msgstr "&Barra de pestanas"
+
+#: Merge.rc:141
+#: Merge.rc:237
+#: Merge.rc:420
+#, c-format
+msgid "&Language..."
+msgstr "&Idioma..."
+
+#: Merge.rc:143
+#: Merge.rc:258
+#: Merge.rc:442
+#, c-format
+msgid "&Tools"
+msgstr "&Ferramentas"
+
+#: Merge.rc:145
+#: Merge.rc:261
+#: Merge.rc:444
+#, c-format
+msgid "&Filters..."
+msgstr "&Filtros..."
+
+#: Merge.rc:146
+#: Merge.rc:262
+#: Merge.rc:445
+#, c-format
+msgid "&Generate Patch..."
+msgstr "&Xerar Patch..."
+
+#: Merge.rc:148
+#: Merge.rc:265
+#: Merge.rc:448
+#, c-format
+msgid "&Plugins"
+msgstr "&Plugins"
+
+#: Merge.rc:150
+#: Merge.rc:267
+#: Merge.rc:450
+#, c-format
+msgid "&List..."
+msgstr "&Listaxe..."
+
+#: Merge.rc:152
+#: Merge.rc:269
+#: Merge.rc:452
+#, c-format
+msgid "&Manual Unpacking"
+msgstr "&Desempaquetado manual"
+
+#: Merge.rc:153
+#: Merge.rc:270
+#: Merge.rc:453
+#, c-format
+msgid "&Automatic Unpacking"
+msgstr "&Desempaquetado autom\xE1tico"
+
+#: Merge.rc:155
+#: Merge.rc:272
+#: Merge.rc:455
+#, c-format
+msgid "&Edit with Unpacker"
+msgstr "&Editar co desempaquetador"
+
+#: Merge.rc:157
+#: Merge.rc:274
+#: Merge.rc:462
+#, c-format
+msgid "&Reload plugins"
+msgstr "&Recargar plugins"
+
+#: Merge.rc:159
+#: Merge.rc:276
+#: Merge.rc:464
+#, c-format
+msgid "&Debug"
+msgstr "&Depurar"
+
+#: Merge.rc:161
+#: Merge.rc:278
+#: Merge.rc:466
+#, c-format
+msgid "&Load Config..."
+msgstr "&Cargar configuraci\xF3n..."
+
+#: Merge.rc:162
+#: Merge.rc:279
+#: Merge.rc:467
+#, c-format
+msgid "&Reset Options"
+msgstr "&Restaurar opci\xF3ns"
+
+#: Merge.rc:164
+#: Merge.rc:281
+#: Merge.rc:469
+#, c-format
+msgid "&Window"
+msgstr "&Fiestra"
+
+#: Merge.rc:166
+#: Merge.rc:283
+#: Merge.rc:471
+#, c-format
+msgid "Cl&ose"
+msgstr "Pe&char"
+
+#: Merge.rc:167
+#: Merge.rc:284
+#: Merge.rc:472
+#, c-format
+msgid "Clo&se All"
+msgstr "Pe&char todo"
+
+#: Merge.rc:169
+#: Merge.rc:286
+#: Merge.rc:474
+#, c-format
+msgid "Change &Pane\tF6"
+msgstr "Trocar o &panel\tF6"
+
+#: Merge.rc:171
+#: Merge.rc:288
+#: Merge.rc:476
+#, c-format
+msgid "Tile &Horizontally"
+msgstr "Ordenar &horizontalmente"
+
+#: Merge.rc:172
+#: Merge.rc:289
+#: Merge.rc:477
+#, c-format
+msgid "Tile &Vertically"
+msgstr "Ordenar &verticalmente"
+
+#: Merge.rc:173
+#: Merge.rc:290
+#: Merge.rc:478
+#, c-format
+msgid "&Cascade"
+msgstr "&En fervenza"
+
+#: Merge.rc:175
+#: Merge.rc:292
+#: Merge.rc:480
+#: Merge.rc:1913
+#, c-format
+msgid "&Help"
+msgstr "&Axuda"
+
+#: Merge.rc:177
+#: Merge.rc:294
+#: Merge.rc:482
+#, c-format
+msgid "&WinMerge Help\tF1"
+msgstr "Axuda do &WinMerge\tF1"
+
+#: Merge.rc:179
+#: Merge.rc:296
+#: Merge.rc:484
+#, c-format
+msgid "R&elease Notes"
+msgstr "Notas da v&ersi\xF3n"
+
+#: Merge.rc:180
+#: Merge.rc:297
+#: Merge.rc:485
+#, c-format
+msgid "&Translations"
+msgstr "&Traduci\xF3ns"
+
+#: Merge.rc:181
+#: Merge.rc:298
+#: Merge.rc:486
+#, c-format
+msgid "C&onfiguration"
+msgstr "C&onfiguraci\xF3n..."
+
+#: Merge.rc:182
+#: Merge.rc:299
+#: Merge.rc:487
+#, c-format
+msgid "A&rchive Support disabled..."
+msgstr "S&oporte de arquivos desactivado..."
+
+#: Merge.rc:184
+#: Merge.rc:301
+#: Merge.rc:489
+#, c-format
+msgid "&GNU General Public License"
+msgstr "Licenza P\xFAblica Xeral &GNU..."
+
+#: Merge.rc:185
+#: Merge.rc:302
+#: Merge.rc:490
+#, c-format
+msgid "&About WinMerge..."
+msgstr "&Acerca de WinMerge..."
+
+#: Merge.rc:200
+#: Merge.rc:333
+#, c-format
+msgid "L&eft Read-only"
+msgstr "Banda esquerda s\xF3 lectura"
+
+#: Merge.rc:201
+#: Merge.rc:334
+#, c-format
+msgid "Ri&ght Read-only"
+msgstr "Banda dereita s\xF3 lectura"
+
+#: Merge.rc:203
+#, c-format
+msgid "File En&coding"
+msgstr "A &codificar arquivo"
+
+#: Merge.rc:209
+#: Merge.rc:359
+#, c-format
+msgid "Select &All\tCtrl+A"
+msgstr "Seleccion&ar todo\tCtrl+A"
+
+#: Merge.rc:215
+#, c-format
+msgid "Show &Identical Items"
+msgstr "Amosar os elementos &id\xE9nticos"
+
+#: Merge.rc:216
+#, c-format
+msgid "Show &Different Items"
+msgstr "Amosar os elementos &diferentes"
+
+#: Merge.rc:217
+#, c-format
+msgid "Show L&eft Unique Items"
+msgstr "Amosar os &elementos \xFAnicos da esquerda"
+
+#: Merge.rc:218
+#, c-format
+msgid "Show Ri&ght Unique Items"
+msgstr "Amosar elementos \xFAnicos da dereita"
+
+#: Merge.rc:219
+#, c-format
+msgid "Show S&kipped Items"
+msgstr "Amosar os elementos saltados"
+
+#: Merge.rc:220
+#, c-format
+msgid "S&how Binary Files"
+msgstr "Amosar os arq&uivos binarios"
+
+#: Merge.rc:222
+#, c-format
+msgid "Show Hidd&en Items"
+msgstr "Amosar os elementos ocu&ltos"
+
+#: Merge.rc:235
+#, c-format
+msgid "Compa&re Statistics"
+msgstr "Estad\xEDstic&as da comparaci\xF3n"
+
+#: Merge.rc:239
+#: Merge.rc:422
+#, c-format
+msgid "Refre&sh\tF5"
+msgstr "Refre&scar\tF5"
+
+#: Merge.rc:240
+#, c-format
+msgid "&Refresh Selected\tCtrl+F5"
+msgstr "&Refrescar seleccionados\tCtrl+F5"
+
+#: Merge.rc:242
+#: Merge.rc:424
+#, c-format
+msgid "&Merge"
+msgstr "&Combinar"
+
+#: Merge.rc:244
+#, c-format
+msgid "Co&mpare\tEnter"
+msgstr "Co&mparar\tIntro"
+
+#: Merge.rc:246
+#: Merge.rc:426
+#, c-format
+msgid "&Next Difference\tAlt+Down"
+msgstr "Segui&nte diferenza\tAlt+Down"
+
+#: Merge.rc:247
+#: Merge.rc:427
+#, c-format
+msgid "&Previous Difference\tAlt+Up"
+msgstr "Diferenza &previa\tAlt+Up"
+
+#: Merge.rc:249
+#: Merge.rc:429
+#, c-format
+msgid "&First Difference\tAlt+Home"
+msgstr "&Primeira diferenza\tAlt+Home"
+
+#: Merge.rc:250
+#: Merge.rc:430
+#, c-format
+msgid "&Current Difference\tAlt+Enter"
+msgstr "Diferenza a&ctual\tAlt+Intro"
+
+#: Merge.rc:251
+#: Merge.rc:431
+#, c-format
+msgid "&Last Difference\tAlt+End"
+msgstr "&Derradeira diferenza\tAlt+End"
+
+#: Merge.rc:253
+#: Merge.rc:433
+#, c-format
+msgid "Copy to &Right\tAlt+Right"
+msgstr "Copia&r para a dereita\tAlt+Dereita"
+
+#: Merge.rc:254
+#: Merge.rc:434
+#, c-format
+msgid "Copy to L&eft\tAlt+Left"
+msgstr "Copiar para a &esquerda\tAlt+Esquerda"
+
+#: Merge.rc:256
+#, c-format
+msgid "&Delete\tDel"
+msgstr "&Borrar\tDel"
+
+#: Merge.rc:260
+#: Merge.rc:558
+#, c-format
+msgid "&Customize Columns..."
+msgstr "Personalizar &columnas..."
+
+#: Merge.rc:263
+#: Merge.rc:446
+#, c-format
+msgid "Generate &Report..."
+msgstr "Xera&r informe..."
+
+#: Merge.rc:317
+#, c-format
+msgid "&Save\tCtrl+S"
+msgstr "&Gardar\tCtrl+S"
+
+#: Merge.rc:318
+#, c-format
+msgid "Save &Left"
+msgstr "Gardar banda esquerda"
+
+#: Merge.rc:320
+#: Merge.rc:325
+#, c-format
+msgid "&Save"
+msgstr "&Gardar"
+
+#: Merge.rc:321
+#: Merge.rc:326
+#, c-format
+msgid "Save &As..."
+msgstr "Gard&ar como..."
+
+#: Merge.rc:323
+#, c-format
+msgid "Save &Right"
+msgstr "Gardar banda &dereita"
+
+#: Merge.rc:329
+#, c-format
+msgid "&Print..."
+msgstr "&Imprimir..."
+
+#: Merge.rc:330
+#, c-format
+msgid "Page Se&tup"
+msgstr "Con&figuraci\xF3n da p\xE1xina"
+
+#: Merge.rc:331
+#, c-format
+msgid "Print Previe&w"
+msgstr "Vista previa da impresi\xF3n"
+
+#: Merge.rc:336
+#, c-format
+msgid "&Convert Line Endings to"
+msgstr "&Converter quebras de li\xF1a a"
+
+#: Merge.rc:338
+#, c-format
+msgid "&Windows (CRLF)"
+msgstr "&Windows (CRLF)"
+
+#: Merge.rc:339
+#, c-format
+msgid "&Unix (LF)"
+msgstr "&Unix (LF)"
+
+#: Merge.rc:340
+#, c-format
+msgid "&Mac (CR)"
+msgstr "&Mac (CR)"
+
+#: Merge.rc:343
+#, c-format
+msgid "&Merge Mode\tF9"
+msgstr "&Modo Combinar\tF9"
+
+#: Merge.rc:345
+#, c-format
+msgid "&File Encoding..."
+msgstr "Codificaci\xF3n do ar&quivo"
+
+#: Merge.rc:351
+#, c-format
+msgid "&Undo\tCtrl+Z"
+msgstr "&Desfacer\tCtrl+Z"
+
+#: Merge.rc:352
+#, c-format
+msgid "&Redo\tCtrl+Y"
+msgstr "&Refacer\tCtrl+Y"
+
+#: Merge.rc:354
+#, c-format
+msgid "Cu&t\tCtrl+X"
+msgstr "Cor&tar\tCtrl+X"
+
+#: Merge.rc:355
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "&Copiar\tCtrl+C"
+
+#: Merge.rc:356
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Colar\tCtrl+V"
+
+#: Merge.rc:358
+#, c-format
+msgid "Select Line &Difference\tF4"
+msgstr "Seleccionar &diferenzas de li\xF1a\tF4"
+
+#: Merge.rc:361
+#, c-format
+msgid "F&ind...\tCtrl+F"
+msgstr "B&uscar...\tCtrl+F"
+
+#: Merge.rc:362
+#, c-format
+msgid "Repla&ce...\tCtrl+H"
+msgstr "Substitu\xED&r...\tCtrl+H"
+
+#: Merge.rc:364
+#, c-format
+msgid "&Scripts"
+msgstr "&Scripts"
+
+#: Merge.rc:366
+#: Merge.rc:2752
+#, c-format
+msgid "< Empty >"
+msgstr "< Baleiro >"
+
+#: Merge.rc:369
+#, c-format
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: Merge.rc:371
+#, c-format
+msgid "&Copy With Line Numbers\tCtrl+Shift+C"
+msgstr "&Copiar cos n\xFAmeros de li\xF1a\tCtrl+Shift+C"
+
+#: Merge.rc:374
+#, c-format
+msgid "&Bookmarks"
+msgstr "&Marcadores"
+
+#: Merge.rc:376
+#, c-format
+msgid "&Toggle Bookmark\tCtrl+F2"
+msgstr "&Cambiar marcador\tCtrl+F2"
+
+#: Merge.rc:377
+#, c-format
+msgid "&Next Bookmark\tF2"
+msgstr "&Seguinte marcador\tF2"
+
+#: Merge.rc:378
+#, c-format
+msgid "&Previous bookmark\tShift+F2"
+msgstr "&Marcador anterior\tShift+F2"
+
+#: Merge.rc:379
+#, c-format
+msgid "&Clear All Bookmarks"
+msgstr "&Borrar todos os marcadores"
+
+#: Merge.rc:381
+#, c-format
+msgid "&Go To...\tCtrl+G"
+msgstr "&Ir a...\tCtrl+G"
+
+#: Merge.rc:389
+#, c-format
+msgid "&Zoom"
+msgstr "&Zoom"
+
+#: Merge.rc:391
+#, c-format
+msgid "Zoom &In\tCtrl++"
+msgstr "&Aumentar\tCtrl++"
+
+#: Merge.rc:392
+#, c-format
+msgid "Zoom &Out\tCtrl+-"
+msgstr "&Reducir\tCtrl+-"
+
+#. Zoom to normal
+#: Merge.rc:393
+#, c-format
+msgid "&Normal\tCtrl+*"
+msgstr "&Normal\tCtrl+*"
+
+#: Merge.rc:395
+#, c-format
+msgid "Syntax Highlight"
+msgstr "Resaltar sintaxe"
+
+#: Merge.rc:400
+#, c-format
+msgid "&Lock Panes"
+msgstr "B&loquear Paneis"
+
+#: Merge.rc:401
+#, c-format
+msgid "&View Whitespace"
+msgstr "&Ver espazos en branco"
+
+#: Merge.rc:402
+#, c-format
+msgid "Vie&w Line Differences"
+msgstr "Ve&r diferenzas de li\xF1a"
+
+#: Merge.rc:403
+#, c-format
+msgid "View Line &Numbers"
+msgstr "Ver os n\xFAmeros de li\xF1a"
+
+#: Merge.rc:404
+#, c-format
+msgid "View &Margins"
+msgstr "Ver as &marxes"
+
+#: Merge.rc:405
+#, c-format
+msgid "W&rap Lines"
+msgstr "A&xuste de li\xF1as"
+
+#: Merge.rc:407
+#, c-format
+msgid "Sw&ap Panes"
+msgstr "In&tercambiar paneis"
+
+#: Merge.rc:417
+#, c-format
+msgid "Diff &Pane"
+msgstr "Panel de &diferenzas"
+
+#: Merge.rc:418
+#, c-format
+msgid "Lo&cation Pane"
+msgstr "Pane&l de situaci\xF3n"
+
+#: Merge.rc:436
+#, c-format
+msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
+msgstr "C&opiar para a dereita e avanzar\tAlt+Ctrl+Dereita"
+
+#: Merge.rc:437
+#, c-format
+msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
+msgstr "C&opiar para a esquerda e avanzar\tAlt+Ctrl+Esquerda"
+
+#: Merge.rc:439
+#, c-format
+msgid "Copy &All to Right"
+msgstr "Copiar todo &para a dereita"
+
+#: Merge.rc:440
+#, c-format
+msgid "Cop&y All to Left"
+msgstr "Cop&iar todo para a esquerda"
+
+#: Merge.rc:457
+#, c-format
+msgid "&Prediffer"
+msgstr "&Pre-comparaci\xF3n"
+
+#: Merge.rc:498
+#, c-format
+msgid "Comp&are"
+msgstr "Compa&rar"
+
+#: Merge.rc:499
+#, c-format
+msgid "Co&mpare Special"
+msgstr "Co&mparar Especial"
+
+#: Merge.rc:501
+#, c-format
+msgid "&XML"
+msgstr "&XML"
+
+#: Merge.rc:506
+#, c-format
+msgid "&Left to Right"
+msgstr "&Da esquerda para a dereita"
+
+#: Merge.rc:507
+#, c-format
+msgid "L&eft to..."
+msgstr "D&a esquerda para..."
+
+#: Merge.rc:508
+#, c-format
+msgid "&Right to Left"
+msgstr "&Da dereita para a esquerda"
+
+#: Merge.rc:509
+#, c-format
+msgid "R&ight to..."
+msgstr "Da d&ereita para..."
+
+#: Merge.rc:511
+#, c-format
+msgid "&Move"
+msgstr "&Mover"
+
+#: Merge.rc:513
+#, c-format
+msgid "&Left to..."
+msgstr "&Da esquerda para ..."
+
+#: Merge.rc:514
+#, c-format
+msgid "&Right to..."
+msgstr "&Da dereita para..."
+
+#: Merge.rc:516
+#, c-format
+msgid "&Delete"
+msgstr "&Borrar"
+
+#: Merge.rc:518
+#: Merge.rc:1136
+#: Merge.rc:1518
+#, c-format
+msgid "&Left"
+msgstr "&Esquerda"
+
+#: Merge.rc:519
+#: Merge.rc:1138
+#: Merge.rc:1521
+#, c-format
+msgid "&Right"
+msgstr "&Dereita"
+
+#: Merge.rc:520
+#, c-format
+msgid "&Both"
+msgstr "&Ambos"
+
+#: Merge.rc:522
+#, c-format
+msgid "Re&name"
+msgstr "Re&nomear"
+
+#: Merge.rc:523
+#, c-format
+msgid "&Hide Items"
+msgstr "&Agochar elementos"
+
+#: Merge.rc:525
+#, c-format
+msgid "&Open Left"
+msgstr "&Abrir arquivo esquerdo"
+
+#: Merge.rc:531
+#, c-format
+msgid "O&pen Right"
+msgstr "&Abrir arquivo dereito"
+
+#: Merge.rc:538
+#, c-format
+msgid "Cop&y Pathnames"
+msgstr "Cop&iar nomes de cami\xF1o"
+
+#: Merge.rc:540
+#, c-format
+msgid "&Left (%1 of %2)"
+msgstr "&Esquerda (%1 de %2)"
+
+#: Merge.rc:541
+#, c-format
+msgid "&Right (%1 of %2)"
+msgstr "&Dereita (%1 de %2)"
+
+#: Merge.rc:542
+#, c-format
+msgid "&Both (%1 of %2)"
+msgstr "&Ambas (%1 de %2)"
+
+#: Merge.rc:544
+#, c-format
+msgid "Copy &Filenames"
+msgstr "Copiar &nomes dos arquivos"
+
+#: Merge.rc:546
+#, c-format
+msgid "&Zip"
+msgstr "&Zip"
+
+#: Merge.rc:548
+#, c-format
+msgid "&Left... (%1 of %2)"
+msgstr "&Esquerda... (%1 of %2)"
+
+#: Merge.rc:549
+#, c-format
+msgid "&Right... (%1 of %2)"
+msgstr "&Dereita... (%1 of %2)"
+
+#: Merge.rc:550
+#, c-format
+msgid "&Both... (%1 of %2)"
+msgstr "&Ambos... (%1 of %2)"
+
+#: Merge.rc:551
+#, c-format
+msgid "&Differences... (%1 of %2)"
+msgstr "&Diferenzas... (%1 of %2)"
+
+#: Merge.rc:554
+#, c-format
+msgid "&Refresh"
+msgstr "&Actualizar"
+
+#: Merge.rc:566
+#, c-format
+msgid "&Copy Full Path"
+msgstr "&Copiar o cami\xF1o completo"
+
+#: Merge.rc:567
+#, c-format
+msgid "Copy &Filename"
+msgstr "Copiar o nome do &arquivo"
+
+#: Merge.rc:573
+#, c-format
+msgid "Prediffer Settings"
+msgstr "Configuraci\xF3n da pre-comparaci\xF3n"
+
+#: Merge.rc:575
+#, c-format
+msgid "&No prediffer"
+msgstr "&Sen pre-comparaci\xF3n"
+
+#: Merge.rc:576
+#, c-format
+msgid "Auto prediffer"
+msgstr "Pre-comparaci\xF3n autom."
+
+#: Merge.rc:584
+#, c-format
+msgid "G&oto Diff"
+msgstr "Ir &para a diferenza"
+
+#: Merge.rc:587
+#, c-format
+msgid "&No Moved Blocks"
+msgstr "&Non mostrar bloques movidos"
+
+#: Merge.rc:588
+#, c-format
+msgid "&All Moved Blocks"
+msgstr "&Mostrar todos os bloques movidos"
+
+#: Merge.rc:589
+#, c-format
+msgid "Moved Block for &Current Diff"
+msgstr "Amosar bloques movidos desde a &diferenza actual"
+
+#: Merge.rc:658
+#, c-format
+msgid "About WinMerge"
+msgstr "Acerca de Winmerge"
+
+#: Merge.rc:664
+#, c-format
+msgid "(Private Build)"
+msgstr "(Private Build)"
+
+#: Merge.rc:665
+#, c-format
+msgid "All rights reserved."
+msgstr "Reservados todos os dereitos"
+
+#: Merge.rc:666
+#, c-format
+msgid "Visit the WinMerge HomePage!"
+msgstr "Visita a Web Oficial de WinMerge!"
+
+#: Merge.rc:669
+#: Merge.rc:701
+#: Merge.rc:791
+#: Merge.rc:977
+#: Merge.rc:1055
+#: Merge.rc:1084
+#: Merge.rc:1094
+#: Merge.rc:1260
+#: Merge.rc:1324
+#: Merge.rc:1337
+#: Merge.rc:1429
+#: Merge.rc:1444
+#: Merge.rc:1666
+#, c-format
+msgid "OK"
+msgstr "Aceptar"
+
+#: Merge.rc:670
+#, c-format
+msgid "Contributors"
+msgstr "Colaboradores"
+
+#: Merge.rc:677
+#, c-format
+msgid "Select Files or Folders"
+msgstr "Seleccionar arquivos ou cartafoles"
+
+#: Merge.rc:680
+#: Merge.rc:1595
+#, c-format
+msgid "&Left:"
+msgstr "&Esquerda"
+
+#: Merge.rc:684
+#: Merge.rc:745
+#: Merge.rc:998
+#: Merge.rc:1020
+#, c-format
+msgid "&Browse..."
+msgstr "&Buscar..."
+
+#: Merge.rc:685
+#: Merge.rc:1599
+#, c-format
+msgid "&Right:"
+msgstr "&Dereita"
+
+#: Merge.rc:689
+#: Merge.rc:1031
+#, c-format
+msgid "Bro&wse..."
+msgstr "Bus&car..."
+
+#: Merge.rc:690
+#: Merge.rc:1603
+#, c-format
+msgid "&Filter:"
+msgstr "&Filtro:"
+
+#: Merge.rc:693
+#: Merge.rc:1605
+#, c-format
+msgid "Select..."
+msgstr "Seleccionar..."
+
+#: Merge.rc:694
+#, c-format
+msgid "&Unpacker:"
+msgstr "&Desempaquetador:"
+
+#: Merge.rc:697
+#, c-format
+msgid "&Select..."
+msgstr "&Seleccionar..."
+
+#: Merge.rc:698
+#: Merge.rc:1606
+#, c-format
+msgid "&Include Subfolders"
+msgstr "&Inclu\xEDndo sub-cartafoles"
+
+#: Merge.rc:700
+#, c-format
+msgid "Status:"
+msgstr "Estado:"
+
+#: Merge.rc:702
+#: Merge.rc:732
+#: Merge.rc:792
+#: Merge.rc:822
+#: Merge.rc:854
+#: Merge.rc:864
+#: Merge.rc:1056
+#: Merge.rc:1085
+#: Merge.rc:1095
+#: Merge.rc:1146
+#: Merge.rc:1261
+#: Merge.rc:1338
+#: Merge.rc:1430
+#: Merge.rc:1445
+#: Merge.rc:1667
+#, c-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: Merge.rc:703
+#: Merge.rc:1339
+#, c-format
+msgid "Help"
+msgstr "Axuda"
+
+#: Merge.rc:704
+#, c-format
+msgid "Files or Folders to Compare"
+msgstr "Arquivos ou cartafoles a comparar"
+
+#: Merge.rc:711
+#, c-format
+msgid "Visual SourceSafe"
+msgstr "Visual SourceSafe"
+
+#: Merge.rc:716
+#, c-format
+msgid "Database:"
+msgstr "Base de datos"
+
+#: Merge.rc:719
+#, c-format
+msgid "Project:"
+msgstr "Proxecto:"
+
+#: Merge.rc:722
+#, c-format
+msgid "User:"
+msgstr "Usuario:"
+
+#: Merge.rc:724
+#, c-format
+msgid "Password:"
+msgstr "Se\xF1a:"
+
+#: Merge.rc:726
+#, c-format
+msgid "Link to Destination VSS project"
+msgstr "Ligaz\xF3n ao proxecto VSS de destino"
+
+#: Merge.rc:728
+#: Merge.rc:869
+#, c-format
+msgid "Apply to all items"
+msgstr "Aplicar a t\xF3dos os elementos"
+
+#: Merge.rc:730
+#, c-format
+msgid "Check Out"
+msgstr "Desprotexer"
+
+#: Merge.rc:731
+#: Merge.rc:865
+#, c-format
+msgid "Save As..."
+msgstr "Gardar como..."
+
+#: Merge.rc:737
+#, c-format
+msgid "Versioning System"
+msgstr "Sistema de versionado"
+
+#: Merge.rc:740
+#, c-format
+msgid "&Versioning System:"
+msgstr "&Sistema de versionado:"
+
+#: Merge.rc:743
+#, c-format
+msgid "&Path to cleartool.exe:"
+msgstr "&Cami\xF1o a cleartool.exe:"
+
+#: Merge.rc:750
+#: Merge.rc:1921
+#, c-format
+msgid "General"
+msgstr "Xeral"
+
+#: Merge.rc:753
+#, c-format
+msgid "Automatically &scroll to first difference"
+msgstr "Ir &automaticamente \xE1 primeira diferenza"
+
+#: Merge.rc:756
+#, c-format
+msgid "&Disable Splash Screen"
+msgstr "&Desactivar a pantalla de inicio"
+
+#: Merge.rc:758
+#, c-format
+msgid "Cl&ose windows with ESC"
+msgstr "Pechar as fiestras con ESC"
+
+#: Merge.rc:760
+#, c-format
+msgid "&Automatically verify paths in Open-dialog"
+msgstr "&Verificar automaticamente os cami\xF1os no dialogo Abrir"
+
+#: Merge.rc:763
+#, c-format
+msgid "All&ow only one instance to run"
+msgstr "Per&mitir s\xF3 unha instacia en curso"
+
+#: Merge.rc:765
+#, c-format
+msgid "As&k when closing multiple windows"
+msgstr "Pr&eguntar antes de pechar varias fiestras"
+
+#: Merge.rc:767
+#, c-format
+msgid "&Preserve file time in file compare"
+msgstr "&Preservar data e hora do arquivo nas comparaci\xF3ns de ficheiros"
+
+#: Merge.rc:770
+#, c-format
+msgid "O&pen-dialog Auto-Completion:"
+msgstr "A&uto-completar di\xE1logo de apertura:"
+
+#: Merge.rc:773
+#, c-format
+msgid "Enable multiple compare windows for"
+msgstr "Activar vent\xE1s de comparaci\xF3n m\xFAltiples para"
+
+#: Merge.rc:775
+#: Merge.rc:1618
+#, c-format
+msgid "&Folder compare"
+msgstr "Comparaci\xF3n de carta&foles"
+
+#: Merge.rc:777
+#: Merge.rc:1620
+#, c-format
+msgid "Fil&e compare"
+msgstr "Comparaci\xF3n de arq&uivos"
+
+#: Merge.rc:779
+#, c-format
+msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgstr "WinMerge permite ocultar algunhas caixas de mensaxes de uso frecuente. Preme o bot\xF3n Restaurar para facer visibles todas as mensaxes outra vez."
+
+#: Merge.rc:781
+#, c-format
+msgid "Reset"
+msgstr "Restaurar"
+
+#: Merge.rc:788
+#, c-format
+msgid "Language"
+msgstr "Idioma"
+
+#: Merge.rc:795
+#, c-format
+msgid "Available languages:"
+msgstr "Idiomas dispo\xF1ibles:"
+
+#: Merge.rc:801
+#, c-format
+msgid "Find"
+msgstr "Procurar"
+
+#: Merge.rc:804
+#: Merge.rc:831
+#, c-format
+msgid "Fi&nd what:"
+msgstr "&Procurar:"
+
+#: Merge.rc:807
+#: Merge.rc:837
+#, c-format
+msgid "Match &whole word only"
+msgstr "S\xF3 se coinci&de toda a palabra"
+
+#: Merge.rc:809
+#: Merge.rc:839
+#, c-format
+msgid "Match &case"
+msgstr "&Coincidir mai\xFAsc./min\xFAsc."
+
+#: Merge.rc:811
+#: Merge.rc:841
+#, c-format
+msgid "Regular &expression"
+msgstr "&Expresi\xF3n Regular"
+
+#: Merge.rc:813
+#, c-format
+msgid "D&on't wrap end of file"
+msgstr "N&on sobrepasar o remate do arquivo"
+
+#: Merge.rc:816
+#, c-format
+msgid "Direction"
+msgstr "Direcci\xF3n"
+
+#: Merge.rc:817
+#, c-format
+msgid "&Up"
+msgstr "&Arriba"
+
+#: Merge.rc:819
+#, c-format
+msgid "&Down"
+msgstr "&Abaixo"
+
+#: Merge.rc:821
+#: Merge.rc:851
+#, c-format
+msgid "&Find Next"
+msgstr "&Procurar o seguinte"
+
+#: Merge.rc:828
+#, c-format
+msgid "Replace"
+msgstr "Substitu\xEDr"
+
+#: Merge.rc:834
+#, c-format
+msgid "Re&place with:"
+msgstr "Substitu\xEDr con:"
+
+#: Merge.rc:843
+#, c-format
+msgid "&Don't wrap end of file"
+msgstr "&Non sobrepasar o remate do arquivo"
+
+#: Merge.rc:846
+#, c-format
+msgid "Replace in"
+msgstr "Substitu\xEDr en"
+
+#: Merge.rc:847
+#, c-format
+msgid "&Selection"
+msgstr "&Selecci\xF3n"
+
+#: Merge.rc:849
+#, c-format
+msgid "Wh&ole file"
+msgstr "Ar&quivo completo"
+
+#: Merge.rc:852
+#, c-format
+msgid "&Replace"
+msgstr "&Substitu\xEDr"
+
+#: Merge.rc:853
+#, c-format
+msgid "Replace &All"
+msgstr "Substitu\xEDr &todo"
+
+#: Merge.rc:860
+#: Merge.rc:2164
+#, c-format
+msgid "Rational ClearCase"
+msgstr "Rational ClearCase"
+
+#: Merge.rc:863
+#, c-format
+msgid "CheckOut"
+msgstr "Desprotexer"
+
+#: Merge.rc:868
+#: Merge.rc:1180
+#, c-format
+msgid "Comments"
+msgstr "Comentarios"
+
+#: Merge.rc:871
+#, c-format
+msgid "CheckIn after checkout"
+msgstr "Protexer despois de desprotexer"
+
+#: Merge.rc:877
+#, c-format
+msgid "Linefilters"
+msgstr "Filtros de li\xF1a"
+
+#: Merge.rc:880
+#, c-format
+msgid "Enable Line Filters"
+msgstr "Activar filtros de li\xF1a"
+
+#: Merge.rc:883
+#, c-format
+msgid "Regular Expressions (one per line):"
+msgstr "Expresi\xF3ns Regulares (unha por li\xF1a):"
+
+#: Merge.rc:890
+#, c-format
+msgid "Save"
+msgstr "Gardar"
+
+#: Merge.rc:891
+#, c-format
+msgid "New"
+msgstr "Novo"
+
+#: Merge.rc:892
+#, c-format
+msgid "Edit"
+msgstr "Editar"
+
+#: Merge.rc:893
+#, c-format
+msgid "Remove"
+msgstr "Eliminar"
+
+#: Merge.rc:898
+#: Merge.rc:1924
+#, c-format
+msgid "Colors"
+msgstr "Cores"
+
+#: Merge.rc:901
+#, c-format
+msgid "Difference:"
+msgstr "Diferenza:"
+
+#: Merge.rc:905
+#, c-format
+msgid "Selected Difference:"
+msgstr "Diferenzas seleccionadas:"
+
+#: Merge.rc:909
+#: Merge.rc:1570
+#, c-format
+msgid "Background"
+msgstr "Fondo"
+
+#: Merge.rc:910
+#, c-format
+msgid "Deleted"
+msgstr "Borrado"
+
+#: Merge.rc:923
+#: Merge.rc:1365
+#: Merge.rc:1571
+#, c-format
+msgid "Text"
+msgstr "Texto"
+
+#: Merge.rc:927
+#, c-format
+msgid "Ignored Difference:"
+msgstr "Diferenzas ignoradas:"
+
+#: Merge.rc:937
+#, c-format
+msgid "Moved:"
+msgstr "Movidas:"
+
+#: Merge.rc:947
+#, c-format
+msgid "Selected Moved:"
+msgstr "Seleccionadas movidas:"
+
+#: Merge.rc:954
+#, c-format
+msgid "Word Difference:"
+msgstr "Diferenza de palabras:"
+
+#: Merge.rc:961
+#, c-format
+msgid "Selected Word Diff:"
+msgstr "Dif. de palabras seleccionadas:"
+
+#: Merge.rc:968
+#: Merge.rc:1054
+#: Merge.rc:1083
+#: Merge.rc:1183
+#: Merge.rc:1411
+#, c-format
+msgid "Defaults"
+msgstr "Predeterminados"
+
+#: Merge.rc:974
+#: Merge.rc:1353
+#: Merge.rc:1559
+#, c-format
+msgid "Dialog"
+msgstr "Di\xE1logo"
+
+#: Merge.rc:984
+#: Merge.rc:1927
+#, c-format
+msgid "System"
+msgstr "Sistema"
+
+#: Merge.rc:987
+#, c-format
+msgid "&Send deleted files to Recycle Bin"
+msgstr "&Enviar os arquivos eliminados para a papeleira"
+
+#: Merge.rc:989
+#, c-format
+msgid "Integration"
+msgstr "Integraci\xF3n"
+
+#: Merge.rc:990
+#, c-format
+msgid "&Add to explorer context menu"
+msgstr "&Engadir ao men\xFA contextual do explorador"
+
+#: Merge.rc:992
+#, c-format
+msgid "E&nable advanced menu"
+msgstr "Ac&tivar men\xFA avanzado"
+
+#: Merge.rc:994
+#, c-format
+msgid "In&clude subfolders by default"
+msgstr "In&clu\xEDr sub-cartafoles por defecto"
+
+#: Merge.rc:996
+#, c-format
+msgid "&External editor:"
+msgstr "&Editor externo:"
+
+#: Merge.rc:999
+#, c-format
+msgid "&Filter folder:"
+msgstr "&Cartafol de filtros:"
+
+#: Merge.rc:1001
+#, c-format
+msgid "B&rowse..."
+msgstr "Explo&rar..."
+
+#: Merge.rc:1002
+#, c-format
+msgid "Temporary files folder"
+msgstr "Cartafol de arquivos temporais"
+
+#: Merge.rc:1003
+#, c-format
+msgid "S&ystem's temp folder"
+msgstr "Cartafol temporal do s&istema"
+
+#: Merge.rc:1005
+#, c-format
+msgid "C&ustom folder:"
+msgstr "Ca&rtafol personalizado:"
+
+#: Merge.rc:1008
+#: Merge.rc:1024
+#, c-format
+msgid "Br&owse..."
+msgstr "Pro&curar..."
+
+#: Merge.rc:1014
+#, c-format
+msgid "Patch Generator"
+msgstr "Xerador de Patchs"
+
+#: Merge.rc:1017
+#, c-format
+msgid "File&1:"
+msgstr "Arquivo&1:"
+
+#: Merge.rc:1021
+#, c-format
+msgid "File&2:"
+msgstr "Arquivo&2:"
+
+#: Merge.rc:1025
+#, c-format
+msgid "&Swap"
+msgstr "&Cambiar"
+
+#: Merge.rc:1026
+#, c-format
+msgid "&Append to existing file"
+msgstr "&Anexar ao arquivo existente"
+
+#: Merge.rc:1028
+#, c-format
+msgid "&Result:"
+msgstr "&Resultado:"
+
+#: Merge.rc:1032
+#, c-format
+msgid "&Format"
+msgstr "&Formato"
+
+#: Merge.rc:1033
+#, c-format
+msgid "St&yle:"
+msgstr "Est&ilo"
+
+#: Merge.rc:1036
+#, c-format
+msgid "&Context:"
+msgstr "&Contexto:"
+
+#: Merge.rc:1039
+#, c-format
+msgid "W&hitespaces"
+msgstr "Es&pazos en branco"
+
+#: Merge.rc:1040
+#, c-format
+msgid "Com&pare"
+msgstr "Com&parar"
+
+#: Merge.rc:1042
+#, c-format
+msgid "I&gnore changes"
+msgstr "I&gnorar trocos"
+
+#: Merge.rc:1044
+#, c-format
+msgid "Ig&nore all"
+msgstr "Ig&norar todo"
+
+#: Merge.rc:1046
+#, c-format
+msgid "Ignor&e blank lines"
+msgstr "Ignor&ar li\xF1as en branco"
+
+#: Merge.rc:1048
+#, c-format
+msgid "Case sensi&tive"
+msgstr "Diferenciar mai\xFAsculas/min\xFAsculas"
+
+#: Merge.rc:1050
+#, c-format
+msgid "Inclu&de command line"
+msgstr "Inclu&\xEDr li\xF1a de comandos"
+
+#: Merge.rc:1052
+#, c-format
+msgid "Open to e&xternal editor"
+msgstr "Abrir nun e&ditor externo"
+
+#: Merge.rc:1074
+#, c-format
+msgid "Display Columns"
+msgstr "Amosar columnas"
+
+#: Merge.rc:1080
+#, c-format
+msgid "Move &Up"
+msgstr "Mover E&nriba"
+
+#: Merge.rc:1081
+#, c-format
+msgid "Move &Down"
+msgstr "Mover E&mbaixo"
+
+#: Merge.rc:1091
+#, c-format
+msgid "Select Unpacker"
+msgstr "Seleccionar desempaquetador"
+
+#: Merge.rc:1096
+#, c-format
+msgid "File unpacker:"
+msgstr "Desempaquetador de arquivos:"
+
+#: Merge.rc:1099
+#, c-format
+msgid "Display all unpackers, don't check the extension"
+msgstr "Amosar todos os desempaquetadores, non verificar a extensi\xF3n"
+
+#: Merge.rc:1102
+#, c-format
+msgid "Extensions list:"
+msgstr "Listaxe de extensi\xF3ns:"
+
+#: Merge.rc:1103
+#, c-format
+msgid "Description:"
+msgstr "Descrici\xF3n:"
+
+#: Merge.rc:1114
+#, c-format
+msgid " Folder Compare Progress"
+msgstr "Progreso na comparaci\xF3n de cartafoles"
+
+#: Merge.rc:1117
+#: Merge.rc:1874
+#, c-format
+msgid "Stop"
+msgstr "Parar"
+
+#: Merge.rc:1122
+#, c-format
+msgid "Comparing items..."
+msgstr "A comparar elementos..."
+
+#: Merge.rc:1123
+#, c-format
+msgid "Items compared:"
+msgstr "Elementos comparados:"
+
+#: Merge.rc:1124
+#, c-format
+msgid "Items total:"
+msgstr "Total de elementos:"
+
+#: Merge.rc:1130
+#, c-format
+msgid "Go To"
+msgstr "Ir a"
+
+#: Merge.rc:1133
+#, c-format
+msgid "G&oto:"
+msgstr "Ir&a:"
+
+#: Merge.rc:1135
+#, c-format
+msgid "File"
+msgstr "Arquivo"
+
+#: Merge.rc:1140
+#, c-format
+msgid "Goto what"
+msgstr "Ir para"
+
+#: Merge.rc:1141
+#, c-format
+msgid "Li&ne"
+msgstr "Li&\xF1a"
+
+#: Merge.rc:1143
+#, c-format
+msgid "&Difference"
+msgstr "&Diferenza"
+
+#: Merge.rc:1145
+#, c-format
+msgid "&Go To"
+msgstr "&Ir a"
+
+#: Merge.rc:1151
+#: Merge.rc:1922
+#, c-format
+msgid "Compare"
+msgstr "Comparar"
+
+#: Merge.rc:1154
+#, c-format
+msgid "Whitespace"
+msgstr "Espazo en branco"
+
+#: Merge.rc:1155
+#, c-format
+msgid "&Compare"
+msgstr "&Comparar"
+
+#: Merge.rc:1157
+#, c-format
+msgid "&Ignore change"
+msgstr "&Ignorar trocos"
+
+#: Merge.rc:1159
+#, c-format
+msgid "I&gnore all"
+msgstr "&Ignorar todo"
+
+#: Merge.rc:1161
+#, c-format
+msgid "Ignore blan&k lines"
+msgstr "Ignorar &li\xF1as en branco"
+
+#: Merge.rc:1163
+#, c-format
+msgid "Ignore &case"
+msgstr "Ignorar mai\xFAsc/min\xFAs."
+
+#: Merge.rc:1165
+#, c-format
+msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
+msgstr "Igno&rar diferenzas nas quebras de li\xF1a (Windows/Unix/Mac)"
+
+#: Merge.rc:1168
+#, c-format
+msgid "E&nable moved block detection"
+msgstr "A&ctivar detecci\xF3n de bloques movidos"
+
+#: Merge.rc:1170
+#, c-format
+msgid "&Match similar lines"
+msgstr "&Combinar as li\xF1as semellantes"
+
+#: Merge.rc:1172
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "Ig&norar diferenzas de tempo inferiores a 3 segundos"
+
+#: Merge.rc:1175
+#, c-format
+msgid "&File Compare method:"
+msgstr "&M\xE9todo de comparaci\xF3n de arquivos:"
+
+#: Merge.rc:1178
+#, c-format
+msgid "S&top after first difference"
+msgstr "P&arar despois da primeira diferenza"
+
+#: Merge.rc:1181
+#, c-format
+msgid "Filter Comments"
+msgstr "Filtrar comentarios"
+
+#: Merge.rc:1188
+#: Merge.rc:1923
+#, c-format
+msgid "Editor"
+msgstr "Editor"
+
+#: Merge.rc:1191
+#, c-format
+msgid "&Highlight syntax"
+msgstr "&Resaltar a sintaxe"
+
+#: Merge.rc:1193
+#, c-format
+msgid "&Automatic rescan"
+msgstr "&Re-escaneo autom\xE1tico"
+
+#: Merge.rc:1195
+#, c-format
+msgid "&Preserve original EOL chars"
+msgstr "&Conservar os caracteres orixinais EOL"
+
+#: Merge.rc:1197
+#, c-format
+msgid "Tabs"
+msgstr "Tabulaci\xF3ns"
+
+#: Merge.rc:1198
+#, c-format
+msgid "&Tab size:"
+msgstr "&Tama\xF1o da tabulaci\xF3n:"
+
+#: Merge.rc:1201
+#, c-format
+msgid "&Insert Tabs"
+msgstr "&Inserir tabulaci\xF3ns"
+
+#: Merge.rc:1203
+#, c-format
+msgid "Insert &Spaces"
+msgstr "Inserir &espazos"
+
+#: Merge.rc:1205
+#, c-format
+msgid "Line Difference Coloring"
+msgstr "Colorar as diferenzas de li\xF1a"
+
+#: Merge.rc:1207
+#, c-format
+msgid "View line differences"
+msgstr "Ver diferenzas de li\xF1a"
+
+#: Merge.rc:1209
+#, c-format
+msgid "&Character level"
+msgstr "&A nivel do caracter"
+
+#: Merge.rc:1211
+#, c-format
+msgid "&Word-level:"
+msgstr "&A nivel da palabra:"
+
+#: Merge.rc:1226
+#, c-format
+msgid "Filefilters"
+msgstr "Filtros de arquivos"
+
+#: Merge.rc:1232
+#, c-format
+msgid "Test"
+msgstr "Testar"
+
+#: Merge.rc:1233
+#, c-format
+msgid "Install..."
+msgstr "Instalar..."
+
+#: Merge.rc:1234
+#, c-format
+msgid "New..."
+msgstr "Novo..."
+
+#: Merge.rc:1235
+#, c-format
+msgid "Edit..."
+msgstr "Editar..."
+
+#: Merge.rc:1236
+#, c-format
+msgid "Delete..."
+msgstr "Borrar..."
+
+#: Merge.rc:1242
+#, c-format
+msgid "Save modified files?"
+msgstr "Queres gardar os arquivos modificados?"
+
+#: Merge.rc:1245
+#, c-format
+msgid "Left side file"
+msgstr "Arquivo da esquerda"
+
+#: Merge.rc:1248
+#, c-format
+msgid "&Save changes"
+msgstr "&Gardar trocos"
+
+#: Merge.rc:1250
+#, c-format
+msgid "&Discard changes"
+msgstr "&Desbotar trocos"
+
+#: Merge.rc:1252
+#, c-format
+msgid "Right side file"
+msgstr "Arquivo da dereita"
+
+#: Merge.rc:1255
+#, c-format
+msgid "S&ave changes"
+msgstr "G&ardar trocos"
+
+#: Merge.rc:1257
+#, c-format
+msgid "Dis&card changes"
+msgstr "Desbo&tar trocos"
+
+#: Merge.rc:1259
+#, c-format
+msgid "Discard All"
+msgstr "Desbotar todo"
+
+#: Merge.rc:1266
+#: Merge.rc:1514
+#: Merge.rc:1929
+#, c-format
+msgid "Codepage"
+msgstr "P\xE1xina de c\xF3digos"
+
+#: Merge.rc:1269
+#, c-format
+msgid "Default Codepage"
+msgstr "P\xE1xina de c\xF3digos predeterminada"
+
+#: Merge.rc:1270
+#, c-format
+msgid "Select the default codepage assumed when loading non-Unicode files:"
+msgstr "Selecciona a p\xE1xina de c\xF3digos predeterminada cando se carguen arquivos non-Unicode:"
+
+#: Merge.rc:1272
+#, c-format
+msgid ""
+"Detect codepage info for these files : .html, .rc, .xml \n"
+"need to restart session"
+msgstr ""
+"Detectar a informaci\xF3n sobre a p\xE1xina de c\xF3digos para estes arquivos:.html, .rc, .xml\n"
+"\xE9 preciso reiniciar a sesi\xF3n"
+
+#: Merge.rc:1275
+#, c-format
+msgid "System codepage"
+msgstr "P\xE1xina de c\xF3digos do sistema"
+
+#: Merge.rc:1277
+#, c-format
+msgid "According to WinMerge User Interface"
+msgstr "Igual \xE1 que emprega a interfaz de usuario de Winmerge"
+
+#: Merge.rc:1279
+#, c-format
+msgid "Custom codepage :"
+msgstr "P\xE1xina de c\xF3digos personalizada:"
+
+#: Merge.rc:1287
+#, c-format
+msgid "WinMerge - Archive support disabled"
+msgstr "WinMerge - Soporte de arquivos desactivado."
+
+#: Merge.rc:1290
+#, c-format
+msgid "Unable to detect 7-Zip version (not installed?)"
+msgstr "Non foi posible detectar a versi\xF3n de 7-Zip (est\xE1 instalado?)"
+
+#: Merge.rc:1293
+#, c-format
+msgid ""
+"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
+"essential components to be copied to the program directory for standalone operation."
+msgstr ""
+"O soporte de arquivos precisa ter instalado no PC 7-Zip ou posterior, ou ben os seus\n"
+"compo\xF1entes esenciais copiados no cartafol do programa para operar independentemente."
+
+#: Merge.rc:1295
+#, c-format
+msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
+msgstr "Tam\xE9n debe existir un plugin de interface axeitado no cami\xF1o (Merge7z*.dll)."
+
+#: Merge.rc:1297
+#, c-format
+msgid ""
+"Please use the version of 7-Zip recommended below until interface plugins for later\n"
+"versions become available."
+msgstr ""
+"Emprega a versi\xF3n de 7-Zip recomendada debaixo at\xE9 que estea\n"
+"dispo\xF1ible un plugin de interface para versi\xF3ns posteriores."
+
+#: Merge.rc:1299
+#, c-format
+msgid "Version"
+msgstr "Versi\xF3n"
+
+#: Merge.rc:1301
+#, c-format
+msgid ""
+"Plugin required\n"
+"(dllbuild %04u)"
+msgstr ""
+"Plugin requirido\n"
+"(dllbuild %04u)"
+
+#: Merge.rc:1303
+#, c-format
+msgid "Recommended version of 7-Zip:"
+msgstr "Versi\xF3n de 7-Zip recomendada:"
+
+#: Merge.rc:1306
+#: Merge.rc:1309
+#, c-format
+msgid "present"
+msgstr "presente"
+
+#: Merge.rc:1307
+#, c-format
+msgid "Merge7z000U.dll"
+msgstr "Merge7z000U.dll"
+
+#: Merge.rc:1310
+#, c-format
+msgid "7-Zip software installed on your computer:"
+msgstr "Software 7-Zip instalado no teu computador:"
+
+#: Merge.rc:1312
+#: Merge.rc:1317
+#, c-format
+msgid "none"
+msgstr "ning\xFAn"
+
+#: Merge.rc:1314
+#, c-format
+msgid "missing"
+msgstr "falta"
+
+#: Merge.rc:1315
+#, c-format
+msgid "7-Zip components for standalone operation:"
+msgstr "Compo\xF1entes para que 7-Zip funcione independente:"
+
+#: Merge.rc:1319
+#, c-format
+msgid "outdated"
+msgstr "obsoleto"
+
+#: Merge.rc:1320
+#, c-format
+msgid "Plugins on path:"
+msgstr "Plugins no cami\xF1o:"
+
+#: Merge.rc:1321
+#, c-format
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"Non amosar esta &mensaxe outra vez.\n"
+"(Sempre podes recuperar esta mensaxe desde o men\xFA de Axuda.)"
+
+#: Merge.rc:1325
+#, c-format
+msgid "Plugin Download"
+msgstr "Descarga de plugins"
+
+#: Merge.rc:1334
+#, c-format
+msgid "Options"
+msgstr "Opci\xF3ns"
+
+#: Merge.rc:1345
+#, c-format
+msgid " Categories"
+msgstr "Categor\xEDas"
+
+#: Merge.rc:1347
+#, c-format
+msgid "Import..."
+msgstr "Importar..."
+
+#: Merge.rc:1348
+#, c-format
+msgid "Export..."
+msgstr "Exportar..."
+
+#: Merge.rc:1356
+#, c-format
+msgid "Keywords:"
+msgstr "Palabras chave:"
+
+#: Merge.rc:1357
+#, c-format
+msgid "Function names:"
+msgstr "Nomes das funci\xF3ns:"
+
+#: Merge.rc:1358
+#, c-format
+msgid "Comments:"
+msgstr "Comentarios:"
+
+#: Merge.rc:1359
+#, c-format
+msgid "Numbers:"
+msgstr "N\xFAmeros:"
+
+#: Merge.rc:1360
+#, c-format
+msgid "Operators:"
+msgstr "Operadores:"
+
+#: Merge.rc:1361
+#, c-format
+msgid "Strings:"
+msgstr "Cadeas:"
+
+#: Merge.rc:1362
+#, c-format
+msgid "Preprocessor:"
+msgstr "Pre-procesador:"
+
+#: Merge.rc:1363
+#, c-format
+msgid "User 1:"
+msgstr "Usuario 1:"
+
+#: Merge.rc:1364
+#, c-format
+msgid "User 2:"
+msgstr "Usuario 2:"
+
+#  Esta traduci\xF3n atopeina no corpus ling\xFC\xEDstico do Open Office, en mancomun.org
+#: Merge.rc:1369
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
+#: Merge.rc:1399
+#: Merge.rc:1404
+#: Merge.rc:1409
+#, c-format
+msgid "Bold"
+msgstr "Negra"
+
+#: Merge.rc:1417
+#, c-format
+msgid "Folder Compare Report"
+msgstr "Informe da comparaci\xF3n de cartafoles"
+
+#: Merge.rc:1420
+#, c-format
+msgid "Report &File:"
+msgstr "Arquivo do &Informe"
+
+#: Merge.rc:1423
+#: Merge.rc:1597
+#: Merge.rc:1601
+#: Merge.rc:1628
+#, c-format
+msgid "Browse..."
+msgstr "Procurar..."
+
+#: Merge.rc:1424
+#, c-format
+msgid "&Style:"
+msgstr "&Estilo:"
+
+#: Merge.rc:1427
+#, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Copiar para o portapapeis"
+
+#: Merge.rc:1435
+#, c-format
+msgid "Shared or Private Filter"
+msgstr "Filtro privado ou compartido"
+
+#: Merge.rc:1438
+#, c-format
+msgid "Which type of filter do you want to create?"
+msgstr "Que tipo de filtro queres crear?"
+
+#: Merge.rc:1440
+#, c-format
+msgid "Shared Filter (for all users on this machine)"
+msgstr "Filtro compartido (para todos os usuarios desta m\xE1quina)"
+
+#: Merge.rc:1442
+#, c-format
+msgid "Private Filter (only for current user)"
+msgstr "Filtro privado (s\xF3 para o usuario actual)"
+
+#: Merge.rc:1450
+#: Merge.rc:1930
+#, c-format
+msgid "Archive Support"
+msgstr "Soporte de Arquivos"
+
+#: Merge.rc:1453
+#, c-format
+msgid "Archive support requires 7-Zip plugin installed:"
+msgstr "O soporte de arquivos require ter o plugin 7-Zip instalado:"
+
+#: Merge.rc:1455
+#, c-format
+msgid "Download 7-zip Plugin"
+msgstr "Baixar o plugin 7-zip"
+
+#: Merge.rc:1456
+#, c-format
+msgid "&Enable archive file support"
+msgstr "&Activar o soporte de arquivos"
+
+#: Merge.rc:1458
+#, c-format
+msgid "&Use stand-alone 7-Zip if available"
+msgstr "&Empregar o 7-Zip independente se est\xE1 dispo\xF1ible"
+
+#: Merge.rc:1461
+#, c-format
+msgid "U&se local 7-Zip from WinMerge folder"
+msgstr "E&mpregar o 7-Zip local do cartafol de WinMerge"
+
+#: Merge.rc:1463
+#, c-format
+msgid "&Detect archive type from file signature"
+msgstr "&Detectar o tipo de arquivo pola sinatura"
+
+#: Merge.rc:1471
+#, c-format
+msgid "Compare Statistics"
+msgstr "Estad\xEDsticas da comparaci\xF3n"
+
+#: Merge.rc:1474
+#, c-format
+msgid "Folders:"
+msgstr "Cartafoles:"
+
+#: Merge.rc:1475
+#, c-format
+msgid "Files:"
+msgstr "Arquivos:"
+
+#: Merge.rc:1476
+#: Merge.rc:2310
+#, c-format
+msgid "Different"
+msgstr "Diferente"
+
+#: Merge.rc:1477
+#, c-format
+msgid "Text:"
+msgstr "Texto:"
+
+#: Merge.rc:1480
+#: Merge.rc:1499
+#, c-format
+msgid "Binary:"
+msgstr "Binario:"
+
+#: Merge.rc:1483
+#, c-format
+msgid "Unique"
+msgstr "\xDAnico"
+
+#: Merge.rc:1484
+#, c-format
+msgid "Left:"
+msgstr "Esquerda:"
+
+#: Merge.rc:1489
+#, c-format
+msgid "Right:"
+msgstr "Dereita"
+
+#: Merge.rc:1494
+#: Merge.rc:2305
+#, c-format
+msgid "Identical"
+msgstr "Iguais"
+
+#: Merge.rc:1503
+#, c-format
+msgid "Total:"
+msgstr "Total:"
+
+#: Merge.rc:1508
+#, c-format
+msgid "Close"
+msgstr "Pechar"
+
+#: Merge.rc:1517
+#, c-format
+msgid "Affects"
+msgstr "Afecta"
+
+#: Merge.rc:1520
+#: Merge.rc:1523
+#, c-format
+msgid "(Affects)"
+msgstr "(Afecta)"
+
+#: Merge.rc:1524
+#, c-format
+msgid "Select Codepage for"
+msgstr "Selecciona a p\xE1xina de c\xF3digos para"
+
+#: Merge.rc:1525
+#, c-format
+msgid "&File Loading:"
+msgstr "&A cargar o arquivo:"
+
+#: Merge.rc:1527
+#: Merge.rc:1530
+#, c-format
+msgid "..."
+msgstr "..."
+
+#: Merge.rc:1528
+#, c-format
+msgid "File &Saving:"
+msgstr "A gardar o &arquivo:"
+
+#: Merge.rc:1531
+#, c-format
+msgid "&Use same codepage for both"
+msgstr "&Empregar a mesma p\xE1xina de c\xF3digos para ambas"
+
+#: Merge.rc:1534
+#, c-format
+msgid "&Apply"
+msgstr "&Aplicar"
+
+#: Merge.rc:1535
+#: Merge.rc:1896
+#, c-format
+msgid "&Cancel"
+msgstr "&Cancelar"
+
+#: Merge.rc:1540
+#, c-format
+msgid "Test Filter"
+msgstr "Probar filtro"
+
+#: Merge.rc:1543
+#, c-format
+msgid "Testing filter ..."
+msgstr "Probando filtro..."
+
+#: Merge.rc:1545
+#, c-format
+msgid "&Enter text to test:"
+msgstr "&Inserir texto para probar:"
+
+#: Merge.rc:1547
+#, c-format
+msgid "&Folder Name"
+msgstr "&Nome do cartafol"
+
+#: Merge.rc:1549
+#, c-format
+msgid "Result:"
+msgstr "Resultado:"
+
+#: Merge.rc:1553
+#, c-format
+msgid "&Test"
+msgstr "&Probar"
+
+#: Merge.rc:1554
+#, c-format
+msgid "&Close"
+msgstr "&Pechar"
+
+#: Merge.rc:1562
+#, c-format
+msgid "&Use customized text colors"
+msgstr "&Empregar cores de texto personalizadas"
+
+#: Merge.rc:1565
+#, c-format
+msgid "Custom text colors"
+msgstr "Cores de texto personalizadas"
+
+#: Merge.rc:1567
+#, c-format
+msgid "Whitespace:"
+msgstr "Espazo en branco:"
+
+#: Merge.rc:1568
+#, c-format
+msgid "Regular text:"
+msgstr "Texto normal"
+
+#: Merge.rc:1569
+#, c-format
+msgid "Selection:"
+msgstr "Selecci\xF3n:"
+
+#: Merge.rc:1592
+#, c-format
+msgid "Paths"
+msgstr "Cami\xF1os"
+
+#: Merge.rc:1598
+#, c-format
+msgid "R&ead-only"
+msgstr "S&\xF3 lectura"
+
+#: Merge.rc:1602
+#, c-format
+msgid "Re&ad-only"
+msgstr "S\xF3 l&ectura"
+
+#: Merge.rc:1608
+#, c-format
+msgid "Open..."
+msgstr "Abrir..."
+
+#: Merge.rc:1609
+#, c-format
+msgid "Save..."
+msgstr "Gardar..."
+
+#: Merge.rc:1614
+#: Merge.rc:1931
+#, c-format
+msgid "Backup Files"
+msgstr "Copias de seguridade(backups)"
+
+#: Merge.rc:1617
+#, c-format
+msgid "Create backup files in:"
+msgstr "Crear as copias de seguridade en:"
+
+#: Merge.rc:1622
+#, c-format
+msgid "Create backup files into:"
+msgstr "Crear as copias de seguridade en: "
+
+#: Merge.rc:1623
+#, c-format
+msgid "&Original file's folder"
+msgstr "&Cartafol orixinal do arquivo"
+
+#: Merge.rc:1625
+#, c-format
+msgid "&Global backup folder:"
+msgstr "&Cartafol das copias de seguridade:"
+
+#: Merge.rc:1629
+#, c-format
+msgid "Backup filename:"
+msgstr "Nome do arquivo de seguridade"
+
+#: Merge.rc:1630
+#, c-format
+msgid "&Append .bak -extension"
+msgstr "&Anexar extensi\xF3n .bak"
+
+#: Merge.rc:1632
+#, c-format
+msgid "A&ppend timestamp"
+msgstr "&Engadir etiqueta coa data"
+
+#: Merge.rc:1639
+#: Merge.rc:2220
+#, c-format
+msgid "Confirm Copy"
+msgstr "Confirmar copia"
+
+#: Merge.rc:1643
+#, c-format
+msgid "Are you sure you want to copy XXX items?"
+msgstr "Est\xE1s seguro de querer copiar XXX elementos?"
+
+#: Merge.rc:1645
+#, c-format
+msgid "From left"
+msgstr "Desde a esquerda"
+
+#: Merge.rc:1648
+#, c-format
+msgid "To right"
+msgstr "Para a dereita"
+
+#: Merge.rc:1651
+#, c-format
+msgid "Yes"
+msgstr "Si"
+
+#: Merge.rc:1652
+#, c-format
+msgid "No"
+msgstr "Non"
+
+#: Merge.rc:1658
+#, c-format
+msgid "Plugins"
+msgstr "Plugins"
+
+#: Merge.rc:1661
+#, c-format
+msgid "&Enable plugins"
+msgstr "&Activar plugins"
+
+#. StringFileInfo.Block
+#: Merge.rc:1691
+#, c-format
+msgid "040904e4"
+msgstr "040904e4"
+
+#. VarFileInfo.Translation
+#: Merge.rc:1707
+#, c-format
+msgid "0x409, 1252"
+msgstr "0x409, 1252"
+
+#: Merge.rc:1722
+#, c-format
+msgid "Ready"
+msgstr "Listo"
+
+#: Merge.rc:1728
+#, c-format
+msgid "EXT"
+msgstr "EXT"
+
+#: Merge.rc:1729
+#, c-format
+msgid "CAP"
+msgstr "CAP"
+
+#: Merge.rc:1730
+#, c-format
+msgid "NUM"
+msgstr "NUM"
+
+#: Merge.rc:1731
+#, c-format
+msgid "SCRL"
+msgstr "SCRL"
+
+#: Merge.rc:1732
+#, c-format
+msgid "OVR"
+msgstr "OVR"
+
+#: Merge.rc:1733
+#, c-format
+msgid "REC"
+msgstr "REC"
+
+#: Merge.rc:1739
+#, c-format
+msgid ""
+"Create empty documents\n"
+"New Documents (Ctrl+N)"
+msgstr ""
+"Crear documentos baleiros\n"
+"Documentos novos  (Ctrl+N) "
+
+#: Merge.rc:1740
+#, c-format
+msgid ""
+"Open an existing document\n"
+"Open (Ctrl+O)"
+msgstr ""
+"Abrir un documento existente\n"
+"Abrir (Ctrl+O)"
+
+#: Merge.rc:1741
+#, c-format
+msgid ""
+"Close the active document\n"
+"Close"
+msgstr ""
+"Pechar o documento activo\n"
+"Pechar"
+
+#: Merge.rc:1742
+#, c-format
+msgid ""
+"Save the active document\n"
+"Save (Ctrl+S)"
+msgstr ""
+"Gravar o documento activo\n"
+"Gardar (Ctrl+S)"
+
+#: Merge.rc:1743
+#, c-format
+msgid ""
+"Save the active document with a new name\n"
+"Save As"
+msgstr ""
+"Gravar o documento activo cun novo nome\n"
+"Gardar como"
+
+#: Merge.rc:1744
+#, c-format
+msgid ""
+"Change the printing options\n"
+"Page Setup"
+msgstr ""
+"Trocar as opci\xF3ns de impresi\xF3n\n"
+"Configuraci\xF3n de p\xE1xina"
+
+#: Merge.rc:1745
+#, c-format
+msgid ""
+"Change the printer and printing options\n"
+"Print Setup"
+msgstr ""
+"Trocar a impresora e as opci\xF3ns de impresi\xF3n\n"
+"Configurar impresi\xF3n"
+
+#: Merge.rc:1746
+#, c-format
+msgid ""
+"Print the active document\n"
+"Print"
+msgstr ""
+"Imprimir o documento activo\n"
+"Imprimir"
+
+#: Merge.rc:1747
+#, c-format
+msgid ""
+"Display full pages\n"
+"Print Preview"
+msgstr ""
+"Amosar todas as p\xE1xinas\n"
+"Previsualizar impresi\xF3n"
+
+#: Merge.rc:1752
+#, c-format
+msgid "Make all hidden items visible again"
+msgstr "Facer visibles outra vez todos os elementos agochados"
+
+#: Merge.rc:1758
+#, c-format
+msgid ""
+"Open project file\n"
+"Project file (Ctrl+J)"
+msgstr ""
+"Abrir o arquivo do proxecto\n"
+"Arquivo do proxecto (Ctrl+J)"
+
+#: Merge.rc:1759
+#, c-format
+msgid "Unknown error attempting to open project file"
+msgstr "Erro desco\xF1ecido ao tentar abrir o arquivo do proxecto"
+
+#: Merge.rc:1760
+#, c-format
+msgid "Unknown error attempting to save project file"
+msgstr "Erro desco\xF1ecido ao tentar gardar o arquivo do proxecto"
+
+#: Merge.rc:1761
+#, c-format
+msgid "Project File"
+msgstr "Arquivo do proxecto"
+
+#: Merge.rc:1762
+#, c-format
+msgid "Project file successfully loaded."
+msgstr "O arquivo do proxecto cargouse correctamente."
+
+#: Merge.rc:1763
+#, c-format
+msgid "Project file successfully saved."
+msgstr "O arquivo do proxecto gardouse correctamente."
+
+#: Merge.rc:1764
+#, c-format
+msgid ""
+"Save current paths and options to project file\n"
+"Save Project File"
+msgstr ""
+"Gardar os cami\xF1os e opci\xF3ns actuais no arquivo do proxecto\n"
+"Gardar arquivo do proxecto"
+
+#: Merge.rc:1769
+#, c-format
+msgid ""
+"Display program information, version number and copyright\n"
+"About"
+msgstr ""
+"Amosar a informaci\xF3n do programa, n\xFAmero da versi\xF3n e copyright\n"
+"Acerca de"
+
+#: Merge.rc:1770
+#, c-format
+msgid ""
+"Quit the application; prompts to save documents\n"
+"Exit"
+msgstr ""
+"Pechar a aplicaci\xF3n, preguntar se se gardan os documentos\n"
+"Sa\xEDr"
+
+#: Merge.rc:1776
+#: Merge.rc:1777
+#: Merge.rc:1778
+#: Merge.rc:1779
+#: Merge.rc:1780
+#: Merge.rc:1781
+#: Merge.rc:1782
+#: Merge.rc:1783
+#: Merge.rc:1784
+#: Merge.rc:1785
+#: Merge.rc:1786
+#: Merge.rc:1787
+#: Merge.rc:1788
+#: Merge.rc:1789
+#: Merge.rc:1790
+#: Merge.rc:1791
+#, c-format
+msgid "Open this document"
+msgstr "Abrir este documento"
+
+#: Merge.rc:1796
+#, c-format
+msgid ""
+"Switch to the next window pane\n"
+"Next Pane"
+msgstr ""
+"Cambiar para o seguinte panel\n"
+"Panel seguinte"
+
+#: Merge.rc:1797
+#, c-format
+msgid ""
+"Switch back to the previous window pane\n"
+"Previous Pane"
+msgstr ""
+"Cambiar para o panel anterior\n"
+"Panel anterior"
+
+#: Merge.rc:1803
+#, c-format
+msgid ""
+"Arrange windows so they overlap\n"
+"Cascade Windows"
+msgstr ""
+"Organizar as vent\xE1s en fervenza(sobrepostas)\n"
+"Fervenza"
+
+#: Merge.rc:1804
+#, c-format
+msgid ""
+"Arrange windows as non-overlapping tiles horizontally\n"
+"Tile Windows Horizontally"
+msgstr ""
+"Organizar as vent\xE1s horizontalmente\n"
+"Organizar horizontalmente"
+
+#: Merge.rc:1805
+#, c-format
+msgid ""
+"Arrange windows as non-overlapping tiles vertically\n"
+"Tile Windows Vertically"
+msgstr ""
+"Organizar as vent\xE1s verticalmente\n"
+"Organizar verticalmente"
+
+#: Merge.rc:1811
+#, c-format
+msgid ""
+"Copy the selection and put it on the Clipboard\n"
+"Copy"
+msgstr ""
+"Copiar a selecci\xF3n e po\xF1ela no portapapeis\n"
+"Copiar"
+
+#: Merge.rc:1812
+#, c-format
+msgid ""
+"Cut the selection and put it on the Clipboard\n"
+"Cut"
+msgstr ""
+"Cortar a selecci\xF3n e po\xF1ela no portapapeis\n"
+"Copiar"
+
+#: Merge.rc:1813
+#, c-format
+msgid ""
+"Find the specified text\n"
+"Find"
+msgstr ""
+"Procurar o texto especificado\n"
+"Procurar"
+
+#: Merge.rc:1814
+#, c-format
+msgid ""
+"Insert Clipboard contents\n"
+"Paste"
+msgstr ""
+"Inserir o contido do portapapeis\n"
+"Pegar"
+
+#: Merge.rc:1815
+#, c-format
+msgid ""
+"Repeat the last action\n"
+"Repeat"
+msgstr ""
+"Repetir a \xFAltima acci\xF3n\n"
+"Repetir"
+
+#: Merge.rc:1816
+#, c-format
+msgid ""
+"Replace specific text with different text\n"
+"Replace"
+msgstr ""
+"Substituir o texto especificado por outro\n"
+"Substitu\xEDr"
+
+#: Merge.rc:1817
+#, c-format
+msgid ""
+"Select the entire document\n"
+"Select All"
+msgstr ""
+"Seleccionar todo o documento\n"
+"Seleccionar todo"
+
+#: Merge.rc:1818
+#, c-format
+msgid ""
+"Undo the last action\n"
+"Undo (Ctrl+Z)"
+msgstr ""
+"Desfacer a \xFAltima acci\xF3n\n"
+"Desfacer (CTRL+Z)"
+
+#: Merge.rc:1819
+#, c-format
+msgid ""
+"Redo the previously undone action\n"
+"Redo (Ctrl+Y)"
+msgstr ""
+"Refacer a acci\xF3n previamente desfeita\n"
+"Refacer (Ctrl+Y)"
+
+#: Merge.rc:1825
+#, c-format
+msgid ""
+"Show or hide the toolbar\n"
+"Toggle ToolBar"
+msgstr ""
+"Amosar ou ocultar a barra de ferramentas\n"
+"Barra de ferramentas"
+
+#: Merge.rc:1826
+#, c-format
+msgid ""
+"Show or hide the status bar\n"
+"Toggle StatusBar"
+msgstr ""
+"Amosar ou ocultar a barra de estado\n"
+"Barra de estado"
+
+#: Merge.rc:1827
+#, c-format
+msgid ""
+"Show or hide the tab bar\n"
+"Toggle TabBar"
+msgstr ""
+"Amosar ou agochar a barra dos separadores\n"
+"Separadores"
+
+#: Merge.rc:1828
+#, c-format
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"Reaxustar o tama\xF1o dos paneis de xeito autom\xE1tico\n"
+"Bloquear Paneis"
+
+#: Merge.rc:1834
+#, c-format
+msgid "Change the window size"
+msgstr "Cambiar o tama\xF1o da fiestra"
+
+#: Merge.rc:1835
+#, c-format
+msgid "Change the window position"
+msgstr "Cambiar a posici\xF3n da fiestra"
+
+#: Merge.rc:1836
+#, c-format
+msgid "Reduce the window to an icon"
+msgstr "Reducir a fiestra a unha icona"
+
+#: Merge.rc:1837
+#, c-format
+msgid "Enlarge the window to full size"
+msgstr "Agrandar a vent\xE1 a tama\xF1o completo"
+
+#: Merge.rc:1838
+#, c-format
+msgid "Switch to the next document window"
+msgstr "Cambiar para a fiestra do documento seguinte"
+
+#: Merge.rc:1839
+#, c-format
+msgid "Switch to the previous document window"
+msgstr "Cambiar para a fiestra do documento anterior"
+
+#: Merge.rc:1840
+#, c-format
+msgid "Close the active window and prompts to save the documents"
+msgstr "Pechar a fiestra activa e preguntar se se gardan os documentos"
+
+#: Merge.rc:1845
+#, c-format
+msgid "Restore the window to normal size"
+msgstr "Voltar a fiestra para o tama\xF1o normal"
+
+#: Merge.rc:1846
+#, c-format
+msgid "Activate Task List"
+msgstr "Activar listaxe de tarefas"
+
+#: Merge.rc:1847
+#, c-format
+msgid "Activate this window"
+msgstr "Activar esta fiestra"
+
+#: Merge.rc:1853
+#, c-format
+msgid ""
+"Close print preview mode\n"
+"Cancel Preview"
+msgstr ""
+"Pechar o modo previsualizaci\xF3n de impresi\xF3n\n"
+"Cancelar previsualizaci\xF3n"
+
+#: Merge.rc:1860
+#, c-format
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
+msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
+
+#: Merge.rc:1861
+#, c-format
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+
+#: Merge.rc:1868
+#, c-format
+msgid "Preserve original EOL chars"
+msgstr "Conservar caracteres EOL orixinais"
+
+#: Merge.rc:1875
+#, c-format
+msgid "Press any key"
+msgstr "Premer calquera tecla"
+
+#: Merge.rc:1881
+#: Merge.rc:1882
+#, c-format
+msgid "Right click on the path to copy"
+msgstr "Premer co bot\xF3n dereito no cami\xF1o a copiar"
+
+#: Merge.rc:1888
+#, c-format
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"Desenvolvedores:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+
+#: Merge.rc:1889
+#, c-format
+msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
+msgstr "WinMerge ofr\xE9cese sen GARANT\xCDA DE NINGUNHA CLASE. Este programa \xE9 software ceibe e anim\xE1moste a distribu\xEDlo baixo certas condici\xF3ns; mira a Licenza P\xFAblica Xeral GNU no men\xFA de Axuda para atopar m\xE1is informaci\xF3n."
+
+#: Merge.rc:1895
+#, c-format
+msgid "&Ok"
+msgstr "&Aceptar"
+
+#: Merge.rc:1897
+#, c-format
+msgid "&Abort"
+msgstr "&Abortar"
+
+#: Merge.rc:1898
+#, c-format
+msgid "&Retry"
+msgstr "&Tentar de novo"
+
+#: Merge.rc:1899
+#, c-format
+msgid "&Ignore"
+msgstr "&Ignorar"
+
+#: Merge.rc:1900
+#, c-format
+msgid "Ignore &all"
+msgstr "Ignorar &todo"
+
+#: Merge.rc:1901
+#, c-format
+msgid "&Yes"
+msgstr "&Si"
+
+#: Merge.rc:1907
+#, c-format
+msgid "Yes to &all"
+msgstr "Si a &todo"
+
+#: Merge.rc:1908
+#, c-format
+msgid "&No"
+msgstr "&Non"
+
+#: Merge.rc:1909
+#, c-format
+msgid "No to a&ll"
+msgstr "&Non a todo"
+
+#: Merge.rc:1910
+#, c-format
+msgid "&Continue"
+msgstr "&Continuar"
+
+#: Merge.rc:1911
+#, c-format
+msgid "&Skip"
+msgstr "&Saltar"
+
+#: Merge.rc:1912
+#, c-format
+msgid "Skip &all"
+msgstr "S&altar todo"
+
+#: Merge.rc:1914
+#, c-format
+msgid "Don't display this &message again."
+msgstr "Non amosar esta &mensaxe de novo."
+
+#: Merge.rc:1915
+#, c-format
+msgid "Don't ask this &question again."
+msgstr "Non preguntar &isto de novo."
+
+#: Merge.rc:1925
+#, c-format
+msgid "Syntax colors"
+msgstr "Cores da sintaxe"
+
+#: Merge.rc:1926
+#, c-format
+msgid "Text Colors"
+msgstr "Cores do texto"
+

@@ Diff output truncated at 100000 characters. @@

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

Revision: 6007
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6007&view=rev
Author:   sdottaka
Date:     2008-10-09 15:01:03 +0000 (Thu, 09 Oct 2008)

Log Message:
-----------
PATCH: [2153339] Patch for 'BUG: 2138555 and 2068790'
- 2138555: Cursor position when comparison files
are the same
- 2068790: "View Margins" & some .HTML Files: Odd
Behaviour

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/editlib/ccrystaltextview.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-09 15:00:27 UTC (rev 6006)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-09 15:01:03 UTC (rev 6007)
@@ -6,6 +6,8 @@
 WinMerge 2.10.2
   Change download URL to current URL (#2136765)
   BugFix: Case-sensitive regexp search didn't work (#1991259)
+  BugFix: Wrong cursor position when disabling selection margin (#2138555)
+  BugFix: Showed a black line when disabling selection margin (#2068790)
   New translation: Galician (#2120685)
   Translation updates:
   - Ukrainian (#2131753)

Modified: branches/R2_10/Src/editlib/ccrystaltextview.cpp
===================================================================
--- branches/R2_10/Src/editlib/ccrystaltextview.cpp	2008-10-09 15:00:27 UTC (rev 6006)
+++ branches/R2_10/Src/editlib/ccrystaltextview.cpp	2008-10-09 15:01:03 UTC (rev 6007)
@@ -4289,9 +4289,10 @@
       m_bSelMargin = bSelMargin;
       if (::IsWindow (m_hWnd))
         {
-          m_nScreenChars = -1;
-          Invalidate ();
+          InvalidateScreenRect ();
+          m_nTopSubLine = GetSubLineIndex(m_nTopLine);
           RecalcHorzScrollBar ();
+          UpdateCaret ();
         }
     }
 }


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

Revision: 6035
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6035&view=rev
Author:   sdottaka
Date:     2008-10-23 22:13:48 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
TODO: [ 1460517 ] Use default settings from HKLM in registry

Fixed the following problems:

1) After installing WinMerge, WinMerge's interface language is not
Japanese but English.

2) WinMerge icon is not shown on Quick Launch bar.

3) After uninstalling WinMerge, the registry key
'HKEY_CURRENT_USER/Software/Thingamahoochie/WinMerge' is not deleted.

4) and I also noticed that TortoiseCVS and TortoiseSVN integrations have
not been worked now.

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Installer/InnoSetup/WinMerge.iss
    branches/R2_10/Src/OptionsInit.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-23 21:54:49 UTC (rev 6034)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-23 22:13:48 UTC (rev 6035)
@@ -9,6 +9,8 @@
   BugFix: Wrong cursor position when disabling selection margin (#2138555)
   BugFix: Showed a black line when disabling selection margin (#2068790)
   BugFix: Fix manual URL in Readme.txt (#2181628)
+  BugFix: There were some installer regressions
+         (eg. Installer didn't create Quick Launch icon) (#1460517)
   New translation: Galician (#2120685)
   Translation updates:
   - Ukrainian (#2131753)

Modified: branches/R2_10/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-10-23 21:54:49 UTC (rev 6034)
+++ branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-10-23 22:13:48 UTC (rev 6035)
@@ -309,6 +309,7 @@
 Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs')
 
 ;This removes the quick launch icon in case the user chooses not to install it after previously having it installed
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
 Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon')
 
 ;This removes the desktop icon in case the user chooses not to install it after previously having it installed
@@ -452,9 +453,11 @@
 Name: {commondesktop}\WinMerge; Filename: {app}\{code:ExeName}; Tasks: desktopicon
 
 ;Quick Launch Icon
-Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon
 
 [Registry]
+Root: HKCU; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey
 Root: HKLM; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty
 Root: HKLM; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey
 
@@ -498,20 +501,20 @@
 Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 1; Tasks: ShellExtension; Check: not ShellMenuEnabled()
 
 ;If WinMerge.exe is installed then we'll automatically configure WinMerge as the differencing application
-Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
-Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
 
 ;Tells TortoiseCVS to use WinMerge as its differencing application (this happens whether or not Tortoise is current installed, that way
 ;if it is installed at a later date this will automatically support it)
-Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
-Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
-Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
+Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS
 
 ;Set WinMerge as TortoiseSVN diff tool
-Root: HKLM; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
+Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN
 
 ;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in
 ;(unless the user already has a startup language specified)

Modified: branches/R2_10/Src/OptionsInit.cpp
===================================================================
--- branches/R2_10/Src/OptionsInit.cpp	2008-10-23 21:54:49 UTC (rev 6034)
+++ branches/R2_10/Src/OptionsInit.cpp	2008-10-23 22:13:48 UTC (rev 6035)
@@ -16,8 +16,8 @@
 
 // Functions to copy values set by installer from HKLM to HKCU.
 static void CopyHKLMValues();
-static bool OpenHKLM(HKEY *key);
-static bool OpenHKCU(HKEY *key);
+static bool OpenHKLM(HKEY *key, LPCTSTR relpath = NULL);
+static bool OpenHKCU(HKEY *key, LPCTSTR relpath = NULL);
 static bool IsFirstRun(HKEY key);
 static void CopyFromLMtoCU(HKEY lmKey, HKEY cuKey, LPCTSTR valname);
 static void ResetFirstRun(HKEY key);
@@ -234,23 +234,34 @@
 		{
 			CopyFromLMtoCU(LMKey, CUKey, _T("ContextMenuEnabled"));
 			CopyFromLMtoCU(LMKey, CUKey, _T("Executable"));
-			CopyFromLMtoCU(LMKey, CUKey, _T("Locale\\LanguageId"));
 			RegCloseKey(CUKey);
 		}
 		RegCloseKey(LMKey);
 	}
+	if (OpenHKLM(&LMKey, _T("Locale")))
+	{
+		if (OpenHKCU(&CUKey, _T("Locale")))
+		{
+			CopyFromLMtoCU(LMKey, CUKey, _T("LanguageId"));
+			RegCloseKey(CUKey);
+		}
+		RegCloseKey(LMKey);
+	}
 }
 
 /**
  * @brief Open HKLM registry key.
  * @param [out] key Pointer to open HKLM key.
+ * @param [in] relative registry path to open.
  * @return true if opening succeeded.
  */
-static bool OpenHKLM(HKEY *key)
+static bool OpenHKLM(HKEY *key, LPCTSTR relpath)
 {
+	TCHAR valuename[256] = _T("Software\\Thingamahoochie\\WinMerge\\");
+	if (relpath)
+		lstrcat(valuename, relpath);
 	LONG retval = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-			_T("Software\\Thingamahoochie\\WinMerge\\"),
-			0, KEY_READ, key);
+			valuename, 0, KEY_READ, key);
 	if (retval == ERROR_SUCCESS)
 	{
 		return true;
@@ -262,13 +273,16 @@
  * @brief Open HKCU registry key.
  * Opens the HKCU key for WinMerge. If the key does not exist, creates one.
  * @param [out] key Pointer to open HKCU key.
+ * @param [in] relative registry path to open.
  * @return true if opening succeeded.
  */
-static bool OpenHKCU(HKEY *key)
+static bool OpenHKCU(HKEY *key, LPCTSTR relpath)
 {
+	TCHAR valuename[256] = _T("Software\\Thingamahoochie\\WinMerge\\");
+	if (relpath)
+		lstrcat(valuename, relpath);
 	LONG retval = RegOpenKeyEx(HKEY_CURRENT_USER,
-			_T("Software\\Thingamahoochie\\WinMerge\\"),
-			0, KEY_ALL_ACCESS, key);
+			valuename, 0, KEY_ALL_ACCESS, key);
 	if (retval == ERROR_SUCCESS)
 	{
 		return true;
@@ -276,8 +290,7 @@
 	else if (retval == ERROR_FILE_NOT_FOUND)
 	{
 		retval = RegCreateKeyEx(HKEY_CURRENT_USER,
-			_T("Software\\Thingamahoochie\\WinMerge\\"),
-			0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL);
+			valuename, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL);
 		if (retval == ERROR_SUCCESS)
 			return true;
 	}


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

Revision: 6038
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6038&view=rev
Author:   kimmov
Date:     2008-10-24 18:38:23 +0000 (Fri, 24 Oct 2008)

Log Message:
-----------
Merge Czech translation update by Jan Hryz from trunk.

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/Languages/Czech.po

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-23 22:40:29 UTC (rev 6037)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-24 18:38:23 UTC (rev 6038)
@@ -13,6 +13,7 @@
          (eg. Installer didn't create Quick Launch icon) (#1460517)
   New translation: Galician (#2120685)
   Translation updates:
+  - Czech (r6038)
   - Ukrainian (#2131753)
 
 WinMerge 2.10 - 2008-09-17 (r5967)

Modified: branches/R2_10/Src/Languages/Czech.po
===================================================================
--- branches/R2_10/Src/Languages/Czech.po	2008-10-23 22:40:29 UTC (rev 6037)
+++ branches/R2_10/Src/Languages/Czech.po	2008-10-24 18:38:23 UTC (rev 6038)
@@ -286,7 +286,7 @@
 #: Merge.rc:450
 #, c-format
 msgid "&List..."
-msgstr ""
+msgstr "&Seznam..."
 
 #: Merge.rc:152
 #: Merge.rc:269
@@ -1842,7 +1842,7 @@
 #: Merge.rc:1165
 #, c-format
 msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Ignorovat rozd\xEDly v &konc\xEDch \xF8\xE1dk\xF9 (Windows/Unix/Mac)"
 
 #: Merge.rc:1168
 #, c-format
@@ -2139,7 +2139,7 @@
 #: Merge.rc:1321
 #, c-format
 msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "T&uto zpr\xE1vu ji\x9E p\xF8\xED\x9At\xEC nezobrazovat.\n(Tuto zpr\xE1vu m\xF9\x9Eete v\x9Edy znovu vyvolat z nab\xEDdky N\xE1pov\xECda.)"
 
 #: Merge.rc:1325
 #, c-format
@@ -2579,12 +2579,12 @@
 #: Merge.rc:1658
 #, c-format
 msgid "Plugins"
-msgstr ""
+msgstr "Pluginy"
 
 #: Merge.rc:1661
 #, c-format
 msgid "&Enable plugins"
-msgstr ""
+msgstr "&Povolit pluginy"
 
 #. StringFileInfo.Block
 #: Merge.rc:1691
@@ -3416,7 +3416,7 @@
 #: Merge.rc:2037
 #, c-format
 msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr ""
+msgstr "Filtry byly aktualizov\xE1ny. Chcete obnovit v\x9Aechna porovn\xE1n\xED slo\x9Eek?\n\nPokud nechcete obnovit v\x9Aechna porovn\xE1n\xED te\xEF, zvolte Ne a obnovte porovn\xE1n\xED pozd\xECji."
 
 #: Merge.rc:2043
 #, c-format
@@ -3511,12 +3511,12 @@
 #: Merge.rc:2071
 #, c-format
 msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Vracen\xED posledn\xED operace..."
 
 #: Merge.rc:2072
 #, c-format
 msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Opakov\xE1n\xED p\xF8edchoz\xED operace..."
 
 #: Merge.rc:2078
 #, c-format
@@ -4042,17 +4042,17 @@
 #: Merge.rc:2218
 #, c-format
 msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Opravdu chcete p\xF8esunout:"
 
 #: Merge.rc:2219
 #, c-format
 msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Opravdu chcete p\xF8esunout %d polo\x9Eek:"
 
 #: Merge.rc:2221
 #, c-format
 msgid "Confirm Move"
-msgstr ""
+msgstr "Potvrdit p\xF8esunut\xED"
 
 #: Merge.rc:2227
 #, c-format
@@ -4557,7 +4557,7 @@
 #: Merge.rc:2384
 #, c-format
 msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr ""
+msgstr "Konce \xF8\xE1dk\xF9 v souboru '%1' jsou rozd\xEDln\xFDch typ\xF9 (Windows/Unix/Mac).\nPodle aktu\xE1ln\xEDch mo\x9Enost\xED budou sjednoceny do hlavn\xEDho typu.\nChcete zm\xECnit mo\x9Enosti a zachovat rozd\xEDln\xE9 konce \xF8\xE1dk\xF9?"
 
 #: Merge.rc:2385
 #, c-format
@@ -5226,12 +5226,12 @@
 #: Merge.rc:2617
 #, c-format
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: Merge.rc:2619
 #, c-format
 msgid "Unpacker"
-msgstr ""
+msgstr "P\xF8evad\xEC\xE8"
 
 #: Merge.rc:2620
 #, c-format
@@ -5266,27 +5266,27 @@
 #: Merge.rc:2632
 #, c-format
 msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Zm\xECn\xED pro soubor/slo\x9Eku vlevo stav pouze pro \xE8ten\xED"
 
 #: Merge.rc:2633
 #, c-format
 msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Zm\xECn\xED pro soubor/slo\x9Eku vpravo stav pouze pro \xE8ten\xED"
 
 #: Merge.rc:2634
 #, c-format
 msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "P\xF8evede konce \xF8\xE1dk\xF9 na typ Windows"
 
 #: Merge.rc:2635
 #, c-format
 msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "P\xF8evede konce \xF8\xE1dk\xF9 na typ Unix"
 
 #: Merge.rc:2636
 #, c-format
 msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "P\xF8evede konce \xF8\xE1dk\xF9 na typ Mac"
 
 #: Merge.rc:2637
 #, c-format
@@ -5468,12 +5468,12 @@
 #: Merge.rc:2677
 #, c-format
 msgid "Select the current user interface language\nLanguage"
-msgstr ""
+msgstr "Umo\x9En\xED zvolit jazyk u\x9Eivatelsk\xE9ho prost\xF8ed\xED aplikace\nJazyk"
 
 #: Merge.rc:2678
 #, c-format
 msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr ""
+msgstr "Uk\xE1\x9Ee rozd\xEDly v \xF8\xE1dc\xEDch odli\x9Anou barvou\nRozd\xEDly v \xF8\xE1dc\xEDch"
 
 #: Merge.rc:2679
 #, c-format
@@ -5525,27 +5525,27 @@
 #: Merge.rc:2691
 #, c-format
 msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr ""
+msgstr "Posune na p\xF8edchoz\xED rozd\xEDl\nP\xF8edchoz\xED rozd\xEDl (Alt+Up)"
 
 #: Merge.rc:2692
 #, c-format
 msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr ""
+msgstr "Posune na dal\x9A\xED rozd\xEDl\nDal\x9A\xED rozd\xEDl (Alt+Down)"
 
 #: Merge.rc:2693
 #, c-format
 msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr ""
+msgstr "Posune na prvn\xED rozd\xEDl\nPrvn\xED rozd\xEDl (Alt+Home)"
 
 #: Merge.rc:2694
 #, c-format
 msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr ""
+msgstr "Posune na aktu\xE1ln\xED rozd\xEDl\nAktu\xE1ln\xED rozd\xEDl (Alt+Enter)"
 
 #: Merge.rc:2695
 #, c-format
 msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr ""
+msgstr "Posune na posledn\xED rozd\xEDl\nPosledn\xED rozd\xEDl (Alt+End)"
 
 #: Merge.rc:2696
 #, c-format
@@ -5634,7 +5634,7 @@
 #: Merge.rc:2718
 #, c-format
 msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Zobraz\xED seznam dostupn\xFDch plugin\xF9"
 
 #: Merge.rc:2719
 #, c-format
@@ -5674,7 +5674,7 @@
 #: Merge.rc:2731
 #, c-format
 msgid "Activates next visible file\nActivate next File"
-msgstr ""
+msgstr "Aktivovat n\xE1sleduj\xEDc\xED viditeln\xFD soubor\nAktivovat n\xE1sleduj\xEDc\xED soubor"
 
 #: Merge.rc:2732
 #, c-format
@@ -5804,7 +5804,7 @@
 #: Merge.rc:2788
 #, c-format
 msgid "No Highlighting"
-msgstr ""
+msgstr "\x8E\xE1dn\xE9 zv\xFDrazn\xECn\xED"
 
 #: Merge.rc:2789
 #, c-format


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

Revision: 6050
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6050&view=rev
Author:   kimmov
Date:     2008-10-29 20:07:21 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
BUG: [ 2101780 ] Different carriage return types: Auto-Update is needed

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/LocationView.cpp
    branches/R2_10/Src/LocationView.h
    branches/R2_10/Src/MergeEditView.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-29 20:05:02 UTC (rev 6049)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-29 20:07:21 UTC (rev 6050)
@@ -14,6 +14,8 @@
          (eg. Installer didn't create Quick Launch icon) (#1460517)
   BugFix: Giving path to file and folder to command line
    did not work (#2138560)
+  BugFix: If messagebox was shown during file loading location pane
+    didn't show any differences (#2101780)
   New translation: Galician (#2120685)
   Translation updates:
   - Czech (r6038)

Modified: branches/R2_10/Src/LocationView.cpp
===================================================================
--- branches/R2_10/Src/LocationView.cpp	2008-10-29 20:05:02 UTC (rev 6049)
+++ branches/R2_10/Src/LocationView.cpp	2008-10-29 20:07:21 UTC (rev 6050)
@@ -144,6 +144,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // CLocationView message handlers
 
+/**
+ * @brief Force recalculation and update of location pane.
+ * This method forces location pane to first recalculate its data and
+ * then repaint itself. This method bypasses location pane's caching
+ * of the diff data.
+ */
+void CLocationView::ForceRecalculate()
+{
+	m_bRecalculateBlocks = TRUE;
+	Invalidate();
+}
+
 /** 
  * @brief Update view.
  */

Modified: branches/R2_10/Src/LocationView.h
===================================================================
--- branches/R2_10/Src/LocationView.h	2008-10-29 20:05:02 UTC (rev 6049)
+++ branches/R2_10/Src/LocationView.h	2008-10-29 20:07:21 UTC (rev 6050)
@@ -72,6 +72,7 @@
 	void SetConnectMovedBlocks(int displayMovedBlocks);
 	void UpdateVisiblePos(int nTopLine = -1, int nBottomLine = -1);
 	void SetFrameHwnd(HWND hwndFrame);
+	void ForceRecalculate();
 
 protected:
 

Modified: branches/R2_10/Src/MergeEditView.cpp
===================================================================
--- branches/R2_10/Src/MergeEditView.cpp	2008-10-29 20:05:02 UTC (rev 6049)
+++ branches/R2_10/Src/MergeEditView.cpp	2008-10-29 20:07:21 UTC (rev 6050)
@@ -2769,12 +2769,13 @@
 }
 
 /**
- * @brief Force repaint of location pane
+ * @brief Force repaint of the location pane.
  */
 void CMergeEditView::RepaintLocationPane()
 {
+	// Must force recalculation due to caching of data in location pane.
 	if (m_pLocationView)
-		m_pLocationView->Invalidate();
+		m_pLocationView->ForceRecalculate();
 }
 
 /**


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

Revision: 6051
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6051&view=rev
Author:   kimmov
Date:     2008-10-29 20:21:55 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
PATCH: [ 2182788 ] Disable rest of the plugins calls

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/MergeDoc.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-29 20:07:21 UTC (rev 6050)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-10-29 20:21:55 UTC (rev 6051)
@@ -16,6 +16,7 @@
    did not work (#2138560)
   BugFix: If messagebox was shown during file loading location pane
     didn't show any differences (#2101780)
+  BugFix: Some calls made to plugins when plugins were disabled (#2182788)
   New translation: Galician (#2120685)
   Translation updates:
   - Czech (r6038)

Modified: branches/R2_10/Src/MergeDoc.cpp
===================================================================
--- branches/R2_10/Src/MergeDoc.cpp	2008-10-29 20:07:21 UTC (rev 6050)
+++ branches/R2_10/Src/MergeDoc.cpp	2008-10-29 20:21:55 UTC (rev 6051)
@@ -2130,9 +2130,12 @@
 	DWORD nRightSuccess = LoadOneFile(1, sRightFile.c_str(), bRORight,
 		filelocRight.encoding);
 
+	const BOOL bFiltersEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
+
 	// scratchpad : we don't call LoadFile, so
 	// we need to initialize the unpacker as a "do nothing" one
-	if (m_nBufferType[0] == BUFFER_UNNAMED && m_nBufferType[1] == BUFFER_UNNAMED)
+	if (bFiltersEnabled && m_nBufferType[0] == BUFFER_UNNAMED &&
+			m_nBufferType[1] == BUFFER_UNNAMED)
 		m_pInfoUnpacker->Initialize(PLUGIN_MANUAL);
 
 	// Bail out if either side failed
@@ -2207,9 +2210,12 @@
 	// Define the prediffer
 	PackingInfo * infoUnpacker = 0;
 	PrediffingInfo * infoPrediffer = 0;
-	m_pDirDoc->FetchPluginInfos(m_strBothFilenames.c_str(), &infoUnpacker, &infoPrediffer);
-	m_diffWrapper.SetPrediffer(infoPrediffer);
-	m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames);
+	if (bFiltersEnabled)
+	{
+		m_pDirDoc->FetchPluginInfos(m_strBothFilenames.c_str(), &infoUnpacker, &infoPrediffer);
+		m_diffWrapper.SetPrediffer(infoPrediffer);
+		m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames);
+	}
 
 	BOOL bBinary = FALSE;
 	nRescanResult = Rescan(bBinary, bIdentical);
@@ -2229,7 +2235,7 @@
 		// Note: If option enabled, and another side type is not recognized,
 		// we use recognized type for unrecognized side too.
 		String sextL, sextR;
-		if (m_pInfoUnpacker->textType.length())
+		if (bFiltersEnabled && m_pInfoUnpacker->textType.length())
 		{
 			sextL = sextR = m_pInfoUnpacker->textType;
 		}
@@ -2246,9 +2252,9 @@
 		if (syntaxHLEnabled)
 		{
 			bLeftTyped = pLeft->SetTextType(sextL.c_str());
-		pLeftDetail->SetTextType(sextL.c_str());
+			pLeftDetail->SetTextType(sextL.c_str());
 			bRightTyped = pRight->SetTextType(sextR.c_str());
-		pRightDetail->SetTextType(sextR.c_str());
+			pRightDetail->SetTextType(sextR.c_str());
 		}
 
 		// If other side didn't have recognized texttype, apply recognized


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

Revision: 6072
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6072&view=rev
Author:   kimmov
Date:     2008-11-06 15:11:13 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
PATCH: [ 2227131 ] Swedish.po + bugreport on broken translations...
 Submitted by Hans Eriksson

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/Languages/Swedish.po

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-04 23:43:47 UTC (rev 6071)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-06 15:11:13 UTC (rev 6072)
@@ -20,6 +20,7 @@
   New translation: Galician (#2120685)
   Translation updates:
   - Czech (r6038)
+  - Swedish (#2227131)
   - Ukrainian (#2131753)
 
 WinMerge 2.10 - 2008-09-17 (r5967)

Modified: branches/R2_10/Src/Languages/Swedish.po
===================================================================
--- branches/R2_10/Src/Languages/Swedish.po	2008-11-04 23:43:47 UTC (rev 6071)
+++ branches/R2_10/Src/Languages/Swedish.po	2008-11-06 15:11:13 UTC (rev 6072)
@@ -13,7 +13,7 @@
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-08-20 13:00+0100\n"
+"PO-Revision-Date: 2008-10-05 23:40+0100\n"
 "Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
 "Language-Team: Swedish <winmerge-translate@..."
 "MIME-Version: 1.0\n"
@@ -1304,7 +1304,9 @@
 #: Merge.rc:779
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge till\xE5ter att vissa meddelanderutor d\xF6ljs. Klicka p\xE5 \xC5terst\xE4ll-knappen f\xF6r att g\xF6ra alla meddelanderutor synliga igen."
+msgstr ""
+"WinMerge till\xE5ter att vissa meddelanderutor d\xF6ljs.\n"
+"Klicka p\xE5 \xC5terst\xE4ll-knappen f\xF6r att g\xF6ra alla meddelanderutor synliga igen."
 
 #: Merge.rc:781
 #, c-format
@@ -2140,8 +2142,12 @@
 
 #: Merge.rc:1321
 #, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "Visa inte detta &meddelande igen.\n(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"Visa inte detta &meddelande igen.\n"
+"(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)"
 
 #: Merge.rc:1325
 #, c-format
@@ -3047,8 +3053,12 @@
 
 #: Merge.rc:1888
 #, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "Utvecklare:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"Utvecklare:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
 
 #: Merge.rc:1889
 #, c-format
@@ -3417,8 +3427,14 @@
 
 #: Merge.rc:2037
 #, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr "Filtren \xE4r uppdaterade Vill du uppdatera alla \xF6ppna katalogj\xE4mf\xF6relser?\n\nOm du inte vill uppdatera alla j\xE4mf\xF6relser nu kan du v\xE4lja Nej och uppdatera j\xE4mf\xF6relser senare."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
+msgstr ""
+"Filtren \xE4r uppdaterade Vill du uppdatera alla \xF6ppna katalogj\xE4mf\xF6relser?\n"
+"\n"
+"Om du inte vill uppdatera alla j\xE4mf\xF6relser nu kan du v\xE4lja Nej och uppdatera j\xE4mf\xF6relser senare."
 
 #: Merge.rc:2043
 #, c-format
@@ -3510,15 +3526,17 @@
 msgid "Creating the report..."
 msgstr "Skapar rapport..."
 
+# Use action instead operation, like the rest of the undo/redo system.
 #: Merge.rc:2071
 #, c-format
 msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xC5ngrar den f\xF6rra \xE5tg\xE4rden"
 
+# Use action instead operation, like the rest of the undo/redo system.
 #: Merge.rc:2072
 #, c-format
 msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "G\xF6r om den tidigare \xE5tg\xE4rden"
 
 #: Merge.rc:2078
 #, c-format
@@ -3641,8 +3659,14 @@
 
 #: Merge.rc:2115
 #, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "Filen\n%1\n\xE4r inte en Konfliktfil."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"Filen\n"
+"%1\n"
+"\xE4r inte en Konfliktfil."
 
 #: Merge.rc:2121
 #, c-format
@@ -4015,7 +4039,8 @@
 msgstr ""
 "\xC4r du s\xE4ker p\xE5 du att vill ta bort\n"
 "\n"
-"%1 ?"
+"%1\n"
+"?"
 
 #: Merge.rc:2215
 #, c-format
@@ -4563,8 +4588,14 @@
 
 #: Merge.rc:2384
 #, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr "Radsluten \xE4r av olika typer (Windows/Unix/Mac) i filen '%1'.\n Med de aktuella inst\xE4llningarna, kommer de att \xE4ndras till den vanligaste typen.\n Vill du \xE4ndra i inst\xE4llningarna och bevara de olika radsluten ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
+msgstr ""
+"Radsluten \xE4r av olika typer (Windows/Unix/Mac) i filen '%1'.\n"
+" Med de aktuella inst\xE4llningarna, kommer de att \xE4ndras till den vanligaste typen.\n"
+" Vill du \xE4ndra i inst\xE4llningarna och bevara de olika radsluten ?"
 
 #: Merge.rc:2385
 #, c-format
@@ -4583,8 +4614,18 @@
 
 #: Merge.rc:2388
 #, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "Katalogen finns bara p\xE5 andra sidan och kan inte \xF6ppnas.\n\nVill du skapa en matchande katalog:\n%1\np\xE5 andra sidan och \xF6ppna dessa kataloger?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
+msgstr ""
+"Katalogen finns bara p\xE5 andra sidan och kan inte \xF6ppnas.\n"
+"\n"
+"Vill du skapa en matchande katalog:\n"
+"%1\n"
+"p\xE5 andra sidan och \xF6ppna dessa kataloger?"
 
 #: Merge.rc:2394
 #, c-format
@@ -5473,13 +5514,21 @@
 
 #: Merge.rc:2677
 #, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "V\xE4ljer spr\xE5k f\xF6r anv\xE4ndargr\xE4nssnittet\nSpr\xE5k"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"V\xE4ljer spr\xE5k f\xF6r anv\xE4ndargr\xE4nssnittet\n"
+"Spr\xE5k"
 
 #: Merge.rc:2678
 #, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "Visar skillnader inom rader med olika f\xE4rg\nVisa radskillnad"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"Visar skillnader inom rader med olika f\xE4rg\n"
+"Visa radskillnad"
 
 #: Merge.rc:2679
 #, c-format
@@ -5530,28 +5579,48 @@
 
 #: Merge.rc:2691
 #, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "G\xE5r till f\xF6reg\xE5ende skillnad\nF\xF6reg\xE5ende skillnad (Alt+Upp)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"G\xE5r till f\xF6reg\xE5ende skillnad\n"
+"F\xF6reg\xE5ende skillnad (Alt+Upp)"
 
 #: Merge.rc:2692
 #, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "G\xE5r till n\xE4sta skillnad\nN\xE4sta skillnad (Alt+Ner)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"G\xE5r till n\xE4sta skillnad\n"
+"N\xE4sta skillnad (Alt+Ner)"
 
 #: Merge.rc:2693
 #, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "G\xE5r till f\xF6rsta skillnaden\nF\xF6rsta skillnad (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"G\xE5r till f\xF6rsta skillnaden\n"
+"F\xF6rsta skillnad (Alt+Home)"
 
 #: Merge.rc:2694
 #, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "G\xE5r till aktuell skillnad\nAktuell skillnad (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"G\xE5r till aktuell skillnad\n"
+"Aktuell skillnad (Alt+Enter)"
 
 #: Merge.rc:2695
 #, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "G\xE5r till sista skillnaden\nSista skillnad (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"G\xE5r till sista skillnaden\n"
+"Sista skillnad (Alt+End)"
 
 #: Merge.rc:2696
 #, c-format
@@ -5679,9 +5748,12 @@
 
 #: Merge.rc:2731
 #, c-format
-msgid "Activates next visible file\nActivate next File"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
 msgstr ""
-"Aktiverar n\xE4sta synliga fil\nAktivera n\xE4sta fil"
+"Aktiverar n\xE4sta synliga fil\n"
+"Aktivera n\xE4sta fil"
 
 #: Merge.rc:2732
 #, c-format
@@ -5690,8 +5762,12 @@
 
 #: Merge.rc:2738
 #, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "\xD6ppnar WinMerge Hj\xE4lp\nWinMerge Hj\xE4lp"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"\xD6ppnar WinMerge Hj\xE4lp\n"
+"WinMerge Hj\xE4lp"
 
 #: Merge.rc:2739
 #, c-format
@@ -5710,13 +5786,21 @@
 
 #: Merge.rc:2742
 #, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "\xD6ppnar Releasenoteringsdokumentet\nReleasenoteringar"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"\xD6ppnar Releasenoteringsdokumentet\n"
+"Releasenoteringar"
 
 #: Merge.rc:2743
 #, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "\xD6ppnar \xD6vers\xE4ttningssidan\n\xD6vers\xE4ttningar"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"\xD6ppnar \xD6vers\xE4ttningssidan\n"
+"\xD6vers\xE4ttningar"
 
 #: Merge.rc:2749
 #, c-format


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

Revision: 6083
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6083&view=rev
Author:   kimmov
Date:     2008-11-12 16:47:29 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
PATCH: [ 2236651 ] An updated InnoSetup Swedish.isl file for WinMerge
 Submitted by Hans Eriksson

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-12 16:44:31 UTC (rev 6082)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-12 16:47:29 UTC (rev 6083)
@@ -3,6 +3,10 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.10.4
+  Translation updates:
+  - Swedish (#2236651)
+
 WinMerge 2.10.2 - 2008-11-06 (r6075)
   Change download URL to current URL (#2136765)
   Installer: create backup of ClearCase config file (#2129095)

Modified: branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl	2008-11-12 16:44:31 UTC (rev 6082)
+++ branches/R2_10/Installer/InnoSetup/Languages/Swedish.isl	2008-11-12 16:47:29 UTC (rev 6083)
@@ -336,7 +336,7 @@
 DanishLanguage=Danska menyer och dialoger
 DutchLanguage=Nederl\xE4ndska menyer och dialoger
 FrenchLanguage=Franska menyer och dialoger
-GalicianLanguage=Galician menus and dialogs
+GalicianLanguage=Galiciska menyer och dialoger
 GermanLanguage=Tyska menyer och dialoger
 GreekLanguage=Grekiska menyer och dialoger
 HungarianLanguage=Ungerska menyer och dialoger


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

Revision: 6120
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6120&view=rev
Author:   gerundt
Date:     2008-11-25 22:47:10 +0000 (Tue, 25 Nov 2008)

Log Message:
-----------
PATCH: [ 2329381 ] Add .Git to SourceControl.flt and fix ignore file rules

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Filters/SourceControl.flt

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-25 22:45:40 UTC (rev 6119)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-25 22:47:10 UTC (rev 6120)
@@ -4,6 +4,7 @@
 http://winmerge.org/tracker/[tracker-id]
 
 WinMerge 2.10.4
+  Add Git to Source Control filter and fix ignore file rules (#2329381)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Filters/SourceControl.flt
===================================================================
--- branches/R2_10/Filters/SourceControl.flt	2008-11-25 22:45:40 UTC (rev 6119)
+++ branches/R2_10/Filters/SourceControl.flt	2008-11-25 22:47:10 UTC (rev 6120)
@@ -12,15 +12,17 @@
 ## Filters for directories begin with d: 
 ## (Inline comments begin with " ##" and extend to the end of the line) 
 
-## f: *\.bzrignore$ ## Bazaar ignore file
-## f: *\.cvsignore$ ## CVS ignore file
-## f: *\.hgignore$ ## Mercurial ignore file
-## f: *\.svnignore$ ## Subversion ignore file
+## f: \.bzrignore$ ## Bazaar ignore file
+## f: \.cvsignore$ ## CVS ignore file
+## f: \.gitignore$ ## Git ignore file
+## f: \.hgignore$ ## Mercurial ignore file
+## f: \.svnignore$ ## Subversion ignore file
 
 f: \.(vs[sp])?scc$  ## Visual SourceSafe files
 
 d: \\\.svn$ ## Subversion working copy
 d: \\_svn$  ## Subversion working copy ASP.NET Hack
 d: \\cvs$   ## CVS control directory
+d: \\\.git$ ## Git directory
 d: \\\.bzr$ ## Bazaar branch
 d: \\\.hg$ ## Mercurial repository


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

Revision: 6122
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6122&view=rev
Author:   kimmov
Date:     2008-11-26 10:56:08 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
PATCH: [ 2327565 ] Patch for Bug 2309190
 Submitted by Chris Paulse

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Docs/Users/Contributors.txt
    branches/R2_10/Src/DirActions.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-26 10:51:59 UTC (rev 6121)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-11-26 10:56:08 UTC (rev 6122)
@@ -5,6 +5,7 @@
 
 WinMerge 2.10.4
   Add Git to Source Control filter and fix ignore file rules (#2329381)
+  Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_10/Docs/Users/Contributors.txt	2008-11-26 10:51:59 UTC (rev 6121)
+++ branches/R2_10/Docs/Users/Contributors.txt	2008-11-26 10:56:08 UTC (rev 6122)
@@ -153,6 +153,7 @@
 * Ryan Mott
 * Tim Musschoot
 * Marco De Paoli
+* Chris Paulse
 * Dan Pidcock
 * Vincent Osele
 * Scott Rasmussen

Modified: branches/R2_10/Src/DirActions.cpp
===================================================================
--- branches/R2_10/Src/DirActions.cpp	2008-11-26 10:51:59 UTC (rev 6121)
+++ branches/R2_10/Src/DirActions.cpp	2008-11-26 10:56:08 UTC (rev 6122)
@@ -748,6 +748,7 @@
 			act.dirflag = di.diffcode.isDirectory();
 			act.context = sel;
 			act.atype = actType;
+			act.UIOrigin = FileActionItem::UI_LEFT;
 			act.UIResult = FileActionItem::UI_DEL_LEFT;
 			actionScript.AddActionItem(act);
 			++selCount;
@@ -816,6 +817,7 @@
 			act.dirflag = di.diffcode.isDirectory();
 			act.context = sel;
 			act.atype = actType;
+			act.UIOrigin = FileActionItem::UI_RIGHT;
 			act.UIResult = FileActionItem::UI_DEL_RIGHT;
 			actionScript.AddActionItem(act);
 			++selCount;


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

Revision: 6153
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6153&view=rev
Author:   kimmov
Date:     2008-12-05 13:59:20 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
PATCH: [ 2391000 ] Installer: use translated Readme for Chinese Simplified

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Installer/InnoSetup/WinMerge.iss

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-05 13:56:30 UTC (rev 6152)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-05 13:59:20 UTC (rev 6153)
@@ -6,6 +6,7 @@
 WinMerge 2.10.4
   Add Git to Source Control filter and fix ignore file rules (#2329381)
   Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
+  Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-12-05 13:56:30 UTC (rev 6152)
+++ branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-12-05 13:59:20 UTC (rev 6153)
@@ -442,6 +442,7 @@
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Brazilian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: PortugueseBrazilian
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Bulgarian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Bulgarian
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Catalan.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Catalan
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseSimplified.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Simplified
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-French.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: French
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Greek.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Greek
 Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Romanian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Romanian


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

Revision: 6158
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6158&view=rev
Author:   kimmov
Date:     2008-12-07 15:14:16 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
PATCH: [ 2396437 ] Installer: Install all readme texts

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Installer/InnoSetup/WinMerge.iss

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-07 15:10:24 UTC (rev 6157)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-07 15:14:16 UTC (rev 6158)
@@ -7,6 +7,7 @@
   Add Git to Source Control filter and fix ignore file rules (#2329381)
   Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
   Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000)
+  Bugfix: Installer didn't install readme.txt for all translations (#2396437)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-12-07 15:10:24 UTC (rev 6157)
+++ branches/R2_10/Installer/InnoSetup/WinMerge.iss	2008-12-07 15:14:16 UTC (rev 6158)
@@ -378,11 +378,13 @@
 
 ; Language files
 Source: ..\..\Src\Languages\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian
 Source: ..\..\Src\Languages\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp
 Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian
 Source: ..\..\Src\Languages\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp
 Source: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan
 Source: ..\..\Src\Languages\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified
 Source: ..\..\Src\Languages\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp
@@ -402,6 +404,7 @@
 Source: ..\..\Src\Languages\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian
 Source: ..\..\Src\Languages\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
 Source: ..\..\Src\Languages\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp


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

Revision: 6179
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6179&view=rev
Author:   kimmov
Date:     2008-12-17 16:19:59 +0000 (Wed, 17 Dec 2008)

Log Message:
-----------
BUG: [ 2427946 ] Command line arguments does not work for Cygwin file pattern

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/MergeCmdLineInfo.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-17 15:11:58 UTC (rev 6178)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-17 16:19:59 UTC (rev 6179)
@@ -8,6 +8,8 @@
   Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190)
   Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000)
   Bugfix: Installer didn't install readme.txt for all translations (#2396437)
+  Bugfix: Could not give paths to commandline when started WinMerge
+    from Cygwin prompt (#2427946)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_10/Src/MergeCmdLineInfo.cpp	2008-12-17 15:11:58 UTC (rev 6178)
+++ branches/R2_10/Src/MergeCmdLineInfo.cpp	2008-12-17 16:19:59 UTC (rev 6179)
@@ -207,11 +207,16 @@
 {
 	String param;
 	bool flag;
+
 	while ((q = EatParam(q, param, &flag)) != 0)
 	{
 		if (!flag)
 		{
-			// Not a flag
+			// Its not a flag so it is a path
+			// Convert paths given in Linux-style ('/' as separator) given from
+			// Cygwin to Windows style ('\' as separator)
+			string_replace(param, String(_T("/")), String(_T("\\"))); 
+
 			// If shortcut, expand it first
 			if (paths_IsShortcut(param.c_str()))
 				param = ExpandShortcut(param.c_str());


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

Revision: 6217
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6217&view=rev
Author:   sdottaka
Date:     2008-12-21 12:20:09 +0000 (Sun, 21 Dec 2008)

Log Message:
-----------
BUG: [2372000] Ampersand in folder names ruins the project file

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/ProjectFile.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-21 12:18:33 UTC (rev 6216)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-21 12:20:09 UTC (rev 6217)
@@ -10,6 +10,8 @@
   Bugfix: Installer didn't install readme.txt for all translations (#2396437)
   Bugfix: Could not give paths to commandline when started WinMerge
     from Cygwin prompt (#2427946)
+  Bugfix: Cound not open project file that contains an ampersand 
+    character in folder names (#2372000)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Src/ProjectFile.cpp
===================================================================
--- branches/R2_10/Src/ProjectFile.cpp	2008-12-21 12:18:33 UTC (rev 6216)
+++ branches/R2_10/Src/ProjectFile.cpp	2008-12-21 12:20:09 UTC (rev 6217)
@@ -288,6 +288,20 @@
 }
 
 /**
+ * @brief Covert characters that are unsafe for use in XML
+ * @param [in] str The string to be converted
+ * @return The converted string
+ */
+static String EscapeXML(const String &str)
+{
+	String escapedStr = str;
+	string_replace(escapedStr, _T("&"), _T("&"));
+	string_replace(escapedStr, _T("<"), _T("&lt;"));
+	string_replace(escapedStr, _T(">"), _T("&gt;"));
+	return escapedStr;
+}
+
+/**
  * @brief Add paths data to the XML tree.
  * This function adds our paths data to the XML tree.
  * @param [in] parent Parent element for paths data.
@@ -300,29 +314,23 @@
 
 	if (!m_leftFile.IsEmpty())
 	{
-		LPCTSTR path;
 		element = scew_element_add(parent, Left_element_name);
-		path = m_leftFile.GetBuffer(MAX_PATH);
-		scew_element_set_contents(element, T2UTF8(path));
-		m_leftFile.ReleaseBuffer();
+		String path = m_leftFile;
+		scew_element_set_contents(element, T2UTF8(EscapeXML(path).c_str()));
 	}
 
 	if (!m_rightFile.IsEmpty())
 	{
-		LPCTSTR path;
 		element = scew_element_add(parent, Right_element_name);
-		path = m_rightFile.GetBuffer(MAX_PATH);
-		scew_element_set_contents(element, T2UTF8(path));
-		m_rightFile.ReleaseBuffer();
+		String path = m_rightFile;
+		scew_element_set_contents(element, T2UTF8(EscapeXML(path).c_str()));
 	}
 
 	if (!m_filter.IsEmpty())
 	{
-		LPCTSTR filter;
 		element = scew_element_add(parent, Filter_element_name);
-		filter = m_filter.GetBuffer(MAX_PATH);
-		scew_element_set_contents(element, T2UTF8(filter));
-		m_filter.ReleaseBuffer();
+		String filter = m_filter;
+		scew_element_set_contents(element, T2UTF8(EscapeXML(filter).c_str()));
 	}
 
 	element = scew_element_add(parent, Subfolders_element_name);


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

Revision: 6220
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6220&view=rev
Author:   sdottaka
Date:     2008-12-21 12:26:31 +0000 (Sun, 21 Dec 2008)

Log Message:
-----------
PATCH: [2292456] Patch for BUG:"Modified Date and Size" seems to ignore size

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/FolderCmp.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-21 12:25:26 UTC (rev 6219)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-21 12:26:31 UTC (rev 6220)
@@ -12,6 +12,8 @@
     from Cygwin prompt (#2427946)
   Bugfix: Cound not open project file that contains an ampersand 
     character in folder names (#2372000)
+  Bugfix: File compare method "Modified Date and Size" ignored file size
+    (#2455595)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Src/FolderCmp.cpp
===================================================================
--- branches/R2_10/Src/FolderCmp.cpp	2008-12-21 12:25:26 UTC (rev 6219)
+++ branches/R2_10/Src/FolderCmp.cpp	2008-12-21 12:26:31 UTC (rev 6220)
@@ -309,7 +309,7 @@
 		
 		// This is actual CMP_DATE_SIZE method..
 		// If file sizes differ mark them different
-		if (pCtxt->m_nCompMethod == CMP_DATE_SIZE && di.diffcode.isResultSame())
+		if (pCtxt->m_nCompMethod == CMP_DATE_SIZE)
 		{
 			if (di.left.size != di.right.size)
 			{


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

Revision: 6248
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6248&view=rev
Author:   kimmov
Date:     2008-12-27 09:55:14 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
BUG: [ 2458728 ] Need to remove control chars from command line
 Fix by Jochen

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/MergeCmdLineInfo.cpp

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-27 09:49:04 UTC (rev 6247)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2008-12-27 09:55:14 UTC (rev 6248)
@@ -14,6 +14,7 @@
     character in folder names (#2372000)
   Bugfix: File compare method "Modified Date and Size" ignored file size
     (#2455595)
+  Bugfix: Remove EOL characters from command line (#2458728)
   Translation updates:
   - Swedish (#2236651)
 

Modified: branches/R2_10/Src/MergeCmdLineInfo.cpp
===================================================================
--- branches/R2_10/Src/MergeCmdLineInfo.cpp	2008-12-27 09:49:04 UTC (rev 6247)
+++ branches/R2_10/Src/MergeCmdLineInfo.cpp	2008-12-27 09:55:14 UTC (rev 6248)
@@ -50,7 +50,7 @@
  */
 LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String &param, bool *flag)
 {
-	if (p && *(p += StrSpn(p, _T(" \t"))) == '\0')
+	if (p && *(p += StrSpn(p, _T(" \t\r\n"))) == '\0')
 		p = 0;
 	LPCTSTR q = PathGetArgs(p);
 	if (q > p && flag)
@@ -74,8 +74,8 @@
 		CharLower(&*param.begin());
 	}
 	// Strip any leading or trailing whitespace or quotes
-	param.erase(0, param.find_first_not_of(_T(" \t\"")));
-	param.erase(param.find_last_not_of(_T(" \t\"")) + 1);
+	param.erase(0, param.find_first_not_of(_T(" \t\r\n\"")));
+	param.erase(param.find_last_not_of(_T(" \t\r\n\"")) + 1);
 	return q;
 }
 
@@ -215,7 +215,7 @@
 			// Its not a flag so it is a path
 			// Convert paths given in Linux-style ('/' as separator) given from
 			// Cygwin to Windows style ('\' as separator)
-			string_replace(param, String(_T("/")), String(_T("\\"))); 
+			string_replace(param, _T("/"), _T("\\"));
 
 			// If shortcut, expand it first
 			if (paths_IsShortcut(param.c_str()))


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

Revision: 6286
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6286&view=rev
Author:   kimmov
Date:     2009-01-06 14:10:29 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
PATCH: [ 2481022 ] Updated Dutch translation
 Submitted by Thomas De Rocker

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Docs/Users/Contributors.txt
    branches/R2_10/Src/Languages/Dutch.po

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2009-01-06 13:29:24 UTC (rev 6285)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2009-01-06 14:10:29 UTC (rev 6286)
@@ -10,12 +10,13 @@
   Bugfix: Installer didn't install readme.txt for all translations (#2396437)
   Bugfix: Could not give paths to commandline when started WinMerge
     from Cygwin prompt (#2427946)
-  Bugfix: Cound not open project file that contains an ampersand 
+  Bugfix: Could not open project file that contains an ampersand 
     character in folder names (#2372000)
   Bugfix: File compare method "Modified Date and Size" ignored file size
     (#2455595)
   Bugfix: Remove EOL characters from command line (#2458728)
   Translation updates:
+  - Dutch (#2481022)
   - Swedish (#2236651)
 
 WinMerge 2.10.2 - 2008-11-06 (r6075)

Modified: branches/R2_10/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_10/Docs/Users/Contributors.txt	2009-01-06 13:29:24 UTC (rev 6285)
+++ branches/R2_10/Docs/Users/Contributors.txt	2009-01-06 14:10:29 UTC (rev 6286)
@@ -50,6 +50,7 @@
 
 * Dutch:
   Michel Coene
+  Thomas De Rocker
   Ronald Schaap
 
 * French:	

Modified: branches/R2_10/Src/Languages/Dutch.po
===================================================================
--- branches/R2_10/Src/Languages/Dutch.po	2009-01-06 13:29:24 UTC (rev 6285)
+++ branches/R2_10/Src/Languages/Dutch.po	2009-01-06 14:10:29 UTC (rev 6286)
@@ -12,9 +12,9 @@
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2008-08-09 00:09+0000\n"
 "PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: Thomas De Rocker <thomasderocker@..."
 "Language-Team: Dutch <winmerge-translate@..."
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP1252\n"
@@ -52,7 +52,7 @@
 #: Merge.rc:75
 #, c-format
 msgid "&Select Line Difference"
-msgstr ""
+msgstr "&Selecteer Regelverschil"
 
 #: Merge.rc:77
 #, c-format
@@ -92,7 +92,7 @@
 #: Merge.rc:86
 #, c-format
 msgid "Op&en"
-msgstr ""
+msgstr "Op&enen"
 
 #: Merge.rc:88
 #: Merge.rc:527
@@ -127,7 +127,7 @@
 #: Merge.rc:310
 #, c-format
 msgid "&New\tCtrl+N"
-msgstr ""
+msgstr "&Nieuw\tCtrl+N"
 
 #: Merge.rc:113
 #: Merge.rc:194
@@ -141,26 +141,26 @@
 #: Merge.rc:312
 #, c-format
 msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Op&en Conflictbestand..."
 
 #: Merge.rc:116
 #: Merge.rc:197
 #: Merge.rc:314
 #, c-format
 msgid "Open Pro&ject...\tCtrl+J"
-msgstr ""
+msgstr "Pro&ject openen...\tCtrl+J"
 
 #: Merge.rc:117
 #: Merge.rc:198
 #: Merge.rc:315
 #, c-format
 msgid "Sa&ve Project..."
-msgstr ""
+msgstr "Project Op&slaan..."
 
 #: Merge.rc:119
 #, c-format
 msgid "Recent Projects"
-msgstr ""
+msgstr "Recente Projecten"
 
 #: Merge.rc:121
 #: Merge.rc:205
@@ -195,56 +195,56 @@
 #: Merge.rc:387
 #, c-format
 msgid "Select &Font..."
-msgstr "Kies  &Font..."
+msgstr "Kies &Font..."
 
 #: Merge.rc:130
 #: Merge.rc:225
 #: Merge.rc:388
 #, c-format
 msgid "Use Default F&ont"
-msgstr "Gebruik standaard  F&ont"
+msgstr "Gebruik standaard F&ont"
 
 #: Merge.rc:132
 #: Merge.rc:227
 #: Merge.rc:409
 #, c-format
 msgid "&Toolbar"
-msgstr ""
+msgstr "&Werkbalk"
 
 #: Merge.rc:134
 #: Merge.rc:229
 #: Merge.rc:411
 #, c-format
 msgid "&None"
-msgstr ""
+msgstr "Geen"
 
 #: Merge.rc:135
 #: Merge.rc:230
 #: Merge.rc:412
 #, c-format
 msgid "&Small"
-msgstr ""
+msgstr "Klein"
 
 #: Merge.rc:136
 #: Merge.rc:231
 #: Merge.rc:413
 #, c-format
 msgid "&Big"
-msgstr ""
+msgstr "Groot"
 
 #: Merge.rc:138
 #: Merge.rc:233
 #: Merge.rc:415
 #, c-format
 msgid "&Status Bar"
-msgstr "&Status Balk"
+msgstr "&Statusbalk"
 
 #: Merge.rc:139
 #: Merge.rc:234
 #: Merge.rc:416
 #, c-format
 msgid "Ta&b Bar"
-msgstr ""
+msgstr "Tab-balk"
 
 #: Merge.rc:141
 #: Merge.rc:237
@@ -258,35 +258,35 @@
 #: Merge.rc:442
 #, c-format
 msgid "&Tools"
-msgstr ""
+msgstr "&Tools"
 
 #: Merge.rc:145
 #: Merge.rc:261
 #: Merge.rc:444
 #, c-format
 msgid "&Filters..."
-msgstr ""
+msgstr "&Filters..."
 
 #: Merge.rc:146
 #: Merge.rc:262
 #: Merge.rc:445
 #, c-format
 msgid "&Generate Patch..."
-msgstr ""
+msgstr "Patch &Genereren..."
 
 #: Merge.rc:148
 #: Merge.rc:265
 #: Merge.rc:448
 #, c-format
 msgid "&Plugins"
-msgstr "&Plug-ins"
+msgstr "&Plugins"
 
 #: Merge.rc:150
 #: Merge.rc:267
 #: Merge.rc:450
 #, c-format
 msgid "&List..."
-msgstr ""
+msgstr "&Lijst..."
 
 #: Merge.rc:152
 #: Merge.rc:269
@@ -321,21 +321,21 @@
 #: Merge.rc:464
 #, c-format
 msgid "&Debug"
-msgstr ""
+msgstr "&Debug"
 
 #: Merge.rc:161
 #: Merge.rc:278
 #: Merge.rc:466
 #, c-format
 msgid "&Load Config..."
-msgstr ""
+msgstr "Configuratie &Laden..."
 
 #: Merge.rc:162
 #: Merge.rc:279
 #: Merge.rc:467
 #, c-format
 msgid "&Reset Options"
-msgstr ""
+msgstr "Instellingen &Resetten"
 
 #: Merge.rc:164
 #: Merge.rc:281
@@ -356,7 +356,7 @@
 #: Merge.rc:472
 #, c-format
 msgid "Clo&se All"
-msgstr ""
+msgstr "Alles &Sluiten"
 
 #: Merge.rc:169
 #: Merge.rc:286
@@ -377,7 +377,7 @@
 #: Merge.rc:477
 #, c-format
 msgid "Tile &Vertically"
-msgstr "&Vertikaal verdelen"
+msgstr "&Verticaal verdelen"
 
 #: Merge.rc:173
 #: Merge.rc:290
@@ -392,35 +392,35 @@
 #: Merge.rc:1913
 #, c-format
 msgid "&Help"
-msgstr ""
+msgstr "&Help"
 
 #: Merge.rc:177
 #: Merge.rc:294
 #: Merge.rc:482
 #, c-format
 msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge Help\tF1"
 
 #: Merge.rc:179
 #: Merge.rc:296
 #: Merge.rc:484
 #, c-format
 msgid "R&elease Notes"
-msgstr ""
+msgstr "Uitgave-opme&rkingen"
 
 #: Merge.rc:180
 #: Merge.rc:297
 #: Merge.rc:485
 #, c-format
 msgid "&Translations"
-msgstr ""
+msgstr "Ver&talingen"
 
 #: Merge.rc:181
 #: Merge.rc:298
 #: Merge.rc:486
 #, c-format
 msgid "C&onfiguration"
-msgstr ""
+msgstr "C&onfiguratie"
 
 #: Merge.rc:182
 #: Merge.rc:299
@@ -434,7 +434,7 @@
 #: Merge.rc:489
 #, c-format
 msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
 
 #: Merge.rc:185
 #: Merge.rc:302
@@ -458,7 +458,7 @@
 #: Merge.rc:203
 #, c-format
 msgid "File En&coding"
-msgstr ""
+msgstr "Bestands&codering"
 
 #: Merge.rc:209
 #: Merge.rc:359
@@ -469,42 +469,42 @@
 #: Merge.rc:215
 #, c-format
 msgid "Show &Identical Items"
-msgstr ""
+msgstr "Toon &Identieke Items"
 
 #: Merge.rc:216
 #, c-format
 msgid "Show &Different Items"
-msgstr ""
+msgstr "Toon Verschillen&de Items"
 
 #: Merge.rc:217
 #, c-format
 msgid "Show L&eft Unique Items"
-msgstr ""
+msgstr "Toon Linkse Unieke Items"
 
 #: Merge.rc:218
 #, c-format
 msgid "Show Ri&ght Unique Items"
-msgstr ""
+msgstr "Toon Rechtse Unieke Items"
 
 #: Merge.rc:219
 #, c-format
 msgid "Show S&kipped Items"
-msgstr ""
+msgstr "Toon Overgeslagen Items"
 
 #: Merge.rc:220
 #, c-format
 msgid "S&how Binary Files"
-msgstr ""
+msgstr "Toon Binary Files"
 
 #: Merge.rc:222
 #, c-format
 msgid "Show Hidd&en Items"
-msgstr ""
+msgstr "Toon Verborgen Items"
 
 #: Merge.rc:235
 #, c-format
 msgid "Compa&re Statistics"
-msgstr ""
+msgstr "Ve&rgelijk Statistieken"
 
 #: Merge.rc:239
 #: Merge.rc:422
@@ -515,18 +515,18 @@
 #: Merge.rc:240
 #, c-format
 msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "Selectie Ve&rversen\tCtrl+F5"
 
 #: Merge.rc:242
 #: Merge.rc:424
 #, c-format
 msgid "&Merge"
-msgstr ""
+msgstr "Sa&menvoegen"
 
 #: Merge.rc:244
 #, c-format
 msgid "Co&mpare\tEnter"
-msgstr ""
+msgstr "Vergelijken\tEnter"
 
 #: Merge.rc:246
 #: Merge.rc:426
@@ -562,7 +562,7 @@
 #: Merge.rc:433
 #, c-format
 msgid "Copy to &Right\tAlt+Right"
-msgstr "Kopieer naar  &Rechts\tAlt+Right"
+msgstr "Kopieer naar &Rechts\tAlt+Right"
 
 #: Merge.rc:254
 #: Merge.rc:434
@@ -573,7 +573,7 @@
 #: Merge.rc:256
 #, c-format
 msgid "&Delete\tDel"
-msgstr ""
+msgstr "Wissen\tDel"
 
 #: Merge.rc:260
 #: Merge.rc:558
@@ -585,7 +585,7 @@
 #: Merge.rc:446
 #, c-format
 msgid "Generate &Report..."
-msgstr ""
+msgstr "&Rapport Genereren..."
 
 #: Merge.rc:317
 #, c-format
@@ -617,37 +617,37 @@
 #: Merge.rc:329
 #, c-format
 msgid "&Print..."
-msgstr ""
+msgstr "&Afdrukken..."
 
 #: Merge.rc:330
 #, c-format
 msgid "Page Se&tup"
-msgstr ""
+msgstr "Pagina-in&stelling"
 
 #: Merge.rc:331
 #, c-format
 msgid "Print Previe&w"
-msgstr ""
+msgstr "Afdrukvoorbeeld"
 
 #: Merge.rc:336
 #, c-format
 msgid "&Convert Line Endings to"
-msgstr ""
+msgstr "&Converteer regeleindes naar"
 
 #: Merge.rc:338
 #, c-format
 msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
 
 #: Merge.rc:339
 #, c-format
 msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
 
 #: Merge.rc:340
 #, c-format
 msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
 
 #: Merge.rc:343
 #, c-format
@@ -657,7 +657,7 @@
 #: Merge.rc:345
 #, c-format
 msgid "&File Encoding..."
-msgstr ""
+msgstr "Bestandscodering..."
 
 #: Merge.rc:351
 #, c-format
@@ -687,7 +687,7 @@
 #: Merge.rc:358
 #, c-format
 msgid "Select Line &Difference\tF4"
-msgstr ""
+msgstr "Selecteer Regelverschillen\tF4"
 
 #: Merge.rc:361
 #, c-format
@@ -702,7 +702,7 @@
 #: Merge.rc:364
 #, c-format
 msgid "&Scripts"
-msgstr ""
+msgstr "&Scripts"
 
 #: Merge.rc:366
 #: Merge.rc:2752
@@ -713,73 +713,73 @@
 #: Merge.rc:369
 #, c-format
 msgid "Advanced"
-msgstr ""
+msgstr "Geavanceerd"
 
 #: Merge.rc:371
 #, c-format
 msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr ""
+msgstr "&Kopieer Met Regelnummers\tCtrl+Shift+C"
 
 #: Merge.rc:374
 #, c-format
 msgid "&Bookmarks"
-msgstr ""
+msgstr "&Bladwijzers"
 
 #: Merge.rc:376
 #, c-format
 msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr ""
+msgstr "Bladwijzer Aan/Uit\tCtrl+F2"
 
 #: Merge.rc:377
 #, c-format
 msgid "&Next Bookmark\tF2"
-msgstr ""
+msgstr "Volge&nde Bladwijzer\tF2"
 
 #: Merge.rc:378
 #, c-format
 msgid "&Previous bookmark\tShift+F2"
-msgstr ""
+msgstr "Vo&rige Bladwijzer\tShift+F2"
 
 #: Merge.rc:379
 #, c-format
 msgid "&Clear All Bookmarks"
-msgstr ""
+msgstr "Alle Bladwijzers Wissen"
 
 #: Merge.rc:381
 #, c-format
 msgid "&Go To...\tCtrl+G"
-msgstr ""
+msgstr "&Ga Naar...\tCtrl+G"
 
 #: Merge.rc:389
 #, c-format
 msgid "&Zoom"
-msgstr ""
+msgstr "&Zoom"
 
 #: Merge.rc:391
 #, c-format
 msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Zoom &In\tCtrl++"
 
 #: Merge.rc:392
 #, c-format
 msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Zoom &Uit\tCtrl+-"
 
 #. Zoom to normal
 #: Merge.rc:393
 #, c-format
 msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normaal\tCtrl+*"
 
 #: Merge.rc:395
 #, c-format
 msgid "Syntax Highlight"
-msgstr ""
+msgstr "Syntaxmarkering"
 
 #: Merge.rc:400
 #, c-format
 msgid "&Lock Panes"
-msgstr ""
+msgstr "Vensters Vastzetten"
 
 #: Merge.rc:401
 #, c-format
@@ -789,32 +789,32 @@
 #: Merge.rc:402
 #, c-format
 msgid "Vie&w Line Differences"
-msgstr ""
+msgstr "Bekijk Regelverschillen"
 
 #: Merge.rc:403
 #, c-format
 msgid "View Line &Numbers"
-msgstr ""
+msgstr "Bekijk Regel&nummers"
 
 #: Merge.rc:404
 #, c-format
 msgid "View &Margins"
-msgstr ""
+msgstr "Bekijk &Marges"
 
 #: Merge.rc:405
 #, c-format
 msgid "W&rap Lines"
-msgstr ""
+msgstr "Automatische Te&rugloop"
 
 #: Merge.rc:407
 #, c-format
 msgid "Sw&ap Panes"
-msgstr ""
+msgstr "Wissel Vensters"
 
 #: Merge.rc:417
 #, c-format
 msgid "Diff &Pane"
-msgstr ""
+msgstr "Verschilvenster"
 
 #: Merge.rc:418
 #, c-format
@@ -844,22 +844,22 @@
 #: Merge.rc:457
 #, c-format
 msgid "&Prediffer"
-msgstr ""
+msgstr "Voorvergelijking"
 
 #: Merge.rc:498
 #, c-format
 msgid "Comp&are"
-msgstr ""
+msgstr "Vergelijken"
 
 #: Merge.rc:499
 #, c-format
 msgid "Co&mpare Special"
-msgstr ""
+msgstr "Vergelijken speciaal"
 
 #: Merge.rc:501
 #, c-format
 msgid "&XML"
-msgstr ""
+msgstr "&XML"
 
 #: Merge.rc:506
 #, c-format
@@ -923,12 +923,12 @@
 #: Merge.rc:522
 #, c-format
 msgid "Re&name"
-msgstr ""
+msgstr "&Naam wijzigen"
 
 #: Merge.rc:523
 #, c-format
 msgid "&Hide Items"
-msgstr ""
+msgstr "Items Verbergen"
 
 #: Merge.rc:525
 #, c-format
@@ -993,7 +993,7 @@
 #: Merge.rc:554
 #, c-format
 msgid "&Refresh"
-msgstr ""
+msgstr "Ve&rnieuwen"
 
 #: Merge.rc:566
 #, c-format
@@ -1043,12 +1043,12 @@
 #: Merge.rc:658
 #, c-format
 msgid "About WinMerge"
-msgstr ""
+msgstr "Over WinMerge"
 
 #: Merge.rc:664
 #, c-format
 msgid "(Private Build)"
-msgstr ""
+msgstr "(Private Versie)"
 
 #: Merge.rc:665
 #, c-format
@@ -1075,12 +1075,12 @@
 #: Merge.rc:1666
 #, c-format
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: Merge.rc:670
 #, c-format
 msgid "Contributors"
-msgstr ""
+msgstr "Medewerkers"
 
 #: Merge.rc:677
 #, c-format
@@ -1117,7 +1117,7 @@
 #: Merge.rc:1603
 #, c-format
 msgid "&Filter:"
-msgstr ""
+msgstr "&Filter:"
 
 #: Merge.rc:693
 #: Merge.rc:1605
@@ -1144,7 +1144,7 @@
 #: Merge.rc:700
 #, c-format
 msgid "Status:"
-msgstr ""
+msgstr "Status:"
 
 #: Merge.rc:702
 #: Merge.rc:732
@@ -1169,7 +1169,7 @@
 #: Merge.rc:1339
 #, c-format
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
 #: Merge.rc:704
 #, c-format
@@ -1179,17 +1179,17 @@
 #: Merge.rc:711
 #, c-format
 msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visual SourceSafe"
 
 #: Merge.rc:716
 #, c-format
 msgid "Database:"
-msgstr ""
+msgstr "Database:"
 
 #: Merge.rc:719
 #, c-format
 msgid "Project:"
-msgstr ""
+msgstr "Project:"
 
 #: Merge.rc:722
 #, c-format
@@ -1272,39 +1272,39 @@
 #: Merge.rc:765
 #, c-format
 msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "Vragen bij &sluiten van meerdere vensters"
 
 #: Merge.rc:767
 #, c-format
 msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "Behoud bestandstijd bij bestandsvergelijking"
 
 #: Merge.rc:770
 #, c-format
 msgid "O&pen-dialog Auto-Completion:"
-msgstr ""
+msgstr "Auto-Aanvullen O&penen-venster:"
 
 #: Merge.rc:773
 #, c-format
 msgid "Enable multiple compare windows for"
-msgstr ""
+msgstr "Activeer meerdere vergelijkingsvensters voor"
 
 #: Merge.rc:775
 #: Merge.rc:1618
 #, c-format
 msgid "&Folder compare"
-msgstr ""
+msgstr "Mappen vergelijken"
 
 #: Merge.rc:777
 #: Merge.rc:1620
 #, c-format
 msgid "Fil&e compare"
-msgstr ""
+msgstr "B&estanden vergelijken"
 
 #: Merge.rc:779
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr ""
+msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Reset-knop om alle berichtvensters terug zichtbaar te maken."
 
 #: Merge.rc:781
 #, c-format
@@ -1353,7 +1353,7 @@
 #: Merge.rc:813
 #, c-format
 msgid "D&on't wrap end of file"
-msgstr ""
+msgstr "Bij einde bestand st&oppen"
 
 #: Merge.rc:816
 #, c-format
@@ -1420,7 +1420,7 @@
 #: Merge.rc:2164
 #, c-format
 msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rational ClearCase"
 
 #: Merge.rc:863
 #, c-format
@@ -1436,7 +1436,7 @@
 #: Merge.rc:871
 #, c-format
 msgid "CheckIn after checkout"
-msgstr ""
+msgstr "CheckIn na checkout"
 
 #: Merge.rc:877
 #, c-format
@@ -1446,7 +1446,7 @@
 #: Merge.rc:880
 #, c-format
 msgid "Enable Line Filters"
-msgstr ""
+msgstr "Activeer Regelfilters"
 
 #: Merge.rc:883
 #, c-format
@@ -1456,22 +1456,22 @@
 #: Merge.rc:890
 #, c-format
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 #: Merge.rc:891
 #, c-format
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #: Merge.rc:892
 #, c-format
 msgid "Edit"
-msgstr ""
+msgstr "Bewerken"
 
 #: Merge.rc:893
 #, c-format
 msgid "Remove"
-msgstr ""
+msgstr "Verwijderen"
 
 #: Merge.rc:898
 #: Merge.rc:1924
@@ -1520,17 +1520,17 @@
 #: Merge.rc:947
 #, c-format
 msgid "Selected Moved:"
-msgstr "Geselecteerd verplaatst verschil:"
+msgstr "Geselecteerd verplaatst:"
 
 #: Merge.rc:954
 #, c-format
 msgid "Word Difference:"
-msgstr ""
+msgstr "Woordverschil:"
 
 #: Merge.rc:961
 #, c-format
 msgid "Selected Word Diff:"
-msgstr ""
+msgstr "Geselect. Woordverschil:"
 
 #: Merge.rc:968
 #: Merge.rc:1054
@@ -1562,7 +1562,7 @@
 #: Merge.rc:989
 #, c-format
 msgid "Integration"
-msgstr ""
+msgstr "Integratie"
 
 #: Merge.rc:990
 #, c-format
@@ -1577,7 +1577,7 @@
 #: Merge.rc:994
 #, c-format
 msgid "In&clude subfolders by default"
-msgstr ""
+msgstr "Submappen standaard bijvoegen"
 
 #: Merge.rc:996
 #, c-format
@@ -1587,27 +1587,27 @@
 #: Merge.rc:999
 #, c-format
 msgid "&Filter folder:"
-msgstr ""
+msgstr "&Filter map:"
 
 #: Merge.rc:1001
 #, c-format
 msgid "B&rowse..."
-msgstr ""
+msgstr "Bladeren..."
 
 #: Merge.rc:1002
 #, c-format
 msgid "Temporary files folder"
-msgstr ""
+msgstr "Map met tijdelijke bestanden"
 
 #: Merge.rc:1003
 #, c-format
 msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "Tijdelijke map van het systeem"
 
 #: Merge.rc:1005
 #, c-format
 msgid "C&ustom folder:"
-msgstr ""
+msgstr "Eigen map:"
 
 #: Merge.rc:1008
 #: Merge.rc:1024
@@ -1658,7 +1658,7 @@
 #: Merge.rc:1036
 #, c-format
 msgid "&Context:"
-msgstr ""
+msgstr "&Context:"
 
 #: Merge.rc:1039
 #, c-format
@@ -1708,12 +1708,12 @@
 #: Merge.rc:1080
 #, c-format
 msgid "Move &Up"
-msgstr ""
+msgstr "Verplaats Omhoog"
 
 #: Merge.rc:1081
 #, c-format
 msgid "Move &Down"
-msgstr ""
+msgstr "Verplaats Omlaag"
 
 #: Merge.rc:1091
 #, c-format
@@ -1743,7 +1743,7 @@
 #: Merge.rc:1114
 #, c-format
 msgid " Folder Compare Progress"
-msgstr ""
+msgstr "Voortgang Mapvergelijking"
 
 #: Merge.rc:1117
 #: Merge.rc:1874
@@ -1754,17 +1754,17 @@
 #: Merge.rc:1122
 #, c-format
 msgid "Comparing items..."
-msgstr ""
+msgstr "Items vergelijken..."
 
 #: Merge.rc:1123
 #, c-format
 msgid "Items compared:"
-msgstr ""
+msgstr "Items vergeleken:"
 
 #: Merge.rc:1124
 #, c-format
 msgid "Items total:"
-msgstr ""
+msgstr "Totaal aantal items:"
 
 #: Merge.rc:1130
 #, c-format
@@ -1840,7 +1840,7 @@
 #: Merge.rc:1165
 #, c-format
 msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Negee&r regeleindeteken-verschillen (Windows/Unix/Mac)"
 
 #: Merge.rc:1168
 #, c-format
@@ -1850,12 +1850,12 @@
 #: Merge.rc:1170
 #, c-format
 msgid "&Match similar lines"
-msgstr ""
+msgstr "Laat gelijke lijnen overeenko&men"
 
 #: Merge.rc:1172
 #, c-format
 msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden"
 
 #: Merge.rc:1175
 #, c-format
@@ -1865,18 +1865,18 @@
 #: Merge.rc:1178
 #, c-format
 msgid "S&top after first difference"
-msgstr ""
+msgstr "S&top na eerste verschil"
 
 #: Merge.rc:1181
 #, c-format
 msgid "Filter Comments"
-msgstr ""
+msgstr "Filter-commentaar"
 
 #: Merge.rc:1188
 #: Merge.rc:1923
 #, c-format
 msgid "Editor"
-msgstr ""
+msgstr "Editor"
 
 #: Merge.rc:1191
 #, c-format
@@ -1916,22 +1916,22 @@
 #: Merge.rc:1205
 #, c-format
 msgid "Line Difference Coloring"
-msgstr ""
+msgstr "Kleur van Regelverschillen"
 
 #: Merge.rc:1207
 #, c-format
 msgid "View line differences"
-msgstr ""
+msgstr "Bekijk regelverschillen"
 
 #: Merge.rc:1209
 #, c-format
 msgid "&Character level"
-msgstr ""
+msgstr "Tekenniveau"
 
 #: Merge.rc:1211
 #, c-format
 msgid "&Word-level:"
-msgstr ""
+msgstr "&Woordniveau:"
 
 #: Merge.rc:1226
 #, c-format
@@ -1941,17 +1941,17 @@
 #: Merge.rc:1232
 #, c-format
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: Merge.rc:1233
 #, c-format
 msgid "Install..."
-msgstr ""
+msgstr "Installeren..."
 
 #: Merge.rc:1234
 #, c-format
 msgid "New..."
-msgstr ""
+msgstr "Nieuw..."
 
 #: Merge.rc:1235
 #, c-format
@@ -1961,7 +1961,7 @@
 #: Merge.rc:1236
 #, c-format
 msgid "Delete..."
-msgstr ""
+msgstr "Wissen"
 
 #: Merge.rc:1242
 #, c-format
@@ -2001,7 +2001,7 @@
 #: Merge.rc:1259
 #, c-format
 msgid "Discard All"
-msgstr ""
+msgstr "Alles Negeren"
 
 #: Merge.rc:1266
 #: Merge.rc:1514
@@ -2013,12 +2013,12 @@
 #: Merge.rc:1269
 #, c-format
 msgid "Default Codepage"
-msgstr ""
+msgstr "Standaard Codetabel"
 
 #: Merge.rc:1270
 #, c-format
 msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr ""
+msgstr "Selecteer de standaard veronderstelde codetabel bij laden van niet-Unicodebestanden:"
 
 #: Merge.rc:1272
 #, c-format
@@ -2027,7 +2027,7 @@
 "need to restart session"
 msgstr ""
 "Tekenset detecteren voor deze bestanden: .html, .rc \n"
-"herstarten sessie noodzakelijk"
+"Herstarten sessie noodzakelijk"
 
 #: Merge.rc:1275
 #, c-format
@@ -2037,7 +2037,7 @@
 #: Merge.rc:1277
 #, c-format
 msgid "According to WinMerge User Interface"
-msgstr "Volgens WinMerge gebruikersinterface"
+msgstr "Volgens WinMerge-gebruikersinterface"
 
 #: Merge.rc:1279
 #, c-format
@@ -2047,12 +2047,12 @@
 #: Merge.rc:1287
 #, c-format
 msgid "WinMerge - Archive support disabled"
-msgstr ""
+msgstr "WinMerge - Archiefondersteuning uitgeschakeld"
 
 #: Merge.rc:1290
 #, c-format
 msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr ""
+msgstr "Kon geen 7-zipversie detecteren (niet ge\xEFnstalleerd?)"
 
 #: Merge.rc:1293
 #, c-format
@@ -2060,11 +2060,13 @@
 "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
 "essential components to be copied to the program directory for standalone operation."
 msgstr ""
+"Archiefondersteuning vereist dat 7-zip 3.11 of later ge\xEFnstalleerd is op uw pc, of dat de\n"
+"essenti\xEBle onderdelen gekopieerd worden naar de programmamap voor standalone-werking."
 
 #: Merge.rc:1295
 #, c-format
 msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr ""
+msgstr "Er moet ook een overeenkomstige interface-plugin (Merge7z*.dll) aanwezig zijn op het pad."
 
 #: Merge.rc:1297
 #, c-format
@@ -2072,11 +2074,13 @@
 "Please use the version of 7-Zip recommended below until interface plugins for later\n"
 "versions become available."
 msgstr ""
+"Gebruik a.u.b. de hieronder aangeraden versie van 7-zip totdat interface-plugins voor\n"
+"latere versies beschikbaar worden."
 
 #: Merge.rc:1299
 #, c-format
 msgid "Version"
-msgstr ""
+msgstr "Versie"
 
 #: Merge.rc:1301
 #, c-format
@@ -2084,128 +2088,134 @@
 "Plugin required\n"
 "(dllbuild %04u)"
 msgstr ""
+"Plugin nodig\n"
+"(dllbuild %04u)"
 
 #: Merge.rc:1303
 #, c-format
 msgid "Recommended version of 7-Zip:"
-msgstr ""
+msgstr "Aangeraden versie van 7-Zip:"
 
 #: Merge.rc:1306
 #: Merge.rc:1309
 #, c-format
 msgid "present"
-msgstr ""
+msgstr "aanwezig"
 
 #: Merge.rc:1307
 #, c-format
 msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Merge7z000U.dll"
 
 #: Merge.rc:1310
 #, c-format
 msgid "7-Zip software installed on your computer:"
-msgstr ""
+msgstr "7-Zip software ge\xEFnstalleerd op deze pc:"
 
 #: Merge.rc:1312
 #: Merge.rc:1317
 #, c-format
 msgid "none"
-msgstr ""
+msgstr "geen"
 
 #: Merge.rc:1314
 #, c-format
 msgid "missing"
-msgstr ""
+msgstr "ontbreekt"
 
 #: Merge.rc:1315
 #, c-format
 msgid "7-Zip components for standalone operation:"
-msgstr ""
+msgstr "7-Zip-onderdelen voor standalone-werking:"
 
 #: Merge.rc:1319
 #, c-format
 msgid "outdated"
-msgstr ""
+msgstr "verouderd"
 
 #: Merge.rc:1320
 #, c-format
 msgid "Plugins on path:"
-msgstr ""
+msgstr "Plugins op pad:"
 
 #: Merge.rc:1321
 #, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
 msgstr ""
+"Toon dit bericht niet meer.\n"
+"(U kan dit bericht altijd terugroepen van het Help-menu.)"
 
 #: Merge.rc:1325
 #, c-format
 msgid "Plugin Download"
-msgstr ""
+msgstr "Plugin-download"
 
 #: Merge.rc:1334
 #, c-format
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #: Merge.rc:1345
 #, c-format
 msgid " Categories"
-msgstr ""
+msgstr " Categorie\xEBn"
 
 #: Merge.rc:1347
 #, c-format
 msgid "Import..."
-msgstr ""
+msgstr "Importeren..."
 
 #: Merge.rc:1348
 #, c-format
 msgid "Export..."
-msgstr ""
+msgstr "Exporteren..."
 
 #: Merge.rc:1356
 #, c-format
 msgid "Keywords:"
-msgstr ""
+msgstr "Sleutelwoorden:"
 
 #: Merge.rc:1357
 #, c-format
 msgid "Function names:"
-msgstr ""
+msgstr "Functienamen"
 
 #: Merge.rc:1358
 #, c-format
 msgid "Comments:"
-msgstr ""
+msgstr "Opmerkingen:"
 
 #: Merge.rc:1359
 #, c-format
 msgid "Numbers:"
-msgstr ""
+msgstr "Nummers:"
 
 #: Merge.rc:1360
 #, c-format
 msgid "Operators:"
-msgstr ""
+msgstr "Operators:"
 
 #: Merge.rc:1361
 #, c-format
 msgid "Strings:"
-msgstr ""
+msgstr "Strings:"
 
 #: Merge.rc:1362
 #, c-format
 msgid "Preprocessor:"
-msgstr ""
+msgstr "Preprocessor:"
 
 #: Merge.rc:1363
 #, c-format
 msgid "User 1:"
-msgstr ""
+msgstr "Gebruiker 1:"
 
 #: Merge.rc:1364
 #, c-format
 msgid "User 2:"
-msgstr ""
+msgstr "Gebruiker 2:"
 
 #: Merge.rc:1369
 #: Merge.rc:1374
@@ -2218,7 +2228,7 @@
 #: Merge.rc:1409
 #, c-format
 msgid "Bold"
-msgstr ""
+msgstr "Vet"
 
 #: Merge.rc:1417
 #, c-format
@@ -2228,7 +2238,7 @@
 #: Merge.rc:1420
 #, c-format
 msgid "Report &File:"
-msgstr ""
+msgstr "Rapporteer &Bestand"
 
 #: Merge.rc:1423
 #: Merge.rc:1597
@@ -2236,88 +2246,88 @@
 #: Merge.rc:1628
 #, c-format
 msgid "Browse..."
-msgstr ""
+msgstr "Bladeren..."
 
 #: Merge.rc:1424
 #, c-format
 msgid "&Style:"
-msgstr ""
+msgstr "&Stijl:"
 
 #: Merge.rc:1427
 #, c-format
 msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "Naar Klembord Kopi\xEBren"
 
 #: Merge.rc:1435
 #, c-format
 msgid "Shared or Private Filter"
-msgstr ""
+msgstr "Gedeelde of Persoonlijke Filter"
 
 #: Merge.rc:1438
 #, c-format
 msgid "Which type of filter do you want to create?"
-msgstr ""
+msgstr "Welk type filter wilt u maken?"
 
 #: Merge.rc:1440
 #, c-format
 msgid "Shared Filter (for all users on this machine)"
-msgstr ""
+msgstr "Gedeelde Filter (voor alle gebruikers op deze pc)"
 
 #: Merge.rc:1442
 #, c-format
 msgid "Private Filter (only for current user)"
-msgstr ""
+msgstr "Private Filter (alleen voor huidige gebruiker)"
 
 #: Merge.rc:1450
 #: Merge.rc:1930
 #, c-format
 msgid "Archive Support"
-msgstr ""
+msgstr "Archiefondersteuning"
 
 #: Merge.rc:1453
 #, c-format
 msgid "Archive support requires 7-Zip plugin installed:"
-msgstr ""
+msgstr "Archiefondersteuning vereist dat de 7-Zip-plugin ge\xEFnstalleerd is:"
 
 #: Merge.rc:1455
 #, c-format
 msgid "Download 7-zip Plugin"
-msgstr ""
+msgstr "Download de 7-Zip-plugin"
 
 #: Merge.rc:1456
 #, c-format
 msgid "&Enable archive file support"
-msgstr ""
+msgstr "Activeer archiefbestand-ondersteuning"
 
 #: Merge.rc:1458
 #, c-format
 msgid "&Use stand-alone 7-Zip if available"
-msgstr ""
+msgstr "Gebr&uik stand-alone 7-Zip indien beschikbaar"
 
 #: Merge.rc:1461
 #, c-format
 msgid "U&se local 7-Zip from WinMerge folder"
-msgstr ""
+msgstr "Gebruik lokale 7-Zip van WinMerge-map"
 
 #: Merge.rc:1463
 #, c-format
 msgid "&Detect archive type from file signature"
-msgstr ""
+msgstr "&Detecteer archieftype via bestandssignatuur"
 
 #: Merge.rc:1471
 #, c-format
 msgid "Compare Statistics"
-msgstr ""
+msgstr "Vergelijkingsstatistieken"
 
 #: Merge.rc:1474
 #, c-format
 msgid "Folders:"
-msgstr ""
+msgstr "Mappen:"
 
 #: Merge.rc:1475
 #, c-format
 msgid "Files:"
-msgstr ""
+msgstr "Bestanden:"
 
 #: Merge.rc:1476
 #: Merge.rc:2310
@@ -2328,28 +2338,28 @@
 #: Merge.rc:1477
 #, c-format
 msgid "Text:"
-msgstr ""
+msgstr "Tekst:"
 
 #: Merge.rc:1480
 #: Merge.rc:1499
 #, c-format
 msgid "Binary:"
-msgstr ""
+msgstr "Binary:"
 
 #: Merge.rc:1483
 #, c-format
 msgid "Unique"
-msgstr ""
+msgstr "Uniek"
 
 #: Merge.rc:1484
 #, c-format
 msgid "Left:"
-msgstr ""
+msgstr "Links:"
 
 #: Merge.rc:1489
 #, c-format
 msgid "Right:"
-msgstr ""
+msgstr "Rechts:"
 
 #: Merge.rc:1494
 #: Merge.rc:2305
@@ -2360,54 +2370,54 @@
 #: Merge.rc:1503
 #, c-format
 msgid "Total:"
-msgstr ""
+msgstr "Totaal:"
 
 #: Merge.rc:1508
 #, c-format
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #: Merge.rc:1517
 #, c-format
 msgid "Affects"
-msgstr ""
+msgstr "Aanpassingen"
 
 #: Merge.rc:1520
 #: Merge.rc:1523
 #, c-format
 msgid "(Affects)"
-msgstr ""
+msgstr "(Aanpassingen)"
 
 #: Merge.rc:1524
 #, c-format
 msgid "Select Codepage for"
-msgstr ""
+msgstr "Selecteer Codetabel voor"
 
 #: Merge.rc:1525
 #, c-format
 msgid "&File Loading:"
-msgstr ""
+msgstr "Bestanden Laden:"
 
 #: Merge.rc:1527
 #: Merge.rc:1530
 #, c-format
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: Merge.rc:1528
 #, c-format
 msgid "File &Saving:"
-msgstr ""
+msgstr "Bestanden Op&slaan:"
 
 #: Merge.rc:1531
 #, c-format
 msgid "&Use same codepage for both"
-msgstr ""
+msgstr "Gebr&uik dezelfde codetabel voor beide"
 
 #: Merge.rc:1534
 #, c-format
 msgid "&Apply"
-msgstr ""
+msgstr "Toepassen"
 
 #: Merge.rc:1535
 #: Merge.rc:1896
@@ -2418,169 +2428,169 @@
 #: Merge.rc:1540
 #, c-format
 msgid "Test Filter"
-msgstr ""
+msgstr "Test Filter"
 
 #: Merge.rc:1543
 #, c-format
 msgid "Testing filter ..."
-msgstr ""
+msgstr "Filter testen..."
 
 #: Merge.rc:1545
 #, c-format
 msgid "&Enter text to test:"
-msgstr ""
+msgstr "G&eef tekst op om te testen:"
 
 #: Merge.rc:1547
 #, c-format
 msgid "&Folder Name"
-msgstr ""
+msgstr "Mapnaam"
 
 #: Merge.rc:1549
 #, c-format
 msgid "Result:"
-msgstr ""
+msgstr "Resultaat:"
 
 #: Merge.rc:1553
 #, c-format
 msgid "&Test"
-msgstr ""
+msgstr "&Test"
 
 #: Merge.rc:1554
 #, c-format
 msgid "&Close"
-msgstr ""
+msgstr "Sluiten"
 
 #: Merge.rc:1562
 #, c-format
 msgid "&Use customized text colors"
-msgstr ""
+msgstr "Gebr&uik aangepaste tekstkleuren"
 
 #: Merge.rc:1565
 #, c-format
 msgid "Custom text colors"
-msgstr ""
+msgstr "Aangepaste tekstkleuren"
 
 #: Merge.rc:1567
 #, c-format
 msgid "Whitespace:"
-msgstr ""
+msgstr "Witruimte:"
 
 #: Merge.rc:1568
 #, c-format
 msgid "Regular text:"
-msgstr ""
+msgstr "Gewone tekst:"
 
 #: Merge.rc:1569
 #, c-format
 msgid "Selection:"
-msgstr ""
+msgstr "Selectie:"
 
 #: Merge.rc:1592
 #, c-format
 msgid "Paths"
-msgstr ""
+msgstr "Paden"
 
 #: Merge.rc:1598
 #, c-format
 msgid "R&ead-only"
-msgstr ""
+msgstr "All&een-lezen"
 
 #: Merge.rc:1602
 #, c-format
 msgid "Re&ad-only"
-msgstr ""
+msgstr "&Alleen-lezen"
 
 #: Merge.rc:1608
 #, c-format
 msgid "Open..."
-msgstr ""
+msgstr "Openen..."
 
 #: Merge.rc:1609
 #, c-format
 msgid "Save..."
-msgstr ""
+msgstr "Opslaan..."
 
 #: Merge.rc:1614
 #: Merge.rc:1931
 #, c-format
 msgid "Backup Files"
-msgstr ""
+msgstr "Backupbestanden"
 
 #: Merge.rc:1617
 #, c-format
 msgid "Create backup files in:"
-msgstr ""
+msgstr "Maak backupbestanden in:"
 
 #: Merge.rc:1622
 #, c-format
 msgid "Create backup files into:"
-msgstr ""
+msgstr "Maak backupbestanden binnen:"
 
 #: Merge.rc:1623
 #, c-format
 msgid "&Original file's folder"
-msgstr ""
+msgstr "Map van &origineel bestand"
 
 #: Merge.rc:1625
 #, c-format
 msgid "&Global backup folder:"
-msgstr ""
+msgstr "&Globale backupmap:"
 
 #: Merge.rc:1629
 #, c-format
 msgid "Backup filename:"
-msgstr ""
+msgstr "Bestandsnaam backup:"
 
 #: Merge.rc:1630
 #, c-format
 msgid "&Append .bak -extension"
-msgstr ""
+msgstr "Voeg .b&ak-extensie toe"
 
 #: Merge.rc:1632
 #, c-format
 msgid "A&ppend timestamp"
-msgstr ""
+msgstr "Voeg tijdstem&pel toe"
 
 #: Merge.rc:1639
 #: Merge.rc:2220
 #, c-format
 msgid "Confirm Copy"
-msgstr ""
+msgstr "Bevestig Kopi\xEBren"
 
 #: Merge.rc:1643
 #, c-format
 msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "Bent u zeker dat u XXX items wilt kopi\xEBren?"
 
 #: Merge.rc:1645
 #, c-format
 msgid "From left"
-msgstr ""
+msgstr "Van links"
 
 #: Merge.rc:1648
 #, c-format
 msgid "To right"
-msgstr ""
+msgstr "Naar rechts"
 
 #: Merge.rc:1651
 #, c-format
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: Merge.rc:1652
 #, c-format
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #: Merge.rc:1658
 #, c-format
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: Merge.rc:1661
 #, c-format
 msgid "&Enable plugins"
-msgstr ""
+msgstr "Plugins activeren"
 
 #. StringFileInfo.Block
 #: Merge.rc:1691
@@ -2602,32 +2612,32 @@
 #: Merge.rc:1728
 #, c-format
 msgid "EXT"
-msgstr ""
+msgstr "UIT"
 
 #: Merge.rc:1729
 #, c-format
 msgid "CAP"
-msgstr ""
+msgstr "CAP"
 
 #: Merge.rc:1730
 #, c-format
 msgid "NUM"
-msgstr ""
+msgstr "NUM"
 
 #: Merge.rc:1731
 #, c-format
 msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
 
 #: Merge.rc:1732
 #, c-format
 msgid "OVR"
-msgstr ""
+msgstr "OVR"
 
 #: Merge.rc:1733
 #, c-format
 msgid "REC"
-msgstr ""
+msgstr "OPN"
 
 #: Merge.rc:1739
 #, c-format
@@ -2645,7 +2655,7 @@
 "Open (Ctrl+O)"
 msgstr ""
 "Een bestaand document openen.\n"
-"Openen"
+"Openen (Ctrl+O)"
 
 #: Merge.rc:1741
 #, c-format
@@ -2707,13 +2717,13 @@
 "Display full pages\n"
 "Print Preview"
 msgstr ""
-"Afdrukvoorbeeld.\n"
-"Afdruk voorbeeld"
+"Toon volledige pagina's\n"
+"Afdrukvoorbeeld"
 
 #: Merge.rc:1752
 #, c-format
 msgid "Make all hidden items visible again"
-msgstr ""
+msgstr "Maak alle verborgen items terug zichtbaar"
 
 #: Merge.rc:1758
 #, c-format
@@ -2721,31 +2731,33 @@
 "Open project file\n"
 "Project file (Ctrl+J)"
 msgstr ""
+"Open projectbestand\n"
+"Projectbestand (Ctrl+J)"
 
 #: Merge.rc:1759
 #, c-format
 msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Onbekende fout bij poging tot openen van projectbestand"
 
 #: Merge.rc:1760
 #, c-format
 msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Onbekende fout bij poging tot opslaan van projectbestand"
 
 #: Merge.rc:1761
 #, c-format
 msgid "Project File"
-msgstr ""
+msgstr "Projectbestand"
 
 #: Merge.rc:1762
 #, c-format
 msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Projectbestand met succes geladen."
 
 #: Merge.rc:1763
 #, c-format
 msgid "Project file successfully saved."
-msgstr ""
+msgstr "Projectbestand met succes opgeslagen."
 
 #: Merge.rc:1764
 #, c-format
@@ -2753,6 +2765,8 @@
 "Save current paths and options to project file\n"
 "Save Project File"
 msgstr ""
+"Huidige paden en opties opslaan naar projectbestand\n"
+"Projectbestand Opslaan"
 
 #: Merge.rc:1769
 #, c-format
@@ -2799,7 +2813,7 @@
 "Next Pane"
 msgstr ""
 "Ga naar het volgende venster deel.\n"
-"Volgende deel"
+"Volgende Venster"
 
 #: Merge.rc:1797
 #, c-format
@@ -2808,7 +2822,7 @@
 "Previous Pane"
 msgstr ""
 "Ga naar het vorige venster deel.\n"
-"Vorige deel"
+"Vorige Venster"
 
 #: Merge.rc:1803
 #, c-format
@@ -2942,11 +2956,17 @@
 "Show or hide the tab bar\n"
 "Toggle TabBar"
 msgstr ""
+"Toon of verberg de tab-balk\n"
+"Tab-balk aan/uit"
 
 #: Merge.rc:1828
 #, c-format
-msgid "Automatically resize panes\nLock Panes"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
 msgstr ""
+"Stel venstergrootte automatisch in\n"
+"Vensters Vastzetten"
 
 #: Merge.rc:1834
 #, c-format
@@ -3004,18 +3024,46 @@
 "Close print preview mode\n"
 "Cancel Preview"
 msgstr ""
-"Afdrukvoorbeeld sluiten.\n"
+"Afdrukvoorbeeld sluiten\n"
 "Afsluiten voorbeeld"
 
 #: Merge.rc:1860
 #, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
 msgstr ""
+"\n"
+"BestandsVergelijking\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.BestandsVergelijking\n"
+"WinMerge BestandsVergelijking"
 
 #: Merge.rc:1861
 #, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
 msgstr ""
+"\n"
+"MapVergelijking\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.MapVergelijking\n"
+"WinMerge MapVergelijking"
 
 #: Merge.rc:1868
 #, c-format
@@ -3035,13 +3083,17 @@
 
 #: Merge.rc:1888
 #, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
 msgstr ""
+"Ontwikkelaars:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
 
 #: Merge.rc:1889
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr ""
+msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is gratis software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details."
 
 #: Merge.rc:1895
 #, c-format
@@ -3116,42 +3168,42 @@
 #: Merge.rc:1925
 #, c-format
 msgid "Syntax colors"
-msgstr ""
+msgstr "Syntaxkleuren"
 
 #: Merge.rc:1926
 #, c-format
 msgid "Text Colors"
-msgstr ""
+msgstr "Tekstkleuren"
 
 #: Merge.rc:1928
 #, c-format
 msgid "Version Control"
-msgstr ""
+msgstr "Versiebeheer"
 
 #: Merge.rc:1938
 #, c-format
 msgid "To:"
-msgstr ""
+msgstr "Naar:"
 
 #: Merge.rc:1939
 #, c-format
 msgid "From left:"
-msgstr ""
+msgstr "Van links:"
 
 #: Merge.rc:1940
 #, c-format
 msgid "To left:"
-msgstr ""
+msgstr "Naar links:"
 
 #: Merge.rc:1941
 #, c-format
 msgid "From right:"
-msgstr ""
+msgstr "Van rechts:"
 
 #: Merge.rc:1942
 #, c-format
 msgid "To right:"
-msgstr ""
+msgstr "Naar rechts:"
 
 #: Merge.rc:1948
 #, c-format
@@ -3161,12 +3213,12 @@
 #: Merge.rc:1949
 #, c-format
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
 
 #: Merge.rc:1955
 #, c-format
 msgid "Options (%1)"
-msgstr "Eigenschappen"
+msgstr "Opties (%1)"
 
 #: Merge.rc:1956
 #, c-format
@@ -3181,7 +3233,7 @@
 #: Merge.rc:1958
 #, c-format
 msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "De geselecteerde wijziging van het lettertype wordt niet verwerkt in de openstaande vensters."
+msgstr "De geselecteerde wijziging van het lettertype wordt niet toegepast in de openstaande vensters."
 
 #: Merge.rc:1960
 #, c-format
@@ -3190,6 +3242,9 @@
 "\n"
 "Please use values 1 - %1."
 msgstr ""
+"Waarde in Tabgrootte-veld is niet binnen acceptatiebereik van WinMerge\n"
+"\n"
+"Gebruik waarden 1 - %1."
 
 #: Merge.rc:1962
 #, c-format
@@ -3198,6 +3253,9 @@
 "\n"
 "Please re-start WinMerge after the reset."
 msgstr ""
+"Bent u zeker dat u alle WinMerge-opties wilt herstellen naar de standaardwaarden?\n"
+"\n"
+"Herstart WinMerge na herstellen."
 
 #: Merge.rc:1968
 #, c-format
@@ -3217,72 +3275,72 @@
 #: Merge.rc:1971
 #, c-format
 msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
-msgstr ""
+msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||"
 
 #: Merge.rc:1973
 #, c-format
 msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||"
 
 #: Merge.rc:1979
 #, c-format
 msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Bestanden (*.*)|*.*||"
 
 #: Merge.rc:1980
 #, c-format
 msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||"
 
 #: Merge.rc:1981
 #, c-format
 msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||"
 
 #: Merge.rc:1987
 #, c-format
 msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
 
 #: Merge.rc:1988
 #, c-format
 msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
 
 #: Merge.rc:1989
 #, c-format
 msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
 
 #: Merge.rc:1990
 #, c-format
 msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
 
 #: Merge.rc:1996
 #, c-format
 msgid "Full Contents"
-msgstr ""
+msgstr "Volledige Inhoud"
 
 #: Merge.rc:1997
 #, c-format
 msgid "Quick Contents"
-msgstr ""
+msgstr "Snelle Inhoud"
 
 #: Merge.rc:1998
 #, c-format
 msgid "Modified Date"
-msgstr "Laatst veranderd datum"
+msgstr "Datum Laatste Wijziging"
 
 #: Merge.rc:1999
 #, c-format
 msgid "Modified Date and Size"
-msgstr ""
+msgstr "Aangepaste Datum en Grootte"
 
 #: Merge.rc:2000
 #, c-format
 msgid "Size"
-msgstr ""
+msgstr "Grootte"
 
 #: Merge.rc:2006
 #: Merge.rc:2616
@@ -3293,33 +3351,33 @@
 #: Merge.rc:2007
 #, c-format
 msgid "Location"
-msgstr "Lokatie"
+msgstr "Locatie"
 
 #: Merge.rc:2008
 #, c-format
 msgid "Filters"
-msgstr ""
+msgstr "Filters"
 
 #: Merge.rc:2009
 #, c-format
 msgid "[F] "
-msgstr ""
+msgstr "[F] "
 
 #: Merge.rc:2010
 #: Merge.rc:2618
 #, c-format
 msgid "Description"
-msgstr ""
+msgstr "Beschrijving"
 
 #: Merge.rc:2011
 #, c-format
 msgid "Select filename for new filter"
-msgstr ""
+msgstr "Selecteer bestandsnaam voor nieuwe filter"
 
 #: Merge.rc:2012
 #, c-format
 msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||"
 
 #: Merge.rc:2014
 #, c-format
@@ -3329,6 +3387,10 @@
 "Please copy file %1 to WinMerge/Filters -folder:\n"
 "%2."
 msgstr ""
+"Kan bestandsfilter-sjabloon niet vinden!\n"
+"\n"
+"Kopieer bestand %1 naar map WinMerge/Filters:\n"
+"%2."
 
 #: Merge.rc:2016
 #, c-format
@@ -3338,6 +3400,10 @@
 "\n"
 "Please make sure the folder exists and is writable."
 msgstr ""
+"Kan filtersjabloonbestand niet kopi\xEBren naar filtermap:\n"
+"%1\n"
+"\n"
+"Ga na of de map bestaat en schrijfbaar is."
 
 #: Merge.rc:2018
 #, c-format
@@ -3346,6 +3412,9 @@
 "\n"
 "Please select filter folder in Options/System."
 msgstr ""
+"Filterbestandsmap van gebruiker is niet gedefinieerd!\n"
+"\n"
+"Selecteer filtermap in Opties/Systeem."
 
 #: Merge.rc:2020
 #, c-format
@@ -3355,11 +3424,15 @@
 "\n"
 "Maybe the file is read-only?"
 msgstr ""
+"Wissen van filterbestand mislukt:\n"
+"%1\n"
+"\n"
+"Misschien is het bestand alleen-lezen?"
 
 #: Merge.rc:2021
 #, c-format
 msgid "Locate filter file to install"
-msgstr ""
+msgstr "Localiseer te installeren filterbestand"
 
 #: Merge.rc:2023
 #, c-format
@@ -3368,21 +3441,30 @@
 "\n"
 "Could not copy new filter file to filter folder."
 msgstr ""
+"Installeren filterbestand mislukt.\n"
+"\n"
+"Kon nieuwe filter niet kopi\xEBren naar filtermap."
 
 #: Merge.rc:2025
 #, c-format
 msgid "Filter file already exists. Overwrite existing filter?"
-msgstr ""
+msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?"
 
 #: Merge.rc:2031
 #, c-format
 msgid "Regular expression"
-msgstr ""
+msgstr "Reguliere expressie"
 
 #: Merge.rc:2037
 #, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
 msgstr ""
+"Filters werden ge\xFCpdatet. Wilt u alle geopende mapvergelijkingen vernieuwen?\n"
+"\n"
+"Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen later vernieuwen."
 
 #: Merge.rc:2043
 #, c-format
@@ -3417,12 +3499,12 @@
 #: Merge.rc:2054
 #, c-format
 msgid "Theirs File"
-msgstr ""
+msgstr "Hun Bestand"
 
 #: Merge.rc:2055
 #, c-format
 msgid "Mine File"
-msgstr ""
+msgstr "Mijn Bestand"
 
 #: Merge.rc:2061
 #, c-format
@@ -3472,17 +3554,17 @@
 #: Merge.rc:2070
 #, c-format
 msgid "Creating the report..."
-msgstr ""
+msgstr "Rapport genereren..."
 
 #: Merge.rc:2071
 #, c-format
 msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Laatste operatie ongedaan maken..."
 
 #: Merge.rc:2072
 #, c-format
 msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Vorige operatie opnieuw doen..."
 
 #: Merge.rc:2078
 #, c-format
@@ -3528,12 +3610,12 @@
 #: Merge.rc:2091
 #, c-format
 msgid "Item %1 of %2"
-msgstr ""
+msgstr "Item %1 van %2"
 
 #: Merge.rc:2092
 #, c-format
 msgid "Items: %1"
-msgstr ""
+msgstr "Items: %1"
 
 #: Merge.rc:2098
 #, c-format
@@ -3601,12 +3683,18 @@
 #: Merge.rc:2114
 #, c-format
 msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "Analyseren van conflictbestand mislukt."
 
 #: Merge.rc:2115
 #, c-format
-msgid "The file\n%1\nis not a conflict file."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
 msgstr ""
+"Bestand\n"
+"%1\n"
+"is geen conflictbestand."
 
 #: Merge.rc:2121
 #, c-format
@@ -3641,6 +3729,10 @@
 "\n"
 "Continue anyway?"
 msgstr ""
+"Kon geen backup maken van origineel bestand:\n"
+"%1\n"
+"\n"
+"Toch doorgaan?"
 
 #: Merge.rc:2128
 #, c-format
@@ -3743,6 +3835,9 @@
 "\n"
 "Refresh documents before continuing."
 msgstr ""
+"Kan geen verschillen samenvoegen wanneer documenten niet gelijklopend zijn.\n"
+"\n"
+"Vernieuw documenten voordat u doorgaat."
 
 #: Merge.rc:2147
 #, c-format
@@ -3786,6 +3881,9 @@
 " Please, check config spec of used view.\n"
 " Undo checkout operation?"
 msgstr ""
+"Versie-systeem gaf een fout bij een poging tot een bestands-checkin.\n"
+" Controleer configuratie-specificaties van de gebruikte weergave.\n"
+" Checkout ongedaan maken?"
 
 #: Merge.rc:2155
 #, c-format
@@ -3793,6 +3891,8 @@
 "Versioning System returned an error while attempting to undo checkout the file.\n"
 " Please, check config spec of used view. "
 msgstr ""
+"Versie-systeem gaf een fout bij een poging tot het ongedaan maken van een bestands-checkout.\n"
+" Controleer configuratie-specificaties van de gebruikte weergave."
 
 #: Merge.rc:2161
 #: Merge.rc:2600
@@ -3813,24 +3913,24 @@
 #: Merge.rc:2165
 #, c-format
 msgid "Break at whitespace"
-msgstr ""
+msgstr "Afbreken bij witruimte"
 
 #: Merge.rc:2166
 #, c-format
 msgid "Break at whitespace or punctuation"
-msgstr ""
+msgstr "Afbreken bij witruimte of interpunctie"
 
 #: Merge.rc:2172
 #: Merge.rc:2174
 #, c-format
 msgid "Copy selected item to named directory"
-msgstr ""
+msgstr "Kopieer geselecteerd item naar genoemde map"
 
 #: Merge.rc:2173
 #: Merge.rc:2175
 #, c-format
 msgid "Copy selected item to custom directory"
-msgstr ""
+msgstr "Kopieer geselecteerd item naar aangepaste map"
 
 #: Merge.rc:2176
 #, c-format
@@ -3850,12 +3950,12 @@
 #: Merge.rc:2179
 #, c-format
 msgid "Hide selected item(s) (on the fly filter)"
-msgstr ""
+msgstr "Verberg geselecteerd(e) item(s) (on-the-fly-filter)"
 
 #: Merge.rc:2180
 #, c-format
 msgid "Rename selected item on both sides"
-msgstr ""
+msgstr "Herbenoem geselecteerd item aan beide kanten"
 
 #: Merge.rc:2181
 #, c-format
@@ -3929,7 +4029,7 @@
 #: Merge.rc:2199
 #, c-format
 msgid "Both (%1 of %2)"
-msgstr ""
+msgstr "Beide (%1 of %2)"
 
 #: Merge.rc:2200
 #, c-format
@@ -3939,22 +4039,22 @@
 #: Merge.rc:2205
 #, c-format
 msgid "Left side - select destination folder:"
-msgstr ""
+msgstr "Linkerkant - selecteer doelmap:"
 
 #: Merge.rc:2206
 #, c-format
 msgid "Right side - select destination folder:"
-msgstr ""
+msgstr "Rechterkant - selecteer doelmap:"
 
 #: Merge.rc:2207
 #, c-format
 msgid "(%1 Files Affected)"
-msgstr ""
+msgstr "(%1 Bestanden Aangepast)"
 
 #: Merge.rc:2208
 #, c-format
 msgid "(%1 of %2 Files Affected)"
-msgstr ""
+msgstr "(%1 van %2 Bestanden Aangepast)"
 
 #: Merge.rc:2214
 #, c-format
@@ -3971,12 +4071,12 @@
 #: Merge.rc:2215
 #, c-format
 msgid "Are you sure you want to copy:"
-msgstr ""
+msgstr "Bent u zeker dat u het volgende wilt kopi\xEBren:"
 
 #: Merge.rc:2216
 #, c-format
 msgid "Are you sure you want to copy %d items:"
-msgstr ""
+msgstr "Bent u zeker dat u %d items wilt kopi\xEBren:"
 
 #: Merge.rc:2217
 #, c-format
@@ -3989,21 +4089,28 @@
 "\n"
 "Please refresh the compare."
 msgstr ""
+"Bewerking afgebroken!\n"
+"\n"
+"Inhoud van de map op de schijven is veranderd, pad\n"
+"%1\n"
+"werd niet gevonden.\n"
+"\n"
+"Vernieuw a.u.b. de vergelijking."
 
 #: Merge.rc:2218
 #, c-format
 msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Bent u zeker dat u wilt verplaatsen:"
 
 #: Merge.rc:2219
 #, c-format
 msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Bent u zeker dat u %d items wilt verplaatsen:"
 
 #: Merge.rc:2221
 #, c-format
 msgid "Confirm Move"
-msgstr ""
+msgstr "Bevestig Verplaatsen"
 
 #: Merge.rc:2227
 #, c-format
@@ -4038,12 +4145,12 @@
 #: Merge.rc:2233
 #, c-format
 msgid "Failed to execute external editor: %1"
-msgstr ""
+msgstr "Uitvoeren externe editor mislukt: %1"
 
 #: Merge.rc:2234
 #, c-format
 msgid "Unknown extension on external editor: %1"
-msgstr ""
+msgstr "Onbekende extensie bij externe editor: %1"
 
 #: Merge.rc:2235
 #, c-format
@@ -4143,12 +4250,12 @@
 #: Merge.rc:2266
 #, c-format
 msgid "Right Size (Short)"
-msgstr ""
+msgstr "Rechtse Grootte (Kort)"
 
 #: Merge.rc:2267
 #, c-format
 msgid "Left Size (Short)"
-msgstr ""
+msgstr "Linkse Grootte (Kort)"
 
 #: Merge.rc:2273
 #, c-format
@@ -4193,12 +4300,12 @@
 #: Merge.rc:2281
 #, c-format
 msgid "Left EOL"
-msgstr ""
+msgstr "Links regeleinde"
 
 #: Merge.rc:2282
 #, c-format
 msgid "Right EOL"
-msgstr ""
+msgstr "Rechts regeleinde"
 
 #: Merge.rc:2288
 #, c-format
@@ -4213,12 +4320,12 @@
 #: Merge.rc:2290
 #, c-format
 msgid "Ignored Diff."
-msgstr ""
+msgstr "Genegeerde Versch."
 
 #: Merge.rc:2291
 #, c-format
 msgid "Differences"
-msgstr ""
+msgstr "Verschillen"
 
 #: Merge.rc:2292
 #: Merge.rc:2596
@@ -4234,7 +4341,7 @@
 #: Merge.rc:2299
 #, c-format
 msgid "Item aborted"
-msgstr ""
+msgstr "Item afgebroken"
 
 #: Merge.rc:2300
 #, c-format
@@ -4249,12 +4356,12 @@
 #: Merge.rc:2302
 #, c-format
 msgid "Left only: %1"
-msgstr ""
+msgstr "Alleen links: %1"
 
 #: Merge.rc:2303
 #, c-format
 msgid "Right only: %1"
-msgstr ""
+msgstr "Alleen rechts: %1"
 
 #: Merge.rc:2304
 #, c-format
@@ -4284,7 +4391,7 @@
 #: Merge.rc:2311
 #, c-format
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #: Merge.rc:2317
 #, c-format
@@ -4344,12 +4451,12 @@
 #: Merge.rc:2333
 #, c-format
 msgid "Left file size abbreviated."
-msgstr ""
+msgstr "Linker bestandsgrootte ingekort."
 
 #: Merge.rc:2334
 #, c-format
 msgid "Right file size abbreviated."
-msgstr ""
+msgstr "Rechter bestandsgrootte ingekort."
 
 #: Merge.rc:2340
 #, c-format
@@ -4394,12 +4501,12 @@
 #: Merge.rc:2348
 #, c-format
 msgid "Left side file EOL type"
-msgstr ""
+msgstr "Type regeleinde linker bestand"
 
 #: Merge.rc:2349
 #, c-format
 msgid "Right side file EOL type"
-msgstr ""
+msgstr "Type regeleinde rechter bestand"
 
 #: Merge.rc:2355
 #, c-format
@@ -4414,12 +4521,12 @@
 #: Merge.rc:2357
 #, c-format
 msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr ""
+msgstr "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd door WinMerge en kunnen niet samengevoegd worden."
 
 #: Merge.rc:2358
 #, c-format
 msgid "Number of differences in file. This number does not include ignored differences."
-msgstr ""
+msgstr "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen."
 
 #: Merge.rc:2359
 #, c-format
@@ -4434,27 +4541,27 @@
 #: Merge.rc:2366
 #, c-format
 msgid "Comma-separated list"
-msgstr ""
+msgstr "Komma-gescheiden lijst"
 
 #: Merge.rc:2367
 #, c-format
 msgid "Tab-separated list"
-msgstr ""
+msgstr "Tab-gescheiden lijst"
 
 #: Merge.rc:2368
 #, c-format
 msgid "Simple HTML"
-msgstr ""
+msgstr "Simpele html"
 
 #: Merge.rc:2369
 #, c-format
 msgid "Simple XML"
-msgstr ""
+msgstr "Simpele xml"
 
 #: Merge.rc:2371
 #, c-format
 msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr ""
+msgstr "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?"
 
 #: Merge.rc:2372
 #, c-format
@@ -4462,11 +4569,13 @@
 "Error creating the report:\n"
 "%1"
 msgstr ""
+"Fout bij maken van rapport:\n"
+"%1"
 
 #: Merge.rc:2373
 #, c-format
 msgid "The report has been created successfully."
-msgstr ""
+msgstr "Het rapport is met succes opgesteld."
 
 #: Merge.rc:2379
 #, c-format
@@ -4497,31 +4606,52 @@
 "\n"
 "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
 msgstr ""
+"Deze bestanden gebruiken verschillende regeleinde-types.\n"
+"\n"
+"Wilt u alle regeleinde-types behandelen als equivalent voor deze vergelijking?\n"
+"\n"
+"Opmerking: Indien u op elk moment alle regeleinde-types als equivalent wilt behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)"
 
 #: Merge.rc:2384
 #, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
 msgstr ""
+"De regeleindes zijn verschillende types (Windows/Unix/Mac) in bestand '%1'.\n"
+" Met de huidige opties zullen ze \xE9\xE9n gemaakt worden naar het hoofdtype.\n"
+" Wilt u de opties wijzigen en de verschillende regeleindes behouden?"
 
 #: Merge.rc:2385
 #, c-format
 msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-msgstr ""
+msgstr "Er trad een fout op bij het voorvergelijken van bestand '%1' met plugin '%2'. De voorvergelijking is niet meer toegepast."
 
 #: Merge.rc:2386
 #, c-format
 msgid "The selected folder is invalid."
-msgstr ""
+msgstr "De geselecteerde map is ongeldig."
 
 #: Merge.rc:2387
 #, c-format
 msgid "Cannot open a binary file to editor."
-msgstr ""
+msgstr "Kan geen binair bestand openen met de editor."
 
 #: Merge.rc:2388
 #, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
 msgstr ""
+"De map bestaat slechts aan de andere kant en kan niet geopend worden.\n"
+"\n"
+"Wilt u een gelijkaardige map:\n"
+"%1\n"
+"maken aan de andere kant en deze mappen openen?"
 
 #: Merge.rc:2394
 #, c-format
@@ -4530,26 +4660,29 @@
 "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
 "Would you like to treat both files as being in the default windows codepage (recommended)?"
 msgstr ""
+"Verschillende codetabellen gevonden in linker (cp%d) en rechter (cp%d) bestanden. \n"
+"Elk bestand in zijn eigen codetabel weergeven zal resulteren in een betere weergave, maar samenvoegen/kopi\xEBren zal gevaarlijk zijn.\n"
+"Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel zijn (aangeraden)?"
 
 #: Merge.rc:2395
 #, c-format
 msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr ""
+msgstr "Waarschuwing: Bestanden gebruiken verschillende coderingen, links=%s en rechts=%s, en samenvoegen kan leiden tot verlies van informatie."
 
 #: Merge.rc:2396
 #, c-format
 msgid "Information lost due to encoding errors: both files"
-msgstr ""
+msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden"
 
 #: Merge.rc:2397
 #, c-format
 msgid "Information lost due to encoding errors: right file"
-msgstr ""
+msgstr "Informatie verloren gegaan wegens coderingsfouten: rechter bestand"
 
 #: Merge.rc:2398
 #, c-format
 msgid "Information lost due to encoding errors: left file"
-msgstr ""
+msgstr "Informatie verloren gegaan wegens coderingsfouten: linker bestand"
 
 #: Merge.rc:2404
 #, c-format
@@ -4559,7 +4692,7 @@
 #: Merge.rc:2405
 #, c-format
 msgid "Line difference"
-msgstr "Verschil binnen regel"
+msgstr "Regelverschil"
 
 #: Merge.rc:2411
 #, c-format
@@ -4584,12 +4717,12 @@
 #: Merge.rc:2425
 #, c-format
 msgid "Location Pane"
-msgstr ""
+msgstr "Locatievenster"
 
 #: Merge.rc:2426
 #, c-format
 msgid "Diff Pane"
-msgstr ""
+msgstr "Verschilvenster"
 
 #: Merge.rc:2432
 #, c-format
@@ -4624,7 +4757,7 @@
 #: Merge.rc:2438
 #, c-format
 msgid "Context"
-msgstr ""
+msgstr "Context"
 
 #: Merge.rc:2439
 #, c-format
@@ -4639,12 +4772,12 @@
 #: Merge.rc:2441
 #, c-format
 msgid "The specified output path is not an absolute path: %1"
-msgstr ""
+msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1"
 
 #: Merge.rc:2442
 #, c-format
 msgid "Specify an output file"
-msgstr ""
+msgstr "Specifieer een uitvoerbestand"
 
 #: Merge.rc:2443
 #, c-format
@@ -4663,11 +4796,14 @@
 "\n"
 "Creating a patch requires that there are no unsaved changes in files."
 msgstr ""
+"Sla alle bestanden eerst op.\n"
+"\n"
+"Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in bestanden zijn."
 
 #: Merge.rc:2446
 #, c-format
 msgid "Folder does not exist."
-msgstr ""
+msgstr "Map bestaat niet."
 
 #: Merge.rc:2451
 #, c-format
@@ -4681,6 +4817,9 @@
 "All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
 "See manual for more info about archive support and how to enable it."
 msgstr ""
+"Archiefondersteuning is niet ingeschakeld.\n"
+"Er kon geen enkel onderdeel voor archiefondersteuning (7-zip and/or Merge7z*.dll) gevonden worden.\n"
+"Zie de handleiding voor meer info over archiefondersteuning en hoe het te activeren."
 
 #: Merge.rc:2453
 #, c-format
@@ -4688,6 +4827,8 @@
 "\n"
 "Note: 7-Zip integration is disabled in WinMerge settings."
 msgstr ""
+"\n"
+"Opmerking: 7-Zip-integratie is uitgeschakeld in de instellingen van WinMerge."
 
 #: Merge.rc:2454
 #, c-format
@@ -4695,36 +4836,38 @@
 "\n"
 "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
 msgstr ""
+"\n"
+"Opmerking: 7-Zip-integratie is gelimiteerd tot standalone-operatie in de instellingen van WinMerge."
 
 #: Merge.rc:2455
 #, c-format
 msgid "Select file for export"
-msgstr ""
+msgstr "Selecteer te exporteren bestand"
 
 #: Merge.rc:2456
 #, c-format
 msgid "Select file for import"
-msgstr ""
+msgstr "Selecteer te importeren bestand"
 
 #: Merge.rc:2457
 #, c-format
 msgid "Options imported from the file."
-msgstr ""
+msgstr "Opties ge\xEFmporteerd van bestand"
 
 #: Merge.rc:2458
 #, c-format
 msgid "Options exported to the file."
-msgstr ""
+msgstr "Opties ge\xEBxporteerd naar bestand."
 
 #: Merge.rc:2459
 #, c-format
 msgid "Failed to import options from the file."
-msgstr ""
+msgstr "Opties importeren van bestand mislukt."
 
 #: Merge.rc:2460
 #, c-format
 msgid "Failed to write options to the file."
-msgstr ""
+msgstr "Opties schrijven naar bestand mislukt."
 
 #: Merge.rc:2461
 #, c-format
@@ -4733,6 +4876,9 @@
 "\n"
 "Do you want to continue?"
 msgstr ""
+"U staat op het punt verschillende vergelijkingsvensters tegelijk te sluiten.\n"
+"\n"
+"Wilt u doorgaan?"
 
 #: Merge.rc:2467
 #, c-format
@@ -4822,353 +4968,353 @@
 #: Merge.rc:2493
 #, c-format
 msgid "Western European"
-msgstr ""
+msgstr "West-Europees"
 
 #: Merge.rc:2494
 #, c-format
 msgid "Eastern European"
-msgstr ""
+msgstr "Oost-Europees"
 
 #: Merge.rc:2495
 #, c-format
 msgid "East Asian"
-msgstr ""
+msgstr "Oost-Aziatisch"
 
 #: Merge.rc:2496
 #, c-format
 msgid "SE & SW Asian"
-msgstr ""
+msgstr "ZO- & ZW-Aziatisch"
 
 #: Merge.rc:2497
 #, c-format
 msgid "Middle Eastern"
-msgstr ""
+msgstr "Midden-Oosters"
 
 #: Merge.rc:2498
 #: Merge.rc:2508
 #, c-format
 msgid "Not applicable"
-msgstr ""
+msgstr "Niet toepasbaar"
 
 #: Merge.rc:2504
 #, c-format
 msgid "MS-Windows"
-msgstr ""
+msgstr "MS-Windows"
 
 #: Merge.rc:2505
 #, c-format
 msgid "MS-DOS"
-msgstr ""
+msgstr "MS-DOS"
 
 #: Merge.rc:2506
 #, c-format
 msgid "Macintosh"
-msgstr ""
+msgstr "Macintosh"
 
 #: Merge.rc:2507
 #, c-format
 msgid "IBM"
-msgstr ""
+msgstr "IBM"
 
 #: Merge.rc:2514
 #, c-format
 msgid "EBCDIC"
-msgstr ""
+msgstr "EBCDIC"
 
 #: Merge.rc:2515
 #, c-format
 msgid "IBM EBCDIC Cyrillic"
-msgstr ""
+msgstr "IBM EBCDIC Cyrillisch"
 
 #: Merge.rc:2521
 #, c-format
 msgid "MS-DOS Latin US"
-msgstr ""
+msgstr "MS-DOS Latijn US"
 
 #: Merge.rc:2522
 #, c-format
 msgid "MS-DOS Arabic"
-msgstr ""
+msgstr "MS-DOS Arabisch"
 
 #: Merge.rc:2523
 #, c-format
 msgid "MS-DOS Greek"
-msgstr ""
+msgstr "MS-DOS Grieks"
 
 #: Merge.rc:2524
 #, c-format
 msgid "MS-DOS Baltic Rim"
-msgstr ""
+msgstr "MS-DOS Baltisch"
 
 #: Merge.rc:2525
 #, c-format
 msgid "MS-DOS Latin 1"
-msgstr ""
+msgstr "MS-DOS Latijn 1"
 
 #: Merge.rc:2526
 #, c-format
 msgid "MS-DOS Greek 1"
-msgstr ""
+msgstr "MS-DOS Grieks 1"
 
 #: Merge.rc:2527
 #, c-format
 msgid "MS-DOS Latin 2"
-msgstr ""
+msgstr "MS-DOS Latijn 2"
 
 #: Merge.rc:2528
 #, c-format
 msgid "MS-DOS Cyrillic"
-msgstr ""
+msgstr "MS-DOS Cyrillisch"
 
 #: Merge.rc:2529
 #, c-format
 msgid "MS-DOS Turkish"
-msgstr ""
+msgstr "MS-DOS Turks"
 
 #: Merge.rc:2530
 #, c-format
 msgid "MS-DOS Portuguese"
-msgstr ""
+msgstr "MS-DOS Portugees"
 
 #: Merge.rc:2536
 #, c-format
 msgid "MS-DOS Icelandic"
-msgstr ""
+msgstr "MS-DOS IJslands"
 
 #: Merge.rc:2537
 #, c-format
 msgid "MS-DOS Hebrew"
-msgstr ""
+msgstr "MS-DOS Hebreeuws"
 
 #: Merge.rc:2538
 #, c-format
 msgid "MS-DOS French Canada"
-msgstr ""
+msgstr "MS-DOS Frans Canada"
 
 #: Merge.rc:2539
 #, c-format
 msgid "MS-DOS Nordic"
-msgstr ""
+msgstr "MS-DOS Nordisch"
 
 #: Merge.rc:2540
 #, c-format
 msgid "MS-DOS Cyrillic CIS 1"
-msgstr ""
+msgstr "MS-DOS Cyrillisch CIS 1"
 
 #: Merge.rc:2541
 #, c-format
 msgid "MS-DOS Greek 2"
-msgstr ""
+msgstr "MS-DOS Grieks 2"
 
 #: Merge.rc:2547
 #, c-format
 msgid "Windows Thai"
-msgstr ""
+msgstr "Windows Thai"
 
 #: Merge.rc:2548
 #, c-format
 msgid "Windows Japanese"
-msgstr ""
+msgstr "Windows Japans"
 
 #: Merge.rc:2549
 #, c-format
 msgid "Windows Simplified Chinese"
-msgstr ""
+msgstr "Windows Simplified Chinees"
 
 #: Merge.rc:2550
 #, c-format
 msgid "Windows Korean"
-msgstr ""
+msgstr "Windows Koreaans"
 
 #: Merge.rc:2551
 #, c-format
 msgid "Windows Traditional Chinese"
-msgstr ""
+msgstr "Windows Traditioneel Chinees"
 
 #: Merge.rc:2552
 #, c-format
 msgid "Windows Latin 2"
-msgstr ""
+msgstr "Windows Latijn 2"
 
 #: Merge.rc:2553
 #, c-format
 msgid "Windows Cyrillic (Slavic)"
-msgstr ""
+msgstr "Windows Cyrillisch (Slavisch)"
 
 #: Merge.rc:2554
 #, c-format
 msgid "Windows Latin 1"
-msgstr ""
+msgstr "Windows Latijn 1"
 
 #: Merge.rc:2555
 #, c-format
 msgid "Windows Greek"
-msgstr ""
+msgstr "Windows Grieks"
 
 #: Merge.rc:2556
 #, c-format
 msgid "Windows Latin 5 (Turkish)"
-msgstr ""
+msgstr "Windows Latijn 5 (Turks)"
 
 #: Merge.rc:2557
 #, c-format
 msgid "Windows Hebrew"
-msgstr ""
+msgstr "Windows Hebreeuws"
 
 #: Merge.rc:2558
 #, c-format
 msgid "Windows Arabic"
-msgstr ""
+msgstr "Windows Arabisch"
 
 #: Merge.rc:2559
 #, c-format
 msgid "Windows Baltic Rim"
-msgstr ""
+msgstr "Windows Baltisch Rim"
 
 #: Merge.rc:2560
 #, c-format
 msgid "Windows Vietnamese"
-msgstr ""
+msgstr "Windows Vietnamees"
 
 #: Merge.rc:2566
 #, c-format
 msgid "Macintosh Roman"
-msgstr ""
+msgstr "Macintosh Romeins"
 
 #: Merge.rc:2567
 #, c-format
 msgid "Macintosh Greek"
-msgstr ""
+msgstr "Macintosh Grieks"
 
 #: Merge.rc:2568
 #, c-format
 msgid "Macintosh Cyrillic"
-msgstr ""
+msgstr "Macintosh Cyrillisch"
 
 #: Merge.rc:2569
 #, c-format
 msgid "Macintosh "
-msgstr ""
+msgstr "Macintosh "
 
 #: Merge.rc:2570
 #, c-format
 msgid "Macintosh Central Europe"
-msgstr ""
+msgstr "Macintosh Centraal-Europa"
 
 #: Merge.rc:2571
 #, c-format
 msgid "Macintosh Turkish"
-msgstr ""
+msgstr "Macintosh Turks"
 
 #: Merge.rc:2580
 #, c-format
 msgid "Approximates ISO-8859-2"
-msgstr ""
+msgstr "Benadert ISO-8859-2"
 
 #: Merge.rc:2583
 #, c-format
 msgid "Approximates ISO-8859-1"
-msgstr ""
+msgstr "Benadert ISO-8859-1"
 
 #: Merge.rc:2584
 #, c-format
 msgid "Approximates ISO-8859-7"
-msgstr ""
+msgstr "Benadert ISO-8859-7"
 
 #: Merge.rc:2585
 #, c-format
 msgid "Approximates ISO-8859-9"
-msgstr ""
+msgstr "Benadert ISO-8859-9"
 
 #: Merge.rc:2586
 #, c-format
 msgid "Approximates ISO-8859-8"
-msgstr ""
+msgstr "Benadert ISO-8859-8"
 
 #: Merge.rc:2592
 #, c-format
 msgid "Win"
-msgstr ""
+msgstr "Win"
 
 #: Merge.rc:2593
 #, c-format
 msgid "Mac"
-msgstr ""
+msgstr "Mac"
 
 #: Merge.rc:2594
 #, c-format
 msgid "Unix"
-msgstr ""
+msgstr "Unix"
 
 #: Merge.rc:2595
 #, c-format
 msgid "Mixed"
-msgstr ""
+msgstr "Gemengd"
 
 #: Merge.rc:2597
 #, c-format
 msgid "LF"
-msgstr ""
+msgstr "LF"
 
 #: Merge.rc:2598
 #, c-format
 msgid "CR"
-msgstr ""
+msgstr "CR"
 
 #: Merge.rc:2599
 #, c-format
 msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
 
 #: Merge.rc:2606
 #, c-format
 msgid " B"
-msgstr ""
+msgstr " B"
 
 #: Merge.rc:2607
 #, c-format
 msgid " KB"
-msgstr ""
+msgstr " KB"
 
 #: Merge.rc:2608
 #, c-format
 msgid " MB"
-msgstr ""
+msgstr " MB"
 
 #: Merge.rc:2609
 #, c-format
 msgid " GB"
-msgstr ""
+msgstr " GB"
 
 #: Merge.rc:2610
 #, c-format
 msgid " TB"
-msgstr ""
+msgstr " TB"
 
 #: Merge.rc:2611
 #, c-format
 msgid " PB"
-msgstr ""
+msgstr " PB"
 
 #: Merge.rc:2617
 #, c-format
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: Merge.rc:2619
 #, c-format
 msgid "Unpacker"
-msgstr ""
+msgstr "Uitpakker"
 
 #: Merge.rc:2620
 #, c-format
 msgid "Prediffer"
-msgstr ""
+msgstr "Voorvergelijken"
 
 #: Merge.rc:2621
 #, c-format
 msgid "Editor script"
-msgstr ""
+msgstr "Editor-script"
 
 #: Merge.rc:2628
 #, c-format
@@ -5193,27 +5339,27 @@
 #: Merge.rc:2632
 #, c-format
 msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Verander alleen-lezen-status van linker bestand/map"
 
 #: Merge.rc:2633
 #, c-format
 msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Verander alleen-lezen-status van rechter bestand/map"
 
 #: Merge.rc:2634
 #, c-format
 msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "Converteer regeleinde naar Windows-modus"
 
 #: Merge.rc:2635
 #, c-format
 msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "Converteer regeleinde naar Unix-modus"
 
 #: Merge.rc:2636
 #, c-format
 msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "Converteer regeleinde naar Mac-modus"
 
 #: Merge.rc:2637
 #, c-format
@@ -5226,11 +5372,13 @@
 "View and adjust file encoding properties\n"
 "File encoding properties"
 msgstr ""
+"Bekijk en wijzig bestandscoderin-eigenschappen\n"
+"Bestandscodering-eigenschappen"
 
 #: Merge.rc:2639
 #, c-format
 msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "Open en verplaats conflictbestand"
 
 #: Merge.rc:2645
 #, c-format
@@ -5238,6 +5386,8 @@
 "Select difference area in the current line\n"
 "Difference in the Current Line"
 msgstr ""
+"Selecteer verschilgebied in de huidige regel\n"
+"Verschil in Huidige Regel"
 
 #: Merge.rc:2646
 #, c-format
@@ -5269,32 +5419,32 @@
 #: Merge.rc:2649
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr ""
+msgstr "Kopieer geselecteerde regels naar het klembord en voeg regelnummers toe aan het begin van elke regel"
 
 #: Merge.rc:2650
 #, c-format
 msgid "Refresh selected items"
-msgstr ""
+msgstr "Vernieuw geselecteerde items"
 
 #: Merge.rc:2651
 #, c-format
 msgid "Toggle bookmark"
-msgstr ""
+msgstr "Bladwijzer aan/uit"
 
 #: Merge.rc:2652
 #, c-format
 msgid "Go to next bookmark"
-msgstr ""
+msgstr "Ga naar volgende bladwijzer"
 
 #: Merge.rc:2653
 #, c-format
 msgid "Go to previous bookmark"
-msgstr ""
+msgstr "Ga naar vorige bladwijzer"
 
 #: Merge.rc:2654
 #, c-format
 msgid "Clear all bookmarks"
-msgstr ""
+msgstr "Alle bladwijzers wissen"
 
 #: Merge.rc:2660
 #, c-format
@@ -5302,6 +5452,8 @@
 "Displays items that are exactly the same\n"
 "Show Identical Items"
 msgstr ""
+"Toont items die exact hetzelfde zijn\n"
+"Toon Identieke Items"
 
 #: Merge.rc:2661
 #, c-format
@@ -5309,6 +5461,8 @@
 "Displays items that have differences\n"
 "Show Different Items"
 msgstr ""
+"Toont items die verschillen bevatten\n"
+"Toon Verschillende Items"
 
 #: Merge.rc:2662
 #, c-format
@@ -5316,6 +5470,8 @@
 "Displays items that exist in only on the left side\n"
 "Show Left Unique Items"
 msgstr ""
+"Toont items die alleen aan de linkerkant bestaan\n"
+"Toon Linker Unieke Items"
 
 #: Merge.rc:2663
 #, c-format
@@ -5323,6 +5479,8 @@
 "Displays items that exist in only on the right side\n"
 "Show Right Unique Items"
 msgstr ""
+"Toont items die alleen aan de rechterkant bestaan\n"
+"Toon Rechter Unieke Items"
 
 #: Merge.rc:2664
 #, c-format
@@ -5330,6 +5488,8 @@
 "Displays binary files\n"
 "Show Binary Files"
 msgstr ""
+"Toont binaire bestanden\n"
+"Toon Binaire Bestanden"
 
 #: Merge.rc:2665
 #, c-format
@@ -5337,6 +5497,8 @@
 "Displays skipped items\n"
 "Show Skipped Items"
 msgstr ""
+"Toont overgeslagen items\n"
+"Toon Overgeslagen Items"
 
 #: Merge.rc:2671
 #, c-format
@@ -5374,22 +5536,30 @@
 #: Merge.rc:2676
 #, c-format
 msgid "Show folder compare statistics dialog"
-msgstr ""
+msgstr "Toon venster met mapvergelijkingsstatistieken"
 
 #: Merge.rc:2677
 #, c-format
-msgid "Select the current user interface language\nLanguage"
+msgid ""
+"Select the current user interface language\n"
+"Language"
 msgstr ""
+"Selecteer de interfacetaal voor de huidige gebruiker\n"
+"Taal"
 
 #: Merge.rc:2678
 #, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
 msgstr ""
+"Toont verschillen binnen dezelfde regel met verschillende kleuren\n"
+"Toon Regelverschil"
 
 #: Merge.rc:2679
 #, c-format
 msgid "Swap the positions of the two panes"
-msgstr ""
+msgstr "Wissel de plaats van de twee vensters"
 
 #: Merge.rc:2680
 #, c-format
@@ -5397,6 +5567,8 @@
 "Shows line numbers\n"
 "Show Line Numbers"
 msgstr ""
+"Toont regelnummers\n"
+"Toon Regelnummers"
 
 #: Merge.rc:2681
 #, c-format
@@ -5404,6 +5576,8 @@
 "Enable word wrap\n"
 "Wrap Lines"
 msgstr ""
+"Activeer woordterugloop\n"
+"Regelterugloop"
 
 #: Merge.rc:2682
 #, c-format
@@ -5411,46 +5585,68 @@
 "Shows selection margins for both panes\n"
 "Show Selection Margins"
 msgstr ""
+"Toont selectiemarges voor beide vensters\n"
+"Toon Selectiemarges"
 
 #: Merge.rc:2683
 #, c-format
 msgid "Increase text size"
-msgstr ""
+msgstr "Vergroot tekst"
 
 #: Merge.rc:2684
 #, c-format
 msgid "Decrease text size"
-msgstr ""
+msgstr "Verklein tekst"
 
 #: Merge.rc:2685
 #, c-format
 msgid "Reset text zoom to default size"
-msgstr ""
+msgstr "Herstel tekst-zoom naar standaardgrootte"
 
 #: Merge.rc:2691
 #, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
 msgstr ""
+"Scroll naar het Vorige verschil\n"
+"Vorige Verschil (Alt+Omhoog)"
 
 #: Merge.rc:2692
 #, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
 msgstr ""
+"Scroll naar het volgende verschil\n"
+"Volgende Verschil (Alt+Omlaag)"
 
 #: Merge.rc:2693
 #, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
 msgstr ""
+"Scroll naar het eerste verschil\n"
+"Eerste Verschil (Alt+Home)"
 
 #: Merge.rc:2694
 #, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
 msgstr ""
+"Scroll naar het huidige verschil\n"
+"Huidig Verschil (Alt+Enter)"
 
 #: Merge.rc:2695
 #, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
 msgstr ""
+"Scroll naar het laatste verschil\n"
+"Laatste Verschil (Alt+End)"
 
 #: Merge.rc:2696
 #, c-format
@@ -5509,12 +5705,12 @@
 #: Merge.rc:2702
 #, c-format
 msgid "Delete selected items from both directories"
-msgstr ""
+msgstr "Geselecteerde items uit beide mappen wissen"
 
 #: Merge.rc:2703
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr ""
+msgstr "Vergelijk geselecteerd item (vergelijk eerste item indien meerdere items geselecteerd)"
 
 #: Merge.rc:2709
 #, c-format
@@ -5534,12 +5730,12 @@
 #: Merge.rc:2712
 #, c-format
 msgid "Generates a report from compare results"
-msgstr ""
+msgstr "Genereert een rapport met vergelijkingsresultaten"
 
 #: Merge.rc:2718
 #, c-format
 msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Toont een lijst met beschikbare plugins"
 
 #: Merge.rc:2719
 #, c-format
@@ -5578,18 +5774,26 @@
 
 #: Merge.rc:2731
 #, c-format
-msgid "Activates next visible file\nActivate next File"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
 msgstr ""
+"Activeert volgend zichtbaar bestand\n"
+"Activeer volgend bestand"
 
 #: Merge.rc:2732
 #, c-format
 msgid "Closes all open windows"
-msgstr ""
+msgstr "Sluit alle geopende vensters"
 
 #: Merge.rc:2738
 #, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
 msgstr ""
+"Opent de WinMerge Help\n"
+"WinMerge Help"
 
 #: Merge.rc:2739
 #, c-format
@@ -5599,22 +5803,30 @@
 #: Merge.rc:2740
 #, c-format
 msgid "Display the GNU General Public License"
-msgstr ""
+msgstr "Toon de GNU General Public License"
 
 #: Merge.rc:2741
 #, c-format
 msgid "Private Build: %1"
-msgstr ""
+msgstr "Private Versie: %1"
 
 #: Merge.rc:2742
 #, c-format
-msgid "Opens the release notes document\nRelease Notes"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
 msgstr ""
+"Opent het document met vrijgave-opmerkingen\n"
+"Vrijgave-opmerkingen"
 
 #: Merge.rc:2743
 #, c-format
-msgid "Opens the translations website\nTranslations"
+msgid ""
+"Opens the translations website\n"
+"Translations"
 msgstr ""
+"Opent de vertalingen-website\n"
+"Vertalingen"
 
 #: Merge.rc:2749
 #, c-format
@@ -5649,17 +5861,17 @@
 #: Merge.rc:2761
 #, c-format
 msgid "Open the file with registered application"
-msgstr ""
+msgstr "Open bestand met geregistreerde applicatie"
 
 #: Merge.rc:2762
 #, c-format
 msgid "Open the file with external editor"
-msgstr ""
+msgstr "Open bestand met externe editor"
 
 #: Merge.rc:2763
 #, c-format
 msgid "Open the file with a particular program"
-msgstr ""
+msgstr "Open bestand met een bepaald programma"
 
 #: Merge.rc:2769
 #, c-format
@@ -5669,7 +5881,7 @@
 #: Merge.rc:2770
 #, c-format
 msgid "Display all moved blocks"
-msgstr ""
+msgstr "Toon alle verplaatste blokken"
 
 #: Merge.rc:2771
 #, c-format
@@ -5694,190 +5906,190 @@
 #: Merge.rc:2780
 #, c-format
 msgid "Disabled"
-msgstr ""
+msgstr "Uitgeschakeld"
 
 #: Merge.rc:2781
 #, c-format
 msgid "From file system"
-msgstr ""
+msgstr "Van bestandssysteem"
 
 #: Merge.rc:2782
 #, c-format
 msgid "From MRU list"
-msgstr ""
+msgstr "Van MRU-lijst"
 
 #: Merge.rc:2788
 #, c-format
 msgid "No Highlighting"
-msgstr ""
+msgstr "Geen Markering"
 
 #: Merge.rc:2789
 #, c-format
 msgid "ASP"
-msgstr ""
+msgstr "ASP"
 
 #: Merge.rc:2790
 #, c-format
 msgid "Basic"
-msgstr ""
+msgstr "Basic"
 
 #: Merge.rc:2791
 #, c-format
 msgid "Batch"
-msgstr ""
+msgstr "Batch"
 
 #: Merge.rc:2792
 #, c-format
 msgid "C/C++"
-msgstr ""
+msgstr "C/C++"
 
 #: Merge.rc:2793
 #, c-format
 msgid "C#"
-msgstr ""
+msgstr "C#"
 
 #: Merge.rc:2794
 #, c-format
 msgid "CSS"
-msgstr ""
+msgstr "CSS"
 
 #: Merge.rc:2795
 #, c-format
 msgid "DCL"
-msgstr ""
+msgstr "DCL"
 
 #: Merge.rc:2796
 #, c-format
 msgid "Fortran"
-msgstr ""
+msgstr "Fortran"
 
 #: Merge.rc:2797
 #, c-format
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
 #: Merge.rc:2798
 #, c-format
 msgid "INI"
-msgstr ""
+msgstr "INI"
 
 #: Merge.rc:2799
 #, c-format
 msgid "InnoSetup"
-msgstr ""
+msgstr "InnoSetup"
 
 #: Merge.rc:2800
 #, c-format
 msgid "InstallShield"
-msgstr ""
+msgstr "InstallShield"
 
 #: Merge.rc:2801
 #, c-format
 msgid "Java"
-msgstr ""
+msgstr "Java"
 
 #: Merge.rc:2802
 #, c-format
 msgid "AutoLISP"
-msgstr ""
+msgstr "AutoLISP"
 
 #: Merge.rc:2803
 #, c-format
 msgid "NSIS"
-msgstr ""
+msgstr "NSIS"
 
 #: Merge.rc:2804
 #, c-format
 msgid "Pascal"
-msgstr ""
+msgstr "Pascal"
 
 #: Merge.rc:2805
 #, c-format
 msgid "Perl"
-msgstr ""
+msgstr "Perl"
 
 #: Merge.rc:2806
 #, c-format
 msgid "PHP"
-msgstr ""
+msgstr "PHP"
 
 #: Merge.rc:2807
 #, c-format
 msgid "Portable Object"
-msgstr ""
+msgstr "Draagbaar Object"
 
 #: Merge.rc:2808
 #, c-format
 msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
 
 #: Merge.rc:2809
 #, c-format
 msgid "Python"
-msgstr ""
+msgstr "Python"
 
 #: Merge.rc:2810
 #, c-format
 msgid "REXX"
-msgstr ""
+msgstr "REXX"
 
 #: Merge.rc:2811
 #, c-format
 msgid "Resources"
-msgstr ""
+msgstr "Bronnen"
 
 #: Merge.rc:2812
 #, c-format
 msgid "Ruby"
-msgstr ""
+msgstr "Ruby"
 
 #: Merge.rc:2813
 #, c-format
 msgid "SGML"
-msgstr ""
+msgstr "SGML"
 
 #: Merge.rc:2814
 #, c-format
 msgid "Shell"
-msgstr ""
+msgstr "Shell"
 
 #: Merge.rc:2815
 #, c-format
 msgid "SIOD"
-msgstr ""
+msgstr "SIOD"
 
 #: Merge.rc:2816
 #, c-format
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #: Merge.rc:2817
 #, c-format
 msgid "TCL"
-msgstr ""
+msgstr "TCL"
 
 #: Merge.rc:2818
 #, c-format
 msgid "TEX"
-msgstr ""
+msgstr "TEX"
 
 #: Merge.rc:2819
 #, c-format
 msgid "XML"
-msgstr ""
+msgstr "XML"
 
 #: Merge.rc:2824
 #, c-format
 msgid "Hide the toolbar"
-msgstr ""
+msgstr "Verberg de werkbalk"
 
 #: Merge.rc:2825
 #, c-format
 msgid "Show small toolbar"
-msgstr ""
+msgstr "Toon kleine werkbalk"
 
 #: Merge.rc:2826
 #, c-format
 msgid "Show big toolbar"
-msgstr ""
+msgstr "Toon grote werkbalk"
 


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

Revision: 6313
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6313&view=rev
Author:   kimmov
Date:     2009-01-11 19:13:25 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
PATCH: [ 2494378 ] Updated Dutch translation for trunk & branch
 Submitted by Thomas De Rocker

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Src/Languages/Dutch.po

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2009-01-11 19:10:50 UTC (rev 6312)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2009-01-11 19:13:25 UTC (rev 6313)
@@ -17,7 +17,7 @@
     (#2455595)
   Bugfix: Remove EOL characters from command line (#2458728)
   Translation updates:
-  - Dutch (#2481022)
+  - Dutch (#2481022, #2494378)
   - Swedish (#2236651)
 
 WinMerge 2.10.2 - 2008-11-06 (r6075)

Modified: branches/R2_10/Src/Languages/Dutch.po
===================================================================
--- branches/R2_10/Src/Languages/Dutch.po	2009-01-11 19:10:50 UTC (rev 6312)
+++ branches/R2_10/Src/Languages/Dutch.po	2009-01-11 19:13:25 UTC (rev 6313)
@@ -4,6 +4,7 @@
 # Translators:
 # * Ronald Schaap <ronald at schaap.demon.nl>
 # * Michel Coene
+# * Thomas De Rocker <thomasderocker@...>
 #
 # ID line follows -- this is updated by SVN
 # $Id$
@@ -1085,7 +1086,7 @@
 #: Merge.rc:677
 #, c-format
 msgid "Select Files or Folders"
-msgstr "Bestanden of mappen selecteren"
+msgstr "Bestanden of Mappen Selecteren"
 
 #: Merge.rc:680
 #: Merge.rc:1595
@@ -1267,7 +1268,7 @@
 #: Merge.rc:763
 #, c-format
 msgid "All&ow only one instance to run"
-msgstr "&Allow only one instance to run"
+msgstr "Slechts \xE9\xE9n draaiende toepassing toestaan"
 
 #: Merge.rc:765
 #, c-format
@@ -1304,7 +1305,7 @@
 #: Merge.rc:779
 #, c-format
 msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Reset-knop om alle berichtvensters terug zichtbaar te maken."
+msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Herstellen-knop om alle berichtvensters terug zichtbaar te maken."
 
 #: Merge.rc:781
 #, c-format
@@ -3093,7 +3094,7 @@
 #: Merge.rc:1889
 #, c-format
 msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is gratis software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details."
+msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is vrije software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details."
 
 #: Merge.rc:1895
 #, c-format
@@ -3469,12 +3470,12 @@
 #: Merge.rc:2043
 #, c-format
 msgid "&Path to cleartool.exe :"
-msgstr "&Pad naar cleartool.exe :"
+msgstr "&Pad naar cleartool.exe:"
 
 #: Merge.rc:2044
 #, c-format
 msgid "&Path to SS.EXE :"
-msgstr "&Pad naar SS.EXE :"
+msgstr "&Pad naar SS.EXE:"
 
 #: Merge.rc:2050
 #, c-format
@@ -3812,11 +3813,11 @@
 "\n"
 "If you want to refresh files close current file compare and load files again."
 msgstr ""
-"Een ander programma heeft bestand\n"
-"%1\n"
-"gewijzigd nadat WinMerge het voor de laatste keer heeft gescand.\n"
+"Een andere toepassing heeft bestand\n"
+"%1 ge\xFCpdated\n"
+"sinds WinMerge het de laatste keer scande.\n"
 "\n"
-"Als u de bestanden wilt verversen, sluit dan de huidige bestandsvergelijking en laad de bestanden opnieuw."
+"Wilt u het bestand opnieuw laden?"
 
 #: Merge.rc:2134
 #, c-format
@@ -5526,7 +5527,7 @@
 #: Merge.rc:2674
 #, c-format
 msgid "Toggle Diff Pane"
-msgstr "Omschakelen verschilvenster"
+msgstr "Verschilvenster Aan/Uit"
 
 #: Merge.rc:2675
 #, c-format
@@ -5755,7 +5756,7 @@
 #: Merge.rc:2722
 #, c-format
 msgid "No prediffer (normal)"
-msgstr "Geen voorvergelijking (normal)"
+msgstr "Geen voorvergelijking (normaal)"
 
 #: Merge.rc:2723
 #, c-format


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

Revision: 6317
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6317&view=rev
Author:   kimmov
Date:     2009-01-12 20:18:21 +0000 (Mon, 12 Jan 2009)

Log Message:
-----------
PATCH: [ 2499994 ] Updated Dutch translation: Installer/ReadMe
 Submitted by Thomas De Rocker

Modified Paths:
--------------
    branches/R2_10/Docs/Users/ChangeLog.txt
    branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl

Modified: branches/R2_10/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_10/Docs/Users/ChangeLog.txt	2009-01-12 20:16:51 UTC (rev 6316)
+++ branches/R2_10/Docs/Users/ChangeLog.txt	2009-01-12 20:18:21 UTC (rev 6317)
@@ -17,7 +17,7 @@
     (#2455595)
   Bugfix: Remove EOL characters from command line (#2458728)
   Translation updates:
-  - Dutch (#2481022, #2494378)
+  - Dutch (#2481022, #2494378, #2499994)
   - Swedish (#2236651)
 
 WinMerge 2.10.2 - 2008-11-06 (r6075)

Modified: branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl	2009-01-12 20:16:51 UTC (rev 6316)
+++ branches/R2_10/Installer/InnoSetup/Languages/Dutch.isl	2009-01-12 20:18:21 UTC (rev 6317)
@@ -288,7 +288,7 @@
 ;Inno Setup Built-in Custom Messages
 NameAndVersion=%1 versie %2
 AdditionalIcons=Extra snelkoppelingen:
-OptionalFeatures=Optional Features:
+OptionalFeatures=Optionele Functies:
 CreateDesktopIcon=Maak een snelkoppeling op het &bureaublad
 CreateQuickLaunchIcon=Maak een snelkoppeling op de &Snel starten werkbalk
 ProgramOnTheWeb=%1 op het Web
@@ -301,65 +301,65 @@
 CompanyName=Thingamahoochie Software
 
 ;Types
-TypicalInstallation=Typical Installation
-FullInstallation=Full Installation
-CompactInstallation=Compact Installation
-CustomInstallation=Custom Installation
+TypicalInstallation=Standaard Installatie
+FullInstallation=Volledige Installatie
+CompactInstallation=Compacte Installatie
+CustomInstallation=Persoonlijke Installatie
 
 ;Components
-AppCoreFiles=WinMerge Core Files
+AppCoreFiles=WinMerge Basisbestanden
 ApplicationRuntimes=Application Runtimes
 Filters=Filters
 Plugins=Plugins
 
 ;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=Talen
+BulgarianLanguage=Bulgaarse menu\x92s en vensters
+CatalanLanguage=Catalaanse menu\x92s en vensters
+ChineseSimplifiedLanguage=Chinese (versimpeld) menu\x92s en vensters
+ChineseTraditionalLanguage=Chinese (traditioneel) menu\x92s en vensters
+CroatianLanguage=Kroatische menu\x92s en vensters
+CzechLanguage=Tsjechische menu\x92s en vensters
+DanishLanguage=Deense menu\x92s en vensters
+DutchLanguage=Nederlandstalige menu\x92s en vensters
+FrenchLanguage=Franse menu\x92s en vensters
+GalicianLanguage=Galicische menu\x92s en vensters
+GermanLanguage=Duitse menu\x92s en vensters
+GreekLanguage=Griekse menu\x92s en vensters
+HungarianLanguage=Hongaarse menu\x92s en vensters
+ItalianLanguage=Italiaanse menu\x92s en vensters
+JapaneseLanguage=Japanse menu\x92s en vensters
+KoreanLanguage=Koreaanse menu\x92s en vensters
+NorwegianLanguage=Noorse menu\x92s en vensters
+PolishLanguage=Poolse menu\x92s en vensters
+PortugueseBrazilLanguage=Portugese (Braziliaanse) menu\x92s en vensters
+PortugueseLanguage=Portugese menu\x92s en vensters
+RomanianLanguage=Roemeense menu\x92s en vensters
+RussianLanguage=Russische menu\x92s en vensters
+SlovakLanguage=Slovaakse menu\x92s en vensters
+SlovenianLanguage=Sloveense menu\x92s en vensters
+SpanishLanguage=Spaanse menu\x92s en vensters
+SwedishLanguage=Zweedse menu\x92s en vensters
+TurkishLanguage=Turkse menu\x92s en vensters
+UkrainianLanguage=Oekra\xEFense menu\x92s en vensters
 
 ;Tasks
-ExplorerContextMenu=&Enable Explorer context menu integration
-IntegrateTortoiseCVS=Integrate with &TortoiseCVS
-IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
-IntegrateClearCase=Integrate with Rational &ClearCase
+ExplorerContextMenu=&Activeer integratie in contextmenu van Verkenner
+IntegrateTortoiseCVS=Integreren met &TortoiseCVS
+IntegrateTortoiseSVN=Integreren met T&ortoiseSVN
+IntegrateClearCase=Integreren met Rational &ClearCase
 IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
 UpdatingCommonControls=Updating the System's Common Controls
 
 ;Icon Labels
-ReadMe=Read Me
-UsersGuide=User's Guide
+ReadMe=Lees Mij
+UsersGuide=Gebruikershandleiding
 UpdatingCommonControls=Updating the System's Common Controls
-ViewStartMenuFolder=&View the WinMerge Start Menu Folder
+ViewStartMenuFolder=Bekijk de WinMerge startmenu-map
 PluginsText=Plugins
 
 ;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=De installer heeft ontdekt dat u de locatie van uw startmenu veranderd heeft van "%s" naar "%s". Wilt u de vorige startmenu-map wissen?
 
 ; Project file description
-ProjectFileDesc=WinMerge Project file
+ProjectFileDesc=WinMerge Projectbestand


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