From 44a83f0c2d8401f6436e3cdb76bab22cb5d796f7 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Thu, 31 May 2007 21:57:29 +0000 Subject: [PATCH] PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase" --- Src/Changes.txt | 5 +++++ Src/Languages/Brazilian/MergeBrazilian.rc | 2 +- Src/Languages/Bulgarian/MergeBulgarian.rc | 2 +- Src/Languages/Catalan/MergeCatalan.rc | 2 +- Src/Languages/ChineseSimplified/MergeChineseSimplified.rc | 2 +- Src/Languages/Czech/MergeCzech.rc | 2 +- Src/Languages/Danish/MergeDanish.rc | 2 +- Src/Languages/Dutch/MergeDutch.rc | 2 +- Src/Languages/French/MergeFrench.rc | 2 +- Src/Languages/German/MergeGerman.rc | 2 +- Src/Languages/Hungarian/MergeHungarian.rc | 2 +- Src/Languages/Italian/MergeItalian.rc | 2 +- Src/Languages/Japanese/MergeJapanese.rc | 2 +- Src/Languages/Korean/MergeKorean.rc | 2 +- Src/Languages/Norwegian/MergeNorwegian.rc | 2 +- Src/Languages/Polish/MergePolish.rc | 2 +- Src/Languages/Russian/MergeRussian.rc | 2 +- Src/Languages/Slovak/MergeSlovak.rc | 2 +- Src/Languages/Spanish/MergeSpanish.rc | 2 +- Src/Languages/Swedish/MergeSwedish.rc | 2 +- Src/Languages/Turkish/MergeTurkish.rc | 2 +- Src/Merge.rc | 2 +- 22 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index d55fee88b..014cc1c0b 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -2,6 +2,11 @@ Src\Changes.txt 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-31 WinMerge experimental release 2.7.3.5 (SVN revision 4304) 2007-05-31 Kimmo diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index b7d2f1151..bfd426753 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 46404d8bd..003d67c70 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -820,7 +820,7 @@ END 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 "Äåéñòâàé",IDOK,169,115,50,14 diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index 3a8c62cb8..64b412c9e 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index c128ab0d5..6f09e419a 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -821,7 +821,7 @@ END 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 "µ÷ÊÔ",IDOK,169,115,50,14 diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index bbdfd6beb..762f9be71 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index 7cf023ae9..70ffcdc97 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 140fc7535..35ed2068e 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 9ceff77fe..240fd96a7 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 1e733c4fa..d7c7f0b29 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index 039378632..9f627fd02 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -820,7 +820,7 @@ END 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õriz",IDOK,169,115,50,14 diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 701111757..1bb44741f 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index 064d349d2..8b033d9b3 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -820,7 +820,7 @@ END 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 "ƒ`ƒFƒbƒNƒAƒEƒg",IDOK,169,115,50,14 diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index b2d9f8d33..2bfc4da89 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -820,7 +820,7 @@ END 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 "üũ¾Æ¿ô",IDOK,169,115,50,14 diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index 3894d2ebc..6f0c93412 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index 18b138b41..e96117629 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -820,7 +820,7 @@ END 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Ÿ",IDOK,169,115,50,14 diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index 965a84af4..62ac66bc3 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -815,7 +815,7 @@ END 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 "Ïðîâåðèòü",IDOK,169,115,50,14 diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index d59250d4d..129dbd443 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index a4bf98d2a..f3d035f05 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -815,7 +815,7 @@ END 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 diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 120414e57..e2749d3b2 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -814,7 +814,7 @@ END 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äll",IDOK,169,115,50,14 diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc index e17378123..92fb1e20d 100644 --- a/Src/Languages/Turkish/MergeTurkish.rc +++ b/Src/Languages/Turkish/MergeTurkish.rc @@ -820,7 +820,7 @@ END 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 diff --git a/Src/Merge.rc b/Src/Merge.rc index 1d5c002c2..674e8f3ee 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -831,7 +831,7 @@ END 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 -- 2.11.0