PATCH: [ 1145016 ] i18n the version control strings

  Src: Merge.rc PropVss.cpp PropVss.h resource.h
  Languages: resource.h Merge*.rc

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 8478f9a..162cf25 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1273,27 +1273,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1635,6 +1614,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc
index 7362f80..fb39224 100644 (file)
--- a/Src/Languages/Bulgarian/MergeBulgarian.rc
+++ b/Src/Languages/Bulgarian/MergeBulgarian.rc
@@ -1157,27 +1157,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1519,6 +1498,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Bulgarian/resource.h b/Src/Languages/Bulgarian/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Bulgarian/resource.h
+++ b/Src/Languages/Bulgarian/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index ec58cb9..f752efe 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1172,27 +1172,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1535,6 +1514,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error de VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index cf22c60..ba3e189 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1143,27 +1143,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    1018, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    1018, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    1018, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    1018, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1505,6 +1484,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index fadc41a..01ebcff 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1256,27 +1256,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1618,6 +1597,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index f794dc8..40b8cd3 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1270,27 +1270,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1632,6 +1611,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 663a6b6..846bef4 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1154,27 +1154,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1517,6 +1496,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Fejl fra VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index f1425d0..84b6d16 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1272,27 +1272,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1634,6 +1613,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 7f4c3c9..6f80e9a 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1158,27 +1158,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1520,6 +1499,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 6eb91cf..8cb200d 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1274,27 +1274,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1637,6 +1616,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Fehler vom VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc
index 90a563e..291ecd4 100644 (file)
--- a/Src/Languages/Hungarian/MergeHungarian.rc
+++ b/Src/Languages/Hungarian/MergeHungarian.rc
@@ -1155,27 +1155,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1518,6 +1497,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Hiba a VSS-bõl:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Hungarian/resource.h b/Src/Languages/Hungarian/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Hungarian/resource.h
+++ b/Src/Languages/Hungarian/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 862c4de..d6542f2 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1271,27 +1271,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1633,6 +1612,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Errore di VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc
index ea88219..347a049 100644 (file)
--- a/Src/Languages/Japanese/MergeJapanese.rc
+++ b/Src/Languages/Japanese/MergeJapanese.rc
@@ -1159,27 +1159,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1522,6 +1501,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "VSS\82©\82ç\82Ì\83G\83\89\81[:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Japanese/resource.h b/Src/Languages/Japanese/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Japanese/resource.h
+++ b/Src/Languages/Japanese/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 7e5b77d..6b96212 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1151,27 +1151,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1516,6 +1495,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "VSS ¿¡·¯:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 36c0e8e..f8dfc64 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1269,27 +1269,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1631,6 +1610,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Feil fra VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index ed616c4..96ea497 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1270,27 +1270,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1632,6 +1611,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 0742459..f36d97e 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1167,27 +1167,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1529,6 +1508,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 4835904..babed61 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1270,27 +1270,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1632,6 +1611,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index a7d14b9..db79795 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1270,27 +1270,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1632,6 +1611,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index f9b1d69..0968db0 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1269,27 +1269,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 6, 0
-0x6e49, 0x6567, 0x006e,
-    IDC_VER_SYS, 0x403, 35, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6d28, 0x6e69, 0x7264, 0x2065, 0x6e65, 0x2064, 0x2e35, 0x2930, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6f20, 0x2067, 0x7473, 0x72f8, 0x6572, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1631,6 +1610,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Fel från VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500
 
 
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index e49a5b8..44949be 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1162,27 +1162,6 @@ IDB_EDIT_SELECTALL      BITMAP                  "res\\select_all.bmp"
 IDB_TOOLS_FILTERS       BITMAP                  "res\\filters.bmp"
 IDB_TOOLS_COLUMNS       BITMAP                  "res\\customize_columns.bmp"
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_PROP_VSS DLGINIT
-BEGIN
-    IDC_VER_SYS, 0x403, 5, 0
-0x6f4e, 0x656e, "\000"
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x6c28, 0x7365, 0x2073, 0x6874, 0x6e61, 0x3520, 0x302e, 0x0029,
-    IDC_VER_SYS, 0x403, 34, 0
-0x6956, 0x7573, 0x6c61, 0x5320, 0x756f, 0x6372, 0x5365, 0x6661, 0x2065,
-0x3528, 0x302e, 0x6120, 0x646e, 0x6120, 0x6f62, 0x6576, 0x0029,
-    IDC_VER_SYS, 0x403, 19, 0
-0x6152, 0x6974, 0x6e6f, 0x6c61, 0x4320, 0x656c, 0x7261, 0x6143, 0x6573,
-"\000"
-    0
-END
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1525,6 +1504,15 @@ BEGIN
     IDS_VSS_ERRORFROM       "Error from VSS:"
 END
 
+// VSS system
+STRINGTABLE
+BEGIN
+    IDS_VCS_NONE            "None"
+    IDS_VCS_VSS4            "Visual SourceSafe (less than 5.0)"
+    IDS_VCS_VSS5            "Visual SourceSafe (5.0 and above)"
+    IDS_VCS_CLEARCASE       "Rational ClearCase"
+END
+
 // DIRECTORY DIFFING : FILE COPY/DELETE (WITHOUT/WITH NUMBER MARK)
 STRINGTABLE
 BEGIN

diff --git a/Src/PropVss.cpp b/Src/PropVss.cpp
index 0c2f80f..44f3420 100644 (file)
--- a/Src/PropVss.cpp
+++ b/Src/PropVss.cpp
@@ -57,6 +57,7 @@ void CPropVss::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_BROWSE_BUTTON, m_ctlBrowse);
        DDX_Text(pDX, IDC_PATH_EDIT, m_strPath);
        DDX_CBIndex(pDX, IDC_VER_SYS, m_nVerSys);
+       DDX_Control(pDX, IDC_VER_SYS, m_ctlVerSys);
        //}}AFX_DATA_MAP
 }
 
@@ -84,6 +85,8 @@ BOOL CPropVss::OnInitDialog()
 {
        CPropertyPage::OnInitDialog();
 
+       LoadVssOptionStrings();
+
        UpdateData(FALSE);
        OnSelendokVerSys();
 
@@ -99,3 +102,22 @@ void CPropVss::OnSelendokVerSys()
        m_ctlVssL1.EnableWindow(m_nVerSys == VCS_VSS4 || m_nVerSys == VCS_CLEARCASE);
        m_ctlBrowse.EnableWindow(m_nVerSys == VCS_VSS4 || m_nVerSys == VCS_CLEARCASE);
 }
+
+/**
+ * Load strings for supported source code control
+ */
+void CPropVss::LoadVssOptionStrings()
+{
+       /*
+       Must be in order to agree with enum in MainFrm.h
+       VCS_NONE = 0,
+       VCS_VSS4,
+       VCS_VSS5,
+       VCS_CLEARCASE,
+       */
+
+       m_ctlVerSys.AddString(LoadResString(IDS_VCS_NONE));
+       m_ctlVerSys.AddString(LoadResString(IDS_VCS_VSS4));
+       m_ctlVerSys.AddString(LoadResString(IDS_VCS_VSS5));
+       m_ctlVerSys.AddString(LoadResString(IDS_VCS_CLEARCASE));
+}

diff --git a/Src/PropVss.h b/Src/PropVss.h
index 2bbe4b7..f8a091f 100644 (file)
--- a/Src/PropVss.h
+++ b/Src/PropVss.h
@@ -31,15 +31,18 @@ public:
        CButton m_ctlBrowse;
        CString m_strPath;
        int             m_nVerSys;
+       CComboBox  m_ctlVerSys;
        //}}AFX_DATA
 
 
+protected:
 // Overrides
        // ClassWizard generate virtual function overrides
        //{{AFX_VIRTUAL(CPropVss)
        protected:
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
        //}}AFX_VIRTUAL
+       void LoadVssOptionStrings();
 
 // Implementation
 protected:

diff --git a/Src/readme.txt b/Src/readme.txt
index 411584d..47db7d6 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2005-02-23 Perry
+ PATCH: [ 1145016 ] i18n the version control strings
+  Src: Merge.rc PropVss.cpp PropVss.h resource.h
+  Languages: resource.h Merge*.rc
+
 2005-02-23 WinMerge experimental release 2.3.1.4 (cvs)
 
 2005-02-23 Kimmo

diff --git a/Src/resource.h b/Src/resource.h
index 853df71..3dd2d56 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -531,6 +531,10 @@
 #define IDS_REGEXP_PREMATURE_END        18494
 #define IDS_REGEXP_TOO_BIG              18495
 #define IDS_REGEXP_UNMATCHED_RPAREN     18496
+#define IDS_VCS_NONE                    18497
+#define IDS_VCS_VSS4                    18498
+#define IDS_VCS_VSS5                    18499
+#define IDS_VCS_CLEARCASE               18500