[Winmerge-svn] SF.net SVN: winmerge: [4305] branches/R2_6/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2007-05-31 21:56:06
|
Revision: 4305 http://svn.sourceforge.net/winmerge/?rev=4305&view=rev Author: gerundt Date: 2007-05-31 14:56:00 -0700 (Thu, 31 May 2007) Log Message: ----------- PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase" Modified Paths: -------------- branches/R2_6/Src/Changes.txt branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc branches/R2_6/Src/Languages/Czech/MergeCzech.rc branches/R2_6/Src/Languages/Danish/MergeDanish.rc branches/R2_6/Src/Languages/Dutch/MergeDutch.rc branches/R2_6/Src/Languages/French/MergeFrench.rc branches/R2_6/Src/Languages/German/MergeGerman.rc branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc branches/R2_6/Src/Languages/Italian/MergeItalian.rc branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc branches/R2_6/Src/Languages/Korean/MergeKorean.rc branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc branches/R2_6/Src/Languages/Polish/MergePolish.rc branches/R2_6/Src/Languages/Russian/MergeRussian.rc branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc branches/R2_6/Src/Merge.rc Modified: branches/R2_6/Src/Changes.txt =================================================================== --- branches/R2_6/Src/Changes.txt 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Changes.txt 2007-05-31 21:56:00 UTC (rev 4305) @@ -2,6 +2,11 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-05-31 Tim + PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase" + Src: Merge.rc + Src/Languages/*: Merge*.rc + 2007-05-29 Takashi BUG [ 1722197 ] Downgrading from 2.7.3.4 to 2.6.6 causes Explorer crash ShellExtension: WinMergeShell.cpp Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc =================================================================== --- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc =================================================================== --- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "\xC4\xE5\xE9\xF1\xF2\xE2\xE0\xE9",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc =================================================================== --- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "&Extreu (check-out)",IDOK,115,115,70,14 Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc =================================================================== --- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -828,7 +828,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "\xB5\xF7\xCA\xD4",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc =================================================================== --- branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc =================================================================== --- branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc =================================================================== --- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Check-out",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc =================================================================== --- branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/French/MergeFrench.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -825,7 +825,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "&Extraire",IDOK,169,115,68,14 Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc =================================================================== --- branches/R2_6/Src/Languages/German/MergeGerman.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/German/MergeGerman.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Auschecken",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc =================================================================== --- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Ellen\xF5riz",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc =================================================================== --- branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Estrai",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc =================================================================== --- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "\x83`\x83F\x83b\x83N\x83A\x83E\x83g",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc =================================================================== --- branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "üũ\xBEƿ\xF4",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc =================================================================== --- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc =================================================================== --- branches/R2_6/Src/Languages/Polish/MergePolish.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Polish/MergePolish.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Sprawd\x9F",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc =================================================================== --- branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "\xCF\xF0\xEE\xE2\xE5\xF0\xE8\xF2\xFC",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc =================================================================== --- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc =================================================================== --- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Desproteger",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc =================================================================== --- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "Verkst\xE4ll",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc =================================================================== --- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -827,7 +827,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 Modified: branches/R2_6/Src/Merge.rc =================================================================== --- branches/R2_6/Src/Merge.rc 2007-05-31 14:29:28 UTC (rev 4304) +++ branches/R2_6/Src/Merge.rc 2007-05-31 21:56:00 UTC (rev 4305) @@ -837,7 +837,7 @@ IDD_CLEARCASE DIALOGEX 0, 0, 279, 134 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rational Clearcase" +CAPTION "Rational ClearCase" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "CheckOut",IDOK,169,115,50,14 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |