Thread: [Winmerge-svn] SF.net SVN: winmerge:[5811] trunk (Page 2)
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
winmerge-svn
|
From: <sdo...@us...> - 2008-08-15 06:45:17
|
Revision: 5811
http://winmerge.svn.sourceforge.net/winmerge/?rev=5811&view=rev
Author: sdottaka
Date: 2008-08-15 06:45:14 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
PATCH [ 1989858 ] Use std::vector in word-diff code(2)
- BugFix: Didn't select word-diff cyclically by pressing F4 key
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeDocLineDiffs.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-15 06:10:16 UTC (rev 5810)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-15 06:45:14 UTC (rev 5811)
@@ -10,6 +10,7 @@
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
Bugfix: Lost focus after folder compare operations (#2046002)
Bugfix: Some files had folder icons when aborting folder compare (#2018836)
+ BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
Translation updates:
- Chinese Traditional (#2039929)
- Japanese (r5805)
Modified: trunk/Src/MergeDocLineDiffs.cpp
===================================================================
--- trunk/Src/MergeDocLineDiffs.cpp 2008-08-15 06:10:16 UTC (rev 5810)
+++ trunk/Src/MergeDocLineDiffs.cpp 2008-08-15 06:45:14 UTC (rev 5811)
@@ -238,7 +238,7 @@
}
// Are we continuing a cycle from the same place ?
- if (whichdiff >= worddiffs.size())
+ if (whichdiff >= (int)worddiffs.size())
whichdiff = -2; // Clearly not continuing the same cycle, reset to not in cycle
// After last diff, reset to get full line again
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-15 14:07:19
|
Revision: 5813
http://winmerge.svn.sourceforge.net/winmerge/?rev=5813&view=rev
Author: kimmov
Date: 2008-08-15 14:07:14 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
PATCH: [ 2034259 ] Include unique folder contents to recursive compare
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/DiffThread.cpp
trunk/Src/DirScan.cpp
trunk/Src/DirScan.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-15 06:46:14 UTC (rev 5812)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-15 14:07:14 UTC (rev 5813)
@@ -6,6 +6,7 @@
WinMerge 2.11.1.4
Add wait cursor for undo and redo (#2039228)
Add icon for "Open Conflict File" menu item (#2047054)
+ Include unique subfolder contents in recursive folder compare (#2034259)
BugFix: External editor command line switches did not work (#2037862)
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
Bugfix: Lost focus after folder compare operations (#2046002)
Modified: trunk/Src/DiffThread.cpp
===================================================================
--- trunk/Src/DiffThread.cpp 2008-08-15 06:46:14 UTC (rev 5812)
+++ trunk/Src/DiffThread.cpp 2008-08-15 14:07:14 UTC (rev 5813)
@@ -39,12 +39,23 @@
* in a single thread. Either edit this line, or breakpoint & change it in
* CompareDirectories() below.
*
- * If you are going to debug compare procdure, you most probably need to set
+ * If you are going to debug compare procedure, you most probably need to set
* this to true. As Visual Studio seems to have real problems with debugging
* these threads otherwise.
*/
static bool bSinglethreaded = false;
+/**
+ * @brief Walk into unique folders and add contents.
+ * This enables/disables walking into unique folders. If we don't walk into
+ * unique folders, they are shown as such in folder compare results. If we
+ * walk into unique folders, we'll show all files in the unique folder and
+ * in possible subfolders.
+ *
+ * This value is true by default.
+ */
+static bool bWalkUniques = true;
+
/** @brief abort handler for CDiffThread -- just a gateway to CDiffThread */
class DiffThreadAbortable : public IAbortable
{
@@ -221,7 +232,7 @@
#endif
// Build results list (except delaying file comparisons until below)
- DirScan_GetItems(paths, subdir, subdir, myStruct, casesensitive, depth, NULL);
+ DirScan_GetItems(paths, subdir, false, subdir, false, myStruct, casesensitive, depth, NULL, bWalkUniques);
#ifdef _DEBUG
_CrtMemCheckpoint(&memStateAfter);
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2008-08-15 06:46:14 UTC (rev 5812)
+++ trunk/Src/DirScan.cpp 2008-08-15 14:07:14 UTC (rev 5813)
@@ -50,7 +50,7 @@
#define OPTIMIZE_SHARE_CSTRINGDATA(X) X
/**
- * @brief Collect file- and directory-names to list.
+ * @brief Collect file- and folder-names to list.
* This function walks given folders and adds found subfolders and files into
* lists. There are two modes, determined by the @p depth:
* - in non-recursive mode we walk only given folders, and add files.
@@ -62,27 +62,44 @@
*
* @param [in] paths Root paths of compare
* @param [in] leftsubdir Left side subdirectory under root path
+ * @param [in] bLeftUniq Is left-side folder unique folder?
* @param [in] rightsubdir Right side subdirectory under root path
+ * @param [in] bRightUniq Is right-side folder unique folder?
+ * @param [in] myStruct Compare-related data, like context etc.
* @param [in] casesensitive Is filename compare casesensitive?
* @param [in] depth Levels of subdirectories to scan, -1 scans all
- * @param [in] pCtxt Compare context
* @param [in] parent Folder diff item to be scanned
+ * @param [in] bUniques If true, walk into unique folders.
* @return 1 normally, -1 if compare was aborted
*/
int DirScan_GetItems(const PathContext &paths, const String &leftsubdir,
- const String &rightsubdir, DiffFuncStruct *myStruct,
- bool casesensitive, int depth, DIFFITEM *parent)
+ bool bLeftUniq, const String &rightsubdir, bool bRightUniq, DiffFuncStruct *myStruct,
+ bool casesensitive, int depth, DIFFITEM *parent,
+ bool bUniques)
{
+ ASSERT(!bLeftUniq || !bRightUniq); // Both folders cannot be unique
static const TCHAR backslash[] = _T("\\");
CDiffContext *pCtxt = myStruct->context;
String sLeftDir(paths.GetLeft());
String sRightDir(paths.GetRight());
String leftsubprefix;
String rightsubprefix;
- if (leftsubdir.length())
+
+ // Format paths for recursive compare (having basedir + subdir)
+ if (bLeftUniq)
{
sLeftDir = paths_ConcatPath(sLeftDir, leftsubdir);
+ leftsubprefix = leftsubdir + backslash;
+ }
+ else if (bRightUniq)
+ {
sRightDir = paths_ConcatPath(sRightDir, rightsubdir);
+ rightsubprefix = rightsubdir + backslash;
+ }
+ else if (!leftsubdir.empty())
+ {
+ sLeftDir = paths_ConcatPath(sLeftDir, leftsubdir);
+ sRightDir = paths_ConcatPath(sRightDir, rightsubdir);
leftsubprefix = leftsubdir + backslash;
// minimize memory footprint by having left/rightsubprefix share CStringData if possible
rightsubprefix = OPTIMIZE_SHARE_CSTRINGDATA
@@ -92,8 +109,10 @@
}
DirItemArray leftDirs, leftFiles, rightDirs, rightFiles;
- LoadAndSortFiles(sLeftDir.c_str(), &leftDirs, &leftFiles, casesensitive);
- LoadAndSortFiles(sRightDir.c_str(), &rightDirs, &rightFiles, casesensitive);
+ if (!bRightUniq)
+ LoadAndSortFiles(sLeftDir.c_str(), &leftDirs, &leftFiles, casesensitive);
+ if (!bLeftUniq)
+ LoadAndSortFiles(sRightDir.c_str(), &rightDirs, &rightFiles, casesensitive);
// Allow user to abort scanning
if (pCtxt->ShouldAbort())
@@ -124,16 +143,60 @@
{
if (i<leftDirs.size() && (j == rightDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)<0))
{
- const UINT nDiffCode = DIFFCODE::LEFT | DIFFCODE::DIR;
- AddToList(leftsubdir, rightsubdir, &leftDirs[i], 0, nDiffCode, myStruct, parent);
+ UINT nDiffCode = DIFFCODE::LEFT | DIFFCODE::DIR;
+ if (bUniques)
+ {
+ // Recurse into unique subfolder and get all items in it
+ String leftnewsub = leftsubprefix + leftDirs[i].filename;
+ if (!pCtxt->m_piFilterGlobal->includeDir(leftnewsub.c_str(), _T("")))
+ {
+ nDiffCode |= DIFFCODE::SKIPPED;
+ AddToList(leftsubdir, _T(""), &leftDirs[i], NULL, nDiffCode, myStruct, parent);
+ }
+ else
+ {
+ DIFFITEM *me = AddToList(leftsubdir, _T(""), &leftDirs[i], NULL, nDiffCode, myStruct, parent);
+ if (DirScan_GetItems(paths, leftnewsub, true, _T(""), false, myStruct, casesensitive,
+ depth - 1, me, bUniques) == -1)
+ {
+ return -1;
+ }
+ }
+ }
+ else
+ {
+ AddToList(leftsubdir, rightsubdir, &leftDirs[i], 0, nDiffCode, myStruct, parent);
+ }
// Advance left pointer over left-only entry, and then retest with new pointers
++i;
continue;
}
if (j<rightDirs.size() && (i == leftDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)>0))
{
- const UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR;
- AddToList(leftsubdir, rightsubdir, 0, &rightDirs[j], nDiffCode, myStruct, parent);
+ UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR;
+ if (bUniques)
+ {
+ // Recurse into unique subfolder and get all items in it
+ String rightnewsub = rightsubprefix + rightDirs[j].filename;
+ if (!pCtxt->m_piFilterGlobal->includeDir(_T(""), rightnewsub.c_str()))
+ {
+ nDiffCode |= DIFFCODE::SKIPPED;
+ AddToList(_T(""), rightsubdir, NULL, &rightDirs[j], nDiffCode, myStruct, parent);
+ }
+ else
+ {
+ DIFFITEM *me = AddToList(_T(""), rightsubdir, NULL, &rightDirs[j], nDiffCode, myStruct, parent);
+ if (DirScan_GetItems(paths, _T(""), false, rightnewsub, true, myStruct, casesensitive,
+ depth - 1, me, bUniques) == -1)
+ {
+ return -1;
+ }
+ }
+ }
+ else
+ {
+ AddToList(leftsubdir, rightsubdir, 0, &rightDirs[j], nDiffCode, myStruct, parent);
+ }
// Advance right pointer over right-only entry, and then retest with new pointers
++j;
continue;
@@ -172,8 +235,8 @@
const UINT nDiffCode = DIFFCODE::BOTH | DIFFCODE::DIR;
DIFFITEM *me = AddToList(leftsubdir, rightsubdir, &leftDirs[i], &rightDirs[j], nDiffCode, myStruct, parent);
// Scan recursively all subdirectories too, we are not adding folders
- if (DirScan_GetItems(paths, leftnewsub, rightnewsub, myStruct, casesensitive,
- depth - 1, me) == -1)
+ if (DirScan_GetItems(paths, leftnewsub, false, rightnewsub, false, myStruct, casesensitive,
+ depth - 1, me, bUniques) == -1)
{
return -1;
}
@@ -194,7 +257,22 @@
if (pCtxt->ShouldAbort())
return -1;
+ if (i < leftFiles.size() && bLeftUniq)
+ {
+ const int nDiffCode = DIFFCODE::LEFT | DIFFCODE::FILE;
+ AddToList(leftsubdir, _T(""), &leftFiles[i], NULL, nDiffCode, myStruct, parent);
+ ++i;
+ continue;
+ }
+ if (j < rightFiles.size() && bRightUniq)
+ {
+ const int nDiffCode = DIFFCODE::RIGHT | DIFFCODE::FILE;
+ AddToList(_T(""), rightsubdir, NULL, &rightFiles[j], nDiffCode, myStruct, parent);
+ ++j;
+ continue;
+ }
+
// Comparing file leftFiles[i].name to rightFiles[j].name
if (i<leftFiles.size() && (j == rightFiles.size() ||
@@ -496,7 +574,7 @@
* @param [in] sRightDir Right subdirectory.
* @param [in] lent Left item data to add.
* @param [in] rent Right item data to add.
- * @param [in] pCtxt Compare context.
+ * @param [in] myStruct Structure containing compare-related data.
* @param [in] parent Parent of item to be added
*/
static DIFFITEM *AddToList(const String &sLeftDir, const String &sRightDir,
@@ -508,8 +586,10 @@
// change to identical
DIFFITEM &di = myStruct->context->AddDiff(parent);
- di.left.path = sLeftDir;
- di.right.path = sRightDir;
+ if (!sLeftDir.empty())
+ di.left.path = sLeftDir;
+ if (!sRightDir.empty())
+ di.right.path = sRightDir;
if (lent)
{
Modified: trunk/Src/DirScan.h
===================================================================
--- trunk/Src/DirScan.h 2008-08-15 06:46:14 UTC (rev 5812)
+++ trunk/Src/DirScan.h 2008-08-15 14:07:14 UTC (rev 5813)
@@ -16,8 +16,9 @@
struct DIFFITEM;
struct DiffFuncStruct;
-int DirScan_GetItems(const PathContext &paths, const String &leftsubdir, const String &rightsubdir, DiffFuncStruct *myStruct,
- bool casesensitive, int depth, DIFFITEM *parent);
+int DirScan_GetItems(const PathContext &paths, const String &leftsubdir,
+ bool bLeftUniq, const String &rightsubdir, bool bRightUniq, DiffFuncStruct *myStruct,
+ bool casesensitive, int depth, DIFFITEM *parent, bool bUniques);
int DirScan_CompareItems(DiffFuncStruct *, POSITION parentdiffpos);
int DirScan_CompareRequestedItems(DiffFuncStruct *, POSITION parentdiffpos);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-08-18 19:38:39
|
Revision: 5816
http://winmerge.svn.sourceforge.net/winmerge/?rev=5816&view=rev
Author: gerundt
Date: 2008-08-18 19:38:32 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
PATCH: [ 2045666 ] Various Updates in German Translation
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/German.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-17 17:33:10 UTC (rev 5815)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-18 19:38:32 UTC (rev 5816)
@@ -13,6 +13,7 @@
Bugfix: Some files had folder icons when aborting folder compare (#2018836)
BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
Translation updates:
+ - German (#2045666)
- Chinese Traditional (#2039929)
- Japanese (r5805)
Modified: trunk/Src/Languages/German.po
===================================================================
--- trunk/Src/Languages/German.po 2008-08-17 17:33:10 UTC (rev 5815)
+++ trunk/Src/Languages/German.po 2008-08-18 19:38:32 UTC (rev 5816)
@@ -14,7 +14,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-04-21 23:30+0100\n"
+"PO-Revision-Date: 2008-08-11 00:18+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -287,7 +287,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Liste..."
#: Merge.rc:152
#: Merge.rc:273
@@ -505,17 +505,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Baum&modus"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Alle Unterordner erweiter&n"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "Alle Unterordner redu&zieren"
#: Merge.rc:239
#, c-format
@@ -2603,12 +2603,12 @@
#: Merge.rc:1662
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
#: Merge.rc:1665
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Plugins aktivieren"
#. StringFileInfo.Block
#: Merge.rc:1695
@@ -2746,17 +2746,17 @@
#: Merge.rc:1757
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Schaltet den Baummodus ein oder aus."
#: Merge.rc:1758
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Alle Unterordner erweitern."
#: Merge.rc:1759
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Alle Unterordner reduzieren."
#: Merge.rc:1765
#, c-format
@@ -3458,8 +3458,14 @@
#: Merge.rc:2044
#, 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 ""
+"Filter wurden aktualisiert. Wollen Sie alle ge\xF6ffneten Ordnervergleiche aktualisieren?\n"
+"\n"
+"Wenn Sie nicht jetzt alle Vergleiche aktualisieren m\xF6chten, k\xF6nnen Sie Nein w\xE4hlen und die Vergleiche sp\xE4ter aktualisieren."
#: Merge.rc:2050
#, c-format
@@ -4087,17 +4093,17 @@
#: Merge.rc:2223
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Wollen Sie wirklich verschieben:"
#: Merge.rc:2224
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Wollen Sie wirklich %d Objekte verschieben:"
#: Merge.rc:2226
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Verschieben best\xE4tigen"
#: Merge.rc:2232
#, c-format
@@ -4368,7 +4374,7 @@
#: Merge.rc:2313
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Ordner sind unterschiedlich"
#: Merge.rc:2314
#, c-format
@@ -5291,22 +5297,22 @@
#: Merge.rc:2623
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Typ"
#: Merge.rc:2625
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Entpacker"
#: Merge.rc:2626
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Prediffer"
#: Merge.rc:2627
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Editor-Skript"
#: Merge.rc:2634
#, c-format
@@ -5331,12 +5337,12 @@
#: Merge.rc:2638
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xC4ndert den linken Schreibschutz-Status."
#: Merge.rc:2639
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xC4ndert den rechten Schreibschutz-Status."
#: Merge.rc:2640
#, c-format
@@ -5727,7 +5733,7 @@
#: Merge.rc:2724
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Zeigt eine Liste der verf\xFCgbaren Plugins."
#: Merge.rc:2725
#, c-format
@@ -5913,7 +5919,7 @@
#: Merge.rc:2794
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Keine Hervorhebung"
#: Merge.rc:2795
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-20 16:03:55
|
Revision: 5827
http://winmerge.svn.sourceforge.net/winmerge/?rev=5827&view=rev
Author: kimmov
Date: 2008-08-20 16:03:51 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
PATCH: [ 2059836 ] Brazilian translation update
Submitted by Felipe Periard Lopes
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Brazilian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-20 15:20:59 UTC (rev 5826)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-20 16:03:51 UTC (rev 5827)
@@ -13,6 +13,7 @@
Bugfix: Some files had folder icons when aborting folder compare (#2018836)
BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
Translation updates:
+ - Brazilian (#2059836)
- German (#2045666)
- Chinese Traditional (#2039929)
- Japanese (r5805)
Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po 2008-08-20 15:20:59 UTC (rev 5826)
+++ trunk/Src/Languages/Brazilian.po 2008-08-20 16:03:51 UTC (rev 5827)
@@ -13,8 +13,8 @@
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: 2008-06-16 18:00+0000\n"
+"POT-Creation-Date: 2008-08-14 01:28+0000\n"
+"PO-Revision-Date: 2008-08-14 18:00+0000\n"
"Last-Translator: Felipe Periard Lopes <felipefpl at ig.com.br>\n"
"Language-Team: Brazilian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:508
+#: Merge.rc:509
#, c-format
msgid "&Copy"
msgstr "&Copiar"
@@ -86,7 +86,7 @@
msgstr "&Colar"
#: Merge.rc:84
-#: Merge.rc:589
+#: Merge.rc:590
#, c-format
msgid "&Goto..."
msgstr "&Ir para..."
@@ -97,22 +97,22 @@
msgstr "Ab&rir"
#: Merge.rc:88
-#: Merge.rc:531
-#: Merge.rc:537
+#: Merge.rc:532
+#: Merge.rc:538
#, c-format
msgid "with &Registered Application"
msgstr "com &o Aplicativo Registrado"
#: Merge.rc:89
-#: Merge.rc:532
-#: Merge.rc:538
+#: Merge.rc:533
+#: Merge.rc:539
#, c-format
msgid "with &External Editor"
msgstr "com &o Editor Externo"
#: Merge.rc:90
-#: Merge.rc:533
-#: Merge.rc:539
+#: Merge.rc:534
+#: Merge.rc:540
#, c-format
msgid "&with..."
msgstr "&com..."
@@ -288,7 +288,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#: Merge.rc:273
@@ -391,7 +391,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1920
+#: Merge.rc:1921
#, c-format
msgid "&Help"
msgstr "&Ajuda"
@@ -506,17 +506,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Modo &\xC1rvore"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&xpandir Todas as Sub-Pastas"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Retrair Todas as Sub-Pastas"
#: Merge.rc:239
#, c-format
@@ -593,7 +593,7 @@
msgstr "&Apagar\tDel"
#: Merge.rc:264
-#: Merge.rc:562
+#: Merge.rc:563
#, c-format
msgid "&Customize Columns..."
msgstr "&Personalizar as Colunas..."
@@ -722,7 +722,7 @@
msgstr "&Scripts"
#: Merge.rc:370
-#: Merge.rc:2758
+#: Merge.rc:2761
#, c-format
msgid "< Empty >"
msgstr "< Vazio >"
@@ -878,1222 +878,1227 @@
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:510
+#: Merge.rc:506
#, c-format
+msgid "&HEX"
+msgstr "&HEX"
+
+#: Merge.rc:511
+#, c-format
msgid "&Left to Right"
msgstr "&Esquerda para a Direita"
-#: Merge.rc:511
+#: Merge.rc:512
#, c-format
msgid "L&eft to..."
msgstr "E&squerda para..."
-#: Merge.rc:512
+#: Merge.rc:513
#, c-format
msgid "&Right to Left"
msgstr "&Direita para a Esquerda"
-#: Merge.rc:513
+#: Merge.rc:514
#, c-format
msgid "R&ight to..."
msgstr "D&ireita para..."
-#: Merge.rc:515
+#: Merge.rc:516
#, c-format
msgid "&Move"
msgstr "&Mover"
-#: Merge.rc:517
+#: Merge.rc:518
#, c-format
msgid "&Left to..."
msgstr "&Esquerda para..."
-#: Merge.rc:518
+#: Merge.rc:519
#, c-format
msgid "&Right to..."
msgstr "&Direita para..."
-#: Merge.rc:520
+#: Merge.rc:521
#, c-format
msgid "&Delete"
msgstr "&Apagar"
-#: Merge.rc:522
-#: Merge.rc:1140
-#: Merge.rc:1522
+#: Merge.rc:523
+#: Merge.rc:1141
+#: Merge.rc:1523
#, c-format
msgid "&Left"
msgstr "&Esquerda"
-#: Merge.rc:523
-#: Merge.rc:1142
-#: Merge.rc:1525
+#: Merge.rc:524
+#: Merge.rc:1143
+#: Merge.rc:1526
#, c-format
msgid "&Right"
msgstr "&Direita"
-#: Merge.rc:524
+#: Merge.rc:525
#, c-format
msgid "&Both"
msgstr "&Ambos"
-#: Merge.rc:526
+#: Merge.rc:527
#, c-format
msgid "Re&name"
msgstr "Re&nomear"
-#: Merge.rc:527
+#: Merge.rc:528
#, c-format
msgid "&Hide Items"
msgstr "&Esconder os Itens"
-#: Merge.rc:529
+#: Merge.rc:530
#, c-format
msgid "&Open Left"
msgstr "&Abrir a Esquerda"
-#: Merge.rc:535
+#: Merge.rc:536
#, c-format
msgid "O&pen Right"
msgstr "A&brir a Direita"
-#: Merge.rc:542
+#: Merge.rc:543
#, c-format
msgid "Cop&y Pathnames"
msgstr "Cop&iar os nomes dos caminhos"
-#: Merge.rc:544
+#: Merge.rc:545
#, c-format
msgid "&Left (%1 of %2)"
msgstr "&Esquerda (%1 de %2)"
-#: Merge.rc:545
+#: Merge.rc:546
#, c-format
msgid "&Right (%1 of %2)"
msgstr "&Direita (%1 de %\xA82)"
-#: Merge.rc:546
+#: Merge.rc:547
#, c-format
msgid "&Both (%1 of %2)"
msgstr "&Ambos (%1 de %2)"
-#: Merge.rc:548
+#: Merge.rc:549
#, c-format
msgid "Copy &Filenames"
msgstr "Copiar &os nomes dos arquivos"
-#: Merge.rc:550
+#: Merge.rc:551
#, c-format
msgid "&Zip"
msgstr "&Zip"
-#: Merge.rc:552
+#: Merge.rc:553
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "&Esquerda... (%1 de %2)"
-#: Merge.rc:553
+#: Merge.rc:554
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "&Direita... (%1 de %2)"
-#: Merge.rc:554
+#: Merge.rc:555
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "&Ambos... (%1 de %2)"
-#: Merge.rc:555
+#: Merge.rc:556
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "&Diferen\xE7as... (%1 de %2)"
-#: Merge.rc:558
+#: Merge.rc:559
#, c-format
msgid "&Refresh"
msgstr "&Atualizar"
-#: Merge.rc:570
+#: Merge.rc:571
#, c-format
msgid "&Copy Full Path"
msgstr "&Copiar o Caminho Completo"
-#: Merge.rc:571
+#: Merge.rc:572
#, c-format
msgid "Copy &Filename"
msgstr "Copiar &o nome do arquivo"
-#: Merge.rc:577
+#: Merge.rc:578
#, c-format
msgid "Prediffer Settings"
msgstr "Configura\xE7\xF5es do Prediffer"
-#: Merge.rc:579
+#: Merge.rc:580
#, c-format
msgid "&No prediffer"
msgstr "&Sem prediffer"
-#: Merge.rc:580
+#: Merge.rc:581
#, c-format
msgid "Auto prediffer"
msgstr "Auto prediffer"
-#: Merge.rc:588
+#: Merge.rc:589
#, c-format
msgid "G&oto Diff"
msgstr "I&r para a Diferen\xE7a"
-#: Merge.rc:591
+#: Merge.rc:592
#, c-format
msgid "&No Moved Blocks"
msgstr "&Nenhum dos Blocos Movidos"
-#: Merge.rc:592
+#: Merge.rc:593
#, c-format
msgid "&All Moved Blocks"
msgstr "&Todos os Blocos Movidos"
-#: Merge.rc:593
+#: Merge.rc:594
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "Bloco Movido par&a a Diferen\xE7a Atual"
-#: Merge.rc:662
+#: Merge.rc:663
#, c-format
msgid "About WinMerge"
msgstr "Sobre o WinMerge"
-#: Merge.rc:668
+#: Merge.rc:669
#, c-format
msgid "(Private Build)"
msgstr "(Build Privado)"
-#: Merge.rc:669
+#: Merge.rc:670
#, c-format
msgid "All rights reserved."
msgstr "Todos os direitos reservados."
-#: Merge.rc:670
+#: Merge.rc:671
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Visitar a Home Page do WinMerge!"
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:795
-#: Merge.rc:981
-#: Merge.rc:1059
-#: Merge.rc:1088
-#: Merge.rc:1098
-#: Merge.rc:1264
-#: Merge.rc:1328
-#: Merge.rc:1341
-#: Merge.rc:1433
-#: Merge.rc:1448
-#: Merge.rc:1670
+#: Merge.rc:674
+#: Merge.rc:706
+#: Merge.rc:796
+#: Merge.rc:982
+#: Merge.rc:1060
+#: Merge.rc:1089
+#: Merge.rc:1099
+#: Merge.rc:1265
+#: Merge.rc:1329
+#: Merge.rc:1342
+#: Merge.rc:1434
+#: Merge.rc:1449
+#: Merge.rc:1671
#, c-format
msgid "OK"
msgstr "OK"
-#: Merge.rc:674
+#: Merge.rc:675
#, c-format
msgid "Contributors"
msgstr "Contribuidores"
-#: Merge.rc:681
+#: Merge.rc:682
#, c-format
msgid "Select Files or Folders"
msgstr "Selecionar Arquivos ou Pastas"
-#: Merge.rc:684
-#: Merge.rc:1599
+#: Merge.rc:685
+#: Merge.rc:1600
#, c-format
msgid "&Left:"
msgstr "&Esquerda:"
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:1002
-#: Merge.rc:1024
+#: Merge.rc:689
+#: Merge.rc:750
+#: Merge.rc:1003
+#: Merge.rc:1025
#, c-format
msgid "&Browse..."
msgstr "&Procurar..."
-#: Merge.rc:689
-#: Merge.rc:1603
+#: Merge.rc:690
+#: Merge.rc:1604
#, c-format
msgid "&Right:"
msgstr "&Direita:"
-#: Merge.rc:693
-#: Merge.rc:1035
+#: Merge.rc:694
+#: Merge.rc:1036
#, c-format
msgid "Bro&wse..."
msgstr "Pro&curar..."
-#: Merge.rc:694
-#: Merge.rc:1607
+#: Merge.rc:695
+#: Merge.rc:1608
#, c-format
msgid "&Filter:"
msgstr "&Filtro:"
-#: Merge.rc:697
-#: Merge.rc:1609
+#: Merge.rc:698
+#: Merge.rc:1610
#, c-format
msgid "Select..."
msgstr "Selecionar..."
-#: Merge.rc:698
+#: Merge.rc:699
#, c-format
msgid "&Unpacker:"
msgstr "&Desempacotador:"
-#: Merge.rc:701
+#: Merge.rc:702
#, c-format
msgid "&Select..."
msgstr "&Selecionar..."
-#: Merge.rc:702
-#: Merge.rc:1610
+#: Merge.rc:703
+#: Merge.rc:1611
#, c-format
msgid "&Include Subfolders"
msgstr "&Incluir as Sub-pastas"
-#: Merge.rc:704
+#: Merge.rc:705
#, c-format
msgid "Status:"
msgstr "Status:"
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:796
-#: Merge.rc:826
-#: Merge.rc:858
-#: Merge.rc:868
-#: Merge.rc:1060
-#: Merge.rc:1089
-#: Merge.rc:1099
-#: Merge.rc:1150
-#: Merge.rc:1265
-#: Merge.rc:1342
-#: Merge.rc:1434
-#: Merge.rc:1449
-#: Merge.rc:1671
+#: Merge.rc:707
+#: Merge.rc:737
+#: Merge.rc:797
+#: Merge.rc:827
+#: Merge.rc:859
+#: Merge.rc:869
+#: Merge.rc:1061
+#: Merge.rc:1090
+#: Merge.rc:1100
+#: Merge.rc:1151
+#: Merge.rc:1266
+#: Merge.rc:1343
+#: Merge.rc:1435
+#: Merge.rc:1450
+#: Merge.rc:1672
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: Merge.rc:707
-#: Merge.rc:1343
+#: Merge.rc:708
+#: Merge.rc:1344
#, c-format
msgid "Help"
msgstr "Ajuda"
-#: Merge.rc:708
+#: Merge.rc:709
#, c-format
msgid "Files or Folders to Compare"
msgstr "Arquivos ou Pastas para Comparar"
-#: Merge.rc:715
+#: Merge.rc:716
#, c-format
msgid "Visual SourceSafe"
msgstr "Visual SourceSafe"
-#: Merge.rc:720
+#: Merge.rc:721
#, c-format
msgid "Database:"
msgstr "Base de dados:"
-#: Merge.rc:723
+#: Merge.rc:724
#, c-format
msgid "Project:"
msgstr "Projeto:"
-#: Merge.rc:726
+#: Merge.rc:727
#, c-format
msgid "User:"
msgstr "Usu\xE1rio:"
-#: Merge.rc:728
+#: Merge.rc:729
#, c-format
msgid "Password:"
msgstr "Senha:"
-#: Merge.rc:730
+#: Merge.rc:731
#, c-format
msgid "Link to Destination VSS project"
msgstr "Link para o projeto VSS Destino"
-#: Merge.rc:732
-#: Merge.rc:873
+#: Merge.rc:733
+#: Merge.rc:874
#, c-format
msgid "Apply to all items"
msgstr "Aplicar a todos os itens"
-#: Merge.rc:734
+#: Merge.rc:735
#, c-format
msgid "Check Out"
msgstr "Veja Isso"
-#: Merge.rc:735
-#: Merge.rc:869
+#: Merge.rc:736
+#: Merge.rc:870
#, c-format
msgid "Save As..."
msgstr "Salvar Como..."
-#: Merge.rc:741
+#: Merge.rc:742
#, c-format
msgid "Versioning System"
msgstr "Sistema de Vers\xF5es"
-#: Merge.rc:744
+#: Merge.rc:745
#, c-format
msgid "&Versioning System:"
msgstr "&Sistema de Vers\xF5es:"
-#: Merge.rc:747
+#: Merge.rc:748
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Caminho para o cleartool.exe:"
-#: Merge.rc:754
-#: Merge.rc:1928
+#: Merge.rc:755
+#: Merge.rc:1929
#, c-format
msgid "General"
msgstr "Geral"
-#: Merge.rc:757
+#: Merge.rc:758
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Automaticame&nte rolar para a primeira diferen\xE7a"
-#: Merge.rc:760
+#: Merge.rc:761
#, c-format
msgid "&Disable Splash Screen"
msgstr "&Desativar a Tela de Inicializa\xE7\xE3o"
-#: Merge.rc:762
+#: Merge.rc:763
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Fe&char as janelas com o ESC"
-#: Merge.rc:764
+#: Merge.rc:765
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "&Automaticamente verificar os caminhos no di\xE1logo-Abrir"
-#: Merge.rc:767
+#: Merge.rc:768
#, c-format
msgid "All&ow only one instance to run"
msgstr "Per&mitir apenas uma inst\xE2ncia a executar"
-#: Merge.rc:769
+#: Merge.rc:770
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Pe&rguntar quando fechar m\xFAltiplas janelas"
-#: Merge.rc:771
+#: Merge.rc:772
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Preservar a hora do arquivo na compara\xE7\xE3o dos arquivos"
-#: Merge.rc:774
+#: Merge.rc:775
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "A&uto-Conclus\xE3o do di\xE1logo-Abrir:"
-#: Merge.rc:777
+#: Merge.rc:778
#, c-format
msgid "Enable multiple compare windows for"
msgstr "Ativar m\xFAltiplas janelas de compara\xE7\xE3o para"
-#: Merge.rc:779
-#: Merge.rc:1622
+#: Merge.rc:780
+#: Merge.rc:1623
#, c-format
msgid "&Folder compare"
msgstr "&Comparar as pastas"
-#: Merge.rc:781
-#: Merge.rc:1624
+#: Merge.rc:782
+#: Merge.rc:1625
#, c-format
msgid "Fil&e compare"
msgstr "Com¶r os arquivos"
-#: Merge.rc:783
+#: Merge.rc:784
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o bot\xE3o Resetar para tornar todas as caixas de mensagens vis\xEDveis de novo."
-#: Merge.rc:785
+#: Merge.rc:786
#, c-format
msgid "Reset"
msgstr "Resetar"
-#: Merge.rc:792
+#: Merge.rc:793
#, c-format
msgid "Language"
msgstr "Idiomas"
-#: Merge.rc:799
+#: Merge.rc:800
#, c-format
msgid "Available languages:"
msgstr "Idiomas dispon\xEDveis:"
-#: Merge.rc:805
+#: Merge.rc:806
#, c-format
msgid "Find"
msgstr "Achar"
-#: Merge.rc:808
-#: Merge.rc:835
+#: Merge.rc:809
+#: Merge.rc:836
#, c-format
msgid "Fi&nd what:"
msgstr "Ac&har:"
-#: Merge.rc:811
-#: Merge.rc:841
+#: Merge.rc:812
+#: Merge.rc:842
#, c-format
msgid "Match &whole word only"
msgstr "Combinar &apenas palavras inteiras"
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:814
+#: Merge.rc:844
#, c-format
msgid "Match &case"
msgstr "Combinar &com o caso sensitivo"
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:816
+#: Merge.rc:846
#, c-format
msgid "Regular &expression"
msgstr "Express&\xE3o regular"
-#: Merge.rc:817
+#: Merge.rc:818
#, c-format
msgid "D&on't wrap end of file"
msgstr "N&\xE3o organizar o final do arquivo"
-#: Merge.rc:820
+#: Merge.rc:821
#, c-format
msgid "Direction"
msgstr "Dire\xE7\xE3o"
-#: Merge.rc:821
+#: Merge.rc:822
#, c-format
msgid "&Up"
msgstr "&Pra cima"
-#: Merge.rc:823
+#: Merge.rc:824
#, c-format
msgid "&Down"
msgstr "&Pra baixo"
-#: Merge.rc:825
-#: Merge.rc:855
+#: Merge.rc:826
+#: Merge.rc:856
#, c-format
msgid "&Find Next"
msgstr "&Achar o Pr\xF3ximo"
-#: Merge.rc:832
+#: Merge.rc:833
#, c-format
msgid "Replace"
msgstr "Substituir"
-#: Merge.rc:838
+#: Merge.rc:839
#, c-format
msgid "Re&place with:"
msgstr "Su&bstituir por:"
-#: Merge.rc:847
+#: Merge.rc:848
#, c-format
msgid "&Don't wrap end of file"
msgstr "&N\xE3o organizar o final do arquivo"
-#: Merge.rc:850
+#: Merge.rc:851
#, c-format
msgid "Replace in"
msgstr "Substituir"
-#: Merge.rc:851
+#: Merge.rc:852
#, c-format
msgid "&Selection"
msgstr "&Sele\xE7\xE3o"
-#: Merge.rc:853
+#: Merge.rc:854
#, c-format
msgid "Wh&ole file"
msgstr "No &arquivo inteiro"
-#: Merge.rc:856
+#: Merge.rc:857
#, c-format
msgid "&Replace"
msgstr "&Substituir"
-#: Merge.rc:857
+#: Merge.rc:858
#, c-format
msgid "Replace &All"
msgstr "Substituir &Tudo"
-#: Merge.rc:864
-#: Merge.rc:2169
+#: Merge.rc:865
+#: Merge.rc:2172
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
-#: Merge.rc:867
+#: Merge.rc:868
#, c-format
msgid "CheckOut"
msgstr "Veja Isso"
-#: Merge.rc:872
-#: Merge.rc:1184
+#: Merge.rc:873
+#: Merge.rc:1185
#, c-format
msgid "Comments"
msgstr "Coment\xE1rios"
-#: Merge.rc:875
+#: Merge.rc:876
#, c-format
msgid "CheckIn after checkout"
msgstr "CheckIn ap\xF3s o checkout"
-#: Merge.rc:881
+#: Merge.rc:882
#, c-format
msgid "Linefilters"
msgstr "Filtros das linhas"
-#: Merge.rc:884
+#: Merge.rc:885
#, c-format
msgid "Enable Line Filters"
msgstr "Ativar os Filtros das Linhas"
-#: Merge.rc:887
+#: Merge.rc:888
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Express\xF5es Regulares (uma por linha):"
-#: Merge.rc:894
+#: Merge.rc:895
#, c-format
msgid "Save"
msgstr "Salvar"
-#: Merge.rc:895
+#: Merge.rc:896
#, c-format
msgid "New"
msgstr "Novo"
-#: Merge.rc:896
+#: Merge.rc:897
#, c-format
msgid "Edit"
msgstr "Editar"
-#: Merge.rc:897
+#: Merge.rc:898
#, c-format
msgid "Remove"
msgstr "Remover"
-#: Merge.rc:902
-#: Merge.rc:1931
+#: Merge.rc:903
+#: Merge.rc:1932
#, c-format
msgid "Colors"
msgstr "Cores"
-#: Merge.rc:905
+#: Merge.rc:906
#, c-format
msgid "Difference:"
msgstr "Diferen\xE7a:"
-#: Merge.rc:909
+#: Merge.rc:910
#, c-format
msgid "Selected Difference:"
msgstr "Diferen\xE7a Selecionada:"
-#: Merge.rc:913
-#: Merge.rc:1574
+#: Merge.rc:914
+#: Merge.rc:1575
#, c-format
msgid "Background"
msgstr "2\xBA Plano"
-#: Merge.rc:914
+#: Merge.rc:915
#, c-format
msgid "Deleted"
msgstr "Apagado"
-#: Merge.rc:927
-#: Merge.rc:1369
-#: Merge.rc:1575
+#: Merge.rc:928
+#: Merge.rc:1370
+#: Merge.rc:1576
#, c-format
msgid "Text"
msgstr "Texto"
-#: Merge.rc:931
+#: Merge.rc:932
#, c-format
msgid "Ignored Difference:"
msgstr "Diferen\xE7a Ignorada:"
-#: Merge.rc:941
+#: Merge.rc:942
#, c-format
msgid "Moved:"
msgstr "Movido:"
-#: Merge.rc:951
+#: Merge.rc:952
#, c-format
msgid "Selected Moved:"
msgstr "Selecionado o Movido:"
-#: Merge.rc:958
+#: Merge.rc:959
#, c-format
msgid "Word Difference:"
msgstr "Diferen\xE7a das Palavras:"
-#: Merge.rc:965
+#: Merge.rc:966
#, c-format
msgid "Selected Word Diff:"
msgstr "Diferen\xE7a das Palavras Selecionadas:"
-#: Merge.rc:972
-#: Merge.rc:1058
-#: Merge.rc:1087
-#: Merge.rc:1187
-#: Merge.rc:1415
+#: Merge.rc:973
+#: Merge.rc:1059
+#: Merge.rc:1088
+#: Merge.rc:1188
+#: Merge.rc:1416
#, c-format
msgid "Defaults"
msgstr "Padr\xF5es"
-#: Merge.rc:978
-#: Merge.rc:1357
-#: Merge.rc:1563
+#: Merge.rc:979
+#: Merge.rc:1358
+#: Merge.rc:1564
#, c-format
msgid "Dialog"
msgstr "Di\xE1logo"
-#: Merge.rc:988
-#: Merge.rc:1934
+#: Merge.rc:989
+#: Merge.rc:1935
#, c-format
msgid "System"
msgstr "Sistema"
-#: Merge.rc:991
+#: Merge.rc:992
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "&Enviar os arquivos apagados para o Recycle Bin"
-#: Merge.rc:993
+#: Merge.rc:994
#, c-format
msgid "Integration"
msgstr "Integra\xE7\xE3o"
-#: Merge.rc:994
+#: Merge.rc:995
#, c-format
msgid "&Add to explorer context menu"
msgstr "&Adicionar ao menu de contexto do explorer"
-#: Merge.rc:996
+#: Merge.rc:997
#, c-format
msgid "E&nable advanced menu"
msgstr "A&tivar o menu avan\xE7ado"
-#: Merge.rc:998
+#: Merge.rc:999
#, c-format
msgid "In&clude subfolders by default"
msgstr "In&cluir as sub-pastas por padr\xE3o"
-#: Merge.rc:1000
+#: Merge.rc:1001
#, c-format
msgid "&External editor:"
msgstr "&Editor externo:"
-#: Merge.rc:1003
+#: Merge.rc:1004
#, c-format
msgid "&Filter folder:"
msgstr "&Filtrar a pasta:"
-#: Merge.rc:1005
+#: Merge.rc:1006
#, c-format
msgid "B&rowse..."
msgstr "P&rocurar..."
-#: Merge.rc:1006
+#: Merge.rc:1007
#, c-format
msgid "Temporary files folder"
msgstr "Pasta dos arquivos tempor\xE1rios"
-#: Merge.rc:1007
+#: Merge.rc:1008
#, c-format
msgid "S&ystem's temp folder"
msgstr "P&asta tempor\xE1ria do sistema"
-#: Merge.rc:1009
+#: Merge.rc:1010
#, c-format
msgid "C&ustom folder:"
msgstr "P&asta personalizada:"
-#: Merge.rc:1012
-#: Merge.rc:1028
+#: Merge.rc:1013
+#: Merge.rc:1029
#, c-format
msgid "Br&owse..."
msgstr "Pr&ocurar..."
-#: Merge.rc:1018
+#: Merge.rc:1019
#, c-format
msgid "Patch Generator"
msgstr "Gerador de Patches"
-#: Merge.rc:1021
+#: Merge.rc:1022
#, c-format
msgid "File&1:"
msgstr "Arquivo&1:"
-#: Merge.rc:1025
+#: Merge.rc:1026
#, c-format
msgid "File&2:"
msgstr "Arquivo&2:"
-#: Merge.rc:1029
+#: Merge.rc:1030
#, c-format
msgid "&Swap"
msgstr "&Trocar"
-#: Merge.rc:1030
+#: Merge.rc:1031
#, c-format
msgid "&Append to existing file"
msgstr "&Anexar ao arquivo existente"
-#: Merge.rc:1032
+#: Merge.rc:1033
#, c-format
msgid "&Result:"
msgstr "&Resultado:"
-#: Merge.rc:1036
+#: Merge.rc:1037
#, c-format
msgid "&Format"
msgstr "&Formato"
-#: Merge.rc:1037
+#: Merge.rc:1038
#, c-format
msgid "St&yle:"
msgstr "Es&tilo:"
-#: Merge.rc:1040
+#: Merge.rc:1041
#, c-format
msgid "&Context:"
msgstr "&Contexto:"
-#: Merge.rc:1043
+#: Merge.rc:1044
#, c-format
msgid "W&hitespaces"
msgstr "E&spa\xE7os em branco"
-#: Merge.rc:1044
+#: Merge.rc:1045
#, c-format
msgid "Com&pare"
msgstr "Com¶r"
-#: Merge.rc:1046
+#: Merge.rc:1047
#, c-format
msgid "I&gnore changes"
msgstr "I&gnorar as mudan\xE7as"
-#: Merge.rc:1048
+#: Merge.rc:1049
#, c-format
msgid "Ig&nore all"
msgstr "Ig&norar tudo"
-#: Merge.rc:1050
+#: Merge.rc:1051
#, c-format
msgid "Ignor&e blank lines"
msgstr "Ignor&ar as linhas em branco"
-#: Merge.rc:1052
+#: Merge.rc:1053
#, c-format
msgid "Case sensi&tive"
msgstr "Caso sensi&tivo"
-#: Merge.rc:1054
+#: Merge.rc:1055
#, c-format
msgid "Inclu&de command line"
msgstr "Inclu&ir a linha de comando"
-#: Merge.rc:1056
+#: Merge.rc:1057
#, c-format
msgid "Open to e&xternal editor"
msgstr "Abrir no e&ditor externo"
-#: Merge.rc:1078
+#: Merge.rc:1079
#, c-format
msgid "Display Columns"
msgstr "Exibir Colunas"
-#: Merge.rc:1084
+#: Merge.rc:1085
#, c-format
msgid "Move &Up"
msgstr "Mover &pra Cima"
-#: Merge.rc:1085
+#: Merge.rc:1086
#, c-format
msgid "Move &Down"
msgstr "Mover &pra Baixo"
-#: Merge.rc:1095
+#: Merge.rc:1096
#, c-format
msgid "Select Unpacker"
msgstr "Selecionar o Desempacotador"
-#: Merge.rc:1100
+#: Merge.rc:1101
#, c-format
msgid "File unpacker:"
msgstr "Desempacotador do arquivo:"
-#: Merge.rc:1103
+#: Merge.rc:1104
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Exibir todos os desempacotadores, n\xE3o verificar a extens\xE3o"
-#: Merge.rc:1106
+#: Merge.rc:1107
#, c-format
msgid "Extensions list:"
msgstr "Lista das extens\xF5es:"
-#: Merge.rc:1107
+#: Merge.rc:1108
#, c-format
msgid "Description:"
msgstr "Descri\xE7\xE3o:"
-#: Merge.rc:1118
+#: Merge.rc:1119
#, c-format
msgid " Folder Compare Progress"
msgstr " Progresso da Compara\xE7\xE3o das Pastas"
-#: Merge.rc:1121
-#: Merge.rc:1881
+#: Merge.rc:1122
+#: Merge.rc:1882
#, c-format
msgid "Stop"
msgstr "Parar"
-#: Merge.rc:1126
+#: Merge.rc:1127
#, c-format
msgid "Comparing items..."
msgstr "Comparando os itens..."
-#: Merge.rc:1127
+#: Merge.rc:1128
#, c-format
msgid "Items compared:"
msgstr "Itens comparados:"
-#: Merge.rc:1128
+#: Merge.rc:1129
#, c-format
msgid "Items total:"
msgstr "Total de itens:"
-#: Merge.rc:1134
+#: Merge.rc:1135
#, c-format
msgid "Go To"
msgstr "Ir Para"
-#: Merge.rc:1137
+#: Merge.rc:1138
#, c-format
msgid "G&oto:"
msgstr "I&r para:"
-#: Merge.rc:1139
+#: Merge.rc:1140
#, c-format
msgid "File"
msgstr "Arquivo"
-#: Merge.rc:1144
+#: Merge.rc:1145
#, c-format
msgid "Goto what"
msgstr "Ir para"
-#: Merge.rc:1145
+#: Merge.rc:1146
#, c-format
msgid "Li&ne"
msgstr "Li&nha"
-#: Merge.rc:1147
+#: Merge.rc:1148
#, c-format
msgid "&Difference"
msgstr "&Diferen\xE7a"
-#: Merge.rc:1149
+#: Merge.rc:1150
#, c-format
msgid "&Go To"
msgstr "&Ir Para"
-#: Merge.rc:1155
-#: Merge.rc:1929
+#: Merge.rc:1156
+#: Merge.rc:1930
#, c-format
msgid "Compare"
msgstr "Comparar"
-#: Merge.rc:1158
+#: Merge.rc:1159
#, c-format
msgid "Whitespace"
msgstr "Espa\xE7o em branco"
-#: Merge.rc:1159
+#: Merge.rc:1160
#, c-format
msgid "&Compare"
msgstr "&Comparar"
-#: Merge.rc:1161
+#: Merge.rc:1162
#, c-format
msgid "&Ignore change"
msgstr "&Ignorar a mudan\xE7a"
-#: Merge.rc:1163
+#: Merge.rc:1164
#, c-format
msgid "I&gnore all"
msgstr "I&gnorar tudo"
-#: Merge.rc:1165
+#: Merge.rc:1166
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorar as li&nhas em branco"
-#: Merge.rc:1167
+#: Merge.rc:1168
#, c-format
msgid "Ignore &case"
msgstr "Ignorar &caso sensitivo"
-#: Merge.rc:1169
+#: Merge.rc:1170
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Igno&rar diferen\xE7as de retorno dos procedimentos (Win/Unix/Mac)"
-#: Merge.rc:1172
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "A&tivar a detec\xE7\xE3o dos blocos movidos"
-#: Merge.rc:1174
+#: Merge.rc:1175
#, c-format
msgid "&Match similar lines"
msgstr "&Combinar as linhas similares"
-#: Merge.rc:1176
+#: Merge.rc:1177
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orar as diferen\xE7as de hora menores do que 3 segundos"
-#: Merge.rc:1179
+#: Merge.rc:1180
#, c-format
msgid "&File Compare method:"
msgstr "&M\xE9todo para Comparar Arquivos:"
-#: Merge.rc:1182
+#: Merge.rc:1183
#, c-format
msgid "S&top after first difference"
msgstr "P&arar ap\xF3s a primeira diferen\xE7a"
-#: Merge.rc:1185
+#: Merge.rc:1186
#, c-format
msgid "Filter Comments"
msgstr "Coment\xE1rios do Filtro"
-#: Merge.rc:1192
-#: Merge.rc:1930
+#: Merge.rc:1193
+#: Merge.rc:1931
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1195
+#: Merge.rc:1196
#, c-format
msgid "&Highlight syntax"
msgstr "&Destacar a sintaxe"
-#: Merge.rc:1197
+#: Merge.rc:1198
#, c-format
msgid "&Automatic rescan"
msgstr "&Re-escaneamento autom\xE1tico"
-#: Merge.rc:1199
+#: Merge.rc:1200
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Preservar os caracteres EOL originais"
-#: Merge.rc:1201
+#: Merge.rc:1202
#, c-format
msgid "Tabs"
msgstr "Abas"
-#: Merge.rc:1202
+#: Merge.rc:1203
#, c-format
msgid "&Tab size:"
msgstr "&Tamanho das abas:"
-#: Merge.rc:1205
+#: Merge.rc:1206
#, c-format
msgid "&Insert Tabs"
msgstr "&Inserir Abas"
-#: Merge.rc:1207
+#: Merge.rc:1208
#, c-format
msgid "Insert &Spaces"
msgstr "Inserir &Espa\xE7os"
-#: Merge.rc:1209
+#: Merge.rc:1210
#, c-format
msgid "Line Difference Coloring"
msgstr "Coloramento das Diferen\xE7as das Linhas"
-#: Merge.rc:1211
+#: Merge.rc:1212
#, c-format
msgid "View line differences"
msgstr "Visualizar as diferen\xE7as das linhas"
-#: Merge.rc:1213
+#: Merge.rc:1214
#, c-format
msgid "&Character level"
msgstr "&N\xEDvel dos caracteres"
-#: Merge.rc:1215
+#: Merge.rc:1216
#, c-format
msgid "&Word-level:"
msgstr "&N\xEDvel das palavras:"
-#: Merge.rc:1230
+#: Merge.rc:1231
#, c-format
msgid "Filefilters"
msgstr "Filtros dos arquivos"
-#: Merge.rc:1236
+#: Merge.rc:1237
#, c-format
msgid "Test"
msgstr "Teste"
-#: Merge.rc:1237
+#: Merge.rc:1238
#, c-format
msgid "Install..."
msgstr "Instalar..."
-#: Merge.rc:1238
+#: Merge.rc:1239
#, c-format
msgid "New..."
msgstr "Novo..."
-#: Merge.rc:1239
+#: Merge.rc:1240
#, c-format
msgid "Edit..."
msgstr "Editar..."
-#: Merge.rc:1240
+#: Merge.rc:1241
#, c-format
msgid "Delete..."
msgstr "Apagar..."
-#: Merge.rc:1246
+#: Merge.rc:1247
#, c-format
msgid "Save modified files?"
msgstr "Salvar os arquivos modificados?"
-#: Merge.rc:1249
+#: Merge.rc:1250
#, c-format
msgid "Left side file"
msgstr "Arquivo do lado esquerdo"
-#: Merge.rc:1252
+#: Merge.rc:1253
#, c-format
msgid "&Save changes"
msgstr "&Salvar mudan\xE7as"
-#: Merge.rc:1254
+#: Merge.rc:1255
#, c-format
msgid "&Discard changes"
msgstr "&Descartar mudan\xE7as"
-#: Merge.rc:1256
+#: Merge.rc:1257
#, c-format
msgid "Right side file"
msgstr "Arquivo do lado direito"
-#: Merge.rc:1259
+#: Merge.rc:1260
#, c-format
msgid "S&ave changes"
msgstr "S&alvar mudan\xE7as"
-#: Merge.rc:1261
+#: Merge.rc:1262
#, c-format
msgid "Dis&card changes"
msgstr "Des&cartar mudan\xE7as"
-#: Merge.rc:1263
+#: Merge.rc:1264
#, c-format
msgid "Discard All"
msgstr "Descartar Tudo"
-#: Merge.rc:1270
-#: Merge.rc:1518
-#: Merge.rc:1936
+#: Merge.rc:1271
+#: Merge.rc:1519
+#: Merge.rc:1937
#, c-format
msgid "Codepage"
msgstr "C\xF3digo da p\xE1gina"
-#: Merge.rc:1273
+#: Merge.rc:1274
#, c-format
msgid "Default Codepage"
msgstr "C\xF3digo da P\xE1gina Padr\xE3o"
-#: Merge.rc:1274
+#: Merge.rc:1275
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Selecionar o c\xF3digo de p\xE1gina padr\xE3o assumido quando carregar arquivos n\xE3o-unicode:"
-#: Merge.rc:1276
+#: Merge.rc:1277
#, c-format
msgid ""
"Detect codepage info for these files : .html, .rc, .xml \n"
"need to restart session"
msgstr "Detectar a info do c\xF3digo de p\xE1gina para estes arquivos : .html, .rc, .xml - precisa reiniciar a sess\xE3o"
-#: Merge.rc:1279
+#: Merge.rc:1280
#, c-format
msgid "System codepage"
msgstr "C\xF3digo de p\xE1gina do sistema"
-#: Merge.rc:1281
+#: Merge.rc:1282
#, c-format
msgid "According to WinMerge User Interface"
msgstr "De Acordo com a Interface do Usu\xE1rio do WinMerge"
-#: Merge.rc:1283
+#: Merge.rc:1284
#, c-format
msgid "Custom codepage :"
msgstr "C\xF3digo de p\xE1gina personalizado :"
-#: Merge.rc:1291
+#: Merge.rc:1292
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Suporte para arquivos desativado"
-#: Merge.rc:1294
+#: Merge.rc:1295
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Incapaz de detectar a vers\xE3o do 7-Zip (n\xE3o instalado?)"
-#: Merge.rc:1297
+#: Merge.rc:1298
#, 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 suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diret\xF3rio do programa para opera\xE7\xE3o isolada."
-#: Merge.rc:1299
+#: Merge.rc:1300
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Deve haver tamb\xE9m um plugin com interface apropriada (Merge7z*.dll) no caminho."
-#: Merge.rc:1301
+#: Merge.rc:1302
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr "Por favor use a vers\xE3o do 7-Zip recomendada abaixo at\xE9 que os plugins de interface para as vers\xF5es posteriores se tornem dispon\xEDveis."
-#: Merge.rc:1303
+#: Merge.rc:1304
#, c-format
msgid "Version"
msgstr "Vers\xE3o"
-#: Merge.rc:1305
+#: Merge.rc:1306
#, c-format
msgid ""
"Plugin required\n"
@@ -2102,54 +2107,54 @@
"Plugin requerido\n"
"(dllbuild %04u)"
-#: Merge.rc:1307
+#: Merge.rc:1308
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Vers\xE3o recomendada do 7-Zip:"
-#: Merge.rc:1310
-#: Merge.rc:1313
+#: Merge.rc:1311
+#: Merge.rc:1314
#, c-format
msgid "present"
msgstr "atual"
-#: Merge.rc:1311
+#: Merge.rc:1312
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1314
+#: Merge.rc:1315
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "Software 7-Zip instalado no seu computador:"
-#: Merge.rc:1316
-#: Merge.rc:1321
+#: Merge.rc:1317
+#: Merge.rc:1322
#, c-format
msgid "none"
msgstr "nenhum"
-#: Merge.rc:1318
+#: Merge.rc:1319
#, c-format
msgid "missing"
msgstr "faltando"
-#: Merge.rc:1319
+#: Merge.rc:1320
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "Componentes do 7-Zip para opera\xE7\xE3o isolada:"
-#: Merge.rc:1323
+#: Merge.rc:1324
#, c-format
msgid "outdated"
msgstr "desatualizado"
-#: Merge.rc:1324
+#: Merge.rc:1325
#, c-format
msgid "Plugins on path:"
msgstr "Plugins no caminho:"
-#: Merge.rc:1325
+#: Merge.rc:1326
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2158,499 +2163,499 @@
"N\xE3o exibir esta mensagem de novo.\n"
"(Voc\xEA pode sempre chamar de novo esta mensagem no menu Ajuda.)"
-#: Merge.rc:1329
+#: Merge.rc:1330
#, c-format
msgid "Plugin Download"
msgstr "Download do Plugin"
-#: Merge.rc:1338
+#: Merge.rc:1339
#, c-format
msgid "Options"
msgstr "Op\xE7\xF5es"
-#: Merge.rc:1349
+#: Merge.rc:1350
#, c-format
msgid " Categories"
msgstr " Categorias"
-#: Merge.rc:1351
+#: Merge.rc:1352
#, c-format
msgid "Import..."
msgstr "Importar..."
-#: Merge.rc:1352
+#: Merge.rc:1353
#, c-format
msgid "Export..."
msgstr "Exportar..."
-#: Merge.rc:1360
+#: Merge.rc:1361
#, c-format
msgid "Keywords:"
msgstr "Palavras-chave:"
-#: Merge.rc:1361
+#: Merge.rc:1362
#, c-format
msgid "Function names:"
msgstr "Nomes das fun\xE7\xF5es:"
-#: Merge.rc:1362
+#: Merge.rc:1363
#, c-format
msgid "Comments:"
msgstr "Coment\xE1rios:"
-#: Merge.rc:1363
+#: Merge.rc:1364
#, c-format
msgid "Numbers:"
msgstr "N\xFAmeros:"
-#: Merge.rc:1364
+#: Merge.rc:1365
#, c-format
msgid "Operators:"
msgstr "Operadores:"
-#: Merge.rc:1365
+#: Merge.rc:1366
#, c-format
msgid "Strings:"
msgstr "Strings:"
-#: Merge.rc:1366
+#: Merge.rc:1367
#, c-format
msgid "Preprocessor:"
msgstr "Pr\xE9-processador:"
-#: Merge.rc:1367
+#: Merge.rc:1368
#, c-format
msgid "User 1:"
msgstr "Usu\xE1rio 1:"
-#: Merge.rc:1368
+#: Merge.rc:1369
#, c-format
msgid "User 2:"
msgstr "Usu\xE1rio 2:"
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
-#: Merge.rc:1413
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
+#: Merge.rc:1399
+#: Merge.rc:1404
+#: Merge.rc:1409
+#: Merge.rc:1414
#, c-format
msgid "Bold"
msgstr "Negrito"
-#: Merge.rc:1421
+#: Merge.rc:1422
#, c-format
msgid "Folder Compare Report"
msgstr "Relat\xF3rio sobre a Compara\xE7\xE3o das Pastas"
-#: Merge.rc:1424
+#: Merge.rc:1425
#, c-format
msgid "Report &File:"
msgstr "Reportar &Arquivo:"
-#: Merge.rc:1427
-#: Merge.rc:1601
-#: Merge.rc:1605
-#: Merge.rc:1632
+#: Merge.rc:1428
+#: Merge.rc:1602
+#: Merge.rc:1606
+#: Merge.rc:1633
#, c-format
msgid "Browse..."
msgstr "Procurar..."
-#: Merge.rc:1428
+#: Merge.rc:1429
#, c-format
msgid "&Style:"
msgstr "&Estilo:"
-#: Merge.rc:1431
+#: Merge.rc:1432
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Copiar para a \xC1rea de Transfer\xEAncia"
-#: Merge.rc:1439
+#: Merge.rc:1440
#, c-format
msgid "Shared or Private Filter"
msgstr "Filtro Compartilhado ou Privado"
-#: Merge.rc:1442
+#: Merge.rc:1443
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Que tipo de filtro voc\xEA quer criar?"
-#: Merge.rc:1444
+#: Merge.rc:1445
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Filtro Compartilhado (para todos os usu\xE1rios nesta m\xE1quina)"
-#: Merge.rc:1446
+#: Merge.rc:1447
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Filtro Privado (s\xF3 para o usu\xE1rio atual)"
-#: Merge.rc:1454
-#: Merge.rc:1937
+#: Merge.rc:1455
+#: Merge.rc:1938
#, c-format
msgid "Archive Support"
msgstr "Suporte para Arquivos"
-#: Merge.rc:1457
+#: Merge.rc:1458
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:"
-#: Merge.rc:1459
+#: Merge.rc:1460
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Baixar o Plugin do 7-zip"
-#: Merge.rc:1460
+#: Merge.rc:1461
#, c-format
msgid "&Enable archive file support"
msgstr "&Ativar o suporte para arquivos dentro do arquivo"
-#: Merge.rc:1462
+#: Merge.rc:1463
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Usar 7-zip isolado se dispon\xEDvel"
-#: Merge.rc:1465
+#: Merge.rc:1466
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "U&sar 7-Zip local da pasta do WinMerge"
-#: Merge.rc:1467
+#: Merge.rc:1468
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detectar o tipo de arquivo da assinatura do arquivo"
-#: Merge.rc:1475
+#: Merge.rc:1476
#, c-format
msgid "Compare Statistics"
msgstr "Comparar as Estat\xEDsticas"
-#: Merge.rc:1478
+#: Merge.rc:1479
#, c-format
msgid "Folders:"
msgstr "Pastas:"
-#: Merge.rc:1479
+#: Merge.rc:1480
#, c-format
msgid "Files:"
msgstr "Arquivos:"
-#: Merge.rc:1480
-#: Merge.rc:2316
+#: Merge.rc:1481
+#: Merge.rc:2319
#, c-format
msgid "Different"
msgstr "Diferente"
-#: Merge.rc:1481
+#: Merge.rc:1482
#, c-format
msgid "Text:"
msgstr "Texto:"
-#: Merge.rc:1484
-#: Merge.rc:1503
+#: Merge.rc:1485
+#: Merge.rc:1504
#, c-format
msgid "Binary:"
msgstr "Bin\xE1rio:"
-#: Merge.rc:1487
+#: Merge.rc:1488
#, c-format
msgid "Unique"
msgstr "\xDAnico"
-#: Merge.rc:1488
+#: Merge.rc:1489
#, c-format
msgid "Left:"
msgstr "Esquerda:"
-#: Merge.rc:1493
+#: Merge.rc:1494
#, c-format
msgid "Right:"
msgstr "Direita:"
-#: Merge.rc:1498
-#: Merge.rc:2310
+#: Merge.rc:1499
+#: Merge.rc:2313
#, c-format
msgid "Identical"
msgstr "Id\xEAnticos"
-#: Merge.rc:1507
+#: Merge.rc:1508
#, c-format
msgid "Total:"
msgstr "Total:"
-#: Merge.rc:1512
+#: Merge.rc:1513
#, c-format
msgid "Close"
msgstr "Fechar"
-#: Merge.rc:1521
+#: Merge.rc:1522
#, c-format
msgid "Affects"
msgstr "Afeta"
-#: Merge.rc:1524
-#: Merge.rc:1527
+#: Merge.rc:1525
+#: Merge.rc:1528
#, c-format
msgid "(Affects)"
msgstr "(Afeta)"
-#: Merge.rc:1528
+#: Merge.rc:1529
#, c-format
msgid "Select Codepage for"
msgstr "Selecionar o C\xF3digo da P\xE1gina para"
-#: Merge.rc:1529
+#: Merge.rc:1530
#, c-format
msgid "&File Loading:"
msgstr "&Carregamento do Arquivo:"
-#: Merge.rc:1531
-#: Merge.rc:1534
+#: Merge.rc:1532
+#: Merge.rc:1535
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1532
+#: Merge.rc:1533
#, c-format
msgid "File &Saving:"
msgstr "Salvamento do &Arquivo:"
-#: Merge.rc:1535
+#: Merge.rc:1536
#, c-format
msgid "&Use same codepage for both"
msgstr "&Usar o mesmo c\xF3digo de p\xE1gina para ambos"
-#: Merge.rc:1538
+#: Merge.rc:1539
#, c-format
msgid "&Apply"
msgstr "&Aplicar"
-#: Merge.rc:1539
-#: Merge.rc:1903
+#: Merge.rc:1540
+#: Merge.rc:1904
#, c-format
msgid "&Cancel"
msgstr "&Cancelar"
-#: Merge.rc:1544
+#: Merge.rc:1545
#, c-format
msgid "Test Filter"
msgstr "Testar Filtro"
-#: Merge.rc:1547
+#: Merge.rc:1548
#, c-format
msgid "Testing filter ..."
msgstr "Testando o filtro ..."
-#: Merge.rc:1549
+#: Merge.rc:1550
#, c-format
msgid "&Enter text to test:"
msgstr "&Inserir o texto para testar:"
-#: Merge.rc:1551
+#: Merge.rc:1552
#, c-format
msgid "&Folder Name"
msgstr "&Nome da Pasta"
-#: Merge.rc:1553
+#: Merge.rc:1554
#, c-format
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:1557
+#: Merge.rc:1558
#, c-format
msgid "&Test"
msgstr "&Teste"
-#: Merge.rc:1558
+#: Merge.rc:1559
#, c-format
msgid "&Close"
msgstr "&Fechar"
-#: Merge.rc:1566
+#: Merge.rc:1567
#, c-format
msgid "&Use customized text colors"
msgstr "&Usar cores de texto personalizadas"
-#: Merge.rc:1569
+#: Merge.rc:1570
#, c-format
msgid "Custom text colors"
msgstr "Cores de texto personalizadas"
-#: Merge.rc:1571
+#: Merge.rc:1572
#, c-format
msgid "Whitespace:"
msgstr "Espa\xE7o vazio:"
-#: Merge.rc:1572
+#: Merge.rc:1573
#, c-format
msgid "Regular text:"
msgstr "Texto regular:"
-#: Merge.rc:1573
+#: Merge.rc:1574
#, c-format
msgid "Selection:"
msgstr "Sele\xE7\xE3o:"
-#: Merge.rc:1596
+#: Merge.rc:1597
#, c-format
msgid "Paths"
msgstr "Caminhos"
-#: Merge.rc:1602
+#: Merge.rc:1603
#, c-format
msgid "R&ead-only"
msgstr "S&omente-leitura"
-#: Merge.rc:1606
+#: Merge.rc:1607
#, c-format
msgid "Re&ad-only"
msgstr "So&mente-leitura"
-#: Merge.rc:1612
+#: Merge.rc:1613
#, c-format
msgid "Open..."
msgstr "Abrir..."
-#: Merge.rc:1613
+#: Merge.rc:1614
#, c-format
msgid "Save..."
msgstr "Salvar..."
-#: Merge.rc:1618
-#: Merge.rc:1938
+#: Merge.rc:1619
+#: Merge.rc:1939
#, c-format
msgid "Backup Files"
msgstr "Arquivos de Backup"
-#: Merge.rc:1621
+#: Merge.rc:1622
#, c-format
msgid "Create backup files in:"
msgstr "Criar arquivos de backup em:"
-#: Merge.rc:1626
+#: Merge.rc:1627
#, c-format
msgid "Create backup files into:"
msgstr "Criar arquivos de backup em:"
-#: Merge.rc:1627
+#: Merge.rc:1628
#, c-format
msgid "&Original file's folder"
msgstr "&Pasta do arquivo original"
-#: Merge.rc:1629
+#: Merge.rc:1630
#, c-format
msgid "&Global backup folder:"
msgstr "&Pasta de backup global:"
-#: Merge.rc:1633
+#: Merge.rc:1634
#, c-format
msgid "Backup filename:"
msgstr "Nome do arquivo de backup:"
-#: Merge.rc:1634
+#: Merge.rc:1635
#, c-format
msgid "&Append .bak -extension"
msgstr "&Anexar a extens\xE3o .bak"
-#: Merge.rc:1636
+#: Merge.rc:1637
#, c-format
msgid "A&ppend timestamp"
msgstr "A&nexar a estampa de tempo"
-#: Merge.rc:1643
-#: Merge.rc:2225
+#: Merge.rc:1644
+#: Merge.rc:2228
#, c-format
msgid "Confirm Copy"
msgstr "Confirmar a C\xF3pia"
-#: Merge.rc:1647
+#: Merge.rc:1648
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Voc\xEA tem certeza que voc\xEA quer copiar os itens XXX?"
-#: Merge.rc:1649
+#: Merge.rc:1650
#, c-format
msgid "From left"
msgstr "Da esquerda"
-#: Merge.rc:1652
+#: Merge.rc:1653
#, c-format
msgid "To right"
msgstr "Para a direita"
-#: Merge.rc:1655
+#: Merge.rc:1656
#, c-format
msgid "Yes"
msgstr "Sim"
-#: Merge.rc:1656
+#: Merge.rc:1657
#, c-format
msgid "No"
msgstr "N\xE3o"
-#: Merge.rc:1662
+#: Merge.rc:1663
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
-#: Merge.rc:1665
+#: Merge.rc:1666
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Ativar plugins"
#. StringFileInfo.Block
-#: Merge.rc:1695
+#: Merge.rc:1696
#, c-format
msgid "040904e4"
msgstr "041604e4"
#. VarFileInfo.Translation
-#: Merge.rc:1711
+#: Merge.rc:1712
#, c-format
msgid "0x409, 1252"
msgstr "0x416, 1252"
-#: Merge.rc:1726
+#: Merge.rc:1727
#, c-format
msgid "Ready"
msgstr "Pronto"
-#: Merge.rc:1732
+#: Merge.rc:1733
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1733
+#: Merge.rc:1734
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1734
+#: Merge.rc:1735
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1735
+#: Merge.rc:1736
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1736
+#: Merge.rc:1737
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1737
+#: Merge.rc:1738
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1743
+#: Merge.rc:1744
#, c-format
msgid ""
"Create empty documents\n"
@@ -2659,7 +2664,7 @@
"Criar documentos vazios\n"
"Novos Documentos (Ctrl+N)"
-#: Merge.rc:1744
+#: Merge.rc:1745
#, c-format
msgid ""
"Open an existing document\n"
@@ -2668,7 +2673,7 @@
"Abrir um documento existente\n"
"Abrir"
-#: Merge.rc:1745
+#: Merge.rc:1746
#, c-format
msgid ""
"Close the active document\n"
@@ -2677,7 +2682,7 @@
"Fechar o documento ativo\n"
"Fechar"
-#: Merge.rc:1746
+#: Merge.rc:1747
#, c-format
msgid ""
"Save the active document\n"
@@ -2686,7 +2691,7 @@
"Salvar o documento ativo\n"
"Salvar"
-#: Merge.rc:1747
+#: Merge.rc:1748
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2695,7 +2700,7 @@
"Salvar o documento ativo com um novo nome\n"
"Salvar Como"
-#: Merge.rc:1748
+#: Merge.rc:1749
#, c-format
msgid ""
"Change the printing options\n"
@@ -2704,7 +2709,7 @@
"Mudar as op\xE7\xF5es de impress\xE3o\n"
"Configurar P\xE1gina"
-#: Merge.rc:1749
+#: Merge.rc:1750
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2713,7 +2718,7 @@
"Mudar a impressora e as op\xE7\xF5es de impress\xE3o\n"
"Configurar a impress\xE3o"
-#: Merge.rc:1750
+#: Merge.rc:1751
#, c-format
msgid ""
"Print the active document\n"
@@ -2722,7 +2727,7 @@
"Imprimir o documento ativo\n"
"Imprimir"
-#: Merge.rc:1751
+#: Merge.rc:1752
#, c-format
msgid ""
"Display full pages\n"
@@ -2731,27 +2736,27 @@
"Exibir p\xE1ginas completas\n"
"Pr\xE9-Visualizar Impress\xE3o"
-#: Merge.rc:1756
+#: Merge.rc:1757
#, c-format
msgid "Make all hidden items visible again"
msgstr "Tornar todos os itens escondidos vis\xEDveis de novo"
-#: Merge.rc:1757
+#: Merge.rc:1758
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Ativar o modo \xE1rvore"
-#: Merge.rc:1758
+#: Merge.rc:1759
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Expandir todas as sub-pastas"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Retrair todas as sub-pastas"
-#: Merge.rc:1765
+#: Merge.rc:1766
#, c-format
msgid ""
"Open project file\n"
@@ -2760,32 +2765,32 @@
"Abrir o arquivo do projeto\n"
"Arquivo do projeto (Ctrl+J)"
-#: Merge.rc:1766
+#: Merge.rc:1767
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto"
-#: Merge.rc:1767
+#: Merge.rc:1768
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto"
-#: Merge.rc:1768
+#: Merge.rc:1769
#, c-format
msgid "Project File"
msgstr "Arquivo do Projeto"
-#: Merge.rc:1769
+#: Merge.rc:1770
#, c-format
msgid "Project file successfully loaded."
msgstr "Arquivo do projeto carregado com sucesso."
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid "Project file successfully saved."
msgstr "Arquivo do projeto salvo com sucesso."
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2794,7 +2799,7 @@
"Salvar os caminhos atuais e op\xE7\xF5es no arquivo do projeto\n"
"Salvar o Arquivo do Projeto"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2803,7 +2808,7 @@
"Exibir as informa\xE7\xF5es do programa, n\xFAmero da vers\xE3o e copyright\n"
"Sobre"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2812,7 +2817,6 @@
"Sair do aplicativo; alertar para salvar os documentos\n"
"Sair"
-#: Merge.rc:1783
#: Merge.rc:1784
#: Merge.rc:1785
#: Merge.rc:1786
@@ -2828,11 +2832,12 @@
#: Merge.rc:1796
#: Merge.rc:1797
#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid "Open this document"
msgstr "Abrir este documento"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2841,7 +2846,7 @@
"Troca para o pr\xF3ximo painel da janela\n"
"Painel Seguinte"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2850,7 +2855,7 @@
"Troca de volta para o painel da janela anterior\n"
"Painel Anterior"
-#: Merge.rc:1810
+#: Merge.rc:1811
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2859,7 +2864,7 @@
"Organiza as janelas para que elas se sobreponham\n"
"Janelas em Cascata"
-#: Merge.rc:1811
+#: Merge.rc:1812
#, fuzzy, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2868,7 +2873,7 @@
"Organizar as janelas lado a lado n\xE3o sobrepostas horizontalmente\n"
"Janelas Lado a Lado Horizontalmente"
-#: Merge.rc:1812
+#: Merge.rc:1813
#, fuzzy, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2877,7 +2882,7 @@
"Organizar as janelas lado a lado n\xE3o sobrepostas verticalmente\n"
"Janelas Lado a Lado Verticalmente"
-#: Merge.rc:1818
+#: Merge.rc:1819
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2886,7 +2891,7 @@
"Copia a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n"
"Copiar"
-#: Merge.rc:1819
+#: Merge.rc:1820
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2895,7 +2900,7 @@
"Corta a sele\xE7\xE3o e a p\xF5e na \xC1rea de Transfer\xEAncia\n"
"Cortar"
-#: Merge.rc:1820
+#: Merge.rc:1821
#, c-format
msgid ""
"Find the specified text\n"
@@ -2904,7 +2909,7 @@
"Achar o texto especificado\n"
"Achar"
-#: Merge.rc:1821
+#: Merge.rc:1822
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2913,7 +2918,7 @@
"Inserir os conte\xFAdos da \xC1rea de Transfer\xEAncia\n"
"Colar"
-#: Merge.rc:1822
+#: Merge.rc:1823
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2922,7 +2927,7 @@
"Repetir a \xFAltima a\xE7\xE3o\n"
"Repetir"
-#: Merge.rc:1823
+#: Merge.rc:1824
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2931,7 +2936,7 @@
"Substitui o texto espec\xEDfico com um texto diferente\n"
"Substituir"
-#: Merge.rc:1824
+#: Merge.rc:1825
#, c-format
msgid ""
"Select the entire document\n"
@@ -2940,7 +2945,7 @@
"Seleciona o documento inteiro\n"
"Selecionar Tudo"
-#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid ""
"Undo the last action\n"
@@ -2949,7 +2954,7 @@
"Desfazer a \xFAltima a\xE7\xE3o\n"
"Desfazer"
-#: Merge.rc:1826
+#: Merge.rc:1827
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -2958,7 +2963,7 @@
"Refazer a a\xE7\xE3o desfeita anteriormente\n"
"Refazer"
-#: Merge.rc:1832
+#: Merge.rc:1833
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -2967,7 +2972,7 @@
"Mostrar ou esconder a barra de ferramentas\n"
"Ativar a Barra de Ferramentas"
-#: Merge.rc:1833
+#: Merge.rc:1834
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -2976,7 +2981,7 @@
"Mostrar ou esconder a barra de status\n"
"Ativar a Barra de Status"
-#: Merge.rc:1834
+#: Merge.rc:1835
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -2985,7 +2990,7 @@
"Mostrar ou esconder a barra das abas\n"
"Ativar a Barra das Abas"
-#: Merge.rc:1835
+#: Merge.rc:1836
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -2994,57 +2999,57 @@
"Automaticamente redimensionar os pain\xE9is\n"
"Trancar os Pain\xE9is"
-#: Merge.rc:1841
+#: Merge.rc:1842
#, c-format
msgid "Change the window size"
msgstr "Mudar o tamanho da janela"
-#: Merge.rc:1842
+#: Merge.rc:1843
#, c-format
msgid "Change the window position"
msgstr "Mudar a posi\xE7\xE3o da janela"
-#: Merge.rc:1843
+#: Merge.rc:1844
#, c-format
msgid "Reduce the window to an icon"
msgstr "Reduzir a janela a um \xEDcone"
-#: Merge.rc:1844
+#: Merge.rc:1845
#, c-format
msgid "Enlarge the window to full size"
msgstr "Aumentar a janela para o tamanho completo"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid "Switch to the next document window"
msgstr "Trocar para a pr\xF3xima janela do documento"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid "Switch to the previous document window"
msgstr "Trocar para a janela do documento anterior"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Fecha a janela ativa e alerta para salvar os documentos"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid "Restore the window to normal size"
msgstr "Restaurar a janela para o tamanho normal"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid "Activate Task List"
msgstr "Ativar a Lista de Tarefas"
-#: Merge.rc:1854
+#: Merge.rc:1855
#, c-format
msgid "Activate this window"
msgstr "Ativar esta janela"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3053,7 +3058,7 @@
"Fechar o modo de pr\xE9-visualiza\xE7\xE3o da impress\xE3o\n"
"Cancelar a Pr\xE9-Visualiza\xE7\xE3o"
-#: Merge.rc:1867
+#: Merge.rc:1868
#, c-format
msgid ""
"\n"
@@ -3072,7 +3077,7 @@
"WinMerge.FileCompare\n"
"Compara\xE7\xE3o dos Arquivos do WinMerge"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid ""
"\n"
@@ -3091,23 +3096,23 @@
"WinMerge.FolderCompare\n"
"Compara\xE7\xE3o das Pastas do WinMerge"
-#: Merge.rc:1875
+#: Merge.rc:1876
#, c-format
msgid "Preserve original EOL chars"
msgstr "Preservar os caracs. EOL originais"
-#: Merge.rc:1882
+#: Merge.rc:1883
#, c-format
msgid "Press any key"
msgstr "Pressione qualquer tecla"
-#: Merge.rc:1888
#: Merge.rc:1889
+#: Merge.rc:1890
#, c-format
msgid "Right click on the path to copy"
msgstr "Clique com o direito no caminho para copiar"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid ""
"Developers:\n"
@@ -3116,152 +3121,152 @@
"Desenvolvedores:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1896
+#: Merge.rc:1897
#, 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 vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este \xE9 um software livre e voc\xEA \xE9 bem vindo para redistribu\xED-lo sob certas circunst\xE2ncias; veja o GNU Licen\xE7a para o P\xFAblico em Geral no menu Ajuda para detalhes."
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "&Ok"
msgstr "&Ok"
-#: Merge.rc:1904
+#: Merge.rc:1905
#, c-format
msgid "&Abort"
msgstr "&Abortar"
-#: Merge.rc:1905
+#: Merge.rc:1906
#, c-format
msgid "&Retry"
msgstr "&Tentar de novo"
-#: Merge.rc:1906
+#: Merge.rc:1907
#, c-format
msgid "&Ignore"
msgstr "&Ignorar"
-#: Merge.rc:1907
+#: Merge.rc:1908
#, c-format
msgid "Ignore &all"
msgstr "Ignorar &tudo"
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "&Yes"
msgstr "&Sim"
-#: Merge.rc:1914
+#: Merge.rc:1915
#, c-format
msgid "Yes to &all"
msgstr "Sim para &todos"
-#: Merge.rc:1915
+#: Merge.rc:1916
#, c-format
msgid "&No"
msgstr "&N\xE3o"
-#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "No to a&ll"
msgstr "N\xE3o para t&odos"
-#: Merge.rc:1917
+#: Merge.rc:1918
#, c-format
msgid "&Continue"
msgstr "&Continuar"
-#: Merge.rc:1918
+#: Merge.rc:1919
#, c-format
msgid "&Skip"
msgstr "&Pular"
-#: Merge.rc:1919
+#: Merge.rc:1920
#, c-format
msgid "Skip &all"
msgstr "Pular &tudo"
-#: Merge.rc:1921
+#: Merge.rc:1922
#, c-format
msgid "Don't display this &message again."
msgstr "N\xE3o exibir esta &mensagem de novo."
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid "Don't ask this &question again."
msgstr "N\xE3o perguntar esta &quest\xE3o de novo."
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "Syntax colors"
msgstr "Cores da sintaxe"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "Text Colors"
msgstr "Cores do Texto"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "Version Control"
msgstr "Controle da Vers\xE3o"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "To:"
msgstr "Para:"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "From left:"
msgstr "Da esquerda:"
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "To left:"
msgstr "Para a esquerda:"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "From right:"
msgstr "Da direita:"
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "To right:"
msgstr "Para a direita:"
-#: Merge.rc:1955
+#: Merge.rc:1956
#, c-format
msgid "Version %1"
msgstr "Vers\xE3o %1"
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1962
+#: Merge.rc:1963
#, c-format
msgid "Options (%1)"
msgstr "Op\xE7\xF5es (%1)"
-#: Merge.rc:1963
+#: Merge.rc:1964
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Todas as caixas de mensagens agora ser\xE3o exibidas de novo."
-#: Merge.rc:1964
+#: Merge.rc:1965
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "Modifica\xE7\xF5es foram feitas na sess\xE3o de compara\xE7\xE3o do arquivo atual. Algumas configura\xE7\xF5es podem n\xE3o acontecer at\xE9 que a compara\xE7\xE3o do arquivo atual seja reiniciada."
-#: Merge.rc:1965
+#: Merge.rc:1966
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "A mudan\xE7a da fonte selecionada n\xE3o ser\xE1 aplicada a qualquer das janelas das diferen\xE7as atualmente vis\xEDveis."
-#: Merge.rc:1967
+#: Merge.rc:1968
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3272,7 +3277,7 @@
"\n"
"Por favor use valores de 1 - %1."
-#: Merge.rc:1969
+#: Merge.rc:1970
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3283,129 +3288,129 @@
"\n"
"Por favor reinicie o WinMerge ap\xF3s o reset."
-#: Merge.rc:1975
+#: Merge.rc:1976
#, c-format
msgid "Open"
msgstr "Abrir"
-#: Merge.rc:1976
+#: Merge.rc:1977
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:1977
+#: Merge.rc:1978
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:1978
+#: Merge.rc:1979
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:1980
+#: Merge.rc:1981
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Arquivos das op\xE7\xF5es (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:1986
+#: Merge.rc:1987
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:1987
+#: Merge.rc:1988
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:1988
+#: Merge.rc:1989
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:1994
+#: Merge.rc:1995
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:1995
+#: Merge.rc:1996
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:1996
+#: Merge.rc:1997
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:1997
+#: Merge.rc:1998
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2003
+#: Merge.rc:2004
#, c-format
msgid "Full Contents"
msgstr "Conte\xFAdos Completos"
-#: Merge.rc:2004
+#: Merge.rc:2005
#, c-format
msgid "Quick Contents"
msgstr "Conte\xFAdos R\xE1pidos"
-#: Merge.rc:2005
+#: Merge.rc:2006
#, c-format
msgid "Modified Date"
msgstr "Data Modificada"
-#: Merge.rc:2006
+#: Merge.rc:2007
#, c-format
msgid "Modified Date and Size"
msgstr "Data e Tamanho Modificados"
-#: Merge.rc:2007
+#: Merge.rc:2008
#, c-format
msgid "Size"
msgstr "Tamanho"
-#: Merge.rc:2013
-#: Merge.rc:2622
+#: Merge.rc:2014
+#: Merge.rc:2625
#, c-format
msgid "Name"
msgstr "Nome"
-#: Merge.rc:2014
+#: Merge.rc:2015
#, c-format
msgid "Location"
msgstr "Local"
-#: Merge.rc:2015
+#: Merge.rc:2016
#, c-format
msgid "Filters"
msgstr "Filtros"
-#: Merge.rc:2016
+#: Merge.rc:2017
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2017
-#: Merge.rc:2624
+#: Merge.rc:2018
+#: Merge.rc:2627
#, c-format
msgid "Description"
msgstr "Descri\xE7\xE3o"
-#: Merge.rc:2018
+#: Merge.rc:2019
#, c-format
msgid "Select filename for new filter"
msgstr "Selecionar o nome do arquivo para o novo filtro"
-#: Merge.rc:2019
+#: Merge.rc:2020
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||"
-#: Merge.rc:2021
+#: Merge.rc:2022
#, c-format
msgid ""
"Cannot find file filter template fil...
[truncated message content] |
|
From: <ki...@us...> - 2008-08-20 16:09:30
|
Revision: 5829
http://winmerge.svn.sourceforge.net/winmerge/?rev=5829&view=rev
Author: kimmov
Date: 2008-08-20 16:09:27 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
PATCH: [ 2060782 ] Update TSVN command line to use -u
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-20 16:04:49 UTC (rev 5828)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-20 16:09:27 UTC (rev 5829)
@@ -7,6 +7,7 @@
Add wait cursor for undo and redo (#2039228)
Add icon for "Open Conflict File" menu item (#2047054)
Include unique subfolder contents in recursive folder compare (#2034259)
+ Installer: Use -u switch in TortoiseSVN command line (#2060782)
BugFix: External editor command line switches did not work (#2037862)
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
Bugfix: Lost focus after folder compare operations (#2046002)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-08-20 16:04:49 UTC (rev 5828)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-08-20 16:09:27 UTC (rev 5829)
@@ -509,7 +509,7 @@
Root: HKLM; 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: HKLM; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -u -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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-08-20 20:28:57
|
Revision: 5831
http://winmerge.svn.sourceforge.net/winmerge/?rev=5831&view=rev
Author: gerundt
Date: 2008-08-20 20:28:52 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
PATCH: [ 2060771 ] Add icon for "Plugins->List" menu item
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MainFrm.cpp
trunk/Src/Merge2.rc
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/res/plugins.bmp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-20 20:18:04 UTC (rev 5830)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-20 20:28:52 UTC (rev 5831)
@@ -8,6 +8,7 @@
Add icon for "Open Conflict File" menu item (#2047054)
Include unique subfolder contents in recursive folder compare (#2034259)
Installer: Use -u switch in TortoiseSVN command line (#2060782)
+ Add icon for "Plugins->List" menu item (#2060771)
BugFix: External editor command line switches did not work (#2037862)
BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833)
Bugfix: Lost focus after folder compare operations (#2046002)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-08-20 20:18:04 UTC (rev 5830)
+++ trunk/Src/MainFrm.cpp 2008-08-20 20:28:52 UTC (rev 5831)
@@ -118,6 +118,7 @@
{ ID_TOOLS_FILTERS, IDB_TOOLS_FILTERS, CMainFrame::MENU_ALL },
{ ID_TOOLS_CUSTOMIZECOLUMNS, IDB_TOOLS_COLUMNS, CMainFrame::MENU_ALL },
{ ID_TOOLS_GENERATEPATCH, IDB_TOOLS_GENERATEPATCH, CMainFrame::MENU_ALL },
+ { ID_PLUGINS_LIST, IDB_PLUGINS_LIST, CMainFrame::MENU_ALL },
{ ID_FILE_PRINT, IDB_FILE_PRINT, CMainFrame::MENU_FILECMP },
{ ID_TOOLS_GENERATEREPORT, IDB_TOOLS_GENERATEREPORT, CMainFrame::MENU_FILECMP },
{ ID_EDIT_TOGGLE_BOOKMARK, IDB_EDIT_TOGGLE_BOOKMARK, CMainFrame::MENU_FILECMP },
Modified: trunk/Src/Merge2.rc
===================================================================
--- trunk/Src/Merge2.rc 2008-08-20 20:18:04 UTC (rev 5830)
+++ trunk/Src/Merge2.rc 2008-08-20 20:28:52 UTC (rev 5831)
@@ -142,6 +142,7 @@
IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp"
IDB_TREE_STATE BITMAP "res\\treestate.bmp"
IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp"
+IDB_PLUGINS_LIST BITMAP "res\\plugins.bmp"
/////////////////////////////////////////////////////////////////////////////
Property changes on: trunk/Src/res/plugins.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2008-08-20 20:18:04 UTC (rev 5830)
+++ trunk/Src/resource.h 2008-08-20 20:28:52 UTC (rev 5831)
@@ -102,6 +102,7 @@
#define IDB_VIEW_ZOOMOUT 359
#define IDB_TREE_STATE 360
#define IDB_FILE_OPENCONFLICT 361
+#define IDB_PLUGINS_LIST 362
#define IDI_FOLDER 500
#define IDI_LFOLDER 501
#define IDI_RFOLDER 502
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-21 13:27:21
|
Revision: 5836
http://winmerge.svn.sourceforge.net/winmerge/?rev=5836&view=rev
Author: kimmov
Date: 2008-08-21 13:27:19 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
PATCH: [ 2062107 ] A Swedish Swedish.po translation update
Submitted by Hans Eriksson
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Swedish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-21 07:06:13 UTC (rev 5835)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-21 13:27:19 UTC (rev 5836)
@@ -19,6 +19,7 @@
- German (#2045666)
- Chinese Traditional (#2039929)
- Japanese (r5805)
+ - Swedish (#2062107)
WinMerge 2.11.1.3 - 2008-08-04 (r5733)
Rename color scheme menu item "None" and add separator (#2027300)
Modified: trunk/Src/Languages/Swedish.po
===================================================================
--- trunk/Src/Languages/Swedish.po 2008-08-21 07:06:13 UTC (rev 5835)
+++ trunk/Src/Languages/Swedish.po 2008-08-21 13:27:19 UTC (rev 5836)
@@ -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-03-04 16:04+0100\n"
+"PO-Revision-Date: 2008-08-20 13:00+0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:508
+#: Merge.rc:509
#, c-format
msgid "&Copy"
msgstr "K&opiera"
@@ -84,7 +84,7 @@
msgstr "K&listra in"
#: Merge.rc:84
-#: Merge.rc:589
+#: Merge.rc:590
#, c-format
msgid "&Goto..."
msgstr "&G\xE5 till..."
@@ -95,22 +95,22 @@
msgstr "\xD6p&pna"
#: Merge.rc:88
-#: Merge.rc:531
-#: Merge.rc:537
+#: Merge.rc:532
+#: Merge.rc:538
#, c-format
msgid "with &Registered Application"
msgstr "med &Registrerat program"
#: Merge.rc:89
-#: Merge.rc:532
-#: Merge.rc:538
+#: Merge.rc:533
+#: Merge.rc:539
#, c-format
msgid "with &External Editor"
msgstr "med &Extern editor"
#: Merge.rc:90
-#: Merge.rc:533
-#: Merge.rc:539
+#: Merge.rc:534
+#: Merge.rc:540
#, c-format
msgid "&with..."
msgstr "&med..."
@@ -286,7 +286,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#: Merge.rc:273
@@ -389,7 +389,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1920
+#: Merge.rc:1921
#, c-format
msgid "&Help"
msgstr "&Hj\xE4lp"
@@ -504,17 +504,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Tr\xE4d&mod"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&xpandera alla underkataloger"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Minimera alla underkataloger"
#: Merge.rc:239
#, c-format
@@ -591,7 +591,7 @@
msgstr "&Ta bort\tDelete"
#: Merge.rc:264
-#: Merge.rc:562
+#: Merge.rc:563
#, c-format
msgid "&Customize Columns..."
msgstr "&Anpassa kolumner..."
@@ -720,7 +720,7 @@
msgstr "&Script"
#: Merge.rc:370
-#: Merge.rc:2758
+#: Merge.rc:2761
#, c-format
msgid "< Empty >"
msgstr "< Inga >"
@@ -876,1166 +876,1171 @@
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:510
+#: Merge.rc:506
#, c-format
+msgid "&HEX"
+msgstr ""
+
+#: Merge.rc:511
+#, c-format
msgid "&Left to Right"
msgstr "&V\xE4nster till h\xF6ger"
-#: Merge.rc:511
+#: Merge.rc:512
#, c-format
msgid "L&eft to..."
msgstr "V&\xE4nster till..."
-#: Merge.rc:512
+#: Merge.rc:513
#, c-format
msgid "&Right to Left"
msgstr "&H\xF6ger till v\xE4nster"
-#: Merge.rc:513
+#: Merge.rc:514
#, c-format
msgid "R&ight to..."
msgstr "H&\xF6ger till..."
-#: Merge.rc:515
+#: Merge.rc:516
#, c-format
msgid "&Move"
msgstr "&Flytta"
-#: Merge.rc:517
+#: Merge.rc:518
#, c-format
msgid "&Left to..."
msgstr "&V\xE4nster till..."
-#: Merge.rc:518
+#: Merge.rc:519
#, c-format
msgid "&Right to..."
msgstr "&H\xF6ger till..."
-#: Merge.rc:520
+#: Merge.rc:521
#, c-format
msgid "&Delete"
msgstr "&Ta bort"
-#: Merge.rc:522
-#: Merge.rc:1140
-#: Merge.rc:1522
+#: Merge.rc:523
+#: Merge.rc:1141
+#: Merge.rc:1523
#, c-format
msgid "&Left"
msgstr "&V\xE4nster"
-#: Merge.rc:523
-#: Merge.rc:1142
-#: Merge.rc:1525
+#: Merge.rc:524
+#: Merge.rc:1143
+#: Merge.rc:1526
#, c-format
msgid "&Right"
msgstr "&H\xF6ger"
-#: Merge.rc:524
+#: Merge.rc:525
#, c-format
msgid "&Both"
msgstr "&B\xE5da"
-#: Merge.rc:526
+#: Merge.rc:527
#, c-format
msgid "Re&name"
msgstr "Byt &namn"
-#: Merge.rc:527
+#: Merge.rc:528
#, c-format
msgid "&Hide Items"
msgstr "&D\xF6lj filnamn"
-#: Merge.rc:529
+#: Merge.rc:530
#, c-format
msgid "&Open Left"
msgstr "&\xD6ppna v\xE4nster"
-#: Merge.rc:535
+#: Merge.rc:536
#, c-format
msgid "O&pen Right"
msgstr "\xD6&ppna h\xF6ger"
-#: Merge.rc:542
+#: Merge.rc:543
#, c-format
msgid "Cop&y Pathnames"
msgstr "Kop&iera S\xF6kv\xE4gar"
-#: Merge.rc:544
+#: Merge.rc:545
#, c-format
msgid "&Left (%1 of %2)"
msgstr "&V\xE4nster (%1 av %2)"
-#: Merge.rc:545
+#: Merge.rc:546
#, c-format
msgid "&Right (%1 of %2)"
msgstr "&H\xF6ger (%1 av %2)"
-#: Merge.rc:546
+#: Merge.rc:547
#, c-format
msgid "&Both (%1 of %2)"
msgstr "&B\xE5da (%1 av %2)"
-#: Merge.rc:548
+#: Merge.rc:549
#, c-format
msgid "Copy &Filenames"
msgstr "Kopiera &Filnamn"
-#: Merge.rc:550
+#: Merge.rc:551
#, c-format
msgid "&Zip"
msgstr "&Zip"
-#: Merge.rc:552
+#: Merge.rc:553
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "&V\xE4nster... (%1 av %2)"
-#: Merge.rc:553
+#: Merge.rc:554
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "&H\xF6ger... (%1 av %2)"
-#: Merge.rc:554
+#: Merge.rc:555
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "&B\xE5da... (%1 av %2)"
-#: Merge.rc:555
+#: Merge.rc:556
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "&Skillnader... (%1 av %2)"
-#: Merge.rc:558
+#: Merge.rc:559
#, c-format
msgid "&Refresh"
msgstr "&Uppdatera"
-#: Merge.rc:570
+#: Merge.rc:571
#, c-format
msgid "&Copy Full Path"
msgstr "Kopiera hela s\xF6kv\xE4gen"
-#: Merge.rc:571
+#: Merge.rc:572
#, c-format
msgid "Copy &Filename"
msgstr "Kopiera Filnamn"
-#: Merge.rc:577
+#: Merge.rc:578
#, c-format
msgid "Prediffer Settings"
msgstr "Prediffer-inst\xE4llningar"
-#: Merge.rc:579
+#: Merge.rc:580
#, c-format
msgid "&No prediffer"
msgstr "&Ingen Prediffer"
-#: Merge.rc:580
+#: Merge.rc:581
#, c-format
msgid "Auto prediffer"
msgstr "Automatisk Prediffer"
-#: Merge.rc:588
+#: Merge.rc:589
#, c-format
msgid "G&oto Diff"
msgstr "G&\xE5 till skillnad"
-#: Merge.rc:591
+#: Merge.rc:592
#, c-format
msgid "&No Moved Blocks"
msgstr "&Inga Flyttade Block"
-#: Merge.rc:592
+#: Merge.rc:593
#, c-format
msgid "&All Moved Blocks"
msgstr "&Alla Flyttade Block"
-#: Merge.rc:593
+#: Merge.rc:594
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "Flyttat Block f\xF6r &Aktuell Skillnad"
-#: Merge.rc:662
+#: Merge.rc:663
#, c-format
msgid "About WinMerge"
msgstr "Om WinMerge"
-#: Merge.rc:668
+#: Merge.rc:669
#, c-format
msgid "(Private Build)"
msgstr "(Privat kompilering)"
-#: Merge.rc:669
+#: Merge.rc:670
#, c-format
msgid "All rights reserved."
msgstr "Med ensamr\xE4tt"
-#: Merge.rc:670
+#: Merge.rc:671
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Bes\xF6k WinMerges hemsida !"
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:795
-#: Merge.rc:981
-#: Merge.rc:1059
-#: Merge.rc:1088
-#: Merge.rc:1098
-#: Merge.rc:1264
-#: Merge.rc:1328
-#: Merge.rc:1341
-#: Merge.rc:1433
-#: Merge.rc:1448
-#: Merge.rc:1670
+#: Merge.rc:674
+#: Merge.rc:706
+#: Merge.rc:796
+#: Merge.rc:982
+#: Merge.rc:1060
+#: Merge.rc:1089
+#: Merge.rc:1099
+#: Merge.rc:1265
+#: Merge.rc:1329
+#: Merge.rc:1342
+#: Merge.rc:1434
+#: Merge.rc:1449
+#: Merge.rc:1671
#, c-format
msgid "OK"
msgstr "OK"
-#: Merge.rc:674
+#: Merge.rc:675
#, c-format
msgid "Contributors"
msgstr "Medarbetare"
-#: Merge.rc:681
+#: Merge.rc:682
#, c-format
msgid "Select Files or Folders"
msgstr "V\xE4lj filer eller kataloger..."
-#: Merge.rc:684
-#: Merge.rc:1599
+#: Merge.rc:685
+#: Merge.rc:1600
#, c-format
msgid "&Left:"
msgstr "&V\xE4nster:"
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:1002
-#: Merge.rc:1024
+#: Merge.rc:689
+#: Merge.rc:750
+#: Merge.rc:1003
+#: Merge.rc:1025
#, c-format
msgid "&Browse..."
msgstr "&Bl\xE4ddra..."
-#: Merge.rc:689
-#: Merge.rc:1603
+#: Merge.rc:690
+#: Merge.rc:1604
#, c-format
msgid "&Right:"
msgstr "&H\xF6ger:"
-#: Merge.rc:693
-#: Merge.rc:1035
+#: Merge.rc:694
+#: Merge.rc:1036
#, c-format
msgid "Bro&wse..."
msgstr "B&l\xE4ddra..."
-#: Merge.rc:694
-#: Merge.rc:1607
+#: Merge.rc:695
+#: Merge.rc:1608
#, c-format
msgid "&Filter:"
msgstr "&Filter:"
-#: Merge.rc:697
-#: Merge.rc:1609
+#: Merge.rc:698
+#: Merge.rc:1610
#, c-format
msgid "Select..."
msgstr "V\xE4lj..."
-#: Merge.rc:698
+#: Merge.rc:699
#, c-format
msgid "&Unpacker:"
msgstr "&Uppackare:"
-#: Merge.rc:701
+#: Merge.rc:702
#, c-format
msgid "&Select..."
msgstr "V\xE4lj..."
-#: Merge.rc:702
-#: Merge.rc:1610
+#: Merge.rc:703
+#: Merge.rc:1611
#, c-format
msgid "&Include Subfolders"
msgstr "&Inkludera Underkataloger"
-#: Merge.rc:704
+#: Merge.rc:705
#, c-format
msgid "Status:"
msgstr "Status:"
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:796
-#: Merge.rc:826
-#: Merge.rc:858
-#: Merge.rc:868
-#: Merge.rc:1060
-#: Merge.rc:1089
-#: Merge.rc:1099
-#: Merge.rc:1150
-#: Merge.rc:1265
-#: Merge.rc:1342
-#: Merge.rc:1434
-#: Merge.rc:1449
-#: Merge.rc:1671
+#: Merge.rc:707
+#: Merge.rc:737
+#: Merge.rc:797
+#: Merge.rc:827
+#: Merge.rc:859
+#: Merge.rc:869
+#: Merge.rc:1061
+#: Merge.rc:1090
+#: Merge.rc:1100
+#: Merge.rc:1151
+#: Merge.rc:1266
+#: Merge.rc:1343
+#: Merge.rc:1435
+#: Merge.rc:1450
+#: Merge.rc:1672
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: Merge.rc:707
-#: Merge.rc:1343
+#: Merge.rc:708
+#: Merge.rc:1344
#, c-format
msgid "Help"
msgstr "Hj\xE4lp"
-#: Merge.rc:708
+#: Merge.rc:709
#, c-format
msgid "Files or Folders to Compare"
msgstr "Filer eller kataloger som skall j\xE4mf\xF6ras"
-#: Merge.rc:715
+#: Merge.rc:716
#, c-format
msgid "Visual SourceSafe"
msgstr "Visual SourceSafe"
-#: Merge.rc:720
+#: Merge.rc:721
#, c-format
msgid "Database:"
msgstr "Databas:"
-#: Merge.rc:723
+#: Merge.rc:724
#, c-format
msgid "Project:"
msgstr "Projekt:"
-#: Merge.rc:726
+#: Merge.rc:727
#, c-format
msgid "User:"
msgstr "Anv\xE4ndare:"
-#: Merge.rc:728
+#: Merge.rc:729
#, c-format
msgid "Password:"
msgstr "L\xF6senord:"
-#: Merge.rc:730
+#: Merge.rc:731
#, c-format
msgid "Link to Destination VSS project"
msgstr "L\xE4nka till valt VSS-projekt"
-#: Merge.rc:732
-#: Merge.rc:873
+#: Merge.rc:733
+#: Merge.rc:874
#, c-format
msgid "Apply to all items"
msgstr "Till\xE4mpa p\xE5 alla objekt"
-#: Merge.rc:734
+#: Merge.rc:735
#, c-format
msgid "Check Out"
msgstr "Checka ut"
-#: Merge.rc:735
-#: Merge.rc:869
+#: Merge.rc:736
+#: Merge.rc:870
#, c-format
msgid "Save As..."
msgstr "Spara som..."
-#: Merge.rc:741
+#: Merge.rc:742
#, c-format
msgid "Versioning System"
msgstr "Versionsstyrningssystem"
-#: Merge.rc:744
+#: Merge.rc:745
#, c-format
msgid "&Versioning System:"
msgstr "&Versionsstyrningssystem:"
-#: Merge.rc:747
+#: Merge.rc:748
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&S\xF6kv\xE4g till Cleartool.exe:"
-#: Merge.rc:754
-#: Merge.rc:1928
+#: Merge.rc:755
+#: Merge.rc:1929
#, c-format
msgid "General"
msgstr "Generellt"
-#: Merge.rc:757
+#: Merge.rc:758
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "G\xE5 automati&skt till f\xF6rsta skillnaden"
-#: Merge.rc:760
+#: Merge.rc:761
#, c-format
msgid "&Disable Splash Screen"
msgstr "&Visa inte Startsk\xE4rm"
-#: Merge.rc:762
+#: Merge.rc:763
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "St&\xE4ng f\xF6nster med ESC"
-#: Merge.rc:764
+#: Merge.rc:765
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "Verifiera s\xF6kv\xE4gar i \xD6ppna-dialogen"
-#: Merge.rc:767
+#: Merge.rc:768
#, c-format
msgid "All&ow only one instance to run"
msgstr "&Till\xE5t bara en upplaga att k\xF6ra"
-#: Merge.rc:769
+#: Merge.rc:770
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Fr\xE5&ga n\xE4r flera f\xF6nster st\xE4ngs"
-#: Merge.rc:771
+#: Merge.rc:772
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Bevara Filtidsuppgifter i Filj\xE4mf\xF6relse"
-#: Merge.rc:774
+#: Merge.rc:775
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "\xD6&ppna-dialog Auto-Komplettera:"
-#: Merge.rc:777
+#: Merge.rc:778
#, c-format
msgid "Enable multiple compare windows for"
msgstr "Starta flera j\xE4mf\xF6rf\xF6nster f\xF6r"
-#: Merge.rc:779
-#: Merge.rc:1622
+#: Merge.rc:780
+#: Merge.rc:1623
#, c-format
msgid "&Folder compare"
msgstr "&J\xE4mf\xF6r kataloger"
-#: Merge.rc:781
-#: Merge.rc:1624
+#: Merge.rc:782
+#: Merge.rc:1625
#, c-format
msgid "Fil&e compare"
msgstr "J\xE4m&f\xF6r filer"
-#: Merge.rc:783
+#: Merge.rc:784
#, 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."
-#: Merge.rc:785
+#: Merge.rc:786
#, c-format
msgid "Reset"
msgstr "\xC5terst\xE4ll"
-#: Merge.rc:792
+#: Merge.rc:793
#, c-format
msgid "Language"
msgstr "Spr\xE5k"
-#: Merge.rc:799
+#: Merge.rc:800
#, c-format
msgid "Available languages:"
msgstr "Tillg\xE4ngliga spr\xE5k:"
-#: Merge.rc:805
+#: Merge.rc:806
#, c-format
msgid "Find"
msgstr "S\xF6k"
-#: Merge.rc:808
-#: Merge.rc:835
+#: Merge.rc:809
+#: Merge.rc:836
#, c-format
msgid "Fi&nd what:"
msgstr "S&\xF6k efter:"
-#: Merge.rc:811
-#: Merge.rc:841
+#: Merge.rc:812
+#: Merge.rc:842
#, c-format
msgid "Match &whole word only"
msgstr "Matcha &hela ord"
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:814
+#: Merge.rc:844
#, c-format
msgid "Match &case"
msgstr "Mat&cha VERSALER och gemener"
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:816
+#: Merge.rc:846
#, c-format
msgid "Regular &expression"
msgstr "&Regulj\xE4rt uttryck"
-#: Merge.rc:817
+#: Merge.rc:818
#, c-format
msgid "D&on't wrap end of file"
msgstr "V&\xE4nd inte vid slutet av filen"
-#: Merge.rc:820
+#: Merge.rc:821
#, c-format
msgid "Direction"
msgstr "Riktning"
-#: Merge.rc:821
+#: Merge.rc:822
#, c-format
msgid "&Up"
msgstr "&Upp"
-#: Merge.rc:823
+#: Merge.rc:824
#, c-format
msgid "&Down"
msgstr "&Ner"
-#: Merge.rc:825
-#: Merge.rc:855
+#: Merge.rc:826
+#: Merge.rc:856
#, c-format
msgid "&Find Next"
msgstr "&S\xF6k n\xE4sta"
-#: Merge.rc:832
+#: Merge.rc:833
#, c-format
msgid "Replace"
msgstr "Ers\xE4tt"
-#: Merge.rc:838
+#: Merge.rc:839
#, c-format
msgid "Re&place with:"
msgstr "Ers\xE4&tt med:"
-#: Merge.rc:847
+#: Merge.rc:848
#, c-format
msgid "&Don't wrap end of file"
msgstr "V\xE4nd inte vid slutet av filen"
-#: Merge.rc:850
+#: Merge.rc:851
#, c-format
msgid "Replace in"
msgstr "Ers\xE4tt i"
-#: Merge.rc:851
+#: Merge.rc:852
#, c-format
msgid "&Selection"
msgstr "&Markering"
-#: Merge.rc:853
+#: Merge.rc:854
#, c-format
msgid "Wh&ole file"
msgstr "He&la filen"
-#: Merge.rc:856
+#: Merge.rc:857
#, c-format
msgid "&Replace"
msgstr "&Ers\xE4tt"
-#: Merge.rc:857
+#: Merge.rc:858
#, c-format
msgid "Replace &All"
msgstr "Ers\xE4tt &alla"
-#: Merge.rc:864
-#: Merge.rc:2169
+#: Merge.rc:865
+#: Merge.rc:2172
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
-#: Merge.rc:867
+#: Merge.rc:868
#, c-format
msgid "CheckOut"
msgstr "Checka ut"
-#: Merge.rc:872
-#: Merge.rc:1184
+#: Merge.rc:873
+#: Merge.rc:1185
#, c-format
msgid "Comments"
msgstr "Kommentarer"
-#: Merge.rc:875
+#: Merge.rc:876
#, c-format
msgid "CheckIn after checkout"
msgstr "Checka in efter Checka ut"
-#: Merge.rc:881
+#: Merge.rc:882
#, c-format
msgid "Linefilters"
msgstr "Radfilter"
-#: Merge.rc:884
+#: Merge.rc:885
#, c-format
msgid "Enable Line Filters"
msgstr "Anv\xE4nd Radfilter"
-#: Merge.rc:887
+#: Merge.rc:888
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Regulj\xE4ra uttryck (ett per rad):"
-#: Merge.rc:894
+#: Merge.rc:895
#, c-format
msgid "Save"
msgstr "Spara"
-#: Merge.rc:895
+#: Merge.rc:896
#, c-format
msgid "New"
msgstr "Ny"
-#: Merge.rc:896
+#: Merge.rc:897
#, c-format
msgid "Edit"
msgstr "\xC4ndra"
-#: Merge.rc:897
+#: Merge.rc:898
#, c-format
msgid "Remove"
msgstr "Ta bort"
-#: Merge.rc:902
-#: Merge.rc:1931
+#: Merge.rc:903
+#: Merge.rc:1932
#, c-format
msgid "Colors"
msgstr "Kul\xF6rer"
-#: Merge.rc:905
+#: Merge.rc:906
#, c-format
msgid "Difference:"
msgstr "Skillnader:"
-#: Merge.rc:909
+#: Merge.rc:910
#, c-format
msgid "Selected Difference:"
msgstr "Markerade skillnader:"
-#: Merge.rc:913
-#: Merge.rc:1574
+#: Merge.rc:914
+#: Merge.rc:1575
#, c-format
msgid "Background"
msgstr "Bakgrund"
-#: Merge.rc:914
+#: Merge.rc:915
#, c-format
msgid "Deleted"
msgstr "Borttaget"
-#: Merge.rc:927
-#: Merge.rc:1369
-#: Merge.rc:1575
+#: Merge.rc:928
+#: Merge.rc:1370
+#: Merge.rc:1576
#, c-format
msgid "Text"
msgstr "Text"
-#: Merge.rc:931
+#: Merge.rc:932
#, c-format
msgid "Ignored Difference:"
msgstr "Ignorerad Skillnad:"
-#: Merge.rc:941
+#: Merge.rc:942
#, c-format
msgid "Moved:"
msgstr "Flyttad:"
-#: Merge.rc:951
+#: Merge.rc:952
#, c-format
msgid "Selected Moved:"
msgstr "Markerad flyttad:"
-#: Merge.rc:958
+#: Merge.rc:959
#, c-format
msgid "Word Difference:"
msgstr "Ordskillnad:"
-#: Merge.rc:965
+#: Merge.rc:966
#, c-format
msgid "Selected Word Diff:"
msgstr "Vald ordskillnad:"
-#: Merge.rc:972
-#: Merge.rc:1058
-#: Merge.rc:1087
-#: Merge.rc:1187
-#: Merge.rc:1415
+#: Merge.rc:973
+#: Merge.rc:1059
+#: Merge.rc:1088
+#: Merge.rc:1188
+#: Merge.rc:1416
#, c-format
msgid "Defaults"
msgstr "Standard"
-#: Merge.rc:978
-#: Merge.rc:1357
-#: Merge.rc:1563
+#: Merge.rc:979
+#: Merge.rc:1358
+#: Merge.rc:1564
#, c-format
msgid "Dialog"
msgstr "Dialog"
-#: Merge.rc:988
-#: Merge.rc:1934
+#: Merge.rc:989
+#: Merge.rc:1935
#, c-format
msgid "System"
msgstr "System"
-#: Merge.rc:991
+#: Merge.rc:992
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "&Skicka borttagna filer till Papperskorgen"
-#: Merge.rc:993
+#: Merge.rc:994
#, c-format
msgid "Integration"
msgstr "Integration"
-#: Merge.rc:994
+#: Merge.rc:995
#, c-format
msgid "&Add to explorer context menu"
msgstr "L\xE4gg till i Utforskarens popup-meny"
-#: Merge.rc:996
+#: Merge.rc:997
#, c-format
msgid "E&nable advanced menu"
msgstr "A&nv\xE4nd avancerad meny"
-#: Merge.rc:998
+#: Merge.rc:999
#, c-format
msgid "In&clude subfolders by default"
msgstr "In&kludera underkataloger som standard"
-#: Merge.rc:1000
+#: Merge.rc:1001
#, c-format
msgid "&External editor:"
msgstr "Extern Editor:"
-#: Merge.rc:1003
+#: Merge.rc:1004
#, c-format
msgid "&Filter folder:"
msgstr "&Filterkatalog:"
-#: Merge.rc:1005
+#: Merge.rc:1006
#, c-format
msgid "B&rowse..."
msgstr "Bl\xE4ddra..."
-#: Merge.rc:1006
+#: Merge.rc:1007
#, c-format
msgid "Temporary files folder"
msgstr "Katalog f\xF6r Tempor\xE4ra filer"
-#: Merge.rc:1007
+#: Merge.rc:1008
#, c-format
msgid "S&ystem's temp folder"
msgstr "S&ystemets tempor\xE4ra katalog"
-#: Merge.rc:1009
+#: Merge.rc:1010
#, c-format
msgid "C&ustom folder:"
msgstr "A&npassad katalog:"
-#: Merge.rc:1012
-#: Merge.rc:1028
+#: Merge.rc:1013
+#: Merge.rc:1029
#, c-format
msgid "Br&owse..."
msgstr "Bl\xE4ddra..."
-#: Merge.rc:1018
+#: Merge.rc:1019
#, c-format
msgid "Patch Generator"
msgstr "Patchgenerator"
-#: Merge.rc:1021
+#: Merge.rc:1022
#, c-format
msgid "File&1:"
msgstr "Fil &1:"
-#: Merge.rc:1025
+#: Merge.rc:1026
#, c-format
msgid "File&2:"
msgstr "Fil &2:"
-#: Merge.rc:1029
+#: Merge.rc:1030
#, c-format
msgid "&Swap"
msgstr "Byt"
-#: Merge.rc:1030
+#: Merge.rc:1031
#, c-format
msgid "&Append to existing file"
msgstr "L\xE4gg till i befintlig fil"
-#: Merge.rc:1032
+#: Merge.rc:1033
#, c-format
msgid "&Result:"
msgstr "&Resultat:"
-#: Merge.rc:1036
+#: Merge.rc:1037
#, c-format
msgid "&Format"
msgstr "&Format"
-#: Merge.rc:1037
+#: Merge.rc:1038
#, c-format
msgid "St&yle:"
msgstr "T&yp:"
-#: Merge.rc:1040
+#: Merge.rc:1041
#, c-format
msgid "&Context:"
msgstr "Samman&hang:"
-#: Merge.rc:1043
+#: Merge.rc:1044
#, c-format
msgid "W&hitespaces"
msgstr "&Mellanslag"
-#: Merge.rc:1044
+#: Merge.rc:1045
#, c-format
msgid "Com&pare"
msgstr "&J\xE4mf\xF6r"
-#: Merge.rc:1046
+#: Merge.rc:1047
#, c-format
msgid "I&gnore changes"
msgstr "Ignorera skillnader"
-#: Merge.rc:1048
+#: Merge.rc:1049
#, c-format
msgid "Ig&nore all"
msgstr "Ignorera alla"
-#: Merge.rc:1050
+#: Merge.rc:1051
#, c-format
msgid "Ignor&e blank lines"
msgstr "Ignorera blanka rader"
-#: Merge.rc:1052
+#: Merge.rc:1053
#, c-format
msgid "Case sensi&tive"
msgstr "VERSAL/gemen-k\xE4nslig"
-#: Merge.rc:1054
+#: Merge.rc:1055
#, c-format
msgid "Inclu&de command line"
msgstr "Inklu&dera kommandorad"
-#: Merge.rc:1056
+#: Merge.rc:1057
#, c-format
msgid "Open to e&xternal editor"
msgstr "\xD6ppna i Extern editor"
-#: Merge.rc:1078
+#: Merge.rc:1079
#, c-format
msgid "Display Columns"
msgstr "Visa kolumner"
-#: Merge.rc:1084
+#: Merge.rc:1085
#, c-format
msgid "Move &Up"
msgstr "Flytta &Upp"
-#: Merge.rc:1085
+#: Merge.rc:1086
#, c-format
msgid "Move &Down"
msgstr "Flytta &Ned"
-#: Merge.rc:1095
+#: Merge.rc:1096
#, c-format
msgid "Select Unpacker"
msgstr "V\xE4lj Uppackare"
-#: Merge.rc:1100
+#: Merge.rc:1101
#, c-format
msgid "File unpacker:"
msgstr "Fil-uppackare:"
-#: Merge.rc:1103
+#: Merge.rc:1104
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Visa alla uppackare, kontrollera inte filsuffixet"
-#: Merge.rc:1106
+#: Merge.rc:1107
#, c-format
msgid "Extensions list:"
msgstr "Filsuffixlista:"
-#: Merge.rc:1107
+#: Merge.rc:1108
#, c-format
msgid "Description:"
msgstr "Beskrivning:"
-#: Merge.rc:1118
+#: Merge.rc:1119
#, c-format
msgid " Folder Compare Progress"
msgstr "Katalogj\xE4mf\xF6relsens fortskridande"
-#: Merge.rc:1121
-#: Merge.rc:1881
+#: Merge.rc:1122
+#: Merge.rc:1882
#, c-format
msgid "Stop"
msgstr "Stopp"
-#: Merge.rc:1126
+#: Merge.rc:1127
#, c-format
msgid "Comparing items..."
msgstr "J\xE4mf\xF6r objekt..."
-#: Merge.rc:1127
+#: Merge.rc:1128
#, c-format
msgid "Items compared:"
msgstr "J\xE4mf\xF6rda objekt:"
-#: Merge.rc:1128
+#: Merge.rc:1129
#, c-format
msgid "Items total:"
msgstr "Objekt totalt:"
-#: Merge.rc:1134
+#: Merge.rc:1135
#, c-format
msgid "Go To"
msgstr "G\xE5 till"
-#: Merge.rc:1137
+#: Merge.rc:1138
#, c-format
msgid "G&oto:"
msgstr "G&\xE5 till:"
-#: Merge.rc:1139
+#: Merge.rc:1140
#, c-format
msgid "File"
msgstr "Fil"
-#: Merge.rc:1144
+#: Merge.rc:1145
#, c-format
msgid "Goto what"
msgstr "G\xE5 till vad"
-#: Merge.rc:1145
+#: Merge.rc:1146
#, c-format
msgid "Li&ne"
msgstr "Ra&d"
-#: Merge.rc:1147
+#: Merge.rc:1148
#, c-format
msgid "&Difference"
msgstr "&Skillnad"
-#: Merge.rc:1149
+#: Merge.rc:1150
#, c-format
msgid "&Go To"
msgstr "&G\xE5 till"
-#: Merge.rc:1155
-#: Merge.rc:1929
+#: Merge.rc:1156
+#: Merge.rc:1930
#, c-format
msgid "Compare"
msgstr "J\xE4mf\xF6r"
-#: Merge.rc:1158
+#: Merge.rc:1159
#, c-format
msgid "Whitespace"
msgstr "Mellanslag"
-#: Merge.rc:1159
+#: Merge.rc:1160
#, c-format
msgid "&Compare"
msgstr "J\xE4mf\xF6r &mellanslag"
-#: Merge.rc:1161
+#: Merge.rc:1162
#, c-format
msgid "&Ignore change"
msgstr "&Ignorera mellanslagsskillnader "
-#: Merge.rc:1163
+#: Merge.rc:1164
#, c-format
msgid "I&gnore all"
msgstr "Ignorera &alla mellanslag"
-#: Merge.rc:1165
+#: Merge.rc:1166
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorera blan&ka rader"
-#: Merge.rc:1167
+#: Merge.rc:1168
#, c-format
msgid "Ignore &case"
msgstr "&Ignorera VERSAL/gemen-skillnader"
-#: Merge.rc:1169
+#: Merge.rc:1170
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)"
-#: Merge.rc:1172
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "M&\xF6jligg\xF6r detektion av flyttade textblock"
-#: Merge.rc:1174
+#: Merge.rc:1175
#, c-format
msgid "&Match similar lines"
msgstr "&Matcha liknande rader"
-#: Merge.rc:1176
+#: Merge.rc:1177
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orera tidsskillnad mindre \xE4n 3 sekunder"
-#: Merge.rc:1179
+#: Merge.rc:1180
#, c-format
msgid "&File Compare method:"
msgstr "&Filj\xE4mf\xF6relsemetod:"
-#: Merge.rc:1182
+#: Merge.rc:1183
#, c-format
msgid "S&top after first difference"
msgstr "S&toppa efter f\xF6rsta skillnaden"
-#: Merge.rc:1185
+#: Merge.rc:1186
#, c-format
msgid "Filter Comments"
msgstr "Filterkommentarer"
-#: Merge.rc:1192
-#: Merge.rc:1930
+#: Merge.rc:1193
+#: Merge.rc:1931
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1195
+#: Merge.rc:1196
#, c-format
msgid "&Highlight syntax"
msgstr "&Markera syntaxen"
-#: Merge.rc:1197
+#: Merge.rc:1198
#, c-format
msgid "&Automatic rescan"
msgstr "Automatisk &uppdatering"
-#: Merge.rc:1199
+#: Merge.rc:1200
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Bevara ursprungliga radslutstecken"
-#: Merge.rc:1201
+#: Merge.rc:1202
#, c-format
msgid "Tabs"
msgstr "Tabbar"
-#: Merge.rc:1202
+#: Merge.rc:1203
#, c-format
msgid "&Tab size:"
msgstr "&Tabbsteg:"
-#: Merge.rc:1205
+#: Merge.rc:1206
#, c-format
msgid "&Insert Tabs"
msgstr "Infoga tabbar"
-#: Merge.rc:1207
+#: Merge.rc:1208
#, c-format
msgid "Insert &Spaces"
msgstr "Infoga mellanslag"
-#: Merge.rc:1209
+#: Merge.rc:1210
#, c-format
msgid "Line Difference Coloring"
msgstr "Radskillnadskul\xF6rer"
-#: Merge.rc:1211
+#: Merge.rc:1212
#, c-format
msgid "View line differences"
msgstr "Visa radskillnader"
-#: Merge.rc:1213
+#: Merge.rc:1214
#, c-format
msgid "&Character level"
msgstr "&Teckenniv\xE5"
-#: Merge.rc:1215
+#: Merge.rc:1216
#, c-format
msgid "&Word-level:"
msgstr "&Ordniv\xE5:"
-#: Merge.rc:1230
+#: Merge.rc:1231
#, c-format
msgid "Filefilters"
msgstr "Filfilter"
-#: Merge.rc:1236
+#: Merge.rc:1237
#, c-format
msgid "Test"
msgstr "Testa"
-#: Merge.rc:1237
+#: Merge.rc:1238
#, c-format
msgid "Install..."
msgstr "Installera..."
-#: Merge.rc:1238
+#: Merge.rc:1239
#, c-format
msgid "New..."
msgstr "Ny..."
-#: Merge.rc:1239
+#: Merge.rc:1240
#, c-format
msgid "Edit..."
msgstr "Redigera..."
-#: Merge.rc:1240
+#: Merge.rc:1241
#, c-format
msgid "Delete..."
msgstr "Ta bort..."
-#: Merge.rc:1246
+#: Merge.rc:1247
#, c-format
msgid "Save modified files?"
msgstr "Spara \xE4ndrade filer?"
-#: Merge.rc:1249
+#: Merge.rc:1250
#, c-format
msgid "Left side file"
msgstr "V\xE4nster fil"
-#: Merge.rc:1252
+#: Merge.rc:1253
#, c-format
msgid "&Save changes"
msgstr "&Spara \xE4ndringar"
-#: Merge.rc:1254
+#: Merge.rc:1255
#, c-format
msgid "&Discard changes"
msgstr "&Ignorera \xE4ndringar"
-#: Merge.rc:1256
+#: Merge.rc:1257
#, c-format
msgid "Right side file"
msgstr "H\xF6ger fil"
-#: Merge.rc:1259
+#: Merge.rc:1260
#, c-format
msgid "S&ave changes"
msgstr "S¶ \xE4ndringar"
-#: Merge.rc:1261
+#: Merge.rc:1262
#, c-format
msgid "Dis&card changes"
msgstr "Ign&orera \xE4ndringar"
-#: Merge.rc:1263
+#: Merge.rc:1264
#, c-format
msgid "Discard All"
msgstr "Ignorera alla \xE4ndringar"
-#: Merge.rc:1270
-#: Merge.rc:1518
-#: Merge.rc:1936
+#: Merge.rc:1271
+#: Merge.rc:1519
+#: Merge.rc:1937
#, c-format
msgid "Codepage"
msgstr "Codepage"
-#: Merge.rc:1273
+#: Merge.rc:1274
#, c-format
msgid "Default Codepage"
msgstr "Standard Codepage"
-#: Merge.rc:1274
+#: Merge.rc:1275
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "V\xE4lj den Codepage som anv\xE4nds som standard n\xE4r icke-Unicodefiler \xF6ppnas:"
-#: Merge.rc:1276
+#: Merge.rc:1277
#, c-format
msgid ""
"Detect codepage info for these files : .html, .rc, .xml \n"
@@ -2044,32 +2049,32 @@
"Detektera Codepageinformation f\xF6r dessa filer : .html, .rc, .xml \n"
"Detta kr\xE4ver en omstart av WinMerge"
-#: Merge.rc:1279
+#: Merge.rc:1280
#, c-format
msgid "System codepage"
msgstr "System Codepage"
-#: Merge.rc:1281
+#: Merge.rc:1282
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Enligt WinMerges anv\xE4ndargr\xE4nssnitt"
-#: Merge.rc:1283
+#: Merge.rc:1284
#, c-format
msgid "Custom codepage :"
msgstr "Anpassad Codepage :"
-#: Merge.rc:1291
+#: Merge.rc:1292
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Arkivst\xF6d \xE4r avst\xE4ngt"
-#: Merge.rc:1294
+#: Merge.rc:1295
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Kan inte detektera 7-Zip-version (\xE4r 7-Zip inte installerat?)"
-#: Merge.rc:1297
+#: Merge.rc:1298
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2078,12 +2083,12 @@
"Arkivst\xF6d kr\xE4ver antingen att version 3.11 eller h\xF6gre av 7-Zip \xE4r installerat p\xE5 din dator, eller att dess\n"
"n\xF6dv\xE4ndiga komponenter kopieras till WinMerges programkatalog f\xF6r frist\xE5ende anv\xE4ndning."
-#: Merge.rc:1299
+#: Merge.rc:1300
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Det m\xE5ste ocks\xE5 finnas ett l\xE4mpligt gr\xE4nssnittsplugin (Merge7z*.dll) i s\xF6kv\xE4gen."
-#: Merge.rc:1301
+#: Merge.rc:1302
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2092,12 +2097,12 @@
"Var god och anv\xE4nd den version av 7-Zip som rekommenderas nedanf\xF6r tills gr\xE4nssnittsplugins f\xF6r senare\n"
"versioner blir tillg\xE4ngliga."
-#: Merge.rc:1303
+#: Merge.rc:1304
#, c-format
msgid "Version"
msgstr "Version"
-#: Merge.rc:1305
+#: Merge.rc:1306
#, c-format
msgid ""
"Plugin required\n"
@@ -2106,551 +2111,551 @@
"Plugin kr\xE4vd\n"
"(dllbuild %04u)"
-#: Merge.rc:1307
+#: Merge.rc:1308
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Rekommenderad version av 7-Zip:"
-#: Merge.rc:1310
-#: Merge.rc:1313
+#: Merge.rc:1311
+#: Merge.rc:1314
#, c-format
msgid "present"
msgstr "finns"
-#: Merge.rc:1311
+#: Merge.rc:1312
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1314
+#: Merge.rc:1315
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "7-Zip program installerat p\xE5 din dator:"
-#: Merge.rc:1316
-#: Merge.rc:1321
+#: Merge.rc:1317
+#: Merge.rc:1322
#, c-format
msgid "none"
msgstr "inget"
-#: Merge.rc:1318
+#: Merge.rc:1319
#, c-format
msgid "missing"
msgstr "saknas"
-#: Merge.rc:1319
+#: Merge.rc:1320
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "7-Zip komponenter f\xF6r frist\xE5ende anv\xE4ndning:"
-#: Merge.rc:1323
+#: Merge.rc:1324
#, c-format
msgid "outdated"
msgstr "utdaterad"
-#: Merge.rc:1324
+#: Merge.rc:1325
#, c-format
msgid "Plugins on path:"
msgstr "Plugins i s\xF6kv\xE4g:"
-#: Merge.rc:1325
+#: Merge.rc:1326
#, 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.)"
-#: Merge.rc:1329
+#: Merge.rc:1330
#, c-format
msgid "Plugin Download"
msgstr "Ladda ner Plugin"
-#: Merge.rc:1338
+#: Merge.rc:1339
#, c-format
msgid "Options"
msgstr "Inst\xE4llningar"
-#: Merge.rc:1349
+#: Merge.rc:1350
#, c-format
msgid " Categories"
msgstr " Kategorier"
-#: Merge.rc:1351
+#: Merge.rc:1352
#, c-format
msgid "Import..."
msgstr "Importera..."
-#: Merge.rc:1352
+#: Merge.rc:1353
#, c-format
msgid "Export..."
msgstr "Exportera..."
-#: Merge.rc:1360
+#: Merge.rc:1361
#, c-format
msgid "Keywords:"
msgstr "Nyckelord:"
-#: Merge.rc:1361
+#: Merge.rc:1362
#, c-format
msgid "Function names:"
msgstr "Funktionsnamn:"
-#: Merge.rc:1362
+#: Merge.rc:1363
#, c-format
msgid "Comments:"
msgstr "Kommentarer:"
-#: Merge.rc:1363
+#: Merge.rc:1364
#, c-format
msgid "Numbers:"
msgstr "Nummer:"
-#: Merge.rc:1364
+#: Merge.rc:1365
#, c-format
msgid "Operators:"
msgstr "Operatorer:"
-#: Merge.rc:1365
+#: Merge.rc:1366
#, c-format
msgid "Strings:"
msgstr "Str\xE4ngar:"
-#: Merge.rc:1366
+#: Merge.rc:1367
#, c-format
msgid "Preprocessor:"
msgstr "Preprocessor:"
-#: Merge.rc:1367
+#: Merge.rc:1368
#, c-format
msgid "User 1:"
msgstr "Anv\xE4ndare 1:"
-#: Merge.rc:1368
+#: Merge.rc:1369
#, c-format
msgid "User 2:"
msgstr "Anv\xE4ndare 2:"
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
-#: Merge.rc:1413
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
+#: Merge.rc:1399
+#: Merge.rc:1404
+#: Merge.rc:1409
+#: Merge.rc:1414
#, c-format
msgid "Bold"
msgstr "Fet"
-#: Merge.rc:1421
+#: Merge.rc:1422
#, c-format
msgid "Folder Compare Report"
msgstr "Rapport f\xF6r Katalogj\xE4mf\xF6relse"
-#: Merge.rc:1424
+#: Merge.rc:1425
#, c-format
msgid "Report &File:"
msgstr "Rapport&fil:"
-#: Merge.rc:1427
-#: Merge.rc:1601
-#: Merge.rc:1605
-#: Merge.rc:1632
+#: Merge.rc:1428
+#: Merge.rc:1602
+#: Merge.rc:1606
+#: Merge.rc:1633
#, c-format
msgid "Browse..."
msgstr "Bl\xE4ddra..."
-#: Merge.rc:1428
+#: Merge.rc:1429
#, c-format
msgid "&Style:"
msgstr "&Stil:"
-#: Merge.rc:1431
+#: Merge.rc:1432
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Kopiera till klippbordet"
-#: Merge.rc:1439
+#: Merge.rc:1440
#, c-format
msgid "Shared or Private Filter"
msgstr "Delat eller privat filter?"
-#: Merge.rc:1442
+#: Merge.rc:1443
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Vilken typ av filter vill du skapa?"
-#: Merge.rc:1444
+#: Merge.rc:1445
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Delat filter (f\xF6r alla anv\xE4ndare p\xE5 denna dator)"
-#: Merge.rc:1446
+#: Merge.rc:1447
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Privat filter (bara f\xF6r den aktuella anv\xE4ndaren)"
-#: Merge.rc:1454
-#: Merge.rc:1937
+#: Merge.rc:1455
+#: Merge.rc:1938
#, c-format
msgid "Archive Support"
msgstr "Arkivst\xF6d"
-#: Merge.rc:1457
+#: Merge.rc:1458
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Arkivst\xF6det kr\xE4ver att 7-Zip-plugin \xE4r installerad:"
-#: Merge.rc:1459
+#: Merge.rc:1460
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Ladda ner 7-zip-plugin"
-#: Merge.rc:1460
+#: Merge.rc:1461
#, c-format
msgid "&Enable archive file support"
msgstr "&Aktivera arkivfilst\xF6d"
-#: Merge.rc:1462
+#: Merge.rc:1463
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Anv\xE4nd frist\xE5ende 7-Zip om det finns"
-#: Merge.rc:1465
+#: Merge.rc:1466
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "A&nv\xE4nd lokal 7-Zip fr\xE5n WinMerges katalog"
-#: Merge.rc:1467
+#: Merge.rc:1468
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detektera arkivtyp fr\xE5n filsignatur"
-#: Merge.rc:1475
+#: Merge.rc:1476
#, c-format
msgid "Compare Statistics"
msgstr "J\xE4mf\xF6relsestatistik"
-#: Merge.rc:1478
+#: Merge.rc:1479
#, c-format
msgid "Folders:"
msgstr "Kataloger:"
-#: Merge.rc:1479
+#: Merge.rc:1480
#, c-format
msgid "Files:"
msgstr "Filer:"
-#: Merge.rc:1480
-#: Merge.rc:2316
+#: Merge.rc:1481
+#: Merge.rc:2319
#, c-format
msgid "Different"
msgstr "Olika"
-#: Merge.rc:1481
+#: Merge.rc:1482
#, c-format
msgid "Text:"
msgstr "Text:"
-#: Merge.rc:1484
-#: Merge.rc:1503
+#: Merge.rc:1485
+#: Merge.rc:1504
#, c-format
msgid "Binary:"
msgstr "Bin\xE4r:"
-#: Merge.rc:1487
+#: Merge.rc:1488
#, c-format
msgid "Unique"
msgstr "Unik"
-#: Merge.rc:1488
+#: Merge.rc:1489
#, c-format
msgid "Left:"
msgstr "V\xE4nster:"
-#: Merge.rc:1493
+#: Merge.rc:1494
#, c-format
msgid "Right:"
msgstr "H\xF6ger:"
-#: Merge.rc:1498
-#: Merge.rc:2310
+#: Merge.rc:1499
+#: Merge.rc:2313
#, c-format
msgid "Identical"
msgstr "Identisk"
-#: Merge.rc:1507
+#: Merge.rc:1508
#, c-format
msgid "Total:"
msgstr "Totalt:"
-#: Merge.rc:1512
+#: Merge.rc:1513
#, c-format
msgid "Close"
msgstr "St\xE4ng"
-#: Merge.rc:1521
+#: Merge.rc:1522
#, c-format
msgid "Affects"
msgstr "P\xE5verkar"
-#: Merge.rc:1524
-#: Merge.rc:1527
+#: Merge.rc:1525
+#: Merge.rc:1528
#, c-format
msgid "(Affects)"
msgstr "(P\xE5verkar)"
-#: Merge.rc:1528
+#: Merge.rc:1529
#, c-format
msgid "Select Codepage for"
msgstr "V\xE4lj Codepage f\xF6r"
-#: Merge.rc:1529
+#: Merge.rc:1530
#, c-format
msgid "&File Loading:"
msgstr "&Fil\xF6ppnande:"
-#: Merge.rc:1531
-#: Merge.rc:1534
+#: Merge.rc:1532
+#: Merge.rc:1535
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1532
+#: Merge.rc:1533
#, c-format
msgid "File &Saving:"
msgstr "Filsparande:"
-#: Merge.rc:1535
+#: Merge.rc:1536
#, c-format
msgid "&Use same codepage for both"
msgstr "&Anv\xE4nd samma Codepage f\xF6r b\xE5da"
-#: Merge.rc:1538
+#: Merge.rc:1539
#, c-format
msgid "&Apply"
msgstr "&Verkst\xE4ll"
-#: Merge.rc:1539
-#: Merge.rc:1903
+#: Merge.rc:1540
+#: Merge.rc:1904
#, c-format
msgid "&Cancel"
msgstr "&Avbryt"
-#: Merge.rc:1544
+#: Merge.rc:1545
#, c-format
msgid "Test Filter"
msgstr "Testa Filter"
-#: Merge.rc:1547
+#: Merge.rc:1548
#, c-format
msgid "Testing filter ..."
msgstr "Testar filter ..."
-#: Merge.rc:1549
+#: Merge.rc:1550
#, c-format
msgid "&Enter text to test:"
msgstr "&Skriv in text att testa:"
-#: Merge.rc:1551
+#: Merge.rc:1552
#, c-format
msgid "&Folder Name"
msgstr "&Katalognamn"
-#: Merge.rc:1553
+#: Merge.rc:1554
#, c-format
msgid "Result:"
msgstr "Resultat:"
-#: Merge.rc:1557
+#: Merge.rc:1558
#, c-format
msgid "&Test"
msgstr "&Testa"
-#: Merge.rc:1558
+#: Merge.rc:1559
#, c-format
msgid "&Close"
msgstr "&St\xE4ng"
-#: Merge.rc:1566
+#: Merge.rc:1567
#, c-format
msgid "&Use customized text colors"
msgstr "&Anv\xE4nd anpassade textkul\xF6rer"
-#: Merge.rc:1569
+#: Merge.rc:1570
#, c-format
msgid "Custom text colors"
msgstr "Anpassade textkul\xF6rer"
-#: Merge.rc:1571
+#: Merge.rc:1572
#, c-format
msgid "Whitespace:"
msgstr "Mellanslag:"
-#: Merge.rc:1572
+#: Merge.rc:1573
#, c-format
msgid "Regular text:"
msgstr "Vanlig text:"
-#: Merge.rc:1573
+#: Merge.rc:1574
#, c-format
msgid "Selection:"
msgstr "Markering:"
-#: Merge.rc:1596
+#: Merge.rc:1597
#, c-format
msgid "Paths"
msgstr "S\xF6kv\xE4gar"
-#: Merge.rc:1602
+#: Merge.rc:1603
#, c-format
msgid "R&ead-only"
msgstr "Bara& l\xE4sbar"
-#: Merge.rc:1606
+#: Merge.rc:1607
#, c-format
msgid "Re&ad-only"
msgstr "Bara& l\xE4sbar"
-#: Merge.rc:1612
+#: Merge.rc:1613
#, c-format
msgid "Open..."
msgstr "\xD6ppna..."
-#: Merge.rc:1613
+#: Merge.rc:1614
#, c-format
msgid "Save..."
msgstr "Spara..."
-#: Merge.rc:1618
-#: Merge.rc:1938
+#: Merge.rc:1619
+#: Merge.rc:1939
#, c-format
msgid "Backup Files"
msgstr "Backup p\xE5 filer"
-#: Merge.rc:1621
+#: Merge.rc:1622
#, c-format
msgid "Create backup files in:"
msgstr "Skapa backupfiler i:"
-#: Merge.rc:1626
+#: Merge.rc:1627
#, c-format
msgid "Create backup files into:"
msgstr "Skapa backupfiler i:"
-#: Merge.rc:1627
+#: Merge.rc:1628
#, c-format
msgid "&Original file's folder"
msgstr "&Originalfilens katalog"
-#: Merge.rc:1629
+#: Merge.rc:1630
#, c-format
msgid "&Global backup folder:"
msgstr "&Global backupkatalog:"
-#: Merge.rc:1633
+#: Merge.rc:1634
#, c-format
msgid "Backup filename:"
msgstr "Backupfilnamn:"
-#: Merge.rc:1634
+#: Merge.rc:1635
#, c-format
msgid "&Append .bak -extension"
msgstr "&L\xE4gg till filsuffixet .bak"
-#: Merge.rc:1636
+#: Merge.rc:1637
#, c-format
msgid "A&ppend timestamp"
msgstr "L&\xE4gg till tidsmarkering"
-#: Merge.rc:1643
-#: Merge.rc:2225
+#: Merge.rc:1644
+#: Merge.rc:2228
#, c-format
msgid "Confirm Copy"
msgstr "Bekr\xE4fta kopiering"
-#: Merge.rc:1647
+#: Merge.rc:1648
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "\xC4r du s\xE4ker p\xE5 att du vill kopiera XXX objekt?"
-#: Merge.rc:1649
+#: Merge.rc:1650
#, c-format
msgid "From left"
msgstr "Fr\xE5n v\xE4nster"
-#: Merge.rc:1652
+#: Merge.rc:1653
#, c-format
msgid "To right"
msgstr "Till h\xF6ger"
-#: Merge.rc:1655
+#: Merge.rc:1656
#, c-format
msgid "Yes"
msgstr "Ja"
-#: Merge.rc:1656
+#: Merge.rc:1657
#, c-format
msgid "No"
msgstr "Nej"
-#: Merge.rc:1662
+#: Merge.rc:1663
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
-#: Merge.rc:1665
+#: Merge.rc:1666
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Starta Plugins"
#. StringFileInfo.Block
-#: Merge.rc:1695
+#: Merge.rc:1696
#, c-format
msgid "040904e4"
msgstr "041d04e4"
#. VarFileInfo.Translation
-#: Merge.rc:1711
+#: Merge.rc:1712
#, c-format
msgid "0x409, 1252"
msgstr "0x41d, 1252"
-#: Merge.rc:1726
+#: Merge.rc:1727
#, c-format
msgid "Ready"
msgstr "Klar"
-#: Merge.rc:1732
+#: Merge.rc:1733
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1733
+#: Merge.rc:1734
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1734
+#: Merge.rc:1735
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1735
+#: Merge.rc:1736
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1736
+#: Merge.rc:1737
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1737
+#: Merge.rc:1738
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1743
+#: Merge.rc:1744
#, c-format
msgid ""
"Create empty documents\n"
@@ -2659,7 +2664,7 @@
"Skapar nya dokument\n"
"Nya Dokument (Ctrl+N)"
-#: Merge.rc:1744
+#: Merge.rc:1745
#, c-format
msgid ""
"Open an existing document\n"
@@ -2668,7 +2673,7 @@
"\xD6ppnar ett befintligt dokument\n"
"\xD6ppna (Ctrl+O)"
-#: Merge.rc:1745
+#: Merge.rc:1746
#, c-format
msgid ""
"Close the active document\n"
@@ -2677,7 +2682,7 @@
"St\xE4nger det aktiva dokumentet\n"
"St\xE4ng"
-#: Merge.rc:1746
+#: Merge.rc:1747
#, c-format
msgid ""
"Save the active document\n"
@@ -2686,7 +2691,7 @@
"Sparar det aktiva dokumentet\n"
"Spara (Ctrl+S)"
-#: Merge.rc:1747
+#: Merge.rc:1748
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2695,7 +2700,7 @@
"Sparar det aktiva dokumentet med ett nytt namn\n"
"Spara som"
-#: Merge.rc:1748
+#: Merge.rc:1749
#, c-format
msgid ""
"Change the printing options\n"
@@ -2704,7 +2709,7 @@
"\xC4ndrar Utskriftsinst\xE4llningar\n"
"Sidinst\xE4llningar"
-#: Merge.rc:1749
+#: Merge.rc:1750
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2713,7 +2718,7 @@
"\xC4ndrar skrivare och skrivarinst\xE4llningar\n"
"Skrivarinst\xE4llningar"
-#: Merge.rc:1750
+#: Merge.rc:1751
#, c-format
msgid ""
"Print the active document\n"
@@ -2722,7 +2727,7 @@
"Skriver ut det aktiva dokumentet\n"
"Skriv ut"
-#: Merge.rc:1751
+#: Merge.rc:1752
#, c-format
msgid ""
"Display full pages\n"
@@ -2731,27 +2736,27 @@
"Visar helsidor\n"
"F\xF6rhandsgranska"
-#: Merge.rc:1756
+#: Merge.rc:1757
#, c-format
msgid "Make all hidden items visible again"
msgstr "G\xF6r alla dolda objekt synliga igen"
-#: Merge.rc:1757
+#: Merge.rc:1758
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "V\xE4xla tr\xE4dmod"
-#: Merge.rc:1758
+#: Merge.rc:1759
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Expandera alla underkataloger"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Minimera alla underkataloger"
-#: Merge.rc:1765
+#: Merge.rc:1766
#, c-format
msgid ""
"Open project file\n"
@@ -2760,32 +2765,32 @@
"\xD6ppna Projektfil\n"
"Projektfil(Ctrl+J)"
-#: Merge.rc:1766
+#: Merge.rc:1767
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att \xF6ppna Projektfil"
-#: Merge.rc:1767
+#: Merge.rc:1768
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att spara Projektfil"
-#: Merge.rc:1768
+#: Merge.rc:1769
#, c-format
msgid "Project File"
msgstr "Projektfil"
-#: Merge.rc:1769
+#: Merge.rc:1770
#, c-format
msgid "Project file successfully loaded."
msgstr "Projektfilen \xE4r framg\xE5ngsrikt \xF6ppnad."
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid "Project file successfully saved."
msgstr "Projektfilen \xE4r framg\xE5ngsrikt sparad."
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2794,7 +2799,7 @@
"Sparar aktuella s\xF6kv\xE4gar och inst\xE4llningar till Projektfil\n"
"Spara Projektfil"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2803,7 +2808,7 @@
"Visar Programinformation, Versionsnummer och Copyright\n"
"Om"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2812,7 +2817,6 @@
"Avslutar WinMerge och fr\xE5gar om du vill spara dokument\n"
"Avsluta"
-#: Merge.rc:1783
#: Merge.rc:1784
#: Merge.rc:1785
#: Merge.rc:1786
@@ -2828,11 +2832,12 @@
#: Merge.rc:1796
#: Merge.rc:1797
#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid "Open this document"
msgstr "\xD6ppna detta dokument"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2841,7 +2846,7 @@
"V\xE4xlar till n\xE4sta f\xF6nster\n"
"N\xE4sta f\xF6nster"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2850,7 +2855,7 @@
"V\xE4xlar till f\xF6rra f\xF6nstret\n"
"F\xF6rra f\xF6nstret"
-#: Merge.rc:1810
+#: Merge.rc:1811
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2859,7 +2864,7 @@
"Arrangerar f\xF6nstren s\xE5 att de \xF6verlappar varandra\n"
"\xD6verlappande f\xF6nster"
-#: Merge.rc:1811
+#: Merge.rc:1812
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2868,7 +2873,7 @@
"Ordnar f\xF6nstren icke-\xF6verlappande horisontellt\n"
"Ordna horisontellt"
-#: Merge.rc:1812
+#: Merge.rc:1813
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2877,7 +2882,7 @@
"Ordnar f\xF6nstren icke-\xF6verlappande vertikalt\n"
"Ordna vertikalt"
-#: Merge.rc:1818
+#: Merge.rc:1819
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2886,7 +2891,7 @@
"Kopierar den markerade texten och l\xE4gger det i klippbordet\n"
"Kopiera"
-#: Merge.rc:1819
+#: Merge.rc:1820
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2895,7 +2900,7 @@
"Klipper ut den markerade texten och l\xE4gger det i klippbordet\n"
"Klipp ut"
-#: Merge.rc:1820
+#: Merge.rc:1821
#, c-format
msgid ""
"Find the specified text\n"
@@ -2904,7 +2909,7 @@
"S\xF6ker den angivna texten\n"
"S\xF6k"
-#: Merge.rc:1821
+#: Merge.rc:1822
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2913,7 +2918,7 @@
"Klistrar in inneh\xE5llet i klippbordet\n"
"Klistra in"
-#: Merge.rc:1822
+#: Merge.rc:1823
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2922,7 +2927,7 @@
"Upprepar den senaste \xE5tg\xE4rden\n"
"Upprepa"
-#: Merge.rc:1823
+#: Merge.rc:1824
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2931,7 +2936,7 @@
"Ers\xE4tter den markerade texten med annan text\n"
"Ers\xE4tt"
-#: Merge.rc:1824
+#: Merge.rc:1825
#, c-format
msgid ""
"Select the entire document\n"
@@ -2940,7 +2945,7 @@
"V\xE4ljer hela dokumentet\n"
"V\xE4lj allt"
-#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid ""
"Undo the last action\n"
@@ -2949,7 +2954,7 @@
"\xC5ngrar den senaste \xE5tg\xE4rden\n"
"\xC5ngra"
-#: Merge.rc:1826
+#: Merge.rc:1827
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -2958,7 +2963,7 @@
"G\xF6r om den tidigare \xE5ngrade \xE5tg\xE4rden\n"
"G\xF6r om"
-#: Merge.rc:1832
+#: Merge.rc:1833
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -2967,7 +2972,7 @@
"Visar eller g\xF6mmer verktygsf\xE4ltet\n"
"V\xE4xla verktygsf\xE4lt"
-#: Merge.rc:1833
+#: Merge.rc:1834
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -2976,7 +2981,7 @@
"Visar eller g\xF6mmer statusf\xE4ltet\n"
"V\xE4xla statusf\xE4ltet"
-#: Merge.rc:1834
+#: Merge.rc:1835
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -2985,62 +2990,62 @@
"Visar eller g\xF6mmer filraden\n"
"V\xE4xla filraden"
-#: Merge.rc:1835
+#: Merge.rc:1836
#, c-format
msgid "Automatically resize panes\nLock Panes"
msgstr "Automatisk storleks\xE4ndring av placering\nL\xE5s Placering"
-#: Merge.rc:1841
+#: Merge.rc:1842
#, c-format
msgid "Change the window size"
msgstr "\xC4ndra f\xF6nsterstorlek"
-#: Merge.rc:1842
+#: Merge.rc:1843
#, c-format
msgid "Change the window position"
msgstr "Flytta f\xF6nster"
-#: Merge.rc:1843
+#: Merge.rc:1844
#, c-format
msgid "Reduce the window to an icon"
msgstr "Minimera f\xF6nstret till en ikon"
-#: Merge.rc:1844
+#: Merge.rc:1845
#, c-format
msgid "Enlarge the window to full size"
msgstr "Maximera f\xF6nstret till full storlek"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid "Switch to the next document window"
msgstr "V\xE4xla till n\xE4sta dokumentf\xF6nster"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid "Switch to the previous document window"
msgstr "V\xE4xla till f\xF6rra dokumentf\xF6nstret"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "St\xE4ng det aktiva f\xF6nstret och fr\xE5ga om dokumenten skall sparas"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid "Restore the window to normal size"
msgstr "\xC5terst\xE4ll f\xF6nstret till normal storlek"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid "Activate Task List"
msgstr "Lista med aktiva f\xF6nster"
-#: Merge.rc:1854
+#: Merge.rc:1855
#, c-format
msgid "Activate this window"
msgstr "Aktiverar det h\xE4r f\xF6nstret"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3049,183 +3054,183 @@
"St\xE4nger F\xF6rhandsgranskning\n"
"St\xE4ng F\xF6rhandsgranskning"
-#: Merge.rc:1867
+#: Merge.rc:1868
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
msgstr "\nFilj\xE4mf\xF6relse\n\n\n\nWinMerge.Filj\xE4mf\xF6relse\nWinMerge Filj\xE4mf\xF6relse"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr "\nKatalogj\xE4mf\xF6relse\n\n\n\nWinMerge.Katalogj\xE4mf\xF6relse\nWinMerge Katalogj\xE4mf\xF6relse"
-#: Merge.rc:1875
+#: Merge.rc:1876
#, c-format
msgid "Preserve original EOL chars"
msgstr "Bevara ursprungliga radslutstecken"
-#: Merge.rc:1882
+#: Merge.rc:1883
#, c-format
msgid "Press any key"
msgstr "Tryck p\xE5 en valfri tangent"
-#: Merge.rc:1888
#: Merge.rc:1889
+#: Merge.rc:1890
#, c-format
msgid "Right click on the path to copy"
msgstr "H\xF6gerklicka p\xE5 s\xF6kv\xE4gen f\xF6r att kopiera"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, 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"
-#: Merge.rc:1896
+#: Merge.rc:1897
#, 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 kommer med ABSOLUT INGA GARANTIER. Detta \xE4r fri programvara och du \xE4r v\xE4lkommen att vidaredistribuera den under vissa omst\xE4ndigheter; se GNU General Public License i Hj\xE4lpmenyn f\xF6r detaljer."
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "&Ok"
msgstr "&OK"
-#: Merge.rc:1904
+#: Merge.rc:1905
#, c-format
msgid "&Abort"
msgstr "&Avbryt"
-#: Merge.rc:1905
+#: Merge.rc:1906
#, c-format
msgid "&Retry"
msgstr "&F\xF6rs\xF6k igen"
-#: Merge.rc:1906
+#: Merge.rc:1907
#, c-format
msgid "&Ignore"
msgstr "&Ignorera"
-#: Merge.rc:1907
+#: Merge.rc:1908
#, c-format
msgid "Ignore &all"
msgstr "Ignorera &allt"
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "&Yes"
msgstr "&Ja"
-#: Merge.rc:1914
+#: Merge.rc:1915
#, c-format
msgid "Yes to &all"
msgstr "Ja till &allt"
-#: Merge.rc:1915
+#: Merge.rc:1916
#, c-format
msgid "&No"
msgstr "&Nej"
-#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "No to a&ll"
msgstr "Nej till a&llt"
-#: Merge.rc:1917
+#: Merge.rc:1918
#, c-format
msgid "&Continue"
msgstr "&Forts\xE4tt"
-#: Merge.rc:1918
+#: Merge.rc:1919
#, c-format
msgid "&Skip"
msgstr "&Skippa"
-#: Merge.rc:1919
+#: Merge.rc:1920
#, c-format
msgid "Skip &all"
msgstr "Skippa &allt"
-#: Merge.rc:1921
+#: Merge.rc:1922
#, c-format
msgid "Don't display this &message again."
msgstr "Visa inte detta &meddelande igen."
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid "Don't ask this &question again."
msgstr "Fr\xE5ga inte denna &fr\xE5ga igen."
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "Syntax colors"
msgstr "Syntaxkul\xF6rer"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "Text Colors"
msgstr "Textkul\xF6rer"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "Version Control"
msgstr "Versionskontroll"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "To:"
msgstr "Till:"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "From left:"
msgstr "Fr\xE5n v\xE4nster:"
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "To left:"
msgstr "Till v\xE4nster:"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "From right:"
msgstr "Fr\xE5n h\xF6ger:"
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "To right:"
msgstr "Till h\xF6ger:"
-#: Merge.rc:1955
+#: Merge.rc:1956
#, c-format
msgid "Version %1"
msgstr "Version %1"
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1962
+#: Merge.rc:1963
#, c-format
msgid "Options (%1)"
msgstr "Egenskaper (%1)"
-#: Merge.rc:1963
+#: Merge.rc:1964
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Alla meddelanderutor visas nu igen."
-#: Merge.rc:1964
+#: Merge.rc:1965
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "\xC4ndringar har gjorts i den aktuella filj\xE4mf\xF6relsesessionen. Vissa inst\xE4llningar kanske inte syns f\xF6rr\xE4n den aktuella filj\xE4mf\xF6relsen startas om."
-#: Merge.rc:1965
+#: Merge.rc:1966
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "\xC4ndringen av typsnitt kommer inte att synas i redan \xF6ppna f\xF6nster."
-#: Merge.rc:1967
+#: Merge.rc:1968
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3236,7 +3241,7 @@
"\n"
"Var god och anv\xE4nd v\xE4rden fr\xE5n 1 - %1."
-#: Merge.rc:1969
+#: Merge.rc:1970
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3247,129 +3252,129 @@
"\n"
"Var god och \xE5terstarta WinMerge efter \xE5terst\xE4llningen."
-#: Merge.rc:1975
+#: Merge.rc:1976
#, c-format
msgid "Open"
msgstr "\xD6ppna"
-#: Merge.rc:1976
+#: Merge.rc:1977
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||"
-#: Merge.rc:1977
+#: Merge.rc:1978
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Alla filer (*.*)|*.*||"
-#: Merge.rc:1978
+#: Merge.rc:1979
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:1980
+#: Merge.rc:1981
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Inst\xE4llningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||"
-#: Merge.rc:1986
+#: Merge.rc:1987
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Text-filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||"
-#: Merge.rc:1987
+#: Merge.rc:1988
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||"
-#: Merge.rc:1988
+#: Merge.rc:1989
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||"
-#: Merge.rc:1994
+#: Merge.rc:1995
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:1995
+#: Merge.rc:1996
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:1996
+#: Merge.rc:1997
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:1997
+#: Merge.rc:1998
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2003
+#: Merge.rc:2004
#, c-format
msgid "Full Contents"
msgstr "Total j\xE4mf\xF6relse"
-#: Merge.rc:2004
+#: Merge.rc:2005
#, c-format
msgid "Quick Contents"
msgstr "Snabb j\xE4mf\xF6relse"
-#: Merge.rc:2005
+#: Merge.rc:2006
#, c-format
msgid "Modified Date"
msgstr "Datum f\xF6r f\xF6r\xE4ndring"
-#: Merge.rc:2006
+#: Merge.rc:2007
#, c-format
msgid "Modified Date and Size"
msgstr "\xC4ndrat Datum och Storlek"
-#: Merge.rc:2007
+#: Merge.rc:2008
#, c-format
msgid "Size"
msgstr "Filstorlek"
-#: Merge.rc:2013
-#: Merge.rc:2622
+#: Merge.rc:2014
+#: Merge.rc:2625
#, c-format
msgid "Name"
msgstr "Namn"
-#: Merge.rc:2014
+#: Merge.rc:2015
#, c-format
msgid "Location"
msgstr "S\xF6kv\xE4g"
-#: Merge.rc:2015
+#: Merge.rc:2016
#, c-format
msgid "Filters"
msgstr "Filter"
-#: Merge.rc:2016
+#: Merge.rc:2017
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2017
-#: Merge.rc:2624
+#: Merge.rc:2018
+#: Merge.rc:2627
#, c-format
msgid "Description"
msgstr "Beskrivning"
-#: Merge.rc:2018
+#: Merge.rc:2019
#, c-format
msgid "Select filename for new filter"
msgstr "V\xE4lj filnamn f\xF6r nytt filter"
-#: Merge.rc:2019
+#: Merge.rc:2020
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||"
-#: Merge.rc:2021
+#: Merge.rc:2022
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3382,7 +3387,7 @@
"Var god och kopiera filen %1 till WinMerges Filterkatalog:\n"
"%2."
-#: Merge.rc:2023
+#: Merge.rc:2024
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3395,7 +3400,7 @@
"\n"
"Var god och verifiera att katalogen finns och att den \xE4r skrivbar."
-#: Merge.rc:2025
+#: Merge.rc:2026
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3406,7 +3411,7 @@
"\n"
"Var god och v\xE4lj filterkatalog i Inst\xE4llningar/System."
-#: Merge.rc:2027
+#: Merge.rc:2028
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3419,12 +3424,12 @@
"\n"
"Kanske \xE4r filen bara l\xE4sbar?"
-#: Merge.rc:2028
+#: Merge.rc:2029
#, c-format
msgid "Locate filter file to install"
msgstr "Ange s\xF6kv\xE4g f\xF6r filterfil att installera"
-#: Merge.rc:2030
+#: Merge.rc:2031
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3435,213 +34...
[truncated message content] |
|
From: <ki...@us...> - 2008-08-21 13:45:06
|
Revision: 5840
http://winmerge.svn.sourceforge.net/winmerge/?rev=5840&view=rev
Author: kimmov
Date: 2008-08-21 13:45:00 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
PATCH: [ 2062442 ] Greek Translation Update - R2_10 Branch (2008/08/20)
Submitted by Polyvios J. Simopoulos
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Greek.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-21 13:34:26 UTC (rev 5839)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-21 13:45:00 UTC (rev 5840)
@@ -17,6 +17,7 @@
Translation updates:
- Brazilian (#2059836)
- German (#2045666)
+ - Greek (#2062442)
- Chinese Traditional (#2039929)
- Japanese (r5805)
- Swedish (#2062107)
Modified: trunk/Src/Languages/Greek.po
===================================================================
--- trunk/Src/Languages/Greek.po 2008-08-21 13:34:26 UTC (rev 5839)
+++ trunk/Src/Languages/Greek.po 2008-08-21 13:45:00 UTC (rev 5840)
@@ -71,7 +71,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:508
+#: Merge.rc:509
#, c-format
msgid "&Copy"
msgstr "\xC1\xED\xF4\xE9&\xE3\xF1\xE1\xF6\xDE"
@@ -83,7 +83,7 @@
msgstr "\xD0\xF1\xEF&\xF3\xDC\xF1\xF4\xE7\xF3\xE7"
#: Merge.rc:84
-#: Merge.rc:589
+#: Merge.rc:590
#, c-format
msgid "&Goto..."
msgstr "\xCC\xE5\xF4\xDC&\xE2\xE1\xF3\xE7..."
@@ -94,22 +94,22 @@
msgstr "\xA2\xED&\xEF\xE9\xE3\xEC\xE1"
#: Merge.rc:88
-#: Merge.rc:531
-#: Merge.rc:537
+#: Merge.rc:532
+#: Merge.rc:538
#, c-format
msgid "with &Registered Application"
msgstr "\xEC\xE5 \xC1\xED\xF4\xE9\xF3\xF4\xEF\xE9\xF7\xE9\xF3\xEC\xDD\xED\xE7 \xC5&\xF6\xE1\xF1\xEC\xEF\xE3\xDE"
#: Merge.rc:89
-#: Merge.rc:532
-#: Merge.rc:538
+#: Merge.rc:533
+#: Merge.rc:539
#, c-format
msgid "with &External Editor"
msgstr "\xEC&\xE5 \xDC\xEB\xEB\xE7 \xC5\xF6\xE1\xF1\xEC\xEF\xE3\xDE"
#: Merge.rc:90
-#: Merge.rc:533
-#: Merge.rc:539
+#: Merge.rc:534
+#: Merge.rc:540
#, c-format
msgid "&with..."
msgstr "\xEC\xE5..."
@@ -285,7 +285,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "\xCA\xE1\xF4\xDC\xEB\xEF\xE3\xEF\xF2..."
#: Merge.rc:152
#: Merge.rc:273
@@ -388,7 +388,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1920
+#: Merge.rc:1921
#, c-format
msgid "&Help"
msgstr "&\xC2\xEF\xDE\xE8\xE5\xE9\xE1"
@@ -590,7 +590,7 @@
msgstr "&\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDE\tDel"
#: Merge.rc:264
-#: Merge.rc:562
+#: Merge.rc:563
#, c-format
msgid "&Customize Columns..."
msgstr "&\xD0\xF1\xEF\xF3\xE1\xF1\xEC\xEF\xE3\xDE \xD3\xF4\xE7\xEB\xFE\xED..."
@@ -719,7 +719,7 @@
msgstr "\xCC\xE1\xEA&\xF1\xEF\xE5\xED\xF4\xEF\xEB\xDD\xF2"
#: Merge.rc:370
-#: Merge.rc:2758
+#: Merge.rc:2761
#, c-format
msgid "< Empty >"
msgstr "< \xA2\xE4\xE5\xE9\xEF >"
@@ -875,1166 +875,1171 @@
msgid "&XML"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:506
#, c-format
+msgid "&HEX"
+msgstr ""
+
+#: Merge.rc:511
+#, c-format
msgid "&Left to Right"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC \xF3\xF4\xEF \xC4\xE5\xEE\xE9\xFC"
-#: Merge.rc:511
+#: Merge.rc:512
#, c-format
msgid "L&eft to..."
msgstr "\xC1\xF1\xE9\xF3\xF4&\xE5\xF1\xFC \xF3\xF4\xEF..."
-#: Merge.rc:512
+#: Merge.rc:513
#, c-format
msgid "&Right to Left"
msgstr "\xC4\xE5&\xEE\xE9\xFC \xF3\xF4\xEF \xC1\xF1\xE9\xF3\xF4\xE5\xF1\xFC"
-#: Merge.rc:513
+#: Merge.rc:514
#, c-format
msgid "R&ight to..."
msgstr "\xC4\xE5\xEE&\xE9\xFC \xF3\xF4\xEF..."
-#: Merge.rc:515
+#: Merge.rc:516
#, c-format
msgid "&Move"
msgstr "&\xCC\xE5\xF4\xE1\xEA\xDF\xED\xE7\xF3\xE7"
-#: Merge.rc:517
+#: Merge.rc:518
#, c-format
msgid "&Left to..."
msgstr "\xC1\xF1\xE9\xF3\xF4&\xE5\xF1\xFC \xF3\xF4\xEF..."
-#: Merge.rc:518
+#: Merge.rc:519
#, c-format
msgid "&Right to..."
msgstr "\xC4\xE5&\xEE\xE9\xFC \xF3\xF4\xEF..."
-#: Merge.rc:520
+#: Merge.rc:521
#, c-format
msgid "&Delete"
msgstr "&\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDE"
-#: Merge.rc:522
-#: Merge.rc:1140
-#: Merge.rc:1522
+#: Merge.rc:523
+#: Merge.rc:1141
+#: Merge.rc:1523
#, c-format
msgid "&Left"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC"
-#: Merge.rc:523
-#: Merge.rc:1142
-#: Merge.rc:1525
+#: Merge.rc:524
+#: Merge.rc:1143
+#: Merge.rc:1526
#, c-format
msgid "&Right"
msgstr "\xC4\xE5&\xEE\xE9\xFC"
-#: Merge.rc:524
+#: Merge.rc:525
#, c-format
msgid "&Both"
msgstr "\xC1\xEC&\xF6\xFC\xF4\xE5\xF1\xE1"
-#: Merge.rc:526
+#: Merge.rc:527
#, c-format
msgid "Re&name"
msgstr "\xCC\xE5\xF4\xEF&\xED\xEF\xEC\xE1\xF3\xDF\xE1"
-#: Merge.rc:527
+#: Merge.rc:528
#, c-format
msgid "&Hide Items"
msgstr "\xC1\xF0\xFC\xEA\xF1\xF5&\xF8\xE7 \xC1\xED\xF4\xE9\xEA\xE5\xE9\xEC\xDD\xED\xF9\xED"
-#: Merge.rc:529
+#: Merge.rc:530
#, c-format
msgid "&Open Left"
msgstr "\xA2\xED\xEF\xE9\xE3\xEC\xE1 \xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xEF\xFD"
-#: Merge.rc:535
+#: Merge.rc:536
#, c-format
msgid "O&pen Right"
msgstr "\xA2\xED\xEF\xE9\xE3\xEC\xE1 \xC4\xE5&\xEE\xE9\xEF\xFD"
-#: Merge.rc:542
+#: Merge.rc:543
#, c-format
msgid "Cop&y Pathnames"
msgstr "\xC1\xED\xF4\xE9\xE3\xF1\xE1\xF6\xDE \xC4\xE9\xE1&\xE4\xF1\xEF\xEC\xFE\xED"
-#: Merge.rc:544
+#: Merge.rc:545
#, c-format
msgid "&Left (%1 of %2)"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:545
+#: Merge.rc:546
#, c-format
msgid "&Right (%1 of %2)"
msgstr "\xC4\xE5&\xEE\xE9\xFC (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:546
+#: Merge.rc:547
#, c-format
msgid "&Both (%1 of %2)"
msgstr "\xC1\xEC&\xF6\xFC\xF4\xE5\xF1\xE1 (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:548
+#: Merge.rc:549
#, c-format
msgid "Copy &Filenames"
msgstr "\xC1\xED\xF4\xE9\xE3\xF1\xE1\xF6\xDE \xCF&\xED\xEF\xEC\xDC\xF4\xF9\xED"
-#: Merge.rc:550
+#: Merge.rc:551
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:552
+#: Merge.rc:553
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:553
+#: Merge.rc:554
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "\xC4\xE5&\xEE\xE9\xFC... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:554
+#: Merge.rc:555
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "\xC1\xEC&\xF6\xFC\xF4\xE5\xF1\xE1... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:555
+#: Merge.rc:556
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "&\xC4\xE9\xE1\xF6\xEF\xF1\xDD\xF2... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:558
+#: Merge.rc:559
#, c-format
msgid "&Refresh"
msgstr "\xC1\xED\xE1&\xED\xDD\xF9\xF3\xE7"
-#: Merge.rc:570
+#: Merge.rc:571
#, c-format
msgid "&Copy Full Path"
msgstr "\xC1\xED\xF4\xE9\xE3\xF1\xE1\xF6\xDE \xF0\xEB\xDE\xF1\xEF\xF5\xF2 \xC4\xE9\xE1&\xE4\xF1\xEF\xEC\xDE\xF2"
-#: Merge.rc:571
+#: Merge.rc:572
#, c-format
msgid "Copy &Filename"
msgstr "\xC1\xED\xF4\xE9\xE3\xF1\xE1\xF6\xDE \xCF&\xED\xFC\xEC\xE1\xF4\xEF\xF2"
-#: Merge.rc:577
+#: Merge.rc:578
#, c-format
msgid "Prediffer Settings"
msgstr "\xD1\xF5\xE8\xEC\xDF\xF3\xE5\xE9\xF2 \xD0\xF1\xEF\xE5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xF4\xDE \xC4\xE9\xE1\xF6\xEF\xF1\xFE\xED"
-#: Merge.rc:579
+#: Merge.rc:580
#, c-format
msgid "&No prediffer"
msgstr "\xD7\xF9\xF1\xDF\xF2 \xF0\xF1\xEF\xE5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1 \xE4\xE9\xE1\xF6\xEF\xF1\xFE\xED"
-#: Merge.rc:580
+#: Merge.rc:581
#, c-format
msgid "Auto prediffer"
msgstr "\xC1\xF5\xF4\xFC\xEC\xE1\xF4\xE7 \xE5\xF0\xE9\xEB\xEF\xE3\xDE \xF0\xF1\xEF\xE5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xF4\xDE \xE4\xE9\xE1\xF6\xEF\xF1\xFE\xED"
-#: Merge.rc:588
+#: Merge.rc:589
#, c-format
msgid "G&oto Diff"
msgstr "\xCC\xE5\xF4\xDC&\xE2\xE1\xF3\xE7 \xF3\xE5 \xC4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:591
+#: Merge.rc:592
#, c-format
msgid "&No Moved Blocks"
msgstr "\xBC\xF7\xE9 \xEC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED\xF4\xE1 \xD4\xEC\xDE\xEC\xE1\xF4\xE1"
-#: Merge.rc:592
+#: Merge.rc:593
#, c-format
msgid "&All Moved Blocks"
msgstr "\xBC&\xEB\xE1 \xF4\xE1 \xEC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED\xF4\xE1 \xD4\xEC\xDE\xEC\xE1\xF4\xE1"
-#: Merge.rc:593
+#: Merge.rc:594
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "\xCC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED \xD4\xEC\xDE\xEC\xE1 \xE3\xE9\xE1 \xD4&\xF1\xDD\xF7\xEF\xF5\xF3\xE1 \xC4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:662
+#: Merge.rc:663
#, c-format
msgid "About WinMerge"
msgstr "\xD0\xE5\xF1\xDF \xF4\xEF\xF5 WinMerge"
-#: Merge.rc:668
+#: Merge.rc:669
#, c-format
msgid "(Private Build)"
msgstr "(\xC9\xE4\xE9\xF9\xF4\xE9\xEA\xDE \xCC\xE5\xF4\xE1\xE3\xEB\xFE\xF4\xF4\xE9\xF3\xE7)"
-#: Merge.rc:669
+#: Merge.rc:670
#, c-format
msgid "All rights reserved."
msgstr "\xCC\xE5 \xF4\xE7\xED \xE5\xF0\xE9\xF6\xFD\xEB\xE1\xEE\xE7 \xF0\xE1\xED\xF4\xFC\xF2 \xE4\xE9\xEA\xE1\xE9\xFE\xEC\xE1\xF4\xEF\xF2."
-#: Merge.rc:670
+#: Merge.rc:671
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "\xC5\xF0\xE9\xF3\xEA\xE5\xF6\xE8\xE5\xDF\xF4\xE5 \xF4\xEF \xD3\xF4\xE1\xE8\xEC\xFC \xF4\xEF\xF5 WinMerge!"
-#: Merge.rc:673
-#: Merge.rc:705
-#: Merge.rc:795
-#: Merge.rc:981
-#: Merge.rc:1059
-#: Merge.rc:1088
-#: Merge.rc:1098
-#: Merge.rc:1264
-#: Merge.rc:1328
-#: Merge.rc:1341
-#: Merge.rc:1433
-#: Merge.rc:1448
-#: Merge.rc:1670
+#: Merge.rc:674
+#: Merge.rc:706
+#: Merge.rc:796
+#: Merge.rc:982
+#: Merge.rc:1060
+#: Merge.rc:1089
+#: Merge.rc:1099
+#: Merge.rc:1265
+#: Merge.rc:1329
+#: Merge.rc:1342
+#: Merge.rc:1434
+#: Merge.rc:1449
+#: Merge.rc:1671
#, c-format
msgid "OK"
msgstr "\xCF\xCA"
-#: Merge.rc:674
+#: Merge.rc:675
#, c-format
msgid "Contributors"
msgstr "\xD3\xF5\xED\xF4\xE5\xEB\xE5\xF3\xF4\xDD\xF2"
-#: Merge.rc:681
+#: Merge.rc:682
#, c-format
msgid "Select Files or Folders"
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDE \xC1\xF1\xF7\xE5\xDF\xF9\xED \xDE \xD6\xE1\xEA\xDD\xEB\xF9\xED"
-#: Merge.rc:684
-#: Merge.rc:1599
+#: Merge.rc:685
+#: Merge.rc:1600
#, c-format
msgid "&Left:"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC:"
-#: Merge.rc:688
-#: Merge.rc:749
-#: Merge.rc:1002
-#: Merge.rc:1024
+#: Merge.rc:689
+#: Merge.rc:750
+#: Merge.rc:1003
+#: Merge.rc:1025
#, c-format
msgid "&Browse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:689
-#: Merge.rc:1603
+#: Merge.rc:690
+#: Merge.rc:1604
#, c-format
msgid "&Right:"
msgstr "\xC4\xE5&\xEE\xE9\xFC:"
-#: Merge.rc:693
-#: Merge.rc:1035
+#: Merge.rc:694
+#: Merge.rc:1036
#, c-format
msgid "Bro&wse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:694
-#: Merge.rc:1607
+#: Merge.rc:695
+#: Merge.rc:1608
#, c-format
msgid "&Filter:"
msgstr "&\xD6\xDF\xEB\xF4\xF1\xEF:"
-#: Merge.rc:697
-#: Merge.rc:1609
+#: Merge.rc:698
+#: Merge.rc:1610
#, c-format
msgid "Select..."
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDE..."
-#: Merge.rc:698
+#: Merge.rc:699
#, c-format
msgid "&Unpacker:"
msgstr "\xC1\xF0\xEF&\xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xFC:"
-#: Merge.rc:701
+#: Merge.rc:702
#, c-format
msgid "&Select..."
msgstr "&\xC5\xF0\xE9\xEB\xEF\xE3\xDE..."
-#: Merge.rc:702
-#: Merge.rc:1610
+#: Merge.rc:703
+#: Merge.rc:1611
#, c-format
msgid "&Include Subfolders"
msgstr "\xCF\xE9 \xD5\xF0\xEF\xF6\xDC\xEA\xE5\xEB\xEF\xE9 \xED\xE1 &\xF3\xF5\xEC\xF0\xE5\xF1\xE9\xEB\xE7\xF6\xE8\xEF\xFD\xED"
-#: Merge.rc:704
+#: Merge.rc:705
#, c-format
msgid "Status:"
msgstr "\xCA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7:"
-#: Merge.rc:706
-#: Merge.rc:736
-#: Merge.rc:796
-#: Merge.rc:826
-#: Merge.rc:858
-#: Merge.rc:868
-#: Merge.rc:1060
-#: Merge.rc:1089
-#: Merge.rc:1099
-#: Merge.rc:1150
-#: Merge.rc:1265
-#: Merge.rc:1342
-#: Merge.rc:1434
-#: Merge.rc:1449
-#: Merge.rc:1671
+#: Merge.rc:707
+#: Merge.rc:737
+#: Merge.rc:797
+#: Merge.rc:827
+#: Merge.rc:859
+#: Merge.rc:869
+#: Merge.rc:1061
+#: Merge.rc:1090
+#: Merge.rc:1100
+#: Merge.rc:1151
+#: Merge.rc:1266
+#: Merge.rc:1343
+#: Merge.rc:1435
+#: Merge.rc:1450
+#: Merge.rc:1672
#, c-format
msgid "Cancel"
msgstr "\xA2&\xEA\xF5\xF1\xEF"
-#: Merge.rc:707
-#: Merge.rc:1343
+#: Merge.rc:708
+#: Merge.rc:1344
#, c-format
msgid "Help"
msgstr "\xC2\xEF\xDE\xE8\xE5\xE9\xE1"
-#: Merge.rc:708
+#: Merge.rc:709
#, c-format
msgid "Files or Folders to Compare"
msgstr "\xC1\xF1\xF7\xE5\xDF\xE1 \xDE \xD6\xDC\xEA\xE5\xEB\xEF\xE9 \xF0\xF1\xEF\xF2 \xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:715
+#: Merge.rc:716
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:720
+#: Merge.rc:721
#, c-format
msgid "Database:"
msgstr "\xC2\xDC\xF3\xE7 \xC4\xE5\xE4\xEF\xEC\xDD\xED\xF9\xED:"
-#: Merge.rc:723
+#: Merge.rc:724
#, c-format
msgid "Project:"
msgstr "\xB8\xF1\xE3\xEF:"
-#: Merge.rc:726
+#: Merge.rc:727
#, c-format
msgid "User:"
msgstr "\xD7\xF1\xDE\xF3\xF4\xE7\xF2:"
-#: Merge.rc:728
+#: Merge.rc:729
#, c-format
msgid "Password:"
msgstr "\xD3\xF5\xED\xE8\xE7\xEC\xE1\xF4\xE9\xEA\xFC:"
-#: Merge.rc:730
+#: Merge.rc:731
#, c-format
msgid "Link to Destination VSS project"
msgstr "\xD0\xE1\xF1\xE1\xF0\xEF\xEC\xF0\xDE \xF3\xF4\xEF \xDD\xF1\xE3\xEF VSS \xD0\xF1\xEF\xEF\xF1\xE9\xF3\xEC\xEF\xFD"
-#: Merge.rc:732
-#: Merge.rc:873
+#: Merge.rc:733
+#: Merge.rc:874
#, c-format
msgid "Apply to all items"
msgstr "\xC5\xF6\xE1\xF1\xEC\xEF\xE3\xDE \xF3\xE5 \xFC\xEB\xE1 \xF4\xE1 \xE1\xED\xF4\xE9\xEA\xE5\xDF\xEC\xE5\xED\xE1"
-#: Merge.rc:734
+#: Merge.rc:735
#, c-format
msgid "Check Out"
msgstr "\xB8\xEB\xE5\xE3\xF7\xEF\xF2 \xEA\xB4 \xB8\xEE\xEF\xE4\xEF\xF2"
-#: Merge.rc:735
-#: Merge.rc:869
+#: Merge.rc:736
+#: Merge.rc:870
#, c-format
msgid "Save As..."
msgstr "\xC1\xF0\xEF\xE8\xDE\xEA\xE5\xF5\xF3\xE7 \xD9\xF2..."
-#: Merge.rc:741
+#: Merge.rc:742
#, c-format
msgid "Versioning System"
msgstr "\xD3\xFD\xF3\xF4\xE7\xEC\xE1 \xC4\xE9\xE1\xF7\xE5\xE9\xF1\xDF\xF3\xE5\xF9\xF2 \xC5\xEA\xE4\xFC\xF3\xE5\xF9\xED"
-#: Merge.rc:744
+#: Merge.rc:745
#, c-format
msgid "&Versioning System:"
msgstr "&\xD3\xFD\xF3\xF4\xE7\xEC\xE1 \xC4\xE9\xE1\xF7\xE5\xE9\xF1\xDF\xF3\xE5\xF9\xF2 \xC5\xEA\xE4\xFC\xF3\xE5\xF9\xED:"
-#: Merge.rc:747
+#: Merge.rc:748
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&\xC4\xE9\xE1\xE4\xF1\xEF\xEC\xDE \xF4\xEF\xF5 cleartool.exe:"
-#: Merge.rc:754
-#: Merge.rc:1928
+#: Merge.rc:755
+#: Merge.rc:1929
#, c-format
msgid "General"
msgstr "\xC3\xE5\xED\xE9\xEA\xDC"
-#: Merge.rc:757
+#: Merge.rc:758
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "\xC1\xF5\xF4\xFC\xEC\xE1\xF4\xE7 &\xEA\xFD\xEB\xE9\xF3\xE7 \xF3\xF4\xE7\xED \xF0\xF1\xFE\xF4\xE7 \xE4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:760
+#: Merge.rc:761
#, c-format
msgid "&Disable Splash Screen"
msgstr "\xC1\xF0\xE5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 &\xD0\xEB\xE1\xE9\xF3\xDF\xEF\xF5 \xCB\xEF\xE3\xEF\xF4\xFD\xF0\xEF\xF5 \xEA\xE1\xF4\xDC \xF4\xE7\xED \xE5\xEA\xEA\xDF\xED\xE7\xF3\xE7"
-#: Merge.rc:762
+#: Merge.rc:763
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "\xCA&\xEB\xE5\xDF\xF3\xE9\xEC\xEF \xF0\xE1\xF1\xE1\xE8\xFD\xF1\xF9\xED \xEC\xE5 ESC"
-#: Merge.rc:764
+#: Merge.rc:765
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "&\xC1\xF5\xF4\xFC\xEC\xE1\xF4\xE7 \xE5\xF0\xE1\xEB\xDE\xE8\xE5\xF5\xF3\xE7 \xE4\xE9\xE1\xE4\xF1\xEF\xEC\xFE\xED \xF3\xF4\xEF \xE4\xE9\xDC\xEB\xEF\xE3\xEF \xE1\xED\xEF\xDF\xE3\xEC\xE1\xF4\xEF\xF2"
-#: Merge.rc:767
+#: Merge.rc:768
#, c-format
msgid "All&ow only one instance to run"
msgstr "\xC5\xF0\xE9\xF4\xF1\xDD\xF0\xE5\xF4\xE1\xE9 \xEC\xFC\xED\xEF \xEC\xDF\xE1 \xF5\xF0\xFC\xF3\xF4\xE1\xF3\xE7 \xF4\xEF\xF5 WinMerge \xE1\xED\xEF\xE9\xEA\xF4\xDE"
-#: Merge.rc:769
+#: Merge.rc:770
#, c-format
msgid "As&k when closing multiple windows"
msgstr "\xC5\xF1\xFE\xF4\xE7\xF3\xE7 \xF0\xF1\xE9\xED \xE1\xF0\xFC \xF4\xEF \xEA\xEB\xE5\xDF\xF3\xE9\xEC\xEF \xF0\xEF\xEB\xEB\xE1\xF0\xEB\xFE\xED \xF0\xE1\xF1\xE1\xE8\xFD\xF1\xF9\xED"
-#: Merge.rc:771
+#: Merge.rc:772
#, c-format
msgid "&Preserve file time in file compare"
msgstr "\xC4\xE9\xE1&\xF4\xDE\xF1\xE7\xF3\xE7 \xF4\xE7\xF2 \xFE\xF1\xE1\xF2 \xF4\xF1\xEF\xF0\xEF\xF0\xEF\xE9\xDE\xF3\xE5\xF9\xF2 \xEA\xE1\xF4\xDC \xF4\xE7 \xF3\xFD\xE3\xEA\xF1\xE9\xF3\xE7 \xE1\xF1\xF7\xE5\xDF\xF9\xED"
-#: Merge.rc:774
+#: Merge.rc:775
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "\xC1\xF5\xF4\xFC\xEC\xE1\xF4\xE7 \xF3\xF5\xEC\xF0\xEB\xDE\xF1\xF9\xF3\xE7 \xE4\xE9\xE1\xEB\xFC\xE3\xEF\xF5 \xE1\xED&\xEF\xDF\xE3\xEC\xE1\xF4\xEF\xF2"
-#: Merge.rc:777
+#: Merge.rc:778
#, c-format
msgid "Enable multiple compare windows for"
msgstr "\xC5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xF0\xEF\xEB\xEB\xE1\xF0\xEB\xFE\xED \xF0\xE1\xF1\xE1\xE8\xFD\xF1\xF9\xED \xF3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xF2 \xE3\xE9\xE1"
-#: Merge.rc:779
-#: Merge.rc:1622
+#: Merge.rc:780
+#: Merge.rc:1623
#, c-format
msgid "&Folder compare"
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7 &\xD6\xE1\xEA\xDD\xEB\xF9\xED"
-#: Merge.rc:781
-#: Merge.rc:1624
+#: Merge.rc:782
+#: Merge.rc:1625
#, c-format
msgid "Fil&e compare"
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7 &\xC1\xF1\xF7\xE5\xDF\xF9\xED"
-#: Merge.rc:783
+#: Merge.rc:784
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "\xD4\xEF WinMerge \xE5\xF0\xE9\xF4\xF1\xDD\xF0\xE5\xE9 \xF4\xE7\xED \xE1\xF0\xFC\xEA\xF1\xF5\xF8\xE7 \xEF\xF1\xE9\xF3\xEC\xDD\xED\xF9\xED \xEA\xEF\xE9\xED\xFE\xED \xF0\xEB\xE1\xE9\xF3\xDF\xF9\xED \xEC\xE7\xED\xF5\xEC\xDC\xF4\xF9\xED. \xD0\xE1\xF4\xDE\xF3\xF4\xE5 \xF4\xEF \xEA\xEF\xF5\xEC\xF0\xDF \xC5\xF0\xE1\xED\xE1\xF6\xEF\xF1\xDC \xE3\xE9\xE1 \xED\xE1 \xEE\xE1\xED\xE1\xEA\xDC\xED\xE5\xF4\xE5 \xFC\xEB\xE1 \xF4\xE1 \xEC\xE7\xED\xFD\xEC\xE1\xF4\xE1 \xEF\xF1\xE1\xF4\xDC."
-#: Merge.rc:785
+#: Merge.rc:786
#, c-format
msgid "Reset"
msgstr "\xC5\xF0\xE1\xED\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:792
+#: Merge.rc:793
#, c-format
msgid "Language"
msgstr "\xC3\xEB\xFE\xF3\xF3\xE1"
-#: Merge.rc:799
+#: Merge.rc:800
#, c-format
msgid "Available languages:"
msgstr "\xC4\xE9\xE1\xE8\xDD\xF3\xE9\xEC\xE5\xF2 \xE3\xEB\xFE\xF3\xF3\xE5\xF2:"
-#: Merge.rc:805
+#: Merge.rc:806
#, c-format
msgid "Find"
msgstr "\xC1\xED\xE1\xE6\xDE\xF4\xE7\xF3\xE7"
-#: Merge.rc:808
-#: Merge.rc:835
+#: Merge.rc:809
+#: Merge.rc:836
#, c-format
msgid "Fi&nd what:"
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7 \xE3\xE9\xE1:"
-#: Merge.rc:811
-#: Merge.rc:841
+#: Merge.rc:812
+#: Merge.rc:842
#, c-format
msgid "Match &whole word only"
msgstr "\xC5\xFD\xF1\xE5\xF3\xE7 \xEF\xEB\xEF\xEA\xEB\xDE\xF1\xF9\xED &\xEB\xDD\xEE\xE5\xF9\xED \xEC\xFC\xED\xEF"
-#: Merge.rc:813
-#: Merge.rc:843
+#: Merge.rc:814
+#: Merge.rc:844
#, c-format
msgid "Match &case"
msgstr "\xC4\xE9\xDC\xEA\xF1\xE9\xF3\xE7 \xD0\xE5\xE6\xFE\xED/&\xCA\xE5\xF6\xE1\xEB\xE1\xDF\xF9\xED"
-#: Merge.rc:815
-#: Merge.rc:845
+#: Merge.rc:816
+#: Merge.rc:846
#, c-format
msgid "Regular &expression"
msgstr "\xD4\xF5\xF0\xEF\xF0\xEF\xE9\xE7\xEC\xDD\xED\xE7 \xB8\xEA&\xF6\xF1\xE1\xF3\xE7"
-#: Merge.rc:817
+#: Merge.rc:818
#, c-format
msgid "D&on't wrap end of file"
msgstr "\xD7\xF9\xF1\xDF\xF2 \xE1\xED\xE1&\xE4\xDF\xF0\xEB\xF9\xF3\xE7 \xF3\xF4\xEF \xF4\xDD\xEB\xEF\xF2 \xF4\xEF\xF5 \xE1\xF1\xF7\xE5\xDF\xEF\xF5"
-#: Merge.rc:820
+#: Merge.rc:821
#, c-format
msgid "Direction"
msgstr "\xCA\xE1\xF4\xE5\xFD\xE8\xF5\xED\xF3\xE7"
-#: Merge.rc:821
+#: Merge.rc:822
#, c-format
msgid "&Up"
msgstr "&\xA2\xED\xF9"
-#: Merge.rc:823
+#: Merge.rc:824
#, c-format
msgid "&Down"
msgstr "&\xCA\xDC\xF4\xF9"
-#: Merge.rc:825
-#: Merge.rc:855
+#: Merge.rc:826
+#: Merge.rc:856
#, c-format
msgid "&Find Next"
msgstr "\xC5\xFD\xF1\xE5\xF3\xE7 &\xC5\xF0\xEF\xEC\xDD\xED\xEF\xF5"
-#: Merge.rc:832
+#: Merge.rc:833
#, c-format
msgid "Replace"
msgstr "\xC1\xED\xF4\xE9\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7"
-#: Merge.rc:838
+#: Merge.rc:839
#, c-format
msgid "Re&place with:"
msgstr "\xC1\xED\xF4\xE9&\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xEC\xE5:"
-#: Merge.rc:847
+#: Merge.rc:848
#, c-format
msgid "&Don't wrap end of file"
msgstr "\xD7\xF9\xF1\xDF\xF2 \xE1\xED\xE1&\xE4\xDF\xF0\xEB\xF9\xF3\xE7 \xF3\xF4\xEF \xF4\xDD\xEB\xEF\xF2 \xF4\xEF\xF5 \xE1\xF1\xF7\xE5\xDF\xEF\xF5"
-#: Merge.rc:850
+#: Merge.rc:851
#, c-format
msgid "Replace in"
msgstr "\xC1\xED\xF4\xE9\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xE5\xED\xF4\xFC\xF2"
-#: Merge.rc:851
+#: Merge.rc:852
#, c-format
msgid "&Selection"
msgstr "&\xC5\xF0\xE9\xEB\xEF\xE3\xDE\xF2"
-#: Merge.rc:853
+#: Merge.rc:854
#, c-format
msgid "Wh&ole file"
msgstr "\xBC&\xEB\xEF\xF5 \xF4\xEF\xF5 \xC1\xF1\xF7\xE5\xDF\xEF\xF5"
-#: Merge.rc:856
+#: Merge.rc:857
#, c-format
msgid "&Replace"
msgstr "\xC1\xED\xF4\xE9&\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7"
-#: Merge.rc:857
+#: Merge.rc:858
#, c-format
msgid "Replace &All"
msgstr "\xC1\xED\xF4\xE9\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xBC&\xEB\xF9\xED"
-#: Merge.rc:864
-#: Merge.rc:2169
+#: Merge.rc:865
+#: Merge.rc:2172
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:867
+#: Merge.rc:868
#, c-format
msgid "CheckOut"
msgstr "\xB8\xEB\xE5\xE3\xF7\xEF\xF2 \xEA\xB4 \xB8\xEE\xEF\xE4\xEF\xF2"
-#: Merge.rc:872
-#: Merge.rc:1184
+#: Merge.rc:873
+#: Merge.rc:1185
#, c-format
msgid "Comments"
msgstr "\xD3\xF7\xFC\xEB\xE9\xE1"
-#: Merge.rc:875
+#: Merge.rc:876
#, c-format
msgid "CheckIn after checkout"
msgstr "\xC4\xE9\xE1\xF0\xDF\xF3\xF4\xE5\xF5\xF3\xE7 \xEC\xE5\xF4\xDC \xE1\xF0\xFC \xDD\xEB\xE5\xE3\xF7\xEF \xEA\xB4 \xDD\xEE\xEF\xE4\xEF"
-#: Merge.rc:881
+#: Merge.rc:882
#, c-format
msgid "Linefilters"
msgstr "\xD6\xDF\xEB\xF4\xF1\xE1 \xC3\xF1\xE1\xEC\xEC\xFE\xED"
-#: Merge.rc:884
+#: Merge.rc:885
#, c-format
msgid "Enable Line Filters"
msgstr "\xC5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xD6\xDF\xEB\xF4\xF1\xF9\xED \xC3\xF1\xE1\xEC\xEC\xFE\xED"
-#: Merge.rc:887
+#: Merge.rc:888
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "\xD4\xF5\xF0\xEF\xF0\xEF\xE9\xE7\xEC\xDD\xED\xE5\xF2 \xC5\xEA&\xF6\xF1\xDC\xF3\xE5\xE9\xF2 (\xEC\xDF\xE1 \xE1\xED\xDC \xE3\xF1\xE1\xEC\xEC\xDE):"
-#: Merge.rc:894
+#: Merge.rc:895
#, c-format
msgid "Save"
msgstr "\xC1\xF0\xEF\xE8\xDE\xEA\xE5\xF5\xF3\xE7"
-#: Merge.rc:895
+#: Merge.rc:896
#, c-format
msgid "New"
msgstr "\xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDF\xE1"
-#: Merge.rc:896
+#: Merge.rc:897
#, c-format
msgid "Edit"
msgstr "\xC5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1"
-#: Merge.rc:897
+#: Merge.rc:898
#, c-format
msgid "Remove"
msgstr "\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDE"
-#: Merge.rc:902
-#: Merge.rc:1931
+#: Merge.rc:903
+#: Merge.rc:1932
#, c-format
msgid "Colors"
msgstr "\xD7\xF1\xFE\xEC\xE1\xF4\xE1"
-#: Merge.rc:905
+#: Merge.rc:906
#, c-format
msgid "Difference:"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xDC:"
-#: Merge.rc:909
+#: Merge.rc:910
#, c-format
msgid "Selected Difference:"
msgstr "\xC5\xF0\xE9\xEB\xE5\xE3\xEC\xDD\xED\xE7 \xC4\xE9\xE1\xF6\xEF\xF1\xDC:"
-#: Merge.rc:913
-#: Merge.rc:1574
+#: Merge.rc:914
+#: Merge.rc:1575
#, c-format
msgid "Background"
msgstr "\xD6\xFC\xED\xF4\xEF"
-#: Merge.rc:914
+#: Merge.rc:915
#, c-format
msgid "Deleted"
msgstr "\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDD\xED\xF4\xE1"
-#: Merge.rc:927
-#: Merge.rc:1369
-#: Merge.rc:1575
+#: Merge.rc:928
+#: Merge.rc:1370
+#: Merge.rc:1576
#, c-format
msgid "Text"
msgstr "\xCA\xE5\xDF\xEC\xE5\xED\xEF"
-#: Merge.rc:931
+#: Merge.rc:932
#, c-format
msgid "Ignored Difference:"
msgstr "\xC1\xE3\xED\xEF\xE7\xE8\xE5\xDF\xF3\xE1 \xC4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:941
+#: Merge.rc:942
#, c-format
msgid "Moved:"
msgstr "\xCC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED\xF4\xE1:"
-#: Merge.rc:951
+#: Merge.rc:952
#, c-format
msgid "Selected Moved:"
msgstr "\xC5\xF0\xE9\xEB\xE5\xE3\xEC\xDD\xED\xE1 \xCC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED\xF4\xE1:"
-#: Merge.rc:958
+#: Merge.rc:959
#, c-format
msgid "Word Difference:"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xDC \xCB\xDD\xEE\xE5\xF9\xF2:"
-#: Merge.rc:965
+#: Merge.rc:966
#, c-format
msgid "Selected Word Diff:"
msgstr "\xC5\xF0\xE9\xEB\xE5\xE3\xEC\xDD\xED\xE7 \xC4\xE9\xE1\xF6\xEF\xF1\xDC \xCB\xDD\xEE\xE5\xF9\xF2:"
-#: Merge.rc:972
-#: Merge.rc:1058
-#: Merge.rc:1087
-#: Merge.rc:1187
-#: Merge.rc:1415
+#: Merge.rc:973
+#: Merge.rc:1059
+#: Merge.rc:1088
+#: Merge.rc:1188
+#: Merge.rc:1416
#, c-format
msgid "Defaults"
msgstr "&\xC1\xF1\xF7\xE9\xEA\xDD\xF2 \xD1\xF5\xE8\xEC\xDF\xF3\xE5\xE9\xF2"
-#: Merge.rc:978
-#: Merge.rc:1357
-#: Merge.rc:1563
+#: Merge.rc:979
+#: Merge.rc:1358
+#: Merge.rc:1564
#, c-format
msgid "Dialog"
msgstr "\xC4\xE9\xDC\xEB\xEF\xE3\xEF\xF2"
-#: Merge.rc:988
-#: Merge.rc:1934
+#: Merge.rc:989
+#: Merge.rc:1935
#, c-format
msgid "System"
msgstr "\xD3\xFD\xF3\xF4\xE7\xEC\xE1"
-#: Merge.rc:991
+#: Merge.rc:992
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "\xC1\xF0\xEF\xF3\xF4\xEF\xEB\xDE \xE4\xE9\xE1\xE3\xF1\xE1\xF6\xDD\xED\xF4\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED \xF3\xF4\xEF\xED &\xCA\xDC\xE4\xEF \xC1\xED\xE1\xEA\xF5\xEA\xEB\xFE\xF3\xE5\xF9\xF2"
-#: Merge.rc:993
+#: Merge.rc:994
#, c-format
msgid "Integration"
msgstr "\xD3\xF5\xED\xE5\xF1\xE3\xE1\xF3\xDF\xE1"
-#: Merge.rc:994
+#: Merge.rc:995
#, c-format
msgid "&Add to explorer context menu"
msgstr "\xD0\xF1\xEF\xF3&\xE8\xDE\xEA\xE7 \xF3\xF4\xE9\xF2 \xE5\xE9\xE4\xE9\xEA\xDD\xF2 \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xF4\xE7\xF2 \xE5\xEE\xE5\xF1\xE5\xF5\xED\xDE\xF3\xE5\xF9\xF2"
-#: Merge.rc:996
+#: Merge.rc:997
#, c-format
msgid "E&nable advanced menu"
msgstr "\xC5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xE5\xEE\xE5\xE9\xE4\xE9\xEA\xE5\xF5\xEC\xDD\xED\xF9\xED \xE5\xF0\xE9\xEB\xEF\xE3\xFE\xED"
-#: Merge.rc:998
+#: Merge.rc:999
#, c-format
msgid "In&clude subfolders by default"
msgstr "\xCF\xE9 \xF5\xF0\xEF\xF6\xDC\xEA\xE5\xEB\xEF\xE9 \xED\xE1 \xF3\xF5\xEC\xF0\xE5\xF1\xE9\xEB\xE1\xEC\xE2\xDC\xED\xEF\xED\xF4\xE1\xE9 \xEA\xE1\xF4' \xE1\xF1\xF7\xDE\xED"
-#: Merge.rc:1000
+#: Merge.rc:1001
#, c-format
msgid "&External editor:"
msgstr "\xC5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1 \xEC\xE5 &\xDC\xEB\xEB\xE7 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE:"
-#: Merge.rc:1003
+#: Merge.rc:1004
#, c-format
msgid "&Filter folder:"
msgstr "\xD6\xDC\xEA\xE5\xEB\xEF\xF2 &\xD6\xDF\xEB\xF4\xF1\xF9\xED:"
-#: Merge.rc:1005
+#: Merge.rc:1006
#, c-format
msgid "B&rowse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:1006
+#: Merge.rc:1007
#, c-format
msgid "Temporary files folder"
msgstr "\xD6\xDC\xEA\xE5\xEB\xEF\xF2 \xF0\xF1\xEF\xF3\xF9\xF1\xE9\xED\xFE\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED"
-#: Merge.rc:1007
+#: Merge.rc:1008
#, c-format
msgid "S&ystem's temp folder"
msgstr "\xD6\xDC\xEA\xE5\xEB\xEF\xF2 \xF0\xF1\xEF\xF3\xF9\xF1\xE9\xED\xFE\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED \xEF\xF1\xDF\xE6\xE5\xF4\xE1\xE9 \xE1\xF0\xFC \xF4\xEF &\xD3\xFD\xF3\xF4\xE7\xEC\xE1"
-#: Merge.rc:1009
+#: Merge.rc:1010
#, c-format
msgid "C&ustom folder:"
msgstr "\xD0\xF1\xEF&\xF4\xE9\xEC\xFE\xEC\xE5\xED\xEF\xF2 \xD6\xDC\xEA\xE5\xEB\xEF\xF2:"
-#: Merge.rc:1012
-#: Merge.rc:1028
+#: Merge.rc:1013
+#: Merge.rc:1029
#, c-format
msgid "Br&owse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:1018
+#: Merge.rc:1019
#, c-format
msgid "Patch Generator"
msgstr "\xC5\xF6\xE1\xF1\xEC\xEF\xE3\xDE \xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDF\xE1\xF2 Patch"
-#: Merge.rc:1021
+#: Merge.rc:1022
#, c-format
msgid "File&1:"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF&1:"
-#: Merge.rc:1025
+#: Merge.rc:1026
#, c-format
msgid "File&2:"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF&2:"
-#: Merge.rc:1029
+#: Merge.rc:1030
#, c-format
msgid "&Swap"
msgstr "\xC1\xED\xF4\xE9\xEC\xE5\xF4\xDC&\xE8\xE5\xF3\xE7"
-#: Merge.rc:1030
+#: Merge.rc:1031
#, c-format
msgid "&Append to existing file"
msgstr "\xD0\xF1\xEF\xF3\xDC\xF1\xF4\xE7\xF3\xE7 \xF3\xE5 \xF5\xF0\xDC\xF1\xF7\xEF\xED \xE1\xF1\xF7\xE5\xDF\xEF"
-#: Merge.rc:1032
+#: Merge.rc:1033
#, c-format
msgid "&Result:"
msgstr "&\xC1\xF0\xEF\xF4\xDD\xEB\xE5\xF3\xEC\xE1:"
-#: Merge.rc:1036
+#: Merge.rc:1037
#, c-format
msgid "&Format"
msgstr "\xCC\xEF\xF1&\xF6\xDE"
-#: Merge.rc:1037
+#: Merge.rc:1038
#, c-format
msgid "St&yle:"
msgstr "\xD3\xF4&\xF5\xEB:"
-#: Merge.rc:1040
+#: Merge.rc:1041
#, c-format
msgid "&Context:"
msgstr "&\xD0\xE5\xF1\xE9\xE2. \xCA\xE5\xDF\xEC.:"
-#: Merge.rc:1043
+#: Merge.rc:1044
#, c-format
msgid "W&hitespaces"
msgstr "\xD7\xE1\xF1\xE1\xEA\xF4\xDE\xF1\xE5\xF2 &\xC4\xE9\xE1\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2"
-#: Merge.rc:1044
+#: Merge.rc:1045
#, c-format
msgid "Com&pare"
msgstr "\xD3\xFD\xE3&\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:1046
+#: Merge.rc:1047
#, c-format
msgid "I&gnore changes"
msgstr "\xCF\xE9 \xEC\xE5\xF4\xE1\xE2\xEF\xEB\xDD\xF2 \xED\xE1 \xC1&\xE3\xED\xEF\xE7\xE8\xEF\xFD\xED"
-#: Merge.rc:1048
+#: Merge.rc:1049
#, c-format
msgid "Ig&nore all"
msgstr "\xCD\xE1 \xC1\xE3\xED\xEF\xE7\xE8\xEF\xFD\xED \xBC&\xEB\xE1"
-#: Merge.rc:1050
+#: Merge.rc:1051
#, c-format
msgid "Ignor&e blank lines"
msgstr "\xCF\xE9 \xEA\xE5\xED\xDD\xF2 \xE3\xF1\xE1\xEC\xEC\xDD\xF2 \xED\xE1 \xE1\xE3\xED\xEF\xEF\xFD\xED\xF4\xE1\xE9"
-#: Merge.rc:1052
+#: Merge.rc:1053
#, c-format
msgid "Case sensi&tive"
msgstr "\xC4\xE9\xDC\xEA\xF1\xE9\xF3\xE7 \xD0\xE5\xE6\xFE\xED/&\xCA\xE5\xF6\xE1\xEB\xE1\xDF\xF9\xED"
-#: Merge.rc:1054
+#: Merge.rc:1055
#, c-format
msgid "Inclu&de command line"
msgstr "\xC7 \xE3\xF1\xE1\xEC\xEC\xDE \xE5\xED\xF4\xEF\xEB\xDE\xF2 \xED\xE1 \xF3\xF5\xEC\xF0\xE5\xF1\xE9\xEB\xE1\xEC\xE2\xDC\xED\xE5\xF4\xE1\xE9"
-#: Merge.rc:1056
+#: Merge.rc:1057
#, c-format
msgid "Open to e&xternal editor"
msgstr "\xA2\xED&\xEF\xE9\xE3\xEC\xE1 \xEC\xE5 \xDC\xEB\xEB\xE7 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE \xE5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1\xF2"
-#: Merge.rc:1078
+#: Merge.rc:1079
#, c-format
msgid "Display Columns"
msgstr "\xC5\xEC\xF6\xDC\xED\xE9\xF3\xE7 \xD3\xF4\xE7\xEB\xFE\xED"
-#: Merge.rc:1084
+#: Merge.rc:1085
#, c-format
msgid "Move &Up"
msgstr "\xCC\xE5\xF4\xE1\xEA\xDF\xED\xE7\xF3\xE7 \xF0\xF1\xEF\xF2 \xF4\xE1 &\xDC\xED\xF9"
-#: Merge.rc:1085
+#: Merge.rc:1086
#, c-format
msgid "Move &Down"
msgstr "\xCC\xE5\xF4\xE1\xEA\xDF\xED\xE7\xF3\xE7 \xF0\xF1\xEF\xF2 \xF4\xE1 &\xEA\xDC\xF4\xF9"
-#: Merge.rc:1095
+#: Merge.rc:1096
#, c-format
msgid "Select Unpacker"
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDE \xC1\xF0\xEF\xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xEF\xFD"
-#: Merge.rc:1100
+#: Merge.rc:1101
#, c-format
msgid "File unpacker:"
msgstr "\xC1\xF0\xEF\xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xFC \xC1\xF1\xF7\xE5\xDF\xF9\xED:"
-#: Merge.rc:1103
+#: Merge.rc:1104
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "\xC5\xEC\xF6\xDC\xED\xE9\xF3\xE7 \xFC\xEB\xF9\xED \xF4\xF9\xED \xE1\xF0\xEF\xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xFE\xED, \xED\xE1 \xEC\xE7\xED \xE5\xEB\xDD\xE3\xF7\xE5\xF4\xE1\xE9 \xE7 \xE5\xF0\xDD\xEA\xF4\xE1\xF3\xE7"
-#: Merge.rc:1106
+#: Merge.rc:1107
#, c-format
msgid "Extensions list:"
msgstr "\xCA\xE1\xF4\xDC\xEB\xEF\xE3\xEF\xF2 \xC5\xF0\xE5\xEA\xF4\xDC\xF3\xE5\xF9\xED:"
-#: Merge.rc:1107
+#: Merge.rc:1108
#, c-format
msgid "Description:"
msgstr "\xD0\xE5\xF1\xE9\xE3\xF1\xE1\xF6\xDE:"
-#: Merge.rc:1118
+#: Merge.rc:1119
#, c-format
msgid " Folder Compare Progress"
msgstr " \xD0\xF1\xFC\xEF\xE4\xEF\xF2 \xD3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xF2 \xD6\xE1\xEA\xDD\xEB\xF9\xED"
-#: Merge.rc:1121
-#: Merge.rc:1881
+#: Merge.rc:1122
+#: Merge.rc:1882
#, c-format
msgid "Stop"
msgstr "\xD4\xE5\xF1\xEC\xE1\xF4\xE9\xF3\xEC\xFC\xF2"
-#: Merge.rc:1126
+#: Merge.rc:1127
#, c-format
msgid "Comparing items..."
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7 \xE1\xED\xF4\xE9\xEA\xE5\xE9\xEC\xDD\xED\xF9\xED..."
-#: Merge.rc:1127
+#: Merge.rc:1128
#, c-format
msgid "Items compared:"
msgstr "\xD3\xF5\xE3\xEA\xF1\xE9\xE8\xDD\xED\xF4\xE1 \xE1\xED\xF4\xE9\xEA\xE5\xDF\xEC\xE5\xED\xE1:"
-#: Merge.rc:1128
+#: Merge.rc:1129
#, c-format
msgid "Items total:"
msgstr "\xD3\xFD\xED\xEF\xEB\xEF \xE1\xED\xF4\xE9\xEA\xE5\xE9\xEC\xDD\xED\xF9\xED:"
-#: Merge.rc:1134
+#: Merge.rc:1135
#, c-format
msgid "Go To"
msgstr "\xCC\xE5\xF4\xDC\xE2\xE1\xF3\xE7"
-#: Merge.rc:1137
+#: Merge.rc:1138
#, c-format
msgid "G&oto:"
msgstr "&\xCC\xE5\xF4\xDC\xE2\xE1\xF3\xE7:"
-#: Merge.rc:1139
+#: Merge.rc:1140
#, c-format
msgid "File"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF"
-#: Merge.rc:1144
+#: Merge.rc:1145
#, c-format
msgid "Goto what"
msgstr "\xCC\xE5\xF4\xDC\xE2\xE1\xF3\xE7 \xF3\xE5"
-#: Merge.rc:1145
+#: Merge.rc:1146
#, c-format
msgid "Li&ne"
msgstr "&\xC3\xF1\xE1\xEC\xEC\xDE"
-#: Merge.rc:1147
+#: Merge.rc:1148
#, c-format
msgid "&Difference"
msgstr "&\xC4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:1149
+#: Merge.rc:1150
#, c-format
msgid "&Go To"
msgstr "\xCC\xE5\xF4\xDC&\xE2\xE1\xF3\xE7"
-#: Merge.rc:1155
-#: Merge.rc:1929
+#: Merge.rc:1156
+#: Merge.rc:1930
#, c-format
msgid "Compare"
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:1158
+#: Merge.rc:1159
#, c-format
msgid "Whitespace"
msgstr "\xD7\xE1\xF1\xE1\xEA\xF4\xDE\xF1\xE5\xF2 \xC4\xE9\xE1\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2"
-#: Merge.rc:1159
+#: Merge.rc:1160
#, c-format
msgid "&Compare"
msgstr "&\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:1161
+#: Merge.rc:1162
#, c-format
msgid "&Ignore change"
msgstr "\xC7 \xEC\xE5\xF4\xE1\xE2\xEF\xEB\xDE \xED\xE1 \xE1&\xE3\xED\xEF\xE5\xDF\xF4\xE1\xE9"
-#: Merge.rc:1163
+#: Merge.rc:1164
#, c-format
msgid "I&gnore all"
msgstr "\xCD\xE1 \xE1\xE3\xED\xEF\xEF\xFD\xED\xF4\xE1\xE9 \xF4\xE1 &\xF0\xDC\xED\xF4\xE1"
-#: Merge.rc:1165
+#: Merge.rc:1166
#, c-format
msgid "Ignore blan&k lines"
msgstr "\xCF\xE9 &\xEA\xE5\xED\xDD\xF2 \xE3\xF1\xE1\xEC\xEC\xDD\xF2 \xED\xE1 \xE1\xE3\xED\xEF\xEF\xFD\xED\xF4\xE1\xE9"
-#: Merge.rc:1167
+#: Merge.rc:1168
#, c-format
msgid "Ignore &case"
msgstr "\xC4\xE9\xDC\xEA\xF1\xE9\xF3\xE7 \xEC\xE5\xF4\xE1\xEE\xFD \xD0\xE5\xE6\xFE\xED/&\xCA\xE5\xF6\xE1\xEB\xE1\xDF\xF9\xED \xE1\xED\xE5\xED\xE5\xF1\xE3\xFC\xF2"
-#: Merge.rc:1169
+#: Merge.rc:1170
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xDD\xF2 \xF7\xE1\xF1\xE1\xEA\xF4\xDE\xF1\xF9\xED &\xF4\xE5\xF1\xEC\xE1\xF4\xE9\xF3\xEC\xEF\xFD (Win/Unix/Mac) \xED\xE1 \xE1\xE3\xED\xEF\xEF\xFD\xED\xF4\xE1\xE9"
-#: Merge.rc:1172
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "\xC5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xE1\xED\xE9&\xF7\xED\xE5\xFD\xF3\xE5\xF9\xF2 \xEC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED\xF4\xF9\xED \xF4\xEC\xE7\xEC\xDC\xF4\xF9\xED"
-#: Merge.rc:1174
+#: Merge.rc:1175
#, c-format
msgid "&Match similar lines"
msgstr "\xC1\xED\xF4\xE9\xF3\xF4\xEF\xDF\xF7\xE9\xF3\xE7 \xF0\xE1\xF1\xEF\xEC\xEF\xDF\xF9\xED \xE3\xF1\xE1\xEC\xEC\xFE\xED"
-#: Merge.rc:1176
+#: Merge.rc:1177
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xDD\xF2 \xFE\xF1\xE1\xF2 \xEC\xE9\xEA\xF1\xFC\xF4\xE5\xF1\xE5\xF2 \xF4\xF9\xED &3 \xE4\xE5\xF5\xF4\xE5\xF1\xEF\xEB\xDD\xF0\xF4\xF9\xED \xED\xE1 \xE1\xE3\xED\xEF\xEF\xFD\xED\xF4\xE1\xE9"
-#: Merge.rc:1179
+#: Merge.rc:1180
#, c-format
msgid "&File Compare method:"
msgstr "&\xCC\xDD\xE8\xEF\xE4\xEF\xF2 \xD3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xF2 \xC1\xF1\xF7\xE5\xDF\xF9\xED:"
-#: Merge.rc:1182
+#: Merge.rc:1183
#, c-format
msgid "S&top after first difference"
msgstr "&\xD4\xE5\xF1\xEC\xE1\xF4\xE9\xF3\xEC\xFC\xF2 \xEC\xE5\xF4\xDC \xF4\xE7\xED \xF0\xF1\xFE\xF4\xE7 \xE4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:1185
+#: Merge.rc:1186
#, c-format
msgid "Filter Comments"
msgstr "\xD3\xF7\xFC\xEB\xE9\xE1 \xD6\xDF\xEB\xF4\xF1\xF9\xED"
-#: Merge.rc:1192
-#: Merge.rc:1930
+#: Merge.rc:1193
+#: Merge.rc:1931
#, c-format
msgid "Editor"
msgstr "\xC5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1 \xCA\xE5\xE9\xEC\xDD\xED\xEF\xF5"
-#: Merge.rc:1195
+#: Merge.rc:1196
#, c-format
msgid "&Highlight syntax"
msgstr "&\xD7\xF1\xF9\xEC\xE1\xF4\xE9\xF3\xEC\xFC\xF2 \xCA\xFE\xE4\xE9\xEA\xE1"
-#: Merge.rc:1197
+#: Merge.rc:1198
#, c-format
msgid "&Automatic rescan"
msgstr "\xC1&\xF5\xF4\xFC\xEC\xE1\xF4\xE7 \xC5\xF0\xE1\xED\xE5\xEE\xDD\xF4\xE1\xF3\xE7"
-#: Merge.rc:1199
+#: Merge.rc:1200
#, c-format
msgid "&Preserve original EOL chars"
msgstr "\xC4\xE9\xE1&\xF4\xDE\xF1\xE7\xF3\xE7 \xE1\xF1\xF7\xE9\xEA\xFE\xED \xF7\xE1\xF1\xE1\xEA\xF4\xDE\xF1\xF9\xED \xF4\xE5\xF1\xEC\xE1\xF4\xE9\xF3\xEC\xEF\xFD"
-#: Merge.rc:1201
+#: Merge.rc:1202
#, c-format
msgid "Tabs"
msgstr "\xD3\xF4\xE7\xEB\xEF\xE8\xDD\xF4\xE5\xF2"
-#: Merge.rc:1202
+#: Merge.rc:1203
#, c-format
msgid "&Tab size:"
msgstr "\xD0\xEB\xDC\xF4\xEF\xF2 \xD3\xF4\xE7\xEB\xEF&\xE8\xE5\xF4\xFE\xED"
-#: Merge.rc:1205
+#: Merge.rc:1206
#, c-format
msgid "&Insert Tabs"
msgstr "\xC5&\xE9\xF3\xE1\xE3\xF9\xE3\xDE \xD3\xF4\xE7\xEB\xEF\xE8\xE5\xF4\xFE\xED"
-#: Merge.rc:1207
+#: Merge.rc:1208
#, c-format
msgid "Insert &Spaces"
msgstr "\xC5\xE9\xF3\xE1\xE3\xF9\xE3\xDE \xCA\xE5\xED\xFE\xED &\xC4\xE9\xE1\xF3\xF4\xE7\xEC\xDC\xF4\xF9\xED"
-#: Merge.rc:1209
+#: Merge.rc:1210
#, c-format
msgid "Line Difference Coloring"
msgstr "\xD7\xF1\xF9\xEC\xE1\xF4\xE9\xF3\xEC\xFC\xF2 \xC4\xE9\xE1\xF6\xEF\xF1\xFE\xED \xC3\xF1\xE1\xEC\xEC\xFE\xED"
-#: Merge.rc:1211
+#: Merge.rc:1212
#, c-format
msgid "View line differences"
msgstr "\xC5\xEC\xF6\xDC\xED\xE9\xF3\xE7 \xE4\xE9\xE1\xF6\xEF\xF1\xFE\xED \xE3\xF1\xE1\xEC\xEC\xFE\xED"
-#: Merge.rc:1213
+#: Merge.rc:1214
#, c-format
msgid "&Character level"
msgstr "\xC5\xF0\xDF\xF0\xE5\xE4\xEF &\xD7\xE1\xF1\xE1\xEA\xF4\xDE\xF1\xF9\xED"
-#: Merge.rc:1215
+#: Merge.rc:1216
#, c-format
msgid "&Word-level:"
msgstr "\xC5\xF0\xDF\xF0\xE5\xE4\xEF &\xCB\xDD\xEE\xE5\xF9\xED"
-#: Merge.rc:1230
+#: Merge.rc:1231
#, c-format
msgid "Filefilters"
msgstr "\xC1\xF1\xF7\xE5\xE9\xEF\xF6\xDF\xEB\xF4\xF1\xE1"
-#: Merge.rc:1236
+#: Merge.rc:1237
#, c-format
msgid "Test"
msgstr "\xC4\xEF\xEA\xE9\xEC\xDE"
-#: Merge.rc:1237
+#: Merge.rc:1238
#, c-format
msgid "Install..."
msgstr "\xC5\xE3\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7..."
-#: Merge.rc:1238
+#: Merge.rc:1239
#, c-format
msgid "New..."
msgstr "\xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDF\xE1..."
-#: Merge.rc:1239
+#: Merge.rc:1240
#, c-format
msgid "Edit..."
msgstr "\xC5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1..."
-#: Merge.rc:1240
+#: Merge.rc:1241
#, c-format
msgid "Delete..."
msgstr "\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDE..."
-#: Merge.rc:1246
+#: Merge.rc:1247
#, c-format
msgid "Save modified files?"
msgstr "\xC1\xF0\xEF\xE8\xDE\xEA\xE5\xF5\xF3\xE7 \xF4\xF1\xEF\xF0\xEF\xF0\xEF\xE9\xE7\xEC\xDD\xED\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED;"
-#: Merge.rc:1249
+#: Merge.rc:1250
#, c-format
msgid "Left side file"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF \xE1\xF1\xE9\xF3\xF4\xE5\xF1\xDE\xF2 \xF0\xEB\xE5\xF5\xF1\xDC\xF2"
-#: Merge.rc:1252
+#: Merge.rc:1253
#, c-format
msgid "&Save changes"
msgstr "\xC1\xF0\xEF&\xE8\xDE\xEA\xE5\xF5\xF3\xE7 \xE1\xEB\xEB\xE1\xE3\xFE\xED"
-#: Merge.rc:1254
+#: Merge.rc:1255
#, c-format
msgid "&Discard changes"
msgstr "\xC1\xF0\xFC&\xF1\xF1\xE9\xF8\xE7 \xE1\xEB\xEB\xE1\xE3\xFE\xED"
-#: Merge.rc:1256
+#: Merge.rc:1257
#, c-format
msgid "Right side file"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF \xE4\xE5\xEE\xE9\xDC\xF2 \xF0\xEB\xE5\xF5\xF1\xDC\xF2"
-#: Merge.rc:1259
+#: Merge.rc:1260
#, c-format
msgid "S&ave changes"
msgstr "\xC1\xF0\xEF&\xE8\xDE\xEA\xE5\xF5\xF3\xE7 \xE1\xEB\xEB\xE1\xE3\xFE\xED"
-#: Merge.rc:1261
+#: Merge.rc:1262
#, c-format
msgid "Dis&card changes"
msgstr "\xC1\xF0\xFC&\xF1\xF1\xE9\xF8\xE7 \xE1\xEB\xEB\xE1\xE3\xFE\xED"
-#: Merge.rc:1263
+#: Merge.rc:1264
#, c-format
msgid "Discard All"
msgstr "\xC1\xF0\xFC\xF1\xF1\xE9&\xF8\xE7 \xFC\xEB\xF9\xED"
-#: Merge.rc:1270
-#: Merge.rc:1518
-#: Merge.rc:1936
+#: Merge.rc:1271
+#: Merge.rc:1519
+#: Merge.rc:1937
#, c-format
msgid "Codepage"
msgstr "\xCA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1"
-#: Merge.rc:1273
+#: Merge.rc:1274
#, c-format
msgid "Default Codepage"
msgstr "\xD0\xF1\xEF\xEA\xE1\xE8\xEF\xF1\xE9\xF3\xEC\xDD\xED\xE7 \xCA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1"
-#: Merge.rc:1274
+#: Merge.rc:1275
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "\xC5\xF0\xE9\xEB\xDD\xEE\xE1\xF4\xE5 \xF4\xE7\xED \xF0\xF1\xEF\xEA\xE1\xE8\xEF\xF1\xE9\xF3\xEC\xDD\xED\xE7 \xEA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1 \xED\xEF\xEF\xF5\xEC\xDD\xED\xE7 \xEA\xE1\xF4\xDC \xF4\xEF \xDC\xED\xEF\xE9\xE3\xEC\xE1 \xE1\xF1\xF7\xE5\xDF\xF9\xED \xF7\xF9\xF1\xDF\xF2 \xEA\xF9\xE4\xE9\xEA\xEF\xF0\xEF\xDF\xE7\xF3\xE7 Unicode"
-#: Merge.rc:1276
+#: Merge.rc:1277
#, c-format
msgid ""
"Detect codepage info for these files : .html, .rc, .xml \n"
@@ -2043,32 +2048,32 @@
"\xC1\xED\xDF\xF7\xED\xE5\xF5\xF3\xE7 \xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE1\xF2 \xEA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1\xF2 \xE5\xED\xF4\xFC\xF2 \xF4\xF9\xED \xE1\xEA\xEF\xEB\xEF\xFD\xE8\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED : .html, .rc, .xml \n"
"\xD7\xF1\xE5\xE9\xDC\xE6\xE5\xF4\xE1\xE9 \xE5\xF0\xE1\xED\xE5\xEA\xEA\xDF\xED\xE7\xF3\xE7 \xF4\xE7\xF2 \xE5\xF1\xE3\xE1\xF3\xDF\xE1\xF2"
-#: Merge.rc:1279
+#: Merge.rc:1280
#, c-format
msgid "System codepage"
msgstr "\xCA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1 \xF3\xF5\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2"
-#: Merge.rc:1281
+#: Merge.rc:1282
#, c-format
msgid "According to WinMerge User Interface"
msgstr "\xD3\xFD\xEC\xF6\xF9\xED\xE1 \xEC\xE5 \xF4\xEF \xD0\xE5\xF1\xE9\xE2\xDC\xEB\xEB\xEF\xED \xC5\xF1\xE3\xE1\xF3\xDF\xE1\xF2 \xF4\xEF\xF5 WinMerge"
-#: Merge.rc:1283
+#: Merge.rc:1284
#, c-format
msgid "Custom codepage :"
msgstr "\xD0\xF1\xEF\xF4\xE9\xEC\xFE\xEC\xE5\xED\xE7 \xEA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1:"
-#: Merge.rc:1291
+#: Merge.rc:1292
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - \xC7 \xF5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xF3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED \xE5\xDF\xED\xE1\xE9 \xE1\xF0\xE5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xE9\xE7\xEC\xDD\xED\xE7"
-#: Merge.rc:1294
+#: Merge.rc:1295
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "\xC7 \xE1\xED\xDF\xF7\xED\xE5\xF5\xF3\xE7 \xF4\xE7\xF2 \xE5\xEA\xE4\xFC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 7-Zip \xE5\xDF\xED\xE1\xE9 \xE1\xE4\xFD\xED\xE1\xF4\xE7 (\xE4\xE5\xED \xE5\xDF\xED\xE1\xE9 \xE5\xE3\xEA\xE1\xF4\xE5\xF3\xF4\xE7\xEC\xDD\xED\xEF;)"
-#: Merge.rc:1297
+#: Merge.rc:1298
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2077,12 +2082,12 @@
"\xC7 \xF5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xF3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED \xE1\xF0\xE1\xE9\xF4\xE5\xDF \xF4\xEF 7-Zip 3.11 \xDE \xEC\xE5\xF4\xE1\xE3\xE5\xED\xDD\xF3\xF4\xE5\xF1\xEF \xED\xE1 \xE5\xDF\xED\xE1\xE9 \xE5\xE3\xEA\xE1\xF4\xE5\xF3\xF4\xE7\xEC\xDD\xED\xEF \xF3\xF4\xEF\xED \xF5\xF0\xEF\xEB\xEF\xE3\xE9\xF3\xF4\xDE \xF3\xE1\xF2, \xDE\n"
"\xF4\xE1 \xE1\xF0\xE1\xF1\xE1\xDF\xF4\xE7\xF4\xE1 \xF3\xF4\xEF\xE9\xF7\xE5\xDF\xE1 \xF4\xEF\xF5 \xED\xE1 \xDD\xF7\xEF\xF5\xED \xE1\xED\xF4\xE9\xE3\xF1\xE1\xF6\xE5\xDF \xF3\xF4\xEF \xF6\xDC\xEA\xE5\xEB\xEF \xF4\xE7\xF2 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE\xF2 \xE3\xE9\xE1 \xE1\xF5\xF4\xFC\xED\xEF\xEC\xE7 \xEB\xE5\xE9\xF4\xEF\xF5\xF1\xE3\xDF\xE1."
-#: Merge.rc:1299
+#: Merge.rc:1300
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "\xD0\xF1\xDD\xF0\xE5\xE9 \xE5\xF0\xDF\xF3\xE7\xF2 \xED\xE1 \xDD\xF7\xE5\xE9 \xEF\xF1\xE9\xF3\xE8\xE5\xDF \xDD\xED\xE1 \xEA\xE1\xF4\xDC\xEB\xEB\xE7\xEB\xEF \xDC\xF1\xE8\xF1\xF9\xEC\xE1 \xF0\xE5\xF1\xE9\xE2\xDC\xEB\xEB\xEF\xED\xF4\xEF\xF2 \xE5\xF1\xE3\xE1\xF3\xDF\xE1\xF2 (Merge7z*.dll) \xF3\xF4\xE7 \xE4\xE9\xE1\xE4\xF1\xEF\xEC\xDE \xF3\xF5\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2."
-#: Merge.rc:1301
+#: Merge.rc:1302
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2091,12 +2096,12 @@
"\xD0\xE1\xF1\xE1\xEA\xE1\xEB\xFE \xF7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xDE\xF3\xF4\xE5 \xF4\xE7\xED \xDD\xEA\xE4\xEF\xF3\xE7 \xF4\xEF\xF5 7-Zip \xF4\xE7 \xF3\xF5\xED\xE9\xF3\xF4\xFE\xEC\xE5\xED\xE7 \xEA\xE1\xF4\xF9\xF4\xDD\xF1\xF9 \xEC\xDD\xF7\xF1\xE9 \xED\xE1 \xF5\xF0\xDC\xF1\xEE\xEF\xF5\xED\n"
"\xE4\xE9\xE1\xE8\xDD\xF3\xE9\xEC\xE1 \xE1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xE1 \xF0\xE5\xF1\xE9\xE2\xDC\xEB\xEB\xEF\xED\xF4\xEF\xF2 \xE5\xF1\xE3\xE1\xF3\xDF\xE1\xF2 \xE3\xE9\xE1 \xEC\xE5\xF4\xE1\xE3\xE5\xED\xDD\xF3\xF4\xE5\xF1\xE5\xF2 \xE5\xEA\xE4\xFC\xF3\xE5\xE9\xF2."
-#: Merge.rc:1303
+#: Merge.rc:1304
#, c-format
msgid "Version"
msgstr "\xB8\xEA\xE4\xEF\xF3\xE7"
-#: Merge.rc:1305
+#: Merge.rc:1306
#, c-format
msgid ""
"Plugin required\n"
@@ -2105,54 +2110,54 @@
"\xC1\xF0\xE1\xE9\xF4\xE5\xDF\xF4\xE1\xE9 \xA2\xF1\xE8\xF1\xF9\xEC\xE1\n"
"(dllbuild %04u)"
-#: Merge.rc:1307
+#: Merge.rc:1308
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "\xD3\xF5\xED\xE9\xF3\xF4\xFE\xEC\xE5\xED\xE7 \xB8\xEA\xE4\xEF\xF3\xE7 \xF4\xEF\xF5 7-Zip:"
-#: Merge.rc:1310
-#: Merge.rc:1313
+#: Merge.rc:1311
+#: Merge.rc:1314
#, c-format
msgid "present"
msgstr "\xF0\xE1\xF1\xFC\xED"
-#: Merge.rc:1311
+#: Merge.rc:1312
#, c-format
msgid "Merge7z000U.dll"
msgstr ""
-#: Merge.rc:1314
+#: Merge.rc:1315
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "\xCB\xEF\xE3\xE9\xF3\xEC\xE9\xEA\xFC 7-Zip \xE5\xE3\xEA\xE1\xF4\xE5\xF3\xF4\xE7\xEC\xDD\xED\xEF \xF3\xF4\xEF\xED \xD5\xF0\xEF\xEB\xEF\xE3\xE9\xF3\xF4\xDE \xF3\xE1\xF2:"
-#: Merge.rc:1316
-#: Merge.rc:1321
+#: Merge.rc:1317
+#: Merge.rc:1322
#, c-format
msgid "none"
msgstr "\xEF\xF5\xE4\xDD\xED (\xEA\xE1\xED\xDD\xED\xE1)"
-#: Merge.rc:1318
+#: Merge.rc:1319
#, c-format
msgid "missing"
msgstr "\xEB\xE5\xDF\xF0\xE5\xE9"
-#: Merge.rc:1319
+#: Merge.rc:1320
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "\xD3\xF4\xEF\xE9\xF7\xE5\xDF\xE1 \xF4\xEF\xF5 7-Zip \xE3\xE9\xE1 \xE1\xF5\xF4\xFC\xED\xEF\xEC\xE7 \xEB\xE5\xE9\xF4\xEF\xF5\xF1\xE3\xDF\xE1:"
-#: Merge.rc:1323
+#: Merge.rc:1324
#, c-format
msgid "outdated"
msgstr "\xF0\xE1\xF1\xF9\xF7\xE7\xEC\xDD\xED\xEF"
-#: Merge.rc:1324
+#: Merge.rc:1325
#, c-format
msgid "Plugins on path:"
msgstr "\xC1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xE1 \xF3\xF4\xE7 \xC4\xE9\xE1\xE4\xF1\xEF\xEC\xDE \xD3\xF5\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2:"
-#: Merge.rc:1325
+#: Merge.rc:1326
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2161,499 +2166,499 @@
"\xCD\xE1 \xEC\xE7\xED \xE5\xEC\xF6\xE1\xED\xE9\xF3\xE8\xE5\xDF \xEE\xE1\xED\xDC \xE1\xF5\xF4\xFC \xF4\xEF &\xCC\xDE\xED\xF5\xEC\xE1.\n"
"(\xCC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xF3\xE5 \xEA\xDC\xE8\xE5 \xF0\xE5\xF1\xDF\xF0\xF4\xF9\xF3\xE7 \xED\xE1 \xE5\xEC\xF6\xE1\xED\xDF\xF3\xE5\xF4\xE5 \xE1\xF5\xF4\xFC \xF4\xEF \xEC\xDE\xED\xF5\xEC\xE1 \xE1\xF0\xFC \xF4\xE9\xF2 \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xF4\xE7\xF2 \xC2\xEF\xE7\xE8\xE5\xDF\xE1\xF2.)"
-#: Merge.rc:1329
+#: Merge.rc:1330
#, c-format
msgid "Plugin Download"
msgstr "\xCC\xE5\xF4\xE1\xF6\xEF\xF1\xDC \xC1\xF1\xE8\xF1\xF9\xEC\xDC\xF4\xF9\xED"
-#: Merge.rc:1338
+#: Merge.rc:1339
#, c-format
msgid "Options"
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDD\xF2"
-#: Merge.rc:1349
+#: Merge.rc:1350
#, c-format
msgid " Categories"
msgstr " \xCA\xE1\xF4\xE7\xE3\xEF\xF1\xDF\xE5\xF2"
-#: Merge.rc:1351
+#: Merge.rc:1352
#, c-format
msgid "Import..."
msgstr "\xC5\xE9\xF3\xE1\xE3\xF9\xE3\xDE..."
-#: Merge.rc:1352
+#: Merge.rc:1353
#, c-format
msgid "Export..."
msgstr "\xC5\xEE\xE1\xE3\xF9\xE3\xDE..."
-#: Merge.rc:1360
+#: Merge.rc:1361
#, c-format
msgid "Keywords:"
msgstr "\xC5\xE9\xE4\xE9\xEA\xDD\xF2 \xCB\xDD\xEE\xE5\xE9\xF2:"
-#: Merge.rc:1361
+#: Merge.rc:1362
#, c-format
msgid "Function names:"
msgstr "\xCF\xED\xFC\xEC\xE1\xF4\xE1 \xC4\xE9\xE5\xF1\xE3\xE1\xF3\xE9\xFE\xED:"
-#: Merge.rc:1362
+#: Merge.rc:1363
#, c-format
msgid "Comments:"
msgstr "\xD3\xF7\xFC\xEB\xE9\xE1:"
-#: Merge.rc:1363
+#: Merge.rc:1364
#, c-format
msgid "Numbers:"
msgstr "\xC1\xF1\xE9\xE8\xEC\xEF\xDF:"
-#: Merge.rc:1364
+#: Merge.rc:1365
#, c-format
msgid "Operators:"
msgstr "\xD4\xE5\xEB\xE5\xF3\xF4\xDD\xF2:"
-#: Merge.rc:1365
+#: Merge.rc:1366
#, c-format
msgid "Strings:"
msgstr "\xC1\xF5\xF4\xEF\xFD\xF3\xE9\xEF \xCA\xE5\xDF\xEC\xE5\xED\xEF:"
-#: Merge.rc:1366
+#: Merge.rc:1367
#, c-format
msgid "Preprocessor:"
msgstr "\xD0\xF1\xEF\xE5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xF4\xDE\xF2:"
-#: Merge.rc:1367
+#: Merge.rc:1368
#, c-format
msgid "User 1:"
msgstr "\xE1\xF0\xFC \xD7\xF1\xDE\xF3\xF4\xE7 1:"
-#: Merge.rc:1368
+#: Merge.rc:1369
#, c-format
msgid "User 2:"
msgstr "\xE1\xF0\xFC \xD7\xF1\xDE\xF3\xF4\xE7 2:"
-#: Merge.rc:1373
-#: Merge.rc:1378
-#: Merge.rc:1383
-#: Merge.rc:1388
-#: Merge.rc:1393
-#: Merge.rc:1398
-#: Merge.rc:1403
-#: Merge.rc:1408
-#: Merge.rc:1413
+#: Merge.rc:1374
+#: Merge.rc:1379
+#: Merge.rc:1384
+#: Merge.rc:1389
+#: Merge.rc:1394
+#: Merge.rc:1399
+#: Merge.rc:1404
+#: Merge.rc:1409
+#: Merge.rc:1414
#, c-format
msgid "Bold"
msgstr "\xB8\xED\xF4\xEF\xED\xE1"
-#: Merge.rc:1421
+#: Merge.rc:1422
#, c-format
msgid "Folder Compare Report"
msgstr "\xC1\xED\xE1\xF6\xEF\xF1\xDC \xD3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xF2 \xD6\xE1\xEA\xDD\xEB\xF9\xED"
-#: Merge.rc:1424
+#: Merge.rc:1425
#, c-format
msgid "Report &File:"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF \xC1\xED\xE1&\xF6\xEF\xF1\xDC\xF2"
-#: Merge.rc:1427
-#: Merge.rc:1601
-#: Merge.rc:1605
-#: Merge.rc:1632
+#: Merge.rc:1428
+#: Merge.rc:1602
+#: Merge.rc:1606
+#: Merge.rc:1633
#, c-format
msgid "Browse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:1428
+#: Merge.rc:1429
#, c-format
msgid "&Style:"
msgstr "&\xD3\xF4\xF5\xEB:"
-#: Merge.rc:1431
+#: Merge.rc:1432
#, c-format
msgid "&Copy to Clipboard"
msgstr "\xC1\xED\xF4\xE9&\xE3\xF1\xE1\xF6\xDE \xF3\xF4\xEF \xD0\xF1\xFC\xF7\xE5\xE9\xF1\xEF"
-#: Merge.rc:1439
+#: Merge.rc:1440
#, c-format
msgid "Shared or Private Filter"
msgstr "\xCA\xEF\xE9\xED\xFC \xDE \xC9\xE4\xE9\xF9\xF4\xE9\xEA\xFC \xD6\xDF\xEB\xF4\xF1\xEF"
-#: Merge.rc:1442
+#: Merge.rc:1443
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "\xD4\xE9 \xF4\xFD\xF0\xEF \xF6\xDF\xEB\xF4\xF1\xEF\xF5 \xE5\xF0\xE9\xE8\xF5\xEC\xE5\xDF\xF4\xE5 \xED\xE1 \xE4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDE\xF3\xE5\xF4\xE5;"
-#: Merge.rc:1444
+#: Merge.rc:1445
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "\xCA\xEF\xE9\xED\xFC \xD6\xDF\xEB\xF4\xF1\xEF (\xE3\xE9\xE1 \xFC\xEB\xEF\xF5\xF2 \xF4\xEF\xF5\xF2 \xF7\xF1\xDE\xF3\xF4\xE5\xF2 \xE1\xF5\xF4\xEF\xFD \xF4\xEF\xF5 \xF3\xF5\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2)"
-#: Merge.rc:1446
+#: Merge.rc:1447
#, c-format
msgid "Private Filter (only for current user)"
msgstr "\xC9\xE4\xE9\xF9\xF4\xE9\xEA\xFC \xD6\xDF\xEB\xF4\xF1\xEF (\xEC\xFC\xED\xEF \xE3\xE9\xE1 \xF4\xEF\xED \xF0\xE1\xF1\xFC\xED\xF4\xE1 \xF7\xF1\xDE\xF3\xF4\xE7)"
-#: Merge.rc:1454
-#: Merge.rc:1937
+#: Merge.rc:1455
+#: Merge.rc:1938
#, c-format
msgid "Archive Support"
msgstr "\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xD3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED"
-#: Merge.rc:1457
+#: Merge.rc:1458
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xF3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xE1\xF0\xE1\xE9\xF4\xE5\xDF \xE5\xE3\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xE1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xEF\xF2 7-Zip:"
-#: Merge.rc:1459
+#: Merge.rc:1460
#, c-format
msgid "Download 7-zip Plugin"
msgstr "\xCC\xE5\xF4\xE1\xF6\xDD\xF1\xE1\xF4\xE5 \xF4\xEF \xA2\xF1\xE8\xF1\xF9\xEC\xE1 7-zip"
-#: Merge.rc:1460
+#: Merge.rc:1461
#, c-format
msgid "&Enable archive file support"
msgstr "&\xC5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xF5\xF0\xEF\xF3\xF4\xE7\xF1\xDF\xEE\xE5\xF9\xF2 \xF3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED"
-#: Merge.rc:1462
+#: Merge.rc:1463
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "\xD7\xF1\xDE\xF3\xE7 &\xE1\xF5\xF4\xEF\xED\xFC\xEC\xEF\xF5 7-Zip \xE5\xDC\xED \xE5\xDF\xED\xE1\xE9 \xE4\xE9\xE1\xE8\xDD\xF3\xE9\xEC\xEF"
-#: Merge.rc:1465
+#: Merge.rc:1466
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "\xD7\xF1\xDE\xF3\xE7 &\xF4\xEF\xF0\xE9\xEA\xEF\xFD 7-Zip \xE1\xF0\xFC \xF4\xEF \xF6\xDC\xEA\xE5\xEB\xEF \xF4\xEF\xF5 WinMerge"
-#: Merge.rc:1467
+#: Merge.rc:1468
#, c-format
msgid "&Detect archive type from file signature"
msgstr "\xC1\xED\xDF&\xF7\xED\xE5\xF5\xF3\xE7 \xF4\xFD\xF0\xEF\xF5 \xF3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xEF\xF5 \xE1\xF1\xF7\xE5\xDF\xEF\xF5 \xE1\xF0\xFC \xF4\xE7\xED \xF5\xF0\xEF\xE3\xF1\xE1\xF6\xDE \xF4\xEF\xF5"
-#: Merge.rc:1475
+#: Merge.rc:1476
#, c-format
msgid "Compare Statistics"
msgstr "\xD3\xF4\xE1\xF4\xE9\xF3\xF4\xE9\xEA\xDC \xD3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xED"
-#: Merge.rc:1478
+#: Merge.rc:1479
#, c-format
msgid "Folders:"
msgstr "\xD6\xDC\xEA\xE5\xEB\xEF\xE9:"
-#: Merge.rc:1479
+#: Merge.rc:1480
#, c-format
msgid "Files:"
msgstr "\xC1\xF1\xF7\xE5\xDF\xE1:"
-#: Merge.rc:1480
-#: Merge.rc:2316
+#: Merge.rc:1481
+#: Merge.rc:2319
#, c-format
msgid "Different"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xE5\xF4\xE9\xEA\xDC"
-#: Merge.rc:1481
+#: Merge.rc:1482
#, c-format
msgid "Text:"
msgstr "\xCA\xE5\xDF\xEC\xE5\xED\xEF:"
-#: Merge.rc:1484
-#: Merge.rc:1503
+#: Merge.rc:1485
+#: Merge.rc:1504
#, c-format
msgid "Binary:"
msgstr "\xC4\xF5\xE1\xE4\xE9\xEA\xDC:"
-#: Merge.rc:1487
+#: Merge.rc:1488
#, c-format
msgid "Unique"
msgstr "\xCF\xF1\xF6\xE1\xED\xDC"
-#: Merge.rc:1488
+#: Merge.rc:1489
#, c-format
msgid "Left:"
msgstr "\xC1\xF1\xE9\xF3\xF4\xE5\xF1\xDC:"
-#: Merge.rc:1493
+#: Merge.rc:1494
#, c-format
msgid "Right:"
msgstr "\xC4\xE5\xEE\xE9\xDC:"
-#: Merge.rc:1498
-#: Merge.rc:2310
+#: Merge.rc:1499
+#: Merge.rc:2313
#, c-format
msgid "Identical"
msgstr "\xD0\xE1\xED\xEF\xEC\xEF\xE9\xFC\xF4\xF5\xF0\xE1"
-#: Merge.rc:1507
+#: Merge.rc:1508
#, c-format
msgid "Total:"
msgstr "\xD3\xFD\xED\xEF\xEB\xEF:"
-#: Merge.rc:1512
+#: Merge.rc:1513
#, c-format
msgid "Close"
msgstr "\xCA\xEB\xE5\xDF\xF3\xE9\xEC\xEF"
-#: Merge.rc:1521
+#: Merge.rc:1522
#, c-format
msgid "Affects"
msgstr "\xC5\xF0\xE7\xF1\xE5\xDC\xE6\xE5\xE9"
-#: Merge.rc:1524
-#: Merge.rc:1527
+#: Merge.rc:1525
+#: Merge.rc:1528
#, c-format
msgid "(Affects)"
msgstr "(\xC5\xF0\xE7\xF1\xE5\xDC\xE6\xE5\xE9)"
-#: Merge.rc:1528
+#: Merge.rc:1529
#, c-format
msgid "Select Codepage for"
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDE \xCA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1\xF2 \xE3\xE9\xE1"
-#: Merge.rc:1529
+#: Merge.rc:1530
#, c-format
msgid "&File Loading:"
msgstr "\xC1\xED\xDC&\xE3\xED\xF9\xF3\xE7 \xC1\xF1\xF7\xE5\xDF\xEF\xF5:"
-#: Merge.rc:1531
-#: Merge.rc:1534
+#: Merge.rc:1532
+#: Merge.rc:1535
#, c-format
msgid "..."
msgstr ""
-#: Merge.rc:1532
+#: Merge.rc:1533
#, c-format
msgid "File &Saving:"
msgstr "\xC1\xF0\xEF&\xE8\xDE\xEA. \xC1\xF1\xF7\xE5\xDF\xEF\xF5:"
-#: Merge.rc:1535
+#: Merge.rc:1536
#, c-format
msgid "&Use same codepage for both"
msgstr "\xD7\xF1\xDE\xF3\xE7 \xE9\xE4\xDF\xE1\xF2 \xEA\xF9\xE4\xE9\xEA\xEF\xF3\xE5\xEB\xDF\xE4\xE1\xF2 \xE3\xE9\xE1 \xE1\xEC\xF6\xFC\xF4\xE5\xF1\xE1"
-#: Merge.rc:1538
+#: Merge.rc:1539
#, c-format
msgid "&Apply"
msgstr "\xC5&\xF6\xE1\xF1\xEC\xEF\xE3\xDE"
-#: Merge.rc:1539
-#: Merge.rc:1903
+#: Merge.rc:1540
+#: Merge.rc:1904
#, c-format
msgid "&Cancel"
msgstr "\xA2&\xEA\xF5\xF1\xEF"
-#: Merge.rc:1544
+#: Merge.rc:1545
#, c-format
msgid "Test Filter"
msgstr "\xC4\xEF\xEA\xE9\xEC\xDE \xD6\xDF\xEB\xF4\xF1\xEF\xF5"
-#: Merge.rc:1547
+#: Merge.rc:1548
#, c-format
msgid "Testing filter ..."
msgstr "\xC4\xEF\xEA\xE9\xEC\xDE \xD6\xDF\xEB\xF4\xF1\xEF\xF5..."
-#: Merge.rc:1549
+#: Merge.rc:1550
#, c-format
msgid "&Enter text to test:"
msgstr "&\xC5\xE9\xF3\xE1\xE3\xF9\xE3\xDE \xEA\xE5\xE9\xEC\xDD\xED\xEF\xF5 \xE3\xE9\xE1 \xE4\xEF\xEA\xE9\xEC\xDE:"
-#: Merge.rc:1551
+#: Merge.rc:1552
#, c-format
msgid "&Folder Name"
msgstr "\xBC\xED\xEF\xEC\xE1 &\xD6\xE1\xEA\xDD\xEB\xEF\xF5"
-#: Merge.rc:1553
+#: Merge.rc:1554
#, c-format
msgid "Result:"
msgstr "\xC1\xF0\xEF\xF4\xDD\xEB\xE5\xF3\xEC\xE1:"
-#: Merge.rc:1557
+#: Merge.rc:1558
#, c-format
msgid "&Test"
msgstr "&\xC4\xEF\xEA\xE9\xEC\xDE"
-#: Merge.rc:1558
+#: Merge.rc:1559
#, c-format
msgid "&Close"
msgstr "\xCA&\xEB\xE5\xDF\xF3\xE9\xEC\xEF"
-#: Merge.rc:1566
+#: Merge.rc:1567
#, c-format
msgid "&Use customized text colors"
msgstr "\xD7\xF1\xDE\xF3\xE7 \xF0\xF1\xEF&\xF4\xE9\xEC\xF9\xEC\xDD\xED\xF9\xED \xF7\xF1\xF9\xEC\xE1\xF4\xE9\xF3\xEC\xFE\xED \xEA\xE5\xE9\xEC\xDD\xED\xEF\xF5"
-#: Merge.rc:1569
+#: Merge.rc:1570
#, c-format
msgid "Custom text colors"
msgstr "\xD0\xF1\xEF\xF4\xE9\xEC\xFE\xEC\xE5\xED\xEF\xE9 \xF7\xF1\xF9\xEC\xE1\xF4\xE9\xF3\xEC\xEF\xDF \xEA\xE5\xE9\xEC\xDD\xED\xEF\xF5"
-#: Merge.rc:1571
+#: Merge.rc:1572
#, c-format
msgid "Whitespace:"
msgstr "\xD7\xE1\xF1\xE1\xEA\xF4\xDE\xF1\xE5\xF2 \xC4\xE9\xE1\xF3\xF4\xDE\xEC\xE1\xF4\xEF\xF2:"
-#: Merge.rc:1572
+#: Merge.rc:1573
#, c-format
msgid "Regular text:"
msgstr "\xC1\xF0\xEB\xFC \xEA\xE5\xDF\xEC\xE5\xED\xEF:"
-#: Merge.rc:1573
+#: Merge.rc:1574
#, c-format
msgid "Selection:"
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDE:"
-#: Merge.rc:1596
+#: Merge.rc:1597
#, c-format
msgid "Paths"
msgstr "\xC4\xE9\xE1\xE4\xF1\xEF\xEC\xDD\xF2"
-#: Merge.rc:1602
+#: Merge.rc:1603
#, c-format
msgid "R&ead-only"
msgstr "\xCC\xFC\xED\xEF \xE3\xE9\xE1 \xC1\xED\xDC&\xE3\xED\xF9\xF3\xE7"
-#: Merge.rc:1606
+#: Merge.rc:1607
#, c-format
msgid "Re&ad-only"
msgstr "\xCC\xFC\xED\xEF \xE3\xE9\xE1 \xC1\xED\xDC&\xE3\xED\xF9\xF3\xE7"
-#: Merge.rc:1612
+#: Merge.rc:1613
#, c-format
msgid "Open..."
msgstr "\xA2\xED&\xEF\xE9\xE3\xEC\xE1"
-#: Merge.rc:1613
+#: Merge.rc:1614
#, c-format
msgid "Save..."
msgstr "\xC1\xF0\xEF\xE8\xDE\xEA\xE5\xF5\xF3\xE7..."
-#: Merge.rc:1618
-#: Merge.rc:1938
+#: Merge.rc:1619
+#: Merge.rc:1939
#, c-format
msgid "Backup Files"
msgstr "\xC5\xF6\xE5\xE4\xF1\xE9\xEA\xDC \xC1\xF1\xF7\xE5\xDF\xE1"
-#: Merge.rc:1621
+#: Merge.rc:1622
#, c-format
msgid "Create backup files in:"
msgstr "\xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDF\xE1 \xE5\xF6\xE5\xE4\xF1\xE9\xEA\xFE\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED \xE5\xED\xFE \xE3\xDF\xED\xE5\xF4\xE1\xE9:"
-#: Merge.rc:1626
+#: Merge.rc:1627
#, c-format
msgid "Create backup files into:"
msgstr "\xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDF\xE1 \xE5\xF6\xE5\xE4\xF1\xE9\xEA\xFE\xED \xE1\xF1\xF7\xE5\xDF\xF9\xED \xE5\xED\xF4\xFC\xF2:"
-#: Merge.rc:1627
+#: Merge.rc:1628
#, c-format
msgid "&Original file's folder"
msgstr "\xC1\xF1&\xF7\xE9\xEA\xEF\xFD \xF6\xE1\xEA\xDD\xEB\xEF\xF5 \xE1\xF1\xF7\xE5\xDF\xEF\xF5"
-#: Merge.rc:1629
+#: Merge.rc:1630
#, c-format
msgid "&Global backup folder:"
msgstr "&\xCA\xE1\xE8\xEF\xEB\xE9\xEA\xEF\xFD \xF6\xE1\xEA\xDD\xEB\xEF\xF5 \xE5\xF6\xE5\xE4\xF1\xE5\xE9\xFE\xED:"
-#: Merge.rc:1633
+#: Merge.rc:1634
#, c-format
msgid "Backup filename:"
msgstr "\xBC\xED\xEF\xEC\xE1 \xE5\xF6\xE5\xE4\xF1\xE9\xEA\xEF\xFD \xE1\xF1\xF7\xE5\xDF\xEF\xF5:"
-#: Merge.rc:1634
+#: Merge.rc:1635
#, c-format
msgid "&Append .bak -extension"
msgstr "\xD0\xF1\xEF\xF3&\xE8\xDE\xEA\xE7 \xE5\xF0\xE5\xEA\xF4\xDC\xF3\xE5\xF9\xF2 .bak"
-#: Merge.rc:1636
+#: Merge.rc:1637
#, c-format
msgid "A&ppend timestamp"
msgstr "\xD0\xF1\xEF\xF3\xE8\xDE\xEA\xE7 &\xE7\xEC\xE5\xF1\xEF\xEC\xE7\xED\xDF\xE1\xF2 \xEA\xB4 \xFE\xF1\xE1\xF2"
-#: Merge.rc:1643
-#: Merge.rc:2225
+#: Merge.rc:1644
+#: Merge.rc:2228
#, c-format
msgid "Confirm Copy"
msgstr "\xC5\xF0\xE9\xE2\xE5\xE2\xE1\xDF\xF9\xF3\xE7 \xC1\xED\xF4\xE9\xE3\xF1\xE1\xF6\xDE\xF2"
-#: Merge.rc:1647
+#: Merge.rc:1648
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "\xC5\xDF\xF3\xE8\xE5 \xE2\xDD\xE2\xE1\xE9\xEF\xE9 \xFC\xF4\xE9 \xE5\xF0\xE9\xE8\xF5\xEC\xE5\xDF\xF4\xE5 \xED\xE1 \xE1\xED\xF4\xE9\xE3\xF1\xDC\xF8\xE5\xF4\xE5 XXX \xE1\xED\xF4\xE9\xEA\xE5\xDF\xEC\xE5\xED\xE1;"
-#: Merge.rc:1649
+#: Merge.rc:1650
#, c-format
msgid "From left"
msgstr "\xC5\xEE \xE1\xF1\xE9\xF3\xF4\xE5\xF1\xFE\xED"
-#: Merge.rc:1652
+#: Merge.rc:1653
#, c-format
msgid "To right"
msgstr "\xD0\xF1\xEF\xF2 \xF4\xE1 \xE4\xE5\xEE\xE9\xDC"
-#: Merge.rc:1655
+#: Merge.rc:1656
#, c-format
msgid "Yes"
msgstr "\xCD\xE1\xE9"
-#: Merge.rc:1656
+#: Merge.rc:1657
#, c-...
[truncated message content] |
|
From: <ki...@us...> - 2008-08-21 15:23:00
|
Revision: 5842
http://winmerge.svn.sourceforge.net/winmerge/?rev=5842&view=rev
Author: kimmov
Date: 2008-08-21 15:22:57 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
PATCH: [ 2056741 ] ignore EOL dialog fix
Submitted by jwdevel
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Src/Common/MessageBoxDialog.cpp
trunk/Src/Common/MessageBoxDialog.h
trunk/Src/MergeDoc.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-21 13:45:52 UTC (rev 5841)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-21 15:22:57 UTC (rev 5842)
@@ -14,6 +14,8 @@
Bugfix: Lost focus after folder compare operations (#2046002)
Bugfix: Some files had folder icons when aborting folder compare (#2018836)
BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858)
+ BugFix: Could not reset EOL ignore after selecting it from query
+ dialog (#2056741)
Translation updates:
- Brazilian (#2059836)
- German (#2045666)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2008-08-21 13:45:52 UTC (rev 5841)
+++ trunk/Docs/Users/Contributors.txt 2008-08-21 15:22:57 UTC (rev 5842)
@@ -134,6 +134,7 @@
* Marvin Gouw
* Robert Grange
* Jan Hryz
+* jwdevel
* Ed_K
* Alberto Kalb
* Robert Knienider
Modified: trunk/Src/Common/MessageBoxDialog.cpp
===================================================================
--- trunk/Src/Common/MessageBoxDialog.cpp 2008-08-21 13:45:52 UTC (rev 5841)
+++ trunk/Src/Common/MessageBoxDialog.cpp 2008-08-21 15:22:57 UTC (rev 5842)
@@ -402,6 +402,9 @@
// Check whether a result was retrieved.
if ( nFormerResult != (-1) )
{
+ if ( ( m_nStyle & MB_IGNORE_IF_SILENCED ) )
+ return IDIGNORE;
+
// Return the former result without displaying the dialog.
return nFormerResult;
}
Modified: trunk/Src/Common/MessageBoxDialog.h
===================================================================
--- trunk/Src/Common/MessageBoxDialog.h 2008-08-21 13:45:52 UTC (rev 5841)
+++ trunk/Src/Common/MessageBoxDialog.h 2008-08-21 15:22:57 UTC (rev 5842)
@@ -48,8 +48,9 @@
#define MB_DONT_ASK_AGAIN 0x02000000L // Additional style.
#define MB_YES_TO_ALL 0x04000000L // Additional style.
#define MB_NO_TO_ALL 0x08000000L // Additional style.
+#define MB_IGNORE_IF_SILENCED 0x10000000L // Additional style.
-#define MB_DEFAULT_CHECKED 0x10000000L // Additional style.
+#define MB_DEFAULT_CHECKED 0x10000000L // Additional style.
#define MB_RIGHT_ALIGN 0x20000000L // Additional style.
#define MB_NO_SOUND 0x40000000L // Additional style.
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-08-21 13:45:52 UTC (rev 5841)
+++ trunk/Src/MergeDoc.cpp 2008-08-21 15:22:57 UTC (rev 5842)
@@ -2202,7 +2202,7 @@
// All lines will differ, that is not very interesting and probably not wanted.
// Propose to turn off the option 'sensitive to EOL'
String s = theApp.LoadString(IDS_SUGGEST_IGNOREEOL);
- if (AfxMessageBox(s.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES)
+ if (AfxMessageBox(s.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN | MB_IGNORE_IF_SILENCED, IDS_SUGGEST_IGNOREEOL) == IDYES)
{
diffOptions.bIgnoreEol = TRUE;
m_diffWrapper.SetOptions(&diffOptions);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-22 17:57:54
|
Revision: 5849
http://winmerge.svn.sourceforge.net/winmerge/?rev=5849&view=rev
Author: kimmov
Date: 2008-08-22 17:57:48 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
BUG: [ 2051069 ] clearcase checkin without german resources
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/CCPrompt.cpp
trunk/Src/CCPrompt.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-21 16:56:38 UTC (rev 5848)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-22 17:57:48 UTC (rev 5849)
@@ -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.11.1.5
+ BugFix: ClearCase checkout/commit dialog translation error (#2051069)
+
WinMerge 2.11.1.4 - 2008-08-21 (r5846)
Binary file edit/compare (#2036603)
Add wait cursor for undo and redo (#2039228)
Modified: trunk/Src/CCPrompt.cpp
===================================================================
--- trunk/Src/CCPrompt.cpp 2008-08-21 16:56:38 UTC (rev 5848)
+++ trunk/Src/CCPrompt.cpp 2008-08-22 17:57:48 UTC (rev 5849)
@@ -1,5 +1,26 @@
-// CCPrompt.cpp : implementation file
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file CCPrompt.cpp
+ *
+ * @brief Implementation file for ClearCase dialog
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
#include "stdafx.h"
#include "merge.h"
@@ -11,10 +32,6 @@
static char THIS_FILE[] = __FILE__;
#endif
-/////////////////////////////////////////////////////////////////////////////
-// CCCPrompt dialog
-
-
CCCPrompt::CCCPrompt(CWnd* pParent /*=NULL*/)
: CDialog(CCCPrompt::IDD, pParent)
, m_bMultiCheckouts(FALSE)
@@ -22,7 +39,6 @@
{
}
-
void CCCPrompt::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
@@ -33,18 +49,26 @@
//}}AFX_DATA_MAP
}
-
BEGIN_MESSAGE_MAP(CCCPrompt, CDialog)
//{{AFX_MSG_MAP(CCCPrompt)
ON_BN_CLICKED(IDC_SAVE_AS, OnSaveas)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
-/////////////////////////////////////////////////////////////////////////////
-// CCCPrompt message handlers
+/**
+ * @brief Handler for WM_INITDIALOG; conventional location to initialize
+ * controls. At this point dialog and control windows exist.
+ */
+BOOL CCCPrompt::OnInitDialog()
+{
+ theApp.TranslateDialog(m_hWnd);
+ CDialog::OnInitDialog();
+ return TRUE; // return TRUE unless you set the focus to a control
+ // EXCEPTION: OCX Property Pages should return FALSE
+}
+
void CCCPrompt::OnSaveas()
{
EndDialog(IDC_SAVE_AS);
}
-
Modified: trunk/Src/CCPrompt.h
===================================================================
--- trunk/Src/CCPrompt.h 2008-08-21 16:56:38 UTC (rev 5848)
+++ trunk/Src/CCPrompt.h 2008-08-22 17:57:48 UTC (rev 5849)
@@ -1,13 +1,34 @@
-// CCPrompt.h : header file
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file CCPrompt.h
+ *
+ * @brief Declaration file for ClearCase dialog.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
#if !defined(AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_)
#define AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_
-
-/////////////////////////////////////////////////////////////////////////////
-// CCCPrompt dialog
-
+/**
+ * @brief A dialog for ClearCase checkout/checkin.
+ */
class CCCPrompt : public CDialog
{
// Construction
@@ -30,6 +51,7 @@
// Implementation
protected:
+ virtual BOOL OnInitDialog();
// Generated message map functions
//{{AFX_MSG(CCCPrompt)
@@ -46,4 +68,3 @@
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_)
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-24 09:56:42
|
Revision: 5850
http://winmerge.svn.sourceforge.net/winmerge/?rev=5850&view=rev
Author: kimmov
Date: 2008-08-24 09:56:37 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
PATCH: [ 2067785 ] Russian translation update
Submitted by Dmitriy
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Russian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-22 17:57:48 UTC (rev 5849)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-24 09:56:37 UTC (rev 5850)
@@ -5,6 +5,8 @@
WinMerge 2.11.1.5
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
+ Translation updates:
+ - Russian (#2067785)
WinMerge 2.11.1.4 - 2008-08-21 (r5846)
Binary file edit/compare (#2036603)
Modified: trunk/Src/Languages/Russian.po
===================================================================
--- trunk/Src/Languages/Russian.po 2008-08-22 17:57:48 UTC (rev 5849)
+++ trunk/Src/Languages/Russian.po 2008-08-24 09:56:37 UTC (rev 5850)
@@ -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: 2007-09-23 23:22-0000\n"
+"PO-Revision-Date: 2008-08-22 17:56+0300\n"
"Last-Translator: Dmitriy S. Aleshkowskiy <wwarlock at mail.ru>\n"
"Language-Team: Russian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -280,14 +280,14 @@
#: Merge.rc:452
#, c-format
msgid "&Plugins"
-msgstr "&\xCF\xEB\xE0\xE3\xE8\xED\xFB"
+msgstr "&\xC4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:150
#: Merge.rc:271
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&\xD1\xEF\xE8\xF1\xEE\xEA"
#: Merge.rc:152
#: Merge.rc:273
@@ -315,7 +315,7 @@
#: Merge.rc:466
#, c-format
msgid "&Reload plugins"
-msgstr "&\xCF\xE5\xF0\xE5\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE2\xF1\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB"
+msgstr "&\xCF\xE5\xF0\xE5\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE2\xF1\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:159
#: Merge.rc:280
@@ -1101,7 +1101,7 @@
#: Merge.rc:675
#, c-format
msgid "Contributors"
-msgstr "\xC4\xE0\xF0\xE8\xF2\xE5\xEB\xE8"
+msgstr "\xD3\xF7\xE0\xF1\xF2\xED\xE8\xEA\xE8"
#: Merge.rc:682
#, c-format
@@ -2085,14 +2085,14 @@
#: Merge.rc:1300
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "\xD2\xE0\xEA \xE6\xE5 \xF2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xEF\xEB\xE0\xE3\xE8\xED (Merge7z*.dll)"
+msgstr "\xD2\xE0\xEA \xE6\xE5 \xF2\xF0\xE5\xE1\xF3\xE5\xF2\xF1\xFF \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5 (Merge7z*.dll)"
#: Merge.rc:1302
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
-msgstr "\xD0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xF2\xF1\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE 7-Zip"
+msgstr "\xD0\xE5\xEA\xEE\xEC\xE5\xED\xE4\xF3\xE5\xF2\xF1\xFF \xE8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xF3\xEA\xE0\xE7\xE0\xED\xED\xF3\xFE \xE2\xE5\xF0\xF1\xE8\xFE 7-Zip, \xEF\xEE\xEA\xE0 \xF1\xE2\xFF\xE7\xF3\xFE\xF9\xE5\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5 \xE4\xEB\xFF \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xF5 \xE2\xE5\xF0\xF1\xE8\xE9 \xED\xE5 \xF1\xF2\xE0\xED\xE5\xF2 \xE4\xEE\xF1\xF2\xF3\xEF\xED\xEE."
#: Merge.rc:1304
#, c-format
@@ -2105,7 +2105,7 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
-"\xD2\xF0\xE5\xE1\xF3\xE5\xEC\xFB\xE9 \xEF\xEB\xE0\xE3\xE8\xED\n"
+"\xD2\xF0\xE5\xE1\xF3\xE5\xEC\xEE\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5\n"
"(dllbuild %04u)"
#: Merge.rc:1308
@@ -2153,17 +2153,21 @@
#: Merge.rc:1325
#, c-format
msgid "Plugins on path:"
-msgstr "\xC4\xEE\xF1\xF2\xF3\xEF\xED\xFB\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB:"
+msgstr "\xC4\xEE\xF1\xF2\xF3\xEF\xED\xFB\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF:"
#: Merge.rc:1326
#, 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\xFB\xE2\xE0\xF2\xFC \xE1\xEE\xEB\xFC\xF8\xE5 \xFD\xF2\xEE \xF1\xEE\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xFB \xE2\xF1\xE5\xE3\xE4\xE0 \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE5\xF0\xED\xF3\xF2\xFC \xE5\xE3\xEE \xF7\xE5\xF0\xE5\xE7 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9\xFC)"
+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\xFB\xE2\xE0\xF2\xFC \xE1\xEE\xEB\xFC\xF8\xE5 \xFD\xF2\xEE \xF1\xEE\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n"
+"(\xC2\xFB \xE2\xF1\xE5\xE3\xE4\xE0 \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE5\xF0\xED\xF3\xF2\xFC \xE5\xE3\xEE \xF7\xE5\xF0\xE5\xE7 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9\xFC)"
#: Merge.rc:1330
#, c-format
msgid "Plugin Download"
-msgstr "\xD1\xEA\xE0\xF7\xE0\xF2\xFC \xEF\xEB\xE0\xE3\xE8\xED\xFB"
+msgstr "\xC7\xE0\xE3\xF0\xF3\xE7\xEA\xE0 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:1339
#, c-format
@@ -2300,12 +2304,12 @@
#: Merge.rc:1458
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xF2\xF0\xE5\xE1\xF3\xE5\xF2 \xED\xE0\xEB\xE8\xF7\xE8\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xE0 7-Zip:"
+msgstr "\xCF\xEE\xE4\xE4\xE5\xF0\xE6\xEA\xE0 \xE0\xF0\xF5\xE8\xE2\xEE\xE2 \xF2\xF0\xE5\xE1\xF3\xE5\xF2 \xED\xE0\xEB\xE8\xF7\xE8\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF 7-Zip:"
#: Merge.rc:1460
#, c-format
msgid "Download 7-zip Plugin"
-msgstr "\xD1\xEA\xE0\xF7\xE0\xF2\xFC \xEF\xEB\xE0\xE3\xE8\xED 7-zip"
+msgstr "\xD1\xEA\xE0\xF7\xE0\xF2\xFC \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5 7-zip"
#: Merge.rc:1461
#, c-format
@@ -2598,12 +2602,12 @@
#: Merge.rc:1663
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "\xC4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:1666
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#. StringFileInfo.Block
#: Merge.rc:1696
@@ -2989,8 +2993,12 @@
#: Merge.rc:1836
#, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8 \xE8\xE7\xEC\xE5\xED\xFF\xF2\xFC \xF0\xE0\xE7\xEC\xE5\xF0 \xEF\xE0\xED\xE5\xEB\xE5\xE9\n\xC7\xE0\xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xED\xE5\xEB\xE8"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8 \xE8\xE7\xEC\xE5\xED\xFF\xF2\xFC \xF0\xE0\xE7\xEC\xE5\xF0 \xEF\xE0\xED\xE5\xEB\xE5\xE9\n"
+"\xC7\xE0\xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xED\xE5\xEB\xE8"
#: Merge.rc:1842
#, c-format
@@ -3053,13 +3061,41 @@
#: Merge.rc:1868
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xD4\xE0\xE9\xEB\xEE\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 \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xD4\xE0\xE9\xEB\xEE\xE2"
#: Merge.rc:1869
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xCF\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 \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xCF\xE0\xEF\xEE\xEA"
#: Merge.rc:1876
#, c-format
@@ -3079,8 +3115,12 @@
#: Merge.rc:1896
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA\xE8:\n\xC4\xE8\xED \xC3\xF0\xE8\xEC\xEC (Dean Grimm), \xCA\xF0\xE8\xF1\xF2\xE8\xE0\xED \xCB\xE8\xF1\xF2 (Christian List), \xCA\xE8\xEC\xEC\xEE \xC2\xE0\xF0\xE8\xF1 (Kimmo Varis), \xC9\xEE\xF5\xE5\xED \xD2\xF3\xF5\xF2 (Jochen Tucht), \xD2\xE8\xEC \xC3\xE5\xF0\xF3\xED\xE4\xF2 (Tim Gerundt), \xD2\xE0\xEA\xE0\xF8\xE8 \xD1\xE0\xE2\xE0\xED\xE0\xEA\xE8 (Takashi Sawanaki), \xC3\xFD\xEB \xD5\xE0\xEC\xEC\xE5\xF0 (Gal Hammer), \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0 \xD1\xEA\xE8\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\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA\xE8:\n"
+"\xC4\xE8\xED \xC3\xF0\xE8\xEC\xEC (Dean Grimm), \xCA\xF0\xE8\xF1\xF2\xE8\xE0\xED \xCB\xE8\xF1\xF2 (Christian List), \xCA\xE8\xEC\xEC\xEE \xC2\xE0\xF0\xE8\xF1 (Kimmo Varis), \xC9\xEE\xF5\xE5\xED \xD2\xF3\xF5\xF2 (Jochen Tucht), \xD2\xE8\xEC \xC3\xE5\xF0\xF3\xED\xE4\xF2 (Tim Gerundt), \xD2\xE0\xEA\xE0\xF8\xE8 \xD1\xE0\xE2\xE0\xED\xE0\xEA\xE8 (Takashi Sawanaki), \xC3\xFD\xEB \xD5\xE0\xEC\xEC\xE5\xF0 (Gal Hammer), \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0 \xD1\xEA\xE8\xED\xED\xE5\xF0 (Alexander Skinner)"
#: Merge.rc:1897
#, c-format
@@ -3449,8 +3489,13 @@
#: Merge.rc:2045
#, 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 ""
+"\xD4\xE8\xEB\xFC\xF2\xF0\xFB \xE1\xFB\xEB\xE8 \xEE\xE1\xED\xEE\xE2\xEB\xE5\xED\xFB. \xD5\xEE\xF2\xE8\xF2\xE5 \xEE\xE1\xED\xEE\xE2\xE8\xF2\xFC \xE2\xF1\xE5 \xEE\xF2\xEA\xF0\xFB\xF2\xFB\xE5 \xF1\xF0\xE0\xE2\xED\xE8\xE2\xE0\xE5\xEC\xFB\xE5 \xEF\xE0\xEF\xEA\xE8?\n"
+"\xC5\xF1\xEB\xE8 \xED\xE5 \xF5\xEE\xF2\xE8\xF2\xE5 \xEE\xE1\xED\xEE\xE2\xEB\xFF\xF2\xFC \xF1\xE5\xE9\xF7\xE0\xF1, \xF2\xEE \xEC\xEE\xE6\xE5\xF2\xE5 \xED\xE0\xE6\xE0\xF2\xFC \"\xCD\xE5\xF2\" \xE8 \xEE\xE1\xED\xEE\xE2\xE8\xF2\xFC \xEF\xEE\xE7\xE6\xE5."
#: Merge.rc:2051
#, c-format
@@ -3545,12 +3590,12 @@
#: Merge.rc:2079
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xCE\xF2\xEC\xE5\xED\xE0 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE9 \xEE\xEF\xE5\xF0\xE0\xF6\xE8\xE8"
#: Merge.rc:2080
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "\xCF\xEE\xE2\xF2\xEE\xF0\xE5\xED\xE8\xE5 \xEF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE5\xE9 \xEE\xEF\xE5\xF0\xE0\xF6\xE8\xE8"
#: Merge.rc:2086
#, c-format
@@ -3673,8 +3718,14 @@
#: Merge.rc:2123
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "\xD4\xE0\xE9\xEB\n%1\n\xED\xE5 \xFF\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF4\xE0\xE9\xEB\xEE\xEC \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xEE\xE2"
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"\xD4\xE0\xE9\xEB\n"
+"%1\n"
+"\xED\xE5 \xFF\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF4\xE0\xE9\xEB\xEE\xEC \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xEE\xE2"
#: Merge.rc:2129
#, c-format
@@ -3740,7 +3791,7 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"\xCF\xEB\xE0\xE3\xE8\xED '%2' \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE7\xE0\xEF\xE0\xEA\xEE\xE2\xE0\xF2\xFC \xE2\xE0\xF8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xEE\xE1\xF0\xE0\xF2\xED\xEE \xE2 \xF4\xE0\xE9\xEB \xF1\xEB\xE5\xE2\xE0 '%1'.\n"
+"\xC4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5 '%2' \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE7\xE0\xEF\xE0\xEA\xEE\xE2\xE0\xF2\xFC \xE2\xE0\xF8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xEE\xE1\xF0\xE0\xF2\xED\xEE \xE2 \xF4\xE0\xE9\xEB \xF1\xEB\xE5\xE2\xE0 '%1'.\n"
"\n"
"\xCE\xF0\xE8\xE3\xE8\xED\xE0\xEB \xEE\xF1\xF2\xE0\xED\xE5\xF2\xF1\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xED\xFB\xEC.\n"
"\n"
@@ -3755,7 +3806,7 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"\xCF\xEB\xE0\xE3\xE8\xED '%2' \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE7\xE0\xEF\xE0\xEA\xEE\xE2\xE0\xF2\xFC \xE2\xE0\xF8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xEE\xE1\xF0\xE0\xF2\xED\xEE \xE2 \xF4\xE0\xE9\xEB \xF1\xEF\xF0\xE0\xE2\xE0 '%1'.\n"
+"\xC4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5 '%2' \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE7\xE0\xEF\xE0\xEA\xEE\xE2\xE0\xF2\xFC \xE2\xE0\xF8\xE8 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF \xEE\xE1\xF0\xE0\xF2\xED\xEE \xE2 \xF4\xE0\xE9\xEB \xF1\xEF\xF0\xE0\xE2\xE0 '%1'.\n"
"\n"
"\xCE\xF0\xE8\xE3\xE8\xED\xE0\xEB \xEE\xF1\xF2\xE0\xED\xE5\xF2\xF1\xFF \xED\xE5 \xE8\xE7\xEC\xE5\xED\xE5\xED\xED\xFB\xEC.\n"
"\n"
@@ -4079,17 +4130,17 @@
#: Merge.rc:2226
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\xD3\xE2\xE5\xF0\xE5\xED\xFB, \xF7\xF2\xEE \xF5\xEE\xF2\xE8\xF2\xE5 \xEF\xE5\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xFC:"
#: Merge.rc:2227
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "\xD3\xE2\xE5\xF0\xE5\xED\xFB, \xF7\xF2\xEE \xF5\xEE\xF2\xE8\xF2\xE5 \xEF\xE5\xF0\xE5\xEC\xE5\xF1\xF2\xE8\xF2\xFC %d \xFD\xEB\xE5\xEC\xE5\xED\xF2\xEE\xE2:"
#: Merge.rc:2229
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "\xCF\xEE\xE4\xF2\xE2\xE5\xF0\xE4\xE8\xF2\xE5 \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xE8\xE5"
#: Merge.rc:2235
#, c-format
@@ -4598,13 +4649,19 @@
#: Merge.rc:2393
#, 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\xF0\xE8\xE7\xED\xE0\xEA\xE8 \xEA\xEE\xED\xF6\xE0 \xF1\xF2\xF0\xEE\xEA\xE8 (EOL) \xF0\xE0\xE7\xED\xFB\xF5 \xF2\xE8\xEF\xEE\xE2 (Windows/Unix/Mac) \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xEC\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0\xEC\xE8 \xEE\xED\xE8 \xE1\xF3\xE4\xF3\xF2 \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xFB \xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xEC\xF3 \xF2\xE8\xEF\xF3.\n \xD5\xEE\xF2\xE8\xF2\xE5 \xE8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8, \xF7\xF2\xEE \xE1\xFB \xF1\xEE\xF5\xF0\xE0\xED\xFF\xF2\xFC EOL \xEA\xE0\xEA \xE5\xF1\xF2\xFC, \xF2\xEE \xE5\xF1\xF2\xFC \xF0\xE0\xE7\xEB\xE8\xF7\xED\xFB\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\xF0\xE8\xE7\xED\xE0\xEA\xE8 \xEA\xEE\xED\xF6\xE0 \xF1\xF2\xF0\xEE\xEA\xE8 (EOL) \xF0\xE0\xE7\xED\xFB\xF5 \xF2\xE8\xEF\xEE\xE2 (Windows/Unix/Mac) \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xE0 '%1'.\n"
+" \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xEC\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0\xEC\xE8 \xEE\xED\xE8 \xE1\xF3\xE4\xF3\xF2 \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xFB \xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xEC\xF3 \xF2\xE8\xEF\xF3.\n"
+" \xD5\xEE\xF2\xE8\xF2\xE5 \xE8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8, \xF7\xF2\xEE \xE1\xFB \xF1\xEE\xF5\xF0\xE0\xED\xFF\xF2\xFC EOL \xEA\xE0\xEA \xE5\xF1\xF2\xFC, \xF2\xEE \xE5\xF1\xF2\xFC \xF0\xE0\xE7\xEB\xE8\xF7\xED\xFB\xEC\xE8?"
#: Merge.rc:2394
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-msgstr "\xCE\xF8\xE8\xE1\xEA\xE0 \xEF\xF0\xE8\xEC\xE5\xED\xE5\xED\xE8\xFF prediffer '%2' \xEA \xF4\xE0\xE9\xEB\xF3 '%1'. \xDD\xF2\xEE\xF2 prediffer \xE4\xE0\xEB\xE5\xE5 \xEF\xF0\xE8\xEC\xE5\xED\xFF\xF2\xFC\xF1\xFF \xED\xE5 \xE1\xF3\xE4\xE5\xF2."
+msgstr "\xCE\xF8\xE8\xE1\xEA\xE0 \xEF\xF0\xE5\xE4\xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xFF \xF4\xE0\xE9\xEB\xE0 '%1' \xF1 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE5\xEC '%2'. \xCF\xF0\xE5\xE4\xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xE4\xE0\xEB\xE5\xE5 \xEF\xF0\xE8\xEC\xE5\xED\xFF\xF2\xFC\xF1\xFF \xED\xE5 \xE1\xF3\xE4\xE5\xF2."
#: Merge.rc:2395
#, c-format
@@ -4618,8 +4675,18 @@
#: Merge.rc:2397
#, 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 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2 \xF2\xEE\xEB\xFC\xEA\xEE \xED\xE0 \xEE\xE4\xED\xEE\xE9 \xF1\xF2\xEE\xF0\xEE\xED\xE5 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE1\xFB\xF2\xFC \xEE\xF2\xEA\xF0\xFB\xF2\xE0.\n\n\xD5\xEE\xF2\xE8\xF2\xE5 \xF1\xEE\xE7\xE4\xE0\xF2\xFC \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xF3\xFE \xEF\xE0\xEF\xEA\xF3:\n%1\n\xED\xE0 \xE4\xF0\xF3\xE3\xEE\xE9 \xF1\xF2\xEE\xF0\xEE\xED\xE5 \xE8 \xEE\xE1\xE5 \xEE\xF2\xEA\xF0\xFB\xF2\xFC \xE8\xF5?"
+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 ""
+"\xCF\xE0\xEF\xEA\xE0 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2 \xF2\xEE\xEB\xFC\xEA\xEE \xED\xE0 \xEE\xE4\xED\xEE\xE9 \xF1\xF2\xEE\xF0\xEE\xED\xE5 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE1\xFB\xF2\xFC \xEE\xF2\xEA\xF0\xFB\xF2\xE0.\n"
+"\n"
+"\xD5\xEE\xF2\xE8\xF2\xE5 \xF1\xEE\xE7\xE4\xE0\xF2\xFC \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xF3\xFE \xEF\xE0\xEF\xEA\xF3:\n"
+"%1\n"
+"\xED\xE0 \xE4\xF0\xF3\xE3\xEE\xE9 \xF1\xF2\xEE\xF0\xEE\xED\xE5 \xE8 \xEE\xE1\xE5 \xEE\xF2\xEA\xF0\xFB\xF2\xFC \xE8\xF5?"
#: Merge.rc:2403
#, c-format
@@ -5268,22 +5335,22 @@
#: Merge.rc:2626
#, c-format
msgid "Type"
-msgstr ""
+msgstr "\xD2\xE8\xEF"
#: Merge.rc:2628
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "\xD0\xE0\xF1\xEF\xE0\xEA\xEE\xE2\xF9\xE8\xEA"
#: Merge.rc:2629
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xE4\xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5"
#: Merge.rc:2630
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "\xD0\xE5\xE4\xE0\xEA\xF2\xEE\xF0 \xF1\xEA\xF0\xE8\xEF\xF2\xEE\xE2"
#: Merge.rc:2637
#, c-format
@@ -5308,12 +5375,12 @@
#: Merge.rc:2641
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xF1\xF2\xE0\xF2\xF3\xF1 \"\xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF\" \xEB\xE5\xE2\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xE0/\xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE0"
#: Merge.rc:2642
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "\xC8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xF1\xF2\xE0\xF2\xF3\xF1 \"\xF2\xEE\xEB\xFC\xEA\xEE \xE4\xEB\xFF \xF7\xF2\xE5\xED\xE8\xFF\" \xEF\xF0\xE0\xE2\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xE0/\xEA\xE0\xF2\xE0\xEB\xEE\xE3\xE0"
#: Merge.rc:2643
#, c-format
@@ -5509,13 +5576,21 @@
#: Merge.rc:2686
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xFF\xE7\xFB\xEA \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xE0 \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF\n\xDF\xE7\xFB\xEA"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xFF\xE7\xFB\xEA \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xE0 \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF\n"
+"\xDF\xE7\xFB\xEA"
#: Merge.rc:2687
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2\xED\xF3\xF2\xF0\xE8 \xF1\xF2\xF0\xEE\xEA \xE4\xF0\xF3\xE3\xE8\xEC\xE8 \xF6\xE2\xE5\xF2\xE0\xEC\xE8\n\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2 \xF1\xF2\xF0\xEE\xEA\xE5"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2\xED\xF3\xF2\xF0\xE8 \xF1\xF2\xF0\xEE\xEA \xE4\xF0\xF3\xE3\xE8\xEC\xE8 \xF6\xE2\xE5\xF2\xE0\xEC\xE8\n"
+"\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2 \xF1\xF2\xF0\xEE\xEA\xE5"
#: Merge.rc:2688
#, c-format
@@ -5566,28 +5641,48 @@
#: Merge.rc:2700
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xCF\xF0\xE5\xE4\xFB\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n"
+"\xCF\xF0\xE5\xE4\xFB\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Up)"
#: Merge.rc:2701
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n"
+"\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Down)"
#: Merge.rc:2702
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xE5\xF0\xE2\xEE\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xCF\xE5\xF0\xE2\xEE\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xE5\xF0\xE2\xEE\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n"
+"\xCF\xE5\xF0\xE2\xEE\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Home)"
#: Merge.rc:2703
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF2\xE5\xEA\xF3\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xD2\xE5\xEA\xF3\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF2\xE5\xEA\xF3\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n"
+"\xD2\xE5\xEA\xF3\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Enter)"
#: Merge.rc:2704
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n"
+"\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+End)"
#: Merge.rc:2705
#, c-format
@@ -5676,7 +5771,7 @@
#: Merge.rc:2727
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xF1\xEF\xE8\xF1\xEE\xEA \xE4\xEE\xF1\xF2\xF3\xEF\xED\xFB\xF5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xE9"
#: Merge.rc:2728
#, c-format
@@ -5701,22 +5796,26 @@
#: Merge.rc:2732
#, c-format
msgid "Suggested plugins"
-msgstr "\xD1\xEE\xE2\xE5\xF2\xF3\xE5\xEC\xFB\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB"
+msgstr "\xD1\xEE\xE2\xE5\xF2\xF3\xE5\xEC\xFB\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:2733
#, c-format
msgid "Other plugins"
-msgstr "\xC4\xF0\xF3\xE3\xE8\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB"
+msgstr "\xC4\xF0\xF3\xE3\xE8\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:2734
#, c-format
msgid "Unload all plugins and reload them (for developers)"
-msgstr "\xC2\xFB\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE2\xF1\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB \xE8 \xE7\xE0\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE8\xF5 \xF1\xED\xEE\xE2\xE0 (\xE4\xEB\xFF \xF0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA\xEE\xE2)"
+msgstr "\xC2\xFB\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE2\xF1\xE5 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF \xE8 \xE7\xE0\xE3\xF0\xF3\xE7\xE8\xF2\xFC \xE8\xF5 \xF1\xED\xEE\xE2\xE0 (\xE4\xEB\xFF \xF0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA\xEE\xE2)"
#: Merge.rc:2740
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xF3\xE5\xF2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xE2\xE8\xE4\xE8\xEC\xFB\xE9 \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xF4\xE0\xE9\xEB"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xF3\xE5\xF2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xE2\xE8\xE4\xE8\xEC\xFB\xE9 \xF4\xE0\xE9\xEB\n"
+"\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2741
#, c-format
@@ -5725,8 +5824,12 @@
#: Merge.rc:2747
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xF1\xEF\xF0\xE0\xE2\xEA\xF3 WinMerge\n\xD1\xEF\xF0\xE0\xE2\xEA\xE0 WinMerge"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xF1\xEF\xF0\xE0\xE2\xEA\xF3 WinMerge\n"
+"\xD1\xEF\xF0\xE0\xE2\xEA\xE0 WinMerge"
#: Merge.rc:2748
#, c-format
@@ -5745,18 +5848,26 @@
#: Merge.rc:2751
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xF1 \xE7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF\xEC\xE8 \xEA \xF0\xE5\xEB\xE8\xE7\xF3\n\xC7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF \xEA \xF0\xE5\xEB\xE8\xE7\xF3"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xF1 \xE7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF\xEC\xE8 \xEA \xF0\xE5\xEB\xE8\xE7\xF3\n"
+"\xC7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF \xEA \xF0\xE5\xEB\xE8\xE7\xF3"
#: Merge.rc:2752
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xF1 \xEF\xE5\xF0\xE5\xE2\xEE\xE4\xE0\xEC\xE8\n\xCF\xE5\xF0\xE5\xE2\xEE\xE4\xFB"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xF1 \xEF\xE5\xF0\xE5\xE2\xEE\xE4\xE0\xEC\xE8\n"
+"\xCF\xE5\xF0\xE5\xE2\xEE\xE4\xFB"
#: Merge.rc:2758
#, c-format
msgid "Plugin Settings"
-msgstr "\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xEF\xEB\xE0\xE3\xE8\xED\xE0"
+msgstr "\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 \xE4\xEE\xEF\xEE\xEB\xED\xE5\xED\xE8\xFF"
#: Merge.rc:2759
#, c-format
@@ -5846,7 +5957,7 @@
#: Merge.rc:2797
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "\xCD\xE5\xF2 \xE2\xFB\xE4\xE5\xEB\xE5\xED\xED\xEE\xE3\xEE"
#: Merge.rc:2798
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-24 15:49:27
|
Revision: 5855
http://winmerge.svn.sourceforge.net/winmerge/?rev=5855&view=rev
Author: kimmov
Date: 2008-08-24 15:49:22 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
PATCH: [ 1979321 ] Plugins: Show processing instructions in XML files
Submitted by Marco De Paoli
Commit actual code changes, previous commit contained only project changes.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Plugins/dlls/DisplayXMLFiles.dll
trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc
trunk/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp
trunk/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h
trunk/Src/ExpatMapLib/expat_maps.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-24 12:05:35 UTC (rev 5854)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-24 15:49:22 UTC (rev 5855)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.11.1.5
+ Plugins: Show processing instructions in XML plugin (#1979321)
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
Translation updates:
- Russian (#2067785)
Modified: trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc
===================================================================
--- trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc 2008-08-24 12:05:35 UTC (rev 5854)
+++ trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc 2008-08-24 15:49:22 UTC (rev 5855)
@@ -54,8 +54,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,1,1,0
+ PRODUCTVERSION 1,1,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -73,7 +73,7 @@
VALUE "Comments", "WinMerge plugin\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "DisplayXMLFiles Module\0"
- VALUE "FileVersion", "1, 1, 0, 0\0"
+ VALUE "FileVersion", "1, 1, 1, 0\0"
VALUE "InternalName", "DisplayXMLFiles\0"
VALUE "LegalCopyright", "Copyright 2003-2008\0"
VALUE "LegalTrademarks", "\0"
@@ -81,7 +81,7 @@
VALUE "OriginalFilename", "DisplayXMLFiles.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "DisplayXMLFiles Module\0"
- VALUE "ProductVersion", "1, 1, 0, 0\0"
+ VALUE "ProductVersion", "1, 1, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: trunk/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp
===================================================================
--- trunk/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp 2008-08-24 12:05:35 UTC (rev 5854)
+++ trunk/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp 2008-08-24 15:49:22 UTC (rev 5855)
@@ -214,12 +214,26 @@
static void XMLCALL ProcessingInstructionHandler(void *userData, const char *target, const char *data)
{
CXMLData *pData = (CXMLData*)userData;
- // Not yet implemented
+
+ // End the previous element if needed
+ if (pData->bNeedsEnding)
+ {
+ fprintf(pData->pOutput,">\n");
+ pData->bNeedsEnding = false;
+ }
+
+ // Indent
+ for (int i = 0; i < pData->iDepth; i++)
+ {
+ fprintf(pData->pOutput,"\t");
+ }
+
+ // Output processing instruction
+ fprintf(pData->pOutput, "<?%s %s?>\n", target, data);
}
static void XMLCALL CommentHandler(void *userData, const char *data)
{
- int i;
CXMLData *pData = (CXMLData*)userData;
// End the previous element if needed
@@ -230,7 +244,7 @@
}
// Indent
- for (i = 0; i < pData->iDepth; i++)
+ for (int i = 0; i < pData->iDepth; i++)
{
fprintf(pData->pOutput,"\t");
}
@@ -285,7 +299,7 @@
XML_SetUserData(parser, &oData);
XML_SetElementHandler(parser, StartElementHandler, EndElementHandler);
XML_SetDefaultHandler(parser, DefaultHandler);
- //XML_SetProcessingInstructionHandler(parser, ProcessingInstructionHandler);
+ XML_SetProcessingInstructionHandler(parser, ProcessingInstructionHandler);
XML_SetCommentHandler(parser, CommentHandler);
XML_SetXmlDeclHandler(parser, XmlDeclHandler);
XML_SetUnknownEncodingHandler(parser, WinMerge_Plug_UnknownEncodingHandler, this);
Modified: trunk/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h
===================================================================
--- trunk/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h 2008-08-24 12:05:35 UTC (rev 5854)
+++ trunk/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h 2008-08-24 15:49:22 UTC (rev 5855)
@@ -89,7 +89,8 @@
for (int i=0; i<(int)cNames; i++)
{
int n = ocslen(rgszNames[i]);
- for (int j=m_nCount-1; j>=0; j--)
+ int j;
+ for (j=m_nCount-1; j>=0; j--)
{
if ((n == m_pMap[j].nLen) &&
(memcmp(m_pMap[j].bstr, rgszNames[i], m_pMap[j].nLen * sizeof(OLECHAR)) == 0))
Modified: trunk/Src/ExpatMapLib/expat_maps.cpp
===================================================================
--- trunk/Src/ExpatMapLib/expat_maps.cpp 2008-08-24 12:05:35 UTC (rev 5854)
+++ trunk/Src/ExpatMapLib/expat_maps.cpp 2008-08-24 15:49:22 UTC (rev 5855)
@@ -137,7 +137,7 @@
}
}
// Lets allow any encoding at all, and provide ISO-8859-1 map
- for (i=0; i<256; ++i)
+ for (int i=0; i<256; ++i)
{
// i->i gives us identity for ASCII, and ISO-8859-1 for remainder
// because Unicode character set is numbered exactly like ISO-8859-1
@@ -158,7 +158,7 @@
info->map[i] = (i<127 ? i : 0);
}
// Populate code bytes as given in our map table
- for (i=0; mapinfo->mapdata[i] != -1; i += 2)
+ for (int i=0; mapinfo->mapdata[i] != -1; i += 2)
{
int src = mapinfo->mapdata[i];
int dest = mapinfo->mapdata[i+1];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-26 17:05:49
|
Revision: 5860
http://winmerge.svn.sourceforge.net/winmerge/?rev=5860&view=rev
Author: kimmov
Date: 2008-08-26 17:05:46 +0000 (Tue, 26 Aug 2008)
Log Message:
-----------
PATCH: [ 2075513 ] A Swedish Swedish.po translation update
Submitted by Hans Eriksson.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Swedish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-25 14:21:53 UTC (rev 5859)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-26 17:05:46 UTC (rev 5860)
@@ -9,6 +9,7 @@
BugFix: Table of Contents in manual (#2071625)
Translation updates:
- Russian (#2067785)
+ - Swedish (#2075513)
WinMerge 2.11.1.4 - 2008-08-21 (r5846)
Binary file edit/compare (#2036603)
Modified: trunk/Src/Languages/Swedish.po
===================================================================
--- trunk/Src/Languages/Swedish.po 2008-08-25 14:21:53 UTC (rev 5859)
+++ trunk/Src/Languages/Swedish.po 2008-08-26 17:05:46 UTC (rev 5860)
@@ -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-08-24 20:00+0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -879,7 +879,7 @@
#: Merge.rc:506
#, c-format
msgid "&HEX"
-msgstr ""
+msgstr "&HEX"
#: Merge.rc:511
#, c-format
@@ -2104,12 +2104,8 @@
#: Merge.rc:1306
#, c-format
-msgid ""
-"Plugin required\n"
-"(dllbuild %04u)"
-msgstr ""
-"Plugin kr\xE4vd\n"
-"(dllbuild %04u)"
+msgid "Plugin required\n"(dllbuild %04u)"
+msgstr "Plugin kr\xE4vd\n(dllbuild %04u)"
#: Merge.rc:1308
#, c-format
@@ -2160,8 +2156,12 @@
#: Merge.rc:1326
#, 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:1330
#, c-format
@@ -3082,8 +3082,12 @@
#: Merge.rc:1896
#, 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:1897
#, c-format
@@ -3452,8 +3456,14 @@
#: Merge.rc:2045
#, 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:2051
#, c-format
@@ -3548,12 +3558,12 @@
#: Merge.rc:2079
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "\xC5ngrar den sista \xE5tg\xE4rden..."
#: Merge.rc:2080
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "G\xF6r om den tidigare \xE5tg\xE4rden..."
#: Merge.rc:2086
#, c-format
@@ -4603,8 +4613,14 @@
#: Merge.rc:2393
#, 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:2394
#, c-format
@@ -5513,13 +5529,21 @@
#: Merge.rc:2686
#, 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:2687
#, 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:2688
#, c-format
@@ -5570,28 +5594,48 @@
#: Merge.rc:2700
#, 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:2701
#, 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:2702
#, 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:2703
#, 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:2704
#, 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:2705
#, c-format
@@ -5719,9 +5763,12 @@
#: Merge.rc:2740
#, 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:2741
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-08-30 19:35:58
|
Revision: 5866
http://winmerge.svn.sourceforge.net/winmerge/?rev=5866&view=rev
Author: kimmov
Date: 2008-08-30 19:35:54 +0000 (Sat, 30 Aug 2008)
Log Message:
-----------
PATCH: [ 2082774 ] Use configured external editor to edit filter files
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/FileFilterHelper.cpp
trunk/Src/MainFrm.h
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-30 17:53:51 UTC (rev 5865)
+++ trunk/Docs/Users/ChangeLog.txt 2008-08-30 19:35:54 UTC (rev 5866)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.11.1.5
+ Use external editor to edit plugins (#2082774)
Plugins: Show processing instructions in XML plugin (#1979321)
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
BugFix: Table of Contents in manual (#2071625)
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2008-08-30 17:53:51 UTC (rev 5865)
+++ trunk/Src/FileFilterHelper.cpp 2008-08-30 19:35:54 UTC (rev 5866)
@@ -24,6 +24,7 @@
#include "stdafx.h"
#include "Ucs2Utf8.h"
+#include "MainFrm.h"
#include "FilterList.h"
#include "DirItem.h"
#include "FileFilterMgr.h"
@@ -293,20 +294,12 @@
}
/**
- * @brief Open filter file to editor (notepad) for modifying.
- *
+ * @brief Open filter file to external editor for modifying.
* @param [in] szFileFilterterPath Path of filter file to edit.
- * @todo Use external editor defined in options?
*/
void FileFilterHelper::EditFileFilter(LPCTSTR szFileFilterPath)
{
- CString cmdLine = (CString)_T("notepad ") + szFileFilterPath;
- STARTUPINFO stInfo = {0};
- PROCESS_INFORMATION prInfo;
- BOOL processSuccess = FALSE;
- stInfo.cb = sizeof(STARTUPINFO);
- processSuccess = CreateProcess(NULL, (LPTSTR)(LPCTSTR)cmdLine, NULL,
- NULL, FALSE, 0, NULL, NULL, &stInfo, &prInfo);
+ CMainFrame::OpenFileToExternalEditor(szFileFilterPath);
}
/**
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2008-08-30 17:53:51 UTC (rev 5865)
+++ trunk/Src/MainFrm.h 2008-08-30 19:35:54 UTC (rev 5866)
@@ -135,7 +135,6 @@
CString SetStatus(LPCTSTR status);
void ClearStatusbarItemCount();
void ApplyViewWhitespace();
- void OpenFileToExternalEditor(LPCTSTR file);
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, LPCTSTR strItem);
@@ -149,6 +148,8 @@
BOOL DoOpenConflict(LPCTSTR conflictFile, bool checked = false);
FRAMETYPE GetFrameType(const CFrameWnd * pFrame) const;
+ static void OpenFileToExternalEditor(LPCTSTR file);
+
// Overrides
virtual void GetMessageString(UINT nID, CString& rMessage) const;
// ClassWizard generated virtual function overrides
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-09-01 17:49:02
|
Revision: 5871
http://winmerge.svn.sourceforge.net/winmerge/?rev=5871&view=rev
Author: kimmov
Date: 2008-09-01 17:49:00 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
PATCH: [ 2084879 ] Fix NSIS ShowUninstDetails keyword in syntax highlighting
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/editlib/nsis.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-08-31 11:30:36 UTC (rev 5870)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-01 17:49:00 UTC (rev 5871)
@@ -8,6 +8,7 @@
Plugins: Show processing instructions in XML plugin (#1979321)
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
BugFix: Table of Contents in manual (#2071625)
+ BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879)
Translation updates:
- Russian (#2067785)
- Swedish (#2075513)
Modified: trunk/Src/editlib/nsis.cpp
===================================================================
--- trunk/Src/editlib/nsis.cpp 2008-08-31 11:30:36 UTC (rev 5870)
+++ trunk/Src/editlib/nsis.cpp 2008-09-01 17:49:00 UTC (rev 5871)
@@ -229,7 +229,7 @@
_T ("SetStaticBkColor"),
_T ("SetWindowLong"),
_T ("ShowInstDetails"),
- _T ("ShowUninstDetails"),
+ _T ("ShowUnInstDetails"),
_T ("ShowWindow"),
_T ("SilentInstall"),
_T ("SilentUnInstall"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-09-07 16:05:57
|
Revision: 5918
http://winmerge.svn.sourceforge.net/winmerge/?rev=5918&view=rev
Author: sdottaka
Date: 2008-09-07 16:05:46 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
BUG: [ 2098626 ] Displays a blank time when last modified time is 00:00:00
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/locality.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-07 12:59:22 UTC (rev 5917)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-07 16:05:46 UTC (rev 5918)
@@ -10,6 +10,8 @@
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
BugFix: Table of Contents in manual (#2071625)
BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879)
+ BugFix: Displayed a blank time when file last modified time is 00:00:00
+ (#2098626)
Translation updates:
- Russian (#2067785)
- Swedish (#2075513)
@@ -537,4 +539,4 @@
WinMerge 2.7.4 and earlier (also 2.6.x stable releases) have more detailed
-changelogs in Changes.txt files in /Src and other folders.
\ No newline at end of file
+changelogs in Changes.txt files in /Src and other folders.
Modified: trunk/Src/locality.cpp
===================================================================
--- trunk/Src/locality.cpp 2008-09-07 12:59:22 UTC (rev 5917)
+++ trunk/Src/locality.cpp 2008-09-07 16:05:46 UTC (rev 5918)
@@ -143,11 +143,13 @@
return String();
if (odt.GetStatus() == COleDateTime::invalid)
return theApp.LoadString(AFX_IDS_INVALID_DATETIME);
- COleVariant var;
- // Don't need to trap error. Should not fail due to type mismatch
- AfxCheckError(VarBstrFromDate(odt.m_dt, LANG_USER_DEFAULT, 0, &V_BSTR(&var)));
- var.vt = VT_BSTR;
- return OLE2CT(V_BSTR(&var));
+ SYSTEMTIME sysTime;
+ odt.GetAsSystemTime(sysTime);
+ TCHAR buff[128];
+ int len = GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_NOUSEROVERRIDE, &sysTime, NULL, buff, countof(buff));
+ buff[len - 1] = ' ';
+ GetTimeFormat(LOCALE_USER_DEFAULT, LOCALE_NOUSEROVERRIDE, &sysTime, NULL, buff + len, countof(buff) - len - 1);
+ return buff;
}
}; // namespace locality
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-09-10 03:00:40
|
Revision: 5937
http://winmerge.svn.sourceforge.net/winmerge/?rev=5937&view=rev
Author: kimmov
Date: 2008-09-10 03:00:38 +0000 (Wed, 10 Sep 2008)
Log Message:
-----------
PATCH: [ 2091800 ] Use python script + ini file to manage version numbers
Modified Paths:
--------------
trunk/Tools/Scripts/ReadMe.txt
Added Paths:
-----------
trunk/Tools/Scripts/SetVersions.py
trunk/Tools/Scripts/SetVersions.txt
trunk/versions.ini
Modified: trunk/Tools/Scripts/ReadMe.txt
===================================================================
--- trunk/Tools/Scripts/ReadMe.txt 2008-09-10 02:59:09 UTC (rev 5936)
+++ trunk/Tools/Scripts/ReadMe.txt 2008-09-10 03:00:38 UTC (rev 5937)
@@ -95,6 +95,11 @@
generate it.
+SetVersions.py
+--------------
+ A script for setting version numbers of different components.
+ See the file SetVersions.txt for documentation of the script.
+
tsvn_patch.py
-------------
Script for cleaning up TortoiseSVN created patch files to use with GNU patch.
Added: trunk/Tools/Scripts/SetVersions.py
===================================================================
--- trunk/Tools/Scripts/SetVersions.py (rev 0)
+++ trunk/Tools/Scripts/SetVersions.py 2008-09-10 03:00:38 UTC (rev 5937)
@@ -0,0 +1,351 @@
+# The MIT License
+#
+# Copyright (c) 2008 Kimmo Varis <ki...@wi...>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# $Id$
+
+# SetVersions.py
+# A Python script to set various component's version numbers in the project.
+
+# This script originates fro CheckSum Tool project at (http://checksumtool.sourceforge.net). Please submit fixes and
+# updates to the script for the originating project so other projects using the script can use them too.
+
+import ConfigParser
+import getopt
+import os
+import shutil
+import sys
+
+def process_NSIS(filename, config, sect):
+ '''Process NSIS section in the ini file.'''
+
+ ver = config.get(sect, 'version')
+ file = config.get(sect, 'path')
+ desc = config.get(sect, 'description')
+
+ print '%s : %s' % (sect, desc)
+ print ' File: ' + file
+ print ' Version: ' + ver
+
+ inidir = os.path.dirname(filename)
+ nsisfile = os.path.join(inidir, file)
+
+ ret = set_NSIS_ver(nsisfile, ver)
+ return ret
+
+def set_NSIS_ver(file, version):
+ '''Set version into NSIS installer file.'''
+
+ outfile = file + '.bak'
+ try:
+ fread = open(file, 'r')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + file + ' for reading'
+ print 'Error: ' + strerror
+ return False
+
+ try:
+ fwrite = open(outfile, 'w')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + infile + ' for writing'
+ print 'Error: ' + strerror
+ fread.close()
+ return False
+
+ # Replace PRODUCT_ VERSION macro value with new value
+ for line in fread:
+ if line.startswith('!define PRODUCT_VERSION'):
+ ind = line.find('\"')
+ ind2 = line.rfind('\"')
+ if ind != -1 and ind2 != -1:
+ line = line[:ind] + version + line[ind2 + 1:]
+ fwrite.write(line)
+
+ fread.close()
+ fwrite.close()
+
+ shutil.move(outfile, file)
+
+ return True
+
+def process_AssemblyCs(filename, config, sect):
+ '''Process C# AssemblyInfo section in the ini file.'''
+
+ ver = config.get(sect, 'version')
+ file = config.get(sect, 'path')
+ desc = config.get(sect, 'description')
+
+ print '%s : %s' % (sect, desc)
+ print ' File: ' + file
+ print ' Version: ' + ver
+
+ inidir = os.path.dirname(filename)
+ nsisfile = os.path.join(inidir, file)
+
+ ret = set_CSAssembly_ver(nsisfile, ver)
+ return ret
+
+def set_CSAssembly_ver(file, version):
+ '''Set version into C# Assembly Info file.'''
+
+ outfile = file + '.bak'
+ try:
+ fread = open(file, 'r')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + file + ' for reading'
+ print 'Error: ' + strerror
+ return False
+
+ try:
+ fwrite = open(outfile, 'w')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + infile + ' for writing'
+ print 'Error: ' + strerror
+ fread.close()
+ return False
+
+ # Replace AssemblyVersion value with new value
+ for line in fread:
+ if line.startswith('[assembly: AssemblyVersion'):
+ replace_ver_in_quotes(line, version)
+ fwrite.write(line)
+
+ fread.close()
+ fwrite.close()
+
+ shutil.move(outfile, file)
+ return True
+
+def process_WinRC(filename, config, sect):
+ '''Process Windows RC file section in the ini file.'''
+
+ ver = config.get(sect, 'version')
+ file = config.get(sect, 'path')
+ desc = config.get(sect, 'description')
+
+ print '%s : %s' % (sect, desc)
+ print ' File: ' + file
+ print ' Version: ' + ver
+
+ inidir = os.path.dirname(filename)
+ rcfile = os.path.join(inidir, file)
+
+ ret = set_WinRC_ver(rcfile, ver)
+ return ret
+
+def set_WinRC_ver(file, version):
+ '''Set version into Windows RC file. Currently we set both fileversion and
+ productversion to same number.
+ TODO: Allow separate file- and product -versions.
+ '''
+
+ outfile = file + '.bak'
+ try:
+ fread = open(file, 'r')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + file + ' for reading'
+ print 'Error: ' + strerror
+ return False
+
+ try:
+ fwrite = open(outfile, 'w')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + infile + ' for writing'
+ print 'Error: ' + strerror
+ fread.close()
+ return False
+
+ # Add ending NULL to the version string and replace dots with commas
+ verInd = version.rfind('\"')
+ if verInd != -1:
+ versionNul = version[:verInd] + '\\0' + version[verInd:]
+
+ # Replace version defines with new value
+ ret = True
+ for line in fread:
+ if line.startswith(' FILEVERSION'):
+ line = replace_rc_ver_at_end(line, version)
+ if line.startswith(' PRODUCTVERSION'):
+ line = replace_rc_ver_at_end(line, version)
+ if line.find('VALUE \"FileVersion\"') != -1:
+ line = replace_ver_in_quotes(line, versionNul)
+ if line.find('VALUE \"ProductVersion\"') != -1:
+ line = replace_ver_in_quotes(line, versionNul)
+ fwrite.write(line)
+
+ fread.close()
+ fwrite.close()
+
+ shutil.move(outfile, file)
+ return ret
+
+def process_InnoSetup(filename, config, sect):
+ ver = config.get(sect, 'version')
+ file = config.get(sect, 'path')
+ desc = config.get(sect, 'description')
+ macro = config.get(sect, 'macro')
+
+ print '%s : %s' % (sect, desc)
+ print ' File: ' + file
+ print ' Version: ' + ver
+ if len(macro):
+ print ' Macro: ' + macro
+ else:
+ print ' ERROR: You must set macro name in the INI file.'
+ return False
+
+ inidir = os.path.dirname(filename)
+ innofile = os.path.join(inidir, file)
+
+ ret = set_InnoSetup_ver(innofile, ver, macro)
+ return ret
+
+def set_InnoSetup_ver(file, version, macro):
+ '''Set version into InnoSetup script. If the macro setting was found
+ from the INI file replace only that macro's value. Currently the script
+ supports only replacing initial macro value.
+
+ TODO: support other means (not just macro) to set version.
+ '''
+
+ outfile = file + '.bak'
+ try:
+ fread = open(file, 'r')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + file + ' for reading'
+ print 'Error: ' + strerror
+ return False
+
+ try:
+ fwrite = open(outfile, 'w')
+ except IOError, (errno, strerror):
+ print 'Cannot open file ' + infile + ' for writing'
+ print 'Error: ' + strerror
+ fread.close()
+ return False
+
+ # Replace version macro value with new value
+ macroline = '#define ' + macro
+ for line in fread:
+ if line.startswith(macroline):
+ line = line[:len(macroline)] + ' ' + version + '\n'
+ fwrite.write(line)
+
+ fread.close()
+ fwrite.close()
+
+ shutil.move(outfile, file)
+ return True
+
+def replace_rc_ver_at_end(line, version):
+ '''Replace plain version number at the end of the line in RC file.
+ Also make sure we have four numbers.
+ '''
+
+ version = version.strip('\"')
+ version = version.replace('.', ',')
+
+ # Make sure there are four numbers, add zeros if necessary
+ commas = version.count(',')
+ if commas < 3:
+ add = 3 - commas
+ for i in range(0, add):
+ version = version + ',0'
+
+ ind = line.rfind(' ')
+ if ind != -1:
+ line = line[:ind + 1] + version + '\n'
+ return line
+
+def replace_ver_in_quotes(line, version):
+ '''Replace version number in line in quotes with given version string.
+ Eg. if line is 'Version "1.2.3"' and version is "4.5.6" the return value is
+ 'Version "3.4.5"'
+ '''
+
+ # Find quote marks between which we set the version number
+ lineInd2 = line.rfind('\"')
+ lineInd1 = line.rfind('\"', 0, lineInd2)
+ if lineInd1 != -1 and lineInd2 != -1:
+ line = line[:lineInd1] + version + line[lineInd2 + 1:]
+ return line
+
+def process_versions(filename):
+ '''Process all sections found from the given ini file.'''
+
+ config = ConfigParser.ConfigParser()
+ config.readfp(open(filename))
+
+ ret = False
+ sectlist = config.sections()
+ print 'Setting versions:'
+ for sect in sectlist:
+ vertype = config.get(sect, 'type')
+ if vertype == 'NSIS':
+ ret = process_NSIS(filename, config, sect)
+ if vertype == 'CS-AssemblyInfo':
+ ret = process_AssemblyCs(filename, config, sect)
+ if vertype == 'WinRC':
+ ret = process_WinRC(filename, config, sect)
+ if vertype == 'InnoSetup':
+ ret = process_InnoSetup(filename, config, sect)
+ return ret
+
+def usage():
+ '''Print script usage information.'''
+
+ print 'Script to set program component version numbers.'
+ print 'Usage: SetVersions.py [-h] filename'
+ print 'Where:'
+ print ' filename is absolute or relative path to the ini file.'
+ print ' -h, --help Print this help.'
+
+def main(argv):
+ filename = ''
+ createbaks = True
+ if len(argv) > 0:
+ opts, args = getopt.getopt(argv, 'h', ['help'])
+
+ for opt, arg in opts:
+ if opt in ('-h', '--help'):
+ usage()
+ sys.exit()
+
+ if len(args) == 1:
+ filename = args[0]
+ else:
+ usage()
+ sys.exit()
+ else:
+ usage()
+ sys.exit()
+
+ filename = os.path.abspath(filename)
+ if os.path.exists(filename):
+ ret = process_versions(filename)
+ if ret == True:
+ print 'Version numbers set successfully!'
+ else:
+ print 'ERROR: Could not find file: ' + filename
+
+# MAIN #
+if __name__ == "__main__":
+ main(sys.argv[1:])
Property changes on: trunk/Tools/Scripts/SetVersions.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Tools/Scripts/SetVersions.txt
===================================================================
--- trunk/Tools/Scripts/SetVersions.txt (rev 0)
+++ trunk/Tools/Scripts/SetVersions.txt 2008-09-10 03:00:38 UTC (rev 5937)
@@ -0,0 +1,63 @@
+SetVersions.py
+==============
+$Id$
+
+WinMerge version numbers are managed by the versions.ini file and
+Tools/Scripts/SetVersions.py script. When the script is run it sets version
+numbers for all resources listed in the ini file.
+
+SetVersions.py script usage:
+
+!!! This script is work in progress !!!
+
+The SetVersions.py script sets versions numbers in different components.
+Components and version numbers to set are defined in configuration file. The
+configuration file is Windows INI-file kind of file, with sections and values.
+
+The section name is only descriptive for the resource to process. It gets
+printed by the script when running.
+
+All sections have these values:
+- type
+ Resource type to set
+- description
+ Short description of the resource (e.g. Installer) to set version
+- path
+ Relative path to the resource to process
+- version
+ Version string/number to set
+
+Available types are:
+CS-AssemblyInfo:
+ Set version number to C# AssemblyInfo file. The script searches for line
+ having assembly: AssemblyVersion -text and sets the version number.
+
+InnoSetup:
+ Set version number to InnoSetup installer script. The installer script
+ must have preprocessor define for the version number. The script replaces
+ value of this macro.
+
+NSIS:
+ Set version number to NSIS installer script. The installer script must have
+ version defined with PRODUCT_VERSION -macro. For example:
+ !define PRODUCT_VERSION "1.2.3"
+
+WinRC:
+ Set file- and product-version into the Windows RC file. The script searches
+ for version numbers in version resource. The script also makes sure that
+ numeric version number has always four numbers. If less numbers are given,
+ zeros are added to the end.
+
+For example:
+[Installer]
+type = NSIS
+description = ChecksumTool NSIS Installer
+path = Installer/NSIS/CheckSumTool.nsi
+version = "0.6.0"
+
+[Installer]
+type = InnoSetup
+description = WinMerge InnoSetup installer
+path = Installer/InnoSetup/WinMerge.iss
+macro = AppVersion
+version = "2.9.12"
Property changes on: trunk/Tools/Scripts/SetVersions.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/versions.ini
===================================================================
--- trunk/versions.ini (rev 0)
+++ trunk/versions.ini 2008-09-10 03:00:38 UTC (rev 5937)
@@ -0,0 +1,22 @@
+; versions.ini - version numbers for WinMerge components
+; Use Tools/Scripts/SetVersions.py script to set the version numbers
+; $Id$
+
+[Installer]
+type = InnoSetup
+description = WinMerge InnoSetup installer
+path = Installer/InnoSetup/WinMerge.iss
+macro = AppVersion
+version = "2.11.1.5"
+
+[Executable]
+type = WinRC
+description = WinMerge executable
+path = Src/Merge.rc
+version = "2.11.1.5"
+
+[Dll]
+type = WinRC
+description = ShellExtension
+path = ShellExtension/ShellExtension.rc
+version = "1.15.1"
Property changes on: trunk/versions.ini
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-09-14 12:45:33
|
Revision: 5950
http://winmerge.svn.sourceforge.net/winmerge/?rev=5950&view=rev
Author: sdottaka
Date: 2008-09-14 12:45:31 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
PATCH: [2110218] Customized colors aren't used in some areas.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeDiffDetailView.cpp
trunk/Src/MergeEditView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-14 07:49:31 UTC (rev 5949)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-14 12:45:31 UTC (rev 5950)
@@ -12,6 +12,7 @@
BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879)
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:
- German (r5934)
- Russian (#2067785)
Modified: trunk/Src/MergeDiffDetailView.cpp
===================================================================
--- trunk/Src/MergeDiffDetailView.cpp 2008-09-14 07:49:31 UTC (rev 5949)
+++ trunk/Src/MergeDiffDetailView.cpp 2008-09-14 12:45:31 UTC (rev 5950)
@@ -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: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2008-09-14 07:49:31 UTC (rev 5949)
+++ trunk/Src/MergeEditView.cpp 2008-09-14 12:45:31 UTC (rev 5950)
@@ -506,8 +506,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.
|
|
From: <sdo...@us...> - 2008-09-14 14:24:26
|
Revision: 5953
http://winmerge.svn.sourceforge.net/winmerge/?rev=5953&view=rev
Author: sdottaka
Date: 2008-09-14 14:24:23 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
BUG: [ 2110350 ] Files are extracted into wrong folder
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Environment.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-14 12:47:59 UTC (rev 5952)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-14 14:24:23 UTC (rev 5953)
@@ -13,6 +13,7 @@
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)
+ BugFix: Zip files were extracted into wrong folder (#2110350)
Translation updates:
- German (r5934)
- Russian (#2067785)
Modified: trunk/Src/Environment.cpp
===================================================================
--- trunk/Src/Environment.cpp 2008-09-14 12:47:59 UTC (rev 5952)
+++ trunk/Src/Environment.cpp 2008-09-14 14:24:23 UTC (rev 5953)
@@ -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.
|
|
From: <ge...@us...> - 2008-09-22 20:41:35
|
Revision: 5971
http://winmerge.svn.sourceforge.net/winmerge/?rev=5971&view=rev
Author: gerundt
Date: 2008-09-22 20:41:31 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
PATCH: [ 2119843 ] Add icon for "Compare" menu item
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MainFrm.cpp
trunk/Src/Merge2.rc
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/res/compare.bmp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-18 19:31:48 UTC (rev 5970)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-22 20:41:31 UTC (rev 5971)
@@ -9,6 +9,7 @@
Change Manual url to http://winmerge.org/docs/manual/ (r5956)
Manual updates
Plugins: Show processing instructions in XML plugin (#1979321)
+ Add icon for "Compare" menu item (#2119843)
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
BugFix: Table of Contents in manual (#2071625)
BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-09-18 19:31:48 UTC (rev 5970)
+++ trunk/Src/MainFrm.cpp 2008-09-22 20:41:31 UTC (rev 5971)
@@ -127,6 +127,7 @@
{ ID_EDIT_CLEAR_ALL_BOOKMARKS, IDB_EDIT_CLEAR_ALL_BOOKMARKS, CMainFrame::MENU_FILECMP },
{ ID_VIEW_ZOOMIN, IDB_VIEW_ZOOMIN, CMainFrame::MENU_FILECMP },
{ ID_VIEW_ZOOMOUT, IDB_VIEW_ZOOMOUT, CMainFrame::MENU_FILECMP },
+ { ID_MERGE_COMPARE, IDB_MERGE_COMPARE, CMainFrame::MENU_FOLDERCMP },
{ ID_MERGE_DELETE, IDB_MERGE_DELETE, CMainFrame::MENU_FOLDERCMP },
{ ID_TOOLS_GENERATEREPORT, IDB_TOOLS_GENERATEREPORT, CMainFrame::MENU_FOLDERCMP },
{ ID_DIR_COPY_LEFT_TO_RIGHT, IDB_LEFT_TO_RIGHT, CMainFrame::MENU_FOLDERCMP },
Modified: trunk/Src/Merge2.rc
===================================================================
--- trunk/Src/Merge2.rc 2008-09-18 19:31:48 UTC (rev 5970)
+++ trunk/Src/Merge2.rc 2008-09-22 20:41:31 UTC (rev 5971)
@@ -143,8 +143,8 @@
IDB_TREE_STATE BITMAP "res\\treestate.bmp"
IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp"
IDB_PLUGINS_LIST BITMAP "res\\plugins.bmp"
+IDB_MERGE_COMPARE BITMAP "res\\compare.bmp"
-
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
Property changes on: trunk/Src/res/compare.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2008-09-18 19:31:48 UTC (rev 5970)
+++ trunk/Src/resource.h 2008-09-22 20:41:31 UTC (rev 5971)
@@ -103,6 +103,7 @@
#define IDB_TREE_STATE 360
#define IDB_FILE_OPENCONFLICT 361
#define IDB_PLUGINS_LIST 362
+#define IDB_MERGE_COMPARE 363
#define IDI_FOLDER 500
#define IDI_LFOLDER 501
#define IDI_RFOLDER 502
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-09-25 15:01:07
|
Revision: 5973
http://winmerge.svn.sourceforge.net/winmerge/?rev=5973&view=rev
Author: sdottaka
Date: 2008-09-25 15:00:51 +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:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-23 22:12:35 UTC (rev 5972)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-25 15:00:51 UTC (rev 5973)
@@ -17,6 +17,7 @@
(#2098626)
BugFix: Customized colors weren't used in some areas (#2110218)
BugFix: Zip files were extracted into wrong folder (#2110350)
+ BugFix: Case-sensitive regexp search didn't work (#1991259)
Translation updates:
- German (r5934)
- Russian (#2067785)
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2008-09-23 22:12:35 UTC (rev 5972)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2008-09-25 15:00:51 UTC (rev 5973)
@@ -4533,22 +4533,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)
{
@@ -4559,10 +4558,11 @@
pos = ovector[0];
nLen = ovector[1] - ovector[0];
#endif
- }
+ }
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.
|
|
From: <sdo...@us...> - 2008-09-25 15:07:53
|
Revision: 5975
http://winmerge.svn.sourceforge.net/winmerge/?rev=5975&view=rev
Author: sdottaka
Date: 2008-09-25 15:07:43 +0000 (Thu, 25 Sep 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:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
trunk/Src/OptionsInit.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-25 15:02:03 UTC (rev 5974)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-25 15:07:43 UTC (rev 5975)
@@ -18,6 +18,8 @@
BugFix: Customized colors weren't used in some areas (#2110218)
BugFix: Zip files were extracted into wrong folder (#2110350)
BugFix: Case-sensitive regexp search didn't work (#1991259)
+ BugFix: There were some installer regressions
+ (eg. Installer didn't create Quick Launch icon) (#1460517)
Translation updates:
- German (r5934)
- Russian (#2067785)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-09-25 15:02:03 UTC (rev 5974)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-09-25 15:07:43 UTC (rev 5975)
@@ -300,6 +300,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
@@ -445,9 +446,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
@@ -491,20 +494,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 -u -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: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2008-09-25 15:02:03 UTC (rev 5974)
+++ trunk/Src/OptionsInit.cpp 2008-09-25 15:07:43 UTC (rev 5975)
@@ -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);
@@ -235,23 +235,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;
@@ -263,13 +274,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;
@@ -277,8 +291,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.
|
|
From: <ki...@us...> - 2008-09-27 17:23:43
|
Revision: 5978
http://winmerge.svn.sourceforge.net/winmerge/?rev=5978&view=rev
Author: kimmov
Date: 2008-09-27 17:23:38 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
PATCH: [ 2131753 ] Updated Ukrainian Translation
Submitted by Warrior
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Ukrainian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-27 12:36:35 UTC (rev 5977)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-27 17:23:38 UTC (rev 5978)
@@ -24,6 +24,7 @@
- German (r5934)
- Russian (#2067785)
- Swedish (#2075513)
+ - Ukrainian (#2131753)
WinMerge 2.11.1.4 - 2008-08-21 (r5846)
Binary file edit/compare (#2036603)
Modified: trunk/Src/Languages/Ukrainian.po
===================================================================
--- trunk/Src/Languages/Ukrainian.po 2008-09-27 12:36:35 UTC (rev 5977)
+++ trunk/Src/Languages/Ukrainian.po 2008-09-27 17:23:38 UTC (rev 5978)
@@ -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 <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -175,7 +175,7 @@
#: Merge.rc:353
#, 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:392
#, 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:231
@@ -217,21 +217,21 @@
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr "&\xCD\xE5\xEC\xE0\xBA"
+msgstr "\xC2\xE8\xEC&\xEA\xED\xF3\xF2\xE8"
#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, 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:235
#: Merge.rc:417
#, 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:237
@@ -245,7 +245,7 @@
#: Merge.rc:420
#, 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:241
@@ -287,7 +287,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&\xD1\xEF\xE8\xF1\xEE\xEA..."
#: Merge.rc:152
#: Merge.rc:273
@@ -315,7 +315,7 @@
#: Merge.rc:466
#, 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:280
@@ -364,7 +364,7 @@
#: Merge.rc:478
#, 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:292
@@ -442,7 +442,7 @@
#: Merge.rc:494
#, 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:337
@@ -526,12 +526,12 @@
#: Merge.rc:426
#, 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:244
#, 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:246
#: Merge.rc:428
@@ -578,7 +578,7 @@
#: Merge.rc:437
#, 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:258
#: Merge.rc:438
@@ -820,7 +820,7 @@
#: Merge.rc:409
#, 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:411
#, c-format
@@ -1014,7 +1014,7 @@
#: Merge.rc:559
#, c-format
msgid "&Refresh"
-msgstr "&\xCE\xED\xEE\xE2\xE8\xF2\xE8"
+msgstr "&\xCF\xEE\xED\xEE\xE2\xE8\xF2\xE8"
#: Merge.rc:571
#, c-format
@@ -1101,12 +1101,12 @@
#: Merge.rc:675
#, c-format
msgid "Contributors"
-msgstr "\xCC\xE5\xF6\xE5\xED\xE0\xF2\xE8"
+msgstr "\xC0\xE2\xF2\xEE\xF0\xE8"
#: Merge.rc:682
#, 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:685
#: Merge.rc:1600
@@ -1120,7 +1120,7 @@
#: Merge.rc:1025
#, c-format
msgid "&Browse..."
-msgstr "&\xCE\xE3\xEB\xFF\xE4..."
+msgstr "&\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
#: Merge.rc:690
#: Merge.rc:1604
@@ -1132,7 +1132,7 @@
#: Merge.rc:1036
#, c-format
msgid "Bro&wse..."
-msgstr "\xCE&\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5&\xE3\xEB\xFF\xE4..."
#: Merge.rc:695
#: Merge.rc:1608
@@ -1160,7 +1160,7 @@
#: Merge.rc:1611
#, 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:705
#, c-format
@@ -1314,7 +1314,7 @@
#: Merge.rc:1623
#, 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:782
#: Merge.rc:1625
@@ -1487,7 +1487,7 @@
#: Merge.rc:897
#, 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:898
#, c-format
@@ -1578,7 +1578,7 @@
#: Merge.rc:992
#, 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:994
#, c-format
@@ -1598,7 +1598,7 @@
#: Merge.rc:999
#, 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:1001
#, c-format
@@ -1613,28 +1613,28 @@
#: Merge.rc:1006
#, c-format
msgid "B&rowse..."
-msgstr "\xCE\xE3\xEB\xFF\xE4"
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4"
#: Merge.rc:1007
#, 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:1008
#, 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:1010
#, 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:1013
#: Merge.rc:1029
#, c-format
msgid "Br&owse..."
-msgstr "\xCE\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
#: Merge.rc:1019
#, c-format
@@ -1694,12 +1694,12 @@
#: Merge.rc:1047
#, 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:1049
#, 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:1051
#, c-format
@@ -1764,7 +1764,7 @@
#: Merge.rc:1119
#, 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:1122
#: Merge.rc:1882
@@ -1780,7 +1780,7 @@
#: Merge.rc:1128
#, 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:1129
#, c-format
@@ -1841,27 +1841,27 @@
#: Merge.rc:1162
#, 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:1164
#, 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:1166
#, 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:1168
#, 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:1170
#, 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:1173
#, c-format
@@ -1876,7 +1876,7 @@
#: Merge.rc:1177
#, 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:1180
#, c-format
@@ -2080,12 +2080,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:1300
#, 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:1302
#, c-format
@@ -2143,7 +2143,7 @@
#: Merge.rc:1320
#, 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:1324
#, c-format
@@ -2157,8 +2157,12 @@
#: Merge.rc:1326
#, 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:1330
#, c-format
@@ -2241,12 +2245,12 @@
#: Merge.rc:1414
#, c-format
msgid "Bold"
-msgstr "\xC6\xE8\xF0\xED\xE8\xE9"
+msgstr "\xC3\xF0\xF3\xE1\xE8\xE9"
#: Merge.rc:1422
#, 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:1425
#, c-format
@@ -2259,7 +2263,7 @@
#: Merge.rc:1633
#, c-format
msgid "Browse..."
-msgstr "\xCE\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
#: Merge.rc:1429
#, c-format
@@ -2300,7 +2304,7 @@
#: Merge.rc:1458
#, 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:1460
#, c-format
@@ -2320,12 +2324,12 @@
#: Merge.rc:1466
#, 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:1468
#, 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:1476
#, c-format
@@ -2335,7 +2339,7 @@
#: Merge.rc:1479
#, c-format
msgid "Folders:"
-msgstr "\xCF\xE0\xEF\xEA\xE8:"
+msgstr "\xD2\xE5\xEA\xE8:"
#: Merge.rc:1480
#, c-format
@@ -2456,7 +2460,7 @@
#: Merge.rc:1552
#, c-format
msgid "&Folder Name"
-msgstr "\xCF\xE0\xEF\xEA\xE0"
+msgstr "\xD2\xE5\xEA\xE0"
#: Merge.rc:1554
#, c-format
@@ -2542,12 +2546,12 @@
#: Merge.rc:1628
#, 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:1630
#, 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:1634
#, c-format
@@ -2598,12 +2602,12 @@
#: Merge.rc:1663
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "\xC4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
#: Merge.rc:1666
#, 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:1696
@@ -2984,13 +2988,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:1836
#, 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:1842
#, c-format
@@ -3053,13 +3061,41 @@
#: Merge.rc:1868
#, 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:1869
#, 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:1876
#, c-format
@@ -3079,8 +3115,12 @@
#: Merge.rc:1896
#, 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:1897
#, c-format
@@ -3105,12 +3145,12 @@
#: Merge.rc:1907
#, 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:1908
#, 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:1909
#, c-format
@@ -3381,7 +3421,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:2024
@@ -3392,10 +3432,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:2026
#, c-format
@@ -3404,9 +3444,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:2028
#, c-format
@@ -3435,7 +3475,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:2033
#, c-format
@@ -3449,8 +3489,14 @@
#: Merge.rc:2045
#, 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:2051
#, c-format
@@ -3465,7 +3511,7 @@
#: Merge.rc:2058
#, 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:2059
#, c-format
@@ -3500,7 +3546,7 @@
#: Merge.rc:2070
#, 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:2071
#, c-format
@@ -3545,12 +3591,12 @@
#: Merge.rc:2079
#, 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:2080
#, 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:2086
#, c-format
@@ -3606,17 +3652,17 @@
#: Merge.rc:2106
#, 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:2107
#, 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:2108
#, 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:2109
#, c-format
@@ -3641,7 +3687,7 @@
#: Merge.rc:2113
#, 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:2119
#, c-format
@@ -3673,8 +3719,14 @@
#: Merge.rc:2123
#, 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:2129
#, c-format
@@ -3796,7 +3848,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:2142
#, c-format
@@ -3842,7 +3894,7 @@
#: Merge.rc:2159
#, 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:2160
#, c-format
@@ -3893,24 +3945,24 @@
#: Merge.rc:2173
#, 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:2174
#, 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:2180
#: Merge.rc:2182
#, 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:2181
#: Merge.rc:2183
#, 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:2184
#, c-format
@@ -4014,27 +4066,27 @@
#: Merge.rc:2208
#, 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:2213
#, 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:2214
#, 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:2215
#, 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:2216
#, 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:2222
#, c-format
@@ -4070,7 +4122,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"
@@ -4079,17 +4131,17 @@
#: Merge.rc:2226
#, 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:2227
#, 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:2229
#, 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:2235
#, c-format
@@ -4179,12 +4231,12 @@
#: Merge.rc:2258
#, 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:2260
#, 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:2266
#, c-format
@@ -4194,7 +4246,7 @@
#: Merge.rc:2267
#, c-format
msgid "Folder"
-msgstr "\xCF\xE0\xEF\xEA\xE0"
+msgstr "\xD2\xE5\xEA\xE0"
#: Merge.rc:2268
#, c-format
@@ -4299,7 +4351,7 @@
#: Merge.rc:2298
#, 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:2299
#, c-format
@@ -4330,7 +4382,7 @@
#: Merge.rc:2309
#, 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:2310
#, c-format
@@ -4395,12 +4447,12 @@
#: Merge.rc:2334
#, 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:2335
#, 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:2336
#, c-format
@@ -4505,7 +4557,7 @@
#: Merge.rc:2366
#, 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:2367
#, c-format
@@ -4594,12 +4646,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:2393
#, 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:2394
#, c-format
@@ -4609,7 +4667,7 @@
#: Merge.rc:2395
#, 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:2396
#, c-format
@@ -4618,8 +4676,18 @@
#: Merge.rc:2397
#, 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:2403
#, c-format
@@ -4700,12 +4768,12 @@
#: Merge.rc:2442
#, 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:2443
#, 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:2444
#, c-format
@@ -4715,7 +4783,7 @@
#: Merge.rc:2445
#, 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:2446
#, c-format
@@ -4755,7 +4823,7 @@
#: Merge.rc:2453
#, 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:2454
#, c-format
@@ -4771,12 +4839,12 @@
#: Merge.rc:2455
#, 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:2460
#, 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:2461
#, c-format
@@ -5268,22 +5336,22 @@
#: Merge.rc:2626
#, c-format
msgid "Type"
-msgstr ""
+msgstr "\xD2\xE8\xEF"
#: Merge.rc:2628
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "\xD0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xEB\xFC\xED\xE8\xEA"
#: Merge.rc:2629
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "\xCD\xE5\xF5\xF2\xF3\xE2\xE0\xF7"
#: Merge.rc:2630
#, 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:2637
#, c-format
@@ -5308,12 +5376,12 @@
#: Merge.rc:2641
#, 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:2642
#, 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:2643
#, c-format
@@ -5382,8 +5450,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:2658
#, c-format
@@ -5393,7 +5461,7 @@
#: Merge.rc:2659
#, 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:2660
#, c-format
@@ -5484,7 +5552,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:2682
@@ -5505,17 +5573,25 @@
#: Merge.rc:2685
#, 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:2686
#, 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:2687
#, 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:2688
#, c-format
@@ -5566,28 +5642,48 @@
#: Merge.rc:2700
#, 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:2701
#, 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:2702
#, 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:2703
#, 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:2704
#, 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:2705
#, c-format
@@ -5646,17 +5742,17 @@
#: Merge.rc:2711
#, 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:2712
#, 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:2718
#, 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:2719
#, c-format
@@ -5676,12 +5772,12 @@
#: Merge.rc:2727
#, 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:2728
#, 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:2729
#, c-format
@@ -5715,8 +5811,12 @@
#: Merge.rc:2740
#, 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:2741
#, c-format
@@ -5725,8 +5825,12 @@
#: Merge.rc:2747
#, 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:2748
#, c-format
@@ -5745,13 +5849,21 @@
#: Merge.rc:2751
#, 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:2752
#, 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:2758
#, c-format
@@ -5831,7 +5943,7 @@
#: Merge.rc:2789
#, 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:2790
#, c-format
@@ -5846,7 +5958,7 @@
#: Merge.rc:2797
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "\xCD\xE5 \xEF\xB3\xE4\xF1\xE2\xB3\xF7\xF3\xE2\xE0\xF2\xE8"
#: Merge.rc:2798
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-09-27 17:31:50
|
Revision: 5980
http://winmerge.svn.sourceforge.net/winmerge/?rev=5980&view=rev
Author: kimmov
Date: 2008-09-27 17:31:48 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
PATCH: [ 2129095 ] Installer: create backup from ClearCase map file
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-27 17:25:48 UTC (rev 5979)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-27 17:31:48 UTC (rev 5980)
@@ -10,6 +10,7 @@
Manual updates
Plugins: Show processing instructions in XML plugin (#1979321)
Add icon for "Compare" menu item (#2119843)
+ Installer: create backup of ClearCase config file (#2129095)
BugFix: ClearCase checkout/commit dialog translation error (#2051069)
BugFix: Table of Contents in manual (#2071625)
BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-09-27 17:25:48 UTC (rev 5979)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-09-27 17:31:48 UTC (rev 5980)
@@ -970,9 +970,12 @@
MapFile: TStringList;
FileName: String;
I: Integer;
+ BakFile: String;
Begin
FileName := ClearCaseMapFile();
+ BakFile := FileName + '.bak';
+ FileCopy(FileName, BakFile, True);
MapFile := TStringList.Create();
{Read the entire map file to a string list}
MapFile.LoadFromFile(FileName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-09-27 18:11:19
|
Revision: 5981
http://winmerge.svn.sourceforge.net/winmerge/?rev=5981&view=rev
Author: kimmov
Date: 2008-09-27 18:11:09 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
PATCH: [ 2120685 ] Galician translation
Submitted by Medulio
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Croatian.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Greek.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Portuguese.isl
trunk/Installer/InnoSetup/Languages/Romanian.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Slovenian.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/Languages/Ukrainian.isl
trunk/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
trunk/Installer/InnoSetup/Languages/Galician.isl
trunk/Src/Languages/Galician.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Docs/Users/ChangeLog.txt 2008-09-27 18:11:09 UTC (rev 5981)
@@ -21,6 +21,7 @@
BugFix: Case-sensitive regexp search didn't work (#1991259)
BugFix: There were some installer regressions
(eg. Installer didn't create Quick Launch icon) (#1460517)
+ New translation: Galician (#2120685)
Translation updates:
- German (r5934)
- Russian (#2067785)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Docs/Users/Contributors.txt 2008-09-27 18:11:09 UTC (rev 5981)
@@ -57,7 +57,10 @@
Gil Andre
Laurent Ganier
Matthieu Pupat
-
+
+* Galician:
+ Medulio
+
* German:
Tim Gerundt
Winfried Peter
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -343,6 +343,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: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -328,6 +328,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: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -335,6 +335,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: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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: trunk/Installer/InnoSetup/Languages/Croatian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -322,6 +322,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: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -337,6 +337,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
Added: trunk/Installer/InnoSetup/Languages/Galician.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Galician.isl (rev 0)
+++ trunk/Installer/InnoSetup/Languages/Galician.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -0,0 +1,382 @@
+; *** Inno Setup version 5.1.11+ Galician messages ***
+;
+; Translated by Jos\xE9 Antonio Cidre Bardel\xE1s (Medulio) - (me...@ci...)
+;
+; 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: trunk/Installer/InnoSetup/Languages/Galician.isl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -334,6 +334,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: trunk/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Greek.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Greek.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -345,6 +345,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: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -364,6 +364,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: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -348,6 +348,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: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -337,6 +337,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: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -349,6 +349,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: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -341,6 +341,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: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -334,6 +334,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: trunk/Installer/InnoSetup/Languages/Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -326,6 +326,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: trunk/Installer/InnoSetup/Languages/Romanian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -345,6 +345,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: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -332,6 +332,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: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -273,6 +273,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: trunk/Installer/InnoSetup/Languages/Slovenian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovenian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Slovenian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -332,6 +332,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: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -341,6 +341,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: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -335,6 +335,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: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -337,6 +337,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: trunk/Installer/InnoSetup/Languages/Ukrainian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-09-27 18:11:09 UTC (rev 5981)
@@ -341,6 +341,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: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-09-27 17:31:48 UTC (rev 5980)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-09-27 18:11:09 UTC (rev 5981)
@@ -119,6 +119,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
@@ -189,6 +190,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
@@ -384,6 +388,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
Added: trunk/Src/Languages/Galician.po
===================================================================
--- trunk/Src/Languages/Galician.po (rev 0)
+++ trunk/Src/Languages/Galician.po 2008-09-27 18:11:09 UTC (rev 5981)
@@ -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 <me...@ci...>\n"
+"Language-Team: Galician-CiberIrmandade <tra...@ci...>\n"
+"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<os"
+
+#: 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\xF1a...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X