[ 840296 ] Informative messageboxes when loading files

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index 07dc708..b383859 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1249,6 +1249,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1360,6 +1365,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index feabd9e..f53ad02 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1263,6 +1263,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Permet la &barreja de tipus de marques de final de línia"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Atura"
     IDC_COMPARISON_CLOSE    "Prem qualsevol tecla"
 END
@@ -1533,6 +1538,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "S'ha produït un error al plugin '%1' i l'operació actual s'avortarà."
     IDS_ERROR_FILE_NOT_UNPACKED "El fitxer not s'ha desempaquetat: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 #endif    // Catalan resources

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 846728e..c282360 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1117,6 +1117,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1220,6 +1225,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 8dec44a..2f21b3a 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1224,6 +1224,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1327,6 +1332,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index 3563f52..846e8ec 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1246,6 +1246,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1352,6 +1357,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 568f047..bd380e8 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1245,6 +1245,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1351,6 +1356,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index 41e8911..5e4f104 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1250,6 +1250,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1359,6 +1364,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index 7356b21..9fd4954 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1251,6 +1251,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1360,6 +1365,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<Aucun>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatique>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 8fefa4f..305b7c0 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1252,6 +1252,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Mischen der Zeilenumbruch-Formate erlauben"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1364,6 +1369,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index 01c2c0b..ccb9d05 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1245,6 +1245,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1351,6 +1356,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 584e0e4..f1b2879 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1213,6 +1213,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1485,6 +1490,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 9ef9c31..3f39cb5 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1245,6 +1245,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1351,6 +1356,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index d9b6f4e..bc8e8b1 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1248,6 +1248,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1355,6 +1360,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index 42edbd1..d5f7c81 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1247,6 +1247,11 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDC_MIXED_EOL           "Preserve original EOL chars"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1355,6 +1360,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 // END STRINGS SYNCHRO

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index 6b1a3a9..7180c06 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1244,6 +1244,11 @@ END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
+    IDC_MIXED_EOL           "Tillåt blandade EOL-typer"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
     IDC_COMPARISON_STOP     "Stop"
     IDC_COMPARISON_CLOSE    "Press any key"
 END
@@ -1353,6 +1358,10 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_PLUGIN_FAILED       "An error occurred in plugin '%1'. The current operation is aborted."
     IDS_ERROR_FILE_NOT_UNPACKED "File not unpacked: %1"
+    IDS_USERCHOICE_NONE     "<None>"
+    IDS_USERCHOICE_AUTOMATIC "<Automatic>"
+    IDS_SUGGEST_IGNOREEOL   "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+    IDS_SUGGEST_PRESERVEEOL "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 ?"
 END
 
 #endif    // Swedish resources

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index dd875f2..fcd9681 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -151,6 +151,8 @@
 #define IDS_ERROR_FILE_NOT_UNPACKED     241
 #define IDS_USERCHOICE_NONE             242
 #define IDS_USERCHOICE_AUTOMATIC        243
+#define IDS_SUGGEST_IGNOREEOL           244
+#define IDS_SUGGEST_PRESERVEEOL         245
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001