Sync to 2.4.1-beta1

1 files changed, 18 insertions, 35 deletions

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index c22f35de6..b1a25829b 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -1871,10 +1871,7 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("flashair");
     def->enum_values.push_back("astrobox");
     def->enum_values.push_back("repetier");
-<<<<<<< HEAD
-=======
     def->enum_values.push_back("mks");
->>>>>>> master
     def->enum_labels.push_back("PrusaLink");
     def->enum_labels.push_back("OctoPrint");
     def->enum_labels.push_back("Duet");
@@ -4414,22 +4411,8 @@ CLIMiscConfigDef::CLIMiscConfigDef()
     ConfigOptionDef* def;
 
     def = this->add("ignore_nonexistent_config", coBool);
-    def->label = "Ignore non-existent config files";
-    def->tooltip = "Do not fail if a file supplied to --load does not exist.";
-
-    def = this->add("config_compatibility", coEnum);
-    def->label = "Forward-compatibility rule when loading configurations from config files and project files (3MF, AMF).";
-    def->tooltip = "This version of PrusaSlicer may not understand configurations produced by newest PrusaSlicer versions. "
-                     "For example, newer PrusaSlicer may extend the list of supported firmware flavors. One may decide to "
-                     "bail out or to substitute an unknown value with a default silently or verbosely.";
-    def->enum_keys_map = &ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>::get_enum_values();
-    def->enum_values.push_back("disable");
-    def->enum_values.push_back("enable");
-    def->enum_values.push_back("enable_silent");
-    def->enum_labels.push_back("Bail out on unknown configuration values");
-    def->enum_labels.push_back("Enable reading unknown configuration values by verbosely substituting them with defaults.");
-    def->enum_labels.push_back("Enable reading unknown configuration values by silently substituting them with defaults.");
-    def->set_default_value(new ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>(ForwardCompatibilitySubstitutionRule::Enable));
+    def->label = L("Ignore non-existent config files");
+    def->tooltip = L("Do not fail if a file supplied to --load does not exist.");
 
     def = this->add("config_compatibility", coEnum);
     def->label = L("Forward-compatibility rule when loading configurations from config files and project files (3MF, AMF).");
@@ -4446,40 +4429,40 @@ CLIMiscConfigDef::CLIMiscConfigDef()
     def->set_default_value(new ConfigOptionEnum<ForwardCompatibilitySubstitutionRule>(ForwardCompatibilitySubstitutionRule::Enable));
 
     def = this->add("load", coStrings);
-    def->label = "Load config file";
-    def->tooltip = "Load configuration from the specified file. It can be used more than once to load options from multiple files.";
+    def->label = L("Load config file");
+    def->tooltip = L("Load configuration from the specified file. It can be used more than once to load options from multiple files.");
 
     def = this->add("output", coString);
-    def->label = "Output File";
-    def->tooltip = "The file where the output will be written (if not specified, it will be based on the input file).";
+    def->label = L("Output File");
+    def->tooltip = L("The file where the output will be written (if not specified, it will be based on the input file).");
     def->cli = "output|o";
 
     def = this->add("single_instance", coBool);
-    def->label = "Single instance mode";
-    def->tooltip = "If enabled, the command line arguments are sent to an existing instance of GUI PrusaSlicer, "
+    def->label = L("Single instance mode");
+    def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI PrusaSlicer, "
                      "or an existing PrusaSlicer window is activated. "
-                     "Overrides the \"single_instance\" configuration value from application preferences.";
+                     "Overrides the \"single_instance\" configuration value from application preferences.");
 
 /*
     def = this->add("autosave", coString);
-    def->label = "Autosave";
-    def->tooltip = "Automatically export current configuration to the specified file.";
+    def->label = L("Autosave");
+    def->tooltip = L("Automatically export current configuration to the specified file.");
 */
 
     def = this->add("datadir", coString);
-    def->label = "Data directory";
-    def->tooltip = "Load and store settings at the given directory. This is useful for maintaining different profiles or including configurations from a network storage.";
+    def->label = L("Data directory");
+    def->tooltip = L("Load and store settings at the given directory. This is useful for maintaining different profiles or including configurations from a network storage.");
 
     def = this->add("loglevel", coInt);
-    def->label = "Logging level";
-    def->tooltip = "Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n"
-                     "For example. loglevel=2 logs fatal, error and warning level messages.";
+    def->label = L("Logging level");
+    def->tooltip = L("Sets logging sensitivity. 0:fatal, 1:error, 2:warning, 3:info, 4:debug, 5:trace\n"
+                     "For example. loglevel=2 logs fatal, error and warning level messages.");
     def->min = 0;
 
 #if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(SLIC3R_GUI)
     def = this->add("sw_renderer", coBool);
-    def->label = "Render with a software renderer";
-    def->tooltip = "Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver.";
+    def->label = L("Render with a software renderer");
+    def->tooltip = L("Render with a software renderer. The bundled MESA software renderer is loaded instead of the default OpenGL driver.");
     def->min = 0;
 #endif /* _MSC_VER */
 }