|
From: <ki...@us...> - 2009-01-27 19:51:56
|
Revision: 6391
http://winmerge.svn.sourceforge.net/winmerge/?rev=6391&view=rev
Author: kimmov
Date: 2009-01-27 19:51:50 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
BUG: [ 2529517 ] Folder Compare:Copy Right/Left don't create folder structure
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirActions.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:47:40 UTC (rev 6390)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-01-27 19:51:50 UTC (rev 6391)
@@ -23,6 +23,7 @@
Bugfix: Crashed if compared file disappeared during file compare (#2493945)
Bugfix: Creating new files caused message about missing files (#2515875)
Bugfix: Could not hide folders in recursive compare (#2528749)
+ Bugfix: Folder Compare:Copy Right/Left don't create folder
Translation updates:
- Brazilian (#2461443, #2524796)
- Chinese Traditional (#2540115)
Modified: branches/R2_12/Src/DirActions.cpp
===================================================================
--- branches/R2_12/Src/DirActions.cpp 2009-01-27 19:47:40 UTC (rev 6390)
+++ branches/R2_12/Src/DirActions.cpp 2009-01-27 19:51:50 UTC (rev 6391)
@@ -271,8 +271,23 @@
}
FileActionItem act;
+ String sDest(srFile);
+
+ if (GetDocument()->GetRecursive())
+ {
+ // If destination sides's relative path is empty it means we
+ // are copying unique items and need to get the real relative
+ // path from original side.
+ if (di.right.path.empty())
+ {
+ sDest = GetDocument()->GetRightBasePath();
+ sDest = paths_ConcatPath(sDest, di.left.path);
+ sDest = paths_ConcatPath(sDest, di.left.filename);
+ }
+ }
+
act.src = srFile;
- act.dest = slFile;
+ act.dest = sDest;
act.context = sel;
act.dirflag = di.diffcode.isDirectory();
act.atype = actType;
@@ -317,8 +332,23 @@
}
FileActionItem act;
+ String sDest(srFile);
+
+ if (GetDocument()->GetRecursive())
+ {
+ // If destination sides's relative path is empty it means we
+ // are copying unique items and need to get the real relative
+ // path from original side.
+ if (di.right.path.empty())
+ {
+ sDest = GetDocument()->GetRightBasePath();
+ sDest = paths_ConcatPath(sDest, di.left.path);
+ sDest = paths_ConcatPath(sDest, di.left.filename);
+ }
+ }
+
act.src = slFile;
- act.dest = srFile;
+ act.dest = sDest;
act.dirflag = di.diffcode.isDirectory();
act.context = sel;
act.atype = actType;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-02-04 17:24:56
|
Revision: 6413
http://winmerge.svn.sourceforge.net/winmerge/?rev=6413&view=rev
Author: gerundt
Date: 2009-02-04 17:24:53 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
BUG: [ 2551043 ] Fault in french installer.
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Installer/InnoSetup/Languages/French.isl
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 17:24:26 UTC (rev 6412)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 17:24:53 UTC (rev 6413)
@@ -29,6 +29,7 @@
- Chinese Traditional (#2540115)
- Czech (r6201)
- Dutch (#2481022, #2494378, #2499994)
+ - French (#2551043)
- Swedish (#2452467, #2465385, #2511043)
WinMerge 2.12.x (R2_12) branch created (r6202)
Modified: branches/R2_12/Installer/InnoSetup/Languages/French.isl
===================================================================
--- branches/R2_12/Installer/InnoSetup/Languages/French.isl 2009-02-04 17:24:26 UTC (rev 6412)
+++ branches/R2_12/Installer/InnoSetup/Languages/French.isl 2009-02-04 17:24:53 UTC (rev 6413)
@@ -319,7 +319,7 @@
TypicalInstallation=Installation Typique
FullInstallation=Installation Compl\xE8te
CompactInstallation=Installation Compacte
-CustomInstallation=Installation Personnaliser
+CustomInstallation=Installation Personalis\xE9e
;Components
AppCoreFiles=Fichiers Vitaux Winmerge
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-04 17:57:10
|
Revision: 6414
http://winmerge.svn.sourceforge.net/winmerge/?rev=6414&view=rev
Author: kimmov
Date: 2009-02-04 17:56:58 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
BUG: [ 2129561 ] Must Show Different to Show L/R Unique: Fldr Cmpr
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirDoc.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 17:24:53 UTC (rev 6413)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 17:56:58 UTC (rev 6414)
@@ -24,6 +24,7 @@
Bugfix: Creating new files caused message about missing files (#2515875)
Bugfix: Could not hide folders in recursive compare (#2528749)
Bugfix: Folder Compare:Copy Right/Left don't create folder
+ Bugfix: Must Show Different to Show L/R Unique (#2129561)
Translation updates:
- Brazilian (#2461443, #2524796)
- Chinese Traditional (#2540115)
Modified: branches/R2_12/Src/DirDoc.cpp
===================================================================
--- branches/R2_12/Src/DirDoc.cpp 2009-02-04 17:24:53 UTC (rev 6413)
+++ branches/R2_12/Src/DirDoc.cpp 2009-02-04 17:56:58 UTC (rev 6414)
@@ -410,18 +410,24 @@
// Subfolders in non-recursive compare can only be skipped or unique
if (!m_bRecursive)
{
+ // left/right filters
+ if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
+ return FALSE;
+ if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
+ return FALSE;
+
// result filters
if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
return FALSE;
-
+ }
+ else // recursive (perhaps tree?) mode
+ {
// left/right filters
if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
return FALSE;
if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
return FALSE;
- }
- else // recursive (perhaps tree?) mode
- {
+
// result filters
if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
return FALSE;
@@ -431,16 +437,16 @@
return FALSE;
if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
return FALSE;
- // left/right filters
- if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
- return FALSE;
- if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
- return FALSE;
-
}
}
else
{
+ // left/right filters
+ if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
+ return FALSE;
+ if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
+ return FALSE;
+
// file type filters
if (di.diffcode.isBin() && !GetOptionsMgr()->GetBool(OPT_SHOW_BINARIES))
return FALSE;
@@ -452,12 +458,6 @@
return FALSE;
if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
return FALSE;
-
- // left/right filters
- if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
- return FALSE;
- if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
- return FALSE;
}
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-04 18:03:33
|
Revision: 6415
http://winmerge.svn.sourceforge.net/winmerge/?rev=6415&view=rev
Author: kimmov
Date: 2009-02-04 18:03:27 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
BUG: [ 2556904 ] Can't copy files from right to left
- part of the fix from Marcel.
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirActions.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 17:56:58 UTC (rev 6414)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 18:03:27 UTC (rev 6415)
@@ -25,6 +25,7 @@
Bugfix: Could not hide folders in recursive compare (#2528749)
Bugfix: Folder Compare:Copy Right/Left don't create folder
Bugfix: Must Show Different to Show L/R Unique (#2129561)
+ Bugfix: Could not copy files from right to left (#2556904)
Translation updates:
- Brazilian (#2461443, #2524796)
- Chinese Traditional (#2540115)
Modified: branches/R2_12/Src/DirActions.cpp
===================================================================
--- branches/R2_12/Src/DirActions.cpp 2009-02-04 17:56:58 UTC (rev 6414)
+++ branches/R2_12/Src/DirActions.cpp 2009-02-04 18:03:27 UTC (rev 6415)
@@ -271,18 +271,18 @@
}
FileActionItem act;
- String sDest(srFile);
+ String sDest(slFile);
if (GetDocument()->GetRecursive())
{
// If destination sides's relative path is empty it means we
// are copying unique items and need to get the real relative
// path from original side.
- if (di.right.path.empty())
+ if (di.left.path.empty())
{
- sDest = GetDocument()->GetRightBasePath();
- sDest = paths_ConcatPath(sDest, di.left.path);
- sDest = paths_ConcatPath(sDest, di.left.filename);
+ sDest = GetDocument()->GetLeftBasePath();
+ sDest = paths_ConcatPath(sDest, di.right.path);
+ sDest = paths_ConcatPath(sDest, di.right.filename);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-02-04 18:48:11
|
Revision: 6417
http://winmerge.svn.sourceforge.net/winmerge/?rev=6417&view=rev
Author: gerundt
Date: 2009-02-04 18:48:05 +0000 (Wed, 04 Feb 2009)
Log Message:
-----------
BUG: [ 2551066 ] Fault in french option.
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/Src/Languages/French.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 18:45:55 UTC (rev 6416)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-04 18:48:05 UTC (rev 6417)
@@ -31,7 +31,7 @@
- Chinese Traditional (#2540115)
- Czech (r6201)
- Dutch (#2481022, #2494378, #2499994)
- - French (#2551043)
+ - French (#2551043, #2551066)
- Swedish (#2452467, #2465385, #2511043)
WinMerge 2.12.x (R2_12) branch created (r6202)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2009-02-04 18:45:55 UTC (rev 6416)
+++ branches/R2_12/Docs/Users/Contributors.txt 2009-02-04 18:48:05 UTC (rev 6417)
@@ -57,6 +57,7 @@
Jean-F Jolin <jea...@us...>
Gil Andre <gil...@co...>
Laurent Ganier <ccg...@cl...>
+ Dominique Saussereau <re...@us...>
Matthieu Pupat
* Galician:
Modified: branches/R2_12/Src/Languages/French.po
===================================================================
--- branches/R2_12/Src/Languages/French.po 2009-02-04 18:45:55 UTC (rev 6416)
+++ branches/R2_12/Src/Languages/French.po 2009-02-04 18:48:05 UTC (rev 6417)
@@ -5,6 +5,7 @@
# * Gil Andre <gil_andre at compuserve.com>
# * Laurent Ganier <ccganier at club-internet.fr>
# * Jean-F Jolin <jean-f-j at users.sourceforge.net>
+# * Dominique Saussereau <redguff at users.sourceforge.net>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -1289,7 +1290,7 @@
#: Merge.rc:768
#, c-format
msgid "All&ow only one instance to run"
-msgstr "&Permetre une seule instance en ex\xE9cution"
+msgstr "&Permettre une seule instance en ex\xE9cution"
#: Merge.rc:770
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-05 15:42:56
|
Revision: 6420
http://winmerge.svn.sourceforge.net/winmerge/?rev=6420&view=rev
Author: kimmov
Date: 2009-02-05 15:42:51 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
BUG: [ 2563314 ] Don't detect extensions for folder names
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirViewColItems.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-05 15:38:54 UTC (rev 6419)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-05 15:42:51 UTC (rev 6420)
@@ -26,6 +26,7 @@
Bugfix: Folder Compare:Copy Right/Left don't create folder
Bugfix: Must Show Different to Show L/R Unique (#2129561)
Bugfix: Could not copy files from right to left (#2556904)
+ Bugfix: Don't show file name extension for folders (#2563314)
Translation updates:
- Brazilian (#2461443, #2524796)
- Chinese Traditional (#2540115)
Modified: branches/R2_12/Src/DirViewColItems.cpp
===================================================================
--- branches/R2_12/Src/DirViewColItems.cpp 2009-02-05 15:38:54 UTC (rev 6419)
+++ branches/R2_12/Src/DirViewColItems.cpp 2009-02-05 15:42:51 UTC (rev 6420)
@@ -189,12 +189,16 @@
/**
* @brief Format Extension column data.
- * @param [in] p Pointer to String having extension string.
+ * @param [in] p Pointer to DIFFITEM.
* @return String to show in the column.
*/
static String ColExtGet(const CDiffContext *, const void *p) //sfilename
{
- const String &r = *static_cast<const String*>(p);
+ const DIFFITEM &di = *static_cast<const DIFFITEM*>(p);
+ // We don't show extension for folder names
+ if (di.diffcode.isDirectory())
+ return _T("");
+ const String &r = di.left.path;
LPCTSTR s = PathFindExtension(r.c_str());
return s + _tcsspn(s, _T("."));
}
@@ -827,7 +831,7 @@
{ _T("Rmtime"), IDS_COLHDR_RTIMEM, IDS_COLDESC_RTIMEM, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.mtime), 4, false, LVCFMT_LEFT },
{ _T("Lctime"), IDS_COLHDR_LTIMEC, IDS_COLDESC_LTIMEC, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, left.ctime), -1, false, LVCFMT_LEFT },
{ _T("Rctime"), IDS_COLHDR_RTIMEC, IDS_COLDESC_RTIMEC, &ColTimeGet, &ColTimeSort, FIELD_OFFSET(DIFFITEM, right.ctime), -1, false, LVCFMT_LEFT },
- { _T("Ext"), IDS_COLHDR_EXTENSION, IDS_COLDESC_EXTENSION, &ColExtGet, &ColExtSort, FIELD_OFFSET(DIFFITEM, left.filename), 5, true, LVCFMT_LEFT },
+ { _T("Ext"), IDS_COLHDR_EXTENSION, IDS_COLDESC_EXTENSION, &ColExtGet, &ColExtSort, 0, 5, true, LVCFMT_LEFT },
{ _T("Lsize"), IDS_COLHDR_LSIZE, IDS_COLDESC_LSIZE, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, left.size), -1, false, LVCFMT_RIGHT },
{ _T("Rsize"), IDS_COLHDR_RSIZE, IDS_COLDESC_RSIZE, &ColSizeGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, right.size), -1, false, LVCFMT_RIGHT },
{ _T("LsizeShort"), IDS_COLHDR_LSIZE_SHORT, IDS_COLDESC_LSIZE_SHORT, &ColSizeShortGet, &ColSizeSort, FIELD_OFFSET(DIFFITEM, left.size), -1, false, LVCFMT_RIGHT },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-05 15:55:16
|
Revision: 6421
http://winmerge.svn.sourceforge.net/winmerge/?rev=6421&view=rev
Author: kimmov
Date: 2009-02-05 15:55:13 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
BUG: [ 2477657 ] unicode file will be shown as textfiles
Fix submitted by Matthias Mayer
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/diffutils/src/IO.C
branches/R2_12/Src/diffutils/src/UTIL.C
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-05 15:42:51 UTC (rev 6420)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-05 15:55:13 UTC (rev 6421)
@@ -9,6 +9,7 @@
New options page for Shell Integration options (#2433648)
Remove Frhed hex editor from GUI (context menu) (r6376)
Register.bat should use Find with full path (#2536582)
+ Better Unicode file detection for full contents compare (2477657)
Bugfix: Could not open project file that contains an ampersand
character in folder names (#2372000)
Bugfix: File compare method "Modified Date and Size" ignored file size
Modified: branches/R2_12/Src/diffutils/src/IO.C
===================================================================
--- branches/R2_12/Src/diffutils/src/IO.C 2009-02-05 15:42:51 UTC (rev 6420)
+++ branches/R2_12/Src/diffutils/src/IO.C 2009-02-05 15:55:13 UTC (rev 6421)
@@ -88,6 +88,7 @@
struct file_data *current;
int skip_test;
{
+ int isbinary;
/* If we have a nonexistent file at this stage, treat it as empty. */
if (current->desc < 0)
{
@@ -129,7 +130,9 @@
current->buffered_chars);
if (current->buffered_chars == -1)
pfatal_with_name (current->name);
- return binary_file_p (current->buffer, current->buffered_chars);
+ isbinary = binary_file_p (current->buffer, current->buffered_chars);
+ isbinary &= !isunicode(current->buffer, current->buffered_chars);
+ return isbinary;
}
}
Modified: branches/R2_12/Src/diffutils/src/UTIL.C
===================================================================
--- branches/R2_12/Src/diffutils/src/UTIL.C 2009-02-05 15:42:51 UTC (rev 6420)
+++ branches/R2_12/Src/diffutils/src/UTIL.C 2009-02-05 15:55:13 UTC (rev 6421)
@@ -957,3 +957,56 @@
return 0;
}
#endif
+/**
+ * @brief Check if buffer contains Unicode encoded data.
+ * This function checks if the data in the buffer starts
+ * with BOM bytes.
+ * @param [in] pBuffer pointer to data.
+ * @return true if unicode, false binary.
+ * EF BB BF UTF-8
+ * FF FE UTF-16, little endian
+ * FE FF UTF-16, big endian
+ * FF FE 00 00 UTF-32, little endian
+ * 00 00 FE FF UTF-32, big-endian
+ */
+int isunicode(unsigned char *pBuffer, int size)
+{
+ int unicoding = 0;
+ if (size >= 2)
+ {
+ if (pBuffer[0] == 0xFF && pBuffer[1] == 0xFE)
+ {
+ unicoding = 1; //UNI little endian
+ return unicoding;
+ }
+ else if (pBuffer[0] == 0xFE && pBuffer[1] == 0xFF)
+ {
+ unicoding = 1; //UNI big endian
+ return unicoding;
+ }
+ }
+ if (!unicoding && (size >= 3))
+ {
+ if (pBuffer[0] == 0xEF && pBuffer[1] == 0xBB && pBuffer[2] == 0xBF)
+ {
+ unicoding = 1; //UTF-8
+ return unicoding;
+ }
+ }
+ if (!unicoding && (size >= 4))
+ {
+ if (pBuffer[0] == 0xFF && pBuffer[1] == 0xFE &&
+ pBuffer[2] == 0x00 && pBuffer[3] == 0x00)
+ {
+ unicoding = 1; //UTF-32, little endian
+ return unicoding;
+ }
+ else if (pBuffer[0] == 0x00 && pBuffer[1] == 0x00 &&
+ pBuffer[2] == 0xFE && pBuffer[3] == 0xFF)
+ {
+ unicoding = 1; //UTF-32, big endian
+ return unicoding;
+ }
+ }
+ return unicoding;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-05 18:27:03
|
Revision: 6425
http://winmerge.svn.sourceforge.net/winmerge/?rev=6425&view=rev
Author: kimmov
Date: 2009-02-05 18:26:58 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
PATCH: [ 2550911 ] Greek Translations Update: Installer, Interface, ReadMe
Submitted by Polyvios J. Simopoulos
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Languages/ReadMe-Greek.txt
branches/R2_12/Installer/InnoSetup/Languages/Greek.isl
branches/R2_12/Src/Languages/Greek.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-05 18:20:39 UTC (rev 6424)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-05 18:26:58 UTC (rev 6425)
@@ -34,6 +34,7 @@
- Czech (r6201)
- Dutch (#2481022, #2494378, #2499994)
- French (#2551043, #2551066)
+ - Greek (#2550911)
- Swedish (#2452467, #2465385, #2511043)
WinMerge 2.12.x (R2_12) branch created (r6202)
Modified: branches/R2_12/Docs/Users/Languages/ReadMe-Greek.txt
===================================================================
--- branches/R2_12/Docs/Users/Languages/ReadMe-Greek.txt 2009-02-05 18:20:39 UTC (rev 6424)
+++ branches/R2_12/Docs/Users/Languages/ReadMe-Greek.txt 2009-02-05 18:26:58 UTC (rev 6425)
@@ -1,74 +1,68 @@
WINMERGE
-\xD4\xEF WinMerge \xE5\xDF\xED\xE1\xE9 \xDD\xED\xE1 \xE5\xF1\xE3\xE1\xEB\xE5\xDF\xEF \xF3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xED \xEA\xE1\xE9 \xF3\xF5\xE3\xF7\xF9\xED\xE5\xFD\xF3\xE5\xF9\xED \xC1\xED\xEF\xE9\xEA\xF4\xEF\xFD \xCA\xFE\xE4\xE9\xEA\xE1 \xE3\xE9\xE1
-Windows. \xD4\xEF WinMerge \xEC\xF0\xEF\xF1\xE5\xDF \xED\xE1 \xF3\xF5\xE3\xEA\xF1\xDF\xED\xE5\xE9 \xE1\xEC\xF6\xFC\xF4\xE5\xF1\xE1 \xF6\xE1\xEA\xDD\xEB\xEF\xF5\xF2 \xEA\xE1\xE9 \xE1\xF1\xF7\xE5\xDF\xE1,
-\xF0\xE1\xF1\xEF\xF5\xF3\xE9\xDC\xE6\xEF\xED\xF4\xE1\xF2 \xF4\xE9\xF2 \xE4\xE9\xE1\xF6\xEF\xF1\xDD\xF2 \xF3\xE5 \xEC\xDF\xE1 \xEF\xF0\xF4\xE9\xEA\xDE \xEC\xEF\xF1\xF6\xDE \xEA\xE5\xE9\xEC\xDD\xED\xEF\xF5 \xF4\xE7\xF2 \xEF\xF0\xEF\xDF\xE1\xF2 \xE7 \xEA\xE1\xF4\xE1\xED\xFC\xE7\xF3\xE7
-\xEA\xE1\xE9 \xEF \xF7\xE5\xE9\xF1\xE9\xF3\xEC\xFC\xF2 \xE5\xDF\xED\xE1\xE9 \xE5\xFD\xEA\xEF\xEB\xE1. \xD4\xEF WinMerge \xEC\xF0\xEF\xF1\xE5\xDF \xED\xE1 \xF7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xE7\xE8\xE5\xDF \xF9\xF2 \xE5\xEE\xF9\xF4\xE5\xF1\xE9\xEA\xFC
-\xE5\xF1\xE3\xE1\xEB\xE5\xDF\xEF \xE4\xE9\xE1\xF6\xEF\xF1\xFE\xED/\xF3\xF5\xE3\xF7\xF9\xED\xE5\xFD\xF3\xE5\xF9\xED \xDE \xF9\xF2 \xEC\xDF\xE1 \xE1\xF5\xF4\xFC\xED\xEF\xEC\xE7 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE.
+\xD4\xEF WinMerge \xE5\xDF\xED\xE1\xE9 \xE5\xF1\xE3\xE1\xEB\xE5\xDF\xEF \xF3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xF9\xF2 \xEA\xE1\xE9 \xF3\xF5\xE3\xF7\xF9\xED\xE5\xFD\xF3\xE5\xF9\xF2 \xE1\xF1\xF7\xE5\xDF\xF9\xED, \xC5\xEB\xE5\xF5\xE8\xDD\xF1\xEF\xF5
+\xCA\xFE\xE4\xE9\xEA\xE1, \xF4\xEF \xEF\xF0\xEF\xDF\xEF \xE5\xDF\xED\xE1\xE9 \xF3\xF5\xEC\xE2\xE1\xF4\xFC \xEC\xE5 \xFC\xEB\xE5\xF2 \xF4\xE9\xF2 \xF3\xFD\xE3\xF7\xF1\xEF\xED\xE5\xF2 \xE5\xEA\xE4\xFC\xF3\xE5\xE9\xF2 \xF4\xEF\xF5 Windows.
+\xCF\xF1\xE9\xF3\xEC\xDD\xED\xE1 \xF7\xE1\xF1\xE1\xEA\xF4\xE7\xF1\xE9\xF3\xF4\xE9\xEA\xDC \xE1\xF0\xE1\xE9\xF4\xEF\xFD\xED \xF0\xF1\xFC\xF3\xE8\xE5\xF4\xE5\xF2 \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xE9\xF2 \xDE \xF3\xF4\xEF\xE9\xF7\xE5\xDF\xE1.
-\xD4\xEF WinMerge \xDD\xF7\xE5\xE9 \xF0\xEF\xEB\xEB\xDC \xF7\xF1\xDE\xF3\xE9\xEC\xE1 \xE2\xEF\xE7\xE8\xE7\xF4\xE9\xEA\xDC \xF7\xE1\xF1\xE1\xEA\xF4\xE7\xF1\xE9\xF3\xF4\xE9\xEA\xDC \xFE\xF3\xF4\xE5 \xED\xE1 \xEA\xE1\xE8\xE9\xF3\xF4\xDC \xF4\xE9\xF2
-\xF3\xF5\xE3\xEA\xF1\xDF\xF3\xE5\xE9\xF2, \xF4\xE9\xF2 \xE5\xED\xE7\xEC\xE5\xF1\xFE\xF3\xE5\xE9\xF2 \xEA\xE1\xE9 \xF4\xE9\xF2 \xF3\xF5\xE3\xF7\xF9\xED\xE5\xFD\xF3\xE5\xE9\xF2 \xFC\xF3\xEF \xF4\xEF \xE4\xF5\xED\xE1\xF4\xFC\xED \xE5\xFD\xEA\xEF\xEB\xE5\xF2 \xEA\xE1\xE9
-\xF7\xF1\xDE\xF3\xE9\xEC\xE5\xF2. \xC4\xE9\xDC\xF6\xEF\xF1\xE5\xF2 \xE3\xEB\xFE\xF3\xF3\xE5\xF2 \xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xEC\xEF\xFD \xEA\xE1\xE9 \xDC\xEB\xEB\xE5\xF2 \xEC\xEF\xF1\xF6\xDD\xF2 \xE1\xF1\xF7\xE5\xDF\xF9\xED
-\xF0\xE1\xF1\xEF\xF5\xF3\xE9\xDC\xE6\xEF\xED\xF4\xE1\xE9 \xEC\xE5 \xF7\xF1\xF9\xEC\xE1\xF4\xE9\xF3\xEC\xDD\xED\xEF \xEA\xFE\xE4\xE9\xEA\xE1.
+\xC7 \xF4\xE5\xEB\xE5\xF5\xF4\xE1\xDF\xE1 \xDD\xEA\xE4\xEF\xF3\xE7 \xF4\xEF\xF5 WinMerge \xEA\xE1\xE9 \xDC\xEB\xEB\xE5\xF2 \xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE5\xF2 \xE3\xE9\xE1 \xF4\xEF WinMerge
+\xE5\xDF\xED\xE1\xE9 \xE4\xE9\xE1\xE8\xDD\xF3\xE9\xEC\xE1 \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://winmerge.org
-\xC7 \xED\xE5\xFE\xF4\xE5\xF1\xE7 \xDD\xEA\xE4\xEF\xF3\xE7 \xF4\xEF\xF5 WinMerge \xEA\xE1\xE9 \xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE5\xF2 \xF3\xF7\xE5\xF4\xE9\xEA\xDD\xF2 \xEC\xE5 \xF4\xEF WinMerge \xE5\xDF\xED\xE1\xE9
-\xE4\xE9\xE1\xE8\xDD\xF3\xE9\xEC\xE5\xF2 \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://winmerge.org/.
+\xC3\xF1\xDE\xE3\xEF\xF1\xE7 \xE5\xE9\xF3\xE1\xE3\xF9\xE3\xDE \xF3\xF4\xEF WinMerge:
+\xC4\xE9\xE1\xE2\xDC\xF3\xF4\xE5 \xF4\xEF \xEA\xE5\xF6\xDC\xEB\xE1\xE9\xEF \xC3\xF1\xDE\xE3\xEF\xF1\xE7 \xC5\xE9\xF3\xE1\xE3\xF9\xE3\xDE \xF4\xEF\xF5 \xE5\xE3\xF7\xE5\xE9\xF1\xE9\xE4\xDF\xEF\xF5 \xF3\xF4\xEF \xE4\xE9\xE1\xE4\xDF\xEA\xF4\xF5\xEF (\xF3\xF4\xE1
+\xC1\xE3\xE3\xEB\xE9\xEA\xDC) \xE3\xE9\xE1 \xED\xE1 \xEE\xE5\xEA\xE9\xED\xDE\xF3\xE5\xF4\xE5 \xED\xE1 \xF7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xE5\xDF\xF4\xE5 \xF4\xEF WinMerge:
+http://winmerge.org/docs/manual/QuickStart.html
-\xC3\xF1\xDE\xE3\xEF\xF1\xE7 \xC5\xEA\xEA\xDF\xED\xE7\xF3\xE7
-================
-\xC3\xE9\xE1 \xED\xE1 \xEC\xDC\xE8\xE5\xF4\xE5 \xF0\xFE\xF2 \xED\xE1 \xE5\xEA\xF4\xE5\xEB\xDD\xF3\xE5\xF4\xE5 \xE2\xE1\xF3\xE9\xEA\xDD\xF2 \xEB\xE5\xE9\xF4\xEF\xF5\xF1\xE3\xDF\xE5\xF2 \xE1\xF6\xEF\xFD \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDE\xF3\xE5\xF4\xE5 \xF4\xEF
-WinMerge, \xE5\xF0\xE9\xEB\xDD\xEE\xF4\xE5 \xC2\xEF\xDE\xE8\xE5\xE9\xE1>\xC2\xEF\xDE\xE8\xE5\xE9\xE1 WinMerge \xEA\xE1\xE9 \xE1\xED\xE1\xE6\xE7\xF4\xDE\xF3\xF4\xE5 \xF4\xEF \xEB\xDE\xEC\xEC\xE1 \xC3\xF1\xDE\xE3\xEF\xF1\xE7
-\xE5\xEA\xEA\xDF\xED\xE7\xF3\xE7. \xB9, \xF0\xE7\xE3\xE1\xDF\xED\xE5\xF4\xE5 \xF3\xF4\xEF \xE1\xED\xF4\xDF\xF3\xF4\xEF\xE9\xF7\xEF \xEB\xDE\xEC\xEC\xE1 \xF3\xF4\xEF\xED \xC9\xF3\xF4\xFC \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
-http://winmerge.org/docs/manual/QuickStart.html.
+\xC5\xE3\xF7\xE5\xE9\xF1\xDF\xE4\xE9\xEF HTML:
+\xD4\xEF \xE5\xE3\xF7\xE5\xE9\xF1\xDF\xE4\xE9\xEF \xE5\xDF\xED\xE1\xE9 \xE4\xE9\xE1\xE8\xDD\xF3\xE9\xEC\xEF \xF3\xF4\xEF \xE4\xE9\xE1\xE4\xDF\xEA\xF4\xF5\xEF \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
+http://winmerge.org/docs/manual/
+\xE5\xDF\xED\xE1\xE9 \xE5\xF0\xDF\xF3\xE7\xF2 \xF0\xE9\xE8\xE1\xED\xFE\xF2 \xE5\xE3\xEA\xE1\xF4\xE5\xF3\xF4\xE7\xEC\xDD\xED\xEF (\xE5\xDC\xED \xE5\xF0\xE5\xEB\xDD\xE3\xE7) \xF4\xEF\xF0\xE9\xEA\xDC \xEA\xE1\xE9 \xE5\xDF\xED\xE1\xE9 \xE4\xF5\xED\xE1\xF4\xFC\xED
+\xED\xE1 \xEC\xE5\xF4\xE1\xF6\xE5\xF1\xE8\xE5\xDF \xEE\xE5\xF7\xF9\xF1\xE9\xF3\xF4\xDC \xE1\xF0\xFC \xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://winmerge.org/
+(\xE2\xEB. \xF3\xF5\xED\xEF\xE4\xE5\xF5\xF4\xE9\xEA\xFC \xEA\xE1\xF4\xE1\xF4\xEF\xF0\xE9\xF3\xF4\xE9\xEA\xFC \xF5\xEB\xE9\xEA\xFC)
-\xC2\xEF\xDE\xE8\xE5\xE9\xE1 WinMerge
-================
-\xC7 \xC2\xEF\xDE\xE8\xE5\xE9\xE1 \xF4\xEF\xF5 WinMerge \xE5\xE3\xEA\xE1\xE8\xDF\xF3\xF4\xE1\xF4\xE1\xE9 \xF4\xEF\xF0\xE9\xEA\xDC \xF9\xF2 \xDD\xED\xE1 \xE1\xF1\xF7\xE5\xDF\xEF \xC2\xEF\xE7\xE8\xE5\xDF\xE1\xF2 HTML \xF4\xE7\xF2
-Microsoft, WinMerge.chm, \xFC\xF4\xE1\xED \xE5\xE3\xEA\xE1\xE8\xE9\xF3\xF4\xDC\xF4\xE5 \xF4\xEF WinMerge. \xC3\xE9\xE1 \xED\xE1 \xE1\xED\xEF\xDF\xEE\xE5\xF4\xE5 \xF4\xE7
-\xC2\xEF\xDE\xE8\xE5\xE9\xE1, \xE5\xF0\xE9\xEB\xDD\xEE\xF4\xE5 \xC2\xEF\xDE\xE8\xE5\xE9\xE1>\xC2\xEF\xDE\xE8\xE5\xE9\xE1 WinMerge \xDE \xF0\xE1\xF4\xDE\xF3\xF4\xE5 \xF4\xEF F1 \xF3\xF4\xEF \xF0\xE1\xF1\xDC\xE8\xF5\xF1\xEF \xF4\xEF\xF5
-WinMerge. \xD3\xF4\xE7 \xE3\xF1\xE1\xEC\xEC\xDE \xE5\xED\xF4\xEF\xEB\xDE\xF2, \xF4\xF1\xDD\xEE\xF4\xE5 \xF4\xEF \xE5\xEA\xF4\xE5\xEB\xDD\xF3\xE9\xEC\xEF \xF4\xEF\xF5 WinMerge \xEC\xE5 \xF4\xE7\xED \xF0\xE1\xF1\xDC\xEC\xE5\xF4\xF1\xEF
-\xE2\xEF\xE7\xE8\xE5\xDF\xE1\xF2 /?.
+\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xD3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xC1\xF1\xF7\xE5\xDF\xF9\xED:
+\xD4\xEF WinMerge \xF7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xE5\xDF \xF4\xEF 7-zip \xE3\xE9\xE1 \xF4\xE7\xED \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.
+\xD4\xEF 7-zip (http://www.7-zip.org) \xE5\xDF\xED\xE1\xE9 \xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xFC/\xE1\xF0\xEF\xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xFC \xE5\xF1\xE3\xE1\xEB\xE5\xDF\xEF,
+\xC5\xEB\xE5\xF5\xE8\xDD\xF1\xEF\xF5 \xCA\xFE\xE4\xE9\xEA\xE1. \xC3\xE9\xE1 \xF4\xE7\xED \xE5\xE3\xEA\xE1\xF4\xDC\xF3\xF4\xE1\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,
+\xEC\xE5\xF4\xE1\xF6\xDD\xF1\xE1\xF4\xE5 \xF4\xEF \xF0\xE1\xEA\xDD\xF4\xEF \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 \xE1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xEF\xF2 7-zip \xE1\xF0\xFC \xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
+http://winmerge.org/.
-\xCC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xE5\xF0\xDF\xF3\xE7\xF2 \xED\xE1 \xE1\xED\xE1\xF4\xF1\xDD\xEE\xE5\xF4\xE5 \xF4\xE7\xED \xDD\xEA\xE4\xEF\xF3\xE7 HTML \xF4\xE7\xF2 \xC2\xEF\xE7\xE8\xE5\xDF\xE1\xF2 \xF4\xEF\xF5 WinMerge \xF3\xF4\xE7
-\xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://winmerge.org/docs/manual/.
+\xC5\xE3\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xD5\xF0\xEF\xF3\xF4\xE7\xF1\xDF\xEE\xE5\xF9\xF2 \xD3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xC1\xF1\xF7\xE5\xDF\xF9\xED:
+\xD3\xF5\xED\xE9\xF3\xF4\xDC\xF4\xE1\xE9 \xE7 \xE5\xE3\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xF4\xE7\xF2 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE\xF2 7-zip. \xC5\xDC\xED \xE1\xF5\xF4\xFC \xE4\xE5\xED \xE5\xDF\xED\xE1\xE9 \xE4\xF5\xED\xE1\xF4\xFC\xED
+\xE3\xE9\xE1 \xEA\xDC\xF0\xEF\xE9\xEF \xEB\xFC\xE3\xEF, \xF4\xEF \xF0\xE1\xEA\xDD\xF4\xEF \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 \xE1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xEF\xF2 7-zip \xE5\xDF\xED\xE1\xE9 \xE4\xF5\xED\xE1\xF4\xFC\xED
+\xED\xE1 \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDE\xF3\xE5\xE9 \xEC\xFC\xED\xEF \xF4\xE1 \xE1\xF0\xE1\xE9\xF4\xEF\xFD\xEC\xE5\xED\xE1 \xE1\xF1\xF7\xE5\xDF\xE1 \xFE\xF3\xF4\xE5 \xED\xE1 \xE5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xE9\xE7\xE8\xE5\xDF \xE7 \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. \xD3\xE7\xEC\xE5\xE9\xFE\xF3\xF4\xE5 \xFC\xF4\xE9 \xC4\xC5\xCD \xC5\xD0\xC9\xD4\xD1\xC5\xD0\xC5\xC9 \xE1\xF5\xF4\xFC\xED\xEF\xEC\xE7 \xF7\xF1\xDE\xF3\xE7 \xF4\xEF\xF5 7-zip,
+\xEC\xFC\xED\xEF \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 \xE3\xE9\xE1 \xF4\xEF WinMerge.
-\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xD3\xF5\xEC\xF0\xE9\xE5\xF3\xEC\xDD\xED\xF9\xED \xC1\xF1\xF7\xE5\xDF\xF9\xED
-===============================
-\xD4\xEF WinMerge \xF7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xE5\xDF \xF4\xEF \xC1\xED\xEF\xE9\xEA\xF4\xEF\xFD \xCA\xFE\xE4\xE9\xEA\xE1 \xE5\xF1\xE3\xE1\xEB\xE5\xDF\xEF [\xE1\xF0\xEF-]\xF3\xF5\xEC\xF0\xE9\xDD\xF3\xE5\xF9\xF2 \xE1\xF1\xF7\xE5\xDF\xF9\xED
-7-Zip (http://www.7-zip.org) \xE3\xE9\xE1 \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. \xD3\xF5\xED\xE9\xF3\xF4\xEF\xFD\xEC\xE5 \xF4\xE7\xED
-\xE5\xE3\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xF4\xE7\xF2 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE\xF2 7-Zip \xEC\xDD\xF3\xF9 \xF4\xE7\xF2 \xEC\xE5\xF4\xE1\xF6\xEF\xF1\xDC\xF2 \xEA\xE1\xE9 \xE5\xEA\xF4\xE5\xEB\xDD\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 \xE1\xF1\xF7\xE5\xDF\xEF\xF5
-\xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 \xE1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xEF\xF2 7-Zip \xE1\xF0\xFC \xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
-http://winmerge.org/downloads/.
+\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xC1\xF1\xF7\xE5\xDF\xF9\xED \xCC\xE1\xEA\xF1\xEF\xE5\xED\xF4\xEF\xEB\xFE\xED (Scripts):
+\xC5\xDC\xED \xE5\xF0\xE9\xE8\xF5\xEC\xE5\xDF\xF4\xE5 \xED\xE1 \xE5\xF1\xE3\xDC\xE6\xE5\xF3\xE8\xE5 \xEC\xE5 \xE1\xF1\xF7\xE5\xDF\xE1 \xEC\xE1\xEA\xF1\xEF\xE5\xED\xF4\xEF\xEB\xFE\xED \xF7\xF1\xE5\xE9\xDC\xE6\xE5\xF4\xE1\xE9 \xED\xE1 \xDD\xF7\xE5\xF4\xE5
+\xE5\xE3\xEA\xE1\xF4\xE5\xF3\xF4\xE7\xEC\xDD\xED\xEF \xF4\xEF Windows Scripting Host (\xC4\xE9\xE5\xF1\xEC\xE7\xED\xDD\xE1\xF2 \xC1\xF1\xF7\xE5\xDF\xF9\xED \xCC\xE1\xEA\xF1\xEF\xE5\xED\xF4\xEF\xEB\xFE\xED
+\xF4\xEF\xF5 Windows). \xC5\xDC\xED \xF3\xE1\xF2 \xE5\xEC\xF6\xE1\xED\xE9\xF3\xE8\xEF\xFD\xED \xEF\xF0\xEF\xE9\xE1\xE4\xDE\xF0\xEF\xF4\xE5 \xEC\xE7\xED\xFD\xEC\xE1\xF4\xE1 \xF3\xF6\xE1\xEB\xEC\xDC\xF4\xF9\xED \xF3\xF7\xE5\xF4\xE9\xEA\xDC \xEC\xE5
+\xF4\xE1 \xE1\xF1\xF7\xE5\xDF\xE1 \xF3\xE1\xF2 \xEC\xE1\xEA\xF1\xEF\xE5\xED\xF4\xEF\xEB\xFE\xED \xF0\xE1\xF1\xE1\xEA\xE1\xEB\xEF\xFD\xEC\xE5 \xE5\xF0\xE9\xF3\xEA\xE5\xF6\xE8\xE5\xDF\xF4\xE5 \xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
+http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
+\xFE\xF3\xF4\xE5 \xED\xE1 \xE5\xEE\xE1\xF3\xF6\xE1\xEB\xDF\xF3\xE5\xF4\xE5 \xFC\xF4\xE9 \xEF Scripting Host \xF3\xE1\xF2 \xE5\xDF\xED\xE1\xE9 \xEA\xE1\xE9 \xE5\xED\xE7\xEC\xE5\xF1\xF9\xEC\xDD\xED\xEF\xF2 (\xE7 \xF0\xEB\xDD\xEF\xED
+\xF0\xF1\xFC\xF3\xF6\xE1\xF4\xE7 \xDD\xEA\xE4\xEF\xF3\xE7) \xEA\xE1\xE9 \xE1\xEA\xDD\xF1\xE1\xE9\xEF\xF2.
-\xC5\xDC\xED \xE4\xE5\xED \xEC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xED\xE1 \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDE\xF3\xE5\xF4\xE5 \xF4\xEF \xE5\xF1\xE3\xE1\xEB\xE5\xDF\xEF 7-Zip \xE3\xE9\xE1 \xEF\xF0\xEF\xE9\xEF\xED\xE4\xDE\xF0\xEF\xF4\xE5 \xEB\xFC\xE3\xEF,
-\xEC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xED\xE1 \xF7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xDE\xF3\xE5\xF4\xE5 \xF4\xEF \xE1\xF1\xF7\xE5\xDF\xEF \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 \xE1\xF1\xE8\xF1\xFE\xEC\xE1\xF4\xEF\xF2 7-Zip \xFE\xF3\xF4\xE5 \xED\xE1
-\xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDE\xF3\xE5\xF4\xE5 \xEC\xFC\xED\xEF \xF4\xE1 \xE1\xF1\xF7\xE5\xDF\xE1 \xF4\xE1 \xE1\xF0\xE1\xE9\xF4\xEF\xFD\xEC\xE5\xED\xE1 \xE3\xE9\xE1 \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.
-\xC4\xE5\xDF\xF4\xE5 \xF4\xEF \xEB\xDE\xEC\xEC\xE1 \xC2\xEF\xE7\xE8\xE5\xDF\xE1\xF2, \xAB7-Zip \xEA\xE1\xE9 \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\xBB \xE3\xE9\xE1
-\xEB\xE5\xF0\xF4\xEF\xEC\xDD\xF1\xE5\xE9\xE5\xF2.
+\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7:
+\xCF\xE9 \xE4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xEF\xDF \xE1\xF0\xE1\xED\xF4\xEF\xFD\xED \xE5\xF1\xF9\xF4\xDE\xEC\xE1\xF4\xE1 \xF3\xF4\xE1 forum (\xEF\xEC\xDC\xE4\xE5\xF2 \xF3\xF5\xE6\xE7\xF4\xDE\xF3\xE5\xF9\xED) \xF4\xEF\xF5 WinMerge,
+\xF3\xF4\xEF Sourceforge.net: http://sourceforge.net/forum/?group_id=13216
-\xD5\xF0\xEF\xF3\xF4\xDE\xF1\xE9\xEE\xE7 \xF4\xEF\xF5 WinMerge
-=======================
-\xC5\xF1\xF9\xF4\xDE\xEC\xE1\xF4\xE1 \xDE \xF5\xF0\xEF\xE4\xE5\xDF\xEE\xE5\xE9\xF2 \xF3\xF7\xE5\xF4\xE9\xEA\xDC \xEC\xE5 \xF4\xEF WinMerge; \xB8\xED\xE1 \xEA\xE1\xEB\xFC \xEC\xDD\xF1\xEF\xF2 \xE3\xE9\xE1 \xE1\xF1\xF7\xDE \xE5\xDF\xED\xE1\xE9 \xEF
-\xF0\xDF\xED\xE1\xEA\xE1\xF2 \xE1\xED\xE1\xEA\xEF\xE9\xED\xFE\xF3\xE5\xF9\xED \xF4\xE7\xF2 \xEA\xEF\xE9\xED\xFC\xF4\xE7\xF4\xE1\xF2 \xF4\xEF\xF5 WinMerge \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7
-http://forums.winmerge.org/. \xCF\xE9 \xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xDD\xF2 \xF3\xF5\xF7\xED\xDC \xE4\xE9\xE1\xE2\xDC\xE6\xEF\xF5\xED \xEA\xE1\xE9 \xE1\xF0\xE1\xED\xF4\xEF\xFD\xED \xF3\xE5
-\xE5\xF1\xF9\xF4\xDE\xEC\xE1\xF4\xE1 \xF3\xE5 \xE1\xEC\xF6\xFC\xF4\xE5\xF1\xE1 \xF4\xE1 fora. \xD7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xDE\xF3\xF4\xE5 \xF4\xEF forum \xC1\xED\xEF\xE9\xEA\xF4\xFE\xED \xD3\xF5\xE6\xE7\xF4\xDE\xF3\xE5\xF9\xED \xE3\xE9\xE1
-\xE3\xE5\xED\xE9\xEA\xDC \xE8\xDD\xEC\xE1\xF4\xE1 \xF4\xEF\xF5 WinMerge, \xFC\xF0\xF9\xF2 \xE5\xF1\xF9\xF4\xDE\xEC\xE1\xF4\xE1 \xF3\xF7\xE5\xF4\xE9\xEA\xDC \xEC\xE5 \xF4\xE7 \xF7\xF1\xDE\xF3\xE7. \xD7\xF1\xE7\xF3\xE9\xEC\xEF\xF0\xEF\xE9\xDE\xF3\xF4\xE5
-\xF4\xEF forum \xF4\xF9\xED \xD0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xFE\xED \xE3\xE9\xE1 \xE8\xDD\xEC\xE1\xF4\xE1 \xF0\xEF\xF5 \xE1\xF6\xEF\xF1\xEF\xFD\xED \xF3\xF4\xEF\xED \xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xEC\xFC \xF4\xEF\xF5
-WinMerge.
+\xD0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xE9\xEA\xDC \xD3\xF6\xDC\xEB\xEC\xE1\xF4\xE1 (Bugs) \xEA\xE1\xE9 \xC1\xE9\xF4\xDE\xF3\xE5\xE9\xF2 \xE3\xE9\xE1 \xE5\xF0\xDF \xF0\xEB\xDD\xEF\xED \xC4\xF5\xED\xE1\xF4\xFC\xF4\xE7\xF4\xE5\xF2:
+\xD0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xE9\xEA\xDC \xF3\xF6\xDC\xEB\xEC\xE1\xF4\xE1 \xEA\xE1\xE9 \xF0\xF1\xEF\xF4\xDC\xF3\xE5\xE9\xF2 \xE3\xE9\xE1 \xED\xDD\xE1 \xF7\xE1\xF1\xE1\xEA\xF4\xE7\xF1\xE9\xF3\xF4\xE9\xEA\xDC \xE8\xE1 \xF0\xF1\xDD\xF0\xE5\xE9
+\xED\xE1 \xF5\xF0\xEF\xE2\xDC\xEB\xEB\xEF\xED\xF4\xE1\xE9 \xF3\xF4\xE1 \xF0\xF1\xF9\xF4\xFC\xEA\xEF\xEB\xE1 (trackers) \xF3\xF6\xE1\xEB\xEC\xDC\xF4\xF9\xED \xEA\xE1\xE9 \xE1\xE9\xF4\xDE\xF3\xE5\xF9\xED \xE3\xE9\xE1 \xE5\xF0\xDF
+\xF0\xEB\xDD\xEF\xED \xE4\xF5\xED\xE1\xF4\xFC\xF4\xE7\xF4\xE5\xF2 (RFE: Requests for Enhancements) \xF3\xF4\xEF sourceforge.net.
-\xD3\xF6\xDC\xEB\xEC\xE1\xF4\xE1 \xEA\xE1\xE9 \xE1\xE9\xF4\xDE\xF3\xE5\xE9\xF2 \xF7\xE1\xF1\xE1\xEA\xF4\xE7\xF1\xE9\xF3\xF4\xE9\xEA\xFE\xED
-=====================================
-\xC5\xDC\xED \xEA\xDC\xF0\xEF\xE9\xEF \xE8\xDD\xEC\xE1 \xE4\xE5\xED \xE5\xF0\xE9\xEB\xFD\xE5\xF4\xE1\xE9 \xF3\xF4\xE1 fora \xF4\xEF\xF5 WinMerge, \xE5\xEB\xDD\xE3\xEE\xF4\xE5 \xF4\xE7\xED \xEA\xE1\xF4\xE1\xE3\xF1\xE1\xF6\xDE
-\xE4\xF1\xE1\xF3\xF4\xE7\xF1\xE9\xFC\xF4\xE7\xF4\xE1\xF2 \xF4\xEF\xF5 \xDD\xF1\xE3\xEF\xF5: \xF0\xE7\xE3\xE1\xDF\xED\xE5\xF4\xE5 \xF3\xF4\xE7 \xE4\xE9\xE5\xFD\xE8\xF5\xED\xF3\xE7 http://project.winmerge.org/,
-\xEA\xE1\xE9 \xE5\xF0\xE9\xEB\xDD\xEE\xF4\xE5 \xEC\xDF\xE1 \xF0\xE1\xF1\xE1\xF0\xEF\xEC\xF0\xDE \xF3\xF4\xEF \xEC\xE5\xED\xEF\xFD Trackers, \xFC\xF0\xF9\xF2 \xD3\xF6\xDC\xEB\xEC\xE1\xF4\xE1 \xEA\xE1\xE9 \xC1\xE9\xF4\xDE\xF3\xE5\xE9\xF2
-\xD7\xE1\xF1\xE1\xEA\xF4\xE7\xF1\xE9\xF3\xF4\xE9\xEA\xFE\xED, \xFC\xF0\xEF\xF5 \xEC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xED\xE1 \xEC\xE5\xEB\xE5\xF4\xDE\xF3\xE5\xF4\xE5 \xDE \xED\xE1 \xF5\xF0\xEF\xE2\xDC\xEB\xE5\xF4\xE5 \xF3\xF4\xEF\xE9\xF7\xE5\xDF\xE1.
+\xD0\xF1\xF9\xF4\xFC\xEA\xEF\xEB\xEF \xD0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xE9\xEA\xFE\xED \xD3\xF6\xE1\xEB\xEC\xDC\xF4\xF9\xED:
+http://sourceforge.net/tracker/?group_id=13216&atid=113216
+\xBC\xF4\xE1\xED \xE1\xED\xE1\xF6\xDD\xF1\xE5\xF4\xE5 \xDD\xED\xE1 \xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xE9\xEA\xFC \xF3\xF6\xDC\xEB\xEC\xE1, \xF0\xE1\xF1\xE1\xEA\xE1\xEB\xEF\xFD\xEC\xE5 \xF0\xE5\xDF\xF4\xE5 \xEC\xE1\xF2 \xE3\xE9\xE1
+\xF4\xEF\xED \xE1\xF1\xE9\xE8\xEC\xFC \xE5\xEA\xE4\xFC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 WinMerge! \xCF\xE9 \xE5\xEA\xE4\xFC\xF3\xE5\xE9\xF2 \xF4\xEF\xF5 WinMerge 2.2.0 \xEA\xE1\xE9
+\xEC\xE5\xF4\xE1\xE3\xE5\xED\xDD\xF3\xF4\xE5\xF1\xE5\xF2 \xDD\xF7\xEF\xF5\xED \xF4\xE7 \xE4\xF5\xED\xE1\xF4\xFC\xF4\xE7\xF4\xE1 \xED\xE1 \xE4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDE\xF3\xEF\xF5\xED "\xCA\xE1\xF4\xE1\xE3\xF1\xE1\xF6\xDE \xD1\xF5\xE8\xEC\xDF\xF3\xE5\xF9\xED"
+\xE1\xF0\xFC \xF4\xE7\xED \xE5\xF0\xE9\xEB\xEF\xE3\xDE \xC2\xEF\xDE\xE8\xE5\xE9\xE1/\xD1\xF5\xE8\xEC\xDF\xF3\xE5\xE9\xF2. \xD0\xE1\xF1\xE1\xEA\xE1\xEB\xEF\xFD\xEC\xE5 \xE5\xF0\xE9\xF3\xF5\xED\xDC\xF8\xE1\xF4\xE5 \xE1\xF5\xF4\xDD\xF2 \xF4\xE9\xF2
+\xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE5\xF2 (\xF9\xF2 \xF3\xF5\xED\xE7\xEC\xEC\xDD\xED\xEF \xE1\xF1\xF7\xE5\xDF\xEF) \xF3\xF4\xE7\xED \xE1\xED\xE1\xF6\xEF\xF1\xDC \xF3\xE1\xF2 \xE3\xE9\xE1 \xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xE9\xEA\xFC
+\xF3\xF6\xDC\xEB\xEC\xE1, \xF0\xE5\xF1\xE9\xDD\xF7\xEF\xF5\xED \xF0\xEB\xDE\xE8\xEF\xF2 \xF7\xF1\xE7\xF3\xDF\xEC\xF9\xED \xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xE9\xFE\xED \xE3\xE9\xE1 \xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xDD\xF2.
-\xC5\xDC\xED \xF5\xF0\xEF\xE2\xDC\xEB\xE5\xF4\xE5 \xEA\xDC\xF0\xEF\xE9\xE1 \xE1\xED\xE1\xF6\xEF\xF1\xDC \xF3\xF6\xDC\xEB\xEC\xE1\xF4\xEF\xF2, \xF0\xE1\xF1\xE1\xEA\xE1\xEB\xEF\xFD\xEC\xE5 \xF3\xF5\xEC\xF0\xE5\xF1\xE9\xEB\xDC\xE2\xE5\xF4\xE5 \xF4\xEF\xED \xE1\xF1\xE9\xE8\xEC\xFC
-\xE5\xEA\xE4\xFC\xF3\xE5\xF9\xF2 \xF4\xEF\xF5 WinMerge \xF3\xF4\xE7\xED \xE1\xED\xE1\xF6\xEF\xF1\xDC \xF3\xE1\xF2. \xCC\xF0\xEF\xF1\xE5\xDF\xF4\xE5 \xED\xE1 \xE4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDE\xF3\xE5\xF4\xE5 \xEC\xDF\xE1 \xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7
-\xF1\xF5\xE8\xEC\xDF\xF3\xE5\xF9\xED \xE5\xF0\xE9\xEB\xDD\xE3\xEF\xED\xF4\xE1\xF2 \xC2\xEF\xDE\xE8\xE5\xE9\xE1>\xD1\xF5\xE8\xEC\xDF\xF3\xE5\xE9\xF2. \xD0\xE1\xF1\xE1\xEA\xE1\xEB\xEF\xFD\xEC\xE5 \xE5\xF0\xE9\xF3\xF5\xED\xDC\xF8\xF4\xE5 \xF4\xE7\xED \xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7
-\xF1\xF5\xE8\xEC\xDF\xF3\xE5\xF9\xED \xF3\xF4\xE7\xED \xE1\xED\xE1\xF6\xEF\xF1\xDC \xF3\xF6\xDC\xEB\xEC\xE1\xF4\xEF\xF2\xB7 \xDD\xF7\xE5\xE9 \xF0\xEF\xEB\xEB\xDD\xF2 \xF7\xF1\xDE\xF3\xE9\xEC\xE5\xF2 \xF0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE5\xF2 \xE3\xE9\xE1
-\xF0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xDD\xF2.
+\xD0\xF1\xF9\xF4\xFC\xEA\xEF\xEB\xEF \xC1\xE5\xC4 (\xC1\xE9\xF4\xDE\xF3\xE5\xF9\xED \xE3\xE9\xE1 \xE5\xF0\xDF \xF0\xEB\xDD\xEF\xED \xC4\xF5\xED\xE1\xF4\xFC\xF4\xE7\xF4\xE5\xF2):
+http://sourceforge.net/tracker/?group_id=13216&atid=363216
-- \xCF\xE9 \xD0\xF1\xEF\xE3\xF1\xE1\xEC\xEC\xE1\xF4\xE9\xF3\xF4\xDD\xF2 \xF4\xEF\xF5 WinMerge
+- \xCF\xE9 \xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xEF\xDF \xF4\xEF\xF5 WinMerge
Modified: branches/R2_12/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- branches/R2_12/Installer/InnoSetup/Languages/Greek.isl 2009-02-05 18:20:39 UTC (rev 6424)
+++ branches/R2_12/Installer/InnoSetup/Languages/Greek.isl 2009-02-05 18:26:58 UTC (rev 6425)
@@ -345,9 +345,9 @@
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
+GalicianLanguage=\xC3\xE1\xEB\xE9\xEA\xE9\xE1\xED\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
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
+GreekLanguage=\xC5\xEB\xEB\xE7\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
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
ItalianLanguage=\xC9\xF4\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
JapaneseLanguage=\xC9\xE1\xF0\xF9\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
@@ -356,14 +356,14 @@
PolishLanguage=\xD0\xEF\xEB\xF9\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
PortugueseBrazilLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC (\xC2\xF1\xE1\xE6\xE9\xEB\xDF\xE1\xF2) \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
PortugueseLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
-RomanianLanguage=Romanian menus and dialogs
+RomanianLanguage=\xD1\xEF\xF5\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
RussianLanguage=\xD1\xF9\xF3\xF3\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SlovakLanguage=\xD3\xEB\xEF\xE2\xE1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
-SlovenianLanguage=Slovenian menus and dialogs
+SlovenianLanguage=\xD3\xEB\xEF\xE2\xE5\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SpanishLanguage=\xC9\xF3\xF0\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SwedishLanguage=\xD3\xEF\xF5\xE7\xE4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
TurkishLanguage=\xD4\xEF\xF5\xF1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
-UkrainianLanguage=Ukrainian menus and dialogs
+UkrainianLanguage=\xCF\xF5\xEA\xF1\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
;Tasks
ExplorerContextMenu=\xC5\xED&\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xE5\xED\xF3\xF9\xEC\xE1\xF4\xFE\xF3\xE5\xF9\xF2 \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
@@ -375,10 +375,10 @@
;Icon Labels
ReadMe=\xC1\xF0\xE1\xF1\xE1\xDF\xF4\xE7\xF4\xE5\xF2 \xD0\xEB\xE7\xF1\xEF\xF6\xEF\xF1\xDF\xE5\xF2 (Read Me)
UsersGuide=\xCF\xE4\xE7\xE3\xDF\xE5\xF2 \xD7\xF1\xDE\xF3\xE5\xF9\xF2
-ViewStartMenuFolder=\xC5\xEC\xF6\xDC\xED\xE9\xF3\xE7 \xF4\xEF\xF5 \xD6\xE1\xEA\xDD\xEB\xEF\xF5 \xF4\xEF\xF5 WinMerge \xF3\xF4\xEF \xB8\xED\xE1\xF1\xEE\xE7
+ViewStartMenuFolder=\xC5\xEC\xF6\xDC\xED\xE9\xF3\xE7 \xF4\xEF\xF5 \xD6\xE1\xEA\xDD\xEB\xEF\xF5 \xF4\xEF\xF5 WinMerge \xF3\xF4\xE7\xED \xB8\xED\xE1\xF1\xEE\xE7
;Code Dialogs
-DeletePreviousStartMenu=\xC7 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xF9\xF2 \xE1\xED\xDF\xF7\xED\xE5\xF5\xF3\xE5 \xFC\xF4\xE9 \xE1\xEB\xEB\xDC\xEE\xE1\xF4\xE5 \xF4\xE7\xED \xF4\xEF\xF0\xEF\xE8\xE5\xF3\xDF\xE1 \xF4\xEF\xF5 \xF6\xE1\xEA\xDD\xEB\xEF\xF5 \xF3\xF4\xEF \xB8\xED\xE1\xF1\xEE\xE7 \xE1\xF0\xFC "%s" \xF3\xE5 "%s". \xC5\xF0\xE9\xE8\xF5\xEC\xE5\xDF\xF4\xE5 \xED\xE1 \xE4\xE9\xE1\xE3\xF1\xDC\xF8\xE5\xF4\xE5 \xF4\xEF\xED \xF0\xF1\xEF\xE7\xE3\xEF\xFD\xEC\xE5\xED\xEF \xF6\xDC\xEA\xE5\xEB\xEF \xE1\xF0\xFC \xF4\xEF \xB8\xED\xE1\xF1\xEE\xE7;
+DeletePreviousStartMenu=\xC7 \xE5\xF6\xE1\xF1\xEC\xEF\xE3\xDE \xE5\xE3\xEA\xE1\xF4\xE1\xF3\xF4\xDC\xF3\xE5\xF9\xF2 \xE1\xED\xDF\xF7\xED\xE5\xF5\xF3\xE5 \xFC\xF4\xE9 \xE1\xEB\xEB\xDC\xEE\xE1\xF4\xE5 \xF4\xE7\xED \xF4\xEF\xF0\xEF\xE8\xE5\xF3\xDF\xE1 \xF4\xEF\xF5 \xF6\xE1\xEA\xDD\xEB\xEF\xF5 \xF3\xF4\xE7\xED \xB8\xED\xE1\xF1\xEE\xE7 \xE1\xF0\xFC "%s" \xF3\xE5 "%s". \xC5\xF0\xE9\xE8\xF5\xEC\xE5\xDF\xF4\xE5 \xED\xE1 \xE4\xE9\xE1\xE3\xF1\xDC\xF8\xE5\xF4\xE5 \xF4\xEF\xED \xF0\xF1\xEF\xE7\xE3\xEF\xFD\xEC\xE5\xED\xEF \xF6\xDC\xEA\xE5\xEB\xEF \xE1\xF0\xFC \xF4\xE7\xED \xB8\xED\xE1\xF1\xEE\xE7;
; Project file description
ProjectFileDesc=\xC1\xF1\xF7\xE5\xDF\xEF \xB8\xF1\xE3\xEF\xF5 \xF4\xEF\xF5 WinMerge
Modified: branches/R2_12/Src/Languages/Greek.po
===================================================================
--- branches/R2_12/Src/Languages/Greek.po 2009-02-05 18:20:39 UTC (rev 6424)
+++ branches/R2_12/Src/Languages/Greek.po 2009-02-05 18:26:58 UTC (rev 6425)
@@ -71,7 +71,7 @@
#: Merge.rc:81
#: Merge.rc:103
-#: Merge.rc:509
+#: Merge.rc:508
#, 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:590
+#: Merge.rc:589
#, 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:532
-#: Merge.rc:538
+#: Merge.rc:531
+#: Merge.rc:537
#, 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:533
-#: Merge.rc:539
+#: Merge.rc:532
+#: Merge.rc:538
#, 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:534
-#: Merge.rc:540
+#: Merge.rc:533
+#: Merge.rc:539
#, c-format
msgid "&with..."
msgstr "\xEC\xE5..."
@@ -388,7 +388,7 @@
#: Merge.rc:175
#: Merge.rc:296
#: Merge.rc:484
-#: Merge.rc:1925
+#: Merge.rc:1933
#, 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:563
+#: Merge.rc:562
#, 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:2779
+#: Merge.rc:2789
#, c-format
msgid "< Empty >"
msgstr "< \xA2\xE4\xE5\xE9\xEF >"
@@ -875,1212 +875,1186 @@
msgid "&XML"
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:510
#, 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:512
+#: Merge.rc:511
#, c-format
msgid "L&eft to..."
msgstr "\xC1\xF1\xE9\xF3\xF4&\xE5\xF1\xFC \xF3\xF4\xEF..."
-#: Merge.rc:513
+#: Merge.rc:512
#, 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:514
+#: Merge.rc:513
#, c-format
msgid "R&ight to..."
msgstr "\xC4\xE5\xEE&\xE9\xFC \xF3\xF4\xEF..."
-#: Merge.rc:516
+#: Merge.rc:515
#, c-format
msgid "&Move"
msgstr "&\xCC\xE5\xF4\xE1\xEA\xDF\xED\xE7\xF3\xE7"
-#: Merge.rc:518
+#: Merge.rc:517
#, c-format
msgid "&Left to..."
msgstr "\xC1\xF1\xE9\xF3\xF4&\xE5\xF1\xFC \xF3\xF4\xEF..."
-#: Merge.rc:519
+#: Merge.rc:518
#, c-format
msgid "&Right to..."
msgstr "\xC4\xE5&\xEE\xE9\xFC \xF3\xF4\xEF..."
-#: Merge.rc:521
+#: Merge.rc:520
#, c-format
msgid "&Delete"
msgstr "&\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDE"
-#: Merge.rc:523
-#: Merge.rc:1145
-#: Merge.rc:1527
+#: Merge.rc:522
+#: Merge.rc:1135
+#: Merge.rc:1517
#, c-format
msgid "&Left"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC"
-#: Merge.rc:524
-#: Merge.rc:1147
-#: Merge.rc:1530
+#: Merge.rc:523
+#: Merge.rc:1137
+#: Merge.rc:1520
#, c-format
msgid "&Right"
msgstr "\xC4\xE5&\xEE\xE9\xFC"
-#: Merge.rc:525
+#: Merge.rc:524
#, c-format
msgid "&Both"
msgstr "\xC1\xEC&\xF6\xFC\xF4\xE5\xF1\xE1"
-#: Merge.rc:527
+#: Merge.rc:526
#, c-format
msgid "Re&name"
msgstr "\xCC\xE5\xF4\xEF&\xED\xEF\xEC\xE1\xF3\xDF\xE1"
-#: Merge.rc:528
+#: Merge.rc:527
#, 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:530
+#: Merge.rc:529
#, c-format
msgid "&Open Left"
msgstr "\xA2\xED\xEF\xE9\xE3\xEC\xE1 \xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xEF\xFD"
-#: Merge.rc:536
+#: Merge.rc:535
#, c-format
msgid "O&pen Right"
msgstr "\xA2\xED\xEF\xE9\xE3\xEC\xE1 \xC4\xE5&\xEE\xE9\xEF\xFD"
-#: Merge.rc:543
+#: Merge.rc:542
#, 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:545
+#: Merge.rc:544
#, c-format
msgid "&Left (%1 of %2)"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:546
+#: Merge.rc:545
#, c-format
msgid "&Right (%1 of %2)"
msgstr "\xC4\xE5&\xEE\xE9\xFC (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:547
+#: Merge.rc:546
#, c-format
msgid "&Both (%1 of %2)"
msgstr "\xC1\xEC&\xF6\xFC\xF4\xE5\xF1\xE1 (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:549
+#: Merge.rc:548
#, 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:551
+#: Merge.rc:550
#, c-format
msgid "&Zip"
msgstr ""
-#: Merge.rc:553
+#: Merge.rc:552
#, c-format
msgid "&Left... (%1 of %2)"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:554
+#: Merge.rc:553
#, c-format
msgid "&Right... (%1 of %2)"
msgstr "\xC4\xE5&\xEE\xE9\xFC... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:555
+#: Merge.rc:554
#, c-format
msgid "&Both... (%1 of %2)"
msgstr "\xC1\xEC&\xF6\xFC\xF4\xE5\xF1\xE1... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:556
+#: Merge.rc:555
#, c-format
msgid "&Differences... (%1 of %2)"
msgstr "&\xC4\xE9\xE1\xF6\xEF\xF1\xDD\xF2... (%1 \xE1\xF0\xFC %2)"
-#: Merge.rc:559
+#: Merge.rc:558
#, c-format
msgid "&Refresh"
msgstr "\xC1\xED\xE1&\xED\xDD\xF9\xF3\xE7"
-#: Merge.rc:571
+#: Merge.rc:570
#, 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:572
+#: Merge.rc:571
#, 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:578
+#: Merge.rc:577
#, 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:580
+#: Merge.rc:579
#, 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:581
+#: Merge.rc:580
#, 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:589
+#: Merge.rc:588
#, 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:592
+#: Merge.rc:591
#, 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:593
+#: Merge.rc:592
#, 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:594
+#: Merge.rc:593
#, 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:663
+#: Merge.rc:662
#, c-format
msgid "About WinMerge"
msgstr "\xD0\xE5\xF1\xDF \xF4\xEF\xF5 WinMerge"
-#: Merge.rc:669
+#: Merge.rc:668
#, 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:670
+#: Merge.rc:669
#, 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:671
+#: Merge.rc:670
#, 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:674
-#: Merge.rc:706
-#: Merge.rc:800
-#: Merge.rc:986
-#: Merge.rc:1064
+#: Merge.rc:673
+#: Merge.rc:705
+#: Merge.rc:797
+#: Merge.rc:983
+#: Merge.rc:1054
+#: Merge.rc:1083
#: Merge.rc:1093
-#: Merge.rc:1103
-#: Merge.rc:1269
-#: Merge.rc:1333
-#: Merge.rc:1346
-#: Merge.rc:1438
-#: Merge.rc:1453
-#: Merge.rc:1675
+#: Merge.rc:1259
+#: Merge.rc:1323
+#: Merge.rc:1336
+#: Merge.rc:1428
+#: Merge.rc:1443
+#: Merge.rc:1665
#, c-format
msgid "OK"
msgstr "\xCF\xCA"
-#: Merge.rc:675
+#: Merge.rc:674
#, c-format
msgid "Contributors"
msgstr "\xD3\xF5\xED\xF4\xE5\xEB\xE5\xF3\xF4\xDD\xF2"
-#: Merge.rc:682
+#: Merge.rc:681
#, 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:685
-#: Merge.rc:1604
+#: Merge.rc:684
+#: Merge.rc:1594
#, c-format
msgid "&Left:"
msgstr "\xC1&\xF1\xE9\xF3\xF4\xE5\xF1\xFC:"
-#: Merge.rc:689
-#: Merge.rc:750
-#: Merge.rc:1007
-#: Merge.rc:1029
+#: Merge.rc:688
+#: Merge.rc:749
+#: Merge.rc:997
+#: Merge.rc:1019
#, c-format
msgid "&Browse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:689
+#: Merge.rc:1598
#, c-format
msgid "&Right:"
msgstr "\xC4\xE5&\xEE\xE9\xFC:"
-#: Merge.rc:694
-#: Merge.rc:1040
+#: Merge.rc:693
+#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:694
+#: Merge.rc:1602
#, c-format
msgid "&Filter:"
msgstr "&\xD6\xDF\xEB\xF4\xF1\xEF:"
-#: Merge.rc:698
-#: Merge.rc:1614
+#: Merge.rc:697
+#: Merge.rc:1604
#, c-format
msgid "Select..."
msgstr "\xC5\xF0\xE9\xEB\xEF\xE3\xDE..."
-#: Merge.rc:699
+#: Merge.rc:698
#, c-format
msgid "&Unpacker:"
msgstr "\xC1\xF0\xEF&\xF3\xF5\xEC\xF0\xE9\xE5\xF3\xF4\xE9\xEA\xFC:"
-#: Merge.rc:702
+#: Merge.rc:701
#, c-format
msgid "&Select..."
msgstr "&\xC5\xF0\xE9\xEB\xEF\xE3\xDE..."
-#: Merge.rc:703
-#: Merge.rc:1615
+#: Merge.rc:702
+#: Merge.rc:1605
#, 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:705
+#: Merge.rc:704
#, c-format
msgid "Status:"
msgstr "\xCA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7:"
-#: Merge.rc:707
-#: Merge.rc:737
-#: Merge.rc:801
-#: Merge.rc:831
-#: Merge.rc:863
-#: Merge.rc:873
-#: Merge.rc:1065
+#: Merge.rc:706
+#: Merge.rc:736
+#: Merge.rc:798
+#: Merge.rc:828
+#: Merge.rc:860
+#: Merge.rc:870
+#: Merge.rc:1055
+#: Merge.rc:1084
#: Merge.rc:1094
-#: Merge.rc:1104
-#: Merge.rc:1155
-#: Merge.rc:1270
-#: Merge.rc:1347
-#: Merge.rc:1439
-#: Merge.rc:1454
-#: Merge.rc:1676
+#: Merge.rc:1145
+#: Merge.rc:1260
+#: Merge.rc:1337
+#: Merge.rc:1429
+#: Merge.rc:1444
+#: Merge.rc:1666
#, c-format
msgid "Cancel"
msgstr "\xA2&\xEA\xF5\xF1\xEF"
-#: Merge.rc:708
-#: Merge.rc:1348
+#: Merge.rc:707
+#: Merge.rc:1338
#, c-format
msgid "Help"
msgstr "\xC2\xEF\xDE\xE8\xE5\xE9\xE1"
-#: Merge.rc:709
+#: Merge.rc:708
#, 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:716
+#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
msgstr ""
-#: Merge.rc:721
+#: Merge.rc:720
#, c-format
msgid "Database:"
msgstr "\xC2\xDC\xF3\xE7 \xC4\xE5\xE4\xEF\xEC\xDD\xED\xF9\xED:"
-#: Merge.rc:724
+#: Merge.rc:723
#, c-format
msgid "Project:"
msgstr "\xB8\xF1\xE3\xEF:"
-#: Merge.rc:727
+#: Merge.rc:726
#, c-format
msgid "User:"
msgstr "\xD7\xF1\xDE\xF3\xF4\xE7\xF2:"
-#: Merge.rc:729
+#: Merge.rc:728
#, c-format
msgid "Password:"
msgstr "\xD3\xF5\xED\xE8\xE7\xEC\xE1\xF4\xE9\xEA\xFC:"
-#: Merge.rc:731
+#: Merge.rc:730
#, 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:733
-#: Merge.rc:878
+#: Merge.rc:732
+#: Merge.rc:875
#, 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:735
+#: Merge.rc:734
#, c-format
msgid "Check Out"
msgstr "\xB8\xEB\xE5\xE3\xF7\xEF\xF2 \xEA\xB4 \xB8\xEE\xEF\xE4\xEF\xF2"
-#: Merge.rc:736
-#: Merge.rc:874
+#: Merge.rc:735
+#: Merge.rc:871
#, c-format
msgid "Save As..."
msgstr "\xC1\xF0\xEF\xE8\xDE\xEA\xE5\xF5\xF3\xE7 \xD9\xF2..."
-#: Merge.rc:742
+#: Merge.rc:741
#, 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:745
+#: Merge.rc:744
#, 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:748
-#: Merge.rc:2056
+#: Merge.rc:747
+#: Merge.rc:2065
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&\xC4\xE9\xE1\xE4\xF1\xEF\xEC\xDE \xF4\xEF\xF5 cleartool.exe:"
-#: Merge.rc:755
-#: Merge.rc:1933
+#: Merge.rc:754
+#: Merge.rc:1941
#, c-format
msgid "General"
msgstr "\xC3\xE5\xED\xE9\xEA\xDC"
-#: Merge.rc:758
+#: Merge.rc:757
#, 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:761
+#: Merge.rc:760
#, 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:763
+#: Merge.rc:762
#, 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:765
+#: Merge.rc:764
#, 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:768
+#: Merge.rc:767
#, 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:770
+#: Merge.rc:769
#, 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:772
+#: Merge.rc:771
#, 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:775
+#: Merge.rc:774
#, c-format
-msgid "Enable Shell &Context Menu"
-msgstr ""
-
-#: Merge.rc:777
-#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr ""
-#: Merge.rc:779
+#: Merge.rc:776
#, 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:782
+#: Merge.rc:779
#, 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:784
-#: Merge.rc:1627
+#: Merge.rc:781
+#: Merge.rc:1617
#, c-format
msgid "&Folder compare"
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7 &\xD6\xE1\xEA\xDD\xEB\xF9\xED"
-#: Merge.rc:786
-#: Merge.rc:1629
+#: Merge.rc:783
+#: Merge.rc:1619
#, c-format
msgid "Fil&e compare"
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7 &\xC1\xF1\xF7\xE5\xDF\xF9\xED"
-#: Merge.rc:788
+#: Merge.rc:785
#, 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:790
+#: Merge.rc:787
#, c-format
msgid "Reset"
msgstr "\xC5\xF0\xE1\xED\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:797
+#: Merge.rc:794
#, c-format
msgid "Language"
msgstr "\xC3\xEB\xFE\xF3\xF3\xE1"
-#: Merge.rc:804
+#: Merge.rc:801
#, 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:810
+#: Merge.rc:807
#, c-format
msgid "Find"
msgstr "\xC1\xED\xE1\xE6\xDE\xF4\xE7\xF3\xE7"
-#: Merge.rc:813
-#: Merge.rc:840
+#: Merge.rc:810
+#: Merge.rc:837
#, c-format
msgid "Fi&nd what:"
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7 \xE3\xE9\xE1:"
-#: Merge.rc:816
-#: Merge.rc:846
+#: Merge.rc:813
+#: Merge.rc:843
#, 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:818
-#: Merge.rc:848
+#: Merge.rc:815
+#: Merge.rc:845
#, 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:820
-#: Merge.rc:850
+#: Merge.rc:817
+#: Merge.rc:847
#, 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:822
+#: Merge.rc:819
#, 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:825
+#: Merge.rc:822
#, c-format
msgid "Direction"
msgstr "\xCA\xE1\xF4\xE5\xFD\xE8\xF5\xED\xF3\xE7"
-#: Merge.rc:826
+#: Merge.rc:823
#, c-format
msgid "&Up"
msgstr "&\xA2\xED\xF9"
-#: Merge.rc:828
+#: Merge.rc:825
#, c-format
msgid "&Down"
msgstr "&\xCA\xDC\xF4\xF9"
-#: Merge.rc:830
-#: Merge.rc:860
+#: Merge.rc:827
+#: Merge.rc:857
#, c-format
msgid "&Find Next"
msgstr "\xC5\xFD\xF1\xE5\xF3\xE7 &\xC5\xF0\xEF\xEC\xDD\xED\xEF\xF5"
-#: Merge.rc:837
+#: Merge.rc:834
#, c-format
msgid "Replace"
msgstr "\xC1\xED\xF4\xE9\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7"
-#: Merge.rc:843
+#: Merge.rc:840
#, c-format
msgid "Re&place with:"
msgstr "\xC1\xED\xF4\xE9&\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7 \xEC\xE5:"
-#: Merge.rc:852
+#: Merge.rc:849
#, 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:855
+#: Merge.rc:852
#, 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:856
+#: Merge.rc:853
#, c-format
msgid "&Selection"
msgstr "&\xC5\xF0\xE9\xEB\xEF\xE3\xDE\xF2"
-#: Merge.rc:858
+#: Merge.rc:855
#, c-format
msgid "Wh&ole file"
msgstr "\xBC&\xEB\xEF\xF5 \xF4\xEF\xF5 \xC1\xF1\xF7\xE5\xDF\xEF\xF5"
-#: Merge.rc:861
+#: Merge.rc:858
#, c-format
msgid "&Replace"
msgstr "\xC1\xED\xF4\xE9&\xEA\xE1\xF4\xDC\xF3\xF4\xE1\xF3\xE7"
-#: Merge.rc:862
+#: Merge.rc:859
#, 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:869
-#: Merge.rc:2177
+#: Merge.rc:866
+#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
msgstr ""
-#: Merge.rc:872
+#: Merge.rc:869
#, c-format
msgid "CheckOut"
msgstr "\xB8\xEB\xE5\xE3\xF7\xEF\xF2 \xEA\xB4 \xB8\xEE\xEF\xE4\xEF\xF2"
-#: Merge.rc:877
-#: Merge.rc:1189
+#: Merge.rc:874
+#: Merge.rc:1179
#, c-format
msgid "Comments"
msgstr "\xD3\xF7\xFC\xEB\xE9\xE1"
-#: Merge.rc:880
+#: Merge.rc:877
#, 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:886
+#: Merge.rc:883
#, c-format
msgid "Linefilters"
msgstr "\xD6\xDF\xEB\xF4\xF1\xE1 \xC3\xF1\xE1\xEC\xEC\xFE\xED"
-#: Merge.rc:889
+#: Merge.rc:886
#, 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:892
+#: Merge.rc:889
#, 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:899
+#: Merge.rc:896
#, c-format
msgid "Save"
msgstr "\xC1\xF0\xEF\xE8\xDE\xEA\xE5\xF5\xF3\xE7"
-#: Merge.rc:900
+#: Merge.rc:897
#, c-format
msgid "New"
msgstr "\xC4\xE7\xEC\xE9\xEF\xF5\xF1\xE3\xDF\xE1"
-#: Merge.rc:901
+#: Merge.rc:898
#, c-format
msgid "Edit"
msgstr "\xC5\xF0\xE5\xEE\xE5\xF1\xE3\xE1\xF3\xDF\xE1"
-#: Merge.rc:902
+#: Merge.rc:899
#, c-format
msgid "Remove"
msgstr "\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDE"
-#: Merge.rc:907
-#: Merge.rc:1936
+#: Merge.rc:904
+#: Merge.rc:1944
#, c-format
msgid "Colors"
msgstr "\xD7\xF1\xFE\xEC\xE1\xF4\xE1"
-#: Merge.rc:910
+#: Merge.rc:907
#, c-format
msgid "Difference:"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xDC:"
-#: Merge.rc:914
+#: Merge.rc:911
#, 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:918
-#: Merge.rc:1579
+#: Merge.rc:915
+#: Merge.rc:1569
#, c-format
msgid "Background"
msgstr "\xD6\xFC\xED\xF4\xEF"
-#: Merge.rc:919
+#: Merge.rc:916
#, c-format
msgid "Deleted"
msgstr "\xC4\xE9\xE1\xE3\xF1\xE1\xF6\xDD\xED\xF4\xE1"
-#: Merge.rc:932
-#: Merge.rc:1374
-#: Merge.rc:1580
+#: Merge.rc:929
+#: Merge.rc:1364
+#: Merge.rc:1570
#, c-format
msgid "Text"
msgstr "\xCA\xE5\xDF\xEC\xE5\xED\xEF"
-#: Merge.rc:936
+#: Merge.rc:933
#, 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:946
+#: Merge.rc:943
#, c-format
msgid "Moved:"
msgstr "\xCC\xE5\xF4\xE1\xEA\xE9\xED\xE7\xE8\xDD\xED\xF4\xE1:"
-#: Merge.rc:956
+#: Merge.rc:953
#, 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:963
+#: Merge.rc:960
#, c-format
msgid "Word Difference:"
msgstr "\xC4\xE9\xE1\xF6\xEF\xF1\xDC \xCB\xDD\xEE\xE5\xF9\xF2:"
-#: Merge.rc:970
+#: Merge.rc:967
#, 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:977
-#: Merge.rc:1063
-#: Merge.rc:1092
-#: Merge.rc:1192
-#: Merge.rc:1420
+#: Merge.rc:974
+#: Merge.rc:1053
+#: Merge.rc:1082
+#: Merge.rc:1182
+#: Merge.rc:1410
#, c-format
msgid "Defaults"
msgstr "&\xC1\xF1\xF7\xE9\xEA\xDD\xF2 \xD1\xF5\xE8\xEC\xDF\xF3\xE5\xE9\xF2"
-#: Merge.rc:983
-#: Merge.rc:1362
-#: Merge.rc:1568
+#: Merge.rc:980
+#: Merge.rc:1352
+#: Merge.rc:1558
#, c-format
msgid "Dialog"
msgstr "\xC4\xE9\xDC\xEB\xEF\xE3\xEF\xF2"
-#: Merge.rc:993
-#: Merge.rc:1939
+#: Merge.rc:990
+#: Merge.rc:1947
#, c-format
msgid "System"
msgstr "\xD3\xFD\xF3\xF4\xE7\xEC\xE1"
-#: Merge.rc:996
+#: Merge.rc:993
#, 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:998
+#: Merge.rc:995
#, c-format
-msgid "Integration"
-msgstr "\xD3\xF5\xED\xE5\xF1\xE3\xE1\xF3\xDF\xE1"
-
-#: Merge.rc:999
-#, 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:1001
-#, 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:1003
-#, 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:1005
-#, 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:1008
+#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
msgstr "\xD6\xDC\xEA\xE5\xEB\xEF\xF2 &\xD6\xDF\xEB\xF4\xF1\xF9\xED:"
-#: Merge.rc:1010
+#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:1011
+#: Merge.rc:1001
#, 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:1012
+#: Merge.rc:1002
#, 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:1014
+#: Merge.rc:1004
#, 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:1017
-#: Merge.rc:1033
+#: Merge.rc:1007
+#: Merge.rc:1023
#, c-format
msgid "Br&owse..."
msgstr "\xC1\xED\xE1&\xE6\xDE\xF4\xE7\xF3\xE7..."
-#: Merge.rc:1023
+#: Merge.rc:1013
#, 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:1026
+#: Merge.rc:1016
#, c-format
msgid "File&1:"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF&1:"
-#: Merge.rc:1030
+#: Merge.rc:1020
#, c-format
msgid "File&2:"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF&2:"
-#: Merge.rc:1034
+#: Merge.rc:1024
#, c-format
msgid "&Swap"
msgstr "\xC1\xED\xF4\xE9\xEC\xE5\xF4\xDC&\xE8\xE5\xF3\xE7"
-#: Merge.rc:1035
+#: Merge.rc:1025
#, 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:1037
+#: Merge.rc:1027
#, c-format
msgid "&Result:"
msgstr "&\xC1\xF0\xEF\xF4\xDD\xEB\xE5\xF3\xEC\xE1:"
-#: Merge.rc:1041
+#: Merge.rc:1031
#, c-format
msgid "&Format"
msgstr "\xCC\xEF\xF1&\xF6\xDE"
-#: Merge.rc:1042
+#: Merge.rc:1032
#, c-format
msgid "St&yle:"
msgstr "\xD3\xF4&\xF5\xEB:"
-#: Merge.rc:1045
+#: Merge.rc:1035
#, c-format
msgid "&Context:"
msgstr "&\xD0\xE5\xF1\xE9\xE2. \xCA\xE5\xDF\xEC.:"
-#: Merge.rc:1048
+#: Merge.rc:1038
#, 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:1049
+#: Merge.rc:1039
#, c-format
msgid "Com&pare"
msgstr "\xD3\xFD\xE3&\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:1051
+#: Merge.rc:1041
#, 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:1053
+#: Merge.rc:1043
#, c-format
msgid "Ig&nore all"
msgstr "\xCD\xE1 \xC1\xE3\xED\xEF\xE7\xE8\xEF\xFD\xED \xBC&\xEB\xE1"
-#: Merge.rc:1055
+#: Merge.rc:1045
#, 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:1057
+#: Merge.rc:1047
#, 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:1059
+#: Merge.rc:1049
#, 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:1061
+#: Merge.rc:1051
#, 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:1083
+#: Merge.rc:1073
#, c-format
msgid "Display Columns"
msgstr "\xC5\xEC\xF6\xDC\xED\xE9\xF3\xE7 \xD3\xF4\xE7\xEB\xFE\xED"
-#: Merge.rc:1089
+#: Merge.rc:1079
#, 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:1090
+#: Merge.rc:1080
#, 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:1100
+#: Merge.rc:1090
#, 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:1105
+#: Merge.rc:1095
#, 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:1108
+#: Merge.rc:1098
#, 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:1111
+#: Merge.rc:1101
#, 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:1112
+#: Merge.rc:1102
#, c-format
msgid "Description:"
msgstr "\xD0\xE5\xF1\xE9\xE3\xF1\xE1\xF6\xDE:"
-#: Merge.rc:1123
+#: Merge.rc:1113
#, 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:1126
-#: Merge.rc:1886
+#: Merge.rc:1116
+#: Merge.rc:1894
#, c-format
msgid "Stop"
msgstr "\xD4\xE5\xF1\xEC\xE1\xF4\xE9\xF3\xEC\xFC\xF2"
-#: Merge.rc:1131
+#: Merge.rc:1121
#, 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:1132
+#: Merge.rc:1122
#, 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:1133
+#: Merge.rc:1123
#, 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:1139
+#: Merge.rc:1129
#, c-format
msgid "Go To"
msgstr "\xCC\xE5\xF4\xDC\xE2\xE1\xF3\xE7"
-#: Merge.rc:1142
+#: Merge.rc:1132
#, c-format
msgid "G&oto:"
msgstr "&\xCC\xE5\xF4\xDC\xE2\xE1\xF3\xE7:"
-#: Merge.rc:1144
+#: Merge.rc:1134
#, c-format
msgid "File"
msgstr "\xC1\xF1\xF7\xE5\xDF\xEF"
-#: Merge.rc:1149
+#: Merge.rc:1139
#, c-format
msgid "Goto what"
msgstr "\xCC\xE5\xF4\xDC\xE2\xE1\xF3\xE7 \xF3\xE5"
-#: Merge.rc:1150
+#: Merge.rc:1140
#, c-format
msgid "Li&ne"
msgstr "&\xC3\xF1\xE1\xEC\xEC\xDE"
-#: Merge.rc:1152
+#: Merge.rc:1142
#, c-format
msgid "&Difference"
msgstr "&\xC4\xE9\xE1\xF6\xEF\xF1\xDC"
-#: Merge.rc:1154
+#: Merge.rc:1144
#, c-format
msgid "&Go To"
msgstr "\xCC\xE5\xF4\xDC&\xE2\xE1\xF3\xE7"
-#: Merge.rc:1160
-#: Merge.rc:1934
+#: Merge.rc:1150
+#: Merge.rc:1942
#, c-format
msgid "Compare"
msgstr "\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:1163
+#: Merge.rc:1153
#, 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:1164
+#: Merge.rc:1154
#, c-format
msgid "&Compare"
msgstr "&\xD3\xFD\xE3\xEA\xF1\xE9\xF3\xE7"
-#: Merge.rc:1166
+#: Merge.rc:1156
#, 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:1168
+#: Merge.rc:1158
#, 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:1170
+#: Merge.rc:1160
#, 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:1172
+#: Merge.rc:1162
#, 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:1174
+#: Merge.rc:1164
#, 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:1177
+#: Merge.rc:1167
#, c-format
msgid "E&nable moved block detection"
msgstr "\xC5\xED\xE5\xF1\xE3\xEF\xF0\xEF\xDF\xE7\xF3\xE7 \xE...
[truncated message content] |
|
From: <ki...@us...> - 2009-02-10 20:23:33
|
Revision: 6436
http://winmerge.svn.sourceforge.net/winmerge/?rev=6436&view=rev
Author: kimmov
Date: 2009-02-10 20:23:30 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
PATCH: [ 2586274 ] A Swedish.po translation update for WinMerge 2.11.2+
Submitted by Hans Eriksson
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Swedish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-10 20:15:09 UTC (rev 6435)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-10 20:23:30 UTC (rev 6436)
@@ -3,6 +3,10 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+WinMerge 2.12.0
+ Translation updates:
+ - Swedish (#2586274)
+
WinMerge 2.11.2 - 2009-02-05 (r6428)
Update Python syntax highlight keywords for Python 2.6 (#2473375)
More accurate visible area rect in location pane (#2479804)
Modified: branches/R2_12/Src/Languages/Swedish.po
===================================================================
--- branches/R2_12/Src/Languages/Swedish.po 2009-02-10 20:15:09 UTC (rev 6435)
+++ branches/R2_12/Src/Languages/Swedish.po 2009-02-10 20:23:30 UTC (rev 6436)
@@ -3572,8 +3572,8 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
-msgstr ""
+msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgstr "Filen\n%1\n har f\xF6rsvunnit. Var god och spara en kopia av filen f\xF6r att forts\xE4tta."
#: Merge.rc:2164
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-02-10 21:09:17
|
Revision: 6438
http://winmerge.svn.sourceforge.net/winmerge/?rev=6438&view=rev
Author: gerundt
Date: 2009-02-10 21:09:11 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
PATCH: [ 2586497 ] Various Updates in German Translation
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/German.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-10 21:06:42 UTC (rev 6437)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-10 21:09:11 UTC (rev 6438)
@@ -5,6 +5,7 @@
WinMerge 2.12.0
Translation updates:
+ - German (#2586497)
- Swedish (#2586274)
WinMerge 2.11.2 - 2009-02-05 (r6428)
Modified: branches/R2_12/Src/Languages/German.po
===================================================================
--- branches/R2_12/Src/Languages/German.po 2009-02-10 21:06:42 UTC (rev 6437)
+++ branches/R2_12/Src/Languages/German.po 2009-02-10 21:09:11 UTC (rev 6438)
@@ -16,7 +16,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-11-27 23:03+0100\n"
+"PO-Revision-Date: 2009-02-10 21:59+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -1301,7 +1301,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\xD6ffnen-Dialog beim Programmstart anzeigen"
#: Merge.rc:776
#, c-format
@@ -1892,7 +1892,7 @@
#: Merge.rc:1192
#, c-format
msgid "&Automatic rescan"
-msgstr "&Automatisches Aktualisieren"
+msgstr "&Automatisch aktualisieren"
#: Merge.rc:1194
#, c-format
@@ -2602,12 +2602,12 @@
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Shell-Integration"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1675
#, c-format
@@ -2622,17 +2622,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Zum Kontextmen\xFC &hinzuf\xFCgen"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Ordnervergleich"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "&Shell-Men\xFC zum Kontextmen\xFC hinzuf\xFCgen"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -3243,7 +3243,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3835,7 +3835,7 @@
#: Merge.rc:2155
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
-msgstr ""
+msgstr "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte Mal gepr\xFCft hat.\n\nM\xF6chten Sie die Datei neu laden?"
#: Merge.rc:2156
#, c-format
@@ -3849,8 +3849,8 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
-msgstr ""
+msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgstr "Die Datei\n%1\nist verlorengegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren."
#: Merge.rc:2164
#, c-format
@@ -4199,12 +4199,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Linkes Shell-Men\xFC"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Rechtes Shell-Men\xFC"
#: Merge.rc:2274
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-11 17:03:06
|
Revision: 6441
http://winmerge.svn.sourceforge.net/winmerge/?rev=6441&view=rev
Author: kimmov
Date: 2009-02-11 17:03:03 +0000 (Wed, 11 Feb 2009)
Log Message:
-----------
PATCH: [ 2586422 ] Dutch translation update
Submitted by Thomas de Rocker
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Dutch.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-11 16:45:00 UTC (rev 6440)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-11 17:03:03 UTC (rev 6441)
@@ -5,6 +5,7 @@
WinMerge 2.12.0
Translation updates:
+ - Dutch (#2586422)
- German (#2586497)
- Swedish (#2586274)
Modified: branches/R2_12/Src/Languages/Dutch.po
===================================================================
--- branches/R2_12/Src/Languages/Dutch.po 2009-02-11 16:45:00 UTC (rev 6440)
+++ branches/R2_12/Src/Languages/Dutch.po 2009-02-11 17:03:03 UTC (rev 6441)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-08-09 00:09+0000\n"
+"POT-Creation-Date: 2009-02-05 20:33+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Thomas De Rocker <tho...@ya...>\n"
"Language-Team: Dutch <win...@li...>\n"
@@ -273,7 +273,7 @@
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "Patch &Genereren..."
+msgstr "Patch &genereren..."
#: Merge.rc:148
#: Merge.rc:269
@@ -329,14 +329,14 @@
#: Merge.rc:470
#, c-format
msgid "&Load Config..."
-msgstr "Configuratie &Laden..."
+msgstr "Configuratie &laden..."
#: Merge.rc:162
#: Merge.rc:283
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr "Instellingen &Resetten"
+msgstr "Instellingen &resetten"
#: Merge.rc:164
#: Merge.rc:285
@@ -357,7 +357,7 @@
#: Merge.rc:476
#, c-format
msgid "Clo&se All"
-msgstr "Alles &Sluiten"
+msgstr "Alles &sluiten"
#: Merge.rc:169
#: Merge.rc:290
@@ -448,13 +448,13 @@
#: Merge.rc:337
#, c-format
msgid "L&eft Read-only"
-msgstr "Links all&een lezen"
+msgstr "Links all&een-lezen"
#: Merge.rc:201
#: Merge.rc:338
#, c-format
msgid "Ri&ght Read-only"
-msgstr "Re&chts alleen lezen"
+msgstr "Re&chts alleen-lezen"
#: Merge.rc:203
#, c-format
@@ -470,37 +470,37 @@
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr "Toon &Identieke Items"
+msgstr "Toon &identieke items"
#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
-msgstr "Toon Verschillen&de Items"
+msgstr "Toon verschillen&de items"
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr "Toon Linkse Unieke Items"
+msgstr "Toon linkse unieke items"
#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr "Toon Rechtse Unieke Items"
+msgstr "Toon rechtse unieke items"
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr "Toon Overgeslagen Items"
+msgstr "Toon overgeslagen items"
#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
-msgstr "Toon Binary Files"
+msgstr "Toon binary files"
#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
-msgstr "Toon Verborgen Items"
+msgstr "Toon verborgen items"
#: Merge.rc:224
#, c-format
@@ -510,17 +510,17 @@
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr "Alle Submappen Uitklappen"
+msgstr "Alle submappen uitklappen"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr "Alle Submappen Inklappen"
+msgstr "Alle submappen inklappen"
#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
-msgstr "Ve&rgelijk Statistieken"
+msgstr "Ve&rgelijk statistieken"
#: Merge.rc:243
#: Merge.rc:426
@@ -531,7 +531,7 @@
#: Merge.rc:244
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr "Selectie Ve&rversen\tCtrl+F5"
+msgstr "Selectie ve&rversen\tCtrl+F5"
#: Merge.rc:246
#: Merge.rc:428
@@ -572,19 +572,19 @@
#: Merge.rc:435
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "&Laatste Verschil\tAlt+End"
+msgstr "&Laatste verschil\tAlt+End"
#: Merge.rc:257
#: Merge.rc:437
#, c-format
msgid "Copy to &Right\tAlt+Right"
-msgstr "Kopieer naar &Rechts\tAlt+Right"
+msgstr "Kopieer naar &rechts\tAlt+Right"
#: Merge.rc:258
#: Merge.rc:438
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "Kopieer naar &Links\tAlt+left"
+msgstr "Kopieer naar &links\tAlt+left"
#: Merge.rc:260
#, c-format
@@ -601,7 +601,7 @@
#: Merge.rc:450
#, c-format
msgid "Generate &Report..."
-msgstr "&Rapport Genereren..."
+msgstr "&Rapport genereren..."
#: Merge.rc:321
#, c-format
@@ -703,7 +703,7 @@
#: Merge.rc:362
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "Selecteer Regelverschillen\tF4"
+msgstr "Selecteer regelverschillen\tF4"
#: Merge.rc:365
#, c-format
@@ -734,7 +734,7 @@
#: Merge.rc:375
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr "&Kopieer Met Regelnummers\tCtrl+Shift+C"
+msgstr "&Kopieer met regelnummers\tCtrl+Shift+C"
#: Merge.rc:378
#, c-format
@@ -744,27 +744,27 @@
#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr "Bladwijzer Aan/Uit\tCtrl+F2"
+msgstr "Bladwijzer aan/uit\tCtrl+F2"
#: Merge.rc:381
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr "Volge&nde Bladwijzer\tF2"
+msgstr "Volge&nde bladwijzer\tF2"
#: Merge.rc:382
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr "Vo&rige Bladwijzer\tShift+F2"
+msgstr "Vo&rige bladwijzer\tShift+F2"
#: Merge.rc:383
#, c-format
msgid "&Clear All Bookmarks"
-msgstr "Alle Bladwijzers Wissen"
+msgstr "Alle bladwijzers wissen"
#: Merge.rc:385
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "&Ga Naar...\tCtrl+G"
+msgstr "&Ga naar...\tCtrl+G"
#: Merge.rc:393
#, c-format
@@ -795,7 +795,7 @@
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr "Vensters Vastzetten"
+msgstr "Vensters vastzetten"
#: Merge.rc:405
#, c-format
@@ -805,27 +805,27 @@
#: Merge.rc:406
#, c-format
msgid "Vie&w Line Differences"
-msgstr "Bekijk Regelverschillen"
+msgstr "Bekijk regelverschillen"
#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
-msgstr "Bekijk Regel&nummers"
+msgstr "Bekijk regel&nummers"
#: Merge.rc:408
#, c-format
msgid "View &Margins"
-msgstr "Bekijk &Marges"
+msgstr "Bekijk &marges"
#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
-msgstr "Automatische Te&rugloop"
+msgstr "Automatische te&rugloop"
#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
-msgstr "Wissel Vensters"
+msgstr "Wissel vensters"
#: Merge.rc:421
#, c-format
@@ -835,7 +835,7 @@
#: Merge.rc:422
#, c-format
msgid "Lo&cation Pane"
-msgstr "Location &Pane"
+msgstr "Location &pane"
#: Merge.rc:440
#, c-format
@@ -944,7 +944,7 @@
#: Merge.rc:527
#, c-format
msgid "&Hide Items"
-msgstr "Items Verbergen"
+msgstr "Items verbergen"
#: Merge.rc:529
#, c-format
@@ -1101,7 +1101,7 @@
#: Merge.rc:681
#, c-format
msgid "Select Files or Folders"
-msgstr "Bestanden of Mappen Selecteren"
+msgstr "Bestanden of mappen selecteren"
#: Merge.rc:684
#: Merge.rc:1594
@@ -1299,12 +1299,12 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr "Toon \"Bestanden of Mappen Selecteren\"-dialoog bij Opstarten"
+msgstr "Toon \"Bestanden of mappen selecteren\"-dialoog bij Opstarten"
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Auto-Aanvullen O&penen-venster:"
+msgstr "Auto-aanvullen O&penen-venster:"
#: Merge.rc:779
#, c-format
@@ -1468,12 +1468,12 @@
#: Merge.rc:886
#, c-format
msgid "Enable Line Filters"
-msgstr "Activeer Regelfilters"
+msgstr "Activeer regelfilters"
#: Merge.rc:889
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr "Reguliere Expressies (\xE9\xE9n per regel):"
+msgstr "Reguliere expressies (\xE9\xE9n per regel):"
#: Merge.rc:896
#, c-format
@@ -1552,7 +1552,7 @@
#: Merge.rc:967
#, c-format
msgid "Selected Word Diff:"
-msgstr "Geselect. Woordverschil:"
+msgstr "Geselect. woordverschil:"
#: Merge.rc:974
#: Merge.rc:1053
@@ -1710,12 +1710,12 @@
#: Merge.rc:1079
#, c-format
msgid "Move &Up"
-msgstr "Verplaats Omhoog"
+msgstr "Verplaats omhoog"
#: Merge.rc:1080
#, c-format
msgid "Move &Down"
-msgstr "Verplaats Omlaag"
+msgstr "Verplaats omlaag"
#: Merge.rc:1090
#, c-format
@@ -1745,7 +1745,7 @@
#: Merge.rc:1113
#, c-format
msgid " Folder Compare Progress"
-msgstr "Voortgang Mapvergelijking"
+msgstr "Voortgang mapvergelijking"
#: Merge.rc:1116
#: Merge.rc:1894
@@ -1918,7 +1918,7 @@
#: Merge.rc:1204
#, c-format
msgid "Line Difference Coloring"
-msgstr "Kleur van Regelverschillen"
+msgstr "Kleur van regelverschillen"
#: Merge.rc:1206
#, c-format
@@ -2015,7 +2015,7 @@
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr "Standaard Codetabel"
+msgstr "Standaard codetabel"
#: Merge.rc:1269
#, c-format
@@ -2235,12 +2235,12 @@
#: Merge.rc:1416
#, c-format
msgid "Folder Compare Report"
-msgstr "Directory Compare Report"
+msgstr "Mapvergelijkingsrapport"
#: Merge.rc:1419
#, c-format
msgid "Report &File:"
-msgstr "Rapporteer &Bestand"
+msgstr "Rapporteer &bestand"
#: Merge.rc:1422
#: Merge.rc:1596
@@ -2258,12 +2258,12 @@
#: Merge.rc:1426
#, c-format
msgid "&Copy to Clipboard"
-msgstr "Naar Klembord Kopi\xEBren"
+msgstr "Naar klembord kopi\xEBren"
#: Merge.rc:1434
#, c-format
msgid "Shared or Private Filter"
-msgstr "Gedeelde of Persoonlijke Filter"
+msgstr "Gedeelde of persoonlijke filter"
#: Merge.rc:1437
#, c-format
@@ -2273,12 +2273,12 @@
#: Merge.rc:1439
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr "Gedeelde Filter (voor alle gebruikers op deze pc)"
+msgstr "Gedeelde filter (voor alle gebruikers op deze pc)"
#: Merge.rc:1441
#, c-format
msgid "Private Filter (only for current user)"
-msgstr "Private Filter (alleen voor huidige gebruiker)"
+msgstr "Persoonlijke filter (alleen voor huidige gebruiker)"
#: Merge.rc:1449
#: Merge.rc:1950
@@ -2393,12 +2393,12 @@
#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
-msgstr "Selecteer Codetabel voor"
+msgstr "Selecteer codetabel voor"
#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
-msgstr "Bestanden Laden:"
+msgstr "Bestanden laden:"
#: Merge.rc:1526
#: Merge.rc:1529
@@ -2409,7 +2409,7 @@
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr "Bestanden Op&slaan:"
+msgstr "Bestanden op&slaan:"
#: Merge.rc:1530
#, c-format
@@ -2430,7 +2430,7 @@
#: Merge.rc:1539
#, c-format
msgid "Test Filter"
-msgstr "Test Filter"
+msgstr "Test filter"
#: Merge.rc:1542
#, c-format
@@ -2557,7 +2557,7 @@
#: Merge.rc:2243
#, c-format
msgid "Confirm Copy"
-msgstr "Bevestig Kopi\xEBren"
+msgstr "Bevestig kopi\xEBren"
#: Merge.rc:1642
#, c-format
@@ -2598,12 +2598,12 @@
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Shell-integratie"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Verkenner"
#: Merge.rc:1675
#, c-format
@@ -2618,17 +2618,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Toevoegen &aan contextmenu"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Mappen vergelijken"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "&Shell-menu toevoegen aan contextmenu"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2728,8 +2728,8 @@
"Change the printing options\n"
"Page Setup"
msgstr ""
-"De paginainstellingen wijzigen.\n"
-"Paginainstellingen"
+"De pagina-instellingen wijzigen.\n"
+"Pagina-instellingen"
#: Merge.rc:1762
#, c-format
@@ -3009,7 +3009,7 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Toon of verberg de tab-balk\n"
+"Tab-balk tonen of verbergen\n"
"Tab-balk aan/uit"
#: Merge.rc:1848
@@ -3552,12 +3552,12 @@
#: Merge.rc:2076
#, c-format
msgid "Theirs File"
-msgstr "Hun Bestand"
+msgstr "Hun bestand"
#: Merge.rc:2077
#, c-format
msgid "Mine File"
-msgstr "Mijn Bestand"
+msgstr "Mijn bestand"
#: Merge.rc:2083
#, c-format
@@ -3811,7 +3811,7 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Plug-in '%2' kan de wijzigingen aan de linker kant niet opslaan in '%1'.\n"
+"Plugin '%2' kan de wijzigingen aan de linker kant niet opslaan in '%1'.\n"
"\n"
"Het originele bestand zal niet worden gewijzigd.\n"
"\n"
@@ -3826,7 +3826,7 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Plug-in '%2' kan de wijzigingen aan de rechter kant niet opslaan in '%1'.\n"
+"Plugin '%2' kan de wijzigingen aan de rechter kant niet opslaan in '%1'.\n"
"\n"
"Het originele bestand zal niet worden gewijzigd.\n"
"\n"
@@ -3883,8 +3883,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"Het bestand\n"
+"%1\n"
+"is verdwenen. Sla een kopie van het bestand op om door te gaan."
#: Merge.rc:2164
#, c-format
@@ -4233,12 +4239,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr "Linker Shellmenu"
+msgstr "Linker shellmenu"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr "Rechter Shellmenu"
+msgstr "Rechter shellmenu"
#: Merge.rc:2274
#, c-format
@@ -4288,7 +4294,7 @@
#: Merge.rc:2290
#, c-format
msgid "Comparison result"
-msgstr "Vergelijkings resultaat"
+msgstr "Vergelijkingsresultaat"
#: Merge.rc:2291
#, c-format
@@ -4318,12 +4324,12 @@
#: Merge.rc:2296
#, c-format
msgid "Right Size (Short)"
-msgstr "Rechtse Grootte (Kort)"
+msgstr "Grootte rechts (Kort)"
#: Merge.rc:2297
#, c-format
msgid "Left Size (Short)"
-msgstr "Linkse Grootte (Kort)"
+msgstr "Grootte links (Kort)"
#: Merge.rc:2303
#, c-format
@@ -4750,7 +4756,7 @@
#: Merge.rc:2432
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr "Waarschuwing: Bestanden gebruiken verschillende coderingen, links=%s en rechts=%s, en samenvoegen kan leiden tot verlies van informatie."
+msgstr "Waarschuwing: bestanden gebruiken verschillende coderingen, links=%s en rechts=%s, en samenvoegen kan leiden tot verlies van informatie."
#: Merge.rc:2433
#, c-format
@@ -4815,7 +4821,7 @@
#: Merge.rc:2470
#, c-format
msgid "1. item is not found or is directory!"
-msgstr "1e item niet gevonden! (is het een map?)"
+msgstr "1ste item niet gevonden! (is het een map?)"
#: Merge.rc:2471
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-12 13:59:41
|
Revision: 6445
http://winmerge.svn.sourceforge.net/winmerge/?rev=6445&view=rev
Author: kimmov
Date: 2009-02-12 13:59:39 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
PATCH: [ 2590079 ] Make help window non-modal for WinMerge window
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/MainFrm.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-12 13:57:02 UTC (rev 6444)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-12 13:59:39 UTC (rev 6445)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.12.0
+ Bugfix: Help window opened from WinMerge was modal (#2590079)
Translation updates:
- Dutch (#2586422)
- German (#2586497)
Modified: branches/R2_12/Src/MainFrm.cpp
===================================================================
--- branches/R2_12/Src/MainFrm.cpp 2009-02-12 13:57:02 UTC (rev 6444)
+++ branches/R2_12/Src/MainFrm.cpp 2009-02-12 13:59:39 UTC (rev 6445)
@@ -1690,7 +1690,7 @@
{
String sPath = GetModulePath(0) + DocsPath;
if (paths_DoesPathExist(sPath.c_str()) == IS_EXISTING_FILE)
- ::HtmlHelp(GetSafeHwnd(), sPath.c_str(), HH_DISPLAY_TOC, NULL);
+ ::HtmlHelp(NULL, sPath.c_str(), HH_DISPLAY_TOC, NULL);
else
ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-13 19:12:50
|
Revision: 6452
http://winmerge.svn.sourceforge.net/winmerge/?rev=6452&view=rev
Author: kimmov
Date: 2009-02-13 19:12:46 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
PATCH: [ 2590212 ] ccrystaltextbuffer
Submitted by Matthias Mayer, edited by Kimmo
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-13 18:07:14 UTC (rev 6451)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-13 19:12:46 UTC (rev 6452)
@@ -5,6 +5,7 @@
WinMerge 2.12.0
Bugfix: Help window opened from WinMerge was modal (#2590079)
+ Bugfix: Crash in editor when undoing (#2590212)
Translation updates:
- Dutch (#2586422, #2590430)
- German (#2586497)
Modified: branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp 2009-02-13 18:07:14 UTC (rev 6451)
+++ branches/R2_12/Src/editlib/ccrystaltextbuffer.cpp 2009-02-13 19:12:46 UTC (rev 6452)
@@ -1302,10 +1302,10 @@
{
nPosition++;
vector<UndoRecord>::const_iterator iter = m_aUndoBuf.begin () + nPosition;
- while (iter != m_aUndoBuf.begin () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0)
+ while (iter != m_aUndoBuf.end () && ((*iter).m_dwFlags & UNDO_BEGINGROUP) == 0)
{
- --iter;
- --nPosition;
+ ++iter;
+ ++nPosition;
}
}
if (nPosition >= m_aUndoBuf.size ())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-14 13:22:50
|
Revision: 6454
http://winmerge.svn.sourceforge.net/winmerge/?rev=6454&view=rev
Author: kimmov
Date: 2009-02-14 12:41:22 +0000 (Sat, 14 Feb 2009)
Log Message:
-----------
PATCH: [ 2596949 ] Croatian translation update for 2.12
Submitted by Osmanagi?\196?\135 Hasan
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Croatian.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-14 12:38:09 UTC (rev 6453)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-14 12:41:22 UTC (rev 6454)
@@ -7,6 +7,7 @@
Bugfix: Help window opened from WinMerge was modal (#2590079)
Bugfix: Crash in editor when undoing (#2590212)
Translation updates:
+ - Croatian (#2596949)
- Dutch (#2586422, #2590430)
- German (#2586497)
- Swedish (#2586274)
Modified: branches/R2_12/Src/Languages/Croatian.po
===================================================================
--- branches/R2_12/Src/Languages/Croatian.po 2009-02-14 12:38:09 UTC (rev 6453)
+++ branches/R2_12/Src/Languages/Croatian.po 2009-02-14 12:41:22 UTC (rev 6454)
@@ -12,8 +12,8 @@
"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-04 22:14+0100\n"
-"Last-Translator: Hasan Osmanag\xE6 <hasan.osmanagic at public.carnet.hr>\n"
+"PO-Revision-Date: 2009-02-13 09:15+0100\n"
+"Last-Translator: Hasan Osmanagi\xE6 <has...@pu...>\n"
"Language-Team: winmerge-translate <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -286,7 +286,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Popis..."
#: Merge.rc:152
#: Merge.rc:273
@@ -399,7 +399,7 @@
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge Pomo\xE6\tF1"
#: Merge.rc:179
#: Merge.rc:300
@@ -504,17 +504,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Prikaz &stabla"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "&Otvori sve podmape"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Zatvori sve podmape"
#: Merge.rc:239
#, c-format
@@ -1298,7 +1298,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Pri pokretanju prika\x9Ei dijalog\"Odabir datoteke ili mape\""
#: Merge.rc:776
#, c-format
@@ -2023,8 +2023,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Odredi info kodne stranice za datoteke: .html, .rc, .xml \n"
+"Nije potrebno ponovno pokretanje"
#: Merge.rc:1274
#, c-format
@@ -2039,7 +2043,7 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Kodna stranica prema \x9Eelji:"
#: Merge.rc:1286
#, c-format
@@ -2133,8 +2137,12 @@
#: Merge.rc:1320
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "Ne prikazuj &vi\x9Ae ovu poruku.\n(Uvijek je dostupna preko izbornika pomo\xE6i.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"Ne prikazuj &vi\x9Ae ovu poruku.\n"
+"(Uvijek je dostupna preko izbornika pomo\xE6i.)"
#: Merge.rc:1324
#, c-format
@@ -2574,23 +2582,23 @@
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Dodaci"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Omogu\xE6i dodatke"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Shell integracija"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1675
#, c-format
@@ -2605,17 +2613,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Dodaj u kontekstni izbornik"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Usporedba mapa"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Dodaj &Shall izbornik u kontekstni izbornik"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2753,17 +2761,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Zatvori prikaz stabla"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Otvara sve podmape"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Zatvara sve podmape"
#: Merge.rc:1778
#, c-format
@@ -3069,13 +3077,41 @@
#: Merge.rc:1880
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge Usporedba datoteka"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
+msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge Usporedba datoteka"
#: Merge.rc:1881
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Usporedba mapa"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Usporedba mapa"
#: Merge.rc:1888
#, c-format
@@ -3095,8 +3131,12 @@
#: Merge.rc:1908
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "Razvojni tim:\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 ""
+"Razvojni tim:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1909
#, fuzzy, c-format
@@ -3226,7 +3266,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3470,13 +3510,19 @@
#: Merge.rc:2059
#, 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 ""
+"Filtari su dogra\xF0eni. \x8Eelite li osvje\x9Eiti sve otvorene usporedbe?\n"
+"\n"
+"Ako odaberete 'Ne', to mo\x9Eete u\xE6initi i kasnije.."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&Staza do SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3561,12 +3607,12 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Poni\x9Atenje zadnje operacije..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Ponavljanje prethodne operacije..."
#: Merge.rc:2100
#, c-format
@@ -3632,17 +3678,17 @@
#: Merge.rc:2122
#, c-format
msgid "Select two folders or two files to compare."
-msgstr "Izbor dviju datoteka ili mapa za usporedbu."
+msgstr "Odabir dvije datoteke ili mape za usporedbu."
#: Merge.rc:2123
#, c-format
msgid "Left path is invalid!"
-msgstr "Lijeva staza je kriva!"
+msgstr "Nedostaje staza do lijeve datoteke!"
#: Merge.rc:2124
#, c-format
msgid "Right path is invalid!"
-msgstr "Desna staza je kriva!"
+msgstr "Nedostaje staza do desne datoteke!"
#: Merge.rc:2125
#, c-format
@@ -3689,8 +3735,14 @@
#: Merge.rc:2137
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "Datoteka\n%1\nnije konfliktna."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"Datoteka\n"
+"%1\n"
+"nije konfliktna."
#: Merge.rc:2143
#, c-format
@@ -3803,8 +3855,18 @@
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Drugi program je izmijenio datoteku\n"
+"%1\n"
+"od zadnjeg WinMerge pregleda.\n"
+"\n"
+"\x8Eelite li ponovno u\xE8itanje datoteke?"
#: Merge.rc:2156
#, c-format
@@ -3818,8 +3880,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"Datoteka\n"
+"%1\n"
+"je nestala. Za nastavak, pohranite kopiju."
#: Merge.rc:2164
#, c-format
@@ -4092,17 +4160,17 @@
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Premjestiti?"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Premjestiti %d stavku?"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Potvrdite premje\x9Atanje"
#: Merge.rc:2250
#, c-format
@@ -4167,12 +4235,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Lijevi Shell izbornik"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Desni Shell izbornik"
#: Merge.rc:2274
#, c-format
@@ -4383,7 +4451,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Mape su razli\xE8ite"
#: Merge.rc:2339
#, c-format
@@ -4403,12 +4471,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "Tekstovi su identi\xE8ni"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "Tekstovi su razli\xE8iti"
#: Merge.rc:2354
#, c-format
@@ -4631,8 +4699,14 @@
#: Merge.rc:2421
#, 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 "Reci zavr\x9Aavaju na razli\xE8it na\xE8in (Windows/Unix/Mac) u datoteci '%1'.\n Prema postavkama, promijenit \xE6e se kako je odabrano.\n Izmijeniti ovu postavku i zadr\x9Eati razli\xE8it na\xE8in zavr\x9Aetaka?"
+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 ""
+"Reci zavr\x9Aavaju na razli\xE8it na\xE8in (Windows/Unix/Mac) u datoteci '%1'.\n"
+" Prema postavkama, promijenit \xE6e se kako je odabrano.\n"
+" Izmijeniti ovu postavku i zadr\x9Eati razli\xE8it na\xE8in zavr\x9Aetaka?"
#: Merge.rc:2422
#, c-format
@@ -4651,8 +4725,18 @@
#: Merge.rc:2425
#, 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 "Mapa postoji samo na jednoj strani i ne mo\x9Ee se otvoriti.\n\n\x8Eelite li stvoriti mapu:\n%1\nna drugoj strani i otvoriti je?"
+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 ""
+"Mapa postoji samo na jednoj strani i ne mo\x9Ee se otvoriti.\n"
+"\n"
+"\x8Eelite li stvoriti mapu:\n"
+"%1\n"
+"na drugoj strani i otvoriti je?"
#: Merge.rc:2431
#, c-format
@@ -5300,22 +5384,22 @@
#: Merge.rc:2654
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Tip"
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Raspakirava\xE8"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Prediffer"
#: Merge.rc:2658
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Ure\xF0iva\xE8 skripti"
#: Merge.rc:2665
#, c-format
@@ -5340,12 +5424,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Izmjena lijeve datoteke/mapa je samo za \xE8itanje"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Izmjena desne datoteke/mapa je samo za \xE8itanje"
#: Merge.rc:2671
#, c-format
@@ -5541,13 +5625,21 @@
#: Merge.rc:2714
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "Izaberite va\x9A jezik su\xE8elja\nJezik"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"Izaberite va\x9A jezik su\xE8elja\n"
+"Jezik"
#: Merge.rc:2715
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "Bojom isticanje razlika u recima\nOboji razli\xE8ite retke"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"Bojom isticanje razlika u recima\n"
+"Oboji razli\xE8ite retke"
#: Merge.rc:2716
#, c-format
@@ -5598,28 +5690,48 @@
#: Merge.rc:2728
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "Prikaz prethodne razlike\nPrethodna razlika (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"Prikaz prethodne razlike\n"
+"Prethodna razlika (Alt+Up)"
#: Merge.rc:2729
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "Prikaz slijede\xE6e razlike\nSlijede\xE6a razlika (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"Prikaz slijede\xE6e razlike\n"
+"Slijede\xE6a razlika (Alt+Down)"
#: Merge.rc:2730
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "Prikaz prve razlike\nPrva razlika (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"Prikaz prve razlike\n"
+"Prva razlika (Alt+Home)"
#: Merge.rc:2731
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "Prikaz aktivne razlike\nAktivna razlika (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"Prikaz aktivne razlike\n"
+"Aktivna razlika (Alt+Enter)"
#: Merge.rc:2732
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "Posljednja razlika\nPosljednja razlika (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"Posljednja razlika\n"
+"Posljednja razlika (Alt+End)"
#: Merge.rc:2733
#, c-format
@@ -5708,7 +5820,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Prika\x9Ei popis dobavljivih dodataka."
#: Merge.rc:2756
#, c-format
@@ -5747,8 +5859,12 @@
#: Merge.rc:2768
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "Aktiviranje slijede\xE6e datoteke - vidljiva\nAktiviraj slijede\xE6u datoteku"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"Aktiviranje slijede\xE6e datoteke - vidljiva\n"
+"Aktiviraj slijede\xE6u datoteku"
#: Merge.rc:2769
#, c-format
@@ -5757,8 +5873,12 @@
#: Merge.rc:2775
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "Prkaz WinMerge pomo\xE6i\nWinMerge Pomo\xE6"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"Prkaz WinMerge pomo\xE6i\n"
+"WinMerge Pomo\xE6"
#: Merge.rc:2776
#, c-format
@@ -5777,13 +5897,21 @@
#: Merge.rc:2779
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "Otvori datoteku napomena uz ina\xE8icu\nRelease Notes"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"Otvori datoteku napomena uz ina\xE8icu\n"
+"Release Notes"
#: Merge.rc:2780
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "OtvoriWeb lokaciju prevoditelja\nTranslations"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"OtvoriWeb lokaciju prevoditelja\n"
+"Translations"
#: Merge.rc:2786
#, c-format
@@ -5878,7 +6006,7 @@
#: Merge.rc:2825
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Nije ozna\xE8eno"
#: Merge.rc:2826
#, c-format
@@ -6033,7 +6161,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-15 13:08:34
|
Revision: 6456
http://winmerge.svn.sourceforge.net/winmerge/?rev=6456&view=rev
Author: kimmov
Date: 2009-02-15 13:08:28 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
PATCH: [ 2599256 ] Detect Windows 7 and Windows 2008 in config log
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/ConfigLog.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-15 13:05:41 UTC (rev 6455)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-15 13:08:28 UTC (rev 6456)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.12.0
+ Detect Windows 7 and Windows 2008 in config log (#2599256)
Bugfix: Help window opened from WinMerge was modal (#2590079)
Bugfix: Crash in editor when undoing (#2590212)
Translation updates:
Modified: branches/R2_12/Src/ConfigLog.cpp
===================================================================
--- branches/R2_12/Src/ConfigLog.cpp 2009-02-15 13:05:41 UTC (rev 6455)
+++ branches/R2_12/Src/ConfigLog.cpp 2009-02-15 13:08:28 UTC (rev 6456)
@@ -659,7 +659,10 @@
}
/**
- * @brief Parse Windows version data to string
+ * @brief Parse Windows version data to string.
+ * See info about how to determine Windows versions from URL:
+ * http://msdn.microsoft.com/en-us/library/ms724833(VS.85).aspx
+ * @return String describing Windows version.
*/
CString CConfigLog::GetWindowsVer()
{
@@ -694,7 +697,19 @@
else if ( osvi.dwMajorVersion <= 4 )
sVersion = _T("Microsoft Windows NT ");
else if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 )
- sVersion = _T("Microsoft Windows Vista ");
+ {
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ sVersion = _T("Microsoft Windows Vista ");
+ else
+ sVersion = _T("Microsoft Windows Server 2008 ");
+ }
+ else if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 )
+ {
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ sVersion = _T("Microsoft Windows 7 ");
+ else
+ sVersion = _T("Microsoft Windows Server 2008 R2 ");
+ }
else
sVersion.Format(_T("[? WindowsNT %d.%d] "),
osvi.dwMajorVersion, osvi.dwMinorVersion);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2009-02-16 14:58:06
|
Revision: 6463
http://winmerge.svn.sourceforge.net/winmerge/?rev=6463&view=rev
Author: sdottaka
Date: 2009-02-16 14:58:03 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
Japanese translation - update
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Japanese.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-16 14:56:44 UTC (rev 6462)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-16 14:58:03 UTC (rev 6463)
@@ -11,6 +11,7 @@
- Croatian (#2596949)
- Dutch (#2586422, #2590430)
- German (#2586497)
+ - Japanese (r6456)
- Swedish (#2586274)
WinMerge 2.11.2 - 2009-02-05 (r6428)
Modified: branches/R2_12/Src/Languages/Japanese.po
===================================================================
--- branches/R2_12/Src/Languages/Japanese.po 2009-02-16 14:56:44 UTC (rev 6462)
+++ branches/R2_12/Src/Languages/Japanese.po 2009-02-16 14:58:03 UTC (rev 6463)
@@ -12,7 +12,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-12-06 10:06+0900\n"
+"PO-Revision-Date: 2009-02-16 23:03+0900\n"
"Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n"
"Language-Team: Japanese <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -2594,12 +2594,12 @@
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "\x83V\x83F\x83\x8B\x93\x9D\x8D\x87"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "\x83G\x83N\x83X\x83v\x83\x8D\x81[\x83\x89"
#: Merge.rc:1675
#, c-format
@@ -2614,17 +2614,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "\x83R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&A)"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "\x83t\x83H\x83\x8B\x83_\x94\xE4\x8Ar"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\x83V\x83F\x83\x8B\x83\x81\x83j\x83\x85\x81[\x82\xF0\x83R\x83\x93\x83e\x83L\x83X\x83g\x83\x81\x83j\x83\x85\x81[\x82ɒlj\xC1(&S)"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -3876,8 +3876,11 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr ""
+"\x83t\x83@\x83C\x83\x8B\n"
+"%1\n"
+"\x82͏\xC1\x96ł\xB5\x82܂\xB5\x82\xBD\x81B\x91\xB1\x8Ds\x82\xB7\x82邽\x82߂Ƀt\x83@\x83C\x83\x8B\x82̃R\x83s\x81[\x82\xF0\x95ۑ\xB6\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B"
#: Merge.rc:2164
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2009-02-16 22:32:22
|
Revision: 6468
http://winmerge.svn.sourceforge.net/winmerge/?rev=6468&view=rev
Author: sdottaka
Date: 2009-02-16 21:47:33 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
BUG: [ 2606153 ] Browse button in Option dialog reverts to previous settings
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/PropBackups.cpp
branches/R2_12/Src/PropRegistry.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-16 21:46:21 UTC (rev 6467)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-16 21:47:33 UTC (rev 6468)
@@ -7,6 +7,8 @@
Detect Windows 7 and Windows 2008 in config log (#2599256)
Bugfix: Help window opened from WinMerge was modal (#2590079)
Bugfix: Crash in editor when undoing (#2590212)
+ Bugfix: Browse button in Option dialog reverted to previous settings
+ (#2606153)
Translation updates:
- Croatian (#2596949)
- Dutch (#2586422, #2590430)
Modified: branches/R2_12/Src/PropBackups.cpp
===================================================================
--- branches/R2_12/Src/PropBackups.cpp 2009-02-16 21:46:21 UTC (rev 6467)
+++ branches/R2_12/Src/PropBackups.cpp 2009-02-16 21:47:33 UTC (rev 6468)
@@ -115,7 +115,6 @@
CString path;
if (SelectFolder(path, NULL, 0, GetSafeHwnd()))
{
- m_sGlobalFolder = path;
- UpdateData(FALSE);
+ SetDlgItemText(IDC_BACKUP_FOLDER, path);
}
}
Modified: branches/R2_12/Src/PropRegistry.cpp
===================================================================
--- branches/R2_12/Src/PropRegistry.cpp 2009-02-16 21:46:21 UTC (rev 6467)
+++ branches/R2_12/Src/PropRegistry.cpp 2009-02-16 21:47:33 UTC (rev 6468)
@@ -140,8 +140,7 @@
CString path;
if (SelectFile(GetSafeHwnd(), path, NULL, IDS_OPEN_TITLE, IDS_PROGRAMFILES, TRUE))
{
- m_strEditorPath = path;
- UpdateData(FALSE);
+ SetDlgItemText(IDC_EXT_EDITOR_PATH, path);
}
}
@@ -151,8 +150,7 @@
CString path;
if (SelectFolder(path, NULL, IDS_OPEN_TITLE, GetSafeHwnd()))
{
- m_strUserFilterPath = path;
- UpdateData(FALSE);
+ SetDlgItemText(IDC_FILTER_USER_PATH, path);
}
}
@@ -162,7 +160,6 @@
CString path;
if (SelectFolder(path, NULL, NULL, GetSafeHwnd()))
{
- m_tempFolder = path;
- UpdateData(FALSE);
+ SetDlgItemText(IDC_TMPFOLDER_NAME, path);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-17 14:15:36
|
Revision: 6469
http://winmerge.svn.sourceforge.net/winmerge/?rev=6469&view=rev
Author: kimmov
Date: 2009-02-17 14:15:31 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
PATCH: [ 2603591 ] French translation
Submitted by Jean-F Jolin
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Languages/ReadMe-French.txt
branches/R2_12/Installer/InnoSetup/Languages/French.isl
branches/R2_12/Src/Languages/French.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-16 21:47:33 UTC (rev 6468)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-17 14:15:31 UTC (rev 6469)
@@ -12,6 +12,7 @@
Translation updates:
- Croatian (#2596949)
- Dutch (#2586422, #2590430)
+ - French (#2603591)
- German (#2586497)
- Japanese (r6456)
- Swedish (#2586274)
Modified: branches/R2_12/Docs/Users/Languages/ReadMe-French.txt
===================================================================
--- branches/R2_12/Docs/Users/Languages/ReadMe-French.txt 2009-02-16 21:47:33 UTC (rev 6468)
+++ branches/R2_12/Docs/Users/Languages/ReadMe-French.txt 2009-02-17 14:15:31 UTC (rev 6469)
@@ -1,62 +1,74 @@
WINMERGE
-WinMerge est un logiciel libre pour comparer et fusionner des fichiers
-qui tourne sur toutes versions modernes de Windows. Certaines caract\xE9-
-ristiques requi\xE8rent des installations ou des composantes additionnelles.
+WinMerge est un outil en logiciel libre pour comparer et fusionner des fichiers
+sur Windows. WinMerge peut comparer des r\xE9pertoires et des fichiers en pr\xE9sentant
+les diff\xE9rences de texte dans un format visuel facile \xE0 comprendre et manipuler.
+WinMerge peut \xEAtre utilis\xE9 comme un outil externe de comparaison/fusion ou
+comme application autonome.
+WinMerge poss\xE8de de nombreuses fonctionnalit\xE9s utiles pour rendre la comparaison,
+la synchronisation, et la fusion aussi facile et pratique que possible. Plusieurs
+langages de programmation et autres formats de fichiers ont une syntaxe mise en
+\xE9vidence.
+
La derni\xE8re version de WinMerge et d'autre information sont disponible a:
http://winmerge.org
-Pour d\xE9buter rapidement avec WinMerge:
-Lisez le manuel en ligne au chapitre du d\xE9marrage rapide de WinMerge:
+D\xE9marrage rapide
+================
+Pour apprendre comment effectuer des op\xE9rations de base apr\xE8s l'installation
+de WinMerge, cliquez sur Aide > Rubrique d'aide WinMerge et acc\xE9dez \xE0 la
+rubrique D\xE9marrage rapide. Ou lisez le manuel en ligne \xE0:
http://winmerge.org/docs/manual/QuickStart.html
-Documentation HTML:
-Elle est disponible en ligne \xE0
+Aide WinMerge
+=============
+L'aide WinMerge est install\xE9 localement comme un fichier d'aide HTML de
+Microsoft, WinMerge.chm, lorsque vous installez WinMerge. Pour ouvrir l'aide,
+cliquez sur Aide > Rubrique d'aide WinMerge ou appuyez sur F1 dans la fen\xEAtre
+WinMerge. Avec la ligne de commande, lancez l'ex\xE9cutable WinMerge
+suivi du commutateur d'aide /?.
+
+Vous pouvez aussi consulter la version en ligne de l'aide WinMerge \xE0:
http://winmerge.org/docs/manual/
-Il est \xE9galement possible de l'install\xE9e localement (si d\xE9sir\xE9)
-et de la t\xE9l\xE9charger s\xE9par\xE9ment \xE0 l'adresse (voir la documentation):
-http://winmerge.org/
-Support d'archive:
-WinMerge utilise 7-Zip pour le support d'archivage de fichier.
-7-Zip (http://www.7-zip.org) est un logiciel d'archivage libre.
-Pour installer le support d'archive de fichier, t\xE9l\xE9charger le programme
-d'installation plugiciel 7-Zip \xE0 l'adresse http://winmerge.org/.
-Installer le support d'archive:
-Il est recommand\xE9 d'installer l'application 7-Zip. Si cela ne peut \xEAtre
-fait, le programme d'installation de plugiciel 7-Zip peut installer
-seulement les fichiers requis pour permetre le support d'archivage de
-fichier. Notez bien que cela NE PERMET PAS l'usage complet de 7-Zip,
-seulement le support d'archivage de fichier pour WinMerge.
+Support d'archive
+=================
+WinMerge utilise le logiciel libre 7-Zip (http://www.7-zip.org) comme
+l'outil d'archivage pour le support d'archivage de fichier.
-Support de scripts:
-Si vous souhaitez travailler avec les scripts vous devrez installer Windows
-Scripting Host. Si vous \xE9prouvez des difficult\xE9es relatives \xE0 vos
-scripts veuillez visiter
-http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp
-pour vous assurer que le Scripting Host est: \xE0 jour et non-corrompu.
+Nous recommandons l'installation de l'application 7-Zip en
+t\xE9l\xE9chargeant et ex\xE9cutant le plugiciel d'installation 7-Zip depuis
+http://winmerge.org/downloads/
-Support:
-Les d\xE9veloppeurs r\xE9pondent aux questions dans les forums de discussion
-WinMerge de Sourceforge.net:
-http://sourceforge.net/forum/?group_id=13216
+Si vous ne pouvez pas installer l'outil 7-Zip pour une raison quelconque.
+Vous pouvez utiliser le plugiciel d'installation 7-Zip pour installer
+uniquement les fichiers n\xE9cessaires au support d'archivage de fichier.
+Voir la rubrique d'aide "7-Zip et support d'archives" pour plus de d\xE9tails.
-Bogues et nouvelles requ\xEAtes:
-Les bogues et suggestions de nouvelles requ\xEAtes doivent \xEAtre transmis via
-l'outil de suivi (tracker) \xE0 sourceforge.net.
+Support WinMerge
+================
+Questions ou suggestions \xE0 propos de WinMerge? Une bonne place pour d\xE9buter
+est le groupe de discussion WinMerge au http://forums.winmerge.org/. Les
+d\xE9veloppeurs lisent et r\xE9pondent fr\xE9quemment aux questions des deux forums.
+Utilisez le forum de discussion ouverte pour des questions d'ordre g\xE9n\xE9ral
+comme l'utilisation. Utilisez le forum des d\xE9veloppeurs pour des questions
+de d\xE9veloppement WinMerge.
-Suivi des Bogues:
-http://sourceforge.net/tracker/?group_id=13216&atid=113216
-Lorsque vous rapporter un bogue, veuillez nous indiquer le num\xE9ro de version
-de WinMerge! A partir de la version 2.2.0 et plus r\xE9cent vous pouvez obtenir
-une trace de configuration via le menu Aide/Configuration.
-Veuillez joindre cette information (comme pi\xE8ce-jointe) \xE0 votre rapport.
-Elle contient une mine d'informations pour les d\xE9veloppeurs.
-Suivi des nouvelles requ\xEAtes:
-http://sourceforge.net/tracker/?group_id=13216&atid=363216
+Bogues et nouvelles requ\xEAtes
+============================
+Si un probl\xE8me n'est pas r\xE9solu dans les forums WinMerge, v\xE9rifiez le traqueur
+de projet \xE0: http://project.winmerge.org/, et cliquez sur un des lien du menu
+du traqueur, comme bogues et nouvelles requ\xEAtes, o\xF9 vous pouvez consulter ou
+soumettre des articles.
+Si vous soumettez un bogue, veuillez inclure le num\xE9ro de version de WinMerge
+dans votre rapport. Vous pouvez g\xE9n\xE9rer un journal de configuration en cliquant
+sur Aide > Configuration. S'il vous pla\xEEt joignez le journal de configuration
+\xE0 votre rapport de bogue, il contient beaucoup d'informations utiles
+pour les d\xE9veloppeurs.
+
- Les D\xE9veloppeurs de WinMerge
Modified: branches/R2_12/Installer/InnoSetup/Languages/French.isl
===================================================================
--- branches/R2_12/Installer/InnoSetup/Languages/French.isl 2009-02-16 21:47:33 UTC (rev 6468)
+++ branches/R2_12/Installer/InnoSetup/Languages/French.isl 2009-02-17 14:15:31 UTC (rev 6469)
@@ -319,7 +319,7 @@
TypicalInstallation=Installation Typique
FullInstallation=Installation Compl\xE8te
CompactInstallation=Installation Compacte
-CustomInstallation=Installation Personalis\xE9e
+CustomInstallation=Installation Personnalis\xE9e
;Components
AppCoreFiles=Fichiers Vitaux Winmerge
@@ -337,9 +337,9 @@
DanishLanguage=Menus et dialogues Danois
DutchLanguage=Menus et dialogues N\xE9erlandais
FrenchLanguage=Menus et dialogues Fran\xE7ais
-GalicianLanguage=Galician menus and dialogs
+GalicianLanguage=Menus et dialogues Galicien
GermanLanguage=Menus et dialogues Allemand
-GreekLanguage=Greek menus and dialogs
+GreekLanguage=Menus et dialogues Grec
HungarianLanguage=Menus et dialogues Hongrois
ItalianLanguage=Menus et dialogues Italien
JapaneseLanguage=Menus et dialogues Japonais
@@ -351,18 +351,18 @@
RomanianLanguage=Menus et dialogues Roumain
RussianLanguage=Menus et dialogues Russe
SlovakLanguage=Menus et dialogues Slovaque
-SlovenianLanguage=Slovenian menus and dialogs
+SlovenianLanguage=Menus et dialogues Slov\xE8ne
SpanishLanguage=Menus et dialogues Espagnol
SwedishLanguage=Menus et dialogues Su\xE9dois
TurkishLanguage=Menus et dialogues Turque
-UkrainianLanguage=Ukrainian menus and dialogs
+UkrainianLanguage=Menus et dialogues Ukrainien
;Tasks
ExplorerContextMenu=&Permetre l'int\xE9gration au menu contextuel de l'explorateur
IntegrateTortoiseCVS=Integrer avec &TortoiseCVS
IntegrateTortoiseSVN=Integrer avec T&ortoiseSVN
IntegrateClearCase=Integrer avec Rational &ClearCase
-AddToPath=&Add WinMerge folder to your system path
+AddToPath=&Ajouter le r\xE9pertoire WinMerge au chemin du syst\xE8me
;Icon Labels
ReadMe=Lisez moi
Modified: branches/R2_12/Src/Languages/French.po
===================================================================
--- branches/R2_12/Src/Languages/French.po 2009-02-16 21:47:33 UTC (rev 6468)
+++ branches/R2_12/Src/Languages/French.po 2009-02-17 14:15:31 UTC (rev 6469)
@@ -15,7 +15,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-21 22:37-0500\n"
+"PO-Revision-Date: 2009-02-15 14:33-0500\n"
"Last-Translator: Jean-F Jolin <jean-f-j at users.sourceforge.net>\n"
"Language-Team: French <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -288,7 +288,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&\xC9num\xE9rer..."
#: Merge.rc:152
#: Merge.rc:273
@@ -501,22 +501,22 @@
#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
-msgstr "Afficher les \xE9l\xE9ments cach\xE9s"
+msgstr "A&fficher les \xE9l\xE9ments cach\xE9s"
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "Arborescence"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Dilat&er tous les sous-r\xE9pertoires"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Contracter tous les sous-r\xE9pertoires"
#: Merge.rc:239
#, c-format
@@ -745,7 +745,7 @@
#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr "Placer/&retirer un signet\tCtrl+F2"
+msgstr "Placer ou &retirer un signet\tCtrl+F2"
#: Merge.rc:381
#, c-format
@@ -1300,12 +1300,12 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Afficher la bo\xEEte de dialogue d'ouverture au d\xE9marrage"
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Automatisation bo\xEEte de dialogue d'ouverture:"
+msgstr "Remplissage de la bo\xEEte de dialogue d'ouverture:"
#: Merge.rc:779
#, c-format
@@ -2025,8 +2025,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"&D\xE9tecter la page de code pour les fichiers : .html, .rc, .xml \n"
+"n\xE9cessite un red\xE9marrage de session"
#: Merge.rc:1274
#, c-format
@@ -2041,7 +2045,7 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Page de code sti&pul\xE9e :"
#: Merge.rc:1286
#, c-format
@@ -2139,8 +2143,12 @@
#: Merge.rc:1320
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "Ne plus afficher ce &message.\n(Il peut toujours \xEAtre r\xE9activer au menu des pr\xE9f\xE9rences.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"Ne plus afficher ce &message.\n"
+"(Il peut toujours \xEAtre r\xE9activer au menu des pr\xE9f\xE9rences.)"
#: Merge.rc:1324
#, c-format
@@ -2580,23 +2588,23 @@
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugiciels"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Activer les plugiciels"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Int\xE9gration \xE0 l'explorateur"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorateur"
#: Merge.rc:1675
#, c-format
@@ -2611,17 +2619,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Ajouter au menu contextuel"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Comparaison de r\xE9pertoire"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Ajouter le menu de l'explorateur au menu contextuel"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2759,17 +2767,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Afficher ou masquer l'arborescence"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Dilater tous les sous-r\xE9pertoires"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Contracter tous les sous-r\xE9pertoires"
#: Merge.rc:1778
#, c-format
@@ -3007,8 +3015,12 @@
#: Merge.rc:1848
#, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "Redimensionne les fen\xEAtres automatiquement\nVerrouiller les fen\xEAtres"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"Redimensionne les fen\xEAtres automatiquement\n"
+"Verrouiller les fen\xEAtres"
#: Merge.rc:1854
#, c-format
@@ -3071,13 +3083,41 @@
#: Merge.rc:1880
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
#: Merge.rc:1881
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
#: Merge.rc:1888
#, c-format
@@ -3097,8 +3137,12 @@
#: Merge.rc:1908
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "D\xE9veloppeurs:\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 ""
+"D\xE9veloppeurs:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1909
#, c-format
@@ -3228,7 +3272,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3472,13 +3516,19 @@
#: Merge.rc:2059
#, 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 ""
+"Les filtres ont \xE9t\xE9 mis \xE0 jour. Voulez-vous actualiser la comparaison de tous les r\xE9pertoires?\n"
+"\n"
+"Si vous ne voulez pas actualiser la comparaison. S\xE9lectionnez Non et l'actualisation se fera plus tard."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&Chemin vers SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3563,12 +3613,12 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Annuler la derni\xE8re op\xE9ration..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Refaire l'op\xE9ration pr\xE9c\xE9dente..."
#: Merge.rc:2100
#, c-format
@@ -3691,8 +3741,14 @@
#: Merge.rc:2137
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "Le fichier\n%1\nn'est pas un fichier en conflit."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"Le fichier\n"
+"%1\n"
+"n'est pas un fichier en conflit."
#: Merge.rc:2143
#, c-format
@@ -3805,8 +3861,18 @@
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Une autre application a mis \xE0 jour le fichier\n"
+"%1\n"
+"depuis le dernier balayage de WinMerge.\n"
+"\n"
+"Voulez-vous actualiser le fichier?"
#: Merge.rc:2156
#, c-format
@@ -3820,8 +3886,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"Le fichier\n"
+"%1\n"
+"a disparu. Veuillez enregistrer une copie du fichier pour continuer."
#: Merge.rc:2164
#, c-format
@@ -4094,17 +4166,17 @@
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "\xCAtes-vous s\xFBr de vouloir d\xE9placer:"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "\xCAtes-vous s\xFBr de vouloir d\xE9placer %d \xE9l\xE9ments:"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Confirmez le d\xE9placement"
#: Merge.rc:2250
#, c-format
@@ -4169,12 +4241,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Menu explorateur gauche"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Menu explorateur droit"
#: Merge.rc:2274
#, c-format
@@ -4385,7 +4457,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Les r\xE9pertoires sont diff\xE9rents"
#: Merge.rc:2339
#, c-format
@@ -4405,12 +4477,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "Les fichiers de texte sont identiques"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "Les fichiers de texte sont diff\xE9rents"
#: Merge.rc:2354
#, c-format
@@ -4633,8 +4705,14 @@
#: Merge.rc:2421
#, 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 "Les fins de ligne sont de type diff\xE9rent (Windows/Unix/Mac) au fichier '%1'.\n Selon les pr\xE9f\xE9rences en vigueur, elles seront uniformis\xE9es au type principal.\n D\xE9sirez-vous changer l'option et pr\xE9server les diff\xE9rences ?"
+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 ""
+"Les fins de ligne sont de type diff\xE9rent (Windows/Unix/Mac) au fichier '%1'.\n"
+" Selon les pr\xE9f\xE9rences en vigueur, elles seront uniformis\xE9es au type principal.\n"
+" D\xE9sirez-vous changer l'option et pr\xE9server les diff\xE9rences ?"
#: Merge.rc:2422
#, c-format
@@ -4653,8 +4731,18 @@
#: Merge.rc:2425
#, 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 "Le r\xE9pertoire existe seulement de l'autre c\xF4t\xE9 et ne peut \xEAtre ouvert ici.\n\nVoulez-vous cr\xE9er un r\xE9pertoire s'accordant:\n%1\n\xE0 l'autre c\xF4t\xE9 et ouvrir ces r\xE9pertoires"
+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 ""
+"Le r\xE9pertoire existe seulement de l'autre c\xF4t\xE9 et ne peut \xEAtre ouvert ici.\n"
+"\n"
+"Voulez-vous cr\xE9er un r\xE9pertoire s'accordant:\n"
+"%1\n"
+"\xE0 l'autre c\xF4t\xE9 et ouvrir ces r\xE9pertoires"
#: Merge.rc:2431
#, c-format
@@ -5302,22 +5390,22 @@
#: Merge.rc:2654
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Type"
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "D\xE9compresseur"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Pr\xE9-comparaison"
#: Merge.rc:2658
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "\xC9diteur de script"
#: Merge.rc:2665
#, c-format
@@ -5342,12 +5430,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Changer le statut de lecture seule pour fichier/r\xE9pertoire du c\xF4t\xE9 gauche"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Changer le statut de lecture seule pour fichier/r\xE9pertoire du c\xF4t\xE9 droit"
#: Merge.rc:2671
#, c-format
@@ -5543,13 +5631,21 @@
#: Merge.rc:2714
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "S\xE9lectionner le langage de l'interface\nLangage"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"S\xE9lectionner le langage de l'interface\n"
+"Langage"
#: Merge.rc:2715
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "Afficher les diff\xE9rences des lignes avec diff\xE9rentes couleurs\nAfficher diff\xE9rences des lignes"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"Afficher les diff\xE9rences des lignes avec diff\xE9rentes couleurs\n"
+"Afficher diff\xE9rences des lignes"
#: Merge.rc:2716
#, c-format
@@ -5710,7 +5806,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Affiche une liste des plugiciels disponibles"
#: Merge.rc:2756
#, c-format
@@ -5749,8 +5845,12 @@
#: Merge.rc:2768
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "Active le prochain fichier visible\nActive le prochain fichier"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"Active le prochain fichier visible\n"
+"Active le prochain fichier"
#: Merge.rc:2769
#, c-format
@@ -5759,8 +5859,12 @@
#: Merge.rc:2775
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "Ouvre la rubrique d'aide de WinMerge\nAide de WinMerge"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"Ouvre la rubrique d'aide de WinMerge\n"
+"Aide de WinMerge"
#: Merge.rc:2776
#, c-format
@@ -5779,13 +5883,21 @@
#: Merge.rc:2779
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "Ouvre les notes de mise \xE0 jour\nNotes de mise \xE0 jour"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"Ouvre les notes de mise \xE0 jour\n"
+"Notes de mise \xE0 jour"
#: Merge.rc:2780
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "Ouvre le site web des traductions\nTraductions"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"Ouvre le site web des traductions\n"
+"Traductions"
#: Merge.rc:2786
#, c-format
@@ -5880,7 +5992,7 @@
#: Merge.rc:2825
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Pas de surbrillance"
#: Merge.rc:2826
#, c-format
@@ -6035,7 +6147,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-17 15:26:46
|
Revision: 6471
http://winmerge.svn.sourceforge.net/winmerge/?rev=6471&view=rev
Author: kimmov
Date: 2009-02-17 15:26:36 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
PATCH: [ 2608190 ] Traditional Chinese Translation of readme.txt
Submitted by wck3
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
branches/R2_12/Docs/Users/Languages/ReadMe-ChineseTraditional.txt
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-17 15:22:36 UTC (rev 6470)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-17 15:26:36 UTC (rev 6471)
@@ -10,6 +10,7 @@
Bugfix: Browse button in Option dialog reverted to previous settings
(#2606153)
Translation updates:
+ - Chinese Traditional (#2608190)
- Croatian (#2596949)
- Dutch (#2586422, #2590430)
- French (#2603591)
Copied: branches/R2_12/Docs/Users/Languages/ReadMe-ChineseTraditional.txt (from rev 6470, trunk/Docs/Users/Languages/ReadMe-ChineseTraditional.txt)
===================================================================
--- branches/R2_12/Docs/Users/Languages/ReadMe-ChineseTraditional.txt (rev 0)
+++ branches/R2_12/Docs/Users/Languages/ReadMe-ChineseTraditional.txt 2009-02-17 15:26:36 UTC (rev 6471)
@@ -0,0 +1,38 @@
+WINMERGE
+
+WinMerge \xACO Windows \xA7@\xB7~\xA8t\xB2ΤU\xAA\xBA\xA1B\xB6}\xA9X\xAA\xBA\xA4\xF1\xB8\xFB\xBBP\xA6X\xA8֪\xBA\xA4u\xA8\xE3\xA1CWinMerge \xAF\xE0\xA4\xF1\xB8\xFB\xB8\xEA\xAEƧ\xA8\xBBP\xC0ɮסA\xA5H\xAA\xBD\xB1\xB5\xACݨ\xEC\xAD\xEC\xA4媺\xA9\xF6\xC0\xB4\xA9\xF6\xB3B\xB2z\xAA\xBA\xA4覡\xA1A\xA7e\xB2{\xA4\xF1\xB8\xFB\xA5X\xAA\xBA\xAEt\xB2\xA7\xA1CWinMerge \xA5i\xA5H\xBFW\xA5߹B\xA5ΡA\xA4]\xA5i\xA5H\xB7\x{D9A8}\xACY\xADӤ\xF1\xB8\xFB\xAEt\xB2\xA7/\xA6X\xA8֤u\xA8㪺\xA5~\xB3\xA1\xBDs\xBF边\xA1C
+
+WinMerge \xA6\xB3\xB3\\xA6h\xA6\xB3\xA5Ϊ\xBA\xA5\\xAF\xE0\xA8ϱo\xA4\xF1\xB8\xFB\xA1B\xA6P\xA4ơB\xA6X\xA8֧\xF3\xA5[\xAEe\xA9\xF6\xA1C\xB3\\xA6h\xB5{\xA6\xA1\xBBy\xA8\xA5\xA9M\xC0ɮ榡\xB3\xA3\xA5H\xBBy\xAAk\xB0\xAA\xABG\xAB\xD7\xC5\xE3\xA5ܡC
+
+WinMerge \xB3̷s\xAA\xA9\xBBP\xB8\xEA\xB0T\xA6b\xA1Ghttp://winmerge.org/
+
+\xA5ߧY\xA4W\xA4\xE2
+===========
+\xA6w\xB8˫\xE1\xA1A\xBEDz߰ާ@\xA1A\xAB\xF6 \xBB\xA1\xA9\xFA > WinMerge \xBB\xA1\xA9\xFA\xA1C\xC2s\xC4\xFD Quick Start \xB3\xB9\xA1C\xA9Φ\xDC http://winmerge.org/docs/manual/QuickStart.html \xC2s\xC4\xFD\xA8\xE4\xBA\xF4\xB8\x{12AA61}C
+
+WinMerge \xBB\xA1\xA9\xFA
+=============
+\xA6w\xB8\xCB WinMerge \xAEɡA\xA8仡\xA9\xFA\xC0ɦb\xA6a\xA6w\xB8˦\xA8 Microsoft HTML Help \xC0\xC9 ( WinMerge.chm)\xA1C\xB6}\xB1һ\xA1\xA9\xFA\xC0ɡA\xAB\xF6\xA1GHelp > WinMerge \xBB\xA1\xA9\xFA\xA1C\xA9Ω\xF3WinMerge \xB5\xA1\xA1A\xAB\xF6 F1\xA1C\xA9\xF3\xA9R\xA5O\xA6C\xA1A\xABh\xA5H "/?" \xB0Ѽư\xF5\xA6\xE6 WinMerge \xAA\xBA\xA5i\xB0\xF5\xA6\xE6\xC0ɡC
+
+\xB1z\xA4]\xA5i\xA5H\xA8\xEC http://winmerge.org/docs/manual/ \xC2s\xC4\xFD\xA8\xE4HTML \xAA\xA9\xA1C
+
+\xC0\xA3\xC1Y\xA4䴩
+===============
+WinMerge \xA5\xCE 7-Zip (http://www.7-zip.org) \xB6}\xA9X\xC0\xA3\xC1Y\xA4u\xA8\xE3\xA8Ӥ䴩\xC0\xA3\xC1Y\xC0ɡC\xA7ڭ̫\xD8ij\xA4U\xB8\xFC\xA6w\xB8\xCB 7-Zip\xA1A\xA8è\xEC http://winmerge.org/downloads/ \xA4U\xB8\xFC 7-Zip \xA5~\xB1\xBE\xA6w\xB8˾\xB9 (plugin installer)\xA1A\xB0\xF5\xA6椧\xA1C
+
+\xADY\xB1z\xA6\xB3\xB1z\xAA\xBA\xB2z\xA5Ѥ\xA3\xA6w\xB8\xCB 7-Zip\xA1A7-Zip \xA5~\xB1\xBE\xA6w\xB8˾\xB9\xA5i\xBF\xEF\xBEܶȦw\xB8ˤ䴩\xC0\xA3\xC1Y\xA9һݪ\xBA\xC0ɮסC\xB2Ӹ`\xBDаѦһ\xA1\xA9\xFA\xC0ɤ\xA4\xAA\xBA\xA1u7-Zip \xBBP\xC0\xA3\xC1Y\xA4䴩\xA1v\xB3\xB9 (7-Zip and archive support)\xA1C
+
+WinMerge \xA4䴩
+================
+\xA6\xB3\xC3\xF6\xA9\xF3 WinMerge \xAA\xBA\xB0\xDD\xC3D\xA9Ϋ\xD8ij\xB6ܡH\xBDШ\xEC http://forums.winmerge.org/ \xAA\xBA WinMerge \xAA\xC0\xB8s\xB0Q\xBDװϡC\xAC\xE3\xB5o\xAA̱`\xB7|\xBE\Ū\xBBP\xA6^\xC0\xB3\xA8\xE2\xADӰQ\xBDװϤ\xA4\xAA\xBA\xB0\xDD\xC3D\xA1C\xA4@\xAF\xEB\xA9ʪ\xBAij\xC3D\xA1A\xB9\xB3\xA8ϥΤW\xAA\xBA\xB0\xDD\xC3D\xA1A\xBDШ줽\xB6}\xB0Q\xBDװ\xCF (Open Discussion forum)\xA1C\xAC\xE3\xB5o\xA4W\xAA\xBAij\xC3D\xA1A\xBDШ\xEC\xAC\xE3\xB5o\xB0Q\xBDװ\xCF (Developers forum)\xA1C
+
+\xB5{\xA6\xA1\xBF\xF9\xBB~\xBBP\xA5\\xAF\xE0\xBCW\xAFq
+=========================
+\xADY\xA4@\xAD\xD3ij\xC3D\xA6b\xB0Q\xBDװϤ\xA4\xA5\xBC\xC0\xF2\xB8ѨM\xA1A\xA5i\xA8\xEC\xADp\xB5e ( http://project.winmerge.org/) \xA4\xA4\xAA\xBA\xB0l\xC2ܾ\xB9 (Tracker) \xACd\xACݡA\xA8ë\xF6\xA8\xE4\xBF\xEF\xB3檺\xB3s\xB5\xB2 (Ĵ\xA6p\xA1ABugs \xA9\xCE Feature Requests)\xA1A\xA8쨺\xB8̴N\xA5i\xA5H\xC2s\xC4\xFD\xA9δ\xA3\xA5X\xB1z\xAA\xBA\xB7Q\xAAk\xA1C
+
+\xB4\xA3\xB3\xF8\xBF\xF9\xBB~\xAEɽЪ\xFE\xA4W\xA9ҥΪ\xBA WinMerge \xAA\xA9\xA5\xBB\xBDs\xB8\xB9\xA1C\xAB\xF6 \xBB\xA1\xA9\xFA > \xB2պA\xA1A\xA5i\xB2\xA3\xA5ͲպA\xAC\xF6\xBF\xFD\xC0ɡC\xB1N\xA6\xB9\xC0ɪ\xFE\xA9\xF3\xB1z\xAA\xBA\xBF\xF9\xBB~\xB4\xA3\xB3\xF8\xA1F\xB8\xD3\xC0ɦ\xB3\xB3\\xA6h\xA6\xB3\xA5Ϊ\xBA\xB8\xEA\xB0T\xB5\xB9\xAC\xE3\xB5o\xAA̡C
+
+
+WinMerge \xAC\xE3\xB5o\xB9ζ\xA4
+
+
Modified: branches/R2_12/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_12/Installer/InnoSetup/WinMerge.iss 2009-02-17 15:22:36 UTC (rev 6470)
+++ branches/R2_12/Installer/InnoSetup/WinMerge.iss 2009-02-17 15:26:36 UTC (rev 6471)
@@ -114,7 +114,7 @@
Name: Bulgarian; MessagesFile: Languages\Bulgarian.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt
Name: Catalan; MessagesFile: Languages\Catalan.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt
Name: Chinese_Simplified; MessagesFile: Languages\Chinese_Simplified.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-ChineseSimplified.txt
-Name: Chinese_Traditional; MessagesFile: Languages\Chinese_Traditional.isl
+Name: Chinese_Traditional; MessagesFile: Languages\Chinese_Traditional.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-ChineseTraditional.txt
Name: Croatian; MessagesFile: Languages\Croatian.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Croatian.txt
Name: Czech; MessagesFile: Languages\Czech.isl
Name: Danish; MessagesFile: Languages\Danish.isl
@@ -387,6 +387,7 @@
Source: ..\..\Src\Languages\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified
Source: ..\..\Src\Languages\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp
+Source: ..\..\Docs\Users\Languages\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional
Source: ..\..\Src\Languages\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian
Source: ..\..\Src\Languages\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp
@@ -450,6 +451,7 @@
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Bulgarian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Bulgarian
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Catalan.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Catalan
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseSimplified.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Simplified
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseTraditional.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Traditional
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Croatian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Croatian
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Dutch.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Dutch
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-French.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: French
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-17 17:02:42
|
Revision: 6476
http://winmerge.svn.sourceforge.net/winmerge/?rev=6476&view=rev
Author: kimmov
Date: 2009-02-17 17:02:35 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
PATCH: [ 2609242 ] Ukranian translation update for 2.12
Submitted by Warrior
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Ukrainian.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-17 17:01:22 UTC (rev 6475)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-17 17:02:35 UTC (rev 6476)
@@ -17,6 +17,7 @@
- German (#2586497)
- Japanese (r6456)
- Swedish (#2586274)
+ - Ukrainian (#2609242)
WinMerge 2.11.2 - 2009-02-05 (r6428)
Update Python syntax highlight keywords for Python 2.6 (#2473375)
Modified: branches/R2_12/Src/Languages/Ukrainian.po
===================================================================
--- branches/R2_12/Src/Languages/Ukrainian.po 2009-02-17 17:01:22 UTC (rev 6475)
+++ branches/R2_12/Src/Languages/Ukrainian.po 2009-02-17 17:02:35 UTC (rev 6476)
@@ -13,8 +13,8 @@
"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-09-26 22:47+0200\n"
-"Last-Translator: Warrior <warr11r at rambler.ru>\n"
+"PO-Revision-Date: 2009-02-13 23:24+0200\n"
+"Last-Translator: Warrior <wa...@ra...>\n"
"Language-Team: Ukrainian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1251\n"
@@ -91,30 +91,30 @@
msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xF0\xFF\xE4\xEA\xE0..."
#: Merge.rc:86
-#, fuzzy, c-format
+#, c-format
msgid "Op&en"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8"
+msgstr "&³\xE4\xEA\xF0\xE8\xF2\xE8"
#: Merge.rc:88
#: Merge.rc:531
#: Merge.rc:537
#, c-format
msgid "with &Registered Application"
-msgstr "\xE7\xE0\xF0\xE5\xBA\xF1\xF2\xF0\xEE\xE2\xE0\xED\xE8\xEC \xE4\xEE\xE4\xE0\xF2\xEA\xEE\xEC"
+msgstr "\xE7\xE0&\xF0\xE5\xBA\xF1\xF2\xF0\xEE\xE2\xE0\xED\xE8\xEC \xE7\xE0\xF1\xF2\xEE\xF1\xF3\xED\xEA\xEE\xEC"
#: Merge.rc:89
#: Merge.rc:532
#: Merge.rc:538
#, c-format
msgid "with &External Editor"
-msgstr "\xE7\xEE\xE2\xED\xB3\xF8\xED\xB3\xEC \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xEE\xEC"
+msgstr "\xE7\xEE&\xE2\xED\xB3\xF8\xED\xB3\xEC \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0\xEE\xEC"
#: Merge.rc:90
#: Merge.rc:533
#: Merge.rc:539
#, c-format
msgid "&with..."
-msgstr "\xE7\xE0 \xE4\xEE\xEF\xEE\xEC\xEE\xE3\xEE\xFE..."
+msgstr "&\xE7\xE0 \xE4\xEE\xEF\xEE\xEC\xEE\xE3\xEE\xFE..."
#: Merge.rc:110
#: Merge.rc:191
@@ -128,7 +128,7 @@
#: Merge.rc:314
#, c-format
msgid "&New\tCtrl+N"
-msgstr "\xCD\xEE\xE2\xE8\xE9\tCtrl+N"
+msgstr "&\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8\tCtrl+N"
#: Merge.rc:113
#: Merge.rc:194
@@ -142,21 +142,21 @@
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xE7 \xEA\xEE\xED\xF4\xEB\xB3\xEA\xF2\xE0\xEC\xE8..."
+msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xE7 \xEA\xEE\xED&\xF4\xEB\xB3\xEA\xF2\xE0\xEC\xE8..."
#: Merge.rc:116
#: Merge.rc:197
#: Merge.rc:318
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xEF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J"
+msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 &\xEF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J"
#: Merge.rc:117
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
-msgstr "\xC7\xE1\xE5\xF0\xE5\xE3\xF2\xE8 \xEF\xF0\xEE\xE5\xEA\xF2..."
+msgstr "\xC7&\xE1\xE5\xF0\xE5\xE3\xF2\xE8 \xEF\xF0\xEE\xE5\xEA\xF2..."
#: Merge.rc:119
#, c-format
@@ -189,7 +189,7 @@
#: Merge.rc:389
#, c-format
msgid "&View"
-msgstr "&\xC2\xE8\xE3\xEB\xFF\xE4"
+msgstr "\xC2\xE8&\xE3\xEB\xFF\xE4"
#: Merge.rc:129
#: Merge.rc:228
@@ -210,7 +210,7 @@
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
-msgstr "\xCF\xE0&\xED\xE5\xEB\xFC \xB3\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xB3\xE2"
+msgstr "\xCF\xE0\xED&\xE5\xEB\xFC \xB3\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xB3\xE2"
#: Merge.rc:134
#: Merge.rc:233
@@ -238,14 +238,14 @@
#: Merge.rc:419
#, c-format
msgid "&Status Bar"
-msgstr "&\xD0\xFF\xE4\xEE\xEA \xF1\xF2\xE0\xED\xF3"
+msgstr "\xD0\xFF&\xE4\xEE\xEA \xF1\xF2\xE0\xED\xF3"
#: Merge.rc:139
#: Merge.rc:238
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
-msgstr "\xCF\xE0\xED\xE5\xEB\xFC \xE7\xE0\xEA\xEB\xE0\xE4\xEE\xEA"
+msgstr "\xCF\xE0\xED\xE5\xEB\xFC &\xE7\xE0\xEA\xEB\xE0\xE4\xEE\xEA"
#: Merge.rc:141
#: Merge.rc:241
@@ -259,7 +259,7 @@
#: Merge.rc:446
#, c-format
msgid "&Tools"
-msgstr "&\xB2\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8"
+msgstr "&\xD1\xE5\xF0\xE2\xB3\xF1"
#: Merge.rc:145
#: Merge.rc:265
@@ -273,14 +273,14 @@
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "&\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEF\xE0\xF2\xF7..."
+msgstr "&\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEB\xE0\xF2\xEA\xF3..."
#: Merge.rc:148
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Plugins"
-msgstr "&\xC4\xEE\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
+msgstr "\xC4\xEE&\xEF\xEE\xE2\xED\xE5\xED\xED\xFF"
#: Merge.rc:150
#: Merge.rc:271
@@ -294,28 +294,28 @@
#: Merge.rc:456
#, c-format
msgid "&Manual Unpacking"
-msgstr "\xD0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xED\xED\xFF \xE2\xF0\xF3\xF7\xED\xF3"
+msgstr "\xD0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xED\xED\xFF &\xE2\xF0\xF3\xF7\xED\xF3"
#: Merge.rc:153
#: Merge.rc:274
#: Merge.rc:457
#, c-format
msgid "&Automatic Unpacking"
-msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xE5 \xF0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xED\xED\xFF"
+msgstr "&\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xE5 \xF0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xED\xED\xFF"
#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
msgid "&Edit with Unpacker"
-msgstr "\xD0\xE5\xE4\xE0\xE3\xF3\xE2\xE0\xF2\xE8 \xE7 \xF0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xEB\xFC\xED\xE8\xEA\xEE\xEC"
+msgstr "&\xD0\xE5\xE4\xE0\xE3\xF3\xE2\xE0\xF2\xE8 \xE7 \xF0\xEE\xE7\xEF\xE0\xEA\xF3\xE2\xE0\xEB\xFC\xED\xE8\xEA\xEE\xEC"
#: Merge.rc:157
#: Merge.rc:278
#: Merge.rc:466
#, c-format
msgid "&Reload plugins"
-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"
+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
@@ -350,14 +350,14 @@
#: Merge.rc:475
#, c-format
msgid "Cl&ose"
-msgstr "\xC7\xE0\xEA\xF0\xE8\xF2\xE8"
+msgstr "&\xC7\xE0\xEA\xF0\xE8\xF2\xE8"
#: Merge.rc:167
#: Merge.rc:288
#: Merge.rc:476
#, c-format
msgid "Clo&se All"
-msgstr "\xC7\xE0\xEA\xF0\xE8\xF2\xE8 \xE2\xF1\xE5"
+msgstr "\xC7\xE0&\xEA\xF0\xE8\xF2\xE8 \xE2\xF1\xE5"
#: Merge.rc:169
#: Merge.rc:290
@@ -400,7 +400,7 @@
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "\xC4\xEE\xE2\xB3\xE4\xEA\xE0 &WinMerge\tF1"
+msgstr "&\xC4\xEE\xE2\xB3\xE4\xEA\xE0 WinMerge\tF1"
#: Merge.rc:179
#: Merge.rc:300
@@ -421,14 +421,14 @@
#: Merge.rc:490
#, c-format
msgid "C&onfiguration"
-msgstr "&\xCA\xEE\xED\xF4\xB3\xE3\xF3\xF0\xE0\xF6\xB3\xFF"
+msgstr "&\xCD\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF"
#: Merge.rc:182
#: Merge.rc:303
#: Merge.rc:491
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 &\xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE2\xE8\xEC\xEA\xED\xE5\xED\xE0..."
+msgstr "ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 &\xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE2\xE8\xEC\xEA\xED\xF3\xF2\xE0..."
#: Merge.rc:184
#: Merge.rc:305
@@ -448,13 +448,13 @@
#: Merge.rc:337
#, c-format
msgid "L&eft Read-only"
-msgstr "\xD4\xE0\xE9\xEB \xE7&\xEB\xB3\xE2\xE0 \xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xF7\xE8\xF2\xE0\xED\xED\xFF"
+msgstr "&\xD4\xE0\xE9\xEB \xE7\xEB\xB3\xE2\xE0 \xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xF7\xE8\xF2\xE0\xED\xED\xFF"
#: Merge.rc:201
#: Merge.rc:338
#, c-format
msgid "Ri&ght Read-only"
-msgstr "\xD4\xE0\xE9\xEB \xF1&\xEF\xF0\xE0\xE2\xE0 \xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xF7\xE8\xF2\xE0\xED\xED\xFF"
+msgstr "\xD4&\xE0\xE9\xEB \xF1\xEF\xF0\xE0\xE2\xE0 \xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xF7\xE8\xF2\xE0\xED\xED\xFF"
#: Merge.rc:203
#, c-format
@@ -470,17 +470,17 @@
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr "\xCE\xE4\xED\xE0\xEA\xEE\xE2\xB3"
+msgstr "&\xCE\xE4\xED\xE0\xEA\xEE\xE2\xB3"
#: Merge.rc:216
#, c-format
msgid "Show &Different Items"
-msgstr "г\xE7\xED\xB3"
+msgstr "&г\xE7\xED\xB3"
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr "\xD3\xED\xB3\xEA\xE0\xEB\xFC\xED\xB3 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
+msgstr "\xD3\xED\xB3\xEA\xE0\xEB\xFC\xED\xB3 &\xEB\xB3\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:218
#, c-format
@@ -490,32 +490,32 @@
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr "\xCF\xF0\xEE\xEF\xF3\xF9\xE5\xED\xB3"
+msgstr "\xCF\xF0\xEE\xEF\xF3&\xF9\xE5\xED\xB3"
#: Merge.rc:220
#, c-format
msgid "S&how Binary Files"
-msgstr "\xC1\xB3\xED\xE0\xF0\xED\xB3 \xF4\xE0\xE9\xEB\xE8"
+msgstr "&\xC1\xB3\xED\xE0\xF0\xED\xB3 \xF4\xE0\xE9\xEB\xE8"
#: Merge.rc:222
#, c-format
msgid "Show Hidd&en Items"
-msgstr "\xD1\xF5\xEE\xE2\xE0\xED\xB3"
+msgstr "\xD1&\xF5\xEE\xE2\xE0\xED\xB3"
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "\xD0\xE5\xE6\xE8\xEC &\xE4\xE5\xF0\xE5\xE2\xE0"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "&\xD0\xEE\xE7\xE3\xEE\xF0\xED\xF3\xF2\xE8 \xE2\xF1\xB3 \xEF\xB3\xE4\xF2\xEA\xE8"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&\xC7\xE3\xEE\xF0\xED\xF3\xF2\xE8 \xE2\xF1\xB3 \xEF\xB3\xE4\xF2\xE5\xEA\xE8"
#: Merge.rc:239
#, c-format
@@ -542,7 +542,7 @@
#: Merge.rc:248
#, c-format
msgid "Co&mpare\tEnter"
-msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8\tEnter"
+msgstr "\xCF\xEE&\xF0\xB3\xE2\xED\xFF\xF2\xE8\tEnter"
#: Merge.rc:250
#: Merge.rc:430
@@ -611,7 +611,7 @@
#: Merge.rc:322
#, c-format
msgid "Save &Left"
-msgstr "\xC7\xE1\xE5\xF0\xE5\xE3\xF2\xE8 \xF4\xE0\xE9\xEB \xE7&\xEB\xB3\xE2\xE0"
+msgstr "\xC7\xE1&\xE5\xF0\xE5\xE3\xF2\xE8 \xF4\xE0\xE9\xEB \xE7\xEB\xB3\xE2\xE0"
#: Merge.rc:324
#: Merge.rc:329
@@ -628,7 +628,7 @@
#: Merge.rc:327
#, c-format
msgid "Save &Right"
-msgstr "\xC7\xE1\xE5\xF0\xE5\xE3\xF2\xE8 \xF4\xE0\xE9\xEB \xF1&\xEF\xF0\xE0\xE2\xE0"
+msgstr "\xC7\xE1\xE5&\xF0\xE5\xE3\xF2\xE8 \xF4\xE0\xE9\xEB \xF1\xEF\xF0\xE0\xE2\xE0"
#: Merge.rc:333
#, c-format
@@ -638,17 +638,17 @@
#: Merge.rc:334
#, c-format
msgid "Page Se&tup"
-msgstr "\xCF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xE8 \xF1\xF2\xEE\xF0\xB3\xED\xEA\xE8..."
+msgstr "\xCF\xE0\xF0\xE0&\xEC\xE5\xF2\xF0\xE8 \xF1\xF2\xEE\xF0\xB3\xED\xEA\xE8..."
#: Merge.rc:335
#, c-format
msgid "Print Previe&w"
-msgstr "\xCF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xB3\xE9 \xEF\xE5\xF0\xE5\xE3\xEB\xFF\xE4"
+msgstr "&\xCF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xB3\xE9 \xEF\xE5\xF0\xE5\xE3\xEB\xFF\xE4"
#: Merge.rc:340
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&\xC7\xE0\xEC\xB3\xED\xE8\xF2\xE8 \xEF\xE5\xF0\xE5\xED\xE5\xF1\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xB3\xE2 \xED\xE0"
+msgstr "\xC7\xE0\xEC\xB3\xED\xE8\xF2\xE8 \xEF\xE5\xF0\xE5\xED\xE5\xF1\xE5\xED\xED\xFF &\xF0\xFF\xE4\xEA\xB3\xE2 \xED\xE0"
#: Merge.rc:342
#, c-format
@@ -668,12 +668,12 @@
#: Merge.rc:347
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "\xD0\xE5\xE6\xE8\xEC \xE7\xEB\xE8\xF2\xF2\xFF\tF9"
+msgstr "\xD0\xE5\xE6\xE8\xEC &\xE7\xEB\xE8\xF2\xF2\xFF\tF9"
#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
-msgstr "\xCA\xEE\xE4\xF3\xE2\xE0\xED\xED\xFF \xF4\xE0\xE9\xEB\xF3..."
+msgstr "&\xCA\xEE\xE4\xF3\xE2\xE0\xED\xED\xFF \xF4\xE0\xE9\xEB\xF3..."
#: Merge.rc:355
#, c-format
@@ -703,12 +703,12 @@
#: Merge.rc:362
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "\xC2\xE8\xE1\xF0\xE0\xF2\xE8 \xE2\xB3\xE4\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC\tF4"
+msgstr "\xC2\xE8\xE1\xF0\xE0\xF2\xE8 \xE2\xB3\xE4&\xEC\xB3\xED\xED\xB3\xF1\xF2\xFC\tF4"
#: Merge.rc:365
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&\xC7\xED\xE0\xE9\xF2\xE8...\tCtrl+F"
+msgstr "\xC7\xED\xE0&\xE9\xF2\xE8...\tCtrl+F"
#: Merge.rc:366
#, c-format
@@ -718,13 +718,13 @@
#: Merge.rc:368
#, c-format
msgid "&Scripts"
-msgstr "&\xD1\xF6\xE5\xED\xE0\xF0\xB3\xBF"
+msgstr "\xD1&\xF6\xE5\xED\xE0\xF0\xB3\xBF"
#: Merge.rc:370
#: Merge.rc:2789
#, c-format
msgid "< Empty >"
-msgstr "< \xCD\xE5\xEC\xE0\xBA >"
+msgstr "< \xCD\xE5\xEC\xE0 >"
#: Merge.rc:373
#, c-format
@@ -739,7 +739,7 @@
#: Merge.rc:378
#, c-format
msgid "&Bookmarks"
-msgstr "&\xC7\xE0\xEA\xEB\xE0\xE4\xEA\xE8"
+msgstr "\xC7&\xE0\xEA\xEB\xE0\xE4\xEA\xE8"
#: Merge.rc:380
#, c-format
@@ -769,23 +769,23 @@
#: Merge.rc:393
#, c-format
msgid "&Zoom"
-msgstr "&\xCC\xE0\xF1\xF8\xF2\xE0\xE1"
+msgstr "\xCC\xE0&\xF1\xF8\xF2\xE0\xE1"
#: Merge.rc:395
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr "\xCD\xE0\xE1\xEB\xE8\xE7\xE8\xF2\xE8\tCtrl++"
+msgstr "\xCD\xE0&\xE1\xEB\xE8\xE7\xE8\xF2\xE8\tCtrl++"
#: Merge.rc:396
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr "³\xE4\xE4\xE0\xEB\xE8\xF2\xE8\tCtrl+-"
+msgstr "³\xE4&\xE4\xE0\xEB\xE8\xF2\xE8\tCtrl+-"
#. Zoom to normal
#: Merge.rc:397
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr "\xC7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9\tCtrl+*"
+msgstr "&\xC7\xE2\xE8\xF7\xE0\xE9\xED\xE8\xE9\tCtrl+*"
#: Merge.rc:399
#, c-format
@@ -795,7 +795,7 @@
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr "\xC7\xE0\xE1\xEB\xEE\xEA\xF3\xE2\xE0\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xB3"
+msgstr "\xC7\xE0&\xE1\xEB\xEE\xEA\xF3\xE2\xE0\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xB3"
#: Merge.rc:405
#, c-format
@@ -810,22 +810,22 @@
#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xED\xEE\xEC\xE5\xF0\xE0 \xF0\xFF\xE4\xEA\xB3\xE2"
+msgstr "\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 &\xED\xEE\xEC\xE5\xF0\xE0 \xF0\xFF\xE4\xEA\xB3\xE2"
#: Merge.rc:408
#, c-format
msgid "View &Margins"
-msgstr "\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF\xEE\xEB\xFF"
+msgstr "\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF&\xEE\xEB\xFF"
#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
-msgstr "\xCF\xE5\xF0\xE5\xED\xEE\xF1\xE8\xF2\xE8 \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
msgid "Sw&ap Panes"
-msgstr "\xCF\xEE\xEC\xB3\xED\xFF\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xB3 \xEC\xB3\xF1\xF6\xFF\xEC\xE8"
+msgstr "\xCF\xEE\xEC&\xB3\xED\xFF\xF2\xE8 \xEF\xE0\xED\xE5\xEB\xB3 \xEC\xB3\xF1\xF6\xFF\xEC\xE8"
#: Merge.rc:421
#, c-format
@@ -835,7 +835,7 @@
#: Merge.rc:422
#, c-format
msgid "Lo&cation Pane"
-msgstr "\xCF\xE0\xED\xE5\xEB\xFC \xEC\xB3\xF1\xF6\xFC \xF0\xEE\xE7\xF2\xE0\xF8\xF3\xE2\xE0\xED\xED\xFF"
+msgstr "\xCF\xE0\xED\xE5\xEB\xFC \xEC\xB3\xF1\xF6\xFC &\xF0\xEE\xE7\xF2\xE0\xF8\xF3\xE2\xE0\xED\xED\xFF"
#: Merge.rc:440
#, c-format
@@ -850,7 +850,7 @@
#: Merge.rc:443
#, c-format
msgid "Copy &All to Right"
-msgstr "\xD1\xEA\xEE&\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xF1\xE5 \xED\xE0 \xEF\xF0\xE0\xE2\xF3 \xEF\xE0\xED\xE5\xEB\xFC"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xF1\xE5 \xED\xE0 \xEF\xF0\xE0\xE2\xF3 \xEF\xE0\xED\xE5\xEB&\xFC"
#: Merge.rc:444
#, c-format
@@ -870,7 +870,7 @@
#: Merge.rc:503
#, c-format
msgid "Co&mpare Special"
-msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8 \xEE\xF1\xEE\xE1\xEB\xE8\xE2\xEE\xF1\xF2\xB3"
+msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xF2\xE8 &\xEE\xF1\xEE\xE1\xEB\xE8\xE2\xEE\xF1\xF2\xB3"
#: Merge.rc:505
#, c-format
@@ -880,22 +880,22 @@
#: Merge.rc:510
#, c-format
msgid "&Left to Right"
-msgstr "\xC7\xEB\xB3\xE2\xE0 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
+msgstr "&\xC7\xEB\xB3\xE2\xE0 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:511
#, c-format
msgid "L&eft to..."
-msgstr "˳\xE2\xEE\xF0\xF3\xF7 \xED\xE0 ..."
+msgstr "\xCB&\xB3\xE2\xEE\xF0\xF3\xF7 \xED\xE0 ..."
#: Merge.rc:512
#, c-format
msgid "&Right to Left"
-msgstr "\xD1\xEF\xF0\xE0\xE2\xE0 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
+msgstr "&\xD1\xEF\xF0\xE0\xE2\xE0 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:513
#, c-format
msgid "R&ight to..."
-msgstr "\xCF\xF0\xE0\xE2\xEE\xF0\xF3\xF7 \xED\xE0 ..."
+msgstr "\xCF&\xF0\xE0\xE2\xEE\xF0\xF3\xF7 \xED\xE0 ..."
#: Merge.rc:515
#, c-format
@@ -915,26 +915,26 @@
#: Merge.rc:520
#, c-format
msgid "&Delete"
-msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8"
+msgstr "&\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8"
#: Merge.rc:522
#: Merge.rc:1135
#: Merge.rc:1517
#, c-format
msgid "&Left"
-msgstr "˳\xE2\xEE\xF0\xF3\xF7"
+msgstr "&˳\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:523
#: Merge.rc:1137
#: Merge.rc:1520
#, c-format
msgid "&Right"
-msgstr "\xCF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
+msgstr "&\xCF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:524
#, c-format
msgid "&Both"
-msgstr "\xCE\xE1\xE8\xE4\xE2\xE0"
+msgstr "&\xCE\xE1\xE8\xE4\xE2\xE0"
#: Merge.rc:526
#, c-format
@@ -949,17 +949,17 @@
#: Merge.rc:529
#, c-format
msgid "&Open Left"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xEB\xB3\xE2\xE8\xE9 \xF4\xE0\xE9\xEB"
+msgstr "&³\xE4\xEA\xF0\xE8\xF2\xE8 \xEB\xB3\xE2\xE8\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:535
#, c-format
msgid "O&pen Right"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xEF\xF0\xE0\xE2\xE8\xE9 \xF4\xE0\xE9\xEB"
+msgstr "\xC2&\xB3\xE4\xEA\xF0\xE8\xF2\xE8 \xEF\xF0\xE0\xE2\xE8\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:542
#, c-format
msgid "Cop&y Pathnames"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xF8\xEB\xFF\xF5\xE8"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 &\xF8\xEB\xFF\xF5\xE8"
#: Merge.rc:544
#, c-format
@@ -1004,7 +1004,7 @@
#: Merge.rc:555
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr "ҳ\xEB\xFC\xEA\xE8 &\xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3... (%1 \xE7 %2)"
+msgstr "\xCB\xE8\xF8\xE5 &\xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3... (%1 \xE7 %2)"
#: Merge.rc:558
#, c-format
@@ -1014,12 +1014,12 @@
#: Merge.rc:570
#, c-format
msgid "&Copy Full Path"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEF\xEE\xE2\xED\xE8\xE9 \xF8\xEB\xFF\xF5"
+msgstr "&\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEF\xEE\xE2\xED\xE8\xE9 \xF8\xEB\xFF\xF5"
#: Merge.rc:571
#, c-format
msgid "Copy &Filename"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xB3\xEC'\xFF \xF4\xE0\xE9\xEB\xF3"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 &\xB3\xEC'\xFF \xF4\xE0\xE9\xEB\xF3"
#: Merge.rc:577
#, c-format
@@ -1029,7 +1029,7 @@
#: Merge.rc:579
#, c-format
msgid "&No prediffer"
-msgstr "&\xCD\xE5\xEC\xE0\xBA \xEF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xFC\xEE\xE3\xEE \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
+msgstr "&\xCD\xE5\xEC\xE0 \xEF\xEE\xEF\xE5\xF0\xE5\xE4\xED\xFC\xEE\xE3\xEE \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
#: Merge.rc:580
#, c-format
@@ -1091,7 +1091,7 @@
#: Merge.rc:1665
#, c-format
msgid "OK"
-msgstr "\xCE\xCA"
+msgstr "\xC3\xE0\xF0\xE0\xE7\xE4"
#: Merge.rc:674
#, c-format
@@ -1190,7 +1190,7 @@
#: Merge.rc:708
#, c-format
msgid "Files or Folders to Compare"
-msgstr "\xD4\xE0\xE9\xEB\xE8 \xE0\xE1\xEE \xEF\xE0\xEF\xEA\xE8 \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
+msgstr "\xD4\xE0\xE9\xEB\xE8 \xE0\xE1\xEE \xF2\xE5\xEA\xE8 \xE4\xEB\xFF \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF"
#: Merge.rc:715
#, c-format
@@ -1284,7 +1284,7 @@
#: Merge.rc:767
#, c-format
msgid "All&ow only one instance to run"
-msgstr "&\xC4\xEE\xE7\xE2\xEE\xEB\xE8\xF2\xE8 \xE7\xE0\xEF\xF3\xF1\xEA \xF2\xB3\xEB\xFC\xEA\xE8 \xEE\xE4\x{DCFA}\xBF \xEA\xEEﳿ"
+msgstr "&\xC4\xEE\xE7\xE2\xEE\xEB\xE8\xF2\xE8 \xE7\xE0\xEF\xF3\xF1\xEA \xEB\xE8\xF8\xE5 \xEE\xE4\x{DCFA}\xBF \xEA\xEEﳿ"
#: Merge.rc:769
#, c-format
@@ -1299,7 +1299,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF\xF0\xE8 \xE7\xE0\xEF\xF3\xF1\xEA\xF3 \xE4\xB3\xE0\xEB\xEE\xE3 \xE2\xE8\xE1\xEE\xF0\xF3 \xF4\xE0\xE9\xEB\xB3\xE2 \xF2\xE0 \xF2\xE5\xEA"
#: Merge.rc:776
#, c-format
@@ -1358,7 +1358,7 @@
#: Merge.rc:843
#, c-format
msgid "Match &whole word only"
-msgstr "\xD8\xF3\xEA\xE0\xF2\xE8 \xF1\xEB\xEE\xE2\xE0 &\xF6\xB3\xEB\xEA\xEE\xEC"
+msgstr "\xC2\xE8\xEA\xEE\xED\xE0\xF2\xE8 \xEF\xEE\xF8\xF3\xEA \xF1\xEB\xEE\xE2\xE0 &\xF6\xB3\xEB\xEA\xEE\xEC"
#: Merge.rc:815
#: Merge.rc:845
@@ -1483,7 +1483,7 @@
#: Merge.rc:897
#, c-format
msgid "New"
-msgstr "\xCD\xEE\xE2\xE8\xE9"
+msgstr "\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8"
#: Merge.rc:898
#, c-format
@@ -1594,7 +1594,7 @@
#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
-msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4"
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4\xE0\xED\xED\xFF "
#: Merge.rc:1001
#, c-format
@@ -1615,12 +1615,12 @@
#: Merge.rc:1023
#, c-format
msgid "Br&owse..."
-msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4\xE0\xED\xED\xFF ..."
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr "\xC3\xE5\xED\xE5\xF0\xE0\xF2\xEE\xF0 \xEF\xE0\xF2\xF7\xB3\xE2"
+msgstr "\xC3\xE5\xED\xE5\xF0\xE0\xF2\xEE\xF0 \xEB\xE0\xF2\xEE\xEA"
#: Merge.rc:1016
#, c-format
@@ -1852,7 +1852,7 @@
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr "\xD8\xF3\xEA\xE0\xF2\xE8 \xF1\xF5\xEE\xE6\xB3 \xF0\xFF\xE4\xEA\xE8"
+msgstr "\xC2\xE8\xEA\xEE\xED\xE0\xF2\xE8 \xEF\xEE\xF8\xF3\xEA \xF1\xF5\xEE\xE6\xE8\xF5 \xF0\xFF\xE4\xEA\xB3\xE2"
#: Merge.rc:1171
#, c-format
@@ -1953,7 +1953,7 @@
#: Merge.rc:1233
#, c-format
msgid "New..."
-msgstr "\xCD\xEE\xE2\xE8\xE9..."
+msgstr "\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8..."
#: Merge.rc:1234
#, c-format
@@ -1983,7 +1983,7 @@
#: Merge.rc:1249
#, c-format
msgid "&Discard changes"
-msgstr "&³\xE4\xF5\xE8\xEB\xE8\xF2\xE8 \xE7\xEC\xB3\xED\xE8"
+msgstr "&\xD1\xEA\xE0\xF1\xF3\xE2\xE0\xF2\xE8 \xE7\xEC\xB3\xED\xE8"
#: Merge.rc:1251
#, c-format
@@ -2003,7 +2003,7 @@
#: Merge.rc:1258
#, c-format
msgid "Discard All"
-msgstr "³\xE4\xF5\xE8\xEB\xE8\xF2\xE8 \xE2\xF1\xE5"
+msgstr "\xD1\xEA\xE0\xF1\xF3\xE2\xE0\xF2\xE8 \xE2\xF1\xE5"
#: Merge.rc:1265
#: Merge.rc:1513
@@ -2024,8 +2024,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"\xC2\xE8\xFF\xE2\xEB\xE5\xED\xED\xFF \xB3\xED\xF4\xEE\xF0\xEC\xE0\xF6\xB3\xBF \xEF\xF0\xEE \xEA\xEE\xE4\xEE\xE2\xF3 \xF1\xF2\xEE\xF0\xB3\xED\xEA\xF3 \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xB3\xE2\n"
+" .html, .rc, .xml \xE2\xE8\xEC\xE0\xE3\xE0\xBA \xEF\xE5\xF0\xE5\xE7\xE0\xEF\xF3\xF1\xEA\xF3"
#: Merge.rc:1274
#, c-format
@@ -2040,12 +2044,12 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "\xCA\xEE\xE4\xEE\xE2\xE0 \xF1\xF2\xEE\xF0\xB3\xED\xEA\xE0 \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0:"
#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr "WinMerge - ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE2\xE8\xEC\xEA\xED\xE5\xED\xE0"
+msgstr "WinMerge - ϳ\xE4\xF2\xF0\xE8\xEC\xEA\xE0 \xE0\xF0\xF5\xB3\xE2\xB3\xE2 \xE2\xE8\xEC\xEA\xED\xF3\xF2\xE0"
#: Merge.rc:1289
#, c-format
@@ -2110,7 +2114,7 @@
#: Merge.rc:1316
#, c-format
msgid "none"
-msgstr "\xED\xE5\xEC\xE0\xBA"
+msgstr "\xED\xE5\xEC\xE0"
#: Merge.rc:1313
#, c-format
@@ -2240,7 +2244,7 @@
#: Merge.rc:1627
#, c-format
msgid "Browse..."
-msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4..."
+msgstr "\xCF\xE5\xF0\xE5\xE3\xEB\xFF\xE4 ..."
#: Merge.rc:1423
#, c-format
@@ -2270,7 +2274,7 @@
#: Merge.rc:1441
#, c-format
msgid "Private Filter (only for current user)"
-msgstr "\xCE\xF1\xEE\xE1\xE8\xF1\xF2\xE8\xE9 \xF4\xB3\xEB\xFC\xF2\xF0 (\xF2\xB3\xEB\xFC\xEA\xE8 \xE4\xEB\xFF \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0)"
+msgstr "\xCE\xF1\xEE\xE1\xE8\xF1\xF2\xE8\xE9 \xF4\xB3\xEB\xFC\xF2\xF0 (\xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0)"
#: Merge.rc:1449
#: Merge.rc:1950
@@ -2590,12 +2594,12 @@
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "\xC2\xE6\xE8\xE2\xEB\xE5\xED\xED\xFF \xE2 \xEE\xE1\xEE\xEB\xEE\xED\xEA\xF3"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "\xCF\xF0\xEE\xE2\xB3\xE4\xED\xE8\xEA"
#: Merge.rc:1675
#, c-format
@@ -2610,17 +2614,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&\xC4\xEE\xE4\xE0\xF2\xE8 \xE4\xEE \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xE3\xEE \xEC\xE5\xED\xFE"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "\xCF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF2\xE5\xEA\xE8"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "\xC4\xEE\xE4\xE0\xF2\xE8 &\xEC\xE5\xED\xFE \xEE\xE1\xEE\xEB\xEE\xED\xEA\xE8 \xE4\xEE \xEA\xEE\xED\xF2\xE5\xEA\xF1\xF2\xED\xEE\xE3\xEE \xEC\xE5\xED\xFE"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2758,17 +2762,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xEC\xEA\xED\xF3\xF2\xE8 \xF0\xE5\xE6\xE8\xEC \xE4\xE5\xF0\xE5\xE2\xE0"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "\xD0\xEE\xE7\xE3\xEE\xF0\xED\xF3\xF2\xE8 \xE2\xF1\xB3 \xEF\xB3\xE4\xF2\xE5\xEA\xE8"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "\xC7\xE3\xEE\xF0\xED\xF3\xF2\xE8 \xE2\xF1\xB3 \xEF\xB3\xE4\xF2\xE5\xEA\xE8"
#: Merge.rc:1778
#, c-format
@@ -3133,7 +3137,7 @@
"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)"
+"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\xE5\xF0 (Gal Hammer), \xCE\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0 \xD1\xEA\xB3\xED\xED\xE5\xF0 (Alexander Skinner)"
#: Merge.rc:1909
#, c-format
@@ -3263,7 +3267,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3278,12 +3282,12 @@
#: Merge.rc:1979
#, 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 "\xD3 \xEF\xEE\xF2\xEE\xF7\xED\xEE\xEC\xF3 \xF1\xE5\xE0\xED\xF1\xB3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF4\xE0\xE9\xEB\xB3\xE2 \xE7\xF0\xEE\xE1\xEB\xE5\xED\xB3 \xE7\xEC\xB3\xED\xE8. \xC4\xE5\xFF\xEA\xB3 \xF0\xE5\xF7\xB3 \xED\xE5 \xED\xE0\xE1\xF3\xE4\xF3\xF2\xFC \xF7\xE8\xED\xED\xEE\xF1\xF2\xB3, \xE4\xEE\xEA\xE8 \xEF\xEE\xF2\xEE\xF7\xED\xE8\xE9 \xF1\xE5\xE0\xED\xF1 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xED\xE5 \xE1\xF3\xE4\xE5 \xEF\xE5\xF0\xE5\xE7\xE0\xEF\xF3\xF9\xE5\xED\xE8\xE9."
+msgstr "\xD3 \xEF\xEE\xF2\xEE\xF7\xED\xEE\xEC\xF3 \xF1\xE5\xE0\xED\xF1\xB3 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xF4\xE0\xE9\xEB\xB3\xE2 \xE7\xF0\xEE\xE1\xEB\xE5\xED\xB3 \xE7\xEC\xB3\xED\xE8. \xC4\xE5\xFF\xEA\xB3 \xF0\xE5\xF7\xB3 \xED\xE5 \xED\xE0\xE1\xF3\xE4\xF3\xF2\xFC \xF7\xE8\xED\xED\xEE\xF1\xF2\xB3, \xEF\xEE\xEA\xE8 \xEF\xEE\xF2\xEE\xF7\xED\xE8\xE9 \xF1\xE5\xE0\xED\xF1 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xFF \xED\xE5 \xE1\xF3\xE4\xE5 \xEF\xE5\xF0\xE5\xE7\xE0\xEF\xF3\xF9\xE5\xED\xE8\xE9."
#: Merge.rc:1980
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "\xC7\xEC\xB3\xED\xE8 \xE4\xEB\xFF \xEE\xE1\xF0\xE0\xED\xEE\xE3\xEE \xF8\xF0\xE8\xF4\xF2\xF3 \xED\xE5 \xE1\xF3\xE4\xF3\xF2\xFC \xE7\xE0\xF1\xF2\xEE\xF1\xEE\xE2\xE0\xED\xB3 \xE4\xEB\xFF \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8\xF5 \xE2\xB3\xEA\xEE\xED \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9."
+msgstr "\xC7\xEC\xB3\xED\xE8 \xE4\xEB\xFF \xE2\xE8\xE1\xF0\xE0\xED\xEE\xE3\xEE \xF8\xF0\xE8\xF4\xF2\xF3 \xED\xE5 \xE1\xF3\xE4\xF3\xF2\xFC \xE7\xE0\xF1\xF2\xEE\xF1\xEE\xE2\xE0\xED\xB3 \xE4\xEB\xFF \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8\xF5 \xE2\xB3\xEA\xEE\xED \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9."
#: Merge.rc:1982
#, c-format
@@ -3437,7 +3441,7 @@
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
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"
+"\xCD\xE5 \xE2\xE4\xE0\xEB\xEE\xF1\xFF \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 \xF2\xE5\xEA\xF3 \xE7 \xF4\xB3\xEB\xFC\xF2\xF0\xE0\xEC\xE8:\n"
"%2."
@@ -3453,7 +3457,7 @@
"\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 \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."
+"\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\xE2\xE0\xED\xED\xFF."
#: Merge.rc:2040
#, c-format
@@ -3519,7 +3523,7 @@
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&\xD8\xEB\xFF\xF5 \xE4\xEE SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3544,7 +3548,7 @@
#: Merge.rc:2076
#, c-format
msgid "Theirs File"
-msgstr "\xAF\xF5\xED\xB3\xE9 \xF4\xE0\xE9\xEB"
+msgstr "\xAF\xF5\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2077
#, c-format
@@ -3728,7 +3732,7 @@
#: Merge.rc:2136
#, c-format
msgid "Failed to parse conflict file."
-msgstr "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xF0\xEE\xE7\xE1\xEE\xF0\xF3 \xF4\xE0\xE9\xEB\xF3 \xEA\xEE\xED\xF4\xEB\xB3\xEA\xF2\xB3\xE2"
+msgstr "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xF0\xEE\xE7\xE1\xE8\xF0\xE0\xED\xED\xFF \xF4\xE0\xE9\xEB\xF3 \xEA\xEE\xED\xF4\xEB\xB3\xEA\xF2\xB3\xE2"
#: Merge.rc:2137
#, c-format
@@ -3759,7 +3763,7 @@
#: Merge.rc:2146
#, c-format
msgid "Error checking destination writeability"
-msgstr "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xEF\xE5\xF0\xE5\xE2\xB3\xF0\xEA\xE8 \xEC\xEE\xE6\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE7\xE0\xEF\xE8\xF1\xF3 \xE2 \xE7\xE0\xE7\xED\xE0\xF7\xE5\xED\xE5 \xEC\xB3\xF1\xF6\xE5"
+msgstr "\xCF\xEE\xEC\xE8\xEB\xEA\xE0 \xEF\xE5\xF0\xE5\xE2\xB3\xF0\xEA\xE8 \xEC\xEE\xE6\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE7\xE0\xEF\xE8\xF1\xF3\xE2\xE0\xED\xED\xFF \xE2 \xE7\xE0\xE7\xED\xE0\xF7\xE5\xED\xE5 \xF0\xEE\xE7\xF2\xE0\xF8\xF3\xE2\xE0\xED\xED\xFF"
#: Merge.rc:2147
#, c-format
@@ -3835,7 +3839,7 @@
"\n"
"Overwrite changed file?"
msgstr ""
-"\xB2\xED\xF8\xE8\xEC \xE4\xEE\xE4\xE0\xF2\xEE\xEA\xEE\xEC \xE7\xEC\xB3\xED\xE5\xED\xE8\xE9 \xF4\xE0\xE9\xEB\n"
+"\xB2\xED\xF8\xE8\xEC \xE7\xE0\xF1\xF2\xEE\xF1\xF3\xED\xEE\xEA\xEE\xEC \xE7\xEC\xB3\xED\xE5\xED\xE8\xE9 \xF4\xE0\xE9\xEB\n"
"%1\n"
"\xE2\xE6\xE5 \xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xE5\xED\xE8\xE9 \xE2 WinMerge .\n"
"\n"
@@ -3850,8 +3854,18 @@
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"\xB2\xED\xF8\xE8\xEC \xE7\xE0\xF1\xF2\xEE\xF1\xF3\xED\xEA\xEE\xEC \xE7\xEC\xB3\xED\xE5\xED\xEE \xF4\xE0\xE9\xEB\n"
+"%1\n"
+"\xE7 \xF2\xEE\xE3\xEE \xF7\xE0\xF1\xF3, \xFF\xEA \xE9\xEE\xE3\xEE \xEF\xF0\xEE\xE3\xEB\xFF\xED\xF3\xE2 WinMerge.\n"
+"\n"
+"\xC2\xE8 \xF5\xEE\xF7\xE5\xF2\xE5 \xEF\xE5\xF0\xE5\xE7\xE0\xE2\xE0\xED\xF2\xE0\xE6\xE8\xF2\xE8 \xF4\xE0\xE9\xEB?"
#: Merge.rc:2156
#, c-format
@@ -3865,8 +3879,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"disappeared. Please save a copy of the file to continue."
msgstr ""
+"\xD4\xE0\xE9\xEB\n"
+"%1\n"
+"\xE2\xE8\xEB\xF3\xF7\xE0\xBA\xF2\xFC\xF1\xFF. \xC7\xE1\xE5\xF0\xE5\xE6\xB3\xF2\xFC \xEA\xEE\xEF\xB3\xFE \xF4\xE0\xE9\xEB\xF3 \xE4\xEB\xFF \xEF\xF0\xEE\xE4\xEE\xE2\xE6\xE5\xED\xED\xFF."
#: Merge.rc:2164
#, c-format
@@ -3887,12 +3907,12 @@
#: Merge.rc:2171
#, c-format
msgid "Checkout files from VSS..."
-msgstr "\xCE\xE4\xE5\xF0\xE6\xF3\xBA\xEC\xEE \xF4\xE0\xE9\xEB\xE8 \xE7 VSS..."
+msgstr "\xCE\xF2\xF0\xE8\xEC\xF3\xBA\xEC\xEE \xF4\xE0\xE9\xEB\xE8 \xE7 VSS..."
#: Merge.rc:2172
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xEA\xEE\xED\xF2\xF0\xEE\xEB\xFE \xE2\xE5\xF0\xF1\xB3\xE9 \xE2\xE8\xFF\xE2\xE8\xEB\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xF3 \xEF\xF0\xE8 \xF1\xEF\xF0\xEE\xE1\xB3 \xE2\xE7\xFF\xF2\xE8 \xF4\xE0\xE9\xEB \xEF\xB3\xE4 \xEA\xEE\xED\xF2\xF0\xEE\xEB\xFC. \xCD\xE5\xEC\xE0\xBA \xEC\xEE\xE6\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xEF\xF0\xEE\xE4\xEE\xE2\xE6\xF3\xE2\xE0\xF2\xE8..."
+msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xE0 \xEA\xEE\xED\xF2\xF0\xEE\xEB\xFE \xE2\xE5\xF0\xF1\xB3\xE9 \xE2\xE8\xFF\xE2\xE8\xEB\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xF3 \xEF\xF0\xE8 \xF1\xEF\xF0\xEE\xE1\xB3 \xE2\xE7\xFF\xF2\xE8 \xF4\xE0\xE9\xEB \xEF\xB3\xE4 \xEA\xEE\xED\xF2\xF0\xEE\xEB\xFC. \xCD\xE5\xEC\xE0 \xEC\xEE\xE6\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xEF\xF0\xEE\xE4\xEE\xE2\xE6\xF3\xE2\xE0\xF2\xE8..."
#: Merge.rc:2173
#, c-format
@@ -3902,7 +3922,7 @@
#: Merge.rc:2174
#, 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 \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 ?"
+msgstr "\xD0\xEE\xE1\xEE\xF7\xE0 \xF2\xE5\xEA\xE0 VSS \xB3 \xF0\xEE\xE7\xF2\xE0\xF8\xF3\xE2\xE0\xED\xED\xFF \xEC\xB3\xF1\xF6\xE5 \xEF\xEE\xF2\xEE\xF7\xED\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3 \xED\xE5 \xF1\xEF\xB3\xE2\xEF\xE0\xE4\xE0\xFE\xF2\xFC. \xCF\xF0\xEE\xE4\xEE\xE2\xE6\xE8\xF2\xE8 ?"
#: Merge.rc:2175
#, c-format
@@ -3922,7 +3942,7 @@
" Undo checkout operation?"
msgstr ""
"VSS \xE7\xED\xE0\xE9\xF8\xEB\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xF3 \xEF\xF0\xE8 \xF1\xEF\xF0\xEE\xE1\xB3 \xEF\xE5\xF0\xE5\xE2\xB3\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB.\n"
-" \xCF\xE5\xF0\xE5\xE2\xB3\xF0\xF2\xE5 \xEA\xEE\xED\xF4\xB3\xE3\xF3\xF0\xE0\xF6\xB3\xFE.\n"
+" \xCF\xE5\xF0\xE5\xE2\xB3\xF0\xF2\xE5 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF.\n"
" \xD1\xEA\xE0\xF1\xF3\xE2\xE0\xF2\xE8 \xE4\xB3\xFE?"
#: Merge.rc:2178
@@ -3932,13 +3952,13 @@
" Please, check config spec of used view. "
msgstr ""
"VSS \xE7\xED\xE0\xE9\xF8\xEB\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xF3 \xEF\xF0\xE8 \xF1\xEF\xF0\xEE\xE1\xB3 \xF1\xEA\xE0\xF1\xF3\xE2\xE0\xED\xED\xFF 䳿.\n"
-"\xCF\xE5\xF0\xE5\xE2\xB3\xF0\xF2\xE5 \xEA\xEE\xED\xF4\xB3\xE3\xF3\xF0\xE0\xF6\xB3\xFE. "
+"\xCF\xE5\xF0\xE5\xE2\xB3\xF0\xF2\xE5 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF. "
#: Merge.rc:2184
#: Merge.rc:2637
#, c-format
msgid "None"
-msgstr "\xCD\xE5\xEC\xE0\xBA"
+msgstr "\xCD\xE5\xEC\xE0"
#: Merge.rc:2185
#, c-format
@@ -3958,54 +3978,54 @@
#: Merge.rc:2189
#, c-format
msgid "Break at whitespace or punctuation"
-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"
+msgstr "\xD0\xEE\xE7\xE1\xE8\xE2\xE0\xF2\xE8 \xE7\xE0 \xEF\xF0\xEE\xEF\xF3\xF1\xEA\xE0\xEC\xE8 \xB3 \xF1\xE8\xEC\xE2\xEE\xEB\xE0\xEC\xE8 \xEF\xF3\xED\xEA\xF2\xF3\xE0\xF6\xB3\xBF"
#: Merge.rc:2195
#: Merge.rc:2197
#, 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 \xF2\xE5\xEA\xF3"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xE8\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:2196
#: Merge.rc:2198
#, 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 \xF2\xE5\xEA\xF3"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xE8\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:2199
#, c-format
msgid "Delete selected item on left"
-msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xE8\xE9 \xE5\xEB\xE5\xEC\xE5\xED\xF2 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
+msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xE8\xE9 \xE5\xEB\xE5\xEC\xE5\xED\xF2 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:2200
#, c-format
msgid "Delete selected item on right"
-msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xE8\xE9 \xE5\xEB\xE5\xEC\xE5\xED\xF2 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
+msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xE8\xE9 \xE5\xEB\xE5\xEC\xE5\xED\xF2 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:2201
#, c-format
msgid "Delete selected item(s) on both sides"
-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 \xF1\xF2\xEE\xF0\xB3\xED"
+msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7 \xEE\xE1\xEE\xF5 \xF1\xF2\xEE\xF0\xB3\xED"
#: Merge.rc:2202
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "\xD1\xF5\xEE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 (\xF8\xE2\xE8\xE4\xEA\xE8\xE9 \xF4\xB3\xEB\xFC\xF2\xF0)"
+msgstr "\xD1\xF5\xEE\xE2\xE0\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 (\xF8\xE2\xE8\xE4\xEA\xE8\xE9 \xF4\xB3\xEB\xFC\xF2\xF0)"
#: Merge.rc:2203
#, c-format
msgid "Rename selected item on both sides"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xEC\xE5\xED\xF3\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7 \xEE\xE1\xEE\xF5 \xF1\xF2\xEE\xF0\xB3\xED"
+msgstr "\xCF\xE5\xF0\xE5\xE9\xEC\xE5\xED\xF3\xE2\xE0\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7 \xEE\xE1\xEE\xF5 \xF1\xF2\xEE\xF0\xB3\xED"
#: Merge.rc:2204
#, c-format
msgid "Right to Left (%1)"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xED\xE0 \xEB\xB3\xE2\xF3 \xF1\xF2\xEE\xF0\xEE\xED\xF3 %1 \xE7 %2 \xEE\xE1\xF0\xE0\xED\xE8\xF5 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xB3\xE2"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xED\xE0 \xEB\xB3\xE2\xF3 \xF1\xF2\xEE\xF0\xEE\xED\xF3 %1 \xE7 %2 \xE2\xE8\xE1\xF0\xE0\xED\xE8\xF5 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xB3\xE2"
#: Merge.rc:2205
#, c-format
msgid "Left to Right (%1)"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xED\xE0 \xEF\xF0\xE0\xE2\xF3 \xF1\xF2\xEE\xF0\xEE\xED\xF3 %1 \xE7 %2 \xEE\xE1\xF0\xE0\xED\xE8\xF5 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xB3\xE2"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xED\xE0 \xEF\xF0\xE0\xE2\xF3 \xF1\xF2\xEE\xF0\xEE\xED\xF3 %1 \xE7 %2 \xE2\xE8\xE1\xF0\xE0\xED\xE8\xF5 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xB3\xE2"
#: Merge.rc:2206
#, c-format
@@ -4164,7 +4184,7 @@
#: Merge.rc:2252
#, c-format
msgid "Open left file with ..."
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xEB\xB3\xE2\xEE\xF0\xF3\xF7 \xE7\xE0 \xE4\xEE\xEF\xEE\xEC\xEE\xE3\xEE\xFE..."
+msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xEB\xB3\xE2\xEE\xF0\xF3\xF7 \xE7\xE0 \xE4\xEE\xEF\xEE\xEC\xEE\xE3\xEE\xFE ..."
#: Merge.rc:2253
#, c-format
@@ -4214,12 +4234,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "˳\xE2\xE5 \xEC\xE5\xED\xFE \xEE\xE1\xEE\xEB\xEE\xED\xEA\xE8"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "\xCF\xF0\xE0\xE2\xE5 \xEC\xE5\xED\xFE \xEE\xE1\xEE\xEB\xEE\xED\xEA\xE8"
#: Merge.rc:2274
#, c-format
@@ -4249,12 +4269,12 @@
#: Merge.rc:2280
#, 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 \xF2\xE5\xEA\xF3"
+msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 \xE2\xE8\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:2282
#, 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 \xF2\xE5\xEA\xF3"
+msgstr "\xCF\xE5\xF0\xE5\xEC\xB3\xF1\xF2\xE8\xF2\xE8 \xE2\xE8\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:2288
#, c-format
@@ -4405,12 +4425,12 @@
#: Merge.rc:2332
#, c-format
msgid "Left only: %1"
-msgstr "ҳ\xEB\xFC\xEA\xE8 \xEB\xB3\xE2\xEE\xF0\xF3\xF7: %1"
+msgstr "\xCB\xE8\xF8\xE5 \xEB\xB3\xE2\xEE\xF0\xF3\xF7: %1"
#: Merge.rc:2333
#, c-format
msgid "Right only: %1"
-msgstr "ҳ\xEB\xFC\xEA\xE8 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7: %1"
+msgstr "\xCB\xE8\xF8\xE5 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7: %1"
#: Merge.rc:2334
#, c-format
@@ -4430,17 +4450,17 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xE8 \xF0\xB3\xE7\xED\xB3"
#: Merge.rc:2339
#, c-format
msgid "Left Only"
-msgstr "ҳ\xEB\xFC\xEA\xE8 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
+msgstr "\xCB\xE8\xF8\xE5 \xEB\xB3\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:2340
#, c-format
msgid "Right Only"
-msgstr "ҳ\xEB\xFC\xEA\xE8 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
+msgstr "\xCB\xE8\xF8\xE5 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7"
#: Merge.rc:2342
#, c-format
@@ -4450,12 +4470,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xB3 \xF4\xE0\xE9\xEB\xE8 \xEE\xE4\xED\xE0\xEA\xEE\xE2\xB3"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "\xD2\xE5\xEA\xF1\xF2\xEE\xE2\xB3 \xF4\xE0\xE9\xEB\xE8 \xF0\xB3\xE7\xED\xB3"
#: Merge.rc:2354
#, c-format
@@ -4465,12 +4485,12 @@
#: Merge.rc:2355
#, c-format
msgid "1 item selected"
-msgstr "\xCE\xE1\xF0\xE0\xED\xE8\xE9 1 \xE5\xEB\xE5\xEC\xE5\xED\xF2"
+msgstr "\xC2\xE8\xE1\xF0\xE0\xED\xE8\xE9 1 \xE5\xEB\xE5\xEC\xE5\xED\xF2"
#: Merge.rc:2356
#, c-format
msgid "%1 items selected"
-msgstr "\xCE\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8: %1"
+msgstr "\xC2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8: %1"
#: Merge.rc:2362
#, c-format
@@ -4540,12 +4560,12 @@
#: Merge.rc:2380
#, c-format
msgid "Left side file version, only for some filetypes."
-msgstr "\xC2\xE5\xF0\xF1\xB3\xFF \xF4\xE0\xE9\xEB\xF3 \xEB\xB3\xE2\xEE\xF0\xF3\xF7, \xF2\xB3\xEB\xFC\xEA\xE8 \xE4\xEB\xFF \xE4\xE5\xFF\xEA\xE8\xF5 \xF2\xE8\xEF\xB3\xE2 \xF4\xE0\xE9\xEB\xB3\xE2."
+msgstr "\xC2\xE5\xF0\xF1\xB3\xFF \xF4\xE0\xE9\xEB\xF3 \xEB\xB3\xE2\xEE\xF0\xF3\xF7, \xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xE4\xE5\xFF\xEA\xE8\xF5 \xF2\xE8\xEF\xB3\xE2 \xF4\xE0\xE9\xEB\xB3\xE2."
#: Merge.rc:2381
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "\xC2\xE5\xF0\xF1\xB3\xFF \xF4\xE0\xE9\xEB\xF3 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7, \xF2\xB3\xEB\xFC\xEA\xE8 \xE4\xEB\xFF \xE4\xE5\xFF\xEA\xE8\xF5 \xF2\xE8\xEF\xB3\xE2 \xF4\xE0\xE9\xEB\xB3\xE2."
+msgstr "\xC2\xE5\xF0\xF1\xB3\xFF \xF4\xE0\xE9\xEB\xF3 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7, \xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xE4\xE5\xFF\xEA\xE8\xF5 \xF2\xE8\xEF\xB3\xE2 \xF4\xE0\xE9\xEB\xB3\xE2."
#: Merge.rc:2382
#, c-format
@@ -4565,12 +4585,12 @@
#: Merge.rc:2385
#, c-format
msgid "Left side file EOL type"
-msgstr "\xCC\xE0\xF0\xEA\xE5\xF0 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xE0 \xE4\xEB\xFF \xEB\xB3\xE2\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3"
+msgstr "\xCF\xEE\xE7\xED\xE0\xF7\xEA\xE0 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xE0 \xE4\xEB\xFF \xEB\xB3\xE2\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3"
#: Merge.rc:2386
#, c-format
msgid "Right side file EOL type"
-msgstr "\xCC\xE0\xF0\xEA\xE5\xF0 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xE0 \xE4\xEB\xFF \xEF\xF0\xE0\xE2\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3"
+msgstr "\xCF\xEE\xE7\xED\xE0\xF7\xEA\xE0 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xFF\xE4\xEA\xE0 \xE4\xEB\xFF \xEF\xF0\xE0\xE2\xEE\xE3\xEE \xF4\xE0\xE9\xEB\xF3"
#: Merge.rc:2392
#, c-format
@@ -4649,12 +4669,12 @@
#: Merge.rc:2417
#, c-format
msgid "The selected files are identical."
-msgstr "\xCE\xE1\xF0\xE0\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xED\xE5 \xEC\xE0\xFE\xF2\xFC \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9"
+msgstr "\xC2\xE8\xE1\xF0\xE0\xED\xB3 \xF4\xE0\xE9\xEB\xE8 \xED\xE5 \xEC\xE0\xFE\xF2\xFC \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9"
#: Merge.rc:2418
#, c-format
msgid "An error occurred while comparing the files."
-msgstr "\xCF\xF0\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xB3 \xF4\xE0\xE9\xEB\xB3\xE2 \xE2\xB3\xE4\xE1\xF3\xEB\xE0\xF1\xFF \xEF\xEE\xEC\xE8\xEB\xEA\xE0."
+msgstr "\xCF\xF0\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xB3 \xF4\xE0\xE9\xEB\xB3\xE2 \xE2\xE8\xED\xE8\xEA\xEB\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xE0."
#: Merge.rc:2419
#, c-format
@@ -4695,7 +4715,7 @@
#: Merge.rc:2423
#, 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 \xF2\xE5\xEA\xF3."
+msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE2\xB3\xE4\xEA\xF0\xE8\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xF3 \xF2\xE5\xEA\xF3."
#: Merge.rc:2424
#, c-format
@@ -4711,7 +4731,7 @@
"%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"
+"\xD2\xE5\xEA\xE0 \xB3\xF1\xED\xF3\xBA \xEB\xE8\xF8\xE5 \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"
@@ -4751,7 +4771,7 @@
#: Merge.rc:2441
#, c-format
msgid "No difference"
-msgstr "\xCD\xE5\xEC\xE0\xBA \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9"
+msgstr "\xCD\xE5\xEC\xE0 \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xE5\xE9"
#: Merge.rc:2442
#, c-format
@@ -4766,7 +4786,7 @@
#: Merge.rc:2449
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE7\xED\xE0\xE9\xF2\xE8 \xF0\xFF\xE4\xEE\xEA \"%s\""
+msgstr "\xCD\xE5 \xE2\xE4\xE0\xEB\xEE\xF1\xFF \xE7\xED\xE0\xE9\xF2\xE8 \xF0\xFF\xE4\xEE\xEA \"%s\""
#: Merge.rc:2455
#, c-format
@@ -4791,7 +4811,7 @@
#: Merge.rc:2469
#, c-format
msgid "Patch file successfully written."
-msgstr "\xCF\xE0\xF2\xF7 \xF3\xF1\xEF\xB3\xF8\xED\xEE \xE7\xE0\xEF\xE8\xF1\xE0\xED\xE8\xE9."
+msgstr "\xCB\xE0\xF2\xEA\xE0 \xF3\xF1\xEF\xB3\xF8\xED\xEE \xE7\xE0\xEF\xE8\xF1\xE0\xED\xE0."
#: Merge.rc:2470
#, c-format
@@ -4806,7 +4826,7 @@
#: Merge.rc:2472
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "\xCF\xE0\xF2\xF7 \xE2\xE6\xE5 \xB3\xF1\xED\xF3\xBA. \xD5\xEE\xF7\xE5\xF2\xE5 \xEF\xE5\xF0\xE5\xE7\xE0\xEF\xE8\xF1\xE0\xF2\xE8 \xE9\xEE\xE3\xEE ?"
+msgstr "\xCB\xE0\xF2\xEA\xE0 \xE2\xE6\xE5 \xB3\xF1\xED\xF3\xBA. \xD5\xEE\xF7\xE5\xF2\xE5 \xEF\xE5\xF0\xE5\xE7\xE0\xEF\xE8\xF1\xE0\xF2\xE8 \xBF\xBF?"
#: Merge.rc:2473
#, c-format
@@ -4831,7 +4851,7 @@
#: Merge.rc:2477
#, c-format
msgid "Could not write to file %1."
-msgstr "\xCD\xE5\xEC\xE0\xBA \xEC\xEE\xE6\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE7\xE0\xEF\xE8\xF1\xE0\xF2\xE8 \xF3 \xF4\xE0\xE9\xEB %1."
+msgstr "\xCD\xE5\xEC\xE0 \xEC\xEE\xE6\xEB\xE8\xE2\xEE\xF1\xF2\xB3 \xE7\xE0\xEF\xE8\xF1\xE0\xF2\xE8 \xF3 \xF4\xE0\xE9\xEB %1."
#: Merge.rc:2478
#, c-format
@@ -4846,12 +4866,12 @@
#: Merge.rc:2480
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEF\xE0\xF2\xF7 \xE7 \xE1\xB3\xED\xE0\xF0\xED\xE8\xF5 \xF4\xE0\xE9\xEB\xB3\xE2"
+msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEB\xE0\xF2\xEA\xF3 \xE7 \xE1\xB3\xED\xE0\xF0\xED\xE8\xF5 \xF4\xE0\xE9\xEB\xB3\xE2"
#: Merge.rc:2481
#, 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 \xF2\xE5\xEA"
+msgstr "\xCD\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEB\xE0\xF2\xEA\xF3 \xE7 \xF2\xE5\xEA"
#: Merge.rc:2482
#, c-format
@@ -4862,7 +4882,7 @@
msgstr ""
"\xD1\xEF\xEE\xF7\xE0\xF2\xEA\xF3 \xE7\xE1\xE5\xF0\xE5\xE6\xB3\xF2\xFC \xE2\xF1\xB3 \xF4\xE0\xE9\xEB\xE8.\n"
"\n"
-"\xD1\xF2\xE2\xEE\xF0\xE5\xED\xED\xFF \xEF\xE0\xF2\xF7\xF3 \xE2\xE8\xEC\xE0\xE3\xE0\xBA, \xF9\xEE\xE1 \xE2 \xF4\xE0\xE9\xEB\xE0\xF5 \xED\xE5 \xE1\xF3\xEB\xEE \xED\xE5 \xE7\xE1\xE5\xF0\xE5\xE6\xE5\xED\xE8\xF5 \xE7\xEC\xB3\xED"
+"\xD1\xF2\xE2\xEE\xF0\xE5\xED\xED\xFF \xEB\xE0\xF2\xEA\xE8 \xE2\xE8\xEC\xE0\xE3\xE0\xBA, \xF9\xEE\xE1 \xE2 \xF4\xE0\xE9\xEB\xE0\xF5 \xED\xE5 \xE1\xF3\xEB\xEE \xED\xE5 \xE7\xE1\xE5\xF0\xE5\xE6\xE5\xED\xE8\xF5 \xE7\xEC\xB3\xED"
#: Merge.rc:2483
#, c-format
@@ -4893,7 +4913,7 @@
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
"\n"
-"\xD3\xE2\xE0\xE3\xE0: \xB2\xED\xF2\xE5\xE3\xF0\xE0\xF6\xB3\xFF \xE7 7-Zip \xE2\xE8\xEC\xEA\xED\xE5\xED\xE0 \xE2 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xF5 WinMerge."
+"\xD3\xE2\xE0\xE3\xE0: \xB2\xED\xF2\xE5\xE3\xF0\xE0\xF6\xB3\xFF \xE7 7-Zip \xE2\xE8\xEC\xEA\xED\xF3\xF2\xE0 \xE2 \xED\xE0\xEB\xE0\xF8\xF2\xF3\xE2\xE0\xED\xED\xFF\xF5 WinMerge."
#: Merge.rc:2491
#, c-format
@@ -4902,7 +4922,7 @@
"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
"\n"
-"\xD3\xE2\xE0\xE3\xE0: \xC7\xE0\xE4\xB3\xFF\xED\xE8\xE9 \xF2\xB3\xEB\xFC\xEA\xE8 \xEB\xEE\xEA\xE0\xEB\xFC\xED\xE8\xE9 \xEC\xEE\xE4\xF3\xEB\xFC 7-Zip."
+"\xD3\xE2\xE0\xE3\xE0: \xC7\xE0\xE4\xB3\xFF\xED\xE8\xE9 \xEB\xE8\xF8\xE5 \xEB\xEE\xEA\xE0\xEB\xFC\xED\xE8\xE9 \xEC\xEE\xE4\xF3\xEB\xFC 7-Zip."
#: Merge.rc:2492
#, c-format
@@ -4953,7 +4973,7 @@
#: Merge.rc:2505
#, c-format
msgid "No match"
-msgstr "\xC7\xE1\xB3\xE3\xB3\xE2 \xED\xE5\xEC\xE0\xBA"
+msgstr "\xC7\xE1\xB3\xE3\xB3\xE2 \xED\xE5\xEC\xE0"
#: Merge.rc:2506
#, c-format
@@ -5018,7 +5038,7 @@
#: Merge.rc:2518
#, c-format
msgid "Premature end of regular expression"
-msgstr "\xCD\xE5\xF1\xEF\xEE\xE4\xB3\xE2\xE0\xED\xE5 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xE5\xE3\xF3\xEB\xFF\xF0\xED\xEE\xE3\xEE \xE2\xE8\xF0\xE0\xE7\xF3"
+msgstr "\xCD\xE5\xEE\xF7\xB3\xEA\xF3\xE2\xE0\xED\xE5 \xE7\xE0\xEA\xB3\xED\xF7\xE5\xED\xED\xFF \xF0\xE5\xE3\xF3\xEB\xFF\xF0\xED\xEE\xE3\xEE \xE2\xE8\xF0\xE0\xE7\xF3"
#: Merge.rc:2519
#, c-format
@@ -5314,7 +5334,7 @@
#: Merge.rc:2632
#, c-format
msgid "Mixed"
-msgstr "\xC7\xEC\xB3\xF8\xE0\xED\xE8\xE9"
+msgstr "̳\xF8\xE0\xED\xE8\xE9"
#: Merge.rc:2634
#, c-format
@@ -5484,12 +5504,12 @@
#: Merge.rc:2686
#, c-format
msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xB3 \xF0\xFF\xE4\xEA\xE8 \xE2 \xE1\xF3\xF4\xE5\xF0 \xEE\xE1\xEC\xB3\xED\xF3, \xE4\xEE\xE4\xE0\xFE\xF7\xE8 \xED\xE0 \xEF\xEE\xF7\xE0\xF2\xEA\xF3 \xF0\xFF\xE4\xEA\xE0 \xE9\xEE\xE3\xEE \xED\xEE\xEC\xE5\xF0"
+msgstr "\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xF0\xFF\xE4\xEA\xE8 \xE2 \xE1\xF3\xF4\xE5\xF0 \xEE\xE1\xEC\xB3\xED\xF3, \xE4\xEE\xE4\xE0\xFE\xF7\xE8 \xED\xE0 \xEF\xEE\xF7\xE0\xF2\xEA\xF3 \xF0\xFF\xE4\xEA\xE0 \xE9\xEE\xE3\xEE \xED\xEE\xEC\xE5\xF0"
#: Merge.rc:2687
#, c-format
msgid "Refresh selected items"
-msgstr "\xCF\xEE\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 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8"
#: Merge.rc:2688
#, c-format
@@ -5535,7 +5555,7 @@
"Displays items that exist in only on the left side\n"
"Show Left Unique Items"
msgstr ""
-"\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF\xF0\xE8\xF1\xF3\xF2\xED\xB3 \xF2\xB3\xEB\xFC\xEA\xE8 \xEB\xB3\xE2\xEE\xF0\xF3\xF7\n"
+"\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF\xF0\xE8\xF1\xF3\xF2\xED\xB3 \xEB\xE8\xF8\xE5 \xEB\xB3\xE2\xEE\xF0\xF3\xF7\n"
"\xD3\xED\xB3\xEA\xE0\xEB\xFC\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7\xEB\xB3\xE2\xE0"
#: Merge.rc:2700
@@ -5544,7 +5564,7 @@
"Displays items that exist in only on the right side\n"
"Show Right Unique Items"
msgstr ""
-"\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF\xF0\xE8\xF1\xF3\xF2\xED\xB3 \xF2\xB3\xEB\xFC\xEA\xE8 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7\n"
+"\xCF\xEE\xEA\xE0\xE7\xF3\xE2\xE0\xF2\xE8 \xEF\xF0\xE8\xF1\xF3\xF2\xED\xB3 \xEB\xE8\xF8\xE5 \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7\n"
"\xD3\xED\xB3\xEA\xE0\xEB\xFC\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xF1\xEF\xF0\xE0\xE2\xE0"
#: Merge.rc:2701
@@ -5719,7 +5739,7 @@
"Copy the selected text to the right file\n"
"Copy Right (Alt+Right)"
msgstr ""
-"\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xE8\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7\n"
+"\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xE8\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7\n"
"\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2 \xF4\xE0\xE9\xEB \xEF\xF0\xE0\xE2\xEE\xF0\xF3\xF7 (Alt+Right)"
#: Merge.rc:2734
@@ -5728,7 +5748,7 @@
"Copy the selected text to the left file\n"
"Copy Left (Alt+Left)"
msgstr ""
-"\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xEE\xE1\xF0\xE0\xED\xE8\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xEB\xB3\xE2\xEE\xF0\xF3\xF7\n"
+"\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xE8\xE9 \xF2\xE5\xEA\xF1\xF2 \xE2 \xF4\xE0\xE9\xEB \xEB\xB3\xE2\xEE\xF0\xF3\xF7\n"
"\xD1\xEA\xEE\xEF\xB3\xFE\xE2\xE0\xF2\xE8 \xE2 \xF4\xE0\xE9\xEB \xEB\xB3\xE2\xEE\xF0\xF3\xF7 (Alt+Left)"
#: Merge.rc:2735
@@ -5770,7 +5790,7 @@
#: Merge.rc:2739
#, 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 \xF2\xE5\xEA"
+msgstr "\xC2\xE8\xEB\xF3\xF7\xE8\xF2\xE8 \xE2\xE8\xE1\xF0\xE0\xED\xB3 \xE5\xEB\xE5\xEC\xE5\xED\xF2\xE8 \xE7 \xEE\xE1\xEE\xF5 \xF2\xE5\xEA"
#: Merge.rc:2740
#, c-format
@@ -5785,7 +5805,7 @@
#: Merge.rc:2747
#, c-format
msgid "Generate a patch-file"
-msgstr "\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEF\xE0\xF2\xF7"
+msgstr "\xD1\xF2\xE2\xEE\xF0\xE8\xF2\xE8 \xEB\xE0\xF2\xEA\xF3"
#: Merge.rc:2748
#, c-format
@@ -5805,7 +5825,7 @@
#: Merge.rc:2756
#, 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\xE0\xF6\xFE\xBA \xEF\xF0\xE8 \xEF\xEE\xF0\xB3\xE2\xED\xFF\xED\xED\xB3 \xF2\xE5\xEA)"
+msgstr "\xC2\xE8\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:2757
#, c-format
@@ -5911,12 +5931,12 @@
#: Merge.rc:2790
#, c-format
msgid "WSH not found - .sct scripts disabled"
-msgstr "WSH \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9 - .sct \xF1\xEA\xF0\xE8\xEF\xF2\xE8 \xE2\xE8\xEC\xEA\xED\xE5\xED\xB3"
+msgstr "WSH \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xE8\xE9 - .sct \xF1\xF6\xE5\xED\xE0\xF0\xB3\xBF \xE2\xE8\xEC\xEA\xED\xF3\xF2\xB3"
#: Merge.rc:2791
#, c-format
msgid "<None>"
-msgstr "<\xCD\xE5\xEC\xE0\xBA>"
+msgstr "<\xCD\xE5\xEC\xE0>"
#: Merge.rc:2792
#, c-format
@@ -5926,7 +5946,7 @@
#: Merge.rc:2798
#, c-format
msgid "Open the file with registered application"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xE7\xE0\xF0\xE5\xBA\xF1\xF2\xF0\xEE\xE2\xE0\xED\xE8\xEC \xE4\xEE\xE4\xE0\xF2\xEA\xEE\xEC"
+msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xE7\xE0\xF0\xE5\xBA\xF1\xF2\xF0\xEE\xE2\xE0\xED\xE8\xEC \xE7\xE0\xF1\xF2\xEE\xF1\xF3\xED\xEA\xEE\xEC"
#: Merge.rc:2799
#, c-format
@@ -5936,7 +5956,7 @@
#: Merge.rc:2800
#, c-format
msgid "Open the file with a particular program"
-msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xEE\xE1\xF0\xE0\xED\xEE\xFE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEE\xFE"
+msgstr "³\xE4\xEA\xF0\xE8\xF2\xE8 \xF4\xE0\xE9\xEB \xE2\xE8\xE1\xF0\xE0\xED\xEE\xFE \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xEE\xFE"
#: Merge.rc:2806
#, c-format
@@ -5956,7 +5976,7 @@
#: Merge.rc:2809
#, c-format
msgid "Go to diff under cursor"
-msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xEF\xB3\xE4 \xEA\xF3\xF0\xF1\xEE\xF0\xEE\xEC"
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xE4\xEE \xE2\xB3\xE4\xEC\xB3\xED\xED\xEE\xF1\xF2\xB3 \xEF\xB3\xE4 \xE2\xEA\xE0\xE7\xB3\xE2\xED\xE8\xEA\xEE\xEC"
#: Merge.rc:2810
#, c-format
@@ -5971,7 +5991,7 @@
#: Merge.rc:2817
#, c-format
msgid "Disabled"
-msgstr "\xC2\xE8\xEC\xEA\xED\xE5\xED\xE8\xE9"
+msgstr "\xC2\xE8\xEC\xEA\xED\xF3\xF2\xE8\xE9"
#: Merge.rc:2818
#, c-format
@@ -6141,7 +6161,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
@@ -6156,10 +6176,10 @@
#: Merge.rc:2863
#, c-format
msgid "Show small toolbar"
-msgstr "\xCC\xE0\xEB\xE5\xED\xFC\xEA\xB3 \xE7\xED\xE0\xF7\xEA\xE8"
+msgstr "\xCC\xE0\xEB\xE5\xED\xFC\xEA\xB3 \xEF\xB3\xEA\xF2\xEE\xE3\xF0\xE0\xEC\xE8"
#: Merge.rc:2864
#, c-format
msgid "Show big toolbar"
-msgstr "\xC2\xE5\xEB\xE8\xEA\xB3 \xE7\xED\xE0\xF7\xEA\xE8"
+msgstr "\xC2\xE5\xEB\xE8\xEA\xB3 \xEF\xB3\xEA\xF2\xEE\xE3\xF0\xE0\xEC\xE8"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-23 09:10:46
|
Revision: 6484
http://winmerge.svn.sourceforge.net/winmerge/?rev=6484&view=rev
Author: kimmov
Date: 2009-02-23 09:10:43 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
BUG: [ 2627752 ] Files without extension get backed up to name..bak
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/MainFrm.cpp
branches/R2_12/Src/MainFrm.h
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-23 09:08:49 UTC (rev 6483)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-23 09:10:43 UTC (rev 6484)
@@ -9,6 +9,7 @@
Bugfix: Crash in editor when undoing (#2590212)
Bugfix: Browse button in Option dialog reverted to previous settings
(#2606153)
+ Bugfix: Files without extension get backed up to name..bak (#2627752)
Translation updates:
- Chinese Traditional (#2608190)
- Croatian (#2596949)
Modified: branches/R2_12/Src/MainFrm.cpp
===================================================================
--- branches/R2_12/Src/MainFrm.cpp 2009-02-23 09:08:49 UTC (rev 6483)
+++ branches/R2_12/Src/MainFrm.cpp 2009-02-23 09:10:43 UTC (rev 6484)
@@ -244,6 +244,9 @@
/** @brief Timeout for window flashing timer, in milliseconds. */
static const UINT WINDOW_FLASH_TIMEOUT = 500;
+/** @brief Backup file extension. */
+static const TCHAR BACKUP_FILE_EXT[] = _T("bak");
+
/**
* @brief Return a const reference to a CMultiDocTemplate's list of documents.
*/
@@ -1347,12 +1350,17 @@
_RPTF0(_CRT_ERROR, "Unknown backup location!");
}
- if (bakPath[bakPath.length() - 1] != '\\')
+ if (!paths_EndsWithSlash(bakPath.c_str()))
bakPath += _T("\\");
BOOL success = FALSE;
if (GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK))
+ {
+ // Don't add dot if there is no existing extension
+ if (ext.size() > 0)
+ ext += _T(".");
ext += BACKUP_FILE_EXT;
+ }
// Append time to filename if wanted so
// NOTE just adds timestamp at the moment as I couldn't figure out
@@ -2720,7 +2728,7 @@
if (paths_DoesPathExist(sPath.c_str()) == IS_EXISTING_FILE)
{
sPath += helpLocation;
- ::HtmlHelp(GetSafeHwnd(), sPath.c_str(), HH_DISPLAY_TOPIC, NULL);
+ ::HtmlHelp(NULL, sPath.c_str(), HH_DISPLAY_TOPIC, NULL);
}
}
}
Modified: branches/R2_12/Src/MainFrm.h
===================================================================
--- branches/R2_12/Src/MainFrm.h 2009-02-23 09:08:49 UTC (rev 6483)
+++ branches/R2_12/Src/MainFrm.h 2009-02-23 09:10:43 UTC (rev 6484)
@@ -36,8 +36,6 @@
#include "VSSHelper.h"
struct FileLocation;
-#define BACKUP_FILE_EXT _T(".bak")
-
/**
* @brief Flags used when opening files
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-25 09:13:35
|
Revision: 6494
http://winmerge.svn.sourceforge.net/winmerge/?rev=6494&view=rev
Author: kimmov
Date: 2009-02-25 09:13:23 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
PATCH: [ 2632173 ] Galician PO update + Shell Extension and ReadMe translated.
Submitted by Medulio
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Installer/InnoSetup/WinMerge.iss
branches/R2_12/ShellExtension/ShellExtension.rc
branches/R2_12/ShellExtension/ShellExtension.vcproj
branches/R2_12/Src/Languages/Galician.po
Added Paths:
-----------
branches/R2_12/Docs/Users/Languages/ReadMe-Galician.txt
branches/R2_12/ShellExtension/Languages/ShellExtensionGalician.rc
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-24 17:55:59 UTC (rev 6493)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-25 09:13:23 UTC (rev 6494)
@@ -15,6 +15,7 @@
- Croatian (#2596949)
- Dutch (#2586422, #2590430)
- French (#2603591)
+ - Galician (#2632173)
- German (#2586497)
- Greek (#2615285)
- Japanese (r6456)
Copied: branches/R2_12/Docs/Users/Languages/ReadMe-Galician.txt (from rev 6491, trunk/Docs/Users/Languages/ReadMe-Galician.txt)
===================================================================
--- branches/R2_12/Docs/Users/Languages/ReadMe-Galician.txt (rev 0)
+++ branches/R2_12/Docs/Users/Languages/ReadMe-Galician.txt 2009-02-25 09:13:23 UTC (rev 6494)
@@ -0,0 +1,65 @@
+O WINMERGE
+
+O WinMerge \xE9 unha ferramenta Open Source de comparaci\xF3n e mestura para Windows.
+O WinMerge pode comparar tanto arquivos como cartafoles, presentando as diferenzas
+nun formato de texto visual que \xE9 moi sinxelo de entender e manexar. O WinMerge
+pode empregarse como unha ferramenta externa de diferenciaci\xF3n/mestura ou como
+unha aplicaci\xF3n independente.
+
+O WinMerge ten varias funcionalidades de grande utilidade para facer comparaci\xF3ns,
+, sincronizar e mesturar do xeito m\xE1is doado e pragm\xE1tico posible. Mesmo resalta o
+texto segundo a sintaxe para diversos linguaxes de programaci\xF3n e outros formatos de
+arquivo.
+
+A informaci\xF3n e a \xFAltima versi\xF3n do WinMerge est\xE1 dispo\xF1ible en http://winmerge.org/.
+
+Comezo r\xE1pido
+===========
+Para aprender como levar a cabo as operaci\xF3ns b\xE1sicas logo de instalar o WinMerge,
+preme en Axuda>Axuda do WinMerge e vai ao tema Quick start. Ou, podes visitar a
+versi\xF3n Web en http://winmerge.org/docs/manual/QuickStart.html.
+
+Axuda do WinMerge
+===============
+A axuda do WinMerge instalase localmente como un arquivo de axuda Microsoft HTML,
+WinMerge.chm, cando instalas o WinMerge. Para abrila, preme en Axuda>Axuda do
+WinMerge ou preme F1 na fiestra do WinMerge. Se empregas a li\xF1a de comandos,
+executa o WinMerge coa opci\xF3n de axuda /?.
+
+Tam\xE9n podes explorar a versi\xF3n HTML da axuda do WinMerge en
+http://winmerge.org/docs/manual/.
+
+Soporte de Arquivo
+==============
+O WinMerge emprega a ferramenta de arquivos Open Source 7-Zip (http://www.7-zip.org)
+para ofrecer soporte de arquivo. Recomendamos instalar o 7-Zip descargando e
+executando o instalador da extensi\xF3n do 7-Zip en http://winmerge.org/downloads/.
+
+Se non podes instalar o 7-Zip por alg\xFAn motivo, podes empregar o instalador da extensi\xF3n
+do 7-zip para instalar s\xF3 os ficheiros requiridos para ter soporte de arquivo de ficheiros.
+B\xF3talle un ollo ao tema "7-Zip and archive support" da axuda para obter pormenores sobre
+o mesmo.
+
+Soporte WinMerge
+==============
+Preguntas ou suxesti\xF3ns verbo do WinMerge? Un bo lugar para comezar \xE9 o taboleiro
+de mensaxes da comunidade do WinMerge en http://forums.winmerge.org/. Os
+desenvolvedores len e responden de xeito frecuente \xE1s cuesti\xF3ns presentadas en \xE1mbolos
+dous foros. Emprega o foro de Discusi\xF3n Aberta para cuesti\xF3ns xerais do WinMerge,
+como os temas relacionados co seu uso. Emprega o foro de Desenvolvedores para as
+cuesti\xF3ns relativas ao desenrolo do WinMerge.
+
+Erros e petici\xF3ns de funcionalidades
+==========================
+Se unha cuesti\xF3n non se resolve nos foros do WinMerge, comproba os rastrexadores do
+proxecto: vai a http://project.winmerge.org/, e preme no men\xFA dos Rastrexadores, como
+Erros e Petici\xF3ns de Funcionalidades, onde poder\xE1s explorar ou enviar os elementos que
+che interesen.
+
+Se env\xEDa unha notificaci\xF3n de erro, por favor, incl\xFAe a versi\xF3n do WinMerge na mesma.
+Podes xerar un rexistro da configuraci\xF3n premendo en Axuda>Configuraci\xF3n.
+Por favor, adxunta o rexistro da configuraci\xF3n xerado \xE1 notificaci\xF3n de erro, pois ten unha
+morea de informaci\xF3n moi \xFAtil para os desenvolvedores.
+
+
+- The WinMerge Developers
Modified: branches/R2_12/Installer/InnoSetup/WinMerge.iss
===================================================================
--- branches/R2_12/Installer/InnoSetup/WinMerge.iss 2009-02-24 17:55:59 UTC (rev 6493)
+++ branches/R2_12/Installer/InnoSetup/WinMerge.iss 2009-02-25 09:13:23 UTC (rev 6494)
@@ -120,7 +120,7 @@
Name: Danish; MessagesFile: Languages\Danish.isl
Name: Dutch; MessagesFile: Languages\Dutch.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Dutch.txt
Name: French; MessagesFile: Languages\French.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-French.txt
-Name: Galician; MessagesFile: Languages\Galician.isl
+Name: Galician; MessagesFile: Languages\Galician.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Galician.txt
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
@@ -397,6 +397,7 @@
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: ..\..\Docs\Users\Languages\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician
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
@@ -455,6 +456,7 @@
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Croatian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Croatian
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Dutch.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Dutch
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-French.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: French
+Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Galician.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Galician
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Greek.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Greek
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Japanese.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Japanese
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Romanian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Romanian
Copied: branches/R2_12/ShellExtension/Languages/ShellExtensionGalician.rc (from rev 6491, trunk/ShellExtension/Languages/ShellExtensionGalician.rc)
===================================================================
--- branches/R2_12/ShellExtension/Languages/ShellExtensionGalician.rc (rev 0)
+++ branches/R2_12/ShellExtension/Languages/ShellExtensionGalician.rc 2009-02-25 09:13:23 UTC (rev 6494)
@@ -0,0 +1,49 @@
+//Microsoft Developer Studio generated resource script.
+// $Id$
+
+#include "../resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Galician (RAG) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
+#ifdef _WIN32
+LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
+BEGIN
+ IDS_PROJNAME "ShellExtension"
+ IDS_CONTEXT_MENU "WinMerge"
+ IDS_CONTEXT_HELP "Abrir con WinMerge"
+ IDS_CONTEXT_HELP_MANYITEMS "Por favor non selecciones m\xE1is de 2 elementos"
+ IDS_COMPARE "Comparar"
+ IDS_COMPARE_ELLIPSIS "Comparar..."
+ IDS_COMPARE_TO "Comparar con"
+ IDS_HELP_SAVETHIS "Gardar esta ruta. Seleccionar outra ruta para comparar con esta."
+ IDS_HELP_COMPARESAVED "Comparar coa ruta gardada (%1)"
+ IDS_RESELECT_FIRST "Voltar seleccionar a primeira"
+END
+
+#endif // Galician (RAG) resources
+/////////////////////////////////////////////////////////////////////////////
Modified: branches/R2_12/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_12/ShellExtension/ShellExtension.rc 2009-02-24 17:55:59 UTC (rev 6493)
+++ branches/R2_12/ShellExtension/ShellExtension.rc 2009-02-25 09:13:23 UTC (rev 6494)
@@ -124,6 +124,14 @@
"#endif //_WIN32\r\n"
"#endif\r\n"
"\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT\r\n"
+ "#pragma code_page(1252)\r\n"
+ "#include ""Languages\\ShellExtensionGalician.rc""\r\n"
+ "#endif //_WIN32\r\n"
+ "#endif\r\n"
+ "\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)\r\n"
"#ifdef _WIN32\r\n"
"LANGUAGE LANG_GERMAN, SUBLANG_GERMAN\r\n"
@@ -429,6 +437,14 @@
#endif //_WIN32
#endif
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
+#ifdef _WIN32
+LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#include "Languages\ShellExtensionGalician.rc"
+#endif //_WIN32
+#endif
+
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
#ifdef _WIN32
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
Modified: branches/R2_12/ShellExtension/ShellExtension.vcproj
===================================================================
--- branches/R2_12/ShellExtension/ShellExtension.vcproj 2009-02-24 17:55:59 UTC (rev 6493)
+++ branches/R2_12/ShellExtension/ShellExtension.vcproj 2009-02-25 09:13:23 UTC (rev 6494)
@@ -1424,6 +1424,57 @@
</FileConfiguration>
</File>
<File
+ RelativePath="Languages\ShellExtensionGalician.rc">
+ <FileConfiguration
+ Name="Unicode Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="Languages\ShellExtensionGerman.rc">
<FileConfiguration
Name="Unicode Debug|Win32"
Modified: branches/R2_12/Src/Languages/Galician.po
===================================================================
--- branches/R2_12/Src/Languages/Galician.po 2009-02-24 17:55:59 UTC (rev 6493)
+++ branches/R2_12/Src/Languages/Galician.po 2009-02-25 09:13:23 UTC (rev 6494)
@@ -12,7 +12,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-09-20 15:42+0100\n"
+"PO-Revision-Date: 2009-02-15 03:22+0100\n"
"Last-Translator: Medulio <me...@ci...>\n"
"Language-Team: Galician-CiberIrmandade <tra...@ci...>\n"
"MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@
#: Merge.rc:538
#, c-format
msgid "with &External Editor"
-msgstr "cun editor externo"
+msgstr "cun &Editor Externo"
#: Merge.rc:90
#: Merge.rc:533
@@ -155,7 +155,7 @@
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
-msgstr "Gar&dar proxecto..."
+msgstr "Gar&dar Proxecto..."
#: Merge.rc:119
#, c-format
@@ -209,21 +209,21 @@
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
-msgstr "&Barra de ferramentas"
+msgstr "Ba&rra de ferramentas"
#: Merge.rc:134
#: Merge.rc:233
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr "&Ning\xFAn"
+msgstr "&Ningunha"
#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Small"
-msgstr "&Pequeno"
+msgstr "&Pequena"
#: Merge.rc:136
#: Merge.rc:235
@@ -479,12 +479,12 @@
#: Merge.rc:217
#, c-format
msgid "Show L&eft Unique Items"
-msgstr "Amosar os &elementos \xFAnicos da esquerda"
+msgstr "Amosar &elementos \xFAnicos da esquerda"
#: Merge.rc:218
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr "Amosar elementos \xFAnicos da dereita"
+msgstr "Amosar e&lementos \xFAnicos da dereita"
#: Merge.rc:219
#, c-format
@@ -504,17 +504,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Modo \xC1rbore"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&xpandir Todos os Subcartafoles"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Colapsar Todos os Subcartafoles"
#: Merge.rc:239
#, c-format
@@ -707,7 +707,7 @@
#: Merge.rc:365
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "B&uscar...\tCtrl+F"
+msgstr "Pr&ocurar...\tCtrl+F"
#: Merge.rc:366
#, c-format
@@ -1114,7 +1114,7 @@
#: Merge.rc:1019
#, c-format
msgid "&Browse..."
-msgstr "&Buscar..."
+msgstr "&Explorar..."
#: Merge.rc:689
#: Merge.rc:1598
@@ -1126,7 +1126,7 @@
#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
-msgstr "Bus&car..."
+msgstr "Procu&rar..."
#: Merge.rc:694
#: Merge.rc:1602
@@ -1278,12 +1278,12 @@
#: Merge.rc:764
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "&Verificar automaticamente os cami\xF1os no dialogo Abrir"
+msgstr "&Verificar automaticamente os cami\xF1os no di\xE1logo Abrir"
#: Merge.rc:767
#, c-format
msgid "All&ow only one instance to run"
-msgstr "Per&mitir s\xF3 unha instacia en curso"
+msgstr "Per&mitir s\xF3 unha instancia en curso"
#: Merge.rc:769
#, c-format
@@ -1298,7 +1298,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Amosar o Di\xE1logo \"Selecciona Arquivos ou Cartafoles\" no Inicio "
#: Merge.rc:776
#, c-format
@@ -1395,7 +1395,7 @@
#: Merge.rc:857
#, c-format
msgid "&Find Next"
-msgstr "&Procurar o seguinte"
+msgstr "&Procurar seguinte"
#: Merge.rc:834
#, c-format
@@ -1546,12 +1546,12 @@
#: Merge.rc:960
#, c-format
msgid "Word Difference:"
-msgstr "Diferenza de palabras:"
+msgstr "Diferenza de palabra:"
#: Merge.rc:967
#, c-format
msgid "Selected Word Diff:"
-msgstr "Dif. de palabras seleccionadas:"
+msgstr "Diferenza de palabra seleccionada:"
#: Merge.rc:974
#: Merge.rc:1053
@@ -1578,7 +1578,7 @@
#: Merge.rc:993
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr "&Enviar os arquivos eliminados para a papeleira"
+msgstr "&Enviar os arquivos eliminados para o lixo"
#: Merge.rc:995
#, c-format
@@ -1775,7 +1775,7 @@
#: Merge.rc:1132
#, c-format
msgid "G&oto:"
-msgstr "Ir&a:"
+msgstr "Ir &a:"
#: Merge.rc:1134
#, c-format
@@ -1785,7 +1785,7 @@
#: Merge.rc:1139
#, c-format
msgid "Goto what"
-msgstr "Ir para"
+msgstr "Ir \xE1"
#: Merge.rc:1140
#, c-format
@@ -2023,8 +2023,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Detectar a informaci\xF3n de p\xE1xina de c\xF3digos para estes arquivos: .html, .rc, .xml \n"
+"Prec\xEDsase reiniciar a sesi\xF3n"
#: Merge.rc:1274
#, c-format
@@ -2034,12 +2038,12 @@
#: Merge.rc:1276
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "Igual \xE1 que emprega a interfaz de usuario de Winmerge"
+msgstr "Igual \xE1 que emprega a interface de usuario de Winmerge"
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "P\xE1xina de c\xF3digos \xE1 medida: "
#: Merge.rc:1286
#, c-format
@@ -2057,7 +2061,7 @@
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr ""
-"O soporte de arquivos precisa ter instalado no PC 7-Zip ou posterior, ou ben os seus\n"
+"O soporte de arquivos precisa ter instalado no teu ordenador o 7-Zip 3.11 ou posterior, ou ben os seus\n"
"compo\xF1entes esenciais copiados no cartafol do programa para operar independentemente."
#: Merge.rc:1294
@@ -2123,7 +2127,7 @@
#: Merge.rc:1314
#, c-format
msgid "7-Zip components for standalone operation:"
-msgstr "Compo\xF1entes para que 7-Zip funcione independente:"
+msgstr "Compo\xF1entes para que o 7-Zip funcione independente:"
#: Merge.rc:1318
#, c-format
@@ -2244,7 +2248,7 @@
#: Merge.rc:1627
#, c-format
msgid "Browse..."
-msgstr "Procurar..."
+msgstr "Explorar..."
#: Merge.rc:1423
#, c-format
@@ -2394,7 +2398,7 @@
#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
-msgstr "&A cargar o arquivo:"
+msgstr "&Cargar o arquivo:"
#: Merge.rc:1526
#: Merge.rc:1529
@@ -2405,7 +2409,7 @@
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr "A gardar o &arquivo:"
+msgstr "Gardar o &arquivo:"
#: Merge.rc:1530
#, c-format
@@ -2517,12 +2521,12 @@
#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
-msgstr "Crear as copias de seguridade en:"
+msgstr "Crear copias de seguridade na:"
#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
-msgstr "Crear as copias de seguridade en: "
+msgstr "Crear as copias de seguridade no: "
#: Merge.rc:1622
#, c-format
@@ -2594,12 +2598,12 @@
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integraci\xF3n na Shell"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorador"
#: Merge.rc:1675
#, c-format
@@ -2614,17 +2618,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "Eng&adir ao men\xFA de contexto"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Comparaci\xF3n de cartafoles"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Engadir men\xFA &Shell ao men\xFA de contexto"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2762,17 +2766,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Conmutar modo \xE1rbore"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Expandir todos os subcartafoles"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Colapsar todos os subcartafoles"
#: Merge.rc:1778
#, c-format
@@ -2951,7 +2955,7 @@
"Replace specific text with different text\n"
"Replace"
msgstr ""
-"Substituir o texto especificado por outro\n"
+"Substitu\xEDr o texto especificado por outro\n"
"Substitu\xEDr"
#: Merge.rc:1837
@@ -3267,7 +3271,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3523,7 +3527,7 @@
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&Ruta ao SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3856,8 +3860,18 @@
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Outra aplicaci\xF3n actualizou o arquivo\n"
+"%1\n"
+"logo da \xFAltima comprobaci\xF3n que fixo o WinMerge.\n"
+"\n"
+"Queres recargar o arquivo?"
#: Merge.rc:2156
#, c-format
@@ -3871,8 +3885,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"O arquivo\n"
+"%1\n"
+"desapareceu. Por favor, garda unha copia do arquivo para poderes continuar."
#: Merge.rc:2164
#, c-format
@@ -4220,12 +4240,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Men\xFA Shell Esquerdo"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Men\xFA Shell Dereito"
#: Merge.rc:2274
#, c-format
@@ -4436,7 +4456,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Os cartafoles son diferentes"
#: Merge.rc:2339
#, c-format
@@ -4456,12 +4476,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "Os arquivos de texto son id\xE9nticos"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "Os arquivos de texto son diferentes"
#: Merge.rc:2354
#, c-format
@@ -5723,7 +5743,7 @@
"Copy Right (Alt+Right)"
msgstr ""
"Copiar o texto seleccionado para a banda dereita\n"
-"Copiar \xE1 dereita (Alt+Right)"
+"Copiar para a dereita (Alt+Right)"
#: Merge.rc:2734
#, c-format
@@ -5732,7 +5752,7 @@
"Copy Left (Alt+Left)"
msgstr ""
"Copiar o texto seleccionado para a banda esquerda\n"
-"Copiar \xE1 esquerda (Alt+Left)"
+"Copiar para a esquerda (Alt+Left)"
#: Merge.rc:2735
#, c-format
@@ -5741,7 +5761,7 @@
"Copy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
"Copiar a diferenza para a banda dereita e ir \xE1 seguinte diferenza\n"
-"Copiar \xE1 dereita e avanzar (Ctrl+Alt+Right)"
+"Copiar para a dereita e avanzar (Ctrl+Alt+Right)"
#: Merge.rc:2736
#, c-format
@@ -5750,7 +5770,7 @@
"Copy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
"Copiar a diferenza para a banda esquerda e avanzar \xE1 seguinte diferenza\n"
-"Copiar \xE1 esquerda e avanzar (Ctrl+Alt+Left)"
+"Copiar para a esquerda e avanzar (Ctrl+Alt+Left)"
#: Merge.rc:2737
#, c-format
@@ -5759,7 +5779,7 @@
"All Right"
msgstr ""
"Copiar todas as diferenzas para o arquivo dereito\n"
-"Todas \xE1 dereita"
+"Todas para a dereita"
#: Merge.rc:2738
#, c-format
@@ -5768,7 +5788,7 @@
"All Left"
msgstr ""
"Copiar todas as diferenzas para o arquivo esquerdo\n"
-"Todas \xE1 esquerda"
+"Todas para a esquerda"
#: Merge.rc:2739
#, c-format
@@ -6144,7 +6164,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-02-25 09:37:36
|
Revision: 6496
http://winmerge.svn.sourceforge.net/winmerge/?rev=6496&view=rev
Author: kimmov
Date: 2009-02-25 09:37:32 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
BUG: [ 2129561 ] Must Show Different to Show L/R Unique: Fldr Cmpr
Show/hide by identical/different status only in tree-mode
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirDoc.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-25 09:35:22 UTC (rev 6495)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-25 09:37:32 UTC (rev 6496)
@@ -10,6 +10,7 @@
Bugfix: Browse button in Option dialog reverted to previous settings
(#2606153)
Bugfix: Files without extension get backed up to name..bak (#2627752)
+ Bugfix: Must Show Different to Show L/R Unique (#2129561)
Translation updates:
- Chinese Traditional (#2608190)
- Croatian (#2596949)
Modified: branches/R2_12/Src/DirDoc.cpp
===================================================================
--- branches/R2_12/Src/DirDoc.cpp 2009-02-25 09:35:22 UTC (rev 6495)
+++ branches/R2_12/Src/DirDoc.cpp 2009-02-25 09:37:32 UTC (rev 6496)
@@ -420,7 +420,7 @@
if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
return FALSE;
}
- else // recursive (perhaps tree?) mode
+ else // recursive mode (including tree-mode)
{
// left/right filters
if (di.diffcode.isSideLeftOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_LEFT))
@@ -428,6 +428,13 @@
if (di.diffcode.isSideRightOnly() && !GetOptionsMgr()->GetBool(OPT_SHOW_UNIQUE_RIGHT))
return FALSE;
+ // ONLY filter folders by result (identical/different) for tree-view.
+ // In the tree-view we show subfolders with identical/different
+ // status. The flat view only shows files inside folders. So if we
+ // filter by status the files inside folder are filtered too and
+ // users see files appearing/disappearing without clear logic.
+ if (GetOptionsMgr()->GetBool(OPT_TREE_MODE))
+ {
// result filters
if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors)
return FALSE;
@@ -437,6 +444,7 @@
return FALSE;
if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT))
return FALSE;
+ }
}
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2009-03-01 08:54:38
|
Revision: 6506
http://winmerge.svn.sourceforge.net/winmerge/?rev=6506&view=rev
Author: kimmov
Date: 2009-03-01 08:54:25 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
PATCH: [ 2648183 ] Danish translation update
Submitted by Rolf Egmose
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/Src/Languages/Danish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-02-28 09:26:16 UTC (rev 6505)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-01 08:54:25 UTC (rev 6506)
@@ -14,6 +14,7 @@
Translation updates:
- Chinese Traditional (#2608190)
- Croatian (#2596949)
+ - Danish (#2648183)
- Dutch (#2586422, #2590430)
- French (#2603591)
- Galician (#2632173)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2009-02-28 09:26:16 UTC (rev 6505)
+++ branches/R2_12/Docs/Users/Contributors.txt 2009-03-01 08:54:25 UTC (rev 6506)
@@ -46,6 +46,7 @@
Jan Hryz <ja...@us...>
* Danish:
+ Rolf Egmose
Christian List <lis...@ho...>
* Dutch:
Modified: branches/R2_12/Src/Languages/Danish.po
===================================================================
--- branches/R2_12/Src/Languages/Danish.po 2009-02-28 09:26:16 UTC (rev 6505)
+++ branches/R2_12/Src/Languages/Danish.po 2009-03-01 08:54:25 UTC (rev 6506)
@@ -13,7 +13,7 @@
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: Rolf Egmose <R.E...@gm...>\n"
"Language-Team: Danish <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
@@ -21,6 +21,7 @@
"X-Poedit-Language: Danish\n"
"X-Poedit-SourceCharset: CP1252\n"
"X-Poedit-Basepath: ../\n"
+"X-Poedit-Country: DENMARK\n"
#. LANGUAGE, SUBLANGUAGE
#: Merge.rc:22
@@ -51,7 +52,7 @@
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&V\xE6lg linjeforskellen"
+msgstr "&V\xE6lg linjeforskel"
#: Merge.rc:77
#, c-format
@@ -140,7 +141,7 @@
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "\xC5b&en Konflikt Fil"
#: Merge.rc:116
#: Merge.rc:197
@@ -159,7 +160,7 @@
#: Merge.rc:119
#, c-format
msgid "Recent Projects"
-msgstr ""
+msgstr "Seneste Projekt"
#: Merge.rc:121
#: Merge.rc:205
@@ -208,28 +209,28 @@
#: Merge.rc:413
#, c-format
msgid "&Toolbar"
-msgstr ""
+msgstr "&V\xE6rkt\xF8jslinie"
#: Merge.rc:134
#: Merge.rc:233
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr ""
+msgstr "&Ingen"
#: Merge.rc:135
#: Merge.rc:234
#: Merge.rc:416
#, c-format
msgid "&Small"
-msgstr ""
+msgstr "&Lille"
#: Merge.rc:136
#: Merge.rc:235
#: Merge.rc:417
#, c-format
msgid "&Big"
-msgstr ""
+msgstr "&Stor"
#: Merge.rc:138
#: Merge.rc:237
@@ -243,7 +244,7 @@
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
-msgstr ""
+msgstr "Fa&ne linie"
#: Merge.rc:141
#: Merge.rc:241
@@ -278,14 +279,14 @@
#: Merge.rc:452
#, c-format
msgid "&Plugins"
-msgstr ""
+msgstr "&Plugins"
#: Merge.rc:150
#: Merge.rc:271
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Liste..."
#: Merge.rc:152
#: Merge.rc:273
@@ -320,21 +321,21 @@
#: Merge.rc:468
#, c-format
msgid "&Debug"
-msgstr ""
+msgstr "&Ret fejl"
#: Merge.rc:161
#: Merge.rc:282
#: Merge.rc:470
#, c-format
msgid "&Load Config..."
-msgstr ""
+msgstr "&Indl\xE6s Konfig..."
#: Merge.rc:162
#: Merge.rc:283
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr ""
+msgstr "&Nulstil Valg"
#: Merge.rc:164
#: Merge.rc:285
@@ -398,28 +399,28 @@
#: Merge.rc:486
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&WinMerge Hj\xE6lp\tF1"
#: Merge.rc:179
#: Merge.rc:300
#: Merge.rc:488
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "U&dgivelses Noter"
#: Merge.rc:180
#: Merge.rc:301
#: Merge.rc:489
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "&Overs\xE6ttelser"
#: Merge.rc:181
#: Merge.rc:302
#: Merge.rc:490
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "K&onfiguration"
#: Merge.rc:182
#: Merge.rc:303
@@ -433,7 +434,7 @@
#: Merge.rc:493
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
#: Merge.rc:185
#: Merge.rc:306
@@ -529,7 +530,7 @@
#: Merge.rc:244
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr ""
+msgstr "&Opdater Valgte\tCtrl+F5"
#: Merge.rc:246
#: Merge.rc:428
@@ -599,7 +600,7 @@
#: Merge.rc:450
#, c-format
msgid "Generate &Report..."
-msgstr "Generer en &raport..."
+msgstr "Generer en &rapport..."
#: Merge.rc:321
#, c-format
@@ -631,17 +632,17 @@
#: Merge.rc:333
#, c-format
msgid "&Print..."
-msgstr ""
+msgstr "&Udskriv..."
#: Merge.rc:334
#, c-format
msgid "Page Se&tup"
-msgstr ""
+msgstr "Side Op&s\xE6tning"
#: Merge.rc:335
#, c-format
msgid "Print Previe&w"
-msgstr ""
+msgstr "Vis Udskrif&t"
#: Merge.rc:340
#, c-format
@@ -651,17 +652,17 @@
#: Merge.rc:342
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:343
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:344
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:347
#, c-format
@@ -671,7 +672,7 @@
#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "&Fil Kodning..."
#: Merge.rc:355
#, c-format
@@ -716,7 +717,7 @@
#: Merge.rc:368
#, c-format
msgid "&Scripts"
-msgstr ""
+msgstr "&Scripts"
#: Merge.rc:370
#: Merge.rc:2789
@@ -742,7 +743,7 @@
#: Merge.rc:380
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr "&Toggle bogm\xE6rke\tCtrl+F2"
+msgstr "&Vis/skjul bogm\xE6rke\tCtrl+F2"
#: Merge.rc:381
#, c-format
@@ -767,33 +768,33 @@
#: Merge.rc:393
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "&Zoom"
#: Merge.rc:395
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Zoom &Ind\tCtrl++"
#: Merge.rc:396
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Zoom &Ud\tCtrl+-"
#. Zoom to normal
#: Merge.rc:397
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normal\tCtrl+*"
#: Merge.rc:399
#, c-format
msgid "Syntax Highlight"
-msgstr ""
+msgstr "Fremh\xE6v Syntaks"
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "&l\xE5s vinduer"
#: Merge.rc:405
#, c-format
@@ -803,27 +804,27 @@
#: Merge.rc:406
#, c-format
msgid "Vie&w Line Differences"
-msgstr ""
+msgstr "Vis& Linie Forskelle"
#: Merge.rc:407
#, c-format
msgid "View Line &Numbers"
-msgstr ""
+msgstr "Vis Linie &numre"
#: Merge.rc:408
#, c-format
msgid "View &Margins"
-msgstr ""
+msgstr "Vis &Margener"
#: Merge.rc:409
#, c-format
msgid "W&rap Lines"
-msgstr ""
+msgstr "O&mbryd Linier"
#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
-msgstr ""
+msgstr "By&t Vinduer"
#: Merge.rc:421
#, c-format
@@ -858,22 +859,22 @@
#: Merge.rc:461
#, c-format
msgid "&Prediffer"
-msgstr ""
+msgstr "&Predeffineret"
#: Merge.rc:502
#, c-format
msgid "Comp&are"
-msgstr ""
+msgstr "Samm&enlign"
#: Merge.rc:503
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "Sa&mmenlign Speciel"
#: Merge.rc:505
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:510
#, c-format
@@ -937,12 +938,12 @@
#: Merge.rc:526
#, c-format
msgid "Re&name"
-msgstr ""
+msgstr "Om&d\xF8b"
#: Merge.rc:527
#, c-format
msgid "&Hide Items"
-msgstr ""
+msgstr "&Skjul Emner"
#: Merge.rc:529
#, c-format
@@ -982,7 +983,7 @@
#: Merge.rc:550
#, c-format
msgid "&Zip"
-msgstr ""
+msgstr "&Zip"
#: Merge.rc:552
#, c-format
@@ -1007,7 +1008,7 @@
#: Merge.rc:558
#, c-format
msgid "&Refresh"
-msgstr ""
+msgstr "&Opdater"
#: Merge.rc:570
#, c-format
@@ -1022,17 +1023,17 @@
#: Merge.rc:577
#, c-format
msgid "Prediffer Settings"
-msgstr "Prediffer indstillinger"
+msgstr "Predeffiner indstillinger"
#: Merge.rc:579
#, c-format
msgid "&No prediffer"
-msgstr "&Ingen prediffer"
+msgstr "&Ingen predeffinering"
#: Merge.rc:580
#, c-format
msgid "Auto prediffer"
-msgstr "&Automatisk prediffer"
+msgstr "&Automatisk predeffinering"
#: Merge.rc:588
#, c-format
@@ -1062,7 +1063,7 @@
#: Merge.rc:668
#, c-format
msgid "(Private Build)"
-msgstr ""
+msgstr "(Privat Udgave)"
#: Merge.rc:669
#, c-format
@@ -1089,12 +1090,12 @@
#: Merge.rc:1665
#, c-format
msgid "OK"
-msgstr ""
+msgstr "OK"
#: Merge.rc:674
#, c-format
msgid "Contributors"
-msgstr ""
+msgstr "Deltagere"
#: Merge.rc:681
#, c-format
@@ -1131,7 +1132,7 @@
#: Merge.rc:1602
#, c-format
msgid "&Filter:"
-msgstr ""
+msgstr "&Filter:"
#: Merge.rc:697
#: Merge.rc:1604
@@ -1142,7 +1143,7 @@
#: Merge.rc:698
#, c-format
msgid "&Unpacker:"
-msgstr ""
+msgstr "&Udpakker:"
#: Merge.rc:701
#, c-format
@@ -1158,7 +1159,7 @@
#: Merge.rc:704
#, c-format
msgid "Status:"
-msgstr ""
+msgstr "Status:"
#: Merge.rc:706
#: Merge.rc:736
@@ -1177,13 +1178,13 @@
#: Merge.rc:1666
#, c-format
msgid "Cancel"
-msgstr "Afbryd"
+msgstr "Annuller"
#: Merge.rc:707
#: Merge.rc:1338
#, c-format
msgid "Help"
-msgstr ""
+msgstr "Hj\xE6lp"
#: Merge.rc:708
#, c-format
@@ -1193,43 +1194,43 @@
#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
-msgstr ""
+msgstr "Visuel Kildesikkerhed"
#: Merge.rc:720
#, c-format
msgid "Database:"
-msgstr ""
+msgstr "Database:"
#: Merge.rc:723
#, c-format
msgid "Project:"
-msgstr ""
+msgstr "Projekt:"
#: Merge.rc:726
#, c-format
msgid "User:"
-msgstr ""
+msgstr "Bruger:"
#: Merge.rc:728
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Password:"
#: Merge.rc:730
#, c-format
msgid "Link to Destination VSS project"
-msgstr ""
+msgstr "Link til Destinations VSS projekt"
#: Merge.rc:732
#: Merge.rc:875
#, c-format
msgid "Apply to all items"
-msgstr ""
+msgstr "Anvend p\xE5 alle emner"
#: Merge.rc:734
#, c-format
msgid "Check Out"
-msgstr ""
+msgstr "Check ud"
#: Merge.rc:735
#: Merge.rc:871
@@ -1262,7 +1263,7 @@
#: Merge.rc:757
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr "Automatisk &scroll til f\xF8rste forskel"
+msgstr "Scroll &automatisk til f\xF8rste forskel"
#: Merge.rc:760
#, c-format
@@ -1282,17 +1283,17 @@
#: Merge.rc:767
#, c-format
msgid "All&ow only one instance to run"
-msgstr "&Allow only one instance to run"
+msgstr "Til&lad kun et eksempel ad gangen"
#: Merge.rc:769
#, c-format
msgid "As&k when closing multiple windows"
-msgstr ""
+msgstr "Sp&\xF8rg ved lukning af flere vinduer "
#: Merge.rc:771
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "Bevar filtid i filsammenligning"
#: Merge.rc:774
#, c-format
@@ -1302,29 +1303,29 @@
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr ""
+msgstr "\xC5&ben-dialog Auto-fuldf\xF8relse:"
#: Merge.rc:779
#, c-format
msgid "Enable multiple compare windows for"
-msgstr ""
+msgstr "Aktiver flere sammenlignings vinduer til"
#: Merge.rc:781
#: Merge.rc:1617
#, c-format
msgid "&Folder compare"
-msgstr ""
+msgstr "&Mappe sammenligning"
#: Merge.rc:783
#: Merge.rc:1619
#, c-format
msgid "Fil&e compare"
-msgstr ""
+msgstr "Fil& sammenligning"
#: Merge.rc:785
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr ""
+msgstr "WinMerge kan gemme almene beskedvinduer. Brug Reset knappen for at vise disse vinduer igen."
#: Merge.rc:787
#, c-format
@@ -1368,12 +1369,12 @@
#: Merge.rc:847
#, c-format
msgid "Regular &expression"
-msgstr "Regul\xE6rt &udtryk"
+msgstr "Alment &udtryk"
#: Merge.rc:819
#, c-format
msgid "D&on't wrap end of file"
-msgstr ""
+msgstr "O&mbryd ikke filendelser"
#: Merge.rc:822
#, c-format
@@ -1409,7 +1410,7 @@
#: Merge.rc:849
#, c-format
msgid "&Don't wrap end of file"
-msgstr "&Begynd ikke forfra efter enden af filen"
+msgstr "&Ombryd ikke filendelser"
#: Merge.rc:852
#, c-format
@@ -1440,12 +1441,12 @@
#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
-msgstr ""
+msgstr "Rationel Logik"
#: Merge.rc:869
#, c-format
msgid "CheckOut"
-msgstr ""
+msgstr "Check ud"
#: Merge.rc:874
#: Merge.rc:1179
@@ -1456,7 +1457,7 @@
#: Merge.rc:877
#, c-format
msgid "CheckIn after checkout"
-msgstr ""
+msgstr "Check ind efter Udcheckning"
#: Merge.rc:883
#, c-format
@@ -1466,32 +1467,32 @@
#: Merge.rc:886
#, c-format
msgid "Enable Line Filters"
-msgstr ""
+msgstr "Aktiver linie filtre"
#: Merge.rc:889
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr "Regul\xE6re udtryk (et pr linje):"
+msgstr "Almene udtryk (et pr linje):"
#: Merge.rc:896
#, c-format
msgid "Save"
-msgstr ""
+msgstr "Gem"
#: Merge.rc:897
#, c-format
msgid "New"
-msgstr ""
+msgstr "Ny"
#: Merge.rc:898
#, c-format
msgid "Edit"
-msgstr ""
+msgstr "Rediger"
#: Merge.rc:899
#, c-format
msgid "Remove"
-msgstr ""
+msgstr "Fjern"
#: Merge.rc:904
#: Merge.rc:1944
@@ -1545,12 +1546,12 @@
#: Merge.rc:960
#, c-format
msgid "Word Difference:"
-msgstr ""
+msgstr "Ordforskel:"
#: Merge.rc:967
#, c-format
msgid "Selected Word Diff:"
-msgstr ""
+msgstr "Valgte Ordforskelle:"
#: Merge.rc:974
#: Merge.rc:1053
@@ -1566,13 +1567,13 @@
#: Merge.rc:1558
#, c-format
msgid "Dialog"
-msgstr ""
+msgstr "Dialog"
#: Merge.rc:990
#: Merge.rc:1947
#, c-format
msgid "System"
-msgstr ""
+msgstr "System"
#: Merge.rc:993
#, c-format
@@ -1587,27 +1588,27 @@
#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
-msgstr ""
+msgstr "&Filter mappe:"
#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "G&ennemse..."
#: Merge.rc:1001
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "Mappe til Midlertidige Filer"
#: Merge.rc:1002
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "Systemets Midlertidige Filer Mappe"
#: Merge.rc:1004
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "V&algt Mappe:"
#: Merge.rc:1007
#: Merge.rc:1023
@@ -1618,7 +1619,7 @@
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr ""
+msgstr "Patch Generator"
#: Merge.rc:1016
#, c-format
@@ -1648,7 +1649,7 @@
#: Merge.rc:1031
#, c-format
msgid "&Format"
-msgstr ""
+msgstr "&Format"
#: Merge.rc:1032
#, c-format
@@ -1708,12 +1709,12 @@
#: Merge.rc:1079
#, c-format
msgid "Move &Up"
-msgstr ""
+msgstr "Flyt &Op"
#: Merge.rc:1080
#, c-format
msgid "Move &Down"
-msgstr ""
+msgstr "Flyt &Ned"
#: Merge.rc:1090
#, c-format
@@ -1733,7 +1734,7 @@
#: Merge.rc:1101
#, c-format
msgid "Extensions list:"
-msgstr ""
+msgstr "Extension liste:"
#: Merge.rc:1102
#, c-format
@@ -1743,28 +1744,28 @@
#: Merge.rc:1113
#, c-format
msgid " Folder Compare Progress"
-msgstr ""
+msgstr " Mappe Sammenlignings Fremskridt"
#: Merge.rc:1116
#: Merge.rc:1894
#, c-format
msgid "Stop"
-msgstr ""
+msgstr "Stop"
#: Merge.rc:1121
#, c-format
msgid "Comparing items..."
-msgstr ""
+msgstr "Sammenligner emner..."
#: Merge.rc:1122
#, c-format
msgid "Items compared:"
-msgstr ""
+msgstr "Emner sammenlignet:"
#: Merge.rc:1123
#, c-format
msgid "Items total:"
-msgstr ""
+msgstr "Emner ialt:"
#: Merge.rc:1129
#, c-format
@@ -1840,7 +1841,7 @@
#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Igno&rer returtegns differencer (Windows/Unix/Mac)"
#: Merge.rc:1167
#, c-format
@@ -1850,12 +1851,12 @@
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr ""
+msgstr "&Match ens linier"
#: Merge.rc:1171
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr ""
+msgstr "Ign&orer tidsdifferencer under 3 sekunder"
#: Merge.rc:1174
#, c-format
@@ -1865,18 +1866,18 @@
#: Merge.rc:1177
#, c-format
msgid "S&top after first difference"
-msgstr ""
+msgstr "S&top efter f\xF8rste difference"
#: Merge.rc:1180
#, c-format
msgid "Filter Comments"
-msgstr ""
+msgstr "Filter Kommentarer"
#: Merge.rc:1187
#: Merge.rc:1943
#, c-format
msgid "Editor"
-msgstr ""
+msgstr "Redigering"
#: Merge.rc:1190
#, c-format
@@ -1916,22 +1917,22 @@
#: Merge.rc:1204
#, c-format
msgid "Line Difference Coloring"
-msgstr ""
+msgstr "Linie Difference Farver"
#: Merge.rc:1206
#, c-format
msgid "View line differences"
-msgstr ""
+msgstr "Vis linie differencer"
#: Merge.rc:1208
#, c-format
msgid "&Character level"
-msgstr ""
+msgstr "&Karakter niveau"
#: Merge.rc:1210
#, c-format
msgid "&Word-level:"
-msgstr ""
+msgstr "&Ord niveau:"
#: Merge.rc:1225
#, c-format
@@ -1941,17 +1942,17 @@
#: Merge.rc:1231
#, c-format
msgid "Test"
-msgstr ""
+msgstr "Test"
#: Merge.rc:1232
#, c-format
msgid "Install..."
-msgstr ""
+msgstr "Installer..."
#: Merge.rc:1233
#, c-format
msgid "New..."
-msgstr ""
+msgstr "Ny..."
#: Merge.rc:1234
#, c-format
@@ -1961,7 +1962,7 @@
#: Merge.rc:1235
#, c-format
msgid "Delete..."
-msgstr ""
+msgstr "Slet..."
#: Merge.rc:1241
#, c-format
@@ -2001,34 +2002,38 @@
#: Merge.rc:1258
#, c-format
msgid "Discard All"
-msgstr ""
+msgstr "Kasser Alt"
#: Merge.rc:1265
#: Merge.rc:1513
#: Merge.rc:1949
#, c-format
msgid "Codepage"
-msgstr ""
+msgstr "Kodes\xE6t"
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr ""
+msgstr "Standard Kodes\xE6t"
#: Merge.rc:1269
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr ""
+msgstr "V\xE6lg det foresl\xE5ede Kodes\xE6t n\xE5r der indl\xE6ses Non-Unicode filer:"
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files : .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Fund af Kodes\xE6t info for disse filer: .html, .rc, .xml \n"
+"kr\xE6ver omstart af handlingen"
#: Merge.rc:1274
#, c-format
msgid "System codepage"
-msgstr ""
+msgstr "System Kodes\xE6t"
#: Merge.rc:1276
#, c-format
@@ -2038,17 +2043,17 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Udvalgt codepage:"
#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr ""
+msgstr "WinMerge - Arkiv support deaktiveret"
#: Merge.rc:1289
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr ""
+msgstr "Kunne ikke finde 7-Zip ( ikke installeret??)"
#: Merge.rc:1292
#, c-format
@@ -2056,11 +2061,13 @@
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
msgstr ""
+"Arkiv support kr\xE6ver at 7-Zip 3.11 eller nyere er installeret p\xE5 computeren, eller at\n"
+"v\xE6sentlige komponenter kopieres til programmappen for standalone operationer."
#: Merge.rc:1294
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr ""
+msgstr "Der skal ogs\xE5 v\xE6re en passende interface plugin (Merge7z *. dll) p\xE5 stien."
#: Merge.rc:1296
#, c-format
@@ -2068,11 +2075,13 @@
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
+"Brug den version af 7-Zip der er vist nedenfor indtil interface plugins til nyere \n"
+"versioner bliver tilg\xE6ngelige. "
#: Merge.rc:1298
#, c-format
msgid "Version"
-msgstr ""
+msgstr "Version"
#: Merge.rc:1300
#, c-format
@@ -2080,128 +2089,134 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
+"Plugin kr\xE6vet\n"
+"(dllbuild %04u)"
#: Merge.rc:1302
#, c-format
msgid "Recommended version of 7-Zip:"
-msgstr ""
+msgstr "Anbefalet version af 7-Zip:"
#: Merge.rc:1305
#: Merge.rc:1308
#, c-format
msgid "present"
-msgstr ""
+msgstr "Nuv\xE6rende"
#: Merge.rc:1306
#, c-format
msgid "Merge7z000U.dll"
-msgstr ""
+msgstr "Flet7z000U.dll"
#: Merge.rc:1309
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr ""
+msgstr "7-Zip software installeret p\xE5 din computer:"
#: Merge.rc:1311
#: Merge.rc:1316
#, c-format
msgid "none"
-msgstr ""
+msgstr "Ingen"
#: Merge.rc:1313
#, c-format
msgid "missing"
-msgstr ""
+msgstr "mangler"
#: Merge.rc:1314
#, c-format
msgid "7-Zip components for standalone operation:"
-msgstr ""
+msgstr "7-Zip komponenter til standalone operationer:"
#: Merge.rc:1318
#, c-format
msgid "outdated"
-msgstr ""
+msgstr "for\xE6ldet"
#: Merge.rc:1319
#, c-format
msgid "Plugins on path:"
-msgstr ""
+msgstr "Plugins p\xE5 sti:"
#: Merge.rc:1320
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
msgstr ""
+"Vis ikke denne &besked igen.\n"
+"(Du kan altid aktivere den fra Hj\xE6lp menuen.)"
#: Merge.rc:1324
#, c-format
msgid "Plugin Download"
-msgstr ""
+msgstr "Plugin Download"
#: Merge.rc:1333
#, c-format
msgid "Options"
-msgstr ""
+msgstr "Valg"
#: Merge.rc:1344
#, c-format
msgid " Categories"
-msgstr ""
+msgstr " Kategorier"
#: Merge.rc:1346
#, c-format
msgid "Import..."
-msgstr ""
+msgstr "Importer..."
#: Merge.rc:1347
#, c-format
msgid "Export..."
-msgstr ""
+msgstr "Eksporter..."
#: Merge.rc:1355
#, c-format
msgid "Keywords:"
-msgstr ""
+msgstr "N\xF8gleord:"
#: Merge.rc:1356
#, c-format
msgid "Function names:"
-msgstr ""
+msgstr "Funktionsnavne:"
#: Merge.rc:1357
#, c-format
msgid "Comments:"
-msgstr ""
+msgstr "Kommentarer:"
#: Merge.rc:1358
#, c-format
msgid "Numbers:"
-msgstr ""
+msgstr "Numre:"
#: Merge.rc:1359
#, c-format
msgid "Operators:"
-msgstr ""
+msgstr "Operat\xF8rer:"
#: Merge.rc:1360
#, c-format
msgid "Strings:"
-msgstr ""
+msgstr "Strenge:"
#: Merge.rc:1361
#, c-format
msgid "Preprocessor:"
-msgstr ""
+msgstr "Forbereder:"
#: Merge.rc:1362
#, c-format
msgid "User 1:"
-msgstr ""
+msgstr "Bruger 1:"
#: Merge.rc:1363
#, c-format
msgid "User 2:"
-msgstr ""
+msgstr "Bruger 2:"
#: Merge.rc:1368
#: Merge.rc:1373
@@ -2214,7 +2229,7 @@
#: Merge.rc:1408
#, c-format
msgid "Bold"
-msgstr ""
+msgstr "Fed"
#: Merge.rc:1416
#, c-format
@@ -2224,7 +2239,7 @@
#: Merge.rc:1419
#, c-format
msgid "Report &File:"
-msgstr ""
+msgstr "Rapport &Fil:"
#: Merge.rc:1422
#: Merge.rc:1596
@@ -2232,88 +2247,88 @@
#: Merge.rc:1627
#, c-format
msgid "Browse..."
-msgstr ""
+msgstr "Gennemse..."
#: Merge.rc:1423
#, c-format
msgid "&Style:"
-msgstr ""
+msgstr "&Stil"
#: Merge.rc:1426
#, c-format
msgid "&Copy to Clipboard"
-msgstr ""
+msgstr "&Kopier til Udklipsholder"
#: Merge.rc:1434
#, c-format
msgid "Shared or Private Filter"
-msgstr ""
+msgstr "Delt eller Privat Filter "
#: Merge.rc:1437
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr ""
+msgstr "Hvilken type filter vil du oprette?"
#: Merge.rc:1439
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr ""
+msgstr "Delt Filter (for alle brugere)"
#: Merge.rc:1441
#, c-format
msgid "Private Filter (only for current user)"
-msgstr ""
+msgstr "Privat Filter (kun aktuel bruger)"
#: Merge.rc:1449
#: Merge.rc:1950
#, c-format
msgid "Archive Support"
-msgstr ""
+msgstr "Arkiv Support"
#: Merge.rc:1452
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr ""
+msgstr "Arkiv support kr\xE6ver at 7-Zip plugin er installeret:"
#: Merge.rc:1454
#, c-format
msgid "Download 7-zip Plugin"
-msgstr ""
+msgstr "Download 7-zip Plugin"
#: Merge.rc:1455
#, c-format
msgid "&Enable archive file support"
-msgstr ""
+msgstr "&Aktiver arkiv fil support"
#: Merge.rc:1457
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr ""
+msgstr "&Brug standalone 7-Zip hvis muligt"
#: Merge.rc:1460
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
-msgstr ""
+msgstr "B&rug lokal 7-Zip fra WinMerge mappe"
#: Merge.rc:1462
#, c-format
msgid "&Detect archive type from file signature"
-msgstr ""
+msgstr "Bestem arkivtype udfra fil signatur"
#: Merge.rc:1470
#, c-format
msgid "Compare Statistics"
-msgstr ""
+msgstr "Sammenlign Statistik"
#: Merge.rc:1473
#, c-format
msgid "Folders:"
-msgstr ""
+msgstr "Mapper:"
#: Merge.rc:1474
#, c-format
msgid "Files:"
-msgstr ""
+msgstr "Filer:"
#: Merge.rc:1475
#: Merge.rc:2341
@@ -2324,28 +2339,28 @@
#: Merge.rc:1476
#, c-format
msgid "Text:"
-msgstr ""
+msgstr "Tekst:"
#: Merge.rc:1479
#: Merge.rc:1498
#, c-format
msgid "Binary:"
-msgstr ""
+msgstr "Bin\xE6r:"
#: Merge.rc:1482
#, c-format
msgid "Unique"
-msgstr ""
+msgstr "Unik"
#: Merge.rc:1483
#, c-format
msgid "Left:"
-msgstr ""
+msgstr "Venstre:"
#: Merge.rc:1488
#, c-format
msgid "Right:"
-msgstr ""
+msgstr "H\xF8jre:"
#: Merge.rc:1493
#: Merge.rc:2335
@@ -2356,222 +2371,222 @@
#: Merge.rc:1502
#, c-format
msgid "Total:"
-msgstr ""
+msgstr "Ialt:"
#: Merge.rc:1507
#, c-format
msgid "Close"
-msgstr ""
+msgstr "Luk"
#: Merge.rc:1516
#, c-format
msgid "Affects"
-msgstr ""
+msgstr "P\xE5virker"
#: Merge.rc:1519
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr ""
+msgstr "(P\xE5virker)"
#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
-msgstr ""
+msgstr "V\xE6lg Kodes\xE6t til"
#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
-msgstr ""
+msgstr "&Fil Indl\xE6sning:"
#: Merge.rc:1526
#: Merge.rc:1529
#, c-format
msgid "..."
-msgstr ""
+msgstr "..."
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr ""
+msgstr "Fil &Gemning:"
#: Merge.rc:1530
#, c-format
msgid "&Use same codepage for both"
-msgstr ""
+msgstr "&Brug samme kodes\xE6t for begge"
#: Merge.rc:1533
#, c-format
msgid "&Apply"
-msgstr ""
+msgstr "&Anvend"
#: Merge.rc:1534
#: Merge.rc:1916
#, c-format
msgid "&Cancel"
-msgstr "&Afbryd"
+msgstr "&Annuller"
#: Merge.rc:1539
#, c-format
msgid "Test Filter"
-msgstr ""
+msgstr "Test Filter"
#: Merge.rc:1542
#, c-format
msgid "Testing filter ..."
-msgstr ""
+msgstr "Tester filter..."
#: Merge.rc:1544
#, c-format
msgid "&Enter text to test:"
-msgstr ""
+msgstr "&Inds\xE6t test tekst:"
#: Merge.rc:1546
#, c-format
msgid "&Folder Name"
-msgstr ""
+msgstr "&Mappe Navn"
#: Merge.rc:1548
#, c-format
msgid "Result:"
-msgstr ""
+msgstr "Resultater:"
#: Merge.rc:1552
#, c-format
msgid "&Test"
-msgstr ""
+msgstr "&Test"
#: Merge.rc:1553
#, c-format
msgid "&Close"
-msgstr ""
+msgstr "&Luk"
#: Merge.rc:1561
#, c-format
msgid "&Use customized text colors"
-msgstr ""
+msgstr "&Brug tilpasset tekstfarve"
#: Merge.rc:1564
#, c-format
msgid "Custom text colors"
-msgstr ""
+msgstr "Tilpasset tekstfarve"
#: Merge.rc:1566
#, c-format
msgid "Whitespace:"
-msgstr ""
+msgstr "Mellemrum:"
#: Merge.rc:1567
#, c-format
msgid "Regular text:"
-msgstr ""
+msgstr "Almindelig tekst:"
#: Merge.rc:1568
#, c-format
msgid "Selection:"
-msgstr ""
+msgstr "Udvalgt:"
#: Merge.rc:1591
#, c-format
msgid "Paths"
-msgstr ""
+msgstr "Stier"
#: Merge.rc:1597
#, c-format
msgid "R&ead-only"
-msgstr ""
+msgstr "S&krivebeskyttet"
#: Merge.rc:1601
#, c-format
msgid "Re&ad-only"
-msgstr ""
+msgstr "Sk&rivebeskyttet"
#: Merge.rc:1607
#, c-format
msgid "Open..."
-msgstr ""
+msgstr "\xC5ben..."
#: Merge.rc:1608
#, c-format
msgid "Save..."
-msgstr ""
+msgstr "Gem..."
#: Merge.rc:1613
#: Merge.rc:1951
#, c-format
msgid "Backup Files"
-msgstr ""
+msgstr "Backup Filer"
#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
-msgstr ""
+msgstr "Opret Backup Filer som:"
#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
-msgstr ""
+msgstr "Gem Backup Filer i:"
#: Merge.rc:1622
#, c-format
msgid "&Original file's folder"
-msgstr ""
+msgstr "&Original filens mappe"
#: Merge.rc:1624
#, c-format
msgid "&Global backup folder:"
-msgstr ""
+msgstr "&Global backup mappe:"
#: Merge.rc:1628
#, c-format
msgid "Backup filename:"
-msgstr ""
+msgstr "Backup filenavn:"
#: Merge.rc:1629
#, c-format
msgid "&Append .bak -extension"
-msgstr ""
+msgstr "&Tilf\xF8j .bak -extension"
#: Merge.rc:1631
#, c-format
msgid "A&ppend timestamp"
-msgstr ""
+msgstr "T&ilf\xF8j Tidspunkt"
#: Merge.rc:1638
#: Merge.rc:2243
#, c-format
msgid "Confirm Copy"
-msgstr ""
+msgstr "Bekr\xE6ft Kopi"
#: Merge.rc:1642
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr ""
+msgstr "\xD8nsker du virkelig at kopiere XXX emner?"
#: Merge.rc:1644
#, c-format
msgid "From left"
-msgstr ""
+msgstr "Fra Venstre"
#: Merge.rc:1647
#, c-format
msgid "To right"
-msgstr ""
+msgstr "Til H\xF8jre"
#: Merge.rc:1650
#, c-format
msgid "Yes"
-msgstr ""
+msgstr "Ja"
#: Merge.rc:1651
#, c-format
msgid "No"
-msgstr ""
+msgstr "Nej"
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
#: Merge.rc:1660
#, c-format
@@ -2618,7 +2633,7 @@
#: Merge.rc:1708
#, c-format
msgid "040904e4"
-msgstr ""
+msgstr "040904e4"
#. VarFileInfo.Translation
#: Merge.rc:1724
@@ -2634,32 +2649,32 @@
#: Merge.rc:1745
#, c-format
msgid "EXT"
-msgstr ""
+msgstr "EXT"
#: Merge.rc:1746
#, c-format
msgid "CAP"
-msgstr ""
+msgstr "CAP"
#: Merge.rc:1747
#, c-format
msgid "NUM"
-msgstr ""
+msgstr "NUM"
#: Merge.rc:1748
#, c-format
msgid "SCRL"
-msgstr ""
+msgstr "SCRL"
#: Merge.rc:1749
#, c-format
msgid "OVR"
-msgstr ""
+msgstr "OVR"
#: Merge.rc:1750
#, c-format
msgid "REC"
-msgstr ""
+msgstr "REC"
#: Merge.rc:1756
#, c-format
@@ -2745,7 +2760,7 @@
#: Merge.rc:1769
#, c-format
msgid "Make all hidden items visible again"
-msgstr ""
+msgstr "G\xF8r alle skjulte emner synlige igen"
#: Merge.rc:1770
#, c-format
@@ -2768,31 +2783,33 @@
"Open project file\n"
"Project file (Ctrl+J)"
msgstr ""
+"\xC5ben projekt fil\n"
+"Projekt fil (Ctrl+J)"
#: Merge.rc:1779
#, c-format
msgid "Unknown error attempting to open project file"
-msgstr ""
+msgstr "Ukendt fejl ved fors\xF8g p\xE5 \xE5bning af projekt fil"
#: Merge.rc:1780
#, c-format
msgid "Unknown error attempting to save project file"
-msgstr ""
+msgstr "Ukendt fejl ved fors\xF8g p\xE5 at gemme projekt fil"
#: Merge.rc:1781
#, c-format
msgid "Project File"
-msgstr ""
+msgstr "Projekt Fil"
#: Merge.rc:1782
#, c-format
msgid "Project file successfully loaded."
-msgstr ""
+msgstr "Projekt fil indl\xE6st succesfuldt"
#: Merge.rc:1783
#, c-format
msgid "Project file successfully saved."
-msgstr ""
+msgstr "Projekt gemt succesfuldt."
#: Merge.rc:1784
#, c-format
@@ -2800,6 +2817,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
+"Gem aktuel sti og valg for projekt fil\n"
+"Gem Projekt Fil"
#: Merge.rc:1789
#, c-format
@@ -2867,22 +2886,22 @@
"Kaskade vinduer"
#: Merge.rc:1824
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
"Tile Windows Horizontally"
msgstr ""
-"Arranger vinduerne som ikke-overlappende brikker\n"
-"Brikker vinduer"
+"Arranger vinduerne vandret og uden overlap\n"
+"Arranger vinduer vandret"
#: Merge.rc:1825
-#, fuzzy, c-format
+#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
"Tile Windows Vertically"
msgstr ""
-"Arranger vinduerne som ikke-overlappende brikker\n"
-"Brikker vinduer"
+"Arranger vinduerne lodret og uden overlap\n"
+"Arranger vinduer lodret"
#: Merge.rc:1831
#, c-format
@@ -2972,7 +2991,7 @@
"Toggle ToolBar"
msgstr ""
"Vis eller gem v\xE6rkt\xF8jslinjen\n"
-"Vis v\xE6rkt\xF8jslinjen"
+"Vis/Skjul v\xE6rkt\xF8jslinjen"
#: Merge.rc:1846
#, c-format
@@ -2981,7 +3000,7 @@
"Toggle StatusBar"
msgstr ""
"Vis eller gem statuslinjen\n"
-"Vis statuslinjen"
+"Vis/Skjul statuslinjen"
#: Merge.rc:1847
#, c-format
@@ -2989,11 +3008,17 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
+"Vis eller skjul fanelinie\n"
+"Vis/Skjul Faner"
#: Merge.rc:1848
#, c-format
-msgid "Automatically resize panes\nLock Panes"
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
msgstr ""
+"Tilpas fanest\xF8rrelse automatisk\n"
+"L\xE5s Faner"
#: Merge.rc:1854
#, c-format
@@ -3052,17 +3077,45 @@
"Cancel Preview"
msgstr ""
"Luk print preview\n"
-"Afbryd preview"
+"Annuller preview"
#: Merge.rc:1880
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"FilSammenligning\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FilSammenligning\n"
+"WinMerge FilSammenligning"
#: Merge.rc:1881
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
msgstr ""
+"\n"
+"Mappe sammenligning\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.Mappe sammenligning\n"
+"WinMerge Mappe sammenligning"
#: Merge.rc:1888
#, c-format
@@ -3082,18 +3135,22 @@
#: Merge.rc:1908
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
+"Udviklere:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1909
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr ""
+msgstr "WinMerge leveres HELT UDEN GARANTI. Det er gratis software, og du er velkommen til at videredistribuere det under visse omst\xE6ndigheder, jf. GNU General Public License. Se Hj\xE6lp for yderligere oplysninger."
#: Merge.rc:1915
#, c-format
msgid "&Ok"
-msgstr ""
+msgstr "&OK"
#: Merge.rc:1917
#, c-format
@@ -3163,52 +3220,52 @@
#: Merge.rc:1945
#, c-format
msgid "Syntax colors"
-msgstr ""
+msgstr "Syntaks Farver"
#: Merge.rc:1946
#, c-format
msgid "Text Colors"
-msgstr ""
+msgstr "Tekst Farver"
#: Merge.rc:1948
#, c-format
msgid "Version Control"
-msgstr ""
+msgstr "Versions Kontrol"
#: Merge.rc:1959
#, c-format
msgid "To:"
-msgstr ""
+msgstr "Til:"
#: Merge.rc:1960
#, c-format
msgid "From left:"
-msgstr ""
+msgstr "Fra Venstre:"
#: Merge.rc:1961
#, c-format
msgid "To left:"
-msgstr ""
+msgstr "Til Venstre:"
#: Merge.rc:1962
#, c-format
msgid "From right:"
-msgstr ""
+msgstr "Fra H\xF8jre:"
#: Merge.rc:1963
#, c-format
msgid "To right:"
-msgstr ""
+msgstr "Til H\xF8jre:"
#: Merge.rc:1969
#, c-format
msgid "Version %1"
-msgstr ""
+msgstr "Version %1"
#: Merge.rc:1970
#, c-format
msgid "Unicode"
-msgstr ""
+msgstr "Unicode"
#: Merge.rc:1971
#, c-format
@@ -3242,6 +3299,9 @@
"\n"
"Please use values 1 - %1."
msgstr ""
+"V\xE6rdi af Tabulatorbredde kan WinMerge ikke acceptere.\n"
+"\n"
+"Brug v\xE6rdierne 1 - %1."
#: Merge.rc:1984
#, c-format
@@ -3250,6 +3310,9 @@
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
+"Vil du virkelig nulstille alle WinMerge valg til standard?\n"
+"\n"
+"Genstart WinMerge efter nulstilling."
#: Merge.rc:1990
#, c-format
@@ -3269,57 +3332,57 @@
#: Merge.rc:1993
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
-msgstr ""
+msgstr "WinMerge Projekt Filer (*.WinMerge)|*.WinMerge||"
#: Merge.rc:1995
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Valg filer (*.ini)|*.ini|All Files (*.*)|*.*||"
#: Merge.rc:2001
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Tekst Filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Filer (*.*)|*.*||"
#: Merge.rc:2002
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "HTML Filer (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
#: Merge.rc:2003
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "XML Filer (*.xml)|*.xml|All Files (*.*)|*.*||"
#: Merge.rc:2009
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:2010
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:2011
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:2012
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:2018
#, c-format
msgid "Full Contents"
-msgstr ""
+msgstr "Alt Indhold"
#: Merge.rc:2019
#, c-format
msgid "Quick Contents"
-msgstr ""
+msgstr "Hurtigt Indhold"
#: Merge.rc:2020
#, c-format
@@ -3329,12 +3392,12 @@
#: Merge.rc:2021
#, c-format
msgid "Modified Date and Size"
-msgstr ""
+msgstr "\xC6ndret Dato og St\xF8rrelse"
#: Merge.rc:2022
#, c-format
msgid "Size"
-msgstr ""
+msgstr "St\xF8rrelse"
#: Merge.rc:2028
#: Merge.rc:2653
@@ -3355,23 +3418,23 @@
#: Merge.rc:2031
#, c-format
msgid "[F] "
-msgstr ""
+msgstr "[F]"
#: Merge.rc:2032
#: Merge.rc:2655
#, c-format
msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
#: Merge.rc:2033
#, c-format
msgid "Select filename for new filter"
-msgstr ""
+msgstr "V\xE6lg filnavn til nyt filter"
#: Merge.rc:2034
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr ""
+msgstr "Fil Filtre (*.flt)|*.flt|Alle Filer (*.*)|*.*||"
#: Merge.rc:2036
#, c-format
@@ -3381,6 +3444,10 @@
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
msgstr ""
+"Kan ikke finde filter skabelon filen!\n"
+"\n"
+"Kopier filen %1 til WinMerge/Filtermappe:\n"
+"%2."
#: Merge.rc:2038
#, c-format
@@ -3390,6 +3457,10 @@
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
+"Kan ikke kopiere filterskabelon til filtermappen:\n"
+"%1\n"
+"\n"
+"Unders\xF8g om mappen eksisterer og kan \xE6ndres."
#: Merge.rc:2040
#, c-format
@@ -3398,6 +3469,9 @@
"\n"
"Please select filter folder in Options/System."
msgstr ""
+"Brugers filterfil mappe er ikke defineret!\n"
+"\n"
+"V\xE6lg filter mappe i valg/System."
#: Merge.rc:2042
#, c-format
@@ -3407,11 +3481,15 @@
"\n"
"Maybe the file is read-only?"
msgstr ""
+"Kunne ikke slette filter filen:\n"
+"%1\n"
+"\n"
+"M\xE5ske er filen skrivebeskyttet?"
#: Merge.rc:2043
#, c-format
msgid "Locate filter file to install"
-msgstr ""
+msgstr "Find filter fil til installering"
#: Merge.rc:2045
#, c-format
@@ -3420,26 +3498,35 @@
"\n"
"Could not copy new filter file to filter folder."
msgstr ""
+"Installering af filter fil fejlede.\n"
+"\n"
+"Kunne ikke kopiere filter fil til filter mappe."
#: Merge.rc:2047
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
-msgstr ""
+msgstr "Filter filen eksisterer allerede. Vil du overskrive den?"
#: Merge.rc:2053
#, c-format
msgid "Regular expression"
-msgstr ""
+msgstr "Almindeligt udtryk"
#: Merge.rc:2059
#, 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 ""
+"Filtre blev opdateret. Vil du opdatere alle \xE5bne sammenligninger?\n"
+"\n"
+"Hvis du ikke vil opdatere sammenligningerne s\xE5 v\xE6lg Nej og opdater senere."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&Sti til SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3464,12 +3551,12 @@
#: Merge.rc:2076
#, c-format
msgid "Theirs File"
-msgstr ""
+msgstr "Deres Fil"
#: Merge.rc:2077
#, c-format
msgid "Mine File"
-msgstr ""
+msgstr "Mine Fil"
#: Merge.rc:2083
#, c-format
@@ -3519,22 +3606,22 @@
#: Merge.rc:2092
#, c-format
msgid "Creating the report..."
-msgstr ""
+msgstr "Opretter rapport"
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Fortryd sidste handling..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Gentager sidste handling..."
#: Merge.rc:2100
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr ""
+msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
#: Merge.rc:2101
#, c-format
@@ -3544,7 +3631,7 @@
#: Merge.rc:2102
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
-msgstr ""
+msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
#: Merge.rc:2103
#, c-format
@@ -3570,17 +3657,17 @@
#: Merge.rc:2107
#, c-format
msgid "RO"
-msgstr ""
+msgstr "RO"
#: Merge.rc:2113
#, c-format
msgid "Item %1 of %2"
-msgstr ""
+msgstr "Emne %1 of %2"
#: Merge.rc:2114
#, c-format
msgid "Items: %1"
-msgstr ""
+msgstr "Emner: %1"
#: Merge.rc:2120
#, c-format
@@ -3648,12 +3735,18 @@
#: Merge.rc:2136
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "Kunne ikke analysere Konflikt fil"
#: Merge.rc:2137
#, c-format
-msgid "The file\n%1\nis not a conflict file."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
msgstr ""
+"Filen\n"
+"%1\n"
+"er ikke en konflikt fil."
#: Merge.rc:2143
#, c-format
@@ -3688,6 +3781,10 @@
"\n"
"Continue anyway?"
msgstr ""
+"Kunne ikke lave backup af original filen:\n"
+"%1\n"
+"\n"
+"Forts\xE6t alligevel?"
#: Merge.rc:2150
#, c-format
@@ -3699,6 +3796,12 @@
"\t-use a different filename (Press Ok)\n"
"\t-abort the current operation (Press Cancel)?"
msgstr ""
+"Gem fil fejlede.\n"
+"%1\n"
+"%2\n"
+"Vil du:\n"
+"\t-bruge et andet filenavn (Tryk Ok)\n"
+"\t-afbryd aktuel operation (Tryk Annuller)?"
#: Merge.rc:2151
#, c-format
@@ -3771,7 +3874,7 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\ndisappeared. Please save a copy of the file to continue."
+msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr ""
#: Merge.rc:2164
@@ -3781,6 +3884,9 @@
"\n"
"Refresh documents before continuing."
msgstr ""
+"Kan ikke flette differencer n\xE5r dokumenter ikke er synkrone.\n"
+"\n"
+"Opdater dokumenter f\xF8r du forts\xE6tter."
#: Merge.rc:2170
#, c-format
@@ -3795,7 +3901,7 @@
#: Merge.rc:2172
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Versionsstyringssystemet returnerede en fejl under fors\xF8get p\xE5 at checke filen ud. Kan ikke forts\xE6tte..."
+msgstr "Versionsstyringssystemet returnerede en fejl under fors\xF8get p\xE5 at kontrollere filen. Kan ikke forts\xE6tte..."
#: Merge.rc:2173
#, c-format
@@ -3824,6 +3930,9 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
+"Versionsstyrings System returnerede en fejl under fors\xF8get p\xE5 at kontrollere i filen.\n"
+"Kontroller konfiguration af visning.\n"
+"Fortryd kontrol operation?"
#: Merge.rc:2178
#, c-format
@@ -3831,44 +3940,46 @@
"Versioning System returned an error while attempting to undo checkout the file.\n"
" Please, check config spec of used view. "
msgstr ""
+"Versionsstyrings System returnerede en fejl under fors\xF8get p\xE5 at fortryde filkontrol.\n"
+"Knotroller konfiguration af visning."
#: Merge.rc:2184
#: Merge.rc:2637
#, c-format
msgid "None"
-msgstr ""
+msgstr "Ingen"
#: Merge.rc:2185
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
-msgstr ""
+msgstr "Visuel kildesikkerhed (mindre end 5.0)"
#: Merge.rc:2186
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
-msgstr ""
+msgstr "Visuel kildesikkerhed (5.0 og over)"
#: Merge.rc:2188
#, c-format
msgid "Break at whitespace"
-msgstr ""
+msgstr "Bryd ved mellemrum"
#: Merge.rc:2189
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr ""
+msgstr "Bryd ved mellemrum eller tegns\xE6tning"
#: Merge.rc:2195
#: Merge.rc:2197
#, c-format
msgid "Copy selected item to named directory"
-msgstr ""
+msgstr "Kopier valgte element til navngivet mappe"
#: Merge.rc:2196
#: Merge.rc:2198
#, c-format
msgid "Copy selected item to custom directory"
-msgstr ""
+msgstr "Kopier valgte element til tilpasset mappe"
#: Merge.rc:2199
#, c-format
@@ -3888,12 +3999,12 @@
#: Merge.rc:2202
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr ""
+msgstr "Skjul valgt emne(r) (ad hoc filter)"
#: Merge.rc:2203
#, c-format
msgid "Rename selected item on both sides"
-msgstr ""
+msgstr "Omd\xF8b valgte emner p\xE5 begge sider"
#: Merge.rc:2204
#, c-format
@@ -3977,22 +4088,22 @@
#: Merge.rc:2228
#, c-format
msgid "Left side - select destination folder:"
-msgstr ""
+msgstr "Venstre side - v\xE6lg destinationsmappen"
#: Merge.rc:2229
#, c-format
msgid "Right side - select destination folder:"
-msgstr ""
+msgstr "H\xF8jre side - v\xE6lg destinationsmappen"
#: Merge.rc:2230
#, c-format
msgid "(%1 Files Affected)"
-msgstr ""
+msgstr "(%1 Filer P\xE5virket)"
#: Merge.rc:2231
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr ""
+msgstr "(%1 af %2 Filer P\xE5virket)"
#: Merge.rc:2237
#, c-format
@@ -4008,12 +4119,12 @@
#: Merge.rc:2238
#, c-format
msgid "Are you sure you want to copy:"
-msgstr ""
+msgstr "Er du sikker p\xE5 du vil kopiere:"
#: Merge.rc:2239
#, c-format
msgid "Are you sure you want to copy %d items:"
-msgstr ""
+msgstr "Er du sikker p\xE5 du vil kopiere %d emner:"
#: Merge.rc:2240
#, c-format
@@ -4026,21 +4137,28 @@
"\n"
"Please refresh the compare."
msgstr ""
+"Operationen afsluttet!\n"
+"\n"
+"Mappeindhold p\xE5 disk er \xE6ndret, stien\n"
+"%1\n"
+"blev ikke fundet.\n"
+"\n"
+"Opdater sammenligning."
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Er du sikker p\xE5 du vil flytte:"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Er du sikker p\xE5 du vil flytte: %d emner:"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Bekr\xE6ft Flytning"
#: Merge.rc:2250
#, c-format
@@ -4075,12 +4193,12 @@
#: Merge.rc:2256
#, c-format
msgid "Failed to execute external editor: %1"
-msgstr ""
+msgstr "Kunne ikke eksekvere ekstern editor: %1"
#: Merge.rc:2257
#, c-format
msgid "Unknown extension on external editor: %1"
-msgstr ""
+msgstr "Ukendt udvidelse i ekstern editor: %1"
#: Merge.rc:2258
#, c-format
@@ -4175,7 +4293,7 @@
#: Merge.rc:2293
#, c-format
msgid "Extension"
-msgstr ""
+msgstr "Udvidelse"
#: Merge.rc:2294
#, c-format
@@ -4190,12 +4308,12 @@
#: Merge.rc:2296
#, c-format
msgid "Right Size (Short)"
-msgstr ""
+msgstr "H\xF8jre St\xF8rrelse (Kort)"
#: Merge.rc:2297
#, c-format
msgid "Left Size (Short)"
-msgstr ""
+msgstr "Venstre St\xF8rrelse (Kort)"
#: Merge.rc:2303
#, c-format
@@ -4240,32 +4358,32 @@
#: Merge.rc:2311
#, c-format
msgid "Left EOL"
-msgstr ""
+msgstr "Venstre EOL"
#: Merge.rc:2312
#, c-format
msgid "Right EOL"
-msgstr ""
+msgstr "H\xF8jre EOL"
#: Merge.rc:2318
#, c-format
msgid "Left Encoding"
-msgstr "Venstre Encoding"
+msgstr "Venstre Koding"
#: Merge.rc:2319
#, c-format
msgid "Right Encoding"
-msgstr "H\xF8jre Encoding"
+msgstr "H\xF8jre Koding"
#: Merge.rc:2320
#, c-format
msgid "Ignored Diff."
-msgstr ""
+msgstr "Ignoreret Diff."
#: Merge.rc:2321
#, c-format
msgid "Differences"
-msgstr ""
+msgstr "Differencer"
#: Merge.rc:2322
#: Merge.rc:2633
@@ -4281,7 +4399,7 @@
#: Merge.rc:2329
#, c-format
msgid "Item aborted"
-msgstr ""
+msgstr "Emne fortrudt"
#: Merge.rc:2330
#, c-format
@@ -4296,12 +4414,12 @@
#: Merge.rc:2332
#, c-format
msgid "Left only: %1"
-msgstr ""
+msgstr "Venstre kun: %1"
#: Merge.rc:2333
#, c-format
msgid "Right only: %1"
-msgstr ""
+msgstr "H\xF8jre kun: %1"
#: Merge.rc:2334
#, c-format
@@ -4336,7 +4454,7 @@
#: Merge.rc:2342
#, c-format
msgid "Error"
-msgstr ""
+msgstr "Fejl"
#: Merge.rc:2343
#, c-format
@@ -4406,12 +4524,12 @@
#: Merge.rc:2370
#, c-format
msgid "Left file size abbreviated."
-msgstr ""
+msgstr "Venstre filst\xF8rrelse forkortet."
#: Merge.rc:2371
#, c-format
msgid "Right file size abbreviated."
-msgstr ""
+msgstr "H\xF8jre filst\xF8rrelse forkortet."
#: Merge.rc:2377
#, c-format
@@ -4456,12 +4574,12 @@
#: Merge.rc:2385
#, c-format
msgid "Left side file EOL type"
-msgstr ""
+msgstr "Venstre sidefil EOL type"
#: Merge.rc:2386
#, c-format
msgid "Right side file EOL type"
-msgstr ""
+msgstr "H\xF8jre sidefil EOL type"
#: Merge.rc:2392
#, c-format
@@ -4476,12 +4594,12 @@
#: Merge.rc:2394
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr ""
+msgstr "Antal ignorerede forskelle i filen. Disse forskelle er ignoreret af WinMerge og kan ikke blive flettet."
#: Merge.rc:2395
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
-msgstr ""
+msgstr "Antel forskelle i filen. Dette tal omfatter ikke ignorerede forskelle."
#: Merge.rc:2396
#, c-format
@@ -4496,27 +4614,27 @@
#: Merge.rc:2403
#, c-format
msgid "Comma-separated list"
-msgstr ""
+msgstr "Komma opdelt liste"
#: Merge.rc:2404
#, c-format
msgid "Tab-separated list"
-msgstr ""
+msgstr "Tab opdelt liste"
#: Merge.rc:2405
#, c-format
msgid "Simple HTML"
-msgstr ""
+msgstr "Simpel HTML"
#: Merge.rc:2406
#, c-format
msgid "Simple XML"
-msgstr ""
+msgstr "Simpel XML"
#: Merge.rc:2408
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr ""
+msgstr "Rapportfilen eksisterer allerede. \xD8nsker du at overskrive eksisterende fil"
#: Merge.rc:2409
#, c-format
@@ -4524,11 +4642,13 @@
"Error creating the report:\n"
"%1"
msgstr ""
+"Fejl ved opretning af rapporten:\n"
+"%1"
#: Merge.rc:2410
#, c-format
msgid "The report has been created successfully."
-msgstr ""
+msgstr "Rapporten blev oprettet succesfuldt."
#: Merge.rc:2416
#, c-format
@@ -4559,11 +4679,22 @@
"\n"
"Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
+"Disse filer anvender forskellige returtegn typer.\n"
+"\n"
+"\xD8nsker du at behandle alle returtegn typer ens til denne sammenligning?\n"
+"\n"
+"Bem\xE6rk: Hvis du altid vil behandle alle returtegn typer ens, s\xE5 indstil valget 'Ignorer returtegn forskelle ..' i Fanen: Indstillinger -> Sammenlign (findes under Redig\xE9r)."
#: Merge.rc:2421
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
msgstr ""
+" EOL forskellige typer (Windows/Unix/Mac) i filen '%1'.\n"
+"Med de nuv\xE6rende valg, vil de blive samlet til den dominerende type.\n"
+"\xD8nsker du at \xE6ndre indstillinger og bevare de forskellige EOL ?"
#: Merge.rc:2422
#, c-format
@@ -4573,17 +4704,27 @@
#: Merge.rc:2423
#, c-format
msgid "The selected folder is invalid."
-msgstr ""
+msgstr "Den valgte mappe er ugyldig."
#: Merge.rc:2424
#, c-format
msgid "Cannot open a binary file to editor."
-msgstr ""
+msgstr "Kan ikke \xE5bne en bin\xE6r fil til editor."
#: Merge.rc:2425
#, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
msgstr ""
+"Mappen eksisterer kun i anden side og ikke kan \xE5bnes.\n"
+"\n"
+"\xD8nsker du at oprette en tilsvarende mappe:\n"
+"%1\n"
+"til den anden side og \xE5bne disse mapper?"
#: Merge.rc:2431
#, c-format
@@ -4599,22 +4740,22 @@
#: Merge.rc:2432
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr ""
+msgstr "Advarsel: Filerne bruger forskellige kodninger, venstre =% s og h\xF8jre =% s, og fletning kan f\xF8re til tab af oplysninger."
#: Merge.rc:2433
#, c-format
msgid "Information lost due to encoding errors: both files"
-msgstr ""
+msgstr "Oplysninger tabt, p\xE5 grund af kodnings fejl: begge filer"
#: Merge.rc:2434
#, c-format
msgid "Information lost due to encoding errors: right file"
-msgstr ""
+msgstr "Oplysninger tabt, p\xE5 grund af kodnings fejl: h\xF8jre fil"
#: Merge.rc:2435
#, c-format
msgid "Information lost due to encoding errors: left file"
-msgstr ""
+msgstr "Oplysninger tabt, p\xE5 grund af kodnings fejl: venstre fil"
#: Merge.rc:2441
#, c-format
@@ -4649,12 +4790,12 @@
#: Merge.rc:2462
#, c-format
msgid "Location Pane"
-msgstr ""
+msgstr "Placerings vindue"
#: Merge.rc:2463
#, c-format
msgid "Diff Pane"
-msgstr ""
+msgstr "Forskels vindue"
#: Merge.rc:2469
#, c-format
@@ -4684,17 +4825,17 @@
#: Merge.rc:2474
#, c-format
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: Merge.rc:2475
#, c-format
msgid "Context"
-msgstr ""
+msgstr "Kontekst"
#: Merge.rc:2476
#, c-format
msgid "Unified"
-msgstr ""
+msgstr "Samlet"
#: Merge.rc:2477
#, c-format
@@ -4704,12 +4845,12 @@
#: Merge.rc:2478
#, c-format
msgid "The specified output path is not an absolute path: %1"
-msgstr ""
+msgstr "Den angivne output sti er ikke en endelig sti: %1"
#: Merge.rc:2479
#, c-format
msgid "Specify an output file"
-msgstr ""
+msgstr "Angiv en output fil"
#: Merge.rc:2480
#, c-format
@@ -4728,11 +4869,14 @@
"\n"
"Creating a patch requires that there are no unsaved changes in files."
msgstr ""
+"Gem alle filer f\xF8rst.\n"
+"\n"
+"Oprettelse af en patch kr\xE6ver at alle \xE6ndringer i filen er gemt."
#: Merge.rc:2483
#, c-format
msgid "Folder does not exist."
-msgstr ""
+msgstr "Mappen eksisterer ikke."
#: Merge.rc:2488
#, c-format
@@ -4756,6 +4900,8 @@
"\n"
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
+"\n"
+"Note: 7-Zip integration er deaktiveret i WinMerge indstillinger."
#: Merge.rc:2491
#, c-format
@@ -4763,36 +4909,38 @@
"\n"
"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
+"\n"
+"Note: 7-Zip integration er begr\xE6nset til standalone operationer i WinMerge indstillinger."
#: Merge.rc:2492
#, c-format
msgid "Select file for export"
-msgstr ""
+msgstr "V\xE6lg fil til eksport"
#: Merge.rc:2493
#, c-format
msgid "Select file for import"
-msgstr ""
+msgstr "Select file for import"
#: Merge.rc:2494
#, c-format
msgid "Options imported from the file."
-msgstr ""
+msgstr "Valg importeret fra filen."
#: Merge.rc:2495
#, c-format
msgid "Options exported to the file."
-msgstr ""
+msgstr "Valg eksporteret til filen."
#: Merge.rc:2496
#, c-format
msgid "Failed to import options from the file."
-msgstr ""
+msgstr "Kunne ikke importere valg fra filen."
#: Merge.rc:2497
#, c-format
msgid "Failed to write options to the file."
-msgstr ""
+msgstr "Kunne ikke skrive valg til filen."
#: Merge.rc:2498
#, c-format
@@ -4801,11 +4949,14 @@
"\n"
"Do you want to continue?"
msgstr ""
+"Du er ved at lukke flere sammenlignings vinduer.\n"
+"\n"
+"Vil du forts\xE6tte?"
#: Merge.rc:2504
#, c-format
msgid "Regular expression error"
-msgstr "Fejl ved regul\xE6rt udtryk"
+msgstr "Fejl ved Alment udtryk"
#: Merge.rc:2505
#, c-format
@@ -4815,428 +4966,428 @@
#: Merge.rc:2506
#, c-format
msgid "Invalid regular expression"
-msgstr "Ugyldigt regul\xE6rt udtryk"
+msgstr "Ugyldigt Alment udtryk"
#: Merge.rc:2507
#, c-format
msgid "Invalid collation character"
-msgstr ""
+msgstr "Ugyldigt sammenlignings tegn"
#: Merge.rc:2508
#, c-format
msgid "Invalid character class name"
-msgstr ""
+msgstr "Ugyldigt tegnklasse navn"
#: Merge.rc:2509
#, c-format
msgid "Trailing backslash"
-msgstr ""
+msgstr "Efterf\xF8lgende backslash (omv. skr\xE5streg)"
#: Merge.rc:2510
#, c-format
msgid "Invalid back reference"
-msgstr ""
+msgstr "Ugyldig bagud reference"
#: Merge.rc:2511
#, c-format
msgid "Unmatched [ or [^"
-msgstr ""
+msgstr "Umatched [ eller [^"
#: Merge.rc:2512
#, c-format
msgid "Unmatched ( or \\("
-msgstr ""
+msgstr "Umatched ( eller \\("
#: Merge.rc:2513
#, c-format
msgid "Unmatched \\{"
-msgstr ""
+msgstr "Umatched \\{"
#: Merge.rc:2514
#, c-format
msgid "Invalid content of \\{\\}"
-msgstr ""
+msgstr "Ugyldigt indhold af \\{\\}"
#: Merge.rc:2515
#, c-format
msgid "Invalid range end"
-msgstr ""
+msgstr "Ugyldig omr\xE5de afslutning"
#: Merge.rc:2516
#, c-format
msgid "Out of memory"
-msgstr ""
+msgstr "Ude af hukommelse"
#: Merge.rc:2517
#, c-format
msgid "Invalid preceding regular expression"
-msgstr ""
+msgstr "Ugyldigt foreg\xE5ende alment udtryk"
#: Merge.rc:2518
#, c-format
msgid "Premature end of regular expression"
-msgstr ""
+msgstr "For tidlig afslutning af alment udtryk"
#: Merge.rc:2519
#, c-format
msgid "Regular expression too big"
-msgstr "Regul\xE6rt udtryk er for stort"
+msgstr "Alment udtryk er for stort"
#: Merge.rc:2524
#, c-format
msgid "Unmatched ) or \\)"
-msgstr ""
+msgstr "Umatched ) eller \\)"
#: Merge.rc:2530
#, c-format
msgid "Western European"
-msgstr ""
+msgstr "Western European"
#: Merge.rc:2531
#, c-format
msgid "Eastern European"
-msgstr ""
+msgstr "Eastern European"
#: Merge.rc:2532
#, c-format
msgid "East Asian"
-msgstr ""
+msgstr "East Asian"
#: Merge.rc:2533
#, c-format
msgid "SE & SW Asian"
-msgstr ""
+msgstr "SE & SW Asian"
#: Merge.rc:2534
#, c-format
msgid "Middle Eastern"
-msgstr ""
+msgstr "Middle Eastern"
#: Merge.rc:2535
#: Merge.rc:2545
#, c-format
msgid "Not applicable"
-msgstr ""
+msgstr "Ikke relevant"
#: Merge.rc:2541
#, c-format
msgid "MS-Windows"
-msgstr ""
+msgstr "MS-Windows"
#: Merge.rc:2542
#, c-format
msgid "MS-DOS"
-msgstr ""
+msgstr "MS-DOS"
#: Merge.rc:2543
#, c-format
msgid "Macintosh"
-msgstr ""
+msgstr "Macintosh"
#: Merge.rc:2544
#, c-format
msgid "IBM"
-msgstr ""
+msgstr "IBM"
#: Merge.rc:2551
#, c-format
msgid "EBCDIC"
-msgstr ""
+msgstr "EBCDIC"
#: Merge.rc:2552
#, c-format
msgid "IBM EBCDIC Cyrillic"
-msgstr ""
+msgstr "IBM EBCDIC Cyrillic"
#: Merge.rc:2558
#, c-format
msgid "MS-DOS Latin US"
-msgstr ""
+msgstr "MS-DOS Latin US"
#: Merge.rc:2559
#, c-format
msgid "MS-DOS Arabic"
-msgstr ""
+msgstr "MS-DOS Arabic"
#: Merge.rc:2560
#, c-format
msgid "MS-DOS Greek"
-msgstr ""
+msgstr "MS-DOS Greek"
#: Merge.rc:2561
#, c-format
msgid "MS-DOS Baltic Rim"
-msgstr ""
+msgstr "MS-DOS Baltic Rim"
#: Merge.rc:2562
#, c-format
msgid "MS-DOS Latin 1"
-msgstr ""
+msgstr "MS-DOS Latin 1"
#: Merge.rc:2563
#, c-format
msgid "MS-DOS Greek 1"
-msgstr ""
+msgstr "MS-DOS Greek 1"
#: Merge.rc:2564
#, c-format
msgid "MS-DOS Latin 2"
-msgstr ""
+msgstr "MS-DOS Latin 2"
#: Merge.rc:2565
#, c-format
msgid "MS-DOS Cyrillic"
-msgstr ""
+msgstr "MS-DOS Cyrillic"
#: Merge.rc:2566
#, c-format
msgid "MS-DOS Turkish"
-msgstr ""
+msgstr "MS-DOS Turkish"
#: Merge.rc:2567
#, c-format
msgid "MS-DOS Portuguese"
-msgstr ""
+msgstr "MS-DOS Portuguese"
#: Merge.rc:2573
#, c-format
msgid "MS-DOS Icelandic"
-msgstr ""
+msgstr "MS-DOS Icelandic"
#: Merge.rc:2574
#, c-format
msgid "MS-DOS Hebrew"
-msgstr ""
+msgstr "MS-DOS Hebrew"
#: Merge.rc:2575
#, c-format
msgid "MS-DOS French Canada"
-msgstr ""
+msgstr "MS-DOS French Canada"
#: Merge.rc:2576
#, c-format
msgid "MS-DOS Nordic"
-msgstr...
[truncated message content] |
|
From: <ki...@us...> - 2009-03-05 16:13:38
|
Revision: 6535
http://winmerge.svn.sourceforge.net/winmerge/?rev=6535&view=rev
Author: kimmov
Date: 2009-03-05 16:13:21 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
PATCH: [ 2659228 ] Remember last copy/move to -folder
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/DirActions.cpp
branches/R2_12/Src/DirView.h
branches/R2_12/Src/FileOrFolderSelect.cpp
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-05 16:07:04 UTC (rev 6534)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-03-05 16:13:21 UTC (rev 6535)
@@ -4,6 +4,7 @@
http://winmerge.org/tracker/[tracker-id]
WinMerge 2.12.0
+ Remember last target folder for Copy/Move to in folder compare (#2659228)
Detect Windows 7 and Windows 2008 in config log (#2599256)
Bugfix: Help window opened from WinMerge was modal (#2590079)
Bugfix: Crash in editor when undoing (#2590212)
Modified: branches/R2_12/Src/DirActions.cpp
===================================================================
--- branches/R2_12/Src/DirActions.cpp 2009-03-05 16:07:04 UTC (rev 6534)
+++ branches/R2_12/Src/DirActions.cpp 2009-03-05 16:13:21 UTC (rev 6535)
@@ -587,11 +587,12 @@
void CDirView::DoCopyLeftTo()
{
CString destPath;
- CString startPath;
+ CString startPath(m_lastCopyFolder.c_str());
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_LEFT))
return;
+ m_lastCopyFolder = destPath;
WaitStatusCursor waitstatus(IDS_STATUS_COPYFILES);
FileActionScript actionScript;
@@ -658,11 +659,12 @@
void CDirView::DoCopyRightTo()
{
CString destPath;
- CString startPath;
+ CString startPath(m_lastCopyFolder.c_str());
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_RIGHT))
return;
+ m_lastCopyFolder = destPath;
WaitStatusCursor waitstatus(IDS_STATUS_COPYFILES);
FileActionScript actionScript;
@@ -729,11 +731,12 @@
void CDirView::DoMoveLeftTo()
{
CString destPath;
- CString startPath;
+ CString startPath(m_lastCopyFolder.c_str());
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_LEFT))
return;
+ m_lastCopyFolder = destPath;
WaitStatusCursor waitstatus(IDS_STATUS_MOVEFILES);
FileActionScript actionScript;
@@ -798,11 +801,12 @@
void CDirView::DoMoveRightTo()
{
CString destPath;
- CString startPath;
+ CString startPath(m_lastCopyFolder.c_str());
if (!SelectFolder(destPath, startPath, IDS_SELECT_DEST_RIGHT))
return;
+ m_lastCopyFolder = destPath;
WaitStatusCursor waitstatus(IDS_STATUS_MOVEFILES);
FileActionScript actionScript;
Modified: branches/R2_12/Src/DirView.h
===================================================================
--- branches/R2_12/Src/DirView.h 2009-03-05 16:07:04 UTC (rev 6534)
+++ branches/R2_12/Src/DirView.h 2009-03-05 16:13:21 UTC (rev 6535)
@@ -274,6 +274,7 @@
DirCompProgressDlg * m_pCmpProgressDlg;
clock_t m_compareStart; /**< Starting process time of the compare */
BOOL m_bUserCancelEdit; /**< TRUE if the user cancels rename */
+ String m_lastCopyFolder; /**< Last Copy To -target folder. */
CShellContextMenu* m_pShellContextMenuLeft; /**< Shell context menu for group of left files */
CShellContextMenu* m_pShellContextMenuRight; /**< Shell context menu for group of right files */
Modified: branches/R2_12/Src/FileOrFolderSelect.cpp
===================================================================
--- branches/R2_12/Src/FileOrFolderSelect.cpp 2009-03-05 16:07:04 UTC (rev 6534)
+++ branches/R2_12/Src/FileOrFolderSelect.cpp 2009-03-05 16:13:21 UTC (rev 6535)
@@ -48,8 +48,13 @@
#define BIF_USENEWUI (BIF_NEWDIALOGSTYLE | BIF_EDITBOX)
#endif
+static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam,
+ LPARAM lpData);
static void ConvertFilter(LPTSTR filterStr);
+/** @brief Last selected folder for folder selection dialog. */
+static String LastSelectedFolder;
+
/**
* @brief Helper function for selecting folder or file.
* This function shows standard Windows file selection dialog for selecting
@@ -155,13 +160,14 @@
TCHAR szPath[MAX_PATH] = {0};
BOOL bRet = FALSE;
String title = theApp.LoadString(titleid);
+ LastSelectedFolder = root_path;
bi.hwndOwner = hwndOwner;
bi.pidlRoot = NULL; // Start from desktop folder
bi.pszDisplayName = szPath;
bi.lpszTitle = title.c_str();
- bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
- bi.lpfn = NULL;
+ bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI | BIF_VALIDATE;
+ bi.lpfn = BrowseCallbackProc;
bi.lParam = NULL;
pidl = SHBrowseForFolder(&bi);
@@ -181,6 +187,21 @@
return bRet;
}
+/**
+ * @brief Callback function for setting selected folder for folder dialog.
+ */
+static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam,
+ LPARAM lpData)
+{
+ // Look for BFFM_INITIALIZED
+ if (uMsg == BFFM_INITIALIZED)
+ {
+ SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)LastSelectedFolder.c_str());
+ }
+ return 0;
+}
+
+
/**
* @brief Shows file/folder selection dialog.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
