|
From: <ki...@us...> - 2008-02-27 21:47:31
|
Revision: 5091
http://winmerge.svn.sourceforge.net/winmerge/?rev=5091&view=rev
Author: kimmov
Date: 2008-02-27 13:47:08 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
Show 'Mixed' as file compare EOL style instead of empty style
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/MergeEditView.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-02-27 21:32:40 UTC (rev 5090)
+++ trunk/Docs/Users/ChangeLog.txt 2008-02-27 21:47:08 UTC (rev 5091)
@@ -8,6 +8,7 @@
two or more EOL styles (#1901547)
Indent "Explorer Context Menu" sub options (#1901763)
Replace 'DOS' in EOL style strings with 'Windows' (#1902583)
+ Show 'Mixed' as file compare EOL style instead of empty style (r5091)
BugFix: Ignore codepage specified on File Encoding dialog if file was
detected as UTF-8 (#1900728)
BugFix: Recognize invalid UTF-8 sequence as UTF-8 (#1900733)
Modified: trunk/Src/MergeEditView.cpp
===================================================================
--- trunk/Src/MergeEditView.cpp 2008-02-27 21:32:40 UTC (rev 5090)
+++ trunk/Src/MergeEditView.cpp 2008-02-27 21:47:08 UTC (rev 5091)
@@ -2049,7 +2049,8 @@
if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
GetDocument()->IsMixedEOL() )
{
- pCmdUI->SetText(_T(""));
+ String eol = LoadResString(IDS_EOL_MIXED);
+ pCmdUI->SetText(eol.c_str());
}
else
GetDocument()->GetLeftView()->OnUpdateIndicatorCRLF(pCmdUI);
@@ -2063,7 +2064,8 @@
if (GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) ||
GetDocument()->IsMixedEOL())
{
- pCmdUI->SetText(_T(""));
+ String eol = LoadResString(IDS_EOL_MIXED);
+ pCmdUI->SetText(eol.c_str());
}
else
GetDocument()->GetRightView()->OnUpdateIndicatorCRLF(pCmdUI);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-27 22:07:51
|
Revision: 5092
http://winmerge.svn.sourceforge.net/winmerge/?rev=5092&view=rev
Author: kimmov
Date: 2008-02-27 14:07:47 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
PATCH: [ 1898401 ] A Swedish.po translation update
- Fix typos and improve grammar as suggested by Hans Eriksson
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-02-27 21:47:08 UTC (rev 5091)
+++ trunk/Docs/Users/ChangeLog.txt 2008-02-27 22:07:47 UTC (rev 5092)
@@ -9,6 +9,7 @@
Indent "Explorer Context Menu" sub options (#1901763)
Replace 'DOS' in EOL style strings with 'Windows' (#1902583)
Show 'Mixed' as file compare EOL style instead of empty style (r5091)
+ Typo fixes and grammar improvements to several strings (#1898401)
BugFix: Ignore codepage specified on File Encoding dialog if file was
detected as UTF-8 (#1900728)
BugFix: Recognize invalid UTF-8 sequence as UTF-8 (#1900733)
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-02-27 21:47:08 UTC (rev 5091)
+++ trunk/Src/Languages/English.pot 2008-02-27 22:07:47 UTC (rev 5092)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-27 19:06+0000\n"
+"POT-Creation-Date: 2008-02-28 00:05+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -2109,7 +2109,7 @@
#: Merge.rc:1312
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from help menu.)"
+msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
#: Merge.rc:1316
@@ -5002,12 +5002,12 @@
#: Merge.rc:2632
#, c-format
-msgid "Select the current user interfacce language\nLanguage"
+msgid "Select the current user interface language\nLanguage"
msgstr ""
#: Merge.rc:2633
#, c-format
-msgid "Shows differences inside lines with different color\nShow Line Diff"
+msgid "Shows differences inside lines with different colors\nShow Line Difference"
msgstr ""
#: Merge.rc:2634
@@ -5047,27 +5047,27 @@
#: Merge.rc:2646
#, c-format
-msgid "Scroll to the previous difference\nPrev Diff (Alt+Up)"
+msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
msgstr ""
#: Merge.rc:2647
#, c-format
-msgid "Scroll to the next difference\nNext Diff (Alt+Down)"
+msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
msgstr ""
#: Merge.rc:2648
#, c-format
-msgid "Scroll to the first difference\nFirst Diff (Alt+Home)"
+msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
msgstr ""
#: Merge.rc:2649
#, c-format
-msgid "Scroll to the current difference\nCurrent Diff (Alt+Enter)"
+msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
msgstr ""
#: Merge.rc:2650
#, c-format
-msgid "Scroll to the last difference\nLast Diff (Alt+End)"
+msgid "Scroll to the last difference\nLast Difference (Alt+End)"
msgstr ""
#: Merge.rc:2651
@@ -5167,7 +5167,7 @@
#: Merge.rc:2685
#, c-format
-msgid "Activates next file visible\nActive next File"
+msgid "Activates next visible file\nActivate next File"
msgstr ""
#: Merge.rc:2686
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-02-27 21:47:08 UTC (rev 5091)
+++ trunk/Src/Merge.rc 2008-02-27 22:07:47 UTC (rev 5092)
@@ -1309,7 +1309,7 @@
CTEXT "",131,204,144,58,10,SS_CENTERIMAGE | SS_SUNKEN
CTEXT "outdated",132,264,144,34,10,SS_CENTERIMAGE | SS_SUNKEN
LTEXT "Plugins on path:",9001,2,160,142,8
- CONTROL "Don't display this &message again.\n(You can always recall this message from help menu.)",
+ CONTROL "Don't display this &message again.\n(You can always recall this message from the Help menu.)",
106,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE |
WS_TABSTOP,2,225,218,18
DEFPUSHBUTTON "OK",IDOK,248,226,50,14,WS_GROUP
@@ -2629,8 +2629,8 @@
ID_VIEW_DETAIL_BAR "Toggle Diff Pane"
ID_VIEW_LOCATION_BAR "Location pane shows overall picture from files"
ID_VIEW_DIR_STATISTICS "Show folder compare statistics dialog"
- ID_VIEW_LANGUAGE "Select the current user interfacce language\nLanguage"
- ID_VIEW_LINEDIFFS "Shows differences inside lines with different color\nShow Line Diff"
+ ID_VIEW_LANGUAGE "Select the current user interface language\nLanguage"
+ ID_VIEW_LINEDIFFS "Shows differences inside lines with different colors\nShow Line Difference"
ID_VIEW_SWAPPANES "Swap the positions of the two panes"
ID_VIEW_LINENUMBERS "Shows line numbers\nShow Line Numbers"
ID_VIEW_WORDWRAP "Enable word wrap\nWrap Lines"
@@ -2643,11 +2643,11 @@
// MERGE MENU
STRINGTABLE
BEGIN
- ID_PREVDIFF "Scroll to the previous difference\nPrev Diff (Alt+Up)"
- ID_NEXTDIFF "Scroll to the next difference\nNext Diff (Alt+Down)"
- ID_FIRSTDIFF "Scroll to the first difference\nFirst Diff (Alt+Home)"
- ID_CURDIFF "Scroll to the current difference\nCurrent Diff (Alt+Enter)"
- ID_LASTDIFF "Scroll to the last difference\nLast Diff (Alt+End)"
+ ID_PREVDIFF "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
+ ID_NEXTDIFF "Scroll to the next difference\nNext Difference (Alt+Down)"
+ ID_FIRSTDIFF "Scroll to the first difference\nFirst Difference (Alt+Home)"
+ ID_CURDIFF "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
+ ID_LASTDIFF "Scroll to the last difference\nLast Difference (Alt+End)"
ID_L2R "Copy the selected text to the right file\nCopy Right (Alt+Right)"
ID_R2L "Copy the selected text to the left file\nCopy Left (Alt+Left)"
ID_L2RNEXT "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
@@ -2682,7 +2682,7 @@
// WINDOW MENU
STRINGTABLE
BEGIN
- ID_WINDOW_CHANGE_PANE "Activates next file visible\nActive next File"
+ ID_WINDOW_CHANGE_PANE "Activates next visible file\nActivate next File"
ID_WINDOW_CLOSEALL "Closes all open windows"
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-02-28 17:27:51
|
Revision: 5096
http://winmerge.svn.sourceforge.net/winmerge/?rev=5096&view=rev
Author: kimmov
Date: 2008-02-28 09:27:45 -0800 (Thu, 28 Feb 2008)
Log Message:
-----------
PATCH: [ 1901784 ] A Swedish Swedish.po translation update...
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Swedish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-02-28 17:10:39 UTC (rev 5095)
+++ trunk/Docs/Users/ChangeLog.txt 2008-02-28 17:27:45 UTC (rev 5096)
@@ -17,6 +17,7 @@
Translation updates:
- Czech (r5073)
- Japanese (r5076)
+ - Swedish (#1901784)
WinMerge 2.7.7.5 - 2008-02-22 (r5069)
Cleaning up Help-menu (#1875111)
Modified: trunk/Src/Languages/Swedish.po
===================================================================
--- trunk/Src/Languages/Swedish.po 2008-02-28 17:10:39 UTC (rev 5095)
+++ trunk/Src/Languages/Swedish.po 2008-02-28 17:27:45 UTC (rev 5096)
@@ -411,7 +411,7 @@
#: Merge.rc:478
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "K&onfiguration"
#: Merge.rc:180
#: Merge.rc:294
@@ -425,7 +425,7 @@
#: Merge.rc:481
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
#: Merge.rc:183
#: Merge.rc:297
@@ -627,18 +627,18 @@
#: Merge.rc:332
#, c-format
-msgid "&DOS (CRLF)"
-msgstr "&DOS (CRLF)"
+msgid "&Windows (CRLF)"
+msgstr ""
#: Merge.rc:333
#, c-format
-msgid "&UNIX (LF)"
-msgstr "&UNIX (LF)"
+msgid "&Unix (LF)"
+msgstr ""
#: Merge.rc:334
#, c-format
-msgid "&MAC (CR)"
-msgstr "&MAC (CR)"
+msgid "&Mac (CR)"
+msgstr ""
#: Merge.rc:337
#, c-format
@@ -1581,22 +1581,22 @@
#: Merge.rc:992
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "Bl\xE4ddra..."
#: Merge.rc:993
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "Katalog f\xF6r Tempor\xE4ra filer"
#: Merge.rc:994
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "S&ystemets tempor\xE4ra katalog"
#: Merge.rc:996
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "A&npassad katalog:"
#: Merge.rc:999
#: Merge.rc:1015
@@ -1828,8 +1828,8 @@
#: Merge.rc:1156
#, c-format
-msgid "Igno&re carriage return differences (DOS/UNIX/MAC)"
-msgstr "Igno&rera skillnader i radslut (DOS/UNIX/MAC)"
+msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
+msgstr ""
#: Merge.rc:1159
#, c-format
@@ -1844,7 +1844,7 @@
#: Merge.rc:1163
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ignorera tidsskillnad mindre \xE4n 3 sekunder"
+msgstr "Ign&orera tidsskillnad mindre \xE4n 3 sekunder"
#: Merge.rc:1166
#, c-format
@@ -2129,12 +2129,8 @@
#: Merge.rc:1312
#, c-format
-msgid ""
-"Don't display this &message again.\n"
-"(You can always recall this message from help menu.)"
+msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
msgstr ""
-"Visa inte detta &meddelande igen.\n"
-"(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)"
#: Merge.rc:1316
#, c-format
@@ -2782,7 +2778,7 @@
#: Merge.rc:1768
#, c-format
msgid "Open this document"
-msgstr "\xD6ppna det h\xE4r dokumentet"
+msgstr "\xD6ppna detta dokument"
#: Merge.rc:1773
#, c-format
@@ -3039,7 +3035,7 @@
#: Merge.rc:1866
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr ""
+msgstr "WinMerge kommer med ABSOLUT INGA GARANTIER. Detta \xE4r fri programvara och du \xE4r v\xE4lkommen att vidaredistribuera den under vissa omst\xE4ndigheter; se GNU General Public License i Hj\xE4lpmenyn f\xF6r detaljer."
#: Merge.rc:1872
#, c-format
@@ -3246,22 +3242,22 @@
#: Merge.rc:1964
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:1965
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:1966
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:1967
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:1973
#, c-format
@@ -3397,7 +3393,7 @@
#: Merge.rc:2008
#, c-format
msgid "Regular expression"
-msgstr "Regulj\xE4ra uttryck"
+msgstr "Regulj\xE4rt uttryck"
#: Merge.rc:2014
#, c-format
@@ -4518,14 +4514,8 @@
#: Merge.rc:2349
#, c-format
-msgid ""
-"The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n"
-" With the current options, they will be unified to the main type.\n"
-" Do you want to change the options and preserve the different EOL ?"
+msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
msgstr ""
-"Radsluten \xE4r av olika typer (DOS/UNIX/MAC) i filen '%1'.\n"
-" Med de aktuella inst\xE4llningarna, kommer de att \xE4ndras till den vanligaste typen.\n"
-" Vill du \xE4ndra i inst\xE4llningarna och bevara de olika radsluten ?"
#: Merge.rc:2350
#, c-format
@@ -5148,17 +5138,17 @@
#: Merge.rc:2562
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2563
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2564
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2571
#, c-format
@@ -5222,18 +5212,18 @@
#: Merge.rc:2589
#, c-format
-msgid "Convert EOL to DOS mode"
-msgstr "Konverterar radslut till DOS-format"
+msgid "Convert EOL to Windows mode"
+msgstr ""
#: Merge.rc:2590
#, c-format
-msgid "Convert EOL to UNIX mode"
-msgstr "Konverterar radslut till UNIX-format"
+msgid "Convert EOL to Unix mode"
+msgstr ""
#: Merge.rc:2591
#, c-format
-msgid "Convert EOL to MAC mode"
-msgstr "Konverterar radslut till MAC-format"
+msgid "Convert EOL to Mac mode"
+msgstr ""
#: Merge.rc:2592
#, c-format
@@ -5414,18 +5404,14 @@
#: Merge.rc:2632
#, c-format
-msgid ""
-"Select the current user interfacce language\n"
-"Language"
+msgid "Select the current user interface language\nLanguage"
msgstr ""
"V\xE4ljer spr\xE5k f\xF6r anv\xE4ndargr\xE4nssnittet\n"
"Spr\xE5k"
#: Merge.rc:2633
#, c-format
-msgid ""
-"Shows differences inside lines with different color\n"
-"Show Line Diff"
+msgid "Shows differences inside lines with different colors\nShow Line Difference"
msgstr ""
"Visar skillnader inom rader med olika f\xE4rg\n"
"Visa radskillnad"
@@ -5479,48 +5465,33 @@
#: Merge.rc:2646
#, c-format
-msgid ""
-"Scroll to the previous difference\n"
-"Prev Diff (Alt+Up)"
+msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
msgstr ""
-"G\xE5r till f\xF6reg\xE5ende skillnad\n"
-"F\xF6reg\xE5ende skillnad (Alt+Upp)"
+"G\xE5r till f\xF6reg\xE5ende skillnad\nF\xF6reg\xE5ende skillnad (Alt+Upp)"
#: Merge.rc:2647
#, c-format
-msgid ""
-"Scroll to the next difference\n"
-"Next Diff (Alt+Down)"
+msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
msgstr ""
-"G\xE5r till n\xE4sta skillnad\n"
-"N\xE4sta skillnad (Alt+Ner)"
+"G\xE5r till n\xE4sta skillnad\nN\xE4sta skillnad (Alt+Ner)"
#: Merge.rc:2648
#, c-format
-msgid ""
-"Scroll to the first difference\n"
-"First Diff (Alt+Home)"
+msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
msgstr ""
-"G\xE5r till f\xF6rsta skillnaden\n"
-"F\xF6rsta skillnad (Alt+Home)"
+"G\xE5r till f\xF6rsta skillnaden\nF\xF6rsta skillnad (Alt+Home)"
#: Merge.rc:2649
#, c-format
-msgid ""
-"Scroll to the current difference\n"
-"Current Diff (Alt+Enter)"
+msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
msgstr ""
-"G\xE5r till aktuell skillnad\n"
-"Aktuell skillnad (Alt+Enter)"
+"G\xE5r till aktuell skillnad\nAktuell skillnad (Alt+Enter)"
#: Merge.rc:2650
#, c-format
-msgid ""
-"Scroll to the last difference\n"
-"Last Diff (Alt+End)"
+msgid "Scroll to the last difference\nLast Difference (Alt+End)"
msgstr ""
-"G\xE5r till sista skillnaden\n"
-"Sista skillnad (Alt+End)"
+"G\xE5r till sista skillnaden\nSista skillnad (Alt+End)"
#: Merge.rc:2651
#, c-format
@@ -5643,12 +5614,9 @@
#: Merge.rc:2685
#, c-format
-msgid ""
-"Activates next file visible\n"
-"Active next File"
+msgid "Activates next visible file\nActivate next File"
msgstr ""
-"V\xE4xlar mellan h\xF6ger och v\xE4nster fil\n"
-"V\xE4xla fil"
+"Aktiverar n\xE4sta synliga fil\nAktivera n\xE4sta fil"
#: Merge.rc:2686
#, c-format
@@ -5668,7 +5636,7 @@
#: Merge.rc:2694
#, c-format
msgid "Display the GNU General Public License"
-msgstr ""
+msgstr "Visar GNU General Public License"
#: Merge.rc:2695
#, c-format
@@ -5683,12 +5651,12 @@
#: Merge.rc:2697
#, c-format
msgid "Opens the translations website\nTranslations"
-msgstr "\xD6ppnar \xF6vers\xE4ttningssidan\n\xD6vers\xE4ttningar"
+msgstr "\xD6ppnar \xD6vers\xE4ttningssidan\n\xD6vers\xE4ttningar"
#: Merge.rc:2703
#, c-format
msgid "Plugin Settings"
-msgstr "Plugin Inst\xE4llningar"
+msgstr "Plugin-inst\xE4llningar"
#: Merge.rc:2704
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-03-03 15:32:16
|
Revision: 5105
http://winmerge.svn.sourceforge.net/winmerge/?rev=5105&view=rev
Author: sdottaka
Date: 2008-03-03 07:32:04 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
BUG: [ 1904355 ] Copy&Paste from VB6 add binary chars
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/editlib/ccrystaltextview2.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-02-28 23:47:28 UTC (rev 5104)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-03 15:32:04 UTC (rev 5105)
@@ -2,6 +2,9 @@
Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
to Subversion revision numbers (rXXXXX).
+WinMerge 2.8 Release Candidate?
+ BugFix: Copy&Paste from VB6 added binary chars (#1904355)
+
WinMerge 2.7.7.6 - 2008-02-28 (r5099)
Remove sintance.h/sintance.cpp as not compatible with GPL (#1886580)
Automatically switch to mixed-EOL mode when loading files with
Modified: trunk/Src/editlib/ccrystaltextview2.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview2.cpp 2008-02-28 23:47:28 UTC (rev 5104)
+++ trunk/Src/editlib/ccrystaltextview2.cpp 2008-03-03 15:32:04 UTC (rev 5105)
@@ -1215,6 +1215,8 @@
GlobalUnlock (hData);
UINT fmt = GetClipTcharTextFormat();
bOK = SetClipboardData (fmt, hData) != NULL;
+ if (bOK)
+ SetClipboardData (RegisterClipboardFormat (_T("WinMergeClipboard")), NULL);
}
CloseClipboard ();
}
@@ -1240,6 +1242,20 @@
memcpy(text.GetBufferSetLength(cchText), pszData, cbData);
GlobalUnlock (hData);
bSuccess = TRUE;
+ BOOL bWinMergeClipboardFormat = FALSE;
+ UINT nFormat = 0;
+ UINT nWinMergeClipboardFormat = RegisterClipboardFormat (_T("WinMergeClipboard"));
+ while (nFormat = EnumClipboardFormats (nFormat))
+ {
+ if (nFormat == nWinMergeClipboardFormat)
+ bWinMergeClipboardFormat = TRUE;
+ }
+ if (!bWinMergeClipboardFormat)
+ {
+ // truncate the data after the first null
+ CString tmp = (LPCTSTR)text;
+ text = tmp;
+ }
}
}
CloseClipboard ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-03 16:06:47
|
Revision: 5106
http://winmerge.svn.sourceforge.net/winmerge/?rev=5106&view=rev
Author: kimmov
Date: 2008-03-03 08:06:21 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
PATCH: [ 1905323 ] Traditional Chinese translation
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/ChineseTraditional.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-03 15:32:04 UTC (rev 5105)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-03 16:06:21 UTC (rev 5106)
@@ -2,8 +2,10 @@
Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or
to Subversion revision numbers (rXXXXX).
-WinMerge 2.8 Release Candidate?
+WinMerge 2.8 Release Candidate
BugFix: Copy&Paste from VB6 added binary chars (#1904355)
+ Translation updates:
+ - Chinese Traditional (#1905323)
WinMerge 2.7.7.6 - 2008-02-28 (r5099)
Remove sintance.h/sintance.cpp as not compatible with GPL (#1886580)
Modified: trunk/Src/Languages/ChineseTraditional.po
===================================================================
--- trunk/Src/Languages/ChineseTraditional.po 2008-03-03 15:32:04 UTC (rev 5105)
+++ trunk/Src/Languages/ChineseTraditional.po 2008-03-03 16:06:21 UTC (rev 5106)
@@ -12,9 +12,9 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-11-02 22:40+0800\n"
-"Last-Translator: \xC5Ǻ\xFB\xA5\xBF <wck3171 at pchome.com.tw>\n"
+"POT-Creation-Date: 2008-02-28 00:05+0000\n"
+"PO-Revision-Date: 2008-03-01 22:22+0800\n"
+"Last-Translator: \xC5Ǻ\xFB\xA5\xBF <wc...@pc...>\n"
"Language-Team: ChineseTraditional <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP950\n"
@@ -138,7 +138,7 @@
#: Merge.rc:114
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "\xB6}\xB1ҽĬ\xF0\xC0\xC9(&E)..."
#: Merge.rc:116
#: Merge.rc:194
@@ -262,7 +262,7 @@
#: Merge.rc:438
#, c-format
msgid "&Filters..."
-msgstr "\xBFz\xBF\xEF\xA4覡(&F)..."
+msgstr "\xBFz\xBFﾹ(&F)..."
#: Merge.rc:146
#: Merge.rc:259
@@ -278,6 +278,7 @@
msgid "&Plugins"
msgstr "\xA5~\xB1\xBE(&P)"
+# "\xA4\xE2\xB0ʸ\xD1\xC0\xA3\xC1Y(&M)"
#: Merge.rc:150
#: Merge.rc:264
#: Merge.rc:444
@@ -285,6 +286,7 @@
msgid "&Manual Unpacking"
msgstr "\xA4\xE2\xB0ʸѶ}\xABD\xAF¤\xE5\xA6r\xC0\xC9(&M)"
+# "\xA6۰ʸ\xD1\xC0\xA3\xC1Y(&A)"
#: Merge.rc:151
#: Merge.rc:265
#: Merge.rc:445
@@ -390,28 +392,28 @@
#: Merge.rc:474
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "WinMerge \xBB\xA1\xA9\xFA(&W)\tF1"
#: Merge.rc:177
#: Merge.rc:291
#: Merge.rc:476
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "\xB5o\xA6满\xA9\xFA(&E)"
#: Merge.rc:178
#: Merge.rc:292
#: Merge.rc:477
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "½Ķ(&T)"
#: Merge.rc:179
#: Merge.rc:293
#: Merge.rc:478
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "\xB2պA(&O)"
#: Merge.rc:180
#: Merge.rc:294
@@ -425,7 +427,7 @@
#: Merge.rc:481
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "GNU \xA4\xBD\xA6@\xB1\xC2\xC5v\xC3\xD2(&G)"
#: Merge.rc:183
#: Merge.rc:297
@@ -628,17 +630,17 @@
#: Merge.rc:332
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:333
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:334
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:337
#, c-format
@@ -648,7 +650,7 @@
#: Merge.rc:339
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "\xC0ɮs\xBDX(&F)..."
#: Merge.rc:345
#, c-format
@@ -744,23 +746,23 @@
#: Merge.rc:383
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "\xA9Ԫ\xF1\xA9Ի\xB7(&Z)"
#: Merge.rc:385
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "\xA9Ԫ\xF1(&I)\tCtrl++"
#: Merge.rc:386
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "\xB1\xC0\xBB\xB7(&O)\tCtrl+-"
#. Zoom to normal
#: Merge.rc:387
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "\xAB\xEC\xB4_\xAD\xEC\xA9l(&N)\tCtrl+*"
#: Merge.rc:389
#, c-format
@@ -845,12 +847,12 @@
#: Merge.rc:491
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "\xA4\xF1\xB8\xFB\xAFS\xA9w\xAE榡(&M)"
#: Merge.rc:493
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:498
#, c-format
@@ -1107,7 +1109,7 @@
#: Merge.rc:1594
#, c-format
msgid "&Filter:"
-msgstr "\xBFz\xBF\xEF\xA4覡(&F)\xA1G"
+msgstr "\xBFz\xBFﾹ(&F)\xA1G"
#: Merge.rc:684
#: Merge.rc:1596
@@ -1263,10 +1265,11 @@
msgid "As&k when closing multiple windows"
msgstr "\xC3h\xAD\xAB\xB5\xF8\xB5\xA1\xAEɥ\xFD\xB8߰\xDD(&K)"
+# "\xA4\xF1\xB8\xFB\xAEɫO\xAFd\xC0ɮɶ\xA1(&P)"
#: Merge.rc:758
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "\xA4\xF1\xB8\xFB\xC0ɮɫO\xAFd\xC0ɮɶ\xA1(&P)"
#: Merge.rc:761
#, c-format
@@ -1430,12 +1433,12 @@
#: Merge.rc:868
#, c-format
msgid "Linefilters"
-msgstr "\xA6椧\xBFz\xBF\xEF\xA4覡"
+msgstr "\xA6椧\xBFz\xB0\xA3\xBE\xB9"
#: Merge.rc:871
#, c-format
msgid "Enable Line Filters"
-msgstr "\xB1ҥΦ\xE6\xBFz\xBF\xEF\xA4覡"
+msgstr "\xB1ҥΦ\xE6\xBFz\xB0\xA3\xBE\xB9"
#: Merge.rc:874
#, c-format
@@ -1576,27 +1579,27 @@
#: Merge.rc:990
#, c-format
msgid "&Filter folder:"
-msgstr "\xB8\xEA\xAEƧ\xA8\xBFz\xBF\xEF\xA4覡(&F)\xA1G"
+msgstr "\xB8\xEA\xAEƧ\xA8\xBFz\xBFﾹ(&F)\xA1G"
#: Merge.rc:992
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "\xC2s\xC4\xFD(&R)..."
#: Merge.rc:993
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "\xBCȦs\xC0ɸ\xEA\xAEƧ\xA8"
#: Merge.rc:994
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "\xA8t\xB2Ϊ\xBA\xBCȦs\xB8\xEA\xAEƧ\xA8(&Y)"
#: Merge.rc:996
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "\xA6ۭq\xB8\xEA\xAEƧ\xA8(&U)\xA1G"
#: Merge.rc:999
#: Merge.rc:1015
@@ -1829,7 +1832,7 @@
#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "\xA9\xBF\xB2\xA4\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xA4\xA7\xAEt\xB2\xA7(Windows/Unix/Mac)(&R)"
#: Merge.rc:1159
#, c-format
@@ -1859,7 +1862,7 @@
#: Merge.rc:1172
#, c-format
msgid "Filter Comments"
-msgstr "\xBFz\xBF\xEF\xA4覡\xA4\xA7\xB5\xF9"
+msgstr "\xBFz\xBFﾹ\xA4\xA7\xB5\xF9"
#: Merge.rc:1179
#: Merge.rc:1900
@@ -1925,7 +1928,7 @@
#: Merge.rc:1217
#, c-format
msgid "Filefilters"
-msgstr "\xC0ɮz\xBF\xEF\xA4覡"
+msgstr "\xC0ɮz\xBFﾹ"
#: Merge.rc:1223
#, c-format
@@ -2041,7 +2044,7 @@
#: Merge.rc:1281
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr "\xA4\xA3\xAF\xB4\xFA 7-Zip \xAA\xA9\xA5\xBB(\xA8S\xA6w\xB8˥\xA6\xA1H)"
+msgstr "\xB5L\xAAk\xB4\xFA\xAA\xBE 7-Zip \xAA\xA9\xA5\xBB(\xA8S\xA6w\xB8\xCB 7-Zip \xB6ܡH)"
#: Merge.rc:1284
#, c-format
@@ -2062,12 +2065,14 @@
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
-msgstr "\xB0\xA3\xABD\xA6\xB3\xA7\xF3\xB7s\xAA\xA9\xA5i\xA5ΡA\xAB\xD8ij\xA8ϥΤU\xAD\xB1\xAA\xBA 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xAA\xA9\xA5\xBB\xA1C"
+msgstr ""
+"\xB0\xA3\xABD\xA6\xB3\xA7\xF3\xB7s\xAA\xA9\xA5i\xA5ΡA\xAB\xD8ij\xA8ϥΤU\xAD\xB1\xAA\xBA\n"
+"7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xAA\xA9\xA5\xBB\xA1C"
#: Merge.rc:1290
#, c-format
msgid "Version"
-msgstr "\xAA\xA9\xA5\xBB"
+msgstr "7-Zip \xAA\xA9\xA5\xBB"
#: Merge.rc:1292
#, c-format
@@ -2075,7 +2080,7 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
-"\xA9ҭn\xAA\xBA\xA5~\xB1\xBE\n"
+"\xB8Ӫ\xA9\xA9ҭn\xAA\xBA\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\n"
"(dllbuild %04u)"
#: Merge.rc:1294
@@ -2113,7 +2118,7 @@
#: Merge.rc:1306
#, c-format
msgid "7-Zip components for standalone operation:"
-msgstr "\xA5i\xBFW\xA5߹B\xA7@\xAA\xBA 7-Zip \xA4\xB8\xA5\xF3\xA1G"
+msgstr "WinMerge \xA4\xBA\xA5Ϊ\xBA 7-Zip \xAE֤ߤ\xB8\xA5\xF3\xA1G"
#: Merge.rc:1310
#, c-format
@@ -2123,17 +2128,21 @@
#: Merge.rc:1311
#, c-format
msgid "Plugins on path:"
-msgstr "\xA5~\xB1\xBE\xA9Ҧb\xB8\xF4\xAE|\xA1G"
+msgstr "\xB8\xF4\xAE|\xA4W\xAA\xBA\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1G"
#: Merge.rc:1312
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
msgstr ""
+"\xA4ŦA\xC5\xE3\xA5ܦ\xB9\xB0T\xAE\xA7\xA1C(&M)\n"
+"(\xA4\xB4\xA5i\xA5ѻ\xA1\xA9\xFA\xBF\xEF\xB3椤\xA5s\xA5X\xA5\xA6)"
#: Merge.rc:1316
#, c-format
msgid "Plugin Download"
-msgstr "\xA5~\xB1\xBE\xA4U\xB8\xFC"
+msgstr "\xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA4U\xB8\xFC"
#: Merge.rc:1325
#, c-format
@@ -2244,22 +2253,22 @@
#: Merge.rc:1426
#, c-format
msgid "Shared or Private Filter"
-msgstr "\xA6@\xA5ΩέӤH\xBFz\xBF\xEF\xA4覡"
+msgstr "\xA6@\xA5ΩέӤH\xBFz\xBFﾹ"
#: Merge.rc:1429
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr "\xA7A\xADn\xABإ߭\xFE\xBAؿz\xBF\xEF\xA4覡\xA1H"
+msgstr "\xA7A\xADn\xABإ߭\xFE\xBAؿz\xBFﾹ\xA1H"
#: Merge.rc:1431
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr "\xA6@\xA5οz\xBF\xEF\xA4覡(\xBEA\xA5ΩҦ\xB3\xA8ϥΪ\xCC)"
+msgstr "\xA6@\xA5οz\xBFﾹ(\xBEA\xA5ΩҦ\xB3\xA8ϥΪ\xCC)"
#: Merge.rc:1433
#, c-format
msgid "Private Filter (only for current user)"
-msgstr "\xADӤH\xBFz\xBF\xEF\xA4覡(\xB6ȾA\xA5β{\xA6b\xA8ϥΪ\xCC)"
+msgstr "\xADӤH\xBFz\xBFﾹ(\xB6ȾA\xA5β{\xA6b\xA8ϥΪ\xCC)"
#: Merge.rc:1441
#: Merge.rc:1907
@@ -2267,15 +2276,16 @@
msgid "Archive Support"
msgstr "\xA4䴩\xC0\xA3\xC1Y"
+# \xA1u\xA5H shared installation \xA6w\xB8\xCB7-Zip \xA5~\xB1\xBE\xA4~\xA6\xB3\xA4䴩\xC0\xA3\xC1Y\xA4\xA7\xB1\xF8\xA5\xF3\xA1G\xA1v\xA1u\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G\xA1vI suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead.
#: Merge.rc:1444
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G"
+msgstr "\xA5\xB2\xB6\xB7\xA5\xFD\xA6w\xB8\xCB 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE\xA1A\xA4~\xA4䴩\xC0\xA3\xC1Y\xA1G"
#: Merge.rc:1446
#, c-format
msgid "Download 7-zip Plugin"
-msgstr "\xA4U\xB8\xFC 7-zip \xA5~\xB1\xBE"
+msgstr "\xA4U\xB8\xFC 7-Zip \xA4\xB6\xAD\xB1\xA5~\xB1\xBE"
#: Merge.rc:1447
#, c-format
@@ -2285,12 +2295,12 @@
#: Merge.rc:1449
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr "\xADY\xA6\xB3\xBFW\xA5ߩ\xF3 WinMerge \xAA\xBA 7-Zip\xA1A\xABh\xA5Τ\xA7(&U)"
+msgstr "\xA8ϥοW\xA5ߪ\xBA 7-Zip \xB3n\xC5\xE9(&U)"
#: Merge.rc:1452
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
-msgstr "\xA8ϥΤ\xA3\xBFW\xA5ߩ\xF3 WinMerge \xAA\xBA 7-Zip(&S)"
+msgstr "\xA8ϥΤ\xA3\xBFW\xA5ߩ\xF3 WinMerge \xAA\xBA 7-Zip \xAE֤ߤ\xB8\xA5\xF3(&S)"
#: Merge.rc:1454
#, c-format
@@ -2411,7 +2421,7 @@
#: Merge.rc:1531
#, c-format
msgid "Test Filter"
-msgstr "\xB4\xFA\xB8տz\xBF\xEF\xA4覡"
+msgstr "\xB4\xFA\xB8տz\xBFﾹ"
#: Merge.rc:1534
#, c-format
@@ -3001,13 +3011,41 @@
#: Merge.rc:1837
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"\xC0ɮפ\xF1\xB8\xFB\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.\xC0ɮפ\xF1\xB8\xFB\n"
+"WinMerge \xC0ɮפ\xF1\xB8\xFB"
#: Merge.rc:1838
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
msgstr ""
+"\n"
+"\xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.\xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB\n"
+"WinMerge \xB8\xEA\xAEƧ\xA8\xA4\xF1\xB8\xFB"
#: Merge.rc:1845
#, c-format
@@ -3037,7 +3075,7 @@
#: Merge.rc:1866
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr ""
+msgstr "\xB5\xB4\xA4\xA3\xABO\xC3Ҧۥѳn\xC5\xE9 WinMerge \xB5L\xB7岫\xA1C\xC5w\xAA\xEF\xA6b\xACY\xA8DZ\xF8\xA5\xF3\xA4U\xA6A\xB4\xB2\xB5o\xA5\xA6\xA1F\xB2Ӹ`\xA8\xA3\xBB\xA1\xA9\xFA\xBF\xEF\xB3椤\xAA\xBA GNU \xA4\xBD\xA6@\xB1\xC2\xC5v\xC3ҡC"
#: Merge.rc:1872
#, c-format
@@ -3077,12 +3115,12 @@
#: Merge.rc:1885
#, c-format
msgid "&No"
-msgstr "\xA4\xA3(&N)"
+msgstr "\xA7_(&N)"
#: Merge.rc:1886
#, c-format
msgid "No to a&ll"
-msgstr "\xA5\xFE\xB3\xA1\xACҤ\xA3(&L)"
+msgstr "\xA5\xFE\xB3\xA1\xACҧ_(&L)"
#: Merge.rc:1887
#, c-format
@@ -3186,7 +3224,7 @@
"\n"
"Please use values 1 - %1."
msgstr ""
-"\xB8\xF5\xAE\xE6\xA4j\xA4p\xC4椤\xA4\xA7\xADȤ\xA3\xACO WinMegrge \xA9ү\xA8\xFC\xA1C\n"
+"\xB8\xF5\xAE\xE6\xA4j\xA4p\xC4椤\xA4\xA7\xADȤ\xA3\xACO WinMerge \xA9ү\xA8\xFC\xA1C\n"
"\n"
"\xBDХέ\xC8 1 - %1\xA1C"
@@ -3244,22 +3282,22 @@
#: Merge.rc:1964
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:1965
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:1966
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:1967
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:1973
#, c-format
@@ -3299,7 +3337,7 @@
#: Merge.rc:1985
#, c-format
msgid "Filters"
-msgstr "\xBFz\xBF\xEF\xA4覡"
+msgstr "\xBFz\xBFﾹ"
#: Merge.rc:1986
#, c-format
@@ -3314,12 +3352,12 @@
#: Merge.rc:1988
#, c-format
msgid "Select filename for new filter"
-msgstr "\xA5H\xB7s\xBFz\xBF\xEF\xA4覡\xBF\xEF\xA8\xFA\xC0ɦW"
+msgstr "\xAC\xB0\xB7s\xBFz\xBFﾹ\xC0ɿ\xEF\xA8\xFA\xC0ɦW"
#: Merge.rc:1989
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr "\xC0ɮz\xBF\xEF\xA4覡 (*.flt)|*.flt|\xA9Ҧ\xB3\xC0ɮ\xD7 (*.*)|*.*||"
+msgstr "\xC0ɮz\xBFﾹ (*.flt)|*.flt|\xA9Ҧ\xB3\xC0ɮ\xD7 (*.*)|*.*||"
#: Merge.rc:1991
#, c-format
@@ -3329,9 +3367,10 @@
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
msgstr ""
-"\xA7䤣\xA8\xEC\xC0ɮz\xBF\xEF\xA4覡\xBC˪O\xC0ɡI\n"
+"\xA7䤣\xA8\xEC\xC0ɮz\xBFﾹ\xBC˪O\xC0ɡI\n"
"\n"
-"\xBDнƻs\xC0ɮ\xD7 %1 \xA8\xEC WinMerge/\xC0ɮz\xBF\xEF\xA4覡-\xB8\xEA\xAEƧ\xA8\xA1C"
+"\xBDнƻs\xC0ɮ\xD7 %1 \xA8\xEC WinMerge/\xC0ɮz\xBFﾹ-\xB8\xEA\xAEƧ\xA8\xA1G\n"
+"%2\xA1C"
#: Merge.rc:1993
#, c-format
@@ -3341,7 +3380,7 @@
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
-"\xB5L\xAAk\xBDƻs\xC0ɮz\xBF\xEF\xA4覡\xBC˪O\xC0ɨ\xEC\xC0ɮz\xBF\xEF\xA4覡\xB8\xEA\xAEƧ\xA8\xA1G\n"
+"\xB5L\xAAk\xBDƻs\xC0ɮz\xBFﾹ\xBC˪O\xC0ɨ\xEC\xC0ɮz\xBFﾹ\xB8\xEA\xAEƧ\xA8\xA1G\n"
"%1\n"
"\n"
"\xBDнT\xA9w\xA6\xB3\xB8Ӹ\xEA\xAEƧ\xA8\xA1A\xA6ӥB\xA4\xB9\xB3\\xBCg\xA4J\xA1C"
@@ -3353,9 +3392,9 @@
"\n"
"Please select filter folder in Options/System."
msgstr ""
-"\xA9|\xA5\xBC\xA9w\xB8q\xA8ϥΪ̪\xBA\xC0ɮz\xBF\xEF\xA4覡\xB8\xEA\xAEƧ\xA8\xA1I\n"
+"\xA9|\xA5\xBC\xA9w\xB8q\xA8ϥΪ̪\xBA\xC0ɮz\xBFﾹ\xB8\xEA\xAEƧ\xA8\xA1I\n"
"\n"
-"\xBDЩ\xF3\xA1u\xBFﶵ/\xA8t\xB2Ρv\xA4\xA4\xBF\xEF\xA9w\xC0ɮz\xBF\xEF\xA4覡\xB8\xEA\xAEƧ\xA8\xA1C"
+"\xBDЩ\xF3\xA1u\xBFﶵ/\xA8t\xB2Ρv\xA4\xA4\xBF\xEF\xA9w\xC0ɮz\xBFﾹ\xB8\xEA\xAEƧ\xA8\xA1C"
#: Merge.rc:1997
#, c-format
@@ -3365,7 +3404,7 @@
"\n"
"Maybe the file is read-only?"
msgstr ""
-"\xB5L\xAAk\xA7R\xB0\xA3\xC0ɮz\xBF\xEF\xA4覡\xC0\xC9\n"
+"\xB5L\xAAk\xA7R\xB0\xA3\xC0ɮz\xBFﾹ\xC0\xC9\n"
"%1\n"
"\n"
"\xA5\xA6\xACO\xB0\xDFŪ\xC0ɡH"
@@ -3373,7 +3412,7 @@
#: Merge.rc:1998
#, c-format
msgid "Locate filter file to install"
-msgstr "\xC2\xEA\xA9w\xC0ɮz\xBF\xEF\xA4覡\xC0ɥH\xA6w\xB8\xCB"
+msgstr "\xA7\xE4\xA8\xEC\xC0ɮz\xBFﾹ\xC0ɥH\xA6w\xB8\xCB"
#: Merge.rc:2000
#, c-format
@@ -3382,14 +3421,14 @@
"\n"
"Could not copy new filter file to filter folder."
msgstr ""
-"\xB5L\xAAk\xA6w\xB8\xCB\xC0ɮz\xBF\xEF\xA4覡\xC0ɡC\n"
+"\xB5L\xAAk\xA6w\xB8\xCB\xC0ɮz\xBFﾹ\xC0ɡC\n"
"\n"
-"\xA4\xA3\xAF\xE0\xBDƻs\xB7s\xC0ɮz\xBF\xEF\xA4覡\xC0ɨ\xEC\xC0ɮz\xBF\xEF\xA4覡\xB8\xEA\xAEƧ\xA8\xA1C"
+"\xA4\xA3\xAF\xE0\xBDƻs\xB7s\xBFz\xBFﾹ\xC0ɨ\xEC\xC0ɮz\xBFﾹ\xB8\xEA\xAEƧ\xA8\xA1C"
#: Merge.rc:2002
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
-msgstr "\xC0ɮz\xBF\xEF\xA4覡\xC0ɤw\xA6s\xA6b\xA1C\xC2л\\xA4\xA7\xA1H"
+msgstr "\xC0ɮz\xBFﾹ\xC0ɤw\xA6s\xA6b\xA1C\xC2л\\xA4\xA7\xA1H"
#: Merge.rc:2008
#, c-format
@@ -3429,12 +3468,12 @@
#: Merge.rc:2025
#, c-format
msgid "Theirs File"
-msgstr ""
+msgstr "\xA5L\xAD̪\xBA(\xC0ɮ\xD7)"
#: Merge.rc:2026
#, c-format
msgid "Mine File"
-msgstr ""
+msgstr "\xA7ڪ\xBA(\xC0ɮ\xD7)"
#: Merge.rc:2032
#, c-format
@@ -3570,7 +3609,7 @@
#: Merge.rc:2073
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "\xBF\xEF\xBEܨ\xE2\xAD\xD3\xC0ɮץH\xB1ҥθѥ]\xBE\xB9\xBF\xEF\xA8\xFA\xA1C"
+msgstr "\xBF\xEF\xA8\xE2\xC0ɥH\xB1ҥθѥ]\xBE\xB9\xBF\xEF\xA8\xFA\xA1C"
#: Merge.rc:2074
#, c-format
@@ -3603,12 +3642,18 @@
#: Merge.rc:2083
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "\xB5L\xAAk\xB8ѪR\xBDĬ\xF0\xC0ɡC"
#: Merge.rc:2084
#, c-format
-msgid "The file\n%1\nis not a conflict file."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
msgstr ""
+"\xC0ɮ\xD7\n"
+"%1\n"
+"\xA4\xA3\xACO\xBDĬ\xF0\xC0ɡC"
#: Merge.rc:2090
#, c-format
@@ -3643,7 +3688,9 @@
"\n"
"Continue anyway?"
msgstr ""
-"\xB5L\xAAk\xB3ƥ\xF7\xAD\xEC\xA9l\xAA\xBA\xC0ɮסC\n"
+"\xB5L\xAAk\xB3ƥ\xF7\xAD\xEC\xA9l\xAA\xBA\xC0ɮסG\n"
+"%1\n"
+"\n"
"\xA4\xB4\xC2\xC2\xC4~\xC4\xF2\xB6ܡH"
#: Merge.rc:2097
@@ -3659,7 +3706,9 @@
"\xB5L\xAAk\xC0x\xA6s\xC0ɮסC\n"
"%1\n"
"%2\n"
-"\xADn\xA5H\xA4\xA3\xA6P\xA6W\xBA\xD9\xC0x\xA6s\xC0ɮܡH"
+"\xADn\xA1G\n"
+"\t-\xA5H\xA4\xA3\xA6P\xA6W\xBA\xD9\xC0x\xA6s\xC0ɮ\xD7 (\xAB\xF6\xA1u\xBDT\xA9w\xA1v)\n"
+"\t-\xA9\xF1\xB1\xF3\xA5ثe\xBEާ@(\xAB\xF6\xA1u\xA8\xFA\xAE\xF8\xA1v)\xA1H"
#: Merge.rc:2098
#, c-format
@@ -3860,7 +3909,7 @@
#: Merge.rc:2148
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "\xC1\xF4\xC2ÿ\xEF\xA8\xFA\xB6\xB5\xA5\xD8 (\xA6۰ʿz\xBF\xEF\xA4覡)"
+msgstr "\xC1\xF4\xC2ÿ\xEF\xA8\xFA\xB6\xB5\xA5\xD8 (\xA6۰ʿz\xBFﾹ)"
#: Merge.rc:2149
#, c-format
@@ -4504,18 +4553,18 @@
"\n"
"\xADn\xB1N\xA9Ҧ\xB3\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xB5\xF8\xADY\xACۦP\xB6ܡH\n"
"\n"
-"\xAA`\xB7N\xA1G\xA6p\xADn\xB1N\xA9Ҧ\xB3\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xB5\xF8\xADY\n"
-"\n"
-"\xACۦP\xA1A\xA6b\xBFﶵ\xB9\xEF\xB8ܲ\xB0\xA4\xA7\xA1u\xA4\xF1\xB8\xFB\xA1v\n"
-"\n"
-"\xAD\xB6\xC5\xD2(\xBDs\xBF\xE8 > \xBFﶵ) \xB3]\xA9w\xBFﶵ\xA6\xA8\n"
-"\n"
-"\xA1u\xA9\xBF\xB2\xA4\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xA4\xA7\xAEt\xB2\xA7\xA1v\xA1C"
+"\xAA`\xB7N\xA1G\xA6p\xADn\xB1N\xA9Ҧ\xB3\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xB5\xF8\xADY\xACۦP\xA1A\xB1o\xA6b(\xBDs\xBF\xE8 > \xBFﶵ) \xBFﶵ\xB9\xEF\xB8ܲ\xB0\xA4\xA7\xA1u\xA4\xF1\xB8\xFB\xA1v\xAD\xB6\xC5ҳ]\xA9w\xBFﶵ\xA6\xA8\xA1u\xA9\xBF\xB2\xA4\xB4\xAB\xA6\xE6\xA6r\xA4\xB8\xA4\xA7\xAEt\xB2\xA7\xA1v\xA1C"
#: Merge.rc:2349
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
msgstr ""
+"\xC0ɮ\xD7 '%1' \xAA\xBA\xC0ɮ\xB2\xA7\xF4\xA6r\xA4\xB8\xC3\xFE\xAB\xAC\xA4\xA3\xA6P(Windows/Unix/Mac)\xA1C\n"
+"\xA5H\xA5ثe\xBFﶵ\xA1A\xA5\xA6\xAD̷|\xB2Τ@\xA8\xEC\xA5D\xC3\xFE\xAB\xAC\xA1C\n"
+"\xA7A\xADn\xC5ܧ\xF3\xBFﶵ\xA8ëO\xAFd\xA4\xA3\xA6P\xAA\xBA\xC0ɮ\xB2\xA7\xF4\xA6r\xA4\xB8\xB6ܡH"
#: Merge.rc:2350
#, c-format
@@ -4534,8 +4583,18 @@
#: Merge.rc:2353
#, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
msgstr ""
+"\xB8\xEA\xAEƧ\xA8\xB6Ȧs\xA9\xF3\xA5t\xA4@\xC3\xE4\xA1A\xA6]\xA6\xB9\xA4\xA3\xAF\xE0\xB6}\xB1\xD2\n"
+"\n"
+"\xB7Q\xB7s\xBCW\xA4@\xADӬۦX\xAA\xBA\xB8\xEA\xAEƧ\xA8\xA1G\n"
+"%1\n"
+"\xA8\xEC\xA5t\xA4@\xC3\xE4\xA1A\xB5M\xAB\xE1\xB6}\xB1Ҩ⧨\xB6ܡH"
#: Merge.rc:2359
#, c-format
@@ -4702,7 +4761,7 @@
"See manual for more info about archive support and how to enable it."
msgstr ""
"\xA5\xBC\xB1ҥ\xCE\xC0\xA3\xC1Y\xA4䴩\xA1C\n"
-"\xA7䤣\xA8\xEC\xA4䴩\xC0\xA3\xC1Y\xAA\xBA\xA9Ҧ\xB3\xA5\xB2\xADn\xA4\xB8\xA5\xF3 (7-zip \xA9M/\xA9\xCE Merge7z*.dll)\xA1C\n"
+"\xA7䤣\xA8\xEC\xA4䴩\xC0\xA3\xC1Y\xAA\xBA\xA9Ҧ\xB3\xA5\xB2\xADn\xA4\xB8\xA5\xF3 (7-Zip \xA9M/\xA9\xCE Merge7z*.dll)\xA1C\n"
"\xBDаѦҤ\xE2\xA5U\xA8\xFA\xB1o\xA7\xF3\xA6h\xA6\xB3\xC3\xF6\xC0\xA3\xC1Y\xA4䴩\xA9M\xB1ҥ\xCE\xC0\xA3\xC1Y\xAA\xBA\xB8\xEA\xB0T\xA1C"
#: Merge.rc:2418
@@ -5139,17 +5198,17 @@
#: Merge.rc:2562
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2563
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2564
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2571
#, c-format
@@ -5214,17 +5273,17 @@
#: Merge.rc:2589
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "\xC2ഫ\xA6\xE6\xA7\xC0\xA6r\xA4\xB8\xAC\xB0 Windows \xA6\xA1"
#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "\xC2ഫ\xA6\xE6\xA7\xC0\xA6r\xA4\xB8\xAC\xB0 Unix \xA6\xA1"
#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "\xC2ഫ\xA6\xE6\xA7\xC0\xA6r\xA4\xB8\xAC\xB0 Mac \xA6\xA1"
#: Merge.rc:2592
#, c-format
@@ -5243,7 +5302,7 @@
#: Merge.rc:2594
#, c-format
msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "\xB6}\xB1ҨøѨM\xBDĬ\xF0\xC0\xC9"
#: Merge.rc:2600
#, c-format
@@ -5405,13 +5464,21 @@
#: Merge.rc:2632
#, c-format
-msgid "Select the current user interface language\nLanguage"
+msgid ""
+"Select the current user interface language\n"
+"Language"
msgstr ""
+"\xBF\xEF\xA8\xFA\xA5ثe\xA8ϥΪ̤\xB6\xAD\xB1\xBBy\xA8\xA5\n"
+"\xBBy\xA8\xA5"
#: Merge.rc:2633
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
msgstr ""
+"\xA5H\xA4\xA3\xA6P\xA6\xE2\xB1m\xC5\xE3\xA5ܦ椺\xAEt\xB2\xA7\n"
+"\xC5\xE3\xA5ܦ椺\xAEt\xB2\xA7"
#: Merge.rc:2634
#, c-format
@@ -5448,42 +5515,62 @@
#: Merge.rc:2638
#, c-format
msgid "Increase text size"
-msgstr ""
+msgstr "\xA5[\xA4j\xA4\xE5\xA6r"
#: Merge.rc:2639
#, c-format
msgid "Decrease text size"
-msgstr ""
+msgstr "\xB4\xEE\xA4p\xA4\xE5\xA6r"
#: Merge.rc:2640
#, c-format
msgid "Reset text zoom to default size"
-msgstr ""
+msgstr "\xAB\xEC\xB4_\xA4\xE5\xA6r\xAD\xEC\xA9l\xA4j\xA4p"
#: Merge.rc:2646
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
msgstr ""
+"\xB1\xB2\xA8\xEC\xA4W\xA4@\xAEt\xB2\xA7\n"
+"\xA4W\xA4@\xAEt\xB2\xA7 (Alt + Up)"
#: Merge.rc:2647
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
msgstr ""
+"\xB1\xB2\xA8\xEC\xA4U\xA4@\xAEt\xB2\xA7\n"
+"\xA4U\xA4@\xAEt\xB2\xA7 (Alt + Down)"
#: Merge.rc:2648
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
msgstr ""
+"\xB1\xB2\xA8\xEC\xB3̪\xEC\xAEt\xB2\xA7\n"
+"\xB3̪\xEC\xAEt\xB2\xA7 (Alt+Home)"
#: Merge.rc:2649
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
msgstr ""
+"\xB1\xB2\xA8\xEC\xA5ثe\xAEt\xB2\xA7\n"
+"\xA5ثe\xAEt\xB2\xA7 (Alt+Enter)"
#: Merge.rc:2650
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
msgstr ""
+"\xB1\xB2\xA8\xEC\xB3̥\xBD\xAEt\xB2\xA7\n"
+"\xB3̥\xBD\xAEt\xB2\xA7 (Alt+End)"
#: Merge.rc:2651
#, c-format
@@ -5562,7 +5649,7 @@
#: Merge.rc:2666
#, c-format
msgid "Select and modify filters"
-msgstr "\xBF\xEF\xA8\xFA\xA8íק\xEF\xBFz\xBF\xEF\xA4覡"
+msgstr "\xBF\xEF\xA8\xFA\xA8íק\xEF\xBFz\xBFﾹ"
#: Merge.rc:2667
#, c-format
@@ -5608,8 +5695,12 @@
#: Merge.rc:2685
#, c-format
-msgid "Activates next visible file\nActivate next File"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
msgstr ""
+"\xA4\xC1\xB4\xAB\xB5J\xC2I\xA6ܥt\xA4@\xC0\xC9\n"
+"\xA4\xC1\xB4\xAB\xA6ܥt\xA4@\xC0\xC9"
#: Merge.rc:2686
#, c-format
@@ -5618,8 +5709,12 @@
#: Merge.rc:2692
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
msgstr ""
+"\xB6}\xB1\xD2 WinMerge \xBB\xA1\xA9\xFA\xC0\xC9\n"
+"WinMerge \xBB\xA1\xA9\xFA"
#: Merge.rc:2693
#, c-format
@@ -5629,7 +5724,7 @@
#: Merge.rc:2694
#, c-format
msgid "Display the GNU General Public License"
-msgstr ""
+msgstr "\xC5\xE3\xA5\xDC GNU \xA4@\xAF뤽\xA6@\xB1\xC2\xC5v\xC3\xD2"
#: Merge.rc:2695
#, c-format
@@ -5638,13 +5733,21 @@
#: Merge.rc:2696
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
msgstr ""
+"\xB6}\xB1ҵo\xA6满\xA9\xFA\n"
+"\xB5o\xA6满\xA9\xFA"
#: Merge.rc:2697
#, c-format
-msgid "Opens the translations website\nTranslations"
+msgid ""
+"Opens the translations website\n"
+"Translations"
msgstr ""
+"\xB6}\xB1\xD2½Ķ\xA4\xE5\xBA\xF4\xAF\xB8\n"
+"½Ķ"
#: Merge.rc:2703
#, c-format
@@ -5699,7 +5802,7 @@
#: Merge.rc:2724
#, c-format
msgid "Display all moved blocks"
-msgstr ""
+msgstr "\xC5\xE3\xA5ܩҦ\xB3\xB2\xBE\xA6쪺\xB0϶\xF4"
#: Merge.rc:2725
#, c-format
@@ -5829,12 +5932,12 @@
#: Merge.rc:2761
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "\xA5i\xC4⦡\xAA\xAB\xA5\xF3"
#: Merge.rc:2762
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2763
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-03 16:16:03
|
Revision: 5107
http://winmerge.svn.sourceforge.net/winmerge/?rev=5107&view=rev
Author: kimmov
Date: 2008-03-03 08:15:44 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
PATCH: [ 1905520 ] A Swedish Swedish.po translation update...
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Swedish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-03 16:06:21 UTC (rev 5106)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-03 16:15:44 UTC (rev 5107)
@@ -6,6 +6,7 @@
BugFix: Copy&Paste from VB6 added binary chars (#1904355)
Translation updates:
- Chinese Traditional (#1905323)
+ - Swedish (#1905520)
WinMerge 2.7.7.6 - 2008-02-28 (r5099)
Remove sintance.h/sintance.cpp as not compatible with GPL (#1886580)
Modified: trunk/Src/Languages/Swedish.po
===================================================================
--- trunk/Src/Languages/Swedish.po 2008-03-03 16:06:21 UTC (rev 5106)
+++ trunk/Src/Languages/Swedish.po 2008-03-03 16:15:44 UTC (rev 5107)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-08-24 23:59+0100\n"
+"PO-Revision-Date: 2008-02-22 16:00+0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -628,17 +628,17 @@
#: Merge.rc:332
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:333
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:334
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:337
#, c-format
@@ -1829,7 +1829,7 @@
#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)"
#: Merge.rc:1159
#, c-format
@@ -2130,7 +2130,7 @@
#: Merge.rc:1312
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "Visa inte detta &meddelande igen.\n(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)"
#: Merge.rc:1316
#, c-format
@@ -4515,7 +4515,7 @@
#: Merge.rc:2349
#, c-format
msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr ""
+msgstr "Radsluten \xE4r av olika typer (Windows/Unix/Mac) i filen '%1'.\n Med de aktuella inst\xE4llningarna, kommer de att \xE4ndras till den vanligaste typen.\n Vill du \xE4ndra i inst\xE4llningarna och bevara de olika radsluten ?"
#: Merge.rc:2350
#, c-format
@@ -5213,17 +5213,17 @@
#: Merge.rc:2589
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "Konverterar radslut till Windows-format"
#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "Konverterar radslut till Unix-format"
#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "Konverterar radslut till Mac-format"
#: Merge.rc:2592
#, c-format
@@ -5405,16 +5405,12 @@
#: Merge.rc:2632
#, c-format
msgid "Select the current user interface language\nLanguage"
-msgstr ""
-"V\xE4ljer spr\xE5k f\xF6r anv\xE4ndargr\xE4nssnittet\n"
-"Spr\xE5k"
+msgstr "V\xE4ljer spr\xE5k f\xF6r anv\xE4ndargr\xE4nssnittet\nSpr\xE5k"
#: Merge.rc:2633
#, c-format
msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr ""
-"Visar skillnader inom rader med olika f\xE4rg\n"
-"Visa radskillnad"
+msgstr "Visar skillnader inom rader med olika f\xE4rg\nVisa radskillnad"
#: Merge.rc:2634
#, c-format
@@ -5466,32 +5462,27 @@
#: Merge.rc:2646
#, c-format
msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr ""
-"G\xE5r till f\xF6reg\xE5ende skillnad\nF\xF6reg\xE5ende skillnad (Alt+Upp)"
+msgstr "G\xE5r till f\xF6reg\xE5ende skillnad\nF\xF6reg\xE5ende skillnad (Alt+Upp)"
#: Merge.rc:2647
#, c-format
msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr ""
-"G\xE5r till n\xE4sta skillnad\nN\xE4sta skillnad (Alt+Ner)"
+msgstr "G\xE5r till n\xE4sta skillnad\nN\xE4sta skillnad (Alt+Ner)"
#: Merge.rc:2648
#, c-format
msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr ""
-"G\xE5r till f\xF6rsta skillnaden\nF\xF6rsta skillnad (Alt+Home)"
+msgstr "G\xE5r till f\xF6rsta skillnaden\nF\xF6rsta skillnad (Alt+Home)"
#: Merge.rc:2649
#, c-format
msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr ""
-"G\xE5r till aktuell skillnad\nAktuell skillnad (Alt+Enter)"
+msgstr "G\xE5r till aktuell skillnad\nAktuell skillnad (Alt+Enter)"
#: Merge.rc:2650
#, c-format
msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr ""
-"G\xE5r till sista skillnaden\nSista skillnad (Alt+End)"
+msgstr "G\xE5r till sista skillnaden\nSista skillnad (Alt+End)"
#: Merge.rc:2651
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-03 20:31:24
|
Revision: 5111
http://winmerge.svn.sourceforge.net/winmerge/?rev=5111&view=rev
Author: kimmov
Date: 2008-03-03 12:31:01 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
PATCH: [ 1891548 ] Update splash screen developers list
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/English.pot
trunk/Src/Merge.rc
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-03 18:58:24 UTC (rev 5110)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-03 20:31:01 UTC (rev 5111)
@@ -3,6 +3,7 @@
to Subversion revision numbers (rXXXXX).
WinMerge 2.8 Release Candidate
+ Update developers list in splash screen (#1891548)
BugFix: Copy&Paste from VB6 added binary chars (#1904355)
Translation updates:
- Chinese Traditional (#1905323)
Modified: trunk/Src/Languages/English.pot
===================================================================
--- trunk/Src/Languages/English.pot 2008-03-03 18:58:24 UTC (rev 5110)
+++ trunk/Src/Languages/English.pot 2008-03-03 20:31:01 UTC (rev 5111)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-28 00:05+0000\n"
+"POT-Creation-Date: 2008-03-03 22:28+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -2881,7 +2881,7 @@
#: Merge.rc:1865
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
+msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
#: Merge.rc:1866
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2008-03-03 18:58:24 UTC (rev 5110)
+++ trunk/Src/Merge.rc 2008-03-03 20:31:01 UTC (rev 5111)
@@ -1862,7 +1862,7 @@
// SPLASH SCREEN TEXTS
STRINGTABLE
BEGIN
- IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Perry Rapp, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Laurent Ganier, Dennis Lim, Chris Mumford"
+ IDS_SPLASH_DEVELOPERS "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
IDS_SPLASH_GPLTEXT "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-03 23:19:41
|
Revision: 5118
http://winmerge.svn.sourceforge.net/winmerge/?rev=5118&view=rev
Author: gerundt
Date: 2008-03-03 15:19:38 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
PATCH: [ 1510293 ] A new Excel plugin - better error handling. - Add the rest
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Plugins/dlls/CompareMSExcelFiles.dll
trunk/Plugins/src_VB/CompareMSExcelFiles/WinMergeScript.cls
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-03 22:39:01 UTC (rev 5117)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-03 23:19:38 UTC (rev 5118)
@@ -4,6 +4,7 @@
WinMerge 2.8 Release Candidate
Update developers list in splash screen (#1891548)
+ Better error handling for Excel plugin (#1510293)
BugFix: Copy&Paste from VB6 added binary chars (#1904355)
Translation updates:
- Chinese Traditional (#1905323)
Modified: trunk/Plugins/dlls/CompareMSExcelFiles.dll
===================================================================
(Binary files differ)
Modified: trunk/Plugins/src_VB/CompareMSExcelFiles/WinMergeScript.cls
===================================================================
--- trunk/Plugins/src_VB/CompareMSExcelFiles/WinMergeScript.cls 2008-03-03 22:39:01 UTC (rev 5117)
+++ trunk/Plugins/src_VB/CompareMSExcelFiles/WinMergeScript.cls 2008-03-03 23:19:38 UTC (rev 5118)
@@ -101,21 +101,54 @@
GetMacrosHead = oTextToSave
End Function
-Private Function GetComponentCount(objDoc As Object)
-' Returns 0 if there is a problem accessing VBComponents
- On Error GoTo ErrHandler
-
- GetComponentCount = 0
- If Not objDoc.VBProject Is Nothing Then
- If Not objDoc.VBProject.VBComponents Is Nothing Then
- GetComponentCount = objDoc.VBProject.VBComponents.Count
- End If
- End If
-
- Exit Function
-
-ErrHandler:
- GetComponentCount = 0
+Private Function GetMacros(objDoc As Object) As String
+ Dim VBComp As Object
+ Dim iCountMacros As Integer
+ Dim oMacroLine As String
+ Dim oTextToSave As String
+ Dim macTempPaths() As String
+ Dim hFile As Long
+
+ On Error GoTo GetMacros
+
+ oTextToSave = ""
+ If Not objDoc.VBProject.VBComponents Is Nothing Then
+ If objDoc.VBProject.VBComponents.Count > 0 Then
+ ReDim macTempPaths(objDoc.VBProject.VBComponents.Count - 1) As String
+ oTextToSave = oTextToSave & "Macros in document" & vbCrLf
+
+ iCountMacros = 0
+ For Each VBComp In objDoc.VBProject.VBComponents
+ oTextToSave = oTextToSave & VBComp.Name & vbCrLf
+
+ macTempPaths(iCountMacros) = CreateTempFile("WMS")
+
+ ' Remove the temporary file
+ Kill macTempPaths(iCountMacros)
+
+ ' Save the text content of the macro
+ VBComp.Export macTempPaths(iCountMacros)
+
+ ' Read the content back from the file
+ hFile = FreeFile
+ Open macTempPaths(iCountMacros) For Input Shared As #hFile
+ Do While Not EOF(1) 'Loop until end of file...
+ Line Input #hFile, oMacroLine 'Read line into variable.
+ oTextToSave = oTextToSave & oMacroLine & vbCrLf
+ Loop
+ Close #hFile
+
+ oTextToSave = oTextToSave & vbCrLf
+ iCountMacros = iCountMacros + 1
+ Next
+ End If
+ End If
+ GetMacros = oTextToSave
+ Exit Function
+
+GetMacros:
+ oTextToSave = ""
+ GetMacros = oTextToSave
End Function
Private Function GetDocProperty(objDoc As Object, pName As String)
@@ -151,15 +184,6 @@
Dim arrTempPaths() As String
ReDim arrTempPaths(objDoc.Worksheets.Count - 1) As String
- ' (ProjectComponents may be zero due to Code Access Security)
- Dim ProjectComponents As Long
- ProjectComponents = GetComponentCount(objDoc)
-
- Dim macTempPaths() As String
- If ProjectComponents > 0 Then
- ReDim macTempPaths(ProjectComponents - 1) As String
- End If
-
Dim iCountSheets As Integer
iCountSheets = 0
@@ -192,46 +216,13 @@
On Error GoTo CleanUp
oTextToSave = oTextToSave & vbCrLf
-
+
' Get the Macros
- If ProjectComponents > 0 Then
- oTextToSave = oTextToSave & "Macros in document" & vbCrLf
- On Error Resume Next
- Dim VBComp As Object
- Dim iCountMacros As Integer
- For Each VBComp In objDoc.VBProject.VBComponents
- VBComp = objDoc.VBProject.VBComponents(iCountMacros)
- oTextToSave = oTextToSave & VBComp.Name & vbCrLf
+ oTextToSave = oTextToSave & GetMacros(objDoc)
- macTempPaths(iCountMacros) = CreateTempFile("WMS")
+ On Error GoTo CleanUp
- ' Remove the temporary file
- Kill macTempPaths(iCountMacros)
-
- ' Save the text content of the macro
- VBComp.Export macTempPaths(iCountMacros)
-
- ' Read the content back from the file
- hFile = FreeFile
- Open macTempPaths(iCountMacros) For Input Shared As #hFile
- 'oTextToSave = oTextToSave + macTempPaths(iCountMacros) + vbCrLf
-
- Dim oMacroLine As String
- Do While Not EOF(1) ' Loop until end of file.
- Line Input #hFile, oMacroLine ' Read line into variable.
-
- oTextToSave = oTextToSave + oMacroLine + vbCrLf
- Loop
-
- Close #hFile
-
- oTextToSave = oTextToSave + vbCrLf
- iCountMacros = iCountMacros + 1
- 'Next VBComp
- Next
- oTextToSave = oTextToSave & vbCrLf
- On Error GoTo 0
- End If
+ oTextToSave = oTextToSave & vbCrLf
' Names
On Error Resume Next
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-03 23:45:13
|
Revision: 5119
http://winmerge.svn.sourceforge.net/winmerge/?rev=5119&view=rev
Author: gerundt
Date: 2008-03-03 15:45:09 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
PATCH: [ 1510298 ] MS Word - compare macros, bookmarks, document properties etc - Add the rest
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Plugins/dlls/CompareMSWordFiles.dll
trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-03 23:19:38 UTC (rev 5118)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-03 23:45:09 UTC (rev 5119)
@@ -5,6 +5,7 @@
WinMerge 2.8 Release Candidate
Update developers list in splash screen (#1891548)
Better error handling for Excel plugin (#1510293)
+ Add macros, bookmarks and document properties to Word plugin (#1510298)
BugFix: Copy&Paste from VB6 added binary chars (#1904355)
Translation updates:
- Chinese Traditional (#1905323)
Modified: trunk/Plugins/dlls/CompareMSWordFiles.dll
===================================================================
(Binary files differ)
Modified: trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls
===================================================================
--- trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls 2008-03-03 23:19:38 UTC (rev 5118)
+++ trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls 2008-03-03 23:45:09 UTC (rev 5119)
@@ -41,6 +41,15 @@
Dim myLastErrorNumber As Long
Dim myLastErrorString As String
+Private Declare Function GetTempPath Lib "kernel32" _
+ Alias "GetTempPathA" (ByVal nBufferLength As Long, _
+ ByVal lpBuffer As String) As Long
+
+Private Declare Function GetTempFileName Lib "kernel32" _
+ Alias "GetTempFileNameA" (ByVal lpszPath As String, _
+ ByVal lpPrefixString As String, ByVal wUnique As Long, _
+ ByVal lpTempFileName As String) As Long
+
Public Property Get PluginEvent() As String
PluginEvent = "FILE_PACK_UNPACK"
End Property
@@ -92,6 +101,70 @@
GetMacrosHead = oTextToSave
End Function
+Private Function GetMacros(objDoc As Object) As String
+ Dim VBComp As Object
+ Dim iCountMacros As Integer
+ Dim oMacroLine As String
+ Dim oTextToSave As String
+ Dim macTempPaths() As String
+ Dim hFile As Long
+
+ On Error GoTo GetMacros
+
+ oTextToSave = ""
+ If Not objDoc.VBProject.VBComponents Is Nothing Then
+ If objDoc.VBProject.VBComponents.Count > 0 Then
+ ReDim macTempPaths(objDoc.VBProject.VBComponents.Count - 1) As String
+ oTextToSave = oTextToSave & "Macros in document" & vbCrLf
+
+ iCountMacros = 0
+ For Each VBComp In objDoc.VBProject.VBComponents
+ oTextToSave = oTextToSave & VBComp.Name & vbCrLf
+
+ macTempPaths(iCountMacros) = CreateTempFile("WMS")
+
+ ' Remove the temporary file
+ Kill macTempPaths(iCountMacros)
+
+ ' Save the text content of the macro
+ VBComp.Export macTempPaths(iCountMacros)
+
+ ' Read the content back from the file
+ hFile = FreeFile
+ Open macTempPaths(iCountMacros) For Input Shared As #hFile
+ Do While Not EOF(1) 'Loop until end of file...
+ Line Input #hFile, oMacroLine 'Read line into variable.
+ oTextToSave = oTextToSave & oMacroLine & vbCrLf
+ Loop
+ Close #hFile
+
+ oTextToSave = oTextToSave & vbCrLf
+ iCountMacros = iCountMacros + 1
+ Next
+ End If
+ End If
+ GetMacros = oTextToSave
+ Exit Function
+
+GetMacros:
+ oTextToSave = ""
+ GetMacros = oTextToSave
+End Function
+
+Private Function GetDocProperty(objDoc As Object, pName As String)
+ On Error GoTo ErrHandler
+
+ GetDocProperty = ""
+ If Not objDoc.BuiltinDocumentProperties.Item(pName) Is Nothing Then
+ GetDocProperty = objDoc.BuiltinDocumentProperties.Item(pName).Value
+ End If
+
+ Exit Function
+
+ErrHandler:
+ GetDocProperty = ""
+End Function
+
Public Function UnpackFile(fileSrc As String, fileDst As String, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean
On Error GoTo CleanUp
@@ -113,10 +186,51 @@
oTextToSave = oTextToSave & "Document Properties" & vbCrLf
oTextToSave = oTextToSave & GetMacrosHead(objDoc)
+ On Error GoTo 0
+
+ Dim itemValue As String
Dim hFile As Long
+ ' Get the document properties
+ On Error Resume Next
+ Dim p As Object
+ For Each p In objDoc.BuiltinDocumentProperties
+ oTextToSave = oTextToSave & p.Name
+ oTextToSave = oTextToSave & " = "
+ itemValue = GetDocProperty(objDoc, p.Name)
+ If itemValue <> "" Then
+ oTextToSave = oTextToSave & itemValue
+ End If
+ oTextToSave = oTextToSave & vbCrLf
+ Next
+ On Error GoTo CleanUp
+
oTextToSave = oTextToSave & vbCrLf
+ ' Get the Macros
+ oTextToSave = oTextToSave & GetMacros(objDoc)
+
+ On Error GoTo CleanUp
+
+ oTextToSave = oTextToSave & vbCrLf
+
+ ' Bookmarks
+ On Error Resume Next
+ Dim nms As Object
+ Set nms = objDoc.Bookmarks
+ If nms.Count > 0 Then
+ oTextToSave = oTextToSave & "Bookmarks in document" & vbCrLf
+ End If
+ Dim iCountNames As Integer
+ For iCountNames = 1 To nms.Count
+ If nms(iCountNames).Name <> "" Then
+ oTextToSave = oTextToSave & nms(iCountNames).Name & vbCrLf
+ End If
+ iCountNames = iCountNames + 1
+ Next
+ On Error GoTo 0
+ oTextToSave = oTextToSave & vbCrLf
+
' Save the text content of the document
oTextToSave = oTextToSave & objDoc.Content.Text & vbCrLf
@@ -150,3 +264,18 @@
subcode = 1
End Function
+' Returns complete path and name for a temporary file
+Private Function CreateTempFile(sPrefix As String) As String
+ Dim sTmpPath As String * 512
+ Dim sTmpName As String * 576
+ Dim nRet As Long
+
+ nRet = GetTempPath(512, sTmpPath)
+ If (nRet > 0 And nRet < 512) Then
+ nRet = GetTempFileName(sTmpPath, sPrefix, 0, sTmpName)
+ If nRet <> 0 Then
+ CreateTempFile = Left$(sTmpName, InStr(sTmpName, vbNullChar) - 1)
+ End If
+ End If
+End Function
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-04 00:02:08
|
Revision: 5120
http://winmerge.svn.sourceforge.net/winmerge/?rev=5120&view=rev
Author: gerundt
Date: 2008-03-03 16:02:01 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Add *.dot (document template) extension to Word plugin
Modified Paths:
--------------
trunk/Docs/Users/Manual/Plugins.xml
trunk/Plugins/dlls/CompareMSWordFiles.dll
trunk/Plugins/src_VB/CompareMSWordFiles/CompareMSWordFiles.vbp
trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls
Modified: trunk/Docs/Users/Manual/Plugins.xml
===================================================================
--- trunk/Docs/Users/Manual/Plugins.xml 2008-03-03 23:45:09 UTC (rev 5119)
+++ trunk/Docs/Users/Manual/Plugins.xml 2008-03-04 00:02:01 UTC (rev 5120)
@@ -154,6 +154,7 @@
<seg>
<simplelist type="inline">
<member><filename class="extension">*.doc</filename></member>
+ <member><filename class="extension">*.dot</filename></member>
</simplelist>
</seg>
<seg>No</seg>
Modified: trunk/Plugins/dlls/CompareMSWordFiles.dll
===================================================================
(Binary files differ)
Modified: trunk/Plugins/src_VB/CompareMSWordFiles/CompareMSWordFiles.vbp
===================================================================
--- trunk/Plugins/src_VB/CompareMSWordFiles/CompareMSWordFiles.vbp 2008-03-03 23:45:09 UTC (rev 5119)
+++ trunk/Plugins/src_VB/CompareMSWordFiles/CompareMSWordFiles.vbp 2008-03-04 00:02:01 UTC (rev 5120)
@@ -13,7 +13,7 @@
CompatibleEXE32="CompareMSWordFiles.dll"
MajorVer=1
MinorVer=0
-RevisionVer=1
+RevisionVer=2
AutoIncrementVer=0
ServerSupportFiles=0
VersionFileDescription="WinMerge Plugin for MS-Word files"
Modified: trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls
===================================================================
--- trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls 2008-03-03 23:45:09 UTC (rev 5119)
+++ trunk/Plugins/src_VB/CompareMSWordFiles/WinMergeScript.cls 2008-03-04 00:02:01 UTC (rev 5120)
@@ -59,7 +59,7 @@
End Property
Public Property Get PluginFileFilters() As String
- PluginFileFilters = "\.doc$"
+ PluginFileFilters = "\.doc;\.dot$"
End Property
Public Property Get PluginIsAutomatic() As Boolean
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-06 20:20:00
|
Revision: 5133
http://winmerge.svn.sourceforge.net/winmerge/?rev=5133&view=rev
Author: kimmov
Date: 2008-03-06 12:19:55 -0800 (Thu, 06 Mar 2008)
Log Message:
-----------
PATCH: [ 1908289 ] A Swedish Swedish.po translation update...
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Swedish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-04 22:32:13 UTC (rev 5132)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-06 20:19:55 UTC (rev 5133)
@@ -5,6 +5,7 @@
WinMerge 2.9.0.1
Translation updates:
- German (r5130)
+ - Swedish (#1908289)
WinMerge 2.8 RC - 2008-03-04 (r5125)
Update developers list in splash screen (#1891548)
Modified: trunk/Src/Languages/Swedish.po
===================================================================
--- trunk/Src/Languages/Swedish.po 2008-03-04 22:32:13 UTC (rev 5132)
+++ trunk/Src/Languages/Swedish.po 2008-03-06 20:19:55 UTC (rev 5133)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-02-22 16:00+0100\n"
+"PO-Revision-Date: 2008-03-04 16:04+0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -3026,7 +3026,7 @@
#: Merge.rc:1865
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr ""
+msgstr "Utvecklare:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1866
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-08 08:17:22
|
Revision: 5137
http://winmerge.svn.sourceforge.net/winmerge/?rev=5137&view=rev
Author: kimmov
Date: 2008-03-08 00:17:20 -0800 (Sat, 08 Mar 2008)
Log Message:
-----------
PATCH: [ 1909001 ] Docs: Update ShellExtextension translation instructions
Modified Paths:
--------------
trunk/Docs/Developers/Translations.html
Added Paths:
-----------
trunk/ShellExtension/Languages/ShellExtensionTemplate.rc
Modified: trunk/Docs/Developers/Translations.html
===================================================================
--- trunk/Docs/Developers/Translations.html 2008-03-07 16:51:09 UTC (rev 5136)
+++ trunk/Docs/Developers/Translations.html 2008-03-08 08:17:20 UTC (rev 5137)
@@ -61,6 +61,10 @@
</ul>
</li>
<li><a href="#shellextension">Translating ShellExtension</a></li>
+ <ul>
+ <li><a href="#shellext_update">Update existing ShellExtension translation</a></li>
+ <li><a href="#shellext_new">Add new ShellExtension translation</a></li>
+ </ul>
<li><a href="#installer">Translating Installer</a></li>
<li><a href="#readme">Translating ReadMe.txt</a></li>
</ul>
@@ -77,6 +81,14 @@
status of current translations</a>, so you can check if your language is
already available and/or it needs to be updated.</p>
+<p>
+There is also a mailing list intended for WinMerge translators in SourceForge.net:
+<a href="https://sourceforge.net/mailarchive/forum.php?forum_name=winmerge-translate">
+Translators mailing list</a>. Please consider joining to the list if you are
+interested in translating WinMerge. Developers send translation related information
+and notices to this list.
+</p>
+
<h3><a name="whatToTranslate">What can I translate?</a></h3>
<p>Listings below show what you can actually translate for WinMerge. And what is
not useful to translate.</p>
@@ -179,9 +191,34 @@
<p>ShellExtension can be translated by translating all the strings <em>between
quotes</em> inside a <code>.rc</code> resource file. ShellExtension resource
files are in <code><a href="http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/ShellExtension/Languages/">
-WinMerge\ShellExtension\Languages\</a></code> folder. There are only few
-strings to translate so it should be fast to do.</p>
+WinMerge\ShellExtension\Languages\</a></code> folder in the WinMerge source tree.
+</p>
+<h4><a name="shellext_update">Update existing ShellExtension translation</a></h4>
+<ol>
+ <li>Get the <code><em>YourLanguage</em>.rc</code> file from <code>ShellExtension\Languages</code>
+ -folder.</li>
+ <li>Open the file into normal text editor (Notepad is ok).</li>
+ <li>Translate few english it has. All the translated strings are in quotes
+ after <code>IDS_XXXX</code> -string</li>
+ <li>Upload the translated file to SF.net
+ <a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">as a
+ patch</a>.</li>
+</ol>
+
+<h4><a name="shellext_new">Add new ShellExtension translation</a></h4>
+<ol>
+ <li>Get the <code>ShellExtensionTemplate.rc</code> file from <code>ShellExtension\Languages</code>
+ -folder.</li>
+ <li>Rename The file to <code><em>YourLanguage</em>.rc</code>.</li>
+ <li>Open the file into normal text editor (Notepad is ok).</li>
+ <li>Translate few english it has. All the translated strings are in quotes
+ after <code>IDS_XXXX</code> -string</li>
+ <li>Upload the translated file to SF.net
+ <a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">as a
+ patch</a>.</li>
+</ol>
+
<h3><a name="installer">Translating Installer</a></h3>
<p>Installer translation files are in <code><a href="http://winmerge.svn.sourceforge.net/viewvc/winmerge/trunk/Installer/InnoSetup/Languages/">
WinMerge\Installer\InnoSetup\Languages\</a></code> folder. Look for a file
Added: trunk/ShellExtension/Languages/ShellExtensionTemplate.rc
===================================================================
--- trunk/ShellExtension/Languages/ShellExtensionTemplate.rc (rev 0)
+++ trunk/ShellExtension/Languages/ShellExtensionTemplate.rc 2008-03-08 08:17:20 UTC (rev 5137)
@@ -0,0 +1,55 @@
+//Microsoft Developer Studio generated resource script.
+//
+// This is a template file for new ShellExtension translations:
+// 1. Copy this file as a [YourLanguage].rc
+// 2. Translate strings in the end of the file
+// 3. Save the file and send it to WinMerge developers
+//
+// $Id$
+
+#include "../resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
+BEGIN
+ IDS_PROJNAME "ShellExtension"
+ IDS_CONTEXT_MENU "WinMerge"
+ IDS_CONTEXT_HELP "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"
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
Property changes on: trunk/ShellExtension/Languages/ShellExtensionTemplate.rc
___________________________________________________________________
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...> - 2008-03-15 09:41:10
|
Revision: 5148
http://winmerge.svn.sourceforge.net/winmerge/?rev=5148&view=rev
Author: kimmov
Date: 2008-03-15 02:41:05 -0700 (Sat, 15 Mar 2008)
Log Message:
-----------
PATCH: [ 1914466 ] Russian translation update
Submitted by Dmitriy S. Aleshkowskiy
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Russian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-14 18:18:49 UTC (rev 5147)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-15 09:41:05 UTC (rev 5148)
@@ -6,6 +6,7 @@
BugFix: Installer could create a registry access error (#1909967)
Translation updates:
- German (r5130, r5139)
+ - Russian (#1914466)
- Swedish (#1908289)
WinMerge 2.8 RC - 2008-03-04 (r5125)
Modified: trunk/Src/Languages/Russian.po
===================================================================
--- trunk/Src/Languages/Russian.po 2008-03-14 18:18:49 UTC (rev 5147)
+++ trunk/Src/Languages/Russian.po 2008-03-15 09:41:05 UTC (rev 5148)
@@ -140,7 +140,7 @@
#: Merge.rc:114
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xF4\xE0\xE9\xEB \xF1 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xE0\xEC\xE8..."
#: Merge.rc:116
#: Merge.rc:194
@@ -391,28 +391,28 @@
#: Merge.rc:474
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "\xD1\xEF\xF0\xE0\xE2\xEA\xE0 &WinMerge\tF1"
#: Merge.rc:177
#: Merge.rc:291
#: Merge.rc:476
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "&\xC7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF \xEA \xF0\xE5\xEB\xE8\xE7\xF3"
#: Merge.rc:178
#: Merge.rc:292
#: Merge.rc:477
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "&\xCF\xE5\xF0\xE5\xE2\xEE\xE4\xFB"
#: Merge.rc:179
#: Merge.rc:293
#: Merge.rc:478
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "&\xCA\xEE\xED\xF4\xE8\xE3\xF3\xF0\xE0\xF6\xE8\xFF"
#: Merge.rc:180
#: Merge.rc:294
@@ -426,7 +426,7 @@
#: Merge.rc:481
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&GNU General Public License"
#: Merge.rc:183
#: Merge.rc:297
@@ -629,17 +629,17 @@
#: Merge.rc:332
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:333
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:334
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:337
#, c-format
@@ -649,7 +649,7 @@
#: Merge.rc:339
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "\xCA\xEE\xE4\xE8\xF0\xEE\xE2\xE0\xED\xE8\xE5 \xF4\xE0\xE9\xEB\xE0..."
#: Merge.rc:345
#, c-format
@@ -745,23 +745,23 @@
#: Merge.rc:383
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "&\xCC\xE0\xF1\xF8\xF2\xE0\xE1"
#: Merge.rc:385
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "\xCF\xF0\xE8\xE1\xEB\xE8\xE7\xE8\xF2\xFC\tCtrl++"
#: Merge.rc:386
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "\xCE\xF2\xE4\xE0\xEB\xE8\xF2\xFC\tCtrl+-"
#. Zoom to normal
#: Merge.rc:387
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "\xCE\xE1\xFB\xF7\xED\xFB\xE9\tCtrl+*"
#: Merge.rc:389
#, c-format
@@ -771,7 +771,7 @@
#: Merge.rc:394
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "\xC7\xE0\xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xED\xE5\xEB\xE8"
#: Merge.rc:395
#, c-format
@@ -846,12 +846,12 @@
#: Merge.rc:491
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "\xD1\xF0\xE0\xE2\xED\xE8\xF2\xFC \xCE\xF1\xEE\xE1\xFB\xE5"
#: Merge.rc:493
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:498
#, c-format
@@ -1267,7 +1267,7 @@
#: Merge.rc:758
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "\xD1\xEE\xF5\xF0\xE0\xED\xFF\xF2\xFC \xE2\xF0\xE5\xEC\xFF \xF4\xE0\xE9\xEB\xE0 \xEF\xF0\xE8 \xF1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE8"
#: Merge.rc:761
#, c-format
@@ -1582,22 +1582,22 @@
#: Merge.rc:992
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "\xCE\xE1\xE7\xEE\xF0"
#: Merge.rc:993
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "\xCF\xE0\xEF\xEA\xE0 \xE4\xEB\xFF \xE2\xF0\xE5\xEC\xE5\xED\xED\xFB\xF5 \xF4\xE0\xE9\xEB\xEE\xE2"
#: Merge.rc:994
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "\xD1\xE8\xF1\xF2\xE5\xEC\xED\xE0\xFF \xEF\xE0\xEF\xEA\xE0 Temp"
#: Merge.rc:996
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "\xD1\xEE\xE1\xF1\xF2\xE2\xE5\xED\xED\xE0\xFF \xEF\xE0\xEF\xEA\xE0:"
#: Merge.rc:999
#: Merge.rc:1015
@@ -1830,7 +1830,7 @@
#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "\xC8\xE3\xED\xEE\xF0\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF0\xE0\xE7\xED\xE8\xF6\xF3 \xE2 \xE2\xEE\xE7\xE2\xF0\xE0\xF2\xE0\xF5 \xEA\xE0\xF0\xE5\xF2\xEA\xE8 (Win/Unix/Mac)"
#: Merge.rc:1159
#, c-format
@@ -2127,7 +2127,7 @@
#: Merge.rc:1312
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "\xCD\xE5 \xEF\xEE\xEA\xE0\xE7\xFB\xE2\xE0\xF2\xFC \xE1\xEE\xEB\xFC\xF8\xE5 \xFD\xF2\xEE \xF1\xEE\xEE\xE1\xF9\xE5\xED\xE8\xE5.\n(\xC2\xFB \xE2\xF1\xE5\xE3\xE4\xE0 \xEC\xEE\xE6\xE5\xF2\xE5 \xE2\xE5\xF0\xED\xF3\xF2\xFC \xE5\xE3\xEE \xF7\xE5\xF0\xE5\xE7 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9\xFC)"
#: Merge.rc:1316
#, c-format
@@ -2933,7 +2933,7 @@
#: Merge.rc:1805
#, c-format
msgid "Automatically resize panes\nLock Panes"
-msgstr ""
+msgstr "\xC0\xE2\xF2\xEE\xEC\xE0\xF2\xE8\xF7\xE5\xF1\xEA\xE8 \xE8\xE7\xEC\xE5\xED\xFF\xF2\xFC \xF0\xE0\xE7\xEC\xE5\xF0 \xEF\xE0\xED\xE5\xEB\xE5\xE9\n\xC7\xE0\xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xEF\xE0\xED\xE5\xEB\xE8"
#: Merge.rc:1811
#, c-format
@@ -2997,12 +2997,12 @@
#: Merge.rc:1837
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr ""
+msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xD4\xE0\xE9\xEB\xEE\xE2"
#: Merge.rc:1838
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr ""
+msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge \xD1\xF0\xE0\xE2\xED\xE5\xED\xE8\xE5 \xCF\xE0\xEF\xEE\xEA"
#: Merge.rc:1845
#, c-format
@@ -3023,12 +3023,12 @@
#: Merge.rc:1865
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr ""
+msgstr "\xD0\xE0\xE7\xF0\xE0\xE1\xEE\xF2\xF7\xE8\xEA\xE8:\n\xC4\xE8\xED \xC3\xF0\xE8\xEC\xEC (Dean Grimm), \xCA\xF0\xE8\xF1\xF2\xE8\xE0\xED \xCB\xE8\xF1\xF2 (Christian List), \xCA\xE8\xEC\xEC\xEE \xC2\xE0\xF0\xE8\xF1 (Kimmo Varis), \xC9\xEE\xF5\xE5\xED \xD2\xF3\xF5\xF2 (Jochen Tucht), \xD2\xE8\xEC \xC3\xE5\xF0\xF3\xED\xE4\xF2 (Tim Gerundt), \xD2\xE0\xEA\xE0\xF8\xE8 \xD1\xE0\xE2\xE0\xED\xE0\xEA\xE8 (Takashi Sawanaki), \xC3\xFD\xEB \xD5\xE0\xEC\xEC\xE5\xF0 (Gal Hammer), \xC0\xEB\xE5\xEA\xF1\xE0\xED\xE4\xF0 \xD1\xEA\xE8\xED\xED\xE5\xF0 (Alexander Skinner)"
#: Merge.rc:1866
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr ""
+msgstr "WinMerge \xEF\xEE\xF1\xF2\xE0\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xC1\xC5\xC7 \xCA\xC0\xCA\xCE\xC9-\xCB\xC8\xC1\xCE \xC3\xC0\xD0\xC0\xCD\xD2\xC8\xC8. \xDD\xF2\xEE \xF1\xE2\xEE\xE1\xEE\xE4\xED\xEE\xE5 \xCF\xCE \xE8 \xEC\xFB \xEF\xF0\xE8\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xE5\xEC \xE5\xE3\xEE \xF0\xE0\xF1\xEF\xF0\xEE\xF1\xF2\xF0\xE0\xED\xE5\xED\xE8\xE5 \xF1\xEE\xE3\xEB\xE0\xF1\xED\xEE \xED\xE5\xEA\xEE\xF2\xEE\xF0\xFB\xF5 \xF3\xF1\xEB\xEE\xE2\xE8\xE9; \xEE\xE7\xED\xE0\xEA\xEE\xEC\xFC\xF2\xE5\xF1\xFC \xF1 GNU General Public License \xE2 \xEC\xE5\xED\xFE \xCF\xEE\xEC\xEE\xF9\xFC \xE4\xEB\xFF \xE1\xEE\xEB\xE5\xE5 \xEF\xEE\xE4\xF0\xEE\xE1\xED\xEE\xE9 \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xE8."
#: Merge.rc:1872
#, c-format
@@ -3235,22 +3235,22 @@
#: Merge.rc:1964
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:1965
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:1966
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:1967
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:1973
#, c-format
@@ -3421,12 +3421,12 @@
#: Merge.rc:2025
#, c-format
msgid "Theirs File"
-msgstr ""
+msgstr "\xC8\xF5 \xF4\xE0\xE9\xEB"
#: Merge.rc:2026
#, c-format
msgid "Mine File"
-msgstr ""
+msgstr "\xCC\xEE\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2032
#, c-format
@@ -3595,12 +3595,12 @@
#: Merge.rc:2083
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "\xCE\xF8\xE8\xE1\xEA\xE0 \xF0\xE0\xE7\xE1\xEE\xF0\xE0 \xF4\xE0\xE9\xEB\xE0 \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xEE\xE2"
#: Merge.rc:2084
#, c-format
msgid "The file\n%1\nis not a conflict file."
-msgstr ""
+msgstr "\xD4\xE0\xE9\xEB\n%1\n\xED\xE5 \xFF\xE2\xEB\xFF\xE5\xF2\xF1\xFF \xF4\xE0\xE9\xEB\xEE\xEC \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xEE\xE2"
#: Merge.rc:2090
#, c-format
@@ -4506,7 +4506,7 @@
#: Merge.rc:2349
#, c-format
msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr ""
+msgstr "\xCF\xF0\xE8\xE7\xED\xE0\xEA\xE8 \xEA\xEE\xED\xF6\xE0 \xF1\xF2\xF0\xEE\xEA\xE8 (EOL) \xF0\xE0\xE7\xED\xFB\xF5 \xF2\xE8\xEF\xEE\xE2 (Windows/Unix/Mac) \xE4\xEB\xFF \xF4\xE0\xE9\xEB\xE0 '%1'.\n \xD1 \xF2\xE5\xEA\xF3\xF9\xE8\xEC\xE8 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE0\xEC\xE8 \xEE\xED\xE8 \xE1\xF3\xE4\xF3\xF2 \xEF\xF0\xE8\xE2\xE5\xE4\xE5\xED\xFB \xEA \xEE\xF1\xED\xEE\xE2\xED\xEE\xEC\xF3 \xF2\xE8\xEF\xF3.\n \xD5\xEE\xF2\xE8\xF2\xE5 \xE8\xE7\xEC\xE5\xED\xE8\xF2\xFC \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8, \xF7\xF2\xEE \xE1\xFB \xF1\xEE\xF5\xF0\xE0\xED\xFF\xF2\xFC EOL \xEA\xE0\xEA \xE5\xF1\xF2\xFC, \xF2\xEE \xE5\xF1\xF2\xFC \xF0\xE0\xE7\xEB\xE8\xF7\xED\xFB\xEC\xE8?"
#: Merge.rc:2350
#, c-format
@@ -4526,7 +4526,7 @@
#: Merge.rc:2353
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr ""
+msgstr "\xCF\xE0\xEF\xEA\xE0 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2 \xF2\xEE\xEB\xFC\xEA\xEE \xED\xE0 \xEE\xE4\xED\xEE\xE9 \xF1\xF2\xEE\xF0\xEE\xED\xE5 \xE8 \xED\xE5 \xEC\xEE\xE6\xE5\xF2 \xE1\xFB\xF2\xFC \xEE\xF2\xEA\xF0\xFB\xF2\xE0.\n\n\xD5\xEE\xF2\xE8\xF2\xE5 \xF1\xEE\xE7\xE4\xE0\xF2\xFC \xF1\xEE\xEE\xF2\xE2\xE5\xF2\xF1\xF2\xE2\xF3\xFE\xF9\xF3\xFE \xEF\xE0\xEF\xEA\xF3:\n%1\n\xED\xE0 \xE4\xF0\xF3\xE3\xEE\xE9 \xF1\xF2\xEE\xF0\xEE\xED\xE5 \xE8 \xEE\xE1\xE5 \xEE\xF2\xEA\xF0\xFB\xF2\xFC \xE8\xF5?"
#: Merge.rc:2359
#, c-format
@@ -5130,17 +5130,17 @@
#: Merge.rc:2562
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2563
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2564
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2571
#, c-format
@@ -5205,17 +5205,17 @@
#: Merge.rc:2589
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xEE\xE1\xF0\xE0\xE7\xEE\xE2\xE0\xF2\xFC EOL \xEA \xEF\xF0\xE8\xED\xFF\xF2\xFB\xEC \xE2 Windows"
#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xEE\xE1\xF0\xE0\xE7\xEE\xE2\xE0\xF2\xFC EOL \xEA \xEF\xF0\xE8\xED\xFF\xF2\xFB\xEC \xE2 Unix"
#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "\xCF\xF0\xE5\xEE\xE1\xF0\xE0\xE7\xEE\xE2\xE0\xF2\xFC EOL \xEA \xEF\xF0\xE8\xED\xFF\xF2\xFB\xEC \xE2 Mac"
#: Merge.rc:2592
#, c-format
@@ -5234,7 +5234,7 @@
#: Merge.rc:2594
#, c-format
msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xE8 \xF0\xE5\xF8\xE8\xF2\xFC \xEA\xEE\xED\xF4\xEB\xE8\xEA\xF2\xED\xFB\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2600
#, c-format
@@ -5397,12 +5397,12 @@
#: Merge.rc:2632
#, c-format
msgid "Select the current user interface language\nLanguage"
-msgstr ""
+msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xFF\xE7\xFB\xEA \xE8\xED\xF2\xE5\xF0\xF4\xE5\xE9\xF1\xE0 \xE4\xEB\xFF \xF2\xE5\xEA\xF3\xF9\xE5\xE3\xEE \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF\n\xDF\xE7\xFB\xEA"
#: Merge.rc:2633
#, c-format
msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2\xED\xF3\xF2\xF0\xE8 \xF1\xF2\xF0\xEE\xEA \xE4\xF0\xF3\xE3\xE8\xEC\xE8 \xF6\xE2\xE5\xF2\xE0\xEC\xE8\n\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEE\xF2\xEB\xE8\xF7\xE8\xFF \xE2 \xF1\xF2\xF0\xEE\xEA\xE5"
#: Merge.rc:2634
#, c-format
@@ -5439,42 +5439,42 @@
#: Merge.rc:2638
#, c-format
msgid "Increase text size"
-msgstr ""
+msgstr "\xD3\xE2\xE5\xEB\xE8\xF7\xE8\xF2\xFC \xF0\xE0\xE7\xEC\xE5\xF0 \xF2\xE5\xEA\xF1\xF2\xE0"
#: Merge.rc:2639
#, c-format
msgid "Decrease text size"
-msgstr ""
+msgstr "\xD3\xEC\xE5\xED\xFC\xF8\xE8\xF2\xFC \xF0\xE0\xE7\xEC\xE5\xF0 \xF2\xE5\xEA\xF1\xF2\xE0"
#: Merge.rc:2640
#, c-format
msgid "Reset text zoom to default size"
-msgstr ""
+msgstr "\xD1\xE1\xF0\xEE\xF1\xE8\xF2\xFC \xEC\xE0\xF1\xF8\xF2\xE0\xE1 \xF2\xE5\xEA\xF1\xF2\xE0 \xEA \xE7\xED\xE0\xF7\xE5\xED\xE8\xFE \xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE"
#: Merge.rc:2646
#, c-format
msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xF0\xE5\xE4\xFB\xE4\xF3\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xCF\xF0\xE5\xE4\xFB\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Up)"
#: Merge.rc:2647
#, c-format
msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xD1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Down)"
#: Merge.rc:2648
#, c-format
msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xE5\xF0\xE2\xEE\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xCF\xE5\xF0\xE2\xEE\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Home)"
#: Merge.rc:2649
#, c-format
msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xF2\xE5\xEA\xF3\xF9\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xD2\xE5\xEA\xF3\xF9\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+Enter)"
#: Merge.rc:2650
#, c-format
msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xEA \xEF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xEC\xF3 \xEE\xF2\xEB\xE8\xF7\xE8\xFE\n\xCF\xEE\xF1\xEB\xE5\xE4\xED\xE5\xE5 \xEE\xF2\xEB\xE8\xF7\xE8\xE5 (Alt+End)"
#: Merge.rc:2651
#, c-format
@@ -5598,7 +5598,7 @@
#: Merge.rc:2685
#, c-format
msgid "Activates next visible file\nActivate next File"
-msgstr ""
+msgstr "\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xF3\xE5\xF2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xE2\xE8\xE4\xE8\xEC\xFB\xE9 \xF4\xE0\xE9\xEB\n\xC0\xEA\xF2\xE8\xE2\xE8\xF0\xEE\xE2\xE0\xF2\xFC \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE8\xE9 \xF4\xE0\xE9\xEB"
#: Merge.rc:2686
#, c-format
@@ -5608,7 +5608,7 @@
#: Merge.rc:2692
#, c-format
msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr ""
+msgstr "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xF1\xEF\xF0\xE0\xE2\xEA\xF3 WinMerge\n\xD1\xEF\xF0\xE0\xE2\xEA\xE0 WinMerge"
#: Merge.rc:2693
#, c-format
@@ -5618,7 +5618,7 @@
#: Merge.rc:2694
#, c-format
msgid "Display the GNU General Public License"
-msgstr ""
+msgstr "\xCF\xEE\xEA\xE0\xE7\xE0\xF2\xFC \xEB\xE8\xF6\xE5\xED\xE7\xE8\xFE GNU General Public License"
#: Merge.rc:2695
#, c-format
@@ -5628,12 +5628,12 @@
#: Merge.rc:2696
#, c-format
msgid "Opens the release notes document\nRelease Notes"
-msgstr ""
+msgstr "\xCE\xF2\xEA\xF0\xFB\xF2\xFC \xE4\xEE\xEA\xF3\xEC\xE5\xED\xF2 \xF1 \xE7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF\xEC\xE8 \xEA \xF0\xE5\xEB\xE8\xE7\xF3\n\xC7\xE0\xEC\xE5\xF7\xE0\xED\xE8\xFF \xEA \xF0\xE5\xEB\xE8\xE7\xF3"
#: Merge.rc:2697
#, c-format
msgid "Opens the translations website\nTranslations"
-msgstr ""
+msgstr "\xCF\xE5\xF0\xE5\xE9\xF2\xE8 \xED\xE0 \xF1\xF2\xF0\xE0\xED\xE8\xF6\xF3 \xF1 \xEF\xE5\xF0\xE5\xE2\xEE\xE4\xE0\xEC\xE8\n\xCF\xE5\xF0\xE5\xE2\xEE\xE4\xFB"
#: Merge.rc:2703
#, c-format
@@ -5688,7 +5688,7 @@
#: Merge.rc:2724
#, c-format
msgid "Display all moved blocks"
-msgstr ""
+msgstr "\xCE\xF2\xEE\xE1\xF0\xE0\xE6\xE0\xF2\xFC \xE2\xF1\xE5 \xEF\xE5\xF0\xE5\xEC\xE5\xF9\xE5\xED\xED\xFB\xE5 \xE1\xEB\xEE\xEA\xE8"
#: Merge.rc:2725
#, c-format
@@ -5808,7 +5808,7 @@
#: Merge.rc:2759
#, c-format
msgid "Perl"
-msgstr "\xCF\xE5\xF0\xEB"
+msgstr "Perl"
#: Merge.rc:2760
#, c-format
@@ -5818,12 +5818,12 @@
#: Merge.rc:2761
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "Portable Object"
#: Merge.rc:2762
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2763
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-03-17 20:31:39
|
Revision: 5150
http://winmerge.svn.sourceforge.net/winmerge/?rev=5150&view=rev
Author: sdottaka
Date: 2008-03-17 13:31:27 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
BUG: [ 1915424 ] The filter box in Open-dialog sometimes displays garbage
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/ShellExtension/WinMergeShell.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-15 09:47:47 UTC (rev 5149)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-17 20:31:27 UTC (rev 5150)
@@ -4,6 +4,8 @@
WinMerge 2.9.0.1
BugFix: Installer could create a registry access error (#1909967)
+ BugFix: The filter text box in Open-dialog sometimes displayed some garbage
+ data (#1915424)
Translation updates:
- German (r5130, r5139)
- Russian (#1914466)
Modified: trunk/ShellExtension/WinMergeShell.cpp
===================================================================
--- trunk/ShellExtension/WinMergeShell.cpp 2008-03-15 09:47:47 UTC (rev 5149)
+++ trunk/ShellExtension/WinMergeShell.cpp 2008-03-17 20:31:27 UTC (rev 5150)
@@ -457,6 +457,10 @@
UINT uidFirstCmd)
{
String strMenu = GetResourceString(IDS_CONTEXT_MENU);
+
+ InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+ uMenuIndex++;
+
InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION, uidFirstCmd, strMenu.c_str());
// Add bitmap
@@ -466,8 +470,11 @@
// Show menu item as grayed if more than two items selected
if (m_nSelectedItems > MaxFileCount)
EnableMenuItem(hmenu, uMenuIndex, MF_BYPOSITION | MF_GRAYED);
+
+ uMenuIndex++;
+ InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
- return 1;
+ return 2;
}
/// Create menu for advanced mode
@@ -479,7 +486,10 @@
String strCompareTo = GetResourceString(IDS_COMPARE_TO);
String strReselect = GetResourceString(IDS_RESELECT_FIRST);
int nItemsAdded = 0;
-
+
+ InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+ uMenuIndex++;
+
switch (m_dwMenuState)
{
// No items selected earlier
@@ -537,6 +547,9 @@
EnableMenuItem(hmenu, uMenuIndex, MF_BYPOSITION | MF_GRAYED);
}
+ uMenuIndex++;
+ InsertMenu(hmenu, uMenuIndex, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+
return nItemsAdded;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-03-17 20:41:45
|
Revision: 5152
http://winmerge.svn.sourceforge.net/winmerge/?rev=5152&view=rev
Author: sdottaka
Date: 2008-03-17 13:41:40 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
BUG: [ 1915536 ] print area is not clipped
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-17 20:32:13 UTC (rev 5151)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-17 20:41:40 UTC (rev 5152)
@@ -6,6 +6,7 @@
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
+ BugFix: Print area was not clipped correctly. (#1915536)
Translation updates:
- German (r5130, r5139)
- Russian (#1914466)
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2008-03-17 20:32:13 UTC (rev 5151)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2008-03-17 20:41:40 UTC (rev 5152)
@@ -1136,6 +1136,7 @@
VERIFY(pdc->ExtTextOut(ptOrigin.x, ptOrigin.y, ETO_CLIPPED,
&rcClip, LPCTSTR(line) + ibegin, nCount, pnWidths));
// Draw rounded rectangles around control characters
+ pdc->SaveDC();
pdc->IntersectClipRect(&rcClip);
HDC hDC = pdc->m_hDC;
HGDIOBJ hBrush = ::GetStockObject(NULL_BRUSH);
@@ -1157,7 +1158,7 @@
hPen = ::SelectObject(hDC, hPen);
::DeleteObject(hPen);
hBrush = ::SelectObject(hDC, hBrush);
- pdc->SelectClipRgn(NULL);
+ pdc->RestoreDC(-1);
}
delete [] pnWidths;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-03-17 21:14:16
|
Revision: 5154
http://winmerge.svn.sourceforge.net/winmerge/?rev=5154&view=rev
Author: sdottaka
Date: 2008-03-17 14:13:42 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
Japanese translation - update
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Japanese.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-17 20:43:16 UTC (rev 5153)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-17 21:13:42 UTC (rev 5154)
@@ -9,6 +9,7 @@
BugFix: Print area was not clipped correctly. (#1915536)
Translation updates:
- German (r5130, r5139)
+ - Japanese (r5152)
- Russian (#1914466)
- Swedish (#1908289)
Modified: trunk/Src/Languages/Japanese.po
===================================================================
--- trunk/Src/Languages/Japanese.po 2008-03-17 20:43:16 UTC (rev 5153)
+++ trunk/Src/Languages/Japanese.po 2008-03-17 21:13:42 UTC (rev 5154)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-02-23 22:43+0900\n"
+"PO-Revision-Date: 2008-03-18 06:00+0900\n"
"Last-Translator: Takashi Sawanaka <sawanaka at d1.dion.ne.jp>\n"
"Language-Team: Japanese <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -627,17 +627,17 @@
#: Merge.rc:332
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:333
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:334
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:337
#, c-format
@@ -1828,7 +1828,7 @@
#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "\x89\xFC\x8Ds\x95\xB6\x8E\x9A\x82̈Ⴂ\x82\x8B\x82\xB7\x82\xE9(&R) (Windows/Unix/Mac)"
#: Merge.rc:1159
#, c-format
@@ -2126,8 +2126,12 @@
#: Merge.rc:1312
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
msgstr ""
+"\x8Dēx\x82\xB1\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2(&M)\x81B\n"
+"(\x83w\x83\x8B\x83v\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82炱\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82ł\xAB\x82܂\xB7\x81B)"
#: Merge.rc:1316
#, c-format
@@ -3054,8 +3058,12 @@
#: Merge.rc:1865
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1866
#, c-format
@@ -4544,8 +4552,14 @@
#: Merge.rc:2349
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
msgstr ""
+"\x83t\x83@\x83C\x83\x8B'%1'\x93\xE0\x82ɈقȂ\xE9\x83^\x83C\x83v(Windows/Unix/Mac)\x82\xCCEOL\x82\xAA\x91\xB6\x8D݂\xB5\x82Ă\xA2\x82܂\xB7\x81B\n"
+" \x8C\xBB\x8D݂̃I\x83v\x83V\x83\x87\x83\x93\x90ݒ\xE8\x82ł́A\x8E\xE5\x82\xC8EOL\x82ɓ\x9D\x88ꂳ\x82\xEA\x82܂\xB7\x81B\n"
+" \x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x95ύX\x82\xB5\x82āA\x88قȂ\xE9EOL\x82\xF0\x95ێ\x9D\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82܂\xB7\x82\xA9?"
#: Merge.rc:2350
#, c-format
@@ -5222,17 +5236,17 @@
#: Merge.rc:2583
#, c-format
msgid "Save the left file"
-msgstr "\x8D\xB6\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7"
+msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7"
#: Merge.rc:2584
#, c-format
msgid "Save the right file"
-msgstr "\x89E\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7"
+msgstr "\x89E\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x95ۑ\xB6\x82\xB5\x82܂\xB7"
#: Merge.rc:2585
#, c-format
msgid "Save the left file with name..."
-msgstr "\x8D\xB6\x82̃t\x83@\x83C\x83\x8B\x82𖼑O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6\x82\xB5\x82܂\xB7..."
+msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B\x82𖼑O\x82\xF0\x95t\x82\xAF\x82ĕۑ\xB6\x82\xB5\x82܂\xB7..."
#: Merge.rc:2586
#, c-format
@@ -5242,27 +5256,27 @@
#: Merge.rc:2587
#, c-format
msgid "Change left file/dir read-only status"
-msgstr "\x8D\xB6\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7"
+msgstr "\x8D\xB6\x91\xA4\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7"
#: Merge.rc:2588
#, c-format
msgid "Change right file/dir read-only status"
-msgstr "\x89E\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7"
+msgstr "\x89E\x91\xA4\x82̃t\x83@\x83C\x83\x8B/\x83t\x83H\x83\x8B\x83_\x82\xF0\x83\x8A\x81[\x83h\x83I\x83\x93\x83\x8A\x81[\x8F\xF3\x91ԂɕύX\x82\xB5\x82܂\xB7"
#: Merge.rc:2589
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "EOL\x82\xF0Windows\x83^\x83C\x83v\x82ɕϊ\xB7\x82\xB5\x82܂\xB7"
#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "EOL\x82\xF0Unix\x83^\x83C\x83v\x82ɕϊ\xB7\x82\xB5\x82܂\xB7"
#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "EOL\x82\xF0Mac\x83^\x83C\x83v\x82ɕϊ\xB7\x82\xB5\x82܂\xB7"
#: Merge.rc:2592
#, c-format
@@ -5443,13 +5457,21 @@
#: Merge.rc:2632
#, c-format
-msgid "Select the current user interface language\nLanguage"
+msgid ""
+"Select the current user interface language\n"
+"Language"
msgstr ""
+"\x8C\xBB\x8D݂̃\x86\x81[\x83U\x81[\x83C\x83\x93\x83^\x81[\x83t\x83F\x81[\x83X\x8C\xBE\x8C\xEA\x82\xF0\x91I\x91\xF0\x82\xB5\x82܂\xB7\n"
+"\x8C\xBE\x8C\xEA"
#: Merge.rc:2633
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
msgstr ""
+"\x8Ds\x93\xE0\x82̍\xB7\x88ق\xF0\x90F\x82\xF0\x95ς\xA6\x82ĕ\\x8E\xA6\x82\xB5\x82܂\xB7\n"
+"\x8Ds\x93\xE0\x82̍\xB7\x88ق\xF0\x95\\x8E\xA6"
#: Merge.rc:2634
#, c-format
@@ -5500,28 +5522,48 @@
#: Merge.rc:2646
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
msgstr ""
+"\x91O\x82̍\xB7\x88قֈړ\xAE\x82\xB5\x82܂\xB7\n"
+"\x91O\x82̍\xB7\x88\xD9 (Alt+Up)"
#: Merge.rc:2647
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
msgstr ""
+"\x8E\x9F\x82̍\xB7\x88قֈړ\xAE\x82\xB5\x82܂\xB7\n"
+"\x8E\x9F\x82̍\xB7\x88\xD9 (Alt+Down)"
#: Merge.rc:2648
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
msgstr ""
+"\x8Dŏ\x89\x82̍\xB7\x88قɈړ\xAE\x82\xB5\x82܂\xB7\n"
+"\x8Dŏ\x89\x82̍\xB7\x88\xD9 (Alt+Home)"
#: Merge.rc:2649
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
msgstr ""
+"\x8C\xBB\x8D݂̍\xB7\x88قɈړ\xAE\x82\xB5\x82܂\xB7\n"
+"\x8C\xBB\x8D݂̍\xB7\x88\xD9 (Alt+Enter)"
#: Merge.rc:2650
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
msgstr ""
+"\x8DŌ\xE3\x82̍\xB7\x88قɈړ\xAE\x82\xB5\x82܂\xB7\n"
+"\x8DŌ\xE3\x82̍\xB7\x88\xD9 (Alt+End)"
#: Merge.rc:2651
#, c-format
@@ -5644,8 +5686,12 @@
#: Merge.rc:2685
#, c-format
-msgid "Activates next visible file\nActivate next File"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
msgstr ""
+"\x8E\x9F\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x83A\x83N\x83e\x83B\x83u\x82ɂ\xB5\x82܂\xB7\n"
+"\x8E\x9F\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0"
#: Merge.rc:2686
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-17 21:39:44
|
Revision: 5156
http://winmerge.svn.sourceforge.net/winmerge/?rev=5156&view=rev
Author: gerundt
Date: 2008-03-17 14:39:31 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
PATCH: [ 1913919 ] Installer: Use correct way to create start menu web link
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-17 21:14:02 UTC (rev 5155)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-17 21:39:31 UTC (rev 5156)
@@ -3,6 +3,7 @@
to Subversion revision numbers (rXXXXX).
WinMerge 2.9.0.1
+ Installer: Use correct way to create start menu web link (#1913919)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-03-17 21:14:02 UTC (rev 5155)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-03-17 21:39:31 UTC (rev 5156)
@@ -399,16 +399,14 @@
Source: ..\..\Plugins\dlls\insert datetime.sct; DestDir: {app}\MergePlugins; Flags: IgnoreVersion CompareTimeStamp; Components: Plugins
Source: ..\..\Plugins\dlls\*.dll; DestDir: {app}\MergePlugins; Flags: promptifolder; Components: Plugins
-[INI]
-Filename: {group}\{cm:ProgramOnTheWeb,WinMerge}.url; Section: InternetShortcut; Key: URL; String: http://WinMerge.org/; Check: GroupCreated
-
[Icons]
;Start Menu Icons
Name: {group}\WinMerge; Filename: {app}\{code:ExeName}
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe.txt; IconFileName: {win}\NOTEPAD.EXE
Name: {group}\{cm:UsersGuide}; Filename: {app}\Docs\WinMerge.chm
Name: {group}\{cm:UninstallProgram,WinMerge}; Filename: {uninstallexe}
+Name: {group}\{cm:ProgramOnTheWeb,WinMerge}; Filename: "http://winmerge.org/"
;Link to translated ReadMe in Start Menu
Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Bulgarian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Bulgarian
@@ -527,7 +525,6 @@
Name: {app}\Formats; Type: filesandordirs
Name: {app}\Lang; Type: filesandordirs
-Name: {group}\{cm:ProgramOnTheWeb,WinMerge}.url; Type: Files
Name: {group}; Type: dirifempty
Name: {app}; Type: dirifempty
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-17 21:47:11
|
Revision: 5158
http://winmerge.svn.sourceforge.net/winmerge/?rev=5158&view=rev
Author: gerundt
Date: 2008-03-17 14:46:54 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
PATCH: [ 1913949 ] Installer: Simplify DeletePreviousStartMenu() function
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-17 21:40:21 UTC (rev 5157)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-17 21:46:54 UTC (rev 5158)
@@ -4,6 +4,7 @@
WinMerge 2.9.0.1
Installer: Use correct way to create start menu web link (#1913919)
+ Installer: Simplify DeletePreviousStartMenu() function (#1913949)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-03-17 21:40:21 UTC (rev 5157)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-03-17 21:46:54 UTC (rev 5158)
@@ -854,58 +854,24 @@
StringChange(strNew, ExpandConstant('{commonprograms}\'), '')
{if the user does have a previous start menu location then..}
- If strOld <> '' THen
+ If strOld <> '' Then
Begin
{If the current and previous start menu locations are different then...}
- If Uppercase(strOld) <> UpperCase(strNew) Then
- Begin
- strMessage := ExpandConstant('{cm:DeletePreviousStartMenu}');
+ If Uppercase(strOld) <> UpperCase(strNew) Then
+ Begin
+ strMessage := ExpandConstant('{cm:DeletePreviousStartMenu}');
strMessage := Format(strMessage, [strOld, strNew]);
- {Display a dialog asking the user if they'd like to delete the previous start menu group}
- {If they'd like to delete the previous start menu group then...}
- If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then
- Begin
- strOld := ExpandConstant('{commonprograms}\') + strOld;
-
- {Removes each of the start menu icons to make the folder empty}
- strShortcut := strOld + '\' + ExpandConstant('{cm:ReadMe}') + '.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\Read Me.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\' + ExpandConstant('{cm:UninstallProgram,WinMerge}') + '.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\Uninstall WinMerge.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\' + ExpandConstant('{cm:UsersGuide}') + '.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\User''s Guide.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\' + ExpandConstant('{cm:ProgramOnTheWeb,WinMerge}') + '.url';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\Winmerge on the Web.lnk';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\Winmerge on the Web.url';
- DeleteFile(strShortcut)
-
- strShortcut := strOld + '\WinMerge.lnk';
- DeleteFile(strShortcut)
-
- {Deletes the empty start menu directory (This has to already be empty in order for this to work, hence the
- file deletions above)}
- RemoveDir(strOld)
- end;
- {end; }
- end;
- end;
+ {Display a dialog asking the user if they'd like to delete the previous start menu group}
+ {If they'd like to delete the previous start menu group then...}
+ If Msgbox(strMessage, mbConfirmation, mb_YesNo) = mrYes Then
+ Begin
+ strOld := ExpandConstant('{commonprograms}\') + strOld;
+ {Remove old start menu}
+ DelTree(strOld, True, True, True);
+ End;
+ End;
+ End;
End;
{This event procedure is queed each time the user changes pages within the installer}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-20 15:43:40
|
Revision: 5179
http://winmerge.svn.sourceforge.net/winmerge/?rev=5179&view=rev
Author: kimmov
Date: 2008-03-20 08:43:27 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
PATCH: [ 1919965 ] Update manual urls to point to 2.8 web manual
Modified Paths:
--------------
trunk/ArchiveSupport/Merge7z/readme.txt
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/ReadMe.txt
trunk/Src/MainFrm.cpp
Modified: trunk/ArchiveSupport/Merge7z/readme.txt
===================================================================
--- trunk/ArchiveSupport/Merge7z/readme.txt 2008-03-20 12:46:31 UTC (rev 5178)
+++ trunk/ArchiveSupport/Merge7z/readme.txt 2008-03-20 15:43:27 UTC (rev 5179)
@@ -27,7 +27,7 @@
The WinMerge User's Manual contains a chapter on 7-Zip and archive support.
- http://winmerge.org/2.6/manual/installing.html
+ http://winmerge.org/2.8/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: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-20 12:46:31 UTC (rev 5178)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-20 15:43:27 UTC (rev 5179)
@@ -6,6 +6,7 @@
Installer: Use correct way to create start menu web link (#1913919)
Installer: Simplify DeletePreviousStartMenu() function (#1913949)
Installer: Updated the side art of the installer application (#1915012)
+ Update URLs and switch to 2.8 manual (#1919965)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
Modified: trunk/Docs/Users/ReadMe.txt
===================================================================
--- trunk/Docs/Users/ReadMe.txt 2008-03-20 12:46:31 UTC (rev 5178)
+++ trunk/Docs/Users/ReadMe.txt 2008-03-20 15:43:27 UTC (rev 5179)
@@ -9,11 +9,11 @@
Quick start to WinMerge:
Read online-manual Quick-start chapter to get started with WinMerge:
-http://www.winmerge.org/2.6/manual/quickstart.html
+http://www.winmerge.org/2.8/manual/quickstart.html
HTML Manual:
Manual is available online at
-http://www.winmerge.org/2.6/manual/
+http://www.winmerge.org/2.8/manual/
it is also possibly installed (if choosed so) locally and downloadable
separately from http://www.winmerge.org/ (see documentation)
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2008-03-20 12:46:31 UTC (rev 5178)
+++ trunk/Src/MainFrm.cpp 2008-03-20 15:43:27 UTC (rev 5179)
@@ -237,7 +237,7 @@
* @brief URL to help indes in internet.
* We use internet help when local help file is not found (not installed).
*/
-static const TCHAR DocsURL[] = _T("http://winmerge.org/2.6/manual/index.html");
+static const TCHAR DocsURL[] = _T("http://winmerge.org/2.8/manual/index.html");
/** @brief Release notes in HTML format. */
static const TCHAR RelNotes[] = _T("\\Docs\\ReleaseNotes.html");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2008-03-23 22:26:29
|
Revision: 5183
http://winmerge.svn.sourceforge.net/winmerge/?rev=5183&view=rev
Author: sdottaka
Date: 2008-03-23 15:26:25 -0700 (Sun, 23 Mar 2008)
Log Message:
-----------
PATCH: [ 1923625 ] Fix for BUG:[ 1921031 ] Undo after pane swapping
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/ChildFrm.cpp
trunk/Src/MergeDoc.cpp
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-23 22:16:57 UTC (rev 5182)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-23 22:26:25 UTC (rev 5183)
@@ -11,6 +11,7 @@
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
BugFix: Print area was not clipped correctly. (#1915536)
+ BugFix: Undo after pane swapping (#1915536, #1923625)
Translation updates:
- German (r5130, r5139, r5171)
- Japanese (r5152)
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2008-03-23 22:16:57 UTC (rev 5182)
+++ trunk/Src/ChildFrm.cpp 2008-03-23 22:26:25 UTC (rev 5183)
@@ -646,6 +646,7 @@
void CChildFrame::UpdateSplitter()
{
m_wndSplitter.RecalcLayout();
+ m_wndDetailBar.UpdateBarHeight(0);
}
void CChildFrame::OnTimer(UINT_PTR nIDEvent)
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2008-03-23 22:16:57 UTC (rev 5182)
+++ trunk/Src/MergeDoc.cpp 2008-03-23 22:26:25 UTC (rev 5183)
@@ -3234,8 +3234,21 @@
/// Swap files and update views
void CMergeDoc::SwapFiles()
{
+ // Swap views
+ int nLeftViewId = m_pView[0]->GetDlgCtrlID();
+ int nRightViewId = m_pView[1]->GetDlgCtrlID();
+ m_pView[0]->SetDlgCtrlID(nRightViewId);
+ m_pView[1]->SetDlgCtrlID(nLeftViewId);
+
+ int nLeftDetailViewId = m_pDetailView[0]->GetDlgCtrlID();
+ int nRightDetailViewId = m_pDetailView[1]->GetDlgCtrlID();
+ m_pDetailView[0]->SetDlgCtrlID(nRightDetailViewId);
+ m_pDetailView[1]->SetDlgCtrlID(nLeftDetailViewId);
+
// Swap buffers and so on
swap<CDiffTextBuffer *>(&m_ptBuf[0], &m_ptBuf[1]);
+ swap<CMergeEditView *>(&m_pView[0], &m_pView[1]);
+ swap<CMergeDiffDetailView *>(&m_pDetailView[0], &m_pDetailView[1]);
swap<DiffFileInfo *>(&m_pSaveFileInfo[0], &m_pSaveFileInfo[1]);
swap<DiffFileInfo *>(&m_pRescanFileInfo[0], &m_pRescanFileInfo[1]);
swap<BUFFERTYPE>(&m_nBufferType[0], &m_nBufferType[1]);
@@ -3246,15 +3259,17 @@
m_diffList.Swap();
- // Reattach text buffers
- m_pView[MERGE_VIEW_LEFT]->ReAttachToBuffer(m_ptBuf[0]);
- m_pView[MERGE_VIEW_RIGHT]->ReAttachToBuffer(m_ptBuf[1]);
- m_pDetailView[0]->ReAttachToBuffer(m_ptBuf[0]);
- m_pDetailView[1]->ReAttachToBuffer(m_ptBuf[1]);
+ m_ptBuf[0]->m_nThisPane = 0;
+ m_pView[MERGE_VIEW_LEFT]->m_nThisPane = 0;
+ m_pDetailView[0]->m_nThisPane = 0;
+ m_ptBuf[1]->m_nThisPane = 1;
+ m_pView[MERGE_VIEW_RIGHT]->m_nThisPane = 1;
+ m_pDetailView[1]->m_nThisPane = 1;
// Update views
UpdateHeaderPath(0);
UpdateHeaderPath(1);
+ GetParentFrame()->UpdateSplitter();
UpdateAllViews(NULL);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-24 20:07:43
|
Revision: 5185
http://winmerge.svn.sourceforge.net/winmerge/?rev=5185&view=rev
Author: kimmov
Date: 2008-03-24 13:07:23 -0700 (Mon, 24 Mar 2008)
Log Message:
-----------
PATCH: [ 1914869 ] New Splash Screen for 2.8
Splash screen image and layout from Alexander.
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Splash.cpp
trunk/Src/res/splash.jpg
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-23 22:27:12 UTC (rev 5184)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-24 20:07:23 UTC (rev 5185)
@@ -7,6 +7,7 @@
Installer: Simplify DeletePreviousStartMenu() function (#1913949)
Installer: Updated the side art of the installer application (#1915012)
Update URLs and switch to 2.8 manual (#1919965)
+ New splash screen (#1914869)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
Modified: trunk/Src/Splash.cpp
===================================================================
--- trunk/Src/Splash.cpp 2008-03-23 22:27:12 UTC (rev 5184)
+++ trunk/Src/Splash.cpp 2008-03-24 20:07:23 UTC (rev 5185)
@@ -24,12 +24,12 @@
* @brief Implementation of splashscreen class
*
*/
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
// $Id$
#include "stdafx.h"
#include "resource.h"
-
+#include "UnicodeString.h"
#include "Picture.h"
#include "Splash.h"
#include "version.h"
@@ -42,17 +42,31 @@
/**
* @brief Area for version text in splash image.
- * Text is right-aligned, so reserve space to left side for longer text.
* @note Translations may have language name after version number.
*/
-static const RECT VersionTextArea = { 255, 5, 469, 20 };
+static const RECT VersionTextArea = { 346, 257, 547, 272 };
+/** @brief Font size for version text. */
+static const UINT VersionTextSize = 9;
+/** @brief Drawing style for version text. */
+static const UINT VersionTextStyle = DT_CENTER | DT_VCENTER;
/** @brief Area for developers list. */
-static const RECT DevelopersArea = { 20, 88, 190, 210 };
+static const RECT DevelopersArea = { 16, 87, 315, 272 };
+/** @brief Font size for developers list text. */
+static const UINT DevelopersTextSize = 10;
+/** @brief Drawing style for developers list text. */
+static const UINT DevelopersTextStyle = DT_NOPREFIX | DT_TOP;
/** @brief Area for copyright text. */
-static const RECT CopyrightArea = { 20, 210, 190, 330 };
+static const RECT CopyrightArea = { 10, 284, 539, 339 };
+/** @brief Font size for copyright text. */
+static const UINT CopyrightTextSize = 8;
+/** @brief Drawing style for copyright text. */
+static const UINT CopyrightTextStyle = DT_TOP | DT_WORDBREAK;
+/** @brief Font used in splash screen texts. */
+static const TCHAR FontName[] = _T("Tahoma");
+
/** @brief ID for the timer closing splash screen. */
static const UINT_PTR SplashTimerID = 1;
@@ -211,12 +225,13 @@
CString s;
CFont versionFont;
CFont textFont;
+ CFont copyrightFont;
CFont *oldfont = NULL;
- int fontHeight = -MulDiv(9, dc.GetDeviceCaps(LOGPIXELSY), 72);
+ int fontHeight = -MulDiv(VersionTextSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
BOOL fontSuccess = versionFont.CreateFont(fontHeight, 0, 0, 0, FW_BOLD, FALSE, FALSE,
0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
- DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, _T("Arial"));
+ DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, FontName);
if (fontSuccess)
oldfont = dc.SelectObject(&versionFont);
@@ -225,11 +240,12 @@
dc.SetBkMode(TRANSPARENT);
RECT area = VersionTextArea;
- dc.DrawText(s, &area, DT_RIGHT | DT_TOP);
+ dc.DrawText(s, &area, VersionTextStyle);
+ fontHeight = -MulDiv(DevelopersTextSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
fontSuccess = textFont.CreateFont(fontHeight, 0, 0, 0, 0, FALSE, FALSE,
0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
- DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, _T("Arial"));
+ DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, FontName);
if (fontSuccess)
{
// We already stored oldfont in previous font change
@@ -240,23 +256,39 @@
}
String text = LoadResString(IDS_SPLASH_DEVELOPERS);
- // Turn spaces between parts of names into non-breaking spaces
// avoid dereference of empty strings and the NULL termiated character
if (text.length() >= 0)
{
- for (TCHAR *p = &*(text.end() - 1) ; p > &*text.begin() && *p != '\n' ; --p)
+ // Replace ", " with linefeed in developers list text to get
+ // developers listed a name per line in the about dialog
+ std::string::size_type pos = text.rfind(_T(", "));
+ while (pos != std::string::npos)
{
- if (*p == _T('\x20') && p[-1] != _T(','))
- *p = _T('\xA0');
+ text.replace(pos, 2, _T("\n"), 1);
+ pos = text.rfind(_T(", "), pos - 1);
}
}
area = DevelopersArea;
- dc.DrawText(text.c_str(), &area, DT_NOPREFIX | DT_TOP | DT_WORDBREAK);
+ dc.DrawText(text.c_str(), &area, DevelopersTextStyle);
+
+ fontHeight = -MulDiv(CopyrightTextSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
+ fontSuccess = copyrightFont.CreateFont(fontHeight, 0, 0, 0, 0, FALSE, FALSE,
+ 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+ DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, FontName);
+ if (fontSuccess)
+ {
+ // We already stored oldfont in previous font change
+ if (oldfont == NULL)
+ oldfont = dc.SelectObject(©rightFont);
+ else
+ dc.SelectObject(©rightFont);
+ }
+
text = LoadResString(IDS_SPLASH_GPLTEXT);
area = CopyrightArea;
- dc.DrawText(text.c_str(), &area, DT_NOPREFIX | DT_TOP | DT_WORDBREAK);
+ dc.DrawText(text.c_str(), &area, CopyrightTextStyle);
if (oldfont != NULL)
dc.SelectObject(oldfont);
Modified: trunk/Src/res/splash.jpg
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-25 18:21:05
|
Revision: 5189
http://winmerge.svn.sourceforge.net/winmerge/?rev=5189&view=rev
Author: kimmov
Date: 2008-03-25 11:19:58 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
PATCH: [ 1920380 ] French translation
Submitted by Jean-F Jolin
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Src/Languages/French.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-25 17:44:57 UTC (rev 5188)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-25 18:19:58 UTC (rev 5189)
@@ -14,6 +14,7 @@
BugFix: Print area was not clipped correctly. (#1915536)
BugFix: Undo after pane swapping (#1915536, #1923625)
Translation updates:
+ - French (#1920380)
- German (r5130, r5139, r5171)
- Japanese (r5152)
- Russian (#1914466)
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2008-03-25 17:44:57 UTC (rev 5188)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2008-03-25 18:19:58 UTC (rev 5189)
@@ -64,7 +64,7 @@
AboutSetupTitle=A Propos de l'assistant d'installation
AboutSetupMessage=%1 version %2%n%3%n%nPage d'accueil de %1 :%n%4
AboutSetupNote=
-TranslatorNote=French translation maintained by Pierre Yager (pi...@le...)
+TranslatorNote=Entretien de la traduction par Jean-Fran\xE7ois Jolin (jean-f-j at users.sourceforge.net)
; *** Buttons
ButtonBack=< &Pr\xE9c\xE9dent
@@ -303,7 +303,7 @@
;Inno Setup Built-in Custom Messages
NameAndVersion=%1 version %2
AdditionalIcons=Ic\xF4nes suppl\xE9mentaires :
-OptionalFeatures=Optional Features:
+OptionalFeatures=Caract\xE9ristiques optionnelles:
CreateDesktopIcon=Cr\xE9er une ic\xF4ne sur le &Bureau
CreateQuickLaunchIcon=Cr\xE9er une ic\xF4ne dans la barre de &Lancement rapide
ProgramOnTheWeb=Page d'accueil de %1
@@ -333,7 +333,7 @@
CatalanLanguage=Menus et dialogues Catalan
ChineseSimplifiedLanguage=Menus et dialogues Chinois (Simplifi\xE9)
ChineseTraditionalLanguage=Menus et dialogues Chinois (Traditionnel)
-CroatianLanguage=Croatian menus and dialogs
+CroatianLanguage=Menus et dialogues Croate
CzechLanguage=Menus et dialogues Tch\xE9coslovaque
DanishLanguage=Menus et dialogues Danois
DutchLanguage=Menus et dialogues N\xE9erlandais
Modified: trunk/Src/Languages/French.po
===================================================================
--- trunk/Src/Languages/French.po 2008-03-25 17:44:57 UTC (rev 5188)
+++ trunk/Src/Languages/French.po 2008-03-25 18:19:58 UTC (rev 5189)
@@ -140,7 +140,7 @@
#: Merge.rc:114
#, c-format
msgid "Op&en Conflict File..."
-msgstr ""
+msgstr "Ouvrir le fichier en conflit..."
#: Merge.rc:116
#: Merge.rc:194
@@ -154,7 +154,7 @@
#: Merge.rc:309
#, c-format
msgid "Sa&ve Project..."
-msgstr "&Enregistrer un Project..."
+msgstr "Enregistrer un Pro&jet..."
#: Merge.rc:119
#, c-format
@@ -208,7 +208,7 @@
#: Merge.rc:403
#, c-format
msgid "&Toolbar"
-msgstr "Barre d'&outils"
+msgstr "Barre d'ou&tils"
#: Merge.rc:134
#: Merge.rc:226
@@ -243,7 +243,7 @@
#: Merge.rc:410
#, c-format
msgid "Ta&b Bar"
-msgstr "Barre de lo&calisation"
+msgstr "Barre d'&onglet"
#: Merge.rc:141
#: Merge.rc:234
@@ -391,42 +391,42 @@
#: Merge.rc:474
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr ""
+msgstr "&Rubriques d'aide WinMerge\tF1"
#: Merge.rc:177
#: Merge.rc:291
#: Merge.rc:476
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "&Notes de mise \xE0 jour"
#: Merge.rc:178
#: Merge.rc:292
#: Merge.rc:477
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "&Traductions"
#: Merge.rc:179
#: Merge.rc:293
#: Merge.rc:478
#, c-format
msgid "C&onfiguration"
-msgstr ""
+msgstr "&Configuration"
#: Merge.rc:180
#: Merge.rc:294
#: Merge.rc:479
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Support d'archives disqualifi\xE9..."
+msgstr "&Support d'archives d\xE9sactiv\xE9..."
#: Merge.rc:182
#: Merge.rc:296
#: Merge.rc:481
#, c-format
msgid "&GNU General Public License"
-msgstr ""
+msgstr "&Licence publique g\xE9n\xE9rale GNU"
#: Merge.rc:183
#: Merge.rc:297
@@ -450,7 +450,7 @@
#: Merge.rc:200
#, c-format
msgid "File En&coding"
-msgstr "Encodage de &fichier"
+msgstr "Encodage de fic&hier"
#: Merge.rc:206
#: Merge.rc:353
@@ -502,7 +502,7 @@
#: Merge.rc:416
#, c-format
msgid "Refre&sh\tF5"
-msgstr "Actual&iser\tF5"
+msgstr "&Actualiser\tF5"
#: Merge.rc:237
#, c-format
@@ -624,22 +624,22 @@
#: Merge.rc:330
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Rendre au format"
+msgstr "&Convertir les fins de ligne"
#: Merge.rc:332
#, c-format
msgid "&Windows (CRLF)"
-msgstr ""
+msgstr "&Windows (CRLF)"
#: Merge.rc:333
#, c-format
msgid "&Unix (LF)"
-msgstr ""
+msgstr "&Unix (LF)"
#: Merge.rc:334
#, c-format
msgid "&Mac (CR)"
-msgstr ""
+msgstr "&Mac (CR)"
#: Merge.rc:337
#, c-format
@@ -649,7 +649,7 @@
#: Merge.rc:339
#, c-format
msgid "&File Encoding..."
-msgstr ""
+msgstr "Encodage de fic&hier"
#: Merge.rc:345
#, c-format
@@ -669,7 +669,7 @@
#: Merge.rc:349
#, c-format
msgid "&Copy\tCtrl+C"
-msgstr "Co&pier\tCtrl+C"
+msgstr "Cop&ier\tCtrl+C"
#: Merge.rc:350
#, c-format
@@ -684,7 +684,7 @@
#: Merge.rc:355
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Rechercher...\tCtrl+F"
+msgstr "Rec&hercher...\tCtrl+F"
#: Merge.rc:356
#, c-format
@@ -694,7 +694,7 @@
#: Merge.rc:358
#, c-format
msgid "&Scripts"
-msgstr "Appliquer un &script"
+msgstr "Appli&quer un script"
#: Merge.rc:360
#: Merge.rc:2706
@@ -715,12 +715,12 @@
#: Merge.rc:368
#, c-format
msgid "&Bookmarks"
-msgstr "&Signets"
+msgstr "Si&gnets"
#: Merge.rc:370
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr "&Placer/retirer un signet\tCtrl+F2"
+msgstr "Placer/&retirer un signet\tCtrl+F2"
#: Merge.rc:371
#, c-format
@@ -745,33 +745,33 @@
#: Merge.rc:383
#, c-format
msgid "&Zoom"
-msgstr ""
+msgstr "&Zoom"
#: Merge.rc:385
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr ""
+msgstr "Zoom a&vant\tCtrl++"
#: Merge.rc:386
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr ""
+msgstr "Zoom a&rri\xE8re\tCtrl+-"
#. Zoom to normal
#: Merge.rc:387
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr ""
+msgstr "&Normal\tCtrl+*"
#: Merge.rc:389
#, c-format
msgid "Syntax Highlight"
-msgstr "Coloration de la syntaxe"
+msgstr "&Coloration de la syntaxe"
#: Merge.rc:394
#, c-format
msgid "&Lock Panes"
-msgstr ""
+msgstr "&Verrouiller les fen\xEAtres"
#: Merge.rc:395
#, c-format
@@ -806,12 +806,12 @@
#: Merge.rc:411
#, c-format
msgid "Diff &Pane"
-msgstr "D\xE9&tail des diff\xE9rences"
+msgstr "&D\xE9tail des diff\xE9rences"
#: Merge.rc:412
#, c-format
msgid "Lo&cation Pane"
-msgstr "Barre de lo&calisation"
+msgstr "Barre de locali&sation"
#: Merge.rc:430
#, c-format
@@ -846,12 +846,12 @@
#: Merge.rc:491
#, c-format
msgid "Co&mpare Special"
-msgstr ""
+msgstr "Comparaison sp&\xE9ciale"
#: Merge.rc:493
#, c-format
msgid "&XML"
-msgstr ""
+msgstr "&XML"
#: Merge.rc:498
#, c-format
@@ -1071,7 +1071,7 @@
#: Merge.rc:662
#, c-format
msgid "Contributors"
-msgstr "Collaborateurs"
+msgstr "Contributeurs"
#: Merge.rc:668
#, c-format
@@ -1267,7 +1267,7 @@
#: Merge.rc:758
#, c-format
msgid "&Preserve file time in file compare"
-msgstr ""
+msgstr "Pr\xE9server le timbre horaire lors de comparaison de fichier"
#: Merge.rc:761
#, c-format
@@ -1277,7 +1277,7 @@
#: Merge.rc:764
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "Qualifier plusieurs fen\xEAtres pour"
+msgstr "Activer plusieurs fen\xEAtres pour"
#: Merge.rc:766
#: Merge.rc:1609
@@ -1436,7 +1436,7 @@
#: Merge.rc:871
#, c-format
msgid "Enable Line Filters"
-msgstr "Qualifier le fitrage des lignes"
+msgstr "Activer le fitrage des lignes"
#: Merge.rc:874
#, c-format
@@ -1562,7 +1562,7 @@
#: Merge.rc:983
#, c-format
msgid "E&nable advanced menu"
-msgstr "&Qualifier le menu avanc\xE9"
+msgstr "&Activer le menu avanc\xE9"
#: Merge.rc:985
#, c-format
@@ -1582,22 +1582,22 @@
#: Merge.rc:992
#, c-format
msgid "B&rowse..."
-msgstr ""
+msgstr "Parc&ourir..."
#: Merge.rc:993
#, c-format
msgid "Temporary files folder"
-msgstr ""
+msgstr "R\xE9pertoire des fichiers temporaires"
#: Merge.rc:994
#, c-format
msgid "S&ystem's temp folder"
-msgstr ""
+msgstr "R\xE9pertoire temporaire du syst\xE8me"
#: Merge.rc:996
#, c-format
msgid "C&ustom folder:"
-msgstr ""
+msgstr "R\xE9pertoire \xE0 identifier:"
#: Merge.rc:999
#: Merge.rc:1015
@@ -1830,12 +1830,12 @@
#: Merge.rc:1156
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr ""
+msgstr "Ignorer les diff\xE9rences de &fin de ligne (Windows/Unix/Mac)"
#: Merge.rc:1159
#, c-format
msgid "E&nable moved block detection"
-msgstr "&Qualifier la d\xE9tection des blocs d\xE9plac\xE9s"
+msgstr "&Activer la d\xE9tection des blocs d\xE9plac\xE9s"
#: Merge.rc:1161
#, c-format
@@ -2038,7 +2038,7 @@
#: Merge.rc:1278
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr "WinMerge - Support pour archives disqualifi\xE9"
+msgstr "WinMerge - Support pour archives d\xE9sactiv\xE9"
#: Merge.rc:1281
#, c-format
@@ -2132,7 +2132,7 @@
#: Merge.rc:1312
#, c-format
msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr ""
+msgstr "Ne plus afficher ce &message.\n(Il peut toujours \xEAtre r\xE9activer au menu des pr\xE9f\xE9rences.)"
#: Merge.rc:1316
#, c-format
@@ -2284,7 +2284,7 @@
#: Merge.rc:1447
#, c-format
msgid "&Enable archive file support"
-msgstr "&Qualifier le support d'archives"
+msgstr "&Activer le support d'archives"
#: Merge.rc:1449
#, c-format
@@ -2938,7 +2938,7 @@
#: Merge.rc:1805
#, c-format
msgid "Automatically resize panes\nLock Panes"
-msgstr ""
+msgstr "Redimensionne les fen\xEAtres automatiquement\nVerrouiller les fen\xEAtres"
#: Merge.rc:1811
#, c-format
@@ -3028,12 +3028,12 @@
#: Merge.rc:1865
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr ""
+msgstr "D\xE9veloppeurs:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1866
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr ""
+msgstr "WinMerge est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous \xEAtes invit\xE9 \xE0 le redistribuer sous certaines conditions; Voir la licence publique g\xE9n\xE9rale GNU au menu d'aide pour tous les d\xE9tails."
#: Merge.rc:1872
#, c-format
@@ -3240,22 +3240,22 @@
#: Merge.rc:1964
#, c-format
msgid "UTF-8"
-msgstr ""
+msgstr "UTF-8"
#: Merge.rc:1965
#, c-format
msgid "UTF-8 (B)"
-msgstr ""
+msgstr "UTF-8 (B)"
#: Merge.rc:1966
#, c-format
msgid "UCS-2 LE"
-msgstr ""
+msgstr "UCS-2 LE"
#: Merge.rc:1967
#, c-format
msgid "UCS-2 BE"
-msgstr ""
+msgstr "UCS-2 BE"
#: Merge.rc:1973
#, c-format
@@ -3426,12 +3426,12 @@
#: Merge.rc:2025
#, c-format
msgid "Theirs File"
-msgstr ""
+msgstr "Leur fichier"
#: Merge.rc:2026
#, c-format
msgid "Mine File"
-msgstr ""
+msgstr "Mon fichier"
#: Merge.rc:2032
#, c-format
@@ -3567,7 +3567,7 @@
#: Merge.rc:2073
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Choisissez deux fichiers pour qualifier la s\xE9lection du d\xE9compresseur."
+msgstr "Choisissez deux fichiers pour activer la s\xE9lection du d\xE9compresseur."
#: Merge.rc:2074
#, c-format
@@ -3600,12 +3600,12 @@
#: Merge.rc:2083
#, c-format
msgid "Failed to parse conflict file."
-msgstr ""
+msgstr "L'analyse du fichier en conflit a \xE9chou\xE9."
#: Merge.rc:2084
#, c-format
msgid "The file\n%1\nis not a conflict file."
-msgstr ""
+msgstr "Le fichier\n%1\nn'est pas un fichier en conflit."
#: Merge.rc:2090
#, c-format
@@ -4513,7 +4513,7 @@
#: Merge.rc:2349
#, c-format
msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr ""
+msgstr "Les fins de ligne sont de type diff\xE9rent (Windows/Unix/Mac) au fichier '%1'.\n Selon les pr\xE9f\xE9rences en vigueur, elles seront uniformis\xE9es au type principal.\n D\xE9sirez-vous changer l'option et pr\xE9server les diff\xE9rences ?"
#: Merge.rc:2350
#, c-format
@@ -4533,7 +4533,7 @@
#: Merge.rc:2353
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr ""
+msgstr "Le r\xE9pertoire existe seulement de l'autre c\xF4t\xE9 et ne peut \xEAtre ouvert ici.\n\nVoulez-vous cr\xE9er un r\xE9pertoire s'accordant:\n%1\n\xE0 l'autre c\xF4t\xE9 et ouvrir ces r\xE9pertoires"
#: Merge.rc:2359
#, c-format
@@ -4584,7 +4584,7 @@
#: Merge.rc:2377
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "texte non trouv\xE9 \"%s\""
+msgstr "Texte non trouv\xE9 \"%s\""
#: Merge.rc:2383
#, c-format
@@ -4699,9 +4699,9 @@
"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
"See manual for more info about archive support and how to enable it."
msgstr ""
-"Le support d'archives n'est pas qualifi\xE9.\n"
+"Le support d'archives n'est pas activ\xE9.\n"
"Tous les composants requis (7-zip et/ou Merge7z*.dll) pour le support d'archives ne peuvent \xEAtre trouv\xE9s.\n"
-"Consulter la documentation au sujet du support d'archives indiquant comment le qualifier."
+"Consulter la documentation au sujet du support d'archives indiquant comment l'activer."
#: Merge.rc:2418
#, c-format
@@ -4710,7 +4710,7 @@
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
"\n"
-"Note: l'int\xE9gration de 7-Zip est disqualifi\xE9e avec les pr\xE9f\xE9rences de WinMerge."
+"Note: l'int\xE9gration de 7-Zip est d\xE9sactiv\xE9e avec les pr\xE9f\xE9rences de WinMerge."
#: Merge.rc:2419
#, c-format
@@ -4795,7 +4795,7 @@
#: Merge.rc:2438
#, c-format
msgid "Invalid back reference"
-msgstr "Ref\xE9rence arri\xE8re invalide"
+msgstr "R\xE9f\xE9rence arri\xE8re invalide"
#: Merge.rc:2439
#, c-format
@@ -5136,17 +5136,17 @@
#: Merge.rc:2562
#, c-format
msgid "LF"
-msgstr ""
+msgstr "LF"
#: Merge.rc:2563
#, c-format
msgid "CR"
-msgstr ""
+msgstr "CR"
#: Merge.rc:2564
#, c-format
msgid "CRLF"
-msgstr ""
+msgstr "CRLF"
#: Merge.rc:2571
#, c-format
@@ -5211,17 +5211,17 @@
#: Merge.rc:2589
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr ""
+msgstr "Convertir la fin de ligne en mode Windows"
#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr ""
+msgstr "Convertir la fin de ligne en mode Unix"
#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr ""
+msgstr "Convertir la fin de ligne en mode Mac"
#: Merge.rc:2592
#, c-format
@@ -5240,7 +5240,7 @@
#: Merge.rc:2594
#, c-format
msgid "Open and resolve conflict file"
-msgstr ""
+msgstr "Ouvrir et r\xE9soudre le fichier en conflit"
#: Merge.rc:2600
#, c-format
@@ -5403,12 +5403,12 @@
#: Merge.rc:2632
#, c-format
msgid "Select the current user interface language\nLanguage"
-msgstr ""
+msgstr "S\xE9lectionner le langage de l'interface\nLangage"
#: Merge.rc:2633
#, c-format
msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr ""
+msgstr "Afficher les diff\xE9rences des lignes avec diff\xE9rentes couleurs\nAfficher diff\xE9rences des lignes"
#: Merge.rc:2634
#, c-format
@@ -5445,42 +5445,42 @@
#: Merge.rc:2638
#, c-format
msgid "Increase text size"
-msgstr ""
+msgstr "Augmenter la taille du texte"
#: Merge.rc:2639
#, c-format
msgid "Decrease text size"
-msgstr ""
+msgstr "Diminuer la taille du texte"
#: Merge.rc:2640
#, c-format
msgid "Reset text zoom to default size"
-msgstr ""
+msgstr "Initialiser le zoom du texte \xE0 la taille par d\xE9faut"
#: Merge.rc:2646
#, c-format
msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr ""
+msgstr "Atteindre la diff\xE9rence pr\xE9c\xE9dente\nDiff Pr\xE9c\xE9dente (Alt+Up)"
#: Merge.rc:2647
#, c-format
msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr ""
+msgstr "Atteindre la diff\xE9rence suivante\nDiff Suivante (Alt+Down)"
#: Merge.rc:2648
#, c-format
msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr ""
+msgstr "Atteindre la premi\xE8re diff\xE9rence\nPremi\xE8re Diff (Alt+Home)"
#: Merge.rc:2649
#, c-format
msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr ""
+msgstr "Atteindre la diff\xE9rence courante\nDiff Courante (Alt+Enter)"
#: Merge.rc:2650
#, c-format
msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr ""
+msgstr "Atteindre la derni\xE8re diff\xE9rence\nDerni\xE8re Diff (Alt+End)"
#: Merge.rc:2651
#, c-format
@@ -5604,7 +5604,7 @@
#: Merge.rc:2685
#, c-format
msgid "Activates next visible file\nActivate next File"
-msgstr ""
+msgstr "Active le prochain fichier visible\nActive le prochain fichier"
#: Merge.rc:2686
#, c-format
@@ -5614,7 +5614,7 @@
#: Merge.rc:2692
#, c-format
msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr ""
+msgstr "Ouvre la rubrique d'aide de WinMerge\nAide de WinMerge"
#: Merge.rc:2693
#, c-format
@@ -5624,7 +5624,7 @@
#: Merge.rc:2694
#, c-format
msgid "Display the GNU General Public License"
-msgstr ""
+msgstr "Afficher la licence publique g\xE9n\xE9rale GNU"
#: Merge.rc:2695
#, c-format
@@ -5634,12 +5634,12 @@
#: Merge.rc:2696
#, c-format
msgid "Opens the release notes document\nRelease Notes"
-msgstr ""
+msgstr "Ouvre les notes de mise \xE0 jour\nNotes de mise \xE0 jour"
#: Merge.rc:2697
#, c-format
msgid "Opens the translations website\nTranslations"
-msgstr ""
+msgstr "Ouvre le site web des traductions\nTraductions"
#: Merge.rc:2703
#, c-format
@@ -5659,7 +5659,7 @@
#: Merge.rc:2707
#, c-format
msgid "WSH not found - .sct scripts disabled"
-msgstr "WSH pas trouv\xE9 - .sct les scripts sont disqualifi\xE9s"
+msgstr "WSH pas trouv\xE9 - .sct les scripts sont d\xE9sactiv\xE9s"
#: Merge.rc:2708
#, c-format
@@ -5694,7 +5694,7 @@
#: Merge.rc:2724
#, c-format
msgid "Display all moved blocks"
-msgstr ""
+msgstr "Afficher tous les blocs d\xE9plac\xE9s"
#: Merge.rc:2725
#, c-format
@@ -5719,7 +5719,7 @@
#: Merge.rc:2734
#, c-format
msgid "Disabled"
-msgstr "Disqualifi\xE9"
+msgstr "D\xE9sactiv\xE9"
#: Merge.rc:2735
#, c-format
@@ -5824,12 +5824,12 @@
#: Merge.rc:2761
#, c-format
msgid "Portable Object"
-msgstr ""
+msgstr "Objet portatif"
#: Merge.rc:2762
#, c-format
msgid "PowerShell"
-msgstr ""
+msgstr "PowerShell"
#: Merge.rc:2763
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-26 22:28:44
|
Revision: 5193
http://winmerge.svn.sourceforge.net/winmerge/?rev=5193&view=rev
Author: gerundt
Date: 2008-03-26 15:27:38 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
PATCH: [ 1926531 ] Add tab icons to Filter dialog
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/FileFiltersDlg.cpp
trunk/Src/Merge2.rc
trunk/Src/PropLineFilter.cpp
trunk/Src/resource.h
Added Paths:
-----------
trunk/Src/res/FileFilter.ico
trunk/Src/res/LineFilter.ico
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-26 14:50:08 UTC (rev 5192)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-26 22:27:38 UTC (rev 5193)
@@ -8,6 +8,7 @@
Installer: Updated the side art of the installer application (#1915012)
Update URLs and switch to 2.8 manual (#1919965)
New splash screen (#1914869)
+ Tab icons at Filter dialog (#1926531)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2008-03-26 14:50:08 UTC (rev 5192)
+++ trunk/Src/FileFiltersDlg.cpp 2008-03-26 22:27:38 UTC (rev 5193)
@@ -59,6 +59,8 @@
m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
m_psp.pszTitle = m_strCaption;
m_psp.dwFlags |= PSP_USETITLE;
+ m_psp.hIcon = AfxGetApp()->LoadIcon(IDI_FILEFILTER);
+ m_psp.dwFlags |= PSP_USEHICON;
}
void FileFiltersDlg::DoDataExchange(CDataExchange* pDX)
Modified: trunk/Src/Merge2.rc
===================================================================
--- trunk/Src/Merge2.rc 2008-03-26 14:50:08 UTC (rev 5192)
+++ trunk/Src/Merge2.rc 2008-03-26 22:27:38 UTC (rev 5193)
@@ -41,6 +41,8 @@
IDI_FOLDERUP_DISABLE ICON "res\\folderup_disable.ico"
IDI_SIGMA ICON "res\\sigma.ico"
IDI_COMPARE_ABORTED ICON "res\\aborted.ico"
+IDI_FILEFILTER ICON "res\\FileFilter.ico"
+IDI_LINEFILTER ICON "res\\LineFilter.ico"
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/Src/PropLineFilter.cpp
===================================================================
--- trunk/Src/PropLineFilter.cpp 2008-03-26 14:50:08 UTC (rev 5192)
+++ trunk/Src/PropLineFilter.cpp 2008-03-26 22:27:38 UTC (rev 5193)
@@ -38,6 +38,8 @@
m_strCaption = theApp.LoadDialogCaption(m_lpszTemplateName).c_str();
m_psp.pszTitle = m_strCaption;
m_psp.dwFlags |= PSP_USETITLE;
+ m_psp.hIcon = AfxGetApp()->LoadIcon(IDI_LINEFILTER);
+ m_psp.dwFlags |= PSP_USEHICON;
}
CPropLineFilter::~CPropLineFilter()
Added: trunk/Src/res/FileFilter.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/FileFilter.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Src/res/LineFilter.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Src/res/LineFilter.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2008-03-26 14:50:08 UTC (rev 5192)
+++ trunk/Src/resource.h 2008-03-26 22:27:38 UTC (rev 5193)
@@ -115,6 +115,8 @@
#define IDI_FOLDERUP_DISABLE 513
#define IDI_SIGMA 514
#define IDI_COMPARE_ABORTED 515
+#define IDI_FILEFILTER 516
+#define IDI_LINEFILTER 517
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2008-03-26 22:56:42
|
Revision: 5194
http://winmerge.svn.sourceforge.net/winmerge/?rev=5194&view=rev
Author: gerundt
Date: 2008-03-26 15:55:44 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
PATCH: [ 1913723 ] Fixing a brazilian message
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Src/Languages/Brazilian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-26 22:27:38 UTC (rev 5193)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-26 22:55:44 UTC (rev 5194)
@@ -15,6 +15,7 @@
BugFix: Print area was not clipped correctly. (#1915536)
BugFix: Undo after pane swapping (#1915536, #1923625)
Translation updates:
+ - Brazilian (#1913723)
- French (#1920380)
- German (r5130, r5139, r5171)
- Japanese (r5152)
Modified: trunk/Src/Languages/Brazilian.po
===================================================================
--- trunk/Src/Languages/Brazilian.po 2008-03-26 22:27:38 UTC (rev 5193)
+++ trunk/Src/Languages/Brazilian.po 2008-03-26 22:55:44 UTC (rev 5194)
@@ -3,6 +3,7 @@
#
# Translators:
# * Wender Firmino <wender at pta.com.br>
+# * Leonardo Peixoto <ljpeixoto at gmail.com>
#
# ID line follows -- this is updated by SVN
# $Id$
@@ -3573,7 +3574,7 @@
#: Merge.rc:2092
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 est\xE1 marcado somente-leitura. Voc\xEA gostaria de salvar suas altera\xE7\xF5es com um nome de diferente?"
+msgstr "%1 est\xE1 marcado como somente-leitura. Voc\xEA tem certeza de que quer sobrescrever esse arquivo ? (Responda N\xE3o para salvar com um nome diferente.)"
#: Merge.rc:2093
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2008-03-27 17:07:57
|
Revision: 5198
http://winmerge.svn.sourceforge.net/winmerge/?rev=5198&view=rev
Author: kimmov
Date: 2008-03-27 10:07:55 -0700 (Thu, 27 Mar 2008)
Log Message:
-----------
PATCH: [ 1926346 ] Add VS2003/VS2005 project files
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Added Paths:
-----------
trunk/Externals/expat/examples/elements.vcproj
trunk/Externals/expat/examples/outline.vcproj
trunk/Externals/expat/expat.sln
trunk/Externals/expat/lib/expat.vcproj
trunk/Externals/expat/lib/expatw.vcproj
trunk/Externals/expat/lib/expatw_static.vcproj
trunk/Externals/expat/xmlwf/xmlwf.vcproj
trunk/Externals/pcre/config_pcre/config_pcre.vcproj
trunk/Externals/pcre/dll_pcre/pcre.vcproj
trunk/Externals/pcre/lib_pcre/lib_pcre.vcproj
trunk/Externals/pcre/lib_pcreposix/lib_pcreposix.vcproj
trunk/Externals/pcre/pcre.sln
trunk/Externals/pcre/pcretest/pcretest.vcproj
trunk/Externals/scew/win32/scew.vcproj
trunk/ShellExtension/ShellExtension.vcproj
trunk/winMerge.sln
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-03-27 15:51:15 UTC (rev 5197)
+++ trunk/Docs/Users/ChangeLog.txt 2008-03-27 17:07:55 UTC (rev 5198)
@@ -9,6 +9,7 @@
Update URLs and switch to 2.8 manual (#1919965)
New splash screen (#1914869)
Tab icons at Filter dialog (#1926531)
+ Add VS2003/VS2005 project files (#1926346)
BugFix: Installer could create a registry access error (#1909967)
BugFix: The filter text box in Open-dialog sometimes displayed some garbage
data (#1915424)
Added: trunk/Externals/expat/examples/elements.vcproj
===================================================================
--- trunk/Externals/expat/examples/elements.vcproj (rev 0)
+++ trunk/Externals/expat/examples/elements.vcproj 2008-03-27 17:07:55 UTC (rev 5198)
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="elements"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\../../../Build/expat/elements/Debug"
+ IntermediateDirectory=".\../../../BuildTmp/expat/elements/Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\lib"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/elements/Debug/elements.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/elements/Debug/"
+ ObjectFile=".\../../../BuildTmp/expat/elements/Debug/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Debug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib"
+ OutputFile=".\../../../Build/expat/elements/Debug/elements.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../../../Build/expat/lib/Debug_static"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/elements/Debug/elements.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\../../../Build/expat/elements/Release"
+ IntermediateDirectory=".\../../../BuildTmp/expat/elements/Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\lib"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/elements/Release/elements.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/elements/Release/"
+ ObjectFile=".\../../../BuildTmp/expat/elements/Release/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/elements/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="odbccp32.lib libexpatMT.lib odbc32.lib"
+ OutputFile=".\../../../Build/expat/elements/Release/elements.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="../../../Build/expat/lib/Release_static"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/elements/Release/elements.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath="elements.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/Externals/expat/examples/elements.vcproj
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Externals/expat/examples/outline.vcproj
===================================================================
--- trunk/Externals/expat/examples/outline.vcproj (rev 0)
+++ trunk/Externals/expat/examples/outline.vcproj 2008-03-27 17:07:55 UTC (rev 5198)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="outline"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\../../../Build/expat/outline/Debug"
+ IntermediateDirectory=".\../../../BuildTmp/expat/outline/Debug"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\lib"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/outline/Debug/outline.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/outline/Debug/"
+ ObjectFile=".\../../../BuildTmp/expat/outline/Debug/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Debug/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=".\../../../Build/expat/outline/Debug/outline.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/outline/Debug/outline.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\../../../Build/expat/outline/Release"
+ IntermediateDirectory=".\../../../BuildTmp/expat/outline/Release"
+ ConfigurationType="1"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="..\lib"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/outline/Release/outline.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/outline/Release/"
+ ObjectFile=".\../../../BuildTmp/expat/outline/Release/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/outline/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile=".\../../../Build/expat/outline/Release/outline.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\../../../Build/expat/outline/Release/outline.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath="outline.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""/>
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/Externals/expat/examples/outline.vcproj
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Externals/expat/expat.sln
===================================================================
--- trunk/Externals/expat/expat.sln (rev 0)
+++ trunk/Externals/expat/expat.sln 2008-03-27 17:07:55 UTC (rev 5198)
@@ -0,0 +1,74 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elements", "examples\elements.vcproj", "{4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}"
+ ProjectSection(ProjectDependencies) = postProject
+ {464DBF5A-69E8-4E1A-8401-171371B86299} = {464DBF5A-69E8-4E1A-8401-171371B86299}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "lib\expat.vcproj", "{ACAE29AF-D15F-402E-AE0A-93141CF439C6}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat_static", "lib\expat_static.vcproj", "{464DBF5A-69E8-4E1A-8401-171371B86299}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw", "lib\expatw.vcproj", "{AC9279F5-5C6F-477F-AA3B-A42F8859D236}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expatw_static", "lib\expatw_static.vcproj", "{4815F7F0-BA32-4D79-A041-A146B0130D9E}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "outline", "examples\outline.vcproj", "{FD603999-011A-458C-9677-D596E25A620C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6} = {ACAE29AF-D15F-402E-AE0A-93141CF439C6}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlwf", "xmlwf\xmlwf.vcproj", "{3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}"
+ ProjectSection(ProjectDependencies) = postProject
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6} = {ACAE29AF-D15F-402E-AE0A-93141CF439C6}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.ActiveCfg = Debug|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Debug.Build.0 = Debug|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.ActiveCfg = Release|Win32
+ {4C943AC7-0187-4AB9-A9DB-F1BE96E2E099}.Release.Build.0 = Release|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.ActiveCfg = Debug|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Debug.Build.0 = Debug|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.ActiveCfg = Release|Win32
+ {ACAE29AF-D15F-402E-AE0A-93141CF439C6}.Release.Build.0 = Release|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.ActiveCfg = Debug|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Debug.Build.0 = Debug|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.ActiveCfg = Release|Win32
+ {464DBF5A-69E8-4E1A-8401-171371B86299}.Release.Build.0 = Release|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.ActiveCfg = Debug|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Debug.Build.0 = Debug|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.ActiveCfg = Release|Win32
+ {AC9279F5-5C6F-477F-AA3B-A42F8859D236}.Release.Build.0 = Release|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.ActiveCfg = Debug|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Debug.Build.0 = Debug|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.ActiveCfg = Release|Win32
+ {4815F7F0-BA32-4D79-A041-A146B0130D9E}.Release.Build.0 = Release|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Debug.ActiveCfg = Debug|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Debug.Build.0 = Debug|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Release.ActiveCfg = Release|Win32
+ {FD603999-011A-458C-9677-D596E25A620C}.Release.Build.0 = Release|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.ActiveCfg = Debug|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Debug.Build.0 = Debug|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.ActiveCfg = Release|Win32
+ {3D30CD64-0C5F-4ABA-87BB-EFF641FDEBB1}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Property changes on: trunk/Externals/expat/expat.sln
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Externals/expat/lib/expat.vcproj
===================================================================
--- trunk/Externals/expat/lib/expat.vcproj (rev 0)
+++ trunk/Externals/expat/lib/expat.vcproj 2008-03-27 17:07:55 UTC (rev 5198)
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="expat"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\../../../Build/expat/lib/Debug"
+ IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Debug/expat.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Debug/"
+ ObjectFile=".\../../../BuildTmp/expat/lib/Debug/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="../../../Build/expat/lib/Debug/libexpat.dll"
+ LinkIncremental="2"
+ SuppressStartupBanner="TRUE"
+ ModuleDefinitionFile=".\libexpat.def"
+ GenerateDebugInformation="TRUE"
+ ImportLibrary=".\../../../Build/expat/lib/Debug/libexpat.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Debug/expat.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="mkdir ..\..\..\Build\expat
+copy ..\..\..\Build\expat\lib\debug\libexpat.lib ..\..\..\Build\expat
+copy ..\..\..\Build\expat\lib\debug\libexpat.dll ..\..\..\Build\expat
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\../../../Build/expat/lib/Release"
+ IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;COMPILED_FROM_DSP"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release/expat.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release/"
+ ObjectFile=".\../../../BuildTmp/expat/lib/Release/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="../../../Build/expat/lib/Release/libexpat.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ ModuleDefinitionFile=".\libexpat.def"
+ ImportLibrary=".\../../../Build/expat/lib/Release/libexpat.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Release/expat.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="mkdir ..\..\..\Build\expat
+copy ..\..\..\Build\expat\lib\release\libexpat.lib ..\..\..\Build\expat
+copy ..\..\..\Build\expat\lib\release\libexpat.dll ..\..\..\Build\expat
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+ <File
+ RelativePath="libexpat.def">
+ </File>
+ <File
+ RelativePath="xmlparse.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
+ ExceptionHandling="FALSE"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="xmlrole.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="xmltok.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="xmltok_impl.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="xmltok_ns.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;COMPILED_FROM_DSP;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl">
+ <File
+ RelativePath="ascii.h">
+ </File>
+ <File
+ RelativePath="asciitab.h">
+ </File>
+ <File
+ RelativePath="expat.h">
+ </File>
+ <File
+ RelativePath="expat_external.h">
+ </File>
+ <File
+ RelativePath="iasciitab.h">
+ </File>
+ <File
+ RelativePath="internal.h">
+ </File>
+ <File
+ RelativePath="latin1tab.h">
+ </File>
+ <File
+ RelativePath="nametab.h">
+ </File>
+ <File
+ RelativePath="utf8tab.h">
+ </File>
+ <File
+ RelativePath="xmlrole.h">
+ </File>
+ <File
+ RelativePath="xmltok.h">
+ </File>
+ <File
+ RelativePath="xmltok_impl.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/Externals/expat/lib/expat.vcproj
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/Externals/expat/lib/expatw.vcproj
===================================================================
--- trunk/Externals/expat/lib/expatw.vcproj (rev 0)
+++ trunk/Externals/expat/lib/expatw.vcproj 2008-03-27 17:07:55 UTC (rev 5198)
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="expatw"
+ SccProjectName=""
+ SccLocalPath="">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\../../../Build/expat/lib/Release-w"
+ IntermediateDirectory=".\../../../BuildTmp/expat/lib/Release-w"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ PreprocessorDefinitions="NDEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Release-w/expatw.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Release-w/"
+ ObjectFile=".\../../../BuildTmp/expat/lib/Release-w/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Release-w/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="../../../Build/expat/lib/Release-w/libexpatw.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ ModuleDefinitionFile=".\libexpatw.def"
+ ImportLibrary=".\../../../Build/expat/lib/Release-w/libexpatw.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="TRUE"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ TypeLibraryName=".\../../../Build/expat/lib/Release-w/expatw.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="mkdir ..\..\..\Build\expat
+copy ..\..\..\Build\expat\lib\Release-w\libexpatw.dll ..\..\..\Build\expat
+copy ..\..\..\Build\expat\lib\Release-w\libexpatw.lib ..\..\..\Build\expat
+"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\../../../Build/expat/lib/Debug-w"
+ IntermediateDirectory=".\../../../BuildTmp/expat/lib/Debug-w"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;COMPILED_FROM_DSP;WIN32;_WINDOWS;_USRDLL;XML_UNICODE_WCHAR_T"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=".\../../../BuildTmp/expat/lib/Debug-w/expatw.pch"
+ AssemblerListingLocation=".\../../../BuildTmp/expat/lib/Debug-w/"
+ ObjectFile=".\../../../BuildTmp/expat/lib/Debug-w/"
+ ProgramDataBaseFileName=".\../../../BuildTmp/expat/lib/Debug-w/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ Sup...
[truncated message content] |
