|
From: <ki...@us...> - 2007-01-15 20:48:34
|
Revision: 4055
http://svn.sourceforge.net/winmerge/?rev=4055&view=rev
Author: kimmov
Date: 2007-01-15 12:48:33 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
Add Ren?\195?\169 Leonhardt to Contributors.txt
Modified Paths:
--------------
branches/R2_6/Docs/Users/Contributors.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_6/Docs/Users/Contributors.txt 2007-01-15 20:46:46 UTC (rev 4054)
+++ branches/R2_6/Docs/Users/Contributors.txt 2007-01-15 20:48:33 UTC (rev 4055)
@@ -109,6 +109,7 @@
* Jan Hryz
* Ed_K
* Ferenc Kubatovics
+* Ren\xE9 Leonhardt
* Vladimir Lukianov
* David Maisonave
* Harry Mckame
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-15 20:46:46 UTC (rev 4054)
+++ branches/R2_6/Src/Changes.txt 2007-01-15 20:48:33 UTC (rev 4055)
@@ -9,6 +9,8 @@
PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
Submitted by Ren\xE9 Leonhardt
Filters: SourceControl.flt
+ Add Ren\xE9 Leonhardt to Contributors.txt
+ Docs/Users: Contributors.txt
2007-01-14 Kimmo
Update manual URL point to 2.6 version manual in readme.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-01-30 21:43:14
|
Revision: 4086
http://svn.sourceforge.net/winmerge/?rev=4086&view=rev
Author: kimmov
Date: 2007-01-30 13:42:55 -0800 (Tue, 30 Jan 2007)
Log Message:
-----------
PATCH: [ 1639493 ] Updated Bulgarian language files
- Submitted by tigertron
Modified Paths:
--------------
branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
Modified: branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt
===================================================================
--- branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-01-28 13:12:42 UTC (rev 4085)
+++ branches/R2_6/Docs/Users/Languages/ReadMe-Bulgarian.txt 2007-01-30 21:42:55 UTC (rev 4086)
@@ -12,9 +12,9 @@
http://www.winmerge.org/2.6/manual/quickstart.html
HTML \xF0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE:
-\xD0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE\xF2\xEE \xE5 \xE4\xEE\xF1\xF2\xFA\xEF\xED\xEE \xEE\xED\xEB\xE0\xE9\xF2 \xED\xE0 \xE0\xE4\xF0\xE5\xF1:
+\xD0\xFA\xEA\xEE\xE2\xEE\xE4\xF1\xF2\xE2\xEE\xF2\xEE \xE5 \xE4\xEE\xF1\xF2\xFA\xEF\xED\xEE \xEE\xED\xEB\xE0\xE9\xED \xED\xE0 \xE0\xE4\xF0\xE5\xF1:
http://www.winmerge.org/2.6/manual/
-\xEC\xEE\xE6\xE5 \xE4\xE0 \xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xEE \xED\xE0 \xC2\xE0\xF8\xE8\xFF \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0 (\xE0\xEA\xEE \xE5 \xE8\xE7\xE1\xF0\xE0\xED\xEE) \xE8\xEB\xE8 \xE4\xE0 \xE3\xEE
+\xEC\xEE\xE6\xE5 \xE4\xE0 \xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xEE \xED\xE0 \xC2\xE0\xF8\xE8\xFF\xF2 \xEA\xEE\xEC\xEF\xFE\xF2\xFA\xF0 (\xE0\xEA\xEE \xE5 \xE8\xE7\xE1\xF0\xE0\xED\xEE) \xE8\xEB\xE8 \xE4\xE0 \xE3\xEE
\xF1\xE2\xE0\xEB\xE8\xF2\xE5 \xEE\xF2 http://www.winmerge.org/ (\xE2\xE8\xE6\xF2\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE0\xF6\xE8\xFF\xF2\xE0)
\xCF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8:
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-28 13:12:42 UTC (rev 4085)
+++ branches/R2_6/Src/Changes.txt 2007-01-30 21:42:55 UTC (rev 4086)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-30 Kimmo
+ PATCH: [ 1639493 ] Updated Bulgarian language files
+ Submitted by tigertron
+ Src/Languages/Bulgarian: MergeBulgarian.rc
+ Docs/Users/Languages: Readme-Bulgarian.txt
+
2007-01-17 2.6.4 Stable Release (R4067)
2007-01-15 Kimmo
Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-28 13:12:42 UTC (rev 4085)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-01-30 21:42:55 UTC (rev 4086)
@@ -105,14 +105,14 @@
MENUITEM SEPARATOR
MENUITEM "&\xC8\xE7\xE1\xE5\xF0\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0 \xE2 \xF0\xE5\xE4\xE0", ID_SELECTLINEDIFF
MENUITEM SEPARATOR
- MENUITEM "&\xCF\xF0\xE5\xE4\xE8\xF8\xED\xEE", ID_EDIT_UNDO
+ MENUITEM "\xCE&\xF2\xEC\xE5\xED\xE8", ID_EDIT_UNDO
MENUITEM "&\xC2\xFA\xF0\xED\xE8", ID_EDIT_REDO
MENUITEM SEPARATOR
MENUITEM "\xC8&\xE7\xF0\xE5\xE6\xE8", ID_EDIT_CUT
MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9", ID_EDIT_COPY
MENUITEM "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8", ID_EDIT_PASTE
MENUITEM SEPARATOR
- MENUITEM "\xCE\xF2&\xE8\xE4\xE8 \xED\xE0...", ID_EDIT_WMGOTO
+ MENUITEM "\xCE\xF2\xE8\xE4\xE8 &\xED\xE0...", ID_EDIT_WMGOTO
MENUITEM SEPARATOR
POPUP "&\xCE\xF2\xE2\xEE\xF0\xE8"
BEGIN
@@ -189,7 +189,7 @@
MENUITEM SEPARATOR
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE", ID_WINDOW_TILE_HORZ
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE", ID_WINDOW_TILE_VERT
- MENUITEM "&\xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
+ MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
END
POPUP "&\xCF\xEE\xEC\xEE\xF9"
BEGIN
@@ -197,8 +197,8 @@
MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
MENUITEM "&\xD2\xFA\xF0\xF1\xE5\xED\xE5...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCD\xE0\xF1\xF2\xF0\xEE\xE8&\xEA\xE8...", ID_HELP_GETCONFIG
- MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE8\xEA\xE8...", ID_HELP_GETCONFIG
+ MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 &\xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xF9\xE5\xF1\xF2\xE2\xE5\xED GNU \xEB\xE8\xF6\xE5\xED\xE7...", ID_HELP_GNULICENSE
MENUITEM "&\xC7\xE0 WinMerge...", ID_APP_ABOUT
@@ -224,7 +224,7 @@
END
POPUP "&\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xED\xE5"
BEGIN
- MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+\xC2", ID_EDIT_SELECT_ALL
+ MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8...", ID_OPTIONS
MENUITEM SEPARATOR
@@ -296,7 +296,7 @@
MENUITEM SEPARATOR
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE", ID_WINDOW_TILE_HORZ
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xE2&\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE", ID_WINDOW_TILE_VERT
- MENUITEM "&\xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
+ MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
END
POPUP "&\xCF\xEE\xEC\xEE\xF9"
BEGIN
@@ -304,8 +304,8 @@
MENUITEM "&\xC8\xED\xE4\xE5\xEA\xF1...", ID_HELP_INDEX
MENUITEM "&\xD2\xFA\xF0\xF1\xE5\xED\xE5...", ID_HELP_SEARCH
MENUITEM SEPARATOR
- MENUITEM "\xCD\xE0\xF1\xF2\xF0\xEE\xE8&\xEA\xE8...", ID_HELP_GETCONFIG
- MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 \xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
+ MENUITEM "&\xCD\xE0\xF1\xF2\xF0\xEE\xE8\xEA\xE8...", ID_HELP_GETCONFIG
+ MENUITEM "\xC7\xE0\xE1\xF0\xE0\xED\xE5\xED\xE0 \xEF\xEE\xE4\xE4\xF0\xFA\xE6\xEA\xE0 \xED\xE0 &\xE0\xF0\xF5\xE8\xE2\xE8...", ID_HELP_MERGE7ZMISMATCH
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xF9\xE5\xF1\xF2\xE2\xE5\xED GNU \xEB\xE8\xF6\xE5\xED\xE7...", ID_HELP_GNULICENSE
MENUITEM "&\xC7\xE0 WinMerge...", ID_APP_ABOUT
@@ -316,13 +316,13 @@
BEGIN
POPUP "&\xD4\xE0\xE9\xEB"
BEGIN
- MENUITEM "&\xCD\xEE\xE2\tCtrl+\xCD", ID_FILE_NEW
+ MENUITEM "&\xCD\xEE\xE2\tCtrl+N", ID_FILE_NEW
MENUITEM "&\xCE\xF2\xE2\xEE\xF0\xE8...\tCtrl+O", ID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "\xCE\xF2\xE2\xEE\xF0\xE8 &\xCF\xF0\xEE\xE5\xEA\xF2...\tCtrl+J", ID_FILE_OPENPROJECT
- MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8 \xCF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
+ MENUITEM "\xC7\xE0\xEF\xE8&\xF8\xE8 \xCF\xF0\xEE\xE5\xEA\xF2...", ID_FILE_SAVEPROJECT
MENUITEM SEPARATOR
- MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8\tCtrl+\xD1", ID_FILE_SAVE
+ MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8\tCtrl+S", ID_FILE_SAVE
POPUP "\xC7\xE0\xEF\xE8\xF8\xE8 &\xEB\xFF\xE2\xE0\xF2\xE0 \xF7\xE0\xF1\xF2"
BEGIN
MENUITEM "&\xC7\xE0\xEF\xE8\xF8\xE8", ID_FILE_SAVE_LEFT
@@ -340,7 +340,7 @@
MENUITEM "\xCE&\xF2 \xEB\xFF\xE2\xEE \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5", ID_FILE_LEFT_READONLY
MENUITEM "\xCE\xF2 \xE4\xFF\xF1&\xED\xEE \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&\xD4\xEE\xF0\xEC\xE0\xF2 \xE7\xE0"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -353,18 +353,18 @@
END
POPUP "&\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xED\xE5"
BEGIN
- MENUITEM "&\xCF\xF0\xE5\xE4\xE8\xF8\xED\xEE\tCtrl+\xCF", ID_EDIT_UNDO
- MENUITEM "\xC2\xFA&\xF0\xED\xE8\tCtrl+\xD0", ID_EDIT_REDO
+ MENUITEM "&\xCE\xF2\xEC\xE5\xED\xE8\tCtrl+Z", ID_EDIT_UNDO
+ MENUITEM "\xC2\xFA&\xF0\xED\xE8\tCtrl+Y", ID_EDIT_REDO
MENUITEM SEPARATOR
- MENUITEM "&\xC8\xE7\xF0\xE5\xE6\xE8\tCtrl+\xC6", ID_EDIT_CUT
- MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9\tCtrl+\xCE", ID_EDIT_COPY
- MENUITEM "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8\tCtrl+\xD1", ID_EDIT_PASTE
+ MENUITEM "&\xC8\xE7\xF0\xE5\xE6\xE8\tCtrl+X", ID_EDIT_CUT
+ MENUITEM "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9\tCtrl+C", ID_EDIT_COPY
+ MENUITEM "\xCF\xEE&\xF1\xF2\xE0\xE2\xE8\tCtrl+V", ID_EDIT_PASTE
MENUITEM SEPARATOR
MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5\tF4", ID_SELECTLINEDIFF
- MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+\xC2", ID_EDIT_SELECT_ALL
+ MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xE2\xF1\xE8\xF7\xEA\xEE\tCtrl+A", ID_EDIT_SELECT_ALL
MENUITEM SEPARATOR
- MENUITEM "\xCD&\xE0\xEC\xE5\xF0\xE8...\tCtrl+\xC0", ID_EDIT_FIND
- MENUITEM "\xC7\xE0\xEC\xE5\xF1&\xF2\xE8...\tCtrl+\xD2", ID_EDIT_REPLACE
+ MENUITEM "\xCD&\xE0\xEC\xE5\xF0\xE8...\tCtrl+F", ID_EDIT_FIND
+ MENUITEM "\xC7\xE0\xEC\xE5\xF1&\xF2\xE8...\tCtrl+H", ID_EDIT_REPLACE
MENUITEM SEPARATOR
POPUP "&\xD1\xEA\xF0\xE8\xEF\xF2\xEE\xE2\xE5"
BEGIN
@@ -389,7 +389,7 @@
MENUITEM SEPARATOR
MENUITEM "&\xCE\xE1\xED\xEE\xE2\xE8\tF5", ID_REFRESH
END
- POPUP "&\xCF\xF0\xE5\xE4\xF1\xF2\xE0\xE2\xFF\xED\xE5"
+ POPUP "&\xC8\xE7\xE3\xEB\xE5\xE4"
BEGIN
MENUITEM "\xC8\xE7\xE1\xE5\xF0\xE8 &\xF8\xF0\xE8\xF4\xF2...", ID_VIEW_SELECTFONT
MENUITEM "\xC8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9 &\xF8\xF0\xE8\xF4\xF2 \xEF\xEE \xEF\xEE\xE4\xF0\xE0\xE7\xE1\xE8\xF0\xE0\xED\xE5", ID_VIEW_USEDEFAULTFONT
@@ -397,11 +397,11 @@
MENUITEM "&\xCF\xEE\xEA\xE0\xE6\xE8 \xEF\xF0\xE0\xE7\xED\xE8\xF2\xE5 \xEC\xE5\xF1\xF2\xE0", ID_VIEW_WHITESPACE
MENUITEM "\xCF\xEE\xEA\xE0\xE6\xE8 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5", ID_VIEW_LINEDIFFS
MENUITEM "\xCF\xEE\xEA\xE0\xE6\xE8 \xED\xEE\xEC\xE5\xF0\xE0 \xED\xE0 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5", ID_VIEW_LINENUMBERS
- MENUITEM "\xCE\xF2\xF0\xE5\xE6\xE8 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5", ID_VIEW_WORDWRAP
+ MENUITEM "\xCE\xF2\xF0\xE5\xE6\xE8 \xE4\xFA\xEB\xE3\xE8\xF2\xE5 \xF0\xE5\xE4\xEE\xE2\xE5", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "\xD0\xE0\xE7\xEC\xE5\xED\xE8 \xEB\xE8\xF1\xF2\xEE\xE2\xE5\xF2\xE5", ID_VIEW_SWAPPANES
MENUITEM SEPARATOR
- MENUITEM "&\xC8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR
+ MENUITEM "\xCB\xE5\xED\xF2\xE0 \xF1 &\xE8\xED\xF1\xF2\xF0\xF3\xEC\xE5\xED\xF2\xE8", ID_VIEW_TOOLBAR
MENUITEM "&\xCB\xE5\xED\xF2\xE0 \xED\xE0 \xF1\xFA\xF1\xF2\xEE\xFF\xED\xE8\xE5\xF2\xEE", ID_VIEW_STATUS_BAR
MENUITEM "\xCB\xE8\xF1\xF2 \xF1 &\xF0\xE0\xE7\xEB\xE8\xF7\xE8\xFF\xF2\xE0", ID_VIEW_DETAIL_BAR
MENUITEM "\xCD\xE0\xE2\xE8\xE3\xE0\xF2\xEE\xF0", ID_VIEW_LOCATION_BAR
@@ -458,7 +458,7 @@
MENUITEM SEPARATOR
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xF5\xEE\xF0\xE8\xE7\xEE\xED\xF2\xE0\xEB\xED\xEE", ID_WINDOW_TILE_HORZ
MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xE2\xE5\xF0\xF2\xE8\xEA\xE0\xEB\xED\xEE", ID_WINDOW_TILE_VERT
- MENUITEM "&\xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
+ MENUITEM "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 &\xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE", ID_WINDOW_CASCADE
END
POPUP "&\xCF\xEE\xEC\xEE\xF9"
BEGIN
@@ -505,13 +505,13 @@
BEGIN
MENUITEM "\xF1 &\xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE8\xF0\xE0\xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0", ID_DIR_OPEN_LEFT
MENUITEM "\xF1 &\xE2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0", ID_DIR_OPEN_LEFT_WITHEDITOR
- MENUITEM "&\xF1...", ID_DIR_OPEN_LEFT_WITH
+ MENUITEM "&\xF1\xFA\xF1...", ID_DIR_OPEN_LEFT_WITH
END
POPUP "\xCE&\xF2\xE2\xEE\xF0\xE8 \xE2 \xE4\xFF\xF1\xED\xEE"
BEGIN
MENUITEM "\xF1 &\xF0\xE5\xE3\xE8\xF1\xF2\xF0\xE8\xF0\xE0\xED\xE0 \xEF\xF0\xEE\xE3\xF0\xE0\xEC\xE0", ID_DIR_OPEN_RIGHT
MENUITEM "\xF1 &\xE2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0", ID_DIR_OPEN_RIGHT_WITHEDITOR
- MENUITEM "&\xF1...", ID_DIR_OPEN_RIGHT_WITH
+ MENUITEM "&\xF1\xFA\xF1...", ID_DIR_OPEN_RIGHT_WITH
END
MENUITEM SEPARATOR
POPUP "\xCA\xEE\xEF\xE8\xF0\xE0\xE9 &\xEF\xFA\xF2\xFF"
@@ -577,23 +577,22 @@
IDR_MAINFRAME ACCELERATORS
BEGIN
- "\xC2", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
- "\xCE", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
- "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL,
- NOINVERT
- "\xC0", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
+ "A", ID_EDIT_SELECT_ALL, VIRTKEY, CONTROL, NOINVERT
+ "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
+ "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT
+ "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT
- "\xD2", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
+ "H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
"J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT
"N", ID_FILE_NEW, VIRTKEY, CONTROL, NOINVERT
"O", ID_FILE_OPEN, VIRTKEY, CONTROL, NOINVERT
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
"S", ID_FILE_SAVE, VIRTKEY, CONTROL, NOINVERT
- "\xD1", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
+ "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
"W", ID_FILE_CLOSE, VIRTKEY, CONTROL, NOINVERT
- "\xC6", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
- "\xD0", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
- "\xCF", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
+ "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
+ "Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
+ "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
"Z", ID_EDIT_REDO, VIRTKEY, SHIFT, CONTROL, NOINVERT
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
@@ -639,7 +638,7 @@
LTEXT "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
LTEXT "\xC2\xE5\xF0\xF1\xE8\xFF 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX
LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
- LTEXT "\xC2\xF1\xE8\xF7\xEA\xE8 \xEF\xF0\xE0\xE2\xE0 \xE7\xE0\xEF\xE0\xF1\xE5\xED\xE8.",IDC_STATIC,7,60,170,8
+ LTEXT "\xC2\xF1\xE8\xF7\xEA\xE8 \xEF\xF0\xE0\xE2\xE0 \xE7\xE0\xEF\xE0\xE7\xE5\xED\xE8.",IDC_STATIC,7,60,170,8
LTEXT "\xCF\xEE\xF1\xE5\xF2\xE8 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xE0\xF2\xE0 \xED\xE0 WinMerge!",IDC_WWW,7,79,209,8
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1
LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
@@ -726,7 +725,7 @@
CAPTION "\xCE\xF1\xED\xEE\xE2\xED\xE8"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&\xD0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xEA\xEE\xEF\xE8\xE5 \xED\xE0 \xEF\xFA\xF0\xE2\xE8\xFF \xF4\xE0\xE9\xEB",IDC_BACKUP_CHECK,"Button",
+ CONTROL "&\xD0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xEA\xEE\xEF\xE8\xE5 \xED\xE0 \xEE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE8\xFF \xF4\xE0\xE9\xEB",IDC_BACKUP_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10
CONTROL "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xED\xEE &\xEF\xF0\xE8\xE4\xE2\xE8\xE6\xE2\xE0\xED\xE5 \xEA\xFA\xEC \xEF\xFA\xF0\xE2\xE0\xF2\xE0 \xF0\xE0\xE7\xEB\xE8\xEA\xE0",
IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
@@ -765,7 +764,7 @@
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,115,123,52,14
LISTBOX IDC_LANGUAGE_LIST,5,16,200,99,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL | WS_TABSTOP | LBS_SORT
- LTEXT "\xC2\xFA\xE7\xEC\xEE\xE6\xED\xE8 \xE5\xE7\xE8\xF6\xE8:",IDC_STATIC,7,7,140,8
+ LTEXT "\xCD\xE0\xEB\xE8\xF7\xED\xE8 \xE5\xE7\xE8\xF6\xE8:",IDC_STATIC,7,7,140,8
END
IDD_EDIT_FIND DIALOGEX 30, 73, 283, 74
@@ -779,7 +778,7 @@
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xF1\xE0\xEC\xEE \xF6\xE5\xEB\xE8 \xE4\xF3\xEC\xE8",IDC_EDIT_WHOLE_WORD,"Button",
BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10
- CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xE2 \xE4\xF3\xEC\xE8\xF2\xE5",IDC_EDIT_MATCH_CASE,"Button",
+ CONTROL "\xC3\xEB\xE0\xE2\xED\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_EDIT_MATCH_CASE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 &\xE8\xE7\xF0\xE0\xE7\xE8",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
@@ -808,7 +807,7 @@
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xF1\xE0\xEC\xEE \xF6\xE5\xEB\xE8 \xE4\xF3\xEC\xE8",IDC_EDIT_WHOLE_WORD,"Button",
BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10
- CONTROL "\xD2\xFA\xF0\xF1\xE8 &\xE2 \xE4\xF3\xEC\xE8\xF2\xE5",IDC_EDIT_MATCH_CASE,"Button",
+ CONTROL "\xC3\xEB\xE0\xE2\xED\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_EDIT_MATCH_CASE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
CONTROL "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 &\xE8\xE7\xF0\xE0\xE7\xE8",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
@@ -822,7 +821,7 @@
DEFPUSHBUTTON "&\xCD\xE0\xEC\xE5\xF0\xE8",IDC_EDIT_SKIP,247,7,50,14,WS_GROUP
PUSHBUTTON "&\xC7\xE0\xEC\xE5\xED\xE8",IDC_EDIT_REPLACE,247,24,50,14
PUSHBUTTON "\xC7\xE0\xEC. &\xE2\xF1\xE8\xF7\xEA\xEE",IDC_EDIT_REPLACE_ALL,247,41,50,14
- PUSHBUTTON "\xCF\xF0\xE5\xEA\xF0\xE0\xF2\xE8",IDCANCEL,247,58,50,14
+ PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,247,58,50,14
END
IDD_CLEARCASE DIALOGEX 0, 0, 279, 134
@@ -832,7 +831,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "\xC4\xE5\xE9\xF1\xF2\xE2\xE0\xE9",IDOK,169,115,50,14
- PUSHBUTTON "\xCF\xF0\xE5\xEA\xF0\xE0\xF2\xE8",IDCANCEL,223,115,50,14
+ PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,223,115,50,14
PUSHBUTTON "\xC7\xE0\xEF\xE8\xF8\xE8 \xEA\xE0\xF2\xEE...",IDC_SAVE_AS,169,115,50,14,NOT WS_VISIBLE
EDITTEXT IDC_COMMENTS,18,21,243,56,ES_MULTILINE | ES_AUTOVSCROLL |
ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
@@ -848,10 +847,10 @@
CAPTION "\xD4\xE8\xEB\xF2\xF0\xE8 \xE7\xE0 \xF0\xE5\xE4"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEB\xE8\xED\xE8\xE8\xF2\xE5 \xF1\xFA\xE4\xFA\xF0\xE6\xE0\xF9\xE8 \xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE",
+ CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xF0\xE5\xE4\xEE\xE2\xE5\xF2\xE5 \xF1\xFA\xE4\xFA\xF0\xE6\xE0\xF9\xE8 \xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE",
IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
7,221,15
- LTEXT "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8\xF2\xE5 \xE8\xE7\xF0\xE0\xE7\xE8 (\xEF\xEE \xE5\xE4\xE8\xED \xED\xE0 \xEB\xE8\xED\xE8\xFF):",IDC_STATIC,7,28,
+ LTEXT "\xCF\xF0\xE0\xE2\xE8\xEB\xED\xE8 \xE8\xE7\xF0\xE0\xE7\xE8 (\xEF\xEE \xE5\xE4\xE8\xED \xED\xE0 \xF0\xE5\xE4):",IDC_STATIC,7,28,
221,8
EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE |
ES_AUTOHSCROLL | ES_WANTRETURN
@@ -866,7 +865,7 @@
CONTROL "Dif",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,29,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "\xC8\xE7\xE1\xE5\xF0\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8\xF2\xE5:",IDC_STATIC,7,49,90,8
+ RTEXT "\xC8\xE7\xE1\xF0\xE0\xED\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8:",IDC_STATIC,7,49,90,8
CONTROL "Dif",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -922,7 +921,7 @@
CONTROL "Dif",IDC_WORDDIFFERENCE_TEXT_COLOR,"Button",
BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- RTEXT "\xD0\xE0\xE7\xEB\xE8\xEA\xE8 \xE2 \xE8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xE4\xF3\xEC\xE8:",IDC_STATIC,7,149,90,8
+ RTEXT "\xC2 \xE8\xE7\xE1\xF0\xE0\xED\xE8\xF2\xE5 \xE4\xF3\xEC\xE8:",IDC_STATIC,7,149,90,8
CONTROL "Dif",IDC_SEL_WORDDIFFERENCE_COLOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
@@ -953,12 +952,12 @@
CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xE2\xF0\xE5\xEC\xE5\xE2\xE8\xF2\xE5 \xF0\xE0\xE7\xEB\xE8\xEA\xE8 \xEF\xEE-\xEC\xE0\xEB\xEA\xE8 \xEE\xF2 3 \xF1\xE5\xEA\xF3\xED\xE4\xE8",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "\xC8\xED\xF2\xE5\xE3\xF0\xE0\xF6\xE8\xFF",IDC_STATIC,7,30,218,46
CONTROL "&\xC4\xEE\xE1\xE0\xE2\xE8 \xEA\xFA\xEC \xEC\xE5\xED\xFE\xF2\xEE \xED\xE0 \xC5\xEA\xF1\xEF\xEB\xEE\xF0\xE5\xF0\xE0",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "\xCF\xEE\xE7\xE2\xEE\xEB\xE8 &\xE4\xEE\xEF\xFA\xEB\xED\xE8\xF2\xE5\xEB\xED\xEE \xEC\xE5\xED\xFE",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEF\xEE\xE4\xEF\xE0\xEF\xEA\xE8\xF2\xE5",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&\xC2\xFA\xED\xF8\xE5\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -985,7 +984,7 @@
PUSHBUTTON "&\xD0\xE0\xE7\xEC\xE5\xED\xE8",IDC_DIFF_SWAPFILES,283,41,50,14
CONTROL "&\xCF\xF0\xE8\xEB\xEE\xE6\xE8 \xEA\xFA\xEC \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9 \xF4\xE0\xE9\xEB",IDC_DIFF_APPENDFILE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10
- LTEXT "&\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2\xE8:",IDC_STATIC,7,66,37,8
+ LTEXT "&\xD0\xE5\xE7\xF3\xEB\xF2\xE0\xF2:",IDC_STATIC,7,66,37,8
COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "\xCF\xEE&\xF2\xFA\xF0\xF1\xE8...",IDC_DIFF_BROWSE_RESULT,283,63,50,14
@@ -1007,9 +1006,9 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,142,10
CONTROL "\xC3\xEE\xEB\xE5\xEC\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_DIFF_CASESENSITIVE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10
- CONTROL "\xCE\xE1\xF5\xE2\xE0&\xF9\xE0\xE9 \xEA\xEE\xEC\xE0\xED\xE4\xED\xE8\xFF \xF0\xE5\xE4",IDC_DIFF_INCLCMDLINE,"Button",
+ CONTROL "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xE5\xEB\xED\xEE \xEA\xEE\xEC\xE0\xED\xE4\xED\xE8\xFF \xF0\xE5\xE4",IDC_DIFF_INCLCMDLINE,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10
- CONTROL "\xCE\xF2\xE2\xEE\xF0\xE8 \xF1 \xE2\xFA\xED\xF8&\xED\xE8\xFF \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0",IDC_DIFF_OPENTOEDITOR,"Button",
+ CONTROL "\xCE\xF2\xE2\xEE\xF0\xE8 \xF1 \xE2\xFA\xED\xF8\xE5&\xED \xF0\xE5\xE4\xE0\xEA\xF2\xEE\xF0",IDC_DIFF_OPENTOEDITOR,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10
PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_DIFF_DEFAULTS,7,159,50,14
DEFPUSHBUTTON "\xCE\xCA",IDOK,230,159,50,14
@@ -1102,12 +1101,12 @@
WS_GROUP,13,38,48,10
CONTROL "&\xC4\xFF\xF1\xED\xEE",IDC_WMGOTO_FILERIGHT,"Button",
BS_AUTORADIOBUTTON,13,48,47,10
- GROUPBOX "\xCE\xF2\xE8\xE4\xE8 \xED\xE0",IDC_STATIC,69,27,78,35
+ GROUPBOX "\xCE\xF2\xE8\xE4\xE8 \xED\xE0:",IDC_STATIC,69,27,78,35
CONTROL "\xD0\xE5&\xE4",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,76,38,68,10
CONTROL "&\xD0\xE0\xE7\xEB\xE8\xEA\xE0",IDC_WMGOTO_TODIFF,"Button",
BS_AUTORADIOBUTTON,76,48,68,10
- DEFPUSHBUTTON "&\xCE\xF2\xE8\xE4\xE8 \xED\xE0",IDOK,153,7,50,14
+ DEFPUSHBUTTON "&\xCE\xF2\xE8\xE4\xE8",IDOK,153,7,50,14
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,153,24,50,14
END
@@ -1116,7 +1115,7 @@
CAPTION "\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "\xCF\xF0\xE0\xE7\xED\xE8\xF2\xE5 \xEC\xE5\xF1\xF2\xE0",IDC_STATIC,7,7,221,50
+ GROUPBOX "\xCF\xF0\xE0\xE7\xED\xE8 \xEC\xE5\xF1\xF2\xE0",IDC_STATIC,7,7,221,50
CONTROL "&\xD1\xF0\xE0\xE2\xED\xFF\xE2\xE0\xED\xE5",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON |
WS_GROUP,14,19,206,10
CONTROL "&\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5",IDC_WHITE_CHANGE,"Button",
@@ -1125,7 +1124,7 @@
14,41,206,10
CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 \xEF\xF0\xE0&\xE7\xED\xE8\xF2\xE5 \xEB\xE8\xED\xE8\xE8",IDC_IGNBLANKS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10
- CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 &\xF7\xE0\xF1\xF2\xE8\xF2\xE5 \xEE\xF2 \xE4\xF3\xEC\xE8\xF2\xE5",IDC_IGNCASE_CHECK,"Button",
+ CONTROL "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xE9 &\xC3\xEE\xEB\xE5\xEC\xE8/\xEC\xE0\xEB\xEA\xE8 \xE1\xF3\xEA\xE2\xE8",IDC_IGNCASE_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10
CONTROL "Igno&re carriage return differences (DOS/UNIX/MAC)",
IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -1154,11 +1153,11 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,17,215,10
CONTROL "&\xC7\xE0\xEF\xE0\xE7\xE8 \xEE\xF0\xE8\xE3\xE8\xED\xE0\xEB\xED\xE8\xF2\xE5 EOL \xE2\xE8\xF4\xFA\xF0",IDC_MIXED_EOL,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,27,215,10
- GROUPBOX "\xC5\xF2\xE8\xEA\xE5\xF2",IDC_STATIC,7,44,221,33,WS_GROUP
- LTEXT "&\xC3\xEE\xEB\xE5\xEC\xE8\xED\xE0 \xED\xE0 \xE5\xF2\xE8\xEA\xE5\xF2\xE0:",IDC_STATIC,14,58,42,8
+ GROUPBOX "\xD2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF",IDC_STATIC,7,44,221,33,WS_GROUP
+ LTEXT "&\xC3\xEE\xEB\xE5\xEC\xE8\xED\xE0 \xED\xE0 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF\xF2\xE0:",IDC_STATIC,14,58,42,8
EDITTEXT IDC_TAB_EDIT,60,56,18,12,ES_AUTOHSCROLL | ES_NUMBER,
WS_EX_RIGHT
- CONTROL "&\xD1\xEB\xEE\xE6\xE8 \xE5\xF2\xE8\xEA\xE5\xF2",IDC_PROP_INSERT_TABS,"Button",
+ CONTROL "&\xD1\xEB\xEE\xE6\xE8 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF",IDC_PROP_INSERT_TABS,"Button",
BS_AUTORADIOBUTTON | WS_GROUP,85,53,137,10
CONTROL "\xD1\xEB\xEE\xE6\xE8 &\xF0\xE0\xE7\xF1\xF2\xEE\xFF\xED\xE8\xFF",IDC_PROP_INSERT_SPACES,"Button",
BS_AUTORADIOBUTTON,85,62,137,10
@@ -1190,7 +1189,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "\xD2\xE5\xF1\xF2\xE2\xE0\xE9",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "\xC8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xE9...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "\xCD\xEE\xE2...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "\xD0\xE5\xE4\xE0\xEA\xF2\xE8\xF0\xE0\xE9...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "\xC8\xE7\xF2\xF0\xE8\xE9...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1331,42 +1330,42 @@
CONTROL "Button1",IDC_SCOLOR_FUNCTIONS,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,39,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_FUNCTIONS_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,40,55,10
CONTROL "Button1",IDC_SCOLOR_COMMENTS,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,59,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_COMMENTS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,60,55,10
CONTROL "Button1",IDC_SCOLOR_NUMBERS,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,79,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_NUMBERS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,80,55,10
CONTROL "Button1",IDC_SCOLOR_OPERATORS,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,99,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_OPERATORS_BOLD,"Button",
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_OPERATORS_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,100,55,10
CONTROL "Button1",IDC_SCOLOR_STRINGS,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,119,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_STRINGS_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,120,55,10
CONTROL "Button1",IDC_SCOLOR_PREPROCESSOR,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,139,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_PREPROCESSOR_BOLD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,110,140,55,10
CONTROL "Button1",IDC_SCOLOR_USER1,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,159,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_USER1_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,160,55,10
CONTROL "Button1",IDC_SCOLOR_USER2,"Button",BS_OWNERDRAW |
WS_TABSTOP,83,179,17,14,WS_EX_TRANSPARENT |
WS_EX_CLIENTEDGE
- CONTROL "Bold",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX |
+ CONTROL "\xD3\xE4\xE5\xE1\xE5\xEB\xE5\xED",IDC_SCOLOR_USER2_BOLD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,110,180,55,10
PUSHBUTTON "\xC2\xFA\xE7\xF1\xF2\xE0\xED\xEE\xE2\xE8",IDC_SCOLORS_BDEFAULTS,182,179,50,14
END
@@ -1384,7 +1383,7 @@
LTEXT "&\xD1\xF2\xE8\xEB:",IDC_STATIC,7,37,35,8
COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "&\xCA\xEE\xEF\xE8\xF0\xE0\xE9 \xE2 \xEA\xEB\xE8\xEF\xE1\xEE\xF0\xE4\xE0",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "OK",IDOK,157,60,50,14
PUSHBUTTON "\xCE\xF2\xEC\xE5\xED\xE8",IDCANCEL,211,60,50,14
@@ -1592,7 +1591,7 @@
BEGIN
BLOCK "040204e3"
BEGIN
- VALUE "\xCA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8", "Translated by Tigertron\0"
+ VALUE "\xCA\xEE\xEC\xE5\xED\xF2\xE0\xF0\xE8", "Translated by sld & Tigertron\0"
VALUE "\xC8\xEC\xE5 \xED\xE0 \xEA\xEE\xEC\xEF\xE0\xED\xE8\xFF\xF2\xE0", "\0"
VALUE "\xCE\xEF\xE8\xF1\xE0\xED\xE8\xE5", "WinMerge Bulgarian resources\0"
VALUE "\xC2\xE5\xF0\xF1\xE8\xFF", "000.000.000.000\0"
@@ -1607,7 +1606,7 @@
END
BLOCK "040904e4"
BEGIN
- VALUE "Comments", "Translated by Tigertron\0"
+ VALUE "Comments", "Translated by sld & Tigertron\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "WinMerge Bulgarian resources\0"
VALUE "FileVersion", "000.000.000.000\0"
@@ -1810,7 +1809,7 @@
BEGIN
ID_WINDOW_NEW "\xCE\xF2\xE2\xE0\xF0\xFF\xED\xE5 \xED\xE0 \xE4\xF0\xF3\xE3 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6 \xE7\xE0 \xF2\xE5\xEA\xF3\xF9\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\n\xCD\xEE\xE2 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6"
ID_WINDOW_ARRANGE "\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xE8\xEA\xEE\xED\xEA\xE8\xF2\xE5 \xE2 \xEE\xF1\xED\xEE\xE2\xE0\xF2\xE0 \xED\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0\n\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xE8\xEA\xEE\xED\xE8\xF2\xE5"
- ID_WINDOW_CASCADE "\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE\n\xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE"
+ ID_WINDOW_CASCADE "\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xEA\xE0\xF1\xEA\xE0\xE4\xED\xEE\n\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xCA\xE0\xF1\xEA\xE0\xE4\xED\xEE"
ID_WINDOW_TILE_HORZ "\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
ID_WINDOW_TILE_VERT "\xCF\xEE\xE4\xF0\xE5\xE6\xE4\xE0 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5 \xE1\xE5\xE7 \xE4\xE0 \xF1\xE5 \xEF\xEE\xEA\xF0\xE8\xE2\xE0\xF2\n\xCF\xEE\xE4\xF0\xE5\xE4\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8\xF2\xE5"
ID_WINDOW_SPLIT "\xD0\xE0\xE7\xE4\xE5\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE8\xFF \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\n\xD0\xE0\xE7\xE4\xE5\xEB\xE8"
@@ -1822,7 +1821,7 @@
ID_EDIT_CLEAR "\xC8\xE7\xF2\xF0\xE8\xE2\xE0 \xE8\xE7\xE1\xF0\xE0\xED\xEE\xF2\xEE\n\xC8\xE7\xF2\xF0\xE8\xE9"
ID_EDIT_CLEAR_ALL "\xC8\xE7\xF2\xF0\xE8\xE2\xE0 \xE2\xF1\xE8\xF7\xEA\xEE\n\xC8\xE7\xF2\xF0\xE8\xE9 \xE2\xF1\xE8\xF7\xEA\xEE"
ID_EDIT_COPY "\xCA\xEE\xEF\xE8\xF0\xE0 \xE8\xE7\xE1\xF0\xE0\xED\xEE\xF2\xEE \xE8 \xE3\xEE \xF1\xEB\xE0\xE3\xE0 \xE2 Clipboard\n\xCA\xEE\xEF\xE8\xF0\xE0\xE9"
- ID_EDIT_CUT "\xD0\xE5\xE6\xE8 \xE8\xE7\xE1\xF0\xE0\xED\xEE\xF2\xEE \xE8 \xE3\xEE \xF1\xEB\xE0\xE3\xE0 \xE2 Clipboard\n\xE8\xE7\xF0\xE5\xE6\xE8"
+ ID_EDIT_CUT "\xD0\xE5\xE6\xE8 \xE8\xE7\xE1\xF0\xE0\xED\xEE\xF2\xEE \xE8 \xE3\xEE \xF1\xEB\xE0\xE3\xE0 \xE2 Clipboard\n\xC8\xE7\xF0\xE5\xE6\xE8"
ID_EDIT_FIND "\xD2\xFA\xF0\xF1\xE8 \xEE\xEF\xF0\xE5\xE4\xE5\xEB\xE5\xED \xF2\xE5\xEA\xF1\xF2\n\xD2\xFA\xF0\xF1\xE8"
ID_EDIT_PASTE "\xD1\xEB\xEE\xE6\xE8 \xF1\xFA\xE4\xFA\xF0\xE6\xE0\xED\xE8\xE5\xF2\xEE \xED\xE0 Clipboard\n\xCF\xEE\xF1\xF2\xE0\xE2\xE8"
ID_EDIT_REPEAT "\xCF\xEE\xE2\xF2\xEE\xF0\xE8 \xEF\xEE\xF1\xEB\xE5\xE4\xED\xEE\xF2\xEE \xE4\xE5\xE9\xF1\xF2\xE2\xE8\xE5\n\xCF\xEE\xE2\xF2\xEE\xF0\xE8"
@@ -1848,7 +1847,7 @@
AFX_IDS_SCMAXIMIZE "\xD3\xE2\xE5\xEB\xE8\xF7\xE8 \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \xE4\xEE \xEF\xFA\xEB\xED\xE8\xF2\xE5 \xEC\xF3 \xF0\xE0\xE7\xEC\xE5\xF0\xE8"
AFX_IDS_SCNEXTWINDOW "\xCF\xF0\xE5\xF5\xE2\xFA\xF0\xEB\xE8 \xED\xE0 \xF1\xEB\xE5\xE4\xE2\xE0\xF9\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2"
AFX_IDS_SCPREVWINDOW "\xCF\xF0\xE5\xF5\xE2\xFA\xF0\xEB\xE8 \xED\xE0 \xEF\xF0\xE5\xE4\xE8\xF8\xED\xE8\xFF \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2"
- AFX_IDS_SCCLOSE "\xC7\xE0\xF2\xE2\xE0\xF0\xFF \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0; \xEF\xE8\xF2\xE0 \xE4\xE0\xEB\xE8 \xE4\xE0 \xE7\xE0\xEF\xE8\xF8\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE8\xF2\xE5"
+ AFX_IDS_SCCLOSE "\xC7\xE0\xF2\xE2\xE0\xF0\xFF \xEF\xF0\xEE\xE7\xEE\xF0\xE5\xF6\xE0 \xE8 \xEF\xE8\xF2\xE0 \xE4\xE0\xEB\xE8 \xE4\xE0 \xE7\xE0\xEF\xE8\xF8\xE5 \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2\xE8\xF2\xE5"
END
STRINGTABLE
@@ -1982,7 +1981,7 @@
IDS_DIFF_OPEN_NO_SET_PROPS "\xCF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xF1\xE5 \xEF\xF0\xE0\xE2\xFF\xF2 \xED\xE0 \xF4\xE0\xE9\xEB\xEE\xE2\xE5\xF2\xE5 \xEE\xF2 \xF2\xE5\xEA\xF3\xF9\xE8\xE0\xF2\xE0 \xF1\xE5\xF1\xE8\xFF \xED\xE0 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5. \xCD\xFF\xEA\xEE\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8 \xF9\xE5 \xF1\xF2\xE0\xED\xE0\xF2 \xE4\xEE\xEA\xE0\xF2\xEE \xF1\xE5 \xF0\xE5\xF1\xF2\xE0\xF0\xF2\xE8\xF0\xE0 \xF2\xE5\xEA\xF3\xF9\xE0\xF2\xE0 \xF1\xE5\xF1\xE8\xFF."
IDS_FONT_CHANGE "\xC8\xE7\xE1\xF0\xE0\xED\xE8\xFF \xF8\xF0\xE8\xF4\xF2 \xED\xFF\xEC\xE0 \xE4\xE0 \xEE\xEA\xE0\xE7\xE2\xE0 \xE2\xEB\xE8\xFF\xED\xE8\xE5 \xED\xE0 \xED\xE8\xEA\xEE\xE8 \xEE\xF2 \xF2\xE5\xEA\xF3\xF9\xE8\xF2\xE5 \xEF\xF0\xEE\xE7\xEE\xF0\xF6\xE8."
IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ "\xD1\xF2\xEE\xE9\xED\xEE\xF1\xF2\xF2\xE0 \xED\xE0 \xF2\xE0\xE1\xF3\xEB\xE0\xF6\xE8\xFF\xF2\xE0 \xED\xE5 \xE5 \xE2 \xE3\xF0\xE0\xED\xE8\xF6\xE8\xF2\xE5, \xEA\xEE\xE8\xF2\xEE WinMerge \xEF\xF0\xE8\xE5\xEC\xE0.\n\n\xCC\xEE\xEB\xFF, \xE8\xE7\xEF\xEE\xEB\xE7\xE2\xE0\xE9\xF2\xE5 \xF1\xF2\xEE\xE9\xED\xEE\xF1\xF2 \xEE\xF2 1 - %1."
END
// BROWSE FILE
@@ -2008,10 +2007,10 @@
STRINGTABLE
BEGIN
IDS_COMPMETHOD_FULL_CONTENTS "\xD6\xFF\xEB\xEE\xF2\xEE \xF1\xFA\xE4\xFA\xF0\xE6\xE0\xED\xE8\xE5"
- IDS_COMPMETHOD_QUICK_CONTENTS "\xC1\xFA\xF0\xE7\xEE \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5"
+ IDS_COMPMETHOD_QUICK_CONTENTS "\xC1\xFA\xF0\xE7 \xE4\xEE\xF1\xF2\xFA\xEF"
IDS_COMPMETHOD_MODDATE "\xCF\xF0\xEE\xEC\xE5\xED\xE5\xED\xE0 \xE4\xE0\xF2\xE0"
- IDS_COMPMETHOD_DATESIZE "\xCF\xF0\xEE\xEC\xE5\xED\xE5\xED\xE0 \xE4\xE0\xF2\xE0 \xE8 \xF0\xE0\xE7\xEC\xE5\xF0"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_DATESIZE "\xCF\xF0\xEE\xEC\xE5\xED\xE5\xED\xE8 \xE4\xE0\xF2\xE0 \xE8 \xF0\xE0\xE7\xEC\xE5\xF0"
+ IDS_COMPMETHOD_SIZE "\xD0\xE0\xE7\xEC\xE5\xF0"
END
// FILTER OPTIONS
@@ -2032,11 +2031,11 @@
"\xCD\xE5 \xE5 \xE7\xE0\xE4\xE0\xE4\xE5\xED\xE0 \xEF\xE0\xEF\xEA\xE0 \xE7\xE0 \xEF\xEE\xF2\xF0\xE5\xE1\xE8\xF2\xE5\xEB\xF1\xEA\xE8 \xF8\xE0\xE1\xEB\xEE\xED\xE8!\n\n\xCC\xEE\xEB\xFF, \xE8\xE7\xE1\xE5\xF0\xE5\xF2\xE5 \xEF\xE0\xEF\xEA\xE0 \xE7\xE0 \xF4\xE8\xEB\xF2\xF0\xE8 \xE2 \xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8/\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE8."
IDS_FILEFILTER_DELETE_FAIL
"\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xE8\xE7\xF2\xF0\xE8\xE5 \xF4\xE8\xEB\xF2\xFA\xF0\xED\xE8\xFF\xF2 \xF4\xE0\xE9\xEB:\n%1\n\n\xCC\xEE\xE6\xE5 \xE1\xE8 \xF4\xE0\xE9\xEB\xFA\xF2 \xE5 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ IDS_FILEFILTER_INSTALL "\xC7\xE0\xE4\xE0\xE9\xF2\xE5 \xF4\xE8\xEB\xF2\xFA\xF0\xE5\xED \xF4\xE0\xE9\xEB \xE7\xE0 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xE5"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "\xC3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xE5\xF2\xEE \xED\xE0 \xF4\xE8\xEB\xF2\xFA\xF0\xED\xE8\xFF \xF4\xE0\xE9\xEB.\n\n\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xEA\xEE\xEF\xE8\xF0\xE0 \xED\xEE\xE2\xE8\xFF\xF2 \xF4\xE0\xE9\xEB \xE2 \xEF\xE0\xEF\xEA\xE0\xF2\xE0 \xF1 \xF4\xE8\xEB\xF2\xF0\xE8."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "\xD4\xE8\xEB\xF2\xFA\xF0\xED\xE8\xFF\xF2 \xF4\xE0\xE9\xEB \xE2\xE5\xF7\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0. \xC4\xE0 \xF1\xE5 \xEF\xF0\xE5\xE7\xE0\xEF\xE8\xF8\xE5 \xEB\xE8 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xE8\xFF\xF2 \xF4\xE8\xEB\xF2\xFA\xF0?"
END
// VERSION CONTROL OPTIONS
@@ -2118,7 +2117,7 @@
STRINGTABLE
BEGIN
IDS_SAVE_AS_TITLE "\xC7\xE0\xEF\xE8\xF8\xE8 \xEA\xE0\xF2\xEE"
- IDS_SAVE_FMT "\xC7\xE0\xEF\xE0\xE7\xE2\xE0 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0 %1?"
+ IDS_SAVE_FMT "\xC7\xE0\xEF\xE8\xF8\xE8 \xEF\xF0\xEE\xEC\xE5\xED\xE8\xF2\xE5 \xED\xE0 %1?"
IDS_SAVEREADONLY_FMT "%1 \xE5 \xF1\xE0\xEC\xEE \xE7\xE0 \xF7\xE5\xF2\xE5\xED\xE5. \xC4\xE0 \xE7\xE0\xEF\xE8\xF8\xE0 \xEB\xE8 \xF4\xE0\xE9\xEB\xE0? (\xCD\xE5, \xF9\xE5 \xE3\xEE \xE7\xE0\xEF\xE8\xF8\xE0 \xF1 \xED\xEE\xE2\xEE \xE8\xEC\xE5.)"
IDS_ERROR_FILE_WRITEABLE "\xC3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xEF\xF0\xEE\xE2\xE5\xF0\xEA\xE0\xF2\xE0 \xE7\xE0 \xE7\xE0\xEF\xE8\xF1"
IDS_ERROR_BACKUP "\xC3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xF1\xFA\xE7\xE4\xE0\xE2\xE0\xED\xE5 \xED\xE0 \xF0\xE5\xE7\xE5\xF0\xE2\xED\xEE \xEA\xEE\xEF\xE8\xE5"
@@ -2261,8 +2260,8 @@
IDS_COLHDR_EXTENSION "\xD0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xE5"
IDS_COLHDR_LSIZE "\xD0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xEB\xFF\xE2\xE0\xF2\xE0 \xF7\xE0\xF1\xF2"
IDS_COLHDR_RSIZE "\xD0\xE0\xE7\xEC\xE5\xF0 \xED\xE0 \xE4\xFF\xF1\xED\xE0\xF2\xE0 \xF7\xE0\xF1\xF2"
- IDS_COLHDR_RSIZE_SHORT "\xD0\xE0\xE7\xEC\xE5\xF0 \xEE\xF2 \xEB\xFF\xE2\xEE (\xCA\xF0\xE0\xF2\xFA\xEA)"
- IDS_COLHDR_LSIZE_SHORT "\xD0\xE0\xE7\xEC\xE5\xF0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE (\xCA\xF0\xE0\xF2\xFA\xEA)"
+ IDS_COLHDR_RSIZE_SHORT "\xD0\xE0\xE7\xEC\xE5\xF0 \xEE\xF2 \xE4\xFF\xF1\xED\xEE (\xCA\xF0\xE0\xF2\xFA\xEA)"
+ IDS_COLHDR_LSIZE_SHORT "\xD0\xE0\xE7\xEC\xE5\xF0 \xEE\xF2 \xEB\xFF\xE2\xEE (\xCA\xF0\xE0\xF2\xFA\xEA)"
END
// DIRECTORY DIFFING : COLUMN TITLES #2
@@ -2285,8 +2284,8 @@
BEGIN
IDS_COLHDR_LENCODING "\xCB\xFF\xE2\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0"
IDS_COLHDR_RENCODING "\xC4\xFF\xF1\xED\xE0 \xEA\xEE\xE4\xE8\xF0\xEE\xE2\xEA\xE0"
- IDS_COLHDR_NIDIFFS "#Ignored diff."
- IDS_COLHDR_NSDIFFS "#differences"
+ IDS_COLHDR_NIDIFFS "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xE0\xED\xE8 \xF0\xE0\xE7\xEB\xE8\xEA\xE8"
+ IDS_COLHDR_NSDIFFS "\xD0\xE0\xE7\xEB\xE8\xEA\xE8"
IDS_COLHDR_BINARY "\xC4\xE2\xEE\xE8\xF7\xE5\xED"
END
@@ -2297,7 +2296,7 @@
IDS_ABORTED_ITEM "\xCF\xF0\xE5\xEA\xFA\xF1\xED\xE0\xF2 \xF4\xE0\xE9\xEB"
IDS_FILE_SKIPPED "\xCF\xF0\xEE\xEF\xF3\xF1\xED\xE0\xF2 \xF4\xE0\xE9\xEB"
IDS_DIR_SKIPPED "\xCF\xF0\xEE\xEF\xF3\xF1\xED\xE0\xF2\xE0 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF"
- IDS_ONLY_IN_FMT "\xF1\xE0\xEC\xEE \xE2 %1"
+ IDS_ONLY_IN_FMT "\xD1\xE0\xEC\xEE \xE2 %1"
IDS_BIN_FILES_SAME "\xC1\xE8\xED\xE0\xF0\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xE5\xE4\xED\xE0\xEA\xE2\xE8"
IDS_IDENTICAL "\xC5\xE4\xED\xE0\xEA\xE2\xE8"
IDS_BIN_FILES_DIFF "\xC1\xE8\xED\xE0\xF0\xED\xE8\xF2\xE5 \xF4\xE0\xE9\xEB\xEE\xE2\xE5 \xF1\xE0 \xF0\xE0\xE7\xEB\xE8\xF7\xED\xE8"
@@ -2411,7 +2410,7 @@
// EDITOR : SEARCH/REPLACE DIALOGS
STRINGTABLE
BEGIN
- IDS_NUM_REPLACED "\xC7\xE0\xEC\xE5\xED\xE5\xED \xED\xE8\xE7 %1."
+ IDS_NUM_REPLACED "\xC7\xE0\xEC\xE5\xED\xE5\xED\xE8 %1 \xED\xE8\xE7(\xE0)."
IDS_EDIT_TEXT_NOT_FOUND "\xCD\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xF1\xE5 \xED\xE0\xEC\xE5\xF0\xE8 \xED\xE8\xE7\xE0 ""%s"""
END
@@ -2432,7 +2431,7 @@
// CREATE PATCH
STRINGTABLE
BEGIN
- IDS_DIFF_SUCCEEDED "\xCF\xE0\xF7\xE0 \xE5 \xE3\xEE\xF2\xEE\xE2."
+ IDS_DIFF_SUCCEEDED "\xCF\xE0\xF7\xFA\xF2 \xE5 \xE3\xEE\xF2\xEE\xE2."
IDS_DIFF_ITEM1NOTFOUND "1. \xEE\xE1\xE5\xEA\xF2\xE0 \xED\xE5 \xE5 \xED\xE0\xEC\xE5\xF0\xE5\xED \xE8\xEB\xE8 \xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF!"
IDS_DIFF_ITEM2NOTFOUND "2. \xEE\xE1\xE5\xEA\xF2\xE0 \xED\xE5 \xE5 \xED\xE0\xEC\xE5\xF0\xE5\xED \xE8\xEB\xE8 \xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF!"
IDS_DIFF_FILEOVERWRITE "\xCF\xE0\xF7\xE0 \xE2\xE5\xF7\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0. \xD9\xE5 \xE3\xEE \xEF\xF0\xE5\xE7\xE0\xEF\xE8\xF8\xE5\xF2\xE5 \xEB\xE8?"
@@ -2494,164 +2493,164 @@
// LANGUAGE NAMES #1
STRINGTABLE
BEGIN
- IDS_AFRIKAANS "\xE0\xF4\xF0\xE8\xEA\xE0\xED\xF1\xEA\xE8"
- IDS_ALBANIAN "\xE0\xEB\xE1\xE0\xED\xF1\xEA\xE8"
- IDS_ARABIC_SAUDI "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Saudi Arabian)"
- IDS_ARABIC_IRAQ "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Iraq)"
- IDS_ARABIC_EGYPT "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Egyptian)"
- IDS_ARABIC_LIBYA "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Libyan)"
- IDS_ARABIC_ALGERIA "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Algerian)"
- IDS_ARABIC_MOROCCO "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Moroccan)"
- IDS_ARABIC_TUNISIA "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Tunisian)"
- IDS_ARABIC_OMAN "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Oman)"
- IDS_ARABIC_YEMEN "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Yemen)"
- IDS_ARABIC_SYRIA "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Syrian)"
- IDS_ARABIC_JORDAN "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Jordan)"
+ IDS_AFRIKAANS "\xC0\xF4\xF0\xE8\xEA\xE0\xED\xF1\xEA\xE8"
+ IDS_ALBANIAN "\xC0\xEB\xE1\xE0\xED\xF1\xEA\xE8"
+ IDS_ARABIC_SAUDI "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Saudi Arabian)"
+ IDS_ARABIC_IRAQ "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Iraq)"
+ IDS_ARABIC_EGYPT "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Egyptian)"
+ IDS_ARABIC_LIBYA "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Libyan)"
+ IDS_ARABIC_ALGERIA "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Algerian)"
+ IDS_ARABIC_MOROCCO "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Moroccan)"
+ IDS_ARABIC_TUNISIA "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Tunisian)"
+ IDS_ARABIC_OMAN "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Oman)"
+ IDS_ARABIC_YEMEN "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Yemen)"
+ IDS_ARABIC_SYRIA "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Syrian)"
+ IDS_ARABIC_JORDAN "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Jordan)"
END
// LANGUAGE NAMES #2
STRINGTABLE
BEGIN
- IDS_ARABIC_LEBANON "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Lebanon)"
- IDS_ARABIC_KUWAIT "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Kuwait)"
- IDS_ARABIC_UAE "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (UAE)"
- IDS_ARABIC_BAHRAIN "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Bahrain)"
- IDS_ARABIC_QATAR "\xE0\xF0\xE0\xE1\xF1\xEA\xE8 (Qatar)"
- IDS_ARMENIAN "\xE0\xF0\xEC\xE5\xED\xF1\xEA\xE8"
+ IDS_ARABIC_LEBANON "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Lebanon)"
+ IDS_ARABIC_KUWAIT "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Kuwait)"
+ IDS_ARABIC_UAE "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (UAE)"
+ IDS_ARABIC_BAHRAIN "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Bahrain)"
+ IDS_ARABIC_QATAR "\xC0\xF0\xE0\xE1\xF1\xEA\xE8 (Qatar)"
+ IDS_ARMENIAN "\xC0\xF0\xEC\xE5\xED\xF1\xEA\xE8"
IDS_AZERI_LATIN "Azeri (Latin)"
IDS_AZERI_CYRILLIC "Azeri (Cyrillic)"
- IDS_BASQUE "\xE1\xE0\xF1\xEA\xF1\xEA\xE8"
- IDS_BELARUSIAN "\xE1\xE5\xEB\xE0\xF0\xF3\xF1\xEA\xE8"
+ IDS_BASQUE "\xC1\xE0\xF1\xEA\xF1\xEA\xE8"
+ IDS_BELARUSIAN "\xC1\xE5\xEB\xE0\xF0\xF3\xF1\xEA\xE8"
IDS_BULGARIAN "\xC1\xFA\xEB\xE3\xE0\xF0\xF1\xEA\xE8"
- IDS_CATALAN "\xEA\xE0\xF2\xE0\xEB\xEE\xED\xF1\xEA\xE8"
- IDS_CHINESE_TRADITIONAL "\xEA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Traditional)"
- IDS_CHINESE_SIMPLIFIED "\xEA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Simplified)"
- IDS_CHINESE_HONGKONG "\xEA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Hong Kong)"
- IDS_CHINESE_SINGAPORE "\xEA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Singapore)"
+ IDS_CATALAN "\xCA\xE0\xF2\xE0\xEB\xEE\xED\xF1\xEA\xE8"
+ IDS_CHINESE_TRADITIONAL "\xCA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Traditional)"
+ IDS_CHINESE_SIMPLIFIED "\xCA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Simplified)"
+ IDS_CHINESE_HONGKONG "\xCA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Hong Kong)"
+ IDS_CHINESE_SINGAPORE "\xCA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Singapore)"
END
// LANGUAGE NAMES #3
STRINGTABLE
BEGIN
- IDS_CHINESE_MACAU "\xEA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Macau SAR)"
- IDS_CROATIAN "\xF5\xFA\xF0\xE2\xE0\xF2\xF1\xEA\xE8"
- IDS_CZECH "\xF7\xE5\xF8\xEA\xE8"
- IDS_DANISH "\xE4\xE0\xF2\xF1\xEA\xE8"
- IDS_DUTCH "\xF5\xEE\xEB\xE0\xED\xE4\xF1\xEA\xE8"
- IDS_DUTCH_BELGIAN "\xF5\xEE\xEB\xE0\xED\xE4\xF1\xEA\xE8 (Belgium)"
- IDS_ENGLISH_US "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (US)"
- IDS_ENGLISH_UK "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (UK)"
- IDS_ENGLISH_AUS "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Australian)"
- IDS_ENGLISH_CAN "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Canadian)"
- IDS_ENGLISH_NZ "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (New Zealand)"
- IDS_ENGLISH_EIRE "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Irish)"
- IDS_ENGLISH_SOUTH_AFRICA "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (So. African)"
- IDS_ENGLISH_JAMAICA "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Jamaican)"
- IDS_ENGLISH_CARIBBEAN "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Caribbean)"
- IDS_ENGLISH_BELIZE "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Belize)"
+ IDS_CHINESE_MACAU "\xCA\xE8\xF2\xE0\xE9\xF1\xEA\xE8 (Macau SAR)"
+ IDS_CROATIAN "\xD5\xFA\xF0\xE2\xE0\xF2\xF1\xEA\xE8"
+ IDS_CZECH "\xD7\xE5\xF8\xEA\xE8"
+ IDS_DANISH "\xC4\xE0\xF2\xF1\xEA\xE8"
+ IDS_DUTCH "\xD5\xEE\xEB\xE0\xED\xE4\xF1\xEA\xE8"
+ IDS_DUTCH_BELGIAN "\xD5\xEE\xEB\xE0\xED\xE4\xF1\xEA\xE8 (Belgium)"
+ IDS_ENGLISH_US "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (US)"
+ IDS_ENGLISH_UK "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (UK)"
+ IDS_ENGLISH_AUS "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Australian)"
+ IDS_ENGLISH_CAN "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Canadian)"
+ IDS_ENGLISH_NZ "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (New Zealand)"
+ IDS_ENGLISH_EIRE "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Irish)"
+ IDS_ENGLISH_SOUTH_AFRICA "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (So. African)"
+ IDS_ENGLISH_JAMAICA "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Jamaican)"
+ IDS_ENGLISH_CARIBBEAN "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Caribbean)"
+ IDS_ENGLISH_BELIZE "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Belize)"
END
// LANGUAGE NAMES #4
STRINGTABLE
BEGIN
- IDS_ENGLISH_TRINIDAD "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Trinidad)"
- IDS_ENGLISH_ZIMBABWE "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Zimbabwe)"
- IDS_ENGLISH_PHILIPPINES "\xE0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Philippines)"
- IDS_ESTONIAN "\xE5\xF1\xF2\xEE\xED\xF1\xEA\xE8"
- IDS_FAEROESE "\xF4\xE0\xF0\xE5\xEE\xF0\xF1\xEA\xE8"
+ IDS_ENGLISH_TRINIDAD "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Trinidad)"
+ IDS_ENGLISH_ZIMBABWE "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Zimbabwe)"
+ IDS_ENGLISH_PHILIPPINES "\xC0\xED\xE3\xEB\xE8\xE9\xF1\xEA\xE8 (Philippines)"
+ IDS_ESTONIAN "\xC5\xF1\xF2\xEE\xED\xF1\xEA\xE8"
+ IDS_FAEROESE "\xD4\xE0\xF0\xE5\xEE\xF0\xF1\xEA\xE8"
IDS_FARSI "Farsi"
- IDS_FINNISH "\xF4\xE8\xED\xEB\xE0\xED\xE4\xF1\xEA\xE8"
- IDS_FRENCH "\xF4\xF0\xE5\xED\xF1\xEA\xE8"
- IDS_FRENCH_BELGIAN "\xF4\xF0\xE5\xED\xF1\xEA\xE8 (Belgique)"
- IDS_FRENCH_CANADIAN "\xF4\xF0\xE5\xED\xF1\xEA\xE8 (Canada)"
- IDS_FRENCH_SWISS "\xF4\xF0\xE5\xED\xF1\xEA\xE8 (Switzerland)"
- IDS_FRENCH_LUXEMBOURG "\xF4\xF0\xE5\xED\xF1\xEA\xE8 (Luxembourg)"
- IDS_FRENCH_MONACO "\xF4\xF0\xE5\xED\xF1\xEA\xE8 (Monaco)"
- IDS_GEORGIAN "\xE3\xF0\xF3\xE7\xE8\xED\xF1\xEA\xE8"
- IDS_GERMAN "\xED\xE5\xEC\xF1\xEA\xE8 (Germany)"
- IDS_GERMAN_SWISS "\xED\xE5\xEC\xF1\xEA\xE8 (Switzerland)"
+ IDS_FINNISH "\xD4\xE8\xED\xEB\xE0\xED\xE4\xF1\xEA\xE8"
+ IDS_FRENCH "\xD4\xF0\xE5\xED\xF1\xEA\xE8"
+ IDS_FRENCH_BELGIAN "\xD4\xF0\xE5\xED\xF1\xEA\xE8 (Belgique)"
+ IDS_FRENCH_CANADIAN "\xD4\xF0\xE5\xED\xF1\xEA\xE8 (Canada)"
+ IDS_FRENCH_SWISS "\xD4\xF0\xE5\xED\xF1\xEA\xE8 (Switzerland)"
+ IDS_FRENCH_LUXEMBOURG "\xD4\xF0\xE5\xED\xF1\xEA\xE8 (Luxembourg)"
+ IDS_FRENCH_MONACO "\xD4\xF0\xE5\xED\xF1\xEA\xE8 (Monaco)"
+ IDS_GEORGIAN "\xC3\xF0\xF3\xE7\xE8\xED\xF1\xEA\xE8"
+ IDS_GERMAN "\xCD\xE5\xEC\xF1\xEA\xE8 (Germany)"
+ IDS_GERMAN_SWISS "\xCD\xE5\xEC\xF1\xEA\xE8 (Switzerland)"
END
// LANGUAGE NAMES #5
STRINGTABLE
BEGIN
- IDS_GERMAN_AUSTRIAN "\xED\xE5\xEC\xF1\xEA\xE8 (Austria)"
- IDS_GERMAN_LUXEMBOURG "\xED\xE5\xEC\xF1\xEA\xE8 (Luxembourg)"
- IDS_GERMAN_LIECHTENSTEIN "\xED\xE5\xEC\xF1\xEA\xE8 (Liechtenstein)"
- IDS_GREEK "\xE3\xF0\xFA\xF6\xEA\xE8"
- IDS_HEBREW "\xE8\xE2\xF0\xE8\xF2"
- IDS_HINDI "\xF5\xE8\xED\xE4\xE8"
- IDS_HUNGARIAN "\xF3\xED\xE3\xE0\xF0\xF1\xEA\xE8"
- IDS_ICELANDIC "\xE8\xF1\xEB\xE0\xED\xE4\xF1\xEA\xE8"
- IDS_INDONESIAN "\xE8\xED\xE4\xEE\xED\xE5\xE7\xE8\xE9\xF1\xEA\xE8"
- IDS_ITALIAN "\xE8\xF2\xE0\xEB\xE8\xE0\xED\xF1\xEA\xE8"
- IDS_ITALIAN_SWISS "\xE8\xF2\xE0\xEB\xE8\xE0\xED\xF1\xEA\xE8 (Swiss)"
- IDS_JAPANESE "\xFF\xEF\xEE\xED\xF1\xEA\xE8"
+ IDS_GERMAN_AUSTRIAN "\xCD\xE5\xEC\xF1\xEA\xE8 (Austria)"
+ IDS_GERMAN_LUXEMBOURG "\xCD\xE5\xEC\xF1\xEA\xE8 (Luxembourg)"
+ IDS_GERMAN_LIECHTENSTEIN "\xCD\xE5\xEC\xF1\xEA\xE8 (Liechtenstein)"
+ IDS_GREEK "\xC3\xF0\xFA\xF6\xEA\xE8"
+ IDS_HEBREW "\xC8\xE2\xF0\xE8\xF2"
+ IDS_HINDI "\xD5\xE8\xED\xE4\xE8"
+ IDS_HUNGARIAN "\xD3\xED\xE3\xE0\xF0\xF1\xEA\xE8"
+ IDS_ICELANDIC "\xC8\xF1\xEB\xE0\xED\xE4\xF1\xEA\xE8"
+ IDS_INDONESIAN "\xC8\xED\xE4\xEE\xED\xE5\xE7\xE8\xE9\xF1\xEA\xE8"
+ IDS_ITALIAN "\xC8\xF2\xE0\xEB\xE8\xE0\xED\xF1\xEA\xE8"
+ IDS_ITALIAN_SWISS "\xC8\xF2\xE0\xEB\xE8\xE0\xED\xF1\xEA\xE8 (Swiss)"
+ IDS_JAPANESE "\xDF\xEF\xEE\xED\xF1\xEA\xE8"
IDS_KASHMIRI "Kashmiri (India)"
IDS_KAZAK "Kazakh"
- IDS_KOREAN "\xEA\xEE\xF0\xE5\xE9\xF1\xEA\xE8"
- IDS_KOREAN_JOHAB "\xEA\xEE\xF0\xE5\xE9\xF1\xEA\xE8 (Johab)"
+ IDS_KOREAN "\xCA\xEE\xF0\xE5\xE9\xF1\xEA\xE8"
+ IDS_KOREAN_JOHAB "\xCA\xEE\xF0\xE5\xE9\xF1\xEA\xE8 (Johab)"
END
// LANGUAGE NAMES #6
STRINGTABLE
BEGIN
- IDS_LATVIAN "\xEB\xE0\xF2\xE2\xE8\xE9\xF1\xEA\xE8"
- IDS_LITHUANIAN "\xEB\xE8\xF2\xEE\xE2\xF1\xEA\xE8"
+ IDS_LATVIAN "\xCB\xE0\xF2\xE2\xE8\xE9\xF1\xEA\xE8"
+ IDS_LITHUANIAN "\xCB\xE8\xF2\xEE\xE2\xF1\xEA\xE8"
IDS_MALAY_MALAYSIA "Malay (Malaysian)"
IDS_MALAY_BRUNEI_DARUSSALAM "Malay (Brunei Darussalam)"
IDS_MANIPURI "Manipuri"
- IDS_NORWEGIAN_BOKMAL "\xED\xEE\xF0\xE2\xE5\xE6\xEA\xE8 (Bokmal)"
- IDS_NORWEGIAN_NYNORSK "\xED\xEE\xF0\xE2\xE5\xE6\xEA\xE8 (Nynorsk)"
- IDS_POLISH "\xEF\xEE\xEB\xF1\xEA\xE8"
- IDS_PORTUGUESE "\xEF\xEE\xF0\xF2\xF3\xE3\xE0\xEB\xF1\xEA\xE8"
- IDS_PORTUGUESE_BRAZILIAN "\xE1\xF0\xE0\xE7\xE8\xEB\xF1\xEA\xE8 \xEF\xEE\xF0\xF2\xF3\xE3\xE0\xEB\xF1\xEA\xE8"
- IDS_ROMANIAN "\xF0\xF3\xEC\xFA\xED\xF1\xEA\xE8"
- IDS_RUSSIAN "\xF0\xF3\xF1\xEA\xE8"
+ IDS_NORWEGIAN_BOKMAL "\xCD\xEE\xF0\xE2\xE5\xE6\xEA\xE8 (Bokmal)"
+ IDS_NORWEGIAN_NYNORSK "\xCD\xEE\xF0\xE2\xE5\xE6\xEA\xE8 (Nynorsk)"
+ IDS_POLISH "\xCF\xEE\xEB\xF1\xEA\xE8"
+ IDS_PORTUGUESE "\xCF\xEE\xF0\xF2\xF3\xE3\xE0\xEB\xF1\xEA\xE8"
+ IDS_PORTUGUESE_BRAZILIAN "\xC1\xF0\xE0\xE7\xE8\xEB\xF1\xEA\xE8 \xCF\xEE\xF0\xF2\xF3\xE3\xE0\xEB\xF1\xEA\xE8"
+ IDS_ROMANIAN "\xD0\xF3\xEC\xFA\xED\xF1\xEA\xE8"
+ IDS_RUSSIAN "\xD0\xF3\xF1\xEA\xE8"
IDS_SANSKRIT "Sanskrit"
- IDS_SERBIAN_LATIN "c\xF0\xFA\xE1\xF1\xEA\xE8 (Latin)"
- IDS_SERBIAN_CYRILLIC "c\xF0\xFA\xE1\xF1\xEA\xE8 (Cyrillic)"
+ IDS_SERBIAN_LATIN "\xD1\xF0\xFA\xE1\xF1\xEA\xE8 (Latin)"
+ IDS_SERBIAN_CYRILLIC "\xD1\xF0\xFA\xE1\xF1\xEA\xE8 (Cyrillic)"
IDS_SINDHI "Sindhi"
END
// LANGUAGE NAMES #7
STRINGTABLE
BEGIN
- IDS_SLOVAK "\xF1\xEB\xEE\xE2\xE0\xF8\xEA\xE8"
- IDS_SLOVENIAN "\xF1\xEB\xEE\xE2\xE5\xED\xF1\xEA\xE8"
- IDS_SPANISH "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8"
- IDS_SPANISH_MEXICAN "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Mexican)"
- IDS_SPANISH_MODERN "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Modern)"
- IDS_SPANISH_GUATEMALA "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Guatemala)"
- IDS_SPANISH_COSTA_RICA "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Costa Rica)"
- IDS_SPANISH_PANAMA "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Panama)"
- IDS_SPANISH_DOMINICAN "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Dominican)"
- IDS_SPANISH_VENEZUELA "\xE2\xE5\xED\xE5\xF6\xF3\xE5\xEB\xF1\xEA\xE8 \xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8"
- IDS_SPANISH_COLOMBIA "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Colombia)"
- IDS_SPANISH_PERU "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Peru)"
- IDS_SPANISH_ARGENTINA "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Argentina)"
- IDS_SPANISH_ECUADOR "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Ecuador)"
- IDS_SPANISH_CHILE "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Chile)"
- IDS_SPANISH_URUGUAY "\xE8\xF1\xEF\xE0\xED\xF1\xEA\xE8 (Uruguay)"
+ IDS_SLOV...
[truncated message content] |
|
From: <ki...@us...> - 2007-03-04 18:15:46
|
Revision: 4144
http://svn.sourceforge.net/winmerge/?rev=4144&view=rev
Author: kimmov
Date: 2007-03-04 10:15:16 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
BUG: [ 1664832 ] Typo Error in the Registry
Modified Paths:
--------------
branches/R2_6/ShellExtension/WinMergeShell.rgs
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/WinMergeShell.rgs
===================================================================
--- branches/R2_6/ShellExtension/WinMergeShell.rgs 2007-03-04 14:45:02 UTC (rev 4143)
+++ branches/R2_6/ShellExtension/WinMergeShell.rgs 2007-03-04 18:15:16 UTC (rev 4144)
@@ -20,7 +20,7 @@
{
val ThreadingModel = s 'Apartment'
}
- 'TypeLib' = s '06029E17-28B5-456A-B866-4E79D98612FD}'
+ 'TypeLib' = s '{06029E17-28B5-456A-B866-4E79D98612FD}'
}
}
NoRemove *
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-03-04 14:45:02 UTC (rev 4143)
+++ branches/R2_6/Src/Changes.txt 2007-03-04 18:15:16 UTC (rev 4144)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-03-04 Kimmo
+ BUG: [ 1664832 ] Typo Error in the Registry
+ ShellExtension: WinMergeShell.rgs
+
2007-03-04 Tim
BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
Src/Languages/Russian: MergeRussian.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-03-04 18:21:01
|
Revision: 4145
http://svn.sourceforge.net/winmerge/?rev=4145&view=rev
Author: kimmov
Date: 2007-03-04 10:20:54 -0800 (Sun, 04 Mar 2007)
Log Message:
-----------
Bump ShellExtension version to 1.9.2
Modified Paths:
--------------
branches/R2_6/ShellExtension/ShellExtension.rc
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_6/ShellExtension/ShellExtension.rc 2007-03-04 18:15:16 UTC (rev 4144)
+++ branches/R2_6/ShellExtension/ShellExtension.rc 2007-03-04 18:20:54 UTC (rev 4145)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,1,0
- PRODUCTVERSION 1,9,1,0
+ FILEVERSION 1,9,2,0
+ PRODUCTVERSION 1,9,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -243,15 +243,15 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.9.1.0\0"
+ VALUE "FileVersion", "1.9.2.0\0"
VALUE "InternalName", "ShellExtension\0"
- VALUE "LegalCopyright", "Copyright 2003-2006\0"
+ VALUE "LegalCopyright", "Copyright 2003-2007\0"
VALUE "LegalTrademarks", "\0"
VALUE "OLESelfRegister", "\0"
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.9.1.0\0"
+ VALUE "ProductVersion", "1.9.2.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-03-04 18:15:16 UTC (rev 4144)
+++ branches/R2_6/Src/Changes.txt 2007-03-04 18:20:54 UTC (rev 4145)
@@ -5,6 +5,8 @@
2007-03-04 Kimmo
BUG: [ 1664832 ] Typo Error in the Registry
ShellExtension: WinMergeShell.rgs
+ Bump ShellExtension version to 1.9.2
+ ShellExtension: ShellExtension.rc
2007-03-04 Tim
BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2007-05-29 14:25:14
|
Revision: 4299
http://svn.sourceforge.net/winmerge/?rev=4299&view=rev
Author: sdottaka
Date: 2007-05-29 07:25:11 -0700 (Tue, 29 May 2007)
Log Message:
-----------
BUG [ 1722197 ] Downgrading from 2.7.3.4 to 2.6.6 causes Explorer crash
Modified Paths:
--------------
branches/R2_6/ShellExtension/WinMergeShell.cpp
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/WinMergeShell.cpp
===================================================================
--- branches/R2_6/ShellExtension/WinMergeShell.cpp 2007-05-26 14:04:03 UTC (rev 4298)
+++ branches/R2_6/ShellExtension/WinMergeShell.cpp 2007-05-29 14:25:11 UTC (rev 4299)
@@ -133,6 +133,9 @@
HDROP hDropInfo;
USES_WINMERGELOCALE;
+ if (!pDataObj)
+ return E_INVALIDARG;
+
// Look for CF_HDROP data in the data object.
if (FAILED(pDataObj->GetData(&fmt, &stg)))
// Nope! Return an "invalid argument" error back to Explorer.
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-05-26 14:04:03 UTC (rev 4298)
+++ branches/R2_6/Src/Changes.txt 2007-05-29 14:25:11 UTC (rev 4299)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-05-29 Takashi
+ BUG [ 1722197 ] Downgrading from 2.7.3.4 to 2.6.6 causes Explorer crash
+ ShellExtension: WinMergeShell.cpp
+
2007-05-19 Tim
Fix white space indenting in C# highlighter (included with PATCH #1556685).
Src/editlib: csharp.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-06-07 19:57:59
|
Revision: 4322
http://svn.sourceforge.net/winmerge/?rev=4322&view=rev
Author: kimmov
Date: 2007-06-07 12:57:57 -0700 (Thu, 07 Jun 2007)
Log Message:
-----------
PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
Added Paths:
-----------
branches/R2_6/Filters/CSharp_loose.flt
Copied: branches/R2_6/Filters/CSharp_loose.flt (from rev 4320, trunk/Filters/CSharp_loose.flt)
===================================================================
--- branches/R2_6/Filters/CSharp_loose.flt (rev 0)
+++ branches/R2_6/Filters/CSharp_loose.flt 2007-06-07 19:57:57 UTC (rev 4322)
@@ -0,0 +1,29 @@
+## This is a directory/file filter for WinMerge
+## This filter suppresses various binaries found in Visual C# source trees
+name: Visual C# loose
+desc: Suppresses various binaries found in Visual C# source trees
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.aps$ ## VC Binary version of resource file, for quick loading
+f: \.bsc$ ## VC Browser database
+f: \.dll$ ## Windows DLL
+f: \.exe$ ## Windows executable
+f: \.obj$ ## VC object module file
+f: \.pdb$ ## VC program database file (debugging symbolic information)
+f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
+f: \.suo$ ## VC options file (binary)
+f: \.cache$ ## ??
+f: \.resource$ ## Compiled resource file.
+f: \.xfrm ## ??
+f: \.bak$ ## backup
+
+d: \\cvs$ ## CVS control directory
+d: \\.svn$ ## Subversion control directory
+
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-07 16:20:22 UTC (rev 4321)
+++ branches/R2_6/Src/Changes.txt 2007-06-07 19:57:57 UTC (rev 4322)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-06-07 Kimmo
+ PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x
+ Filters new file: CSharp_loose.flt
+
2007-05-31 Tim
PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase"
Src: Merge.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-06-14 19:24:08
|
Revision: 4333
http://svn.sourceforge.net/winmerge/?rev=4333&view=rev
Author: kimmov
Date: 2007-06-14 12:24:06 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
Bump ShellExtension version to 1.9.3
Modified Paths:
--------------
branches/R2_6/ShellExtension/ShellExtension.rc
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_6/ShellExtension/ShellExtension.rc 2007-06-14 02:28:07 UTC (rev 4332)
+++ branches/R2_6/ShellExtension/ShellExtension.rc 2007-06-14 19:24:06 UTC (rev 4333)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,2,0
- PRODUCTVERSION 1,9,2,0
+ FILEVERSION 1,9,3,0
+ PRODUCTVERSION 1,9,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -243,7 +243,7 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.9.2.0\0"
+ VALUE "FileVersion", "1.9.3.0\0"
VALUE "InternalName", "ShellExtension\0"
VALUE "LegalCopyright", "Copyright 2003-2007\0"
VALUE "LegalTrademarks", "\0"
@@ -251,7 +251,7 @@
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.9.2.0\0"
+ VALUE "ProductVersion", "1.9.3.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-14 02:28:07 UTC (rev 4332)
+++ branches/R2_6/Src/Changes.txt 2007-06-14 19:24:06 UTC (rev 4333)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-06-14 Kimmo
+ Bump ShellExtension version to 1.9.3
+ ShellExtension: ShellExtension.rc
+
2007-06-07 Kimmo
PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x
Filters new file: CSharp_loose.flt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-06-14 19:26:36
|
Revision: 4334
http://svn.sourceforge.net/winmerge/?rev=4334&view=rev
Author: kimmov
Date: 2007-06-14 12:26:30 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
PATCH: [ 1735240 ] Copy new Delphi- and Symbian -file filters to 2.6 branch
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
Added Paths:
-----------
branches/R2_6/Filters/Delphi.flt
branches/R2_6/Filters/Symbian.flt
Copied: branches/R2_6/Filters/Delphi.flt (from rev 4329, trunk/Filters/Delphi.flt)
===================================================================
--- branches/R2_6/Filters/Delphi.flt (rev 0)
+++ branches/R2_6/Filters/Delphi.flt 2007-06-14 19:26:30 UTC (rev 4334)
@@ -0,0 +1,33 @@
+## This is a directory/file filter template for WinMerge
+name: Delphi filter
+desc: View only files .PAS and files .DFM
+
+## Select if filter is inclusive or exclusive
+## Inclusive (loose) filter lets through all items not matching rules
+## Exclusive filter lets through only items that match to rule
+## include or exclude
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.^~ ## EXCLUDE temporary files
+f: \.dcu$ ## EXCLUDE Delphi compiled unit
+f: \.exe$ ## EXCLUDE Exe file
+f: \.cfg$ ## EXCLUDE configuration file
+f: \.dsk$ ## EXCLUDE File of internal information of the project
+f: \.dof$ ## EXCLUDE Delphi options file
+f: \.ddp$ ## EXCLUDE Delphi diagram portfolio file
+f: \.db$ ## EXCLUDE File Paradox
+f: \.ims$ ## EXCLUDE Icon file, normally created with IconForge
+f: \.bak$ ## EXCLUDE Backup file made with WinMerge
+
+## f: \.dfm$ ## Delphi Form
+## f: \.pas$ ## Delphi source
+## f: \.dpr$ ## Delphi Project
+## f: \.dpk$ ## Delphi Package
+## f: \.bpg$ ## Delphi Package Group
+## f: \.bpl$ ## Delphi Package Library
+
+## d: \\subdir$ ## Filter for directory
\ No newline at end of file
Copied: branches/R2_6/Filters/Symbian.flt (from rev 4329, trunk/Filters/Symbian.flt)
===================================================================
--- branches/R2_6/Filters/Symbian.flt (rev 0)
+++ branches/R2_6/Filters/Symbian.flt 2007-06-14 19:26:30 UTC (rev 4334)
@@ -0,0 +1,37 @@
+## This is a directory/file filter for WinMerge
+## This filter suppresses various binaries found in Symbian development source trees.
+name: Symbian C++
+desc: Suppresses various binaries found in Visual C++ source trees compiling Symbian
+
+## This is an inclusive (loose) filter
+## (it lets through everything not specified)
+def: include
+
+## Filters for filenames begin with f:
+## Filters for directories begin with d:
+## (Inline comments begin with " ##" and extend to the end of the line)
+
+f: \.bsc$ ## VC Browser database
+f: \.aps$ ## VC Binary version of resource file, for quick loading
+f: \.bsc$ ## VC Browser database
+f: \.clw$ ## VC class-wizard status file
+f: \.dll$ ## Windows DLL
+f: \.exe$ ## Windows executable
+f: \.exp$ ## VC library export file
+f: \\vc60.idb$ ## VC ?
+f: \.ilk$ ## VC incremental linker memory file
+f: \.lib$ ## compiled libraries
+f: \.ncb$ ## VC parser information file (class view & component gallery stuff)
+f: \.obj$ ## VC object module file
+f: \.pch$ ## VC precompiled header file
+f: \.pdb$ ## VC program database file (debugging symbolic information)
+f: \.sbr$ ## VC source browser file (used to create bsc file)
+f: \.res$ ## VC compiled resources file (output of RC [resource compiler])
+f: \.rsc ## Compiled resources
+f: \.app ## Application
+f: \.aif
+f: \.bak$ ## backup
+f: \ABLD.bat$ ## Bat file
+
+d: \\cvs$ ## CVS control directory
+d: \\.svn$ ## Subversion control directory
\ No newline at end of file
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-06-14 19:24:06 UTC (rev 4333)
+++ branches/R2_6/Src/Changes.txt 2007-06-14 19:26:30 UTC (rev 4334)
@@ -5,6 +5,8 @@
2007-06-14 Kimmo
Bump ShellExtension version to 1.9.3
ShellExtension: ShellExtension.rc
+ PATCH: [ 1735240 ] Copy new Delphi- and Symbian -file filters to 2.6 branch
+ Filters new files: Delphi.flt Symbian.flt
2007-06-07 Kimmo
PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-07-13 11:47:54
|
Revision: 4366
http://svn.sourceforge.net/winmerge/?rev=4366&view=rev
Author: kimmov
Date: 2007-07-13 04:47:51 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Add Alberto Kalb to contributors list
Modified Paths:
--------------
branches/R2_6/Docs/Users/Contributors.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_6/Docs/Users/Contributors.txt 2007-07-12 19:10:26 UTC (rev 4365)
+++ branches/R2_6/Docs/Users/Contributors.txt 2007-07-13 11:47:51 UTC (rev 4366)
@@ -108,6 +108,7 @@
* Marvin Gouw
* Jan Hryz
* Ed_K
+* Alberto Kalb
* Ferenc Kubatovics
* Ren\xE9 Leonhardt
* Vladimir Lukianov
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-07-12 19:10:26 UTC (rev 4365)
+++ branches/R2_6/Src/Changes.txt 2007-07-13 11:47:51 UTC (rev 4366)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-07-13 Kimmo
+ Add Alberto Kalb to contributors list
+ Docs/Users: Contributors.txt
+
2007-06-19 2.6.8 Stable Release (R4343)
2007-06-17 Tim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-08-12 22:18:37
|
Revision: 4425
http://winmerge.svn.sourceforge.net/winmerge/?rev=4425&view=rev
Author: gerundt
Date: 2007-08-12 15:18:35 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Optimize CreateReviewPoFiles script and change output filenames to "<Language>Review.po".
Modified Paths:
--------------
branches/R2_6/Docs/Developers/readme-developers.html
branches/R2_6/Src/Languages/CreateReviewPoFiles.vbs
Property Changed:
----------------
branches/R2_6/Src/Languages/CreateReviewPoFiles.vbs
Modified: branches/R2_6/Docs/Developers/readme-developers.html
===================================================================
--- branches/R2_6/Docs/Developers/readme-developers.html 2007-08-12 22:16:52 UTC (rev 4424)
+++ branches/R2_6/Docs/Developers/readme-developers.html 2007-08-12 22:18:35 UTC (rev 4425)
@@ -485,7 +485,7 @@
<h4><code>CreateReviewPoFiles.vbs</code></h4>
<p>With this VBScript file under the <code>Src\Languages\</code> folder you can create <a href="http://en.wikipedia.org/wiki/Gettext">gettext</a> PO files to review the translations.
-The script tries to collect all strings from the resource files and save the original and translated strings into PO files. For each language you will find the PO file under the language subfolder: <code>Src\Languages\<em>Language</em>\<em>Language</em>.po</code>.
+The script tries to collect all strings from the resource files and save the original and translated strings into PO files. For each language you will find the PO file under the language subfolder: <code>Src\Languages\<em>Language</em>\<em>Language</em>Review.po</code>.
<strong>The script can take several minutes to finish!</strong></p>
<p>If you have a PO file from your language, you could use a simple text editor or better <a href="http://www.poedit.net">poEdit</a> to review the file:</p>
<pre>#: IDD_PROPPAGE_LARGE.IDC_SINGLE_INSTANCE
Modified: branches/R2_6/Src/Languages/CreateReviewPoFiles.vbs
===================================================================
--- branches/R2_6/Src/Languages/CreateReviewPoFiles.vbs 2007-08-12 22:16:52 UTC (rev 4424)
+++ branches/R2_6/Src/Languages/CreateReviewPoFiles.vbs 2007-08-12 22:18:35 UTC (rev 4425)
@@ -1,262 +1,263 @@
-Option Explicit
-''
-' This script creates PO files for easier reviewing of the translations.
-'
-' Copyright (C) 2007 by Tim Gerundt
-' Released under the "GNU General Public License"
-'
-' ID line follows -- this is updated by SVN
-' $Id: $
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-
-Dim oFSO
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-Call Main
-
-''
-' ...
-Sub Main
- Dim oLanguages, sLanguage
- Dim oOriginalTranslations, oLanguageTranslations
-
- Wscript.Echo "Warning: This step could take some time!"
-
- Set oOriginalTranslations = GetTranslationsFromRcFile("../Merge.rc")
-
- Set oLanguages = GetLanguages
- For Each sLanguage In oLanguages.Keys 'For all languages...
- Set oLanguageTranslations = GetTranslationsFromRcFile(oLanguages(sLanguage))
- CreateReviewPoFile sLanguage, oOriginalTranslations, oLanguageTranslations
- Next
-
- Wscript.Echo "Finished!"
-End Sub
-
-''
-' ...
-Function GetLanguages()
- Dim oLanguages, oSubFolder, sRcPath
-
- Set oLanguages = CreateObject("Scripting.Dictionary")
-
- For Each oSubFolder In oFSO.GetFolder(".").SubFolders 'For all subfolders in the current folder...
- If (oSubFolder.Name <> ".svn") Then 'If NOT a SVN folder...
- sRcPath = oFSO.BuildPath (oSubFolder.Path, "Merge" & oSubFolder.Name & ".rc")
- If (oFSO.FileExists(sRcPath) = True) Then '...
- oLanguages.Add oSubFolder.Name, sRcPath
- End If
- End If
- Next
- Set GetLanguages = oLanguages
-End Function
-
-''
-' ...
-Function GetTranslationsFromRcFile(ByVal sRcPath)
- Dim oTranslations, oTextFile, sLine
- Dim oMatch, iBlockType, sKey1, sKey2, iPosition, sValue
- Dim sCodePage
-
- Set oTranslations = CreateObject("Scripting.Dictionary")
-
- If (oFSO.FileExists(sRcPath) = True) Then
- iBlockType = NO_BLOCK
- sKey1 = ""
- sKey2 = ""
- iPosition = 0
- sCodePage = ""
- Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
- Do Until oTextFile.AtEndOfStream = True
- sLine = Trim(oTextFile.ReadLine)
-
- sValue = ""
-
- If (FoundRegExpMatch(sLine, "(IDR_.*) MENU", oMatch) = True) Then 'MENU...
- iBlockType = MENU_BLOCK
- sKey1 = oMatch.SubMatches(0)
- iPosition = 0
- ElseIf (FoundRegExpMatch(sLine, "(IDD_.*) DIALOGEX", oMatch) = True) Then 'DIALOGEX...
- iBlockType = DIALOGEX_BLOCK
- sKey1 = oMatch.SubMatches(0)
- iPosition = 0
- ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
- iBlockType = STRINGTABLE_BLOCK
- sKey1 = "STRINGTABLE"
- 'iPosition = 0
- ElseIf (sLine = "END") Then 'END...
- If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
- iBlockType = NO_BLOCK
- sKey1 = ""
- 'iPosition = 0
- End If
- End If
-
- Select Case iBlockType
- Case NO_BLOCK:
- If (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
- sCodePage = oMatch.SubMatches(0)
- End If
- '...
- '...
- '...
-
- Case MENU_BLOCK:
- 'POPUP...
- If (FoundRegExpMatch(sLine, "POPUP ""(.*)""", oMatch) = True) Then 'POPUP...
- If (InStr(oMatch.SubMatches(0), "_POPUP_") = 0) Then
- sKey2 = iPosition
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- ElseIf (FoundRegExpMatch(sLine, "MENUITEM.*""(.*)"".*(ID_.*)", oMatch) = True) Then 'MENUITEM...
- sKey2 = oMatch.SubMatches(1)
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- '...
- '...
- '...
-
- Case DIALOGEX_BLOCK:
- If (FoundRegExpMatch(sLine, "CAPTION.*""(\w+)""", oMatch) = True) Then 'CAPTION...
- sKey2 = "CAPTION"
- sValue = oMatch.SubMatches(0)
- ElseIf (FoundRegExpMatch(sLine, "PUSHBUTTON.*""(.*)"",(\w+)", oMatch) = True) Then 'DEFPUSHBUTTON/PUSHBUTTON...
- sKey2 = oMatch.SubMatches(1)
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- ElseIf (FoundRegExpMatch(sLine, "[L|R]TEXT.*""(.*)"",(\w+)", oMatch) = True) Then 'LTEXT/RTEXT...
- If (oMatch.SubMatches(0) <> "") And (oMatch.SubMatches(0) <> "Static") Then
- If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
- sKey2 = oMatch.SubMatches(1)
- Else
- sKey2 = iPosition & "_TEXT"
- iPosition = iPosition + 1
- End If
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- ElseIf (FoundRegExpMatch(sLine, "[L|R]TEXT.*""(.*)"",", oMatch) = True) Then 'LTEXT/RTEXT (without ID)...
- sKey2 = iPosition & "_TEXT"
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",(\w+)", oMatch) = True) Then 'CONTROL...
- If (oMatch.SubMatches(0) <> "Dif") And (oMatch.SubMatches(0) <> "Btn") And (oMatch.SubMatches(0) <> "Button1") Then
- sKey2 = oMatch.SubMatches(1)
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",", oMatch) = True) Then 'CONTROL (without ID)...
- sKey2 = iPosition & "_CONTROL"
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- ElseIf (FoundRegExpMatch(sLine, "GROUPBOX +""(.*?)"",(\w+)", oMatch) = True) Then 'GROUPBOX...
- If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
- sKey2 = oMatch.SubMatches(1)
- Else
- sKey2 = iPosition & "_GROUPBOX"
- iPosition = iPosition + 1
- End If
- sValue = oMatch.SubMatches(0)
- 'Wscript.Echo sKey1 & "." & sKey2 & " = " & sValue
- End If
- '...
- '...
- '...
-
- Case STRINGTABLE_BLOCK:
- If (FoundRegExpMatch(sLine, "(\w+).*""(.*)""", oMatch) = True) Then 'String...
- sKey2 = oMatch.SubMatches(0)
- sValue = oMatch.SubMatches(1)
- ElseIf (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) Then 'String (without ID)...
- sKey2 = iPosition
- iPosition = iPosition + 1
- sValue = oMatch.SubMatches(0)
- End If
- '...
- '...
- '...
-
- End Select
-
- If (sValue <> "") Then
- oTranslations.Add sKey1 & "." & sKey2, sValue
- End If
- Loop
- oTextFile.Close
-
- oTranslations.Add "code_page", sCodePage
- End If
- Set GetTranslationsFromRcFile = oTranslations
-End Function
-
-''
-' ...
-Sub CreateReviewPoFile(ByVal sLanguage, ByVal oOriginalTranslations, ByVal oLanguageTranslations)
- Dim oPoFile, sKey
- Dim sOriginalTranslation, sLanguageTranslation
-
- Set oPoFile = oFSO.CreateTextFile(sLanguage & "\" & sLanguage & ".po", True)
-
- oPoFile.WriteLine "# DO NOT EDIT THIS FILE!"
- oPoFile.WriteLine "# This file is only for easier reviewing of the WinMerge translation..."
- oPoFile.WriteLine "#"
- oPoFile.WriteLine "msgid """""
- oPoFile.WriteLine "msgstr """""
- oPoFile.WriteLine """Project-Id-Version: \n"""
- oPoFile.WriteLine """Report-Msgid-Bugs-To: \n"""
- oPoFile.WriteLine """POT-Creation-Date: \n"""
- oPoFile.WriteLine """PO-Revision-Date: \n"""
- oPoFile.WriteLine """Last-Translator: \n"""
- oPoFile.WriteLine """Language-Team: \n"""
- oPoFile.WriteLine """MIME-Version: 1.0\n"""
- oPoFile.WriteLine """Content-Type: text/plain; charset=CP" & oLanguageTranslations("code_page") & "\n"""
- oPoFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
- oPoFile.WriteLine
- For Each sKey In oOriginalTranslations.Keys 'For all original translations...
- If (sKey <> "code_page") Then
- sOriginalTranslation = oOriginalTranslations(sKey)
- sLanguageTranslation = oLanguageTranslations(sKey)
- oPoFile.WriteLine "#: " & sKey
- If (sOriginalTranslation = sLanguageTranslation) Then 'If MAYBE NOT translated...
- oPoFile.WriteLine "#, fuzzy"
- End If
- oPoFile.WriteLine "msgid """ & sOriginalTranslation & """"
- oPoFile.WriteLine "msgstr """ & sLanguageTranslation & """"
- oPoFile.WriteLine
- End If
- Next
- oPoFile.Close
-End Sub
-
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
- Dim oRegExp, oMatches, oMatch
-
- Set oRegExp = New RegExp
- oRegExp.Pattern = sPattern
- oRegExp.IgnoreCase = True
-
- oMatchReturn = Null
- FoundRegExpMatch = False
- If (oRegExp.Test(sString) = True) Then
- Set oMatches = oRegExp.Execute(sString)
- Set oMatch = oMatches(0)
- If (oMatch.SubMatches(0) <> "") Then
- Set oMatchReturn = oMatch
- FoundRegExpMatch = True
- End If
- End If
-End Function
+Option Explicit
+''
+' This script creates PO files for easier reviewing of the translations.
+'
+' Copyright (C) 2007 by Tim Gerundt
+' Released under the "GNU General Public License"
+'
+' ID line follows -- this is updated by SVN
+' $Id$
+
+Const ForReading = 1
+
+Const NO_BLOCK = 0
+Const MENU_BLOCK = 1
+Const DIALOGEX_BLOCK = 2
+Const STRINGTABLE_BLOCK = 3
+Const VERSIONINFO_BLOCK = 4
+
+Dim oFSO, bRunFromCmd
+
+Set oFSO = CreateObject("Scripting.FileSystemObject")
+
+bRunFromCmd = False
+If (LCase(Right(Wscript.FullName, 11))) = "cscript.exe" Then
+ bRunFromCmd = True
+End If
+
+Call Main
+
+''
+' ...
+Sub Main
+ Dim oLanguages, sLanguage
+ Dim oOriginalTranslations, oLanguageTranslations
+ Dim StartTime, EndTime, Seconds
+
+ StartTime = Time
+
+ Wscript.Echo "Warning: " & Wscript.ScriptName & " can take several minutes to finish!"
+
+ Set oOriginalTranslations = GetTranslationsFromRcFile("../Merge.rc")
+
+ Set oLanguages = GetLanguages
+ For Each sLanguage In oLanguages.Keys 'For all languages...
+ If (bRunFromCmd = True) Then 'If run from command line...
+ Wscript.Echo sLanguage
+ End If
+ Set oLanguageTranslations = GetTranslationsFromRcFile(oLanguages(sLanguage))
+ CreateReviewPoFile sLanguage, oOriginalTranslations, oLanguageTranslations
+ Next
+
+ EndTime = Time
+ Seconds = DateDiff("s", StartTime, EndTime)
+
+ Wscript.Echo Wscript.ScriptName & " finished after " & Seconds & " seconds!"
+End Sub
+
+''
+' ...
+Function GetLanguages()
+ Dim oLanguages, oSubFolder, sRcPath
+
+ Set oLanguages = CreateObject("Scripting.Dictionary")
+
+ For Each oSubFolder In oFSO.GetFolder(".").SubFolders 'For all subfolders in the current folder...
+ If (oSubFolder.Name <> ".svn") Then 'If NOT a SVN folder...
+ sRcPath = oFSO.BuildPath(oSubFolder.Path, "Merge" & oSubFolder.Name & ".rc")
+ If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
+ oLanguages.Add oSubFolder.Name, sRcPath
+ End If
+ End If
+ Next
+ Set GetLanguages = oLanguages
+End Function
+
+''
+' ...
+Function GetTranslationsFromRcFile(ByVal sRcPath)
+ Dim oTranslations, oTextFile, sLine
+ Dim oMatch, iBlockType, sKey1, sKey2, iPosition, sValue
+ Dim sCodePage
+
+ Set oTranslations = CreateObject("Scripting.Dictionary")
+
+ If (oFSO.FileExists(sRcPath) = True) Then
+ iBlockType = NO_BLOCK
+ sKey1 = ""
+ sKey2 = ""
+ iPosition = 0
+ sCodePage = ""
+ Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
+ Do Until oTextFile.AtEndOfStream = True
+ sLine = Trim(oTextFile.ReadLine)
+
+ sValue = ""
+
+ If (FoundRegExpMatch(sLine, "(IDR_.*) MENU", oMatch) = True) Then 'MENU...
+ iBlockType = MENU_BLOCK
+ sKey1 = oMatch.SubMatches(0)
+ iPosition = 0
+ ElseIf (FoundRegExpMatch(sLine, "(IDD_.*) DIALOGEX", oMatch) = True) Then 'DIALOGEX...
+ iBlockType = DIALOGEX_BLOCK
+ sKey1 = oMatch.SubMatches(0)
+ iPosition = 0
+ ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
+ iBlockType = STRINGTABLE_BLOCK
+ sKey1 = "STRINGTABLE"
+ 'iPosition = 0
+ ElseIf (FoundRegExpMatch(sLine, "(VS_.*) VERSIONINFO", oMatch) = True) Then 'VERSIONINFO...
+ iBlockType = VERSIONINFO_BLOCK
+ sKey1 = "VERSIONINFO"
+ iPosition = 0
+ ElseIf (sLine = "END") Then 'END...
+ If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
+ iBlockType = NO_BLOCK
+ sKey1 = ""
+ 'iPosition = 0
+ End If
+ ElseIf (sLine <> "") Then 'If NOT empty line...
+ Select Case iBlockType
+ Case NO_BLOCK:
+ If (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
+ sCodePage = oMatch.SubMatches(0)
+ End If
+
+ Case MENU_BLOCK:
+ If (FoundRegExpMatch(sLine, "POPUP ""(.*)""", oMatch) = True) Then 'POPUP...
+ If (InStr(oMatch.SubMatches(0), "_POPUP_") = 0) Then
+ sKey2 = iPosition
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "MENUITEM.*""(.*)"".*(ID_.*)", oMatch) = True) Then 'MENUITEM...
+ sKey2 = oMatch.SubMatches(1)
+ sValue = oMatch.SubMatches(0)
+ End If
+
+ Case DIALOGEX_BLOCK:
+ If (FoundRegExpMatch(sLine, "CAPTION.*""(.*)""", oMatch) = True) Then 'CAPTION...
+ sKey2 = "CAPTION"
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "PUSHBUTTON.*""(.*)"",(\w+)", oMatch) = True) Then 'DEFPUSHBUTTON/PUSHBUTTON...
+ sKey2 = oMatch.SubMatches(1)
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "[L|R|C]TEXT.*""(.*)"",(\w+)", oMatch) = True) Then 'LTEXT/RTEXT...
+ If (oMatch.SubMatches(0) <> "") And (oMatch.SubMatches(0) <> "Static") Then
+ If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
+ sKey2 = oMatch.SubMatches(1)
+ Else
+ sKey2 = iPosition & "_TEXT"
+ iPosition = iPosition + 1
+ End If
+ sValue = oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "[L|R]TEXT.*""(.*)"",", oMatch) = True) Then 'LTEXT/RTEXT (without ID)...
+ sKey2 = iPosition & "_TEXT"
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",(\w+)", oMatch) = True) Then 'CONTROL...
+ If (oMatch.SubMatches(0) <> "Dif") And (oMatch.SubMatches(0) <> "Btn") And (oMatch.SubMatches(0) <> "Button1") _
+ And (oMatch.SubMatches(0) <> "List1") And (oMatch.SubMatches(0) <> "Tree1") Then
+ sKey2 = oMatch.SubMatches(1)
+ sValue = oMatch.SubMatches(0)
+ End If
+ ElseIf (FoundRegExpMatch(sLine, "CONTROL +""(.*?)"",", oMatch) = True) Then 'CONTROL (without ID)...
+ sKey2 = iPosition & "_CONTROL"
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ ElseIf (FoundRegExpMatch(sLine, "GROUPBOX +""(.*?)"",(\w+)", oMatch) = True) Then 'GROUPBOX...
+ If (oMatch.SubMatches(1) <> "IDC_STATIC") Then
+ sKey2 = oMatch.SubMatches(1)
+ Else
+ sKey2 = iPosition & "_GROUPBOX"
+ iPosition = iPosition + 1
+ End If
+ sValue = oMatch.SubMatches(0)
+ End If
+
+ Case STRINGTABLE_BLOCK:
+ If (FoundRegExpMatch(sLine, "(\w+).*""(.*)""", oMatch) = True) Then 'String...
+ sKey2 = oMatch.SubMatches(0)
+ sValue = oMatch.SubMatches(1)
+ ElseIf (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) Then 'String (without ID)...
+ sKey2 = iPosition
+ iPosition = iPosition + 1
+ sValue = oMatch.SubMatches(0)
+ End If
+
+ Case VERSIONINFO_BLOCK:
+ '...
+ '...
+ '...
+
+ End Select
+ End If
+
+ If (sValue <> "") Then
+ oTranslations.Add sKey1 & "." & sKey2, sValue
+ End If
+ Loop
+ oTextFile.Close
+
+ oTranslations.Add "code_page", sCodePage
+ End If
+ Set GetTranslationsFromRcFile = oTranslations
+End Function
+
+''
+' ...
+Sub CreateReviewPoFile(ByVal sLanguage, ByVal oOriginalTranslations, ByVal oLanguageTranslations)
+ Dim oPoFile, sKey
+ Dim sOriginalTranslation, sLanguageTranslation
+
+ Set oPoFile = oFSO.CreateTextFile(sLanguage & "\" & sLanguage & "Review.po", True)
+
+ oPoFile.WriteLine "# DO NOT EDIT THIS FILE!"
+ oPoFile.WriteLine "# This file is only for easier reviewing of the WinMerge translation..."
+ oPoFile.WriteLine "#"
+ oPoFile.WriteLine "msgid """""
+ oPoFile.WriteLine "msgstr """""
+ oPoFile.WriteLine """Project-Id-Version: \n"""
+ oPoFile.WriteLine """Report-Msgid-Bugs-To: \n"""
+ oPoFile.WriteLine """POT-Creation-Date: \n"""
+ oPoFile.WriteLine """PO-Revision-Date: \n"""
+ oPoFile.WriteLine """Last-Translator: \n"""
+ oPoFile.WriteLine """Language-Team: \n"""
+ oPoFile.WriteLine """MIME-Version: 1.0\n"""
+ oPoFile.WriteLine """Content-Type: text/plain; charset=CP" & oLanguageTranslations("code_page") & "\n"""
+ oPoFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
+ oPoFile.WriteLine
+ For Each sKey In oOriginalTranslations.Keys 'For all original translations...
+ If (sKey <> "code_page") Then
+ sOriginalTranslation = oOriginalTranslations(sKey)
+ sLanguageTranslation = oLanguageTranslations(sKey)
+ oPoFile.WriteLine "#: " & sKey
+ If (sOriginalTranslation = sLanguageTranslation) Then 'If MAYBE NOT translated...
+ oPoFile.WriteLine "#, fuzzy"
+ End If
+ oPoFile.WriteLine "msgid """ & sOriginalTranslation & """"
+ oPoFile.WriteLine "msgstr """ & sLanguageTranslation & """"
+ oPoFile.WriteLine
+ End If
+ Next
+ oPoFile.Close
+End Sub
+
+''
+' ...
+Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
+ Dim oRegExp, oMatches
+
+ Set oRegExp = New RegExp
+ oRegExp.Pattern = sPattern
+ oRegExp.IgnoreCase = True
+
+ oMatchReturn = Null
+ FoundRegExpMatch = False
+ If (oRegExp.Test(sString) = True) Then
+ Set oMatches = oRegExp.Execute(sString)
+ Set oMatchReturn = oMatches(0)
+ FoundRegExpMatch = True
+ End If
+End Function
Property changes on: branches/R2_6/Src/Languages/CreateReviewPoFiles.vbs
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2007-10-11 17:30:47
|
Revision: 4607
http://winmerge.svn.sourceforge.net/winmerge/?rev=4607&view=rev
Author: kimmov
Date: 2007-10-11 10:30:43 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
PATCH: [ 1810539 ] ShellExtensionChineseTraditional.rc for 2.6.12 updated
Submitted by Wei-cheng
Modified Paths:
--------------
branches/R2_6/ShellExtension/Languages/ShellExtensionChineseTraditional.rc
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/Languages/ShellExtensionChineseTraditional.rc
===================================================================
--- branches/R2_6/ShellExtension/Languages/ShellExtensionChineseTraditional.rc 2007-10-11 17:26:50 UTC (rev 4606)
+++ branches/R2_6/ShellExtension/Languages/ShellExtensionChineseTraditional.rc 2007-10-11 17:30:43 UTC (rev 4607)
@@ -30,16 +30,16 @@
STRINGTABLE
BEGIN
- IDS_PROJNAME "ShellExtension"
+ IDS_PROJNAME "\xA8t\xB2Τ\xB6\xAD\xB1\xA9\xB5\xA6\xF9"
IDS_CONTEXT_MENU "WinMerge"
- IDS_CONTEXT_HELP "Open with WinMerge"
- IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 2 items"
- IDS_COMPARE "Compare"
- IDS_COMPARE_ELLIPSIS "Compare..."
- IDS_COMPARE_TO "Compare To"
- IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path."
- IDS_HELP_COMPARESAVED "Compare to saved path (%1)"
- IDS_RESELECT_FIRST "Re-select First"
+ IDS_CONTEXT_HELP "\xA5H WinMerge \xB6}\xB1\xD2"
+ IDS_CONTEXT_HELP_MANYITEMS "\xBDФſ\xEF\xA8\xE2\xADӥH\xA4W\xAA\xBA\xB6\xB5\xA5\xD8"
+ IDS_COMPARE "\xA4\xF1\xB8\xFB"
+ IDS_COMPARE_ELLIPSIS "\xA4\xF1\xB8\xFB..."
+ IDS_COMPARE_TO "\xA4\xF1\xB8\xFB\xA8\xEC"
+ IDS_HELP_SAVETHIS "\xC0x\xA6s\xA6\xB9\xB8\xF4\xAE|\xA1C\xBF\xEF\xA5t\xA4@\xB8\xF4\xAE|\xBBP\xA6\xB9\xB8\xF4\xAE|\xA4\xF1\xB8\xFB\xA1C"
+ IDS_HELP_COMPARESAVED "\xBBP\xC0x\xA6s\xAA\xBA\xB8\xF4\xAE|\xA4\xF1\xB8\xFB (%1)"
+ IDS_RESELECT_FIRST "\xAD\xAB\xBF\xEF\xB2Ĥ@\xAD\xD3"
END
#endif // Chinese (Traditional) resources
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-10-11 17:26:50 UTC (rev 4606)
+++ branches/R2_6/Src/Changes.txt 2007-10-11 17:30:43 UTC (rev 4607)
@@ -6,6 +6,9 @@
PATCH: [ 1810171 ] MergeChineseTraditional.rc of 2.6.12 updated
Submitted by Wei-cheng
Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
+ PATCH: [ 1810539 ] ShellExtensionChineseTraditional.rc for 2.6.12 updated
+ Submitted by Wei-cheng
+ ShellExtension/Languages: ShellExtensionChineseTraditional.rc
2007-09-26 2.6.12 Stable Release (R4567)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-11-21 22:01:33
|
Revision: 4784
http://winmerge.svn.sourceforge.net/winmerge/?rev=4784&view=rev
Author: gerundt
Date: 2007-11-21 14:01:32 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Introduction.xml
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-11-21 22:01:32 UTC (rev 4784)
@@ -1,3 +1,7 @@
+2007-11-21 Tim
+ BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
+ Manual: Introduction.xml
+
2007-10-11 Kimmo
Bump manual version to 1.2.11 and update copyright year
Manual: WinMerge_help.xml
Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Introduction.xml 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2007-11-21 22:01:32 UTC (rev 4784)
@@ -27,7 +27,7 @@
reliable program to use.</para>
<para>Please note that WinMerge is not a freeware, but it is <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licenced. We have
+ url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licenced. We have
given you a good tool for free, so please follow our licence and submit your
improvements back to us. We are happy to get help improving WinMerge
further. It is advantage for all WinMerge users.</para>
@@ -199,7 +199,7 @@
url="http://sourceforge.net/tracker/?group_id=13216&atid=313216">patches</ulink>
and help improve this product! If you publish your altered version, you
are required to publish changes source code too, it is what <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licence is about.
+ url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licence is about.
Please respect it.</para>
<para>While WinMerge development has been fast in last couple of years,
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Src/Changes.txt 2007-11-21 22:01:32 UTC (rev 4784)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-11-21 Tim
+ BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
+ Src: MainFrm.cpp
+
2007-11-11 Kimmo
PATCH: [ 1811745 ] Do not merge ignored differences (with multi selection)
Src: MergeDoc.cpp
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Src/MainFrm.cpp 2007-11-21 22:01:32 UTC (rev 4784)
@@ -808,7 +808,7 @@
void CMainFrame::OnHelpGnulicense()
{
CString spath = GetModulePath() + _T("\\Copying");
- CString url = _T("http://www.gnu.org/copyleft/gpl.html");
+ CString url = _T("http://www.gnu.org/licenses/gpl-2.0.html");
OpenFileOrUrl(spath, url);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-09 18:09:26
|
Revision: 4887
http://winmerge.svn.sourceforge.net/winmerge/?rev=4887&view=rev
Author: kimmov
Date: 2008-01-09 10:09:09 -0800 (Wed, 09 Jan 2008)
Log Message:
-----------
PATCH: [ 1864556 ] Update Manual URL for Merge7z
Modified Paths:
--------------
branches/R2_6/ArchiveSupport/Merge7z/readme.txt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ArchiveSupport/Merge7z/readme.txt
===================================================================
--- branches/R2_6/ArchiveSupport/Merge7z/readme.txt 2008-01-09 15:58:59 UTC (rev 4886)
+++ branches/R2_6/ArchiveSupport/Merge7z/readme.txt 2008-01-09 18:09:09 UTC (rev 4887)
@@ -27,7 +27,7 @@
The WinMerge User's Manual contains a chapter on 7-Zip and archive support.
- http://winmerge.org/2.4/manual/installing.html
+ http://winmerge.org/2.6/manual/installing.html
Configuration information about your current system, and its presence or
absence of archive support, is available from the WinMerge Help/Configuration
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-09 15:58:59 UTC (rev 4886)
+++ branches/R2_6/Src/Changes.txt 2008-01-09 18:09:09 UTC (rev 4887)
@@ -6,6 +6,8 @@
Update copyright year for 2008
Src: Merge.rc
Src/Languages/*: Merge*.rc
+ PATCH: [ 1864556 ] Update Manual URL for Merge7z
+ ArchiveSupport/Merge7z: readme.txt
2008-01-08 Tim
PATCH: [ 1866221 ] PO(T) syntax highlighter
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-01-12 11:56:57
|
Revision: 4899
http://winmerge.svn.sourceforge.net/winmerge/?rev=4899&view=rev
Author: sdottaka
Date: 2008-01-12 03:56:56 -0800 (Sat, 12 Jan 2008)
Log Message:
-----------
BUG: [ 1869821 ] Register.bat doesn't work on W98 and Vista
Modified Paths:
--------------
branches/R2_6/ShellExtension/Register.bat
branches/R2_6/ShellExtension/UnRegister.bat
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/Register.bat
===================================================================
--- branches/R2_6/ShellExtension/Register.bat 2008-01-12 11:56:24 UTC (rev 4898)
+++ branches/R2_6/ShellExtension/Register.bat 2008-01-12 11:56:56 UTC (rev 4899)
@@ -10,27 +10,39 @@
: ShellExtension.dll can be unregistered with command:
: "Register.bat /U"
+IF "%OS%" == "" Set DLLPATH=%0\..\ShellExtension.dll
+IF "%PROCESSOR_ARCHITECTURE%" == "x86" Set DLLPATH=%~dp0%ShellExtensionU.dll
+IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" Set DLLPATH=%~dp0%ShellExtensionX64.dll
+IF "%PROCESSOR_ARCHITECTURE%" == "IA64" Set DLLPATH=%~dp0%ShellExtensionX64.dll
+
IF "%1" == "/u" Goto Uninstall
IF "%1" == "/U" Goto Uninstall
Echo Registering ShellExtension.dll...
-IF "%OS%" == "" RegSvr32 ShellExtension.dll
-IF "%OS%" == "Windows_NT" (
- IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 ShellExtensionU.dll
- IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 ShellExtensionX64.dll
- IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 ShellExtensionX64.dll
-)
-
+IF "%OS%" == "" %WINDIR%\System\RegSvr32 "%DLLPATH%"
+IF "%OS%" == "" Goto End
+Call :ExecuteRegSvr32 "%DLLPATH%"
Goto End
:Uninstall
Echo UnRegistering ShellExtension.dll...
-IF "%OS%" == "" RegSvr32 /u ShellExtension.dll
-IF "%OS%" == "Windows_NT" (
- IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 /u ShellExtensionU.dll
- IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 /u ShellExtensionX64.dll
- IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 /u ShellExtensionX64.dll
+IF "%OS%" == "" %WINDIR%\System\RegSvr32 /u "%DLLPATH%"
+IF "%OS%" == "" Goto End
+Call :ExecuteRegSvr32 /u "%DLLPATH%"
+Goto End
+
+:ExecuteRegSvr32
+Ver | Find "Version 6." > NUL
+IF NOT ERRORLEVEL 1 (
+ rem Windows Vista, Server 2008?
+ Echo args="": For Each a in WScript.Arguments: args = args ^& """" ^& a ^& """ ": Next: CreateObject^("Shell.Application"^).ShellExecute "RegSvr32", args, "", "runas" > "%TEMP%\RegSvr32Elevated.vbs"
+ Wscript //nologo "%TEMP%\RegSvr32Elevated.vbs" %*
+ Del "%TEMP%\RegSvr32Elevated.vbs" 2> NUL
+) Else (
+ rem Windows NT4.0, 2000, XP, Sever 2003
+ RegSvr32 %*
)
+Goto :EOF
:End
CLS
\ No newline at end of file
Modified: branches/R2_6/ShellExtension/UnRegister.bat
===================================================================
--- branches/R2_6/ShellExtension/UnRegister.bat 2008-01-12 11:56:24 UTC (rev 4898)
+++ branches/R2_6/ShellExtension/UnRegister.bat 2008-01-12 11:56:56 UTC (rev 4899)
@@ -1 +1 @@
-Register.bat /u
\ No newline at end of file
+%0\..\Register.bat /u
\ No newline at end of file
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-12 11:56:24 UTC (rev 4898)
+++ branches/R2_6/Src/Changes.txt 2008-01-12 11:56:56 UTC (rev 4899)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-12 Takashi
+ BUG: [ 1869821 ] Register.bat doesn't work on W98 and Vista
+ ShellExtension: Register.bat Unregister.bat
+
2008-01-10 Tim
Fix spelling error "succesfully".
Src: Merge.rc MergeDoc.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-01-15 20:22:37
|
Revision: 4917
http://winmerge.svn.sourceforge.net/winmerge/?rev=4917&view=rev
Author: gerundt
Date: 2008-01-15 12:22:30 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
BUG: [ 1869621 ] xslt support
Modified Paths:
--------------
branches/R2_6/Filters/XML_html.flt
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Filters/XML_html.flt
===================================================================
--- branches/R2_6/Filters/XML_html.flt 2008-01-15 20:20:06 UTC (rev 4916)
+++ branches/R2_6/Filters/XML_html.flt 2008-01-15 20:22:30 UTC (rev 4917)
@@ -12,7 +12,7 @@
## (Inline comments begin with " ##" and extend to the end of the line)
f: \.xml$ ## XML files
-f: \.xlst$
+f: \.xslt$
f: \.dtd$
f: \.html$ ## HTML files
f: \.htm$
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-15 20:20:06 UTC (rev 4916)
+++ branches/R2_6/Src/Changes.txt 2008-01-15 20:22:30 UTC (rev 4917)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-15 Tim
+ BUG: [ 1869621 ] xslt support
+ Submitted by Joel Paula
+ Filters: XML_html.flt
+
2008-01-12 Takashi
BUG: [ 1869821 ] Register.bat doesn't work on W98 and Vista
ShellExtension: Register.bat Unregister.bat
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-01-17 13:54:00
|
Revision: 4927
http://winmerge.svn.sourceforge.net/winmerge/?rev=4927&view=rev
Author: kimmov
Date: 2008-01-17 05:53:55 -0800 (Thu, 17 Jan 2008)
Log Message:
-----------
Bump ShellExtension version to 1.9.4 and update copyright year to 2008
Modified Paths:
--------------
branches/R2_6/ShellExtension/ShellExtension.rc
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_6/ShellExtension/ShellExtension.rc 2008-01-17 00:15:31 UTC (rev 4926)
+++ branches/R2_6/ShellExtension/ShellExtension.rc 2008-01-17 13:53:55 UTC (rev 4927)
@@ -224,8 +224,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,3,0
- PRODUCTVERSION 1,9,3,0
+ FILEVERSION 1,9,4,0
+ PRODUCTVERSION 1,9,4,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -243,15 +243,15 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "ShellExtension Module\0"
- VALUE "FileVersion", "1.9.3.0\0"
+ VALUE "FileVersion", "1.9.4.0\0"
VALUE "InternalName", "ShellExtension\0"
- VALUE "LegalCopyright", "Copyright 2003-2007\0"
+ VALUE "LegalCopyright", "Copyright 2003-2008\0"
VALUE "LegalTrademarks", "\0"
VALUE "OLESelfRegister", "\0"
VALUE "OriginalFilename", "ShellExtension.DLL\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "ShellExtension Module\0"
- VALUE "ProductVersion", "1.9.3.0\0"
+ VALUE "ProductVersion", "1.9.4.0\0"
VALUE "SpecialBuild", "\0"
END
END
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2008-01-17 00:15:31 UTC (rev 4926)
+++ branches/R2_6/Src/Changes.txt 2008-01-17 13:53:55 UTC (rev 4927)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2008-01-17 Kimmo
+ Bump ShellExtension version to 1.9.4 and update copyright year to 2008
+ ShellExtension: ShellExtension.rc
+
2008-01-15 Tim
BUG: [ 1869621 ] xslt support
Submitted by Joel Paula
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
