Widen label IDC_PRIVATEBUILD on about box.

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index cc38832..1bb489b 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -268,7 +268,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Versão 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "Todos os direitos reservados.",IDC_STATIC,7,60,170,8
     LTEXT           "Visite o site do WinMerge!",IDC_WWW,7,119,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,114,209,1

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 50187c3..da554aa 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -263,7 +263,7 @@ BEGIN
     LTEXT           "WinMerge",-1,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "È·¶¨",1,184,7,32,14,WS_GROUP
     LTEXT           "°æ±¾ 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "±£ÁôËùÓÐȨÀû¡£",-1,7,60,170,8
     LTEXT           "°Ý·Ã WinMerge Ê×Ò³£¡",IDC_WWW,7,107,209,8
     CONTROL         "",-1,"Static",SS_ETCHEDHORZ,7,103,209,1

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 9fb1d3f..2661393 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -264,7 +264,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "½T©w",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "ª©¥» 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "«O¯d©Ò¦³Åv§Q¡C",IDC_STATIC,7,60,170,8
     LTEXT           "«ô³X WinMerge ­º­¶¡I",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index ac48fc5..184bc50 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -268,7 +268,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,18,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Verze 1.0",IDC_VERSION,63,28,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,38,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,38,153,8
     LTEXT           "V\9aechna práva vyhrazena.",IDC_STATIC,7,60,170,8
     LTEXT           "Nav\9ativte www stránku programu WinMerge!",IDC_WWW,7,107,
                     184,8

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 1e789b7..d728bdc 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -268,7 +268,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Version 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "Alle rettigheder forbeholdes",IDC_STATIC,7,60,170,8
     LTEXT           "Besøg WinMerge hjemmesiden!",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 221a8c3..e0ddb74 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -269,7 +269,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,159,7,32,14,WS_GROUP
     LTEXT           "Version 1.0",IDC_VERSION,63,23,127,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "All rights reserved.",IDC_STATIC,7,60,170,8
     LTEXT           "Bezoek deWinMerge HomePage!",IDC_WWW,7,98,184,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,72,184,1

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 9afbcbf..4c3f870 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -270,7 +270,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,64,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Version 1.0",IDC_VERSION,64,23,127,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,64,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,64,33,153,8
     LTEXT           "Tous droits réservés.",IDC_STATIC,7,60,170,8
     LTEXT           "Découvrez la page d'accueil de WinMerge !",IDC_WWW,7,
                     107,184,8

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 3006d7f..de8c937 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -272,7 +272,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,85,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Version 1.0",IDC_VERSION,64,23,88,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "Alle Rechte vorbehalten.",IDC_STATIC,7,60,170,8
     LTEXT           "Besuchen Sie die WinMerge HomePage!",IDC_WWW,7,107,209,
                     8

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 50137b7..ea919ec 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -267,7 +267,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,159,7,32,14,WS_GROUP
     LTEXT           "Versione 1.0",IDC_VERSION,64,23,127,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "Tutti i diritti riservati.",IDC_STATIC,7,60,170,8
     LTEXT           "Visita la HomePage di WinMerge!",IDC_WWW,7,107,184,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,184,1

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index d672ab3..14a9564 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -235,7 +235,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "È®ÀÎ",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "¹öÀü 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "All rights reserved.",IDC_STATIC,7,60,170,8
     LTEXT           "WinMerge ȨÆäÀÌÁö ¹æ¹®!",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 8ce5de2..7994f3c 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -266,7 +266,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Version 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "Alle rettigheter forbeholdes",IDC_STATIC,7,60,170,8
     LTEXT           "Besøk WinMerge sin hjemmeside!",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 8fd5bb1..5fde931 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -268,7 +268,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Verzia 1.0",IDC_VERSION,63,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "V\9aetky práva vyhradené.",IDC_STATIC,7,60,170,8
     LTEXT           "Nav\9atívte www stránku programu WinMerge!",IDC_WWW,7,107,
                     184,8

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 8ff2296..4bf3326 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -268,7 +268,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "Aceptar",IDOK,184,7,37,14,WS_GROUP
     LTEXT           "Versión 1.0",IDC_VERSION,64,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "Derechos reservados.",IDC_STATIC,7,60,170,8
     LTEXT           "¡Visite la página de WinMerge!",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1

diff --git a/Src/Merge.rc b/Src/Merge.rc
index cc9c611..8169025 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1,7 +1,5 @@
 //Microsoft Developer Studio generated resource script.
 //
-// $Id$
-
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -268,7 +266,7 @@ BEGIN
     LTEXT           "WinMerge",IDC_STATIC,63,13,63,8,SS_NOPREFIX
     DEFPUSHBUTTON   "OK",IDOK,184,7,32,14,WS_GROUP
     LTEXT           "Version 1.0",IDC_VERSION,63,23,84,8,SS_NOPREFIX
-    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,84,8
+    LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "All rights reserved.",IDC_STATIC,7,60,170,8
     LTEXT           "Visit the WinMerge HomePage!",IDC_WWW,7,107,209,8
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
@@ -837,7 +835,6 @@ BEGIN
     ID_INDICATOR_REC        "REC"
 END
 
-// ID_FILE_NEW SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_FILE_NEW             "Create a new document\nNew"
@@ -851,7 +848,6 @@ BEGIN
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
 END
 
-// ID_APP_ABOUT SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
@@ -878,7 +874,6 @@ BEGIN
     ID_FILE_MRU_FILE16      "Open this document"
 END
 
-// ID_NEXT_PANE SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
@@ -895,7 +890,6 @@ BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
-// ID_EDIT_CLEAR SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
@@ -989,7 +983,6 @@ BEGIN
     ID_DIR_OPEN_RIGHT       "Open right file"
 END
 
-// IDS_SAVE_AS_TITLE SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_SAVE_AS_TITLE       "Save As"
@@ -1012,7 +1005,6 @@ BEGIN
     IDS_NOPROJECT           "You must specify a SourceSafe project path in order to continue (ie:  $/MyProject)"
 END
 
-// IDS_COLHDR_FILENAME SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_COLHDR_FILENAME     "Filename"
@@ -1069,7 +1061,6 @@ BEGIN
     ID_FILE_RIGHT_READONLY  "Change right file/dir read-only status"
 END
 
-// ID_EOL_TO_DOS SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     ID_EOL_TO_DOS           "Convert EOL to DOS mode"
@@ -1107,10 +1098,13 @@ BEGIN
     IDS_FILE_SKIPPED        "File skipped"
     IDS_DIR_SKIPPED         "Directory skipped"
     IDS_STATUSBAR_READONLY  "RO"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDS_PRIVATEBUILD_FMT    "Private Build: %1"
 END
 
-// IDS_NUM_REPLACED SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_NUM_REPLACED        "Replaced %1 string(s)."
@@ -1126,7 +1120,6 @@ BEGIN
     IDC_STATIC_TITLE_RIGHT  "Right click on the path to copy"
 END
 
-// LANGUAGES SYNCHRO
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_AFRIKAANS           "Afrikaans"
@@ -1291,7 +1284,6 @@ BEGIN
     IDS_VIETNAMESE          "Vietnamese"
 END
 
-// END STRINGS SYNCHRO
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/Src/readme.txt b/Src/readme.txt
index 00fdf9a..f9875cc 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2003-09-13 Perry
+ Widen label IDC_PRIVATEBUILD on about box.
+  WinMerge: Merge.rc
+  Languages: *.rc
+
 2003-09-13 WinMerge experimental release 2.1.1.5 (patch demos)
 2003-09-13 WinMerge experimental release 2.1.1.4 (cvs)