diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 8e4c5fabc6..84c526b040 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -22201,3 +22201,131 @@ msgstr "" #~ "Veuillez saisir des valeurs valides :\n" #~ "Début > 10 intervalle >= 0\n" #~ "Fin > Début + Intervalle" + +# Orca: hardcoded GUI strings extracted (i18n FR pass) +msgid "Rename Object" +msgstr "Renommer l’objet" + +msgid "Rename Part" +msgstr "Renommer la pièce" + +msgid "Paste settings" +msgstr "Coller les réglages" + +msgid "Shift objects to bed" +msgstr "Déplacer les objets sur le plateau" + +msgid "Object order changed" +msgstr "Ordre des objets modifié" + +msgid "Layer setting added" +msgstr "Réglage de couche ajouté" + +msgid "Part setting added" +msgstr "Réglage de pièce ajouté" + +msgid "Object setting added" +msgstr "Réglage d’objet ajouté" + +msgid "Height range settings added" +msgstr "Réglages de plage de hauteur ajoutés" + +msgid "Part settings added" +msgstr "Réglages de pièce ajoutés" + +msgid "Object settings added" +msgstr "Réglages d’objet ajoutés" + +msgid "Load Part" +msgstr "Charger une pièce" + +msgid "Load Modifier" +msgstr "Charger un modificateur" + +msgid "Add primitive" +msgstr "Ajouter une primitive" + +msgid "Delete Settings" +msgstr "Supprimer les réglages" + +msgid "Delete part" +msgstr "Supprimer la pièce" + +msgid "Merge parts to an object" +msgstr "Fusionner les pièces en un objet" + +msgid "Add layers" +msgstr "Ajouter des couches" + +msgid "Delete selected" +msgstr "Supprimer la sélection" + +msgid "Instances to Separated Objects" +msgstr "Séparer les instances en objets" + +msgid "Change Filaments" +msgstr "Changer les filaments" + +msgid "Delete Object" +msgstr "Supprimer l’objet" + +msgid "Delete All Objects" +msgstr "Supprimer tous les objets" + +msgid "Reset Project" +msgstr "Réinitialiser le projet" + +msgid "Split to Objects" +msgstr "Scinder en objets" + +msgid "Replace with 3D file" +msgstr "Remplacer par un fichier 3D" + +msgid "Reload all" +msgstr "Tout recharger" + +msgid "Reset Cut" +msgstr "Réinitialiser la découpe" + +msgid "How to trouble shooting" +msgstr "Comment résoudre les problèmes ?" + +msgid "parse json failed" +msgstr "Échec de l’analyse du JSON" + +msgid "Select Images" +msgstr "Sélectionner des images" + +msgid "One of the presets does not exist" +msgstr "L’un des préréglages n’existe pas." + +msgid "Compared presets has different printer technology" +msgstr "Les préréglages comparés utilisent une technologie d’imprimante différente." + +msgid "Done." +msgstr "Terminé." + +msgid "Change extruder color" +msgstr "Changer la couleur de l’extrudeur" + +msgid "There is an update available. Open the preset bundle dialog to update it." +msgstr "Une mise à jour est disponible. Ouvrez la boîte de dialogue du paquet de préréglages pour l’installer." + +msgid "Orca Slicer - Switching language failed" +msgstr "Orca Slicer — Échec du changement de langue" + +msgid "Switching Orca Slicer to language %s failed." +msgstr "Le passage d’Orca Slicer à la langue %s a échoué." + +msgid "\nYou may need to reconfigure the missing locales, likely by running the \"locale-gen\" and \"dpkg-reconfigure locales\" commands.\n" +msgstr "\nVous devrez peut-être reconfigurer les paramètres régionaux manquants, probablement en exécutant les commandes « locale-gen » et « dpkg-reconfigure locales ».\n" + +msgid "Image files (*.png;*.jpg;*jpeg)|*.png;*.jpg;*.jpeg" +msgstr "Fichiers image (*.png;*.jpg;*jpeg)|*.png;*.jpg;*.jpeg" + +msgid "Config files (*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament)|*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament" +msgstr "Fichiers de configuration (*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament)|*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament" + +msgid "Objects(%1%) have duplicated connectors. Some connectors may be missing in slicing result.\nPlease report to PrusaSlicer team in which scenario this issue happened.\nThank you." +msgstr "Les objets (%1%) ont des connecteurs dupliqués. Certains connecteurs risquent d’être absents du résultat du découpage.\nVeuillez signaler à l’équipe PrusaSlicer dans quel scénario ce problème est survenu.\nMerci." + diff --git a/localization/i18n/list.txt b/localization/i18n/list.txt index d968cd5322..e2f64dbd76 100644 --- a/localization/i18n/list.txt +++ b/localization/i18n/list.txt @@ -97,6 +97,7 @@ src/slic3r/GUI/Widgets/FilamentLoad.cpp src/slic3r/GUI/Widgets/TempInput.cpp src/slic3r/GUI/Widgets/CheckList.cpp src/slic3r/GUI/Widgets/SwitchButton.cpp +src/slic3r/GUI/Widgets/ProgressDialog.cpp src/slic3r/GUI/ImGuiWrapper.cpp src/slic3r/GUI/Jobs/ArrangeJob.cpp src/slic3r/GUI/Jobs/OrientJob.cpp diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index 4a429a4a5a..ed99ac5ea2 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -298,7 +298,7 @@ void AMSMaterialsSetting::create_panel_kn(wxWindow* parent) if (language.find("zh") == 0) region = "zh"; wxString link_url = wxString::Format("https://wiki.bambulab.com/%s/software/bambu-studio/calibration_pa", region); - m_wiki_ctrl = new HyperLink(parent, "Wiki Guide", link_url); + m_wiki_ctrl = new HyperLink(parent, _L("Wiki Guide"), link_url); cali_title_sizer->Add(m_ratio_text, 0, wxALIGN_CENTER_VERTICAL); cali_title_sizer->Add(m_wiki_ctrl, 0, wxALIGN_CENTER_VERTICAL); diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index 316778a994..ab838033de 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -590,7 +590,7 @@ PingCodeBindDialog::~PingCodeBindDialog() { sizer_error_code->Add(m_st_txt_error_code, 0, wxALL, 0); - auto st_title_error_desc = new wxStaticText(m_sw_bind_failed_info, wxID_ANY, wxT("Error desc")); + auto st_title_error_desc = new wxStaticText(m_sw_bind_failed_info, wxID_ANY, _L("Error desc")); auto st_title_error_desc_doc = new wxStaticText(m_sw_bind_failed_info, wxID_ANY, ": "); m_st_txt_error_desc = new Label(m_sw_bind_failed_info, wxEmptyString); st_title_error_desc->SetForegroundColour(0x909090); @@ -607,7 +607,7 @@ PingCodeBindDialog::~PingCodeBindDialog() { sizer_error_desc->Add(st_title_error_desc_doc, 0, wxALL, 0); sizer_error_desc->Add(m_st_txt_error_desc, 0, wxALL, 0); - auto st_title_extra_info = new wxStaticText(m_sw_bind_failed_info, wxID_ANY, wxT("Extra info")); + auto st_title_extra_info = new wxStaticText(m_sw_bind_failed_info, wxID_ANY, _L("Extra info")); auto st_title_extra_info_doc = new wxStaticText(m_sw_bind_failed_info, wxID_ANY, ": "); m_st_txt_extra_info = new Label(m_sw_bind_failed_info, wxEmptyString); st_title_extra_info->SetForegroundColour(0x909090); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c763dbc119..1478bc3596 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -7160,7 +7160,7 @@ void GUI_App::start_sync_user_preset(bool with_progress_dlg) .plater() ->get_notification_manager() ->push_notification(NotificationType::CustomNotification, - NotificationManager::NotificationLevel::RegularNotificationLevel, "There is an update available. Open the preset bundle dialog to update it."); + NotificationManager::NotificationLevel::RegularNotificationLevel, _u8L("There is an update available. Open the preset bundle dialog to update it.")); update_available = false; } @@ -7738,14 +7738,14 @@ bool GUI_App::load_language(wxString language, bool initial) if (!wxLocale::IsAvailable(locale_language_info->Language)) { // Loading the language dictionary failed. - wxString message = "Switching Orca Slicer to language " + requested_language_code + " failed."; + wxString message = wxString::Format(_L("Switching Orca Slicer to language %s failed."), requested_language_code); #if !defined(_WIN32) && !defined(__APPLE__) // likely some linux system - message += "\nYou may need to reconfigure the missing locales, likely by running the \"locale-gen\" and \"dpkg-reconfigure locales\" commands.\n"; + message += _L("\nYou may need to reconfigure the missing locales, likely by running the \"locale-gen\" and \"dpkg-reconfigure locales\" commands.\n"); #endif if (initial) message + "\n\nApplication will close."; - wxMessageBox(message, "Orca Slicer - Switching language failed", wxOK | wxICON_ERROR); + wxMessageBox(message, _L("Orca Slicer - Switching language failed"), wxOK | wxICON_ERROR); if (initial) std::exit(EXIT_FAILURE); else diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index fcdf005aad..1401db046f 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1154,7 +1154,7 @@ void ObjectList::update_filament_in_config(const wxDataViewItem& item) m_config = config; - take_snapshot("Change Filament"); + take_snapshot(_u8L("Change Filament")); const int extruder = m_objects_model->GetExtruderNumber(item); m_config->set_key_value("extruder", new ConfigOptionInt(extruder)); @@ -1192,7 +1192,7 @@ void ObjectList::update_name_in_model(const wxDataViewItem& item) const if (obj_idx < 0) return; const int volume_id = m_objects_model->GetVolumeIdByItem(item); - take_snapshot(volume_id < 0 ? "Rename Object" : "Rename Part"); + take_snapshot(volume_id < 0 ? _u8L("Rename Object") : _u8L("Rename Part")); ModelObject* obj = object(obj_idx); if (m_objects_model->GetItemType(item) & itObject) { @@ -1360,7 +1360,7 @@ void ObjectList::paste_settings_into_list() { wxDataViewItemArray sels; GetSelections(sels); - take_snapshot("Paste settings"); + take_snapshot(_u8L("Paste settings")); std::unique_ptr global_keys; // need copy from global @@ -1578,7 +1578,7 @@ void ObjectList::list_manipulation(const wxPoint& mouse_pos, bool evt_context_me int obj_idx, vol_idx; get_selected_item_indexes(obj_idx, vol_idx, item); if (obj_idx != -1) { - Plater::TakeSnapshot(plater, "Shift objects to bed"); + Plater::TakeSnapshot(plater, _u8L("Shift objects to bed")); (*m_objects)[obj_idx]->ensure_on_bed(); cnv->reload_scene(true, true); update_info_items(obj_idx); @@ -2001,7 +2001,7 @@ void ObjectList::OnDrop(wxDataViewEvent &event) } //#if 1 - take_snapshot("Object order changed"); + take_snapshot(_u8L("Object order changed")); if(m_dragged_data.type() & itObject){ int delta = dest_obj_id < src_obj_id ? -1 : 1; @@ -2065,9 +2065,9 @@ void ObjectList::add_category_to_settings_from_selection(const std::vector< std: assert(m_config); auto opt_keys = m_config->keys(); - const std::string snapshot_text = item_type & itLayer ? "Layer setting added" : - item_type & itVolume ? "Part setting added" : - "Object setting added"; + const std::string snapshot_text = item_type & itLayer ? _u8L("Layer setting added") : + item_type & itVolume ? _u8L("Part setting added") : + _u8L("Object setting added"); take_snapshot(snapshot_text); const DynamicPrintConfig& from_config = printer_technology() == ptFFF ? @@ -2106,9 +2106,9 @@ void ObjectList::add_category_to_settings_from_frequent(const std::vectorkeys(); - const std::string snapshot_text = item_type & itLayer ? "Height range settings added" : - item_type & itVolume ? "Part settings added" : - "Object settings added"; + const std::string snapshot_text = item_type & itLayer ? _u8L("Height range settings added") : + item_type & itVolume ? _u8L("Part settings added") : + _u8L("Object settings added"); take_snapshot(snapshot_text); const DynamicPrintConfig& from_config = wxGetApp().preset_bundle->prints.get_edited_preset().config; @@ -2176,7 +2176,7 @@ void ObjectList::load_subobject(ModelVolumeType type, bool from_galery/* = false if (input_files.IsEmpty()) return; - take_snapshot((type == ModelVolumeType::MODEL_PART) ? "Load Part" : "Load Modifier"); + take_snapshot((type == ModelVolumeType::MODEL_PART) ? _u8L("Load Part") : _u8L("Load Modifier")); std::vector volumes; // ! ysFIXME - delete commented code after testing and rename "load_modifier" to something common @@ -2463,7 +2463,7 @@ void ObjectList::load_generic_subobject(const std::string& type_name, const Mode if (instance_idx == -1) return; - take_snapshot("Add primitive"); + take_snapshot(_u8L("Add primitive")); // Selected object ModelObject &model_object = *(*m_objects)[obj_idx]; @@ -2555,7 +2555,7 @@ void ObjectList::load_shape_object(const std::string &type_name) if (obj_idx < 0) return; - Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Add Primitive"); + Plater::TakeSnapshot snapshot(wxGetApp().plater(), _u8L("Add Primitive")); // Create mesh BoundingBoxf3 bb; @@ -2716,7 +2716,7 @@ void ObjectList::del_settings_from_config(const wxDataViewItem& parent_item) (is_layer_settings && opt_cnt == 2 && m_config->has("extruder") && m_config->has("layer_height"))) return; - take_snapshot("Delete Settings"); + take_snapshot(_u8L("Delete Settings")); int extruder = m_config->has("extruder") ? m_config->extruder() : -1; @@ -2757,7 +2757,7 @@ void ObjectList::del_layer_from_object(const int obj_idx, const t_layer_height_r if (del_range == object(obj_idx)->layer_config_ranges.end()) return; - take_snapshot("Remove height range"); + take_snapshot(_u8L("Remove height range")); object(obj_idx)->layer_config_ranges.erase(del_range); @@ -2830,7 +2830,7 @@ bool ObjectList::del_subobject_from_object(const int obj_idx, const int idx, con return false; } - take_snapshot("Delete part"); + take_snapshot(_u8L("Delete part")); object->delete_volume(idx); @@ -2895,7 +2895,7 @@ void ObjectList::split() return; } - take_snapshot("Split to parts"); + take_snapshot(_u8L("Split to parts")); volume->split(filament_cnt, wxGetApp().app_config->get_bool("keep_painting")); @@ -3028,7 +3028,7 @@ void ObjectList::merge(bool to_multipart_object) GetSelections(sels); assert(!sels.IsEmpty()); - Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Assemble"); + Plater::TakeSnapshot snapshot(wxGetApp().plater(), _u8L("Assemble")); get_object_idxs(obj_idxs, sels); @@ -3176,7 +3176,7 @@ void ObjectList::merge(bool to_multipart_object) if (obj_idx == -1) return; - Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Merge parts to an object"); + Plater::TakeSnapshot snapshot(wxGetApp().plater(), _u8L("Merge parts to an object")); ModelObject* model_object = (*m_objects)[obj_idx]; model_object->merge(); @@ -3243,7 +3243,7 @@ void ObjectList::layers_editing() // set some default value if (ranges.empty()) { // BBS: remove snapshot name "Add layers" - take_snapshot("Add layers"); + take_snapshot(_u8L("Add layers")); ranges[{ 0.0f, 2.0f }].assign_config(get_default_layer_config(obj_idx)); } @@ -4234,7 +4234,7 @@ void ObjectList::delete_from_model_and_list(const ItemType type, const int obj_i if (!(type&(itObject|itVolume|itInstance))) return; - take_snapshot("Delete selected"); + take_snapshot(_u8L("Delete selected")); if (type&itObject) { bool was_cut = object(obj_idx)->is_cut(); @@ -4467,7 +4467,7 @@ void ObjectList::remove() UnselectAll(); update_selection(sels, sels_mode, m_objects_model); - Plater::TakeSnapshot snapshot = Plater::TakeSnapshot(wxGetApp().plater(), "Delete selected"); + Plater::TakeSnapshot snapshot = Plater::TakeSnapshot(wxGetApp().plater(), _u8L("Delete selected")); for (auto& item : sels) { @@ -5525,7 +5525,7 @@ void ObjectList::change_part_type() return; } - take_snapshot("Change part type"); + take_snapshot(_u8L("Change part type")); volume->set_type(new_type); wxDataViewItemArray sel = reorder_volumes_and_get_selection(obj_idx, [volume](const ModelVolume* vol) { return vol == volume; }); @@ -5799,7 +5799,7 @@ void ObjectList::set_volume_type(ModelVolumeType new_type) } } - take_snapshot("Change part type"); + take_snapshot(_u8L("Change part type")); std::set changed_volumes; std::set touched_objects; @@ -6033,7 +6033,7 @@ void ObjectList::split_instances() if (obj_idx == -1) return; - Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Instances to Separated Objects"); + Plater::TakeSnapshot snapshot(wxGetApp().plater(), _u8L("Instances to Separated Objects")); if (selection.is_single_full_object()) { @@ -6164,7 +6164,7 @@ void ObjectList::fix_through_cgal() return true; }; - Plater::TakeSnapshot snapshot(plater, "Repairing model object"); + Plater::TakeSnapshot snapshot(plater, _u8L("Repairing model object")); // Open a progress dialog. ProgressDialog progress_dlg(_L("Repairing model object"), "", 100, find_toplevel_parent(plater), @@ -6495,7 +6495,7 @@ void ObjectList::OnEditingStarted(wxDataViewEvent &event) else if (col == colSinking) { Plater * plater = wxGetApp().plater(); GLCanvas3D *cnv = plater->canvas3D(); - Plater::TakeSnapshot(plater, "Shift objects to bed"); + Plater::TakeSnapshot(plater, _u8L("Shift objects to bed")); int obj_idx, vol_idx; get_selected_item_indexes(obj_idx, vol_idx, item); (*m_objects)[obj_idx]->ensure_on_bed(); @@ -6582,7 +6582,7 @@ void ObjectList::set_extruder_for_selected_items(const int extruder) if (sels.empty()) return; - take_snapshot("Change Filaments"); + take_snapshot(_u8L("Change Filaments")); for (const wxDataViewItem& sel_item : sels) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 353301995f..dd712011a5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -2975,7 +2975,7 @@ void GLGizmoCut3D::render_cut_plane_input_window(CutConnectors &connectors, floa ImGui::SameLine(); m_imgui->disabled_begin(is_cut_plane_init && !has_connectors); if (m_imgui->button(_L("Reset"), _L("Reset cutting plane and remove connectors"))) { - Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Reset Cut", UndoRedo::SnapshotType::GizmoAction); + Plater::TakeSnapshot snapshot(wxGetApp().plater(), _u8L("Reset Cut"), UndoRedo::SnapshotType::GizmoAction); reset_cut_plane(); reset_connectors(); } @@ -3500,10 +3500,10 @@ static void check_objects_after_cut(const ModelObjectPtrs& objects) wxString names = from_u8(err_objects_names[0]); for (size_t i = 1; i < err_objects_names.size(); i++) names += ", " + from_u8(err_objects_names[i]); - WarningDialog(wxGetApp().plater(), format_wxstr("Objects(%1%) have duplicated connectors. " + WarningDialog(wxGetApp().plater(), format_wxstr(_L("Objects(%1%) have duplicated connectors. " "Some connectors may be missing in slicing result.\n" "Please report to PrusaSlicer team in which scenario this issue happened.\n" - "Thank you.", names)).ShowModal(); + "Thank you."), names)).ShowModal(); } void synchronize_model_after_cut(Model& model, const CutObjectBase& cut_id) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index d850f2a925..028a47964b 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -3735,7 +3735,7 @@ void MainFrame::load_config_file() // return; wxFileDialog dlg(this, _L("Select profile to load:"), !m_last_config.IsEmpty() ? get_dir_name(m_last_config) : wxGetApp().app_config->get_last_dir(), - "config.json", "Config files (*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament)|*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament", wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST); + "config.json", _L("Config files (*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament)|*.json;*.zip;*.orca_printer;*.orca_bundle;*.orca_filament"), wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST); wxArrayString files; if (dlg.ShowModal() != wxID_OK) return; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index b7b8111f1e..4ae8ca0cf8 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -6838,7 +6838,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ // BBS BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << " " << boost::format("import 3mf IMPORT_LOAD_MODEL_OBJECTS \n"); - wxString msg = wxString::Format("Loading file: %s", from_path(real_filename)); + wxString msg = wxString::Format(_L("Loading file: %s"), from_path(real_filename)); model_idx++; dlg_cont = dlg.Update(progress_percent, msg); if (!dlg_cont) { @@ -7538,7 +7538,7 @@ bool Plater::priv::delete_object_from_model(size_t obj_idx, bool refresh_immedia return false; } - std::string snapshot_label = "Delete Object"; + std::string snapshot_label = _u8L("Delete Object"); if (!obj->name.empty()) snapshot_label += ": " + obj->name; Plater::TakeSnapshot snapshot(q, snapshot_label); @@ -7562,7 +7562,7 @@ bool Plater::priv::delete_object_from_model(size_t obj_idx, bool refresh_immedia void Plater::priv::delete_all_objects_from_model() { - Plater::TakeSnapshot snapshot(q, "Delete All Objects"); + Plater::TakeSnapshot snapshot(q, _u8L("Delete All Objects")); if (view3D->is_layers_editing_enabled()) view3D->enable_layers_editing(false); @@ -7593,7 +7593,7 @@ void Plater::priv::delete_all_objects_from_model() void Plater::priv::reset(bool apply_presets_change) { - Plater::TakeSnapshot snapshot(q, "Reset Project", UndoRedo::SnapshotType::ProjectSeparator); + Plater::TakeSnapshot snapshot(q, _u8L("Reset Project"), UndoRedo::SnapshotType::ProjectSeparator); clear_warnings(); @@ -7742,7 +7742,7 @@ void Plater::priv::split_object(int obj_idx, bool auto_drop /* = true */) // NotificationManager::NotificationLevel::PrintInfoNotificationLevel, // _u8L("All non-solid parts (modifiers) were deleted")); - Plater::TakeSnapshot snapshot(q, "Split to Objects"); + Plater::TakeSnapshot snapshot(q, _u8L("Split to Objects")); auto is_atleast_one_floating = [new_objects]() { for (ModelObject* new_object : new_objects) { @@ -8552,7 +8552,7 @@ void Plater::priv::replace_with_stl() return; } - if (!replace_volume_with_stl(object_idx, volume_idx, out_path, "Replace with 3D file")) + if (!replace_volume_with_stl(object_idx, volume_idx, out_path, _u8L("Replace with 3D file"))) return; // update 3D scene @@ -8669,7 +8669,7 @@ void Plater::priv::replace_all_with_stl() BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " replacing volume : " << input_path << " with " << new_path; - if (!replace_volume_with_stl(object_idx, volume_idx, new_path, "Replace with 3D file")) { + if (!replace_volume_with_stl(object_idx, volume_idx, new_path, _u8L("Replace with 3D file"))) { status += boost::str(boost::format(_L("✖ Skipped %1%: failed to replace.\n").ToStdString()) % volume_name); BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " cannot replace volume : failed to replace with " << new_path; continue; @@ -8729,7 +8729,7 @@ void Plater::priv::reload_from_disk() return (v1.first == v2.first) && (v1.second == v2.second); }), selected_volumes.end()); #else - Plater::TakeSnapshot snapshot(q, "Reload from disk"); + Plater::TakeSnapshot snapshot(q, _u8L("Reload from disk")); const Selection& selection = get_selection(); @@ -8878,7 +8878,7 @@ void Plater::priv::reload_from_disk() replace_paths.erase(std::unique(replace_paths.begin(), replace_paths.end()), replace_paths.end()); #if ENABLE_RELOAD_FROM_DISK_REWORK - Plater::TakeSnapshot snapshot(q, "Reload from disk"); + Plater::TakeSnapshot snapshot(q, _u8L("Reload from disk")); #endif // ENABLE_RELOAD_FROM_DISK_REWORK std::vector fail_list; @@ -9171,7 +9171,7 @@ void Plater::priv::reload_all_from_disk() if (model.objects.empty()) return; - Plater::TakeSnapshot snapshot(q, "Reload all"); + Plater::TakeSnapshot snapshot(q, _u8L("Reload all")); Plater::SuppressSnapshots suppress(q); Selection& selection = get_selection(); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index a6798c077e..97852d6381 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -1080,7 +1080,7 @@ void PlaterPresetComboBox::show_edit_menu() #ifdef __linux__ // To edit extruder color from the sidebar if (m_type == Preset::TYPE_FILAMENT) { - append_menu_item(menu, wxID_ANY, _devL("Change extruder color"), "", + append_menu_item(menu, wxID_ANY, _L("Change extruder color"), "", [this](wxCommandEvent&) { this->change_extruder_color(); }, "blank_14", menu, []() { return true; }, wxGetApp().plater()); wxGetApp().plater()->PopupMenu(menu); return; diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp index 41e5cebced..e44a712acc 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp @@ -95,7 +95,7 @@ void PrinterCloudAuthDialog::OnScriptMessage(wxWebViewEvent& evt) } Close(); } catch (std::exception& e) { - wxMessageBox(e.what(), "parse json failed", wxICON_WARNING); + wxMessageBox(e.what(), _L("parse json failed"), wxICON_WARNING); Close(); } } diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 56720ba635..7ff9637ee0 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -1524,7 +1524,7 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent) m_tip4->SetMaxSize(wxSize(FromDIP(355), -1)); // ORCA standardized HyperLink - m_trouble_shoot = new HyperLink(this, "How to trouble shooting"); + m_trouble_shoot = new HyperLink(this, _L("How to trouble shooting")); m_img_help = new wxStaticBitmap(this, wxID_ANY, create_scaled_bitmap("input_access_code_x1_en", this, 198), wxDefaultPosition, wxSize(FromDIP(355), -1), 0); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 9fd0a65087..7e9d957f78 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -654,7 +654,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) sizer_error_code->Add(m_st_txt_error_code, 0, wxALL, 0); - auto st_title_error_desc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, wxT("Error desc")); + auto st_title_error_desc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, _L("Error desc")); auto st_title_error_desc_doc = new wxStaticText(m_sw_print_failed_info, wxID_ANY,": "); m_st_txt_error_desc = new Label(m_sw_print_failed_info, wxEmptyString); st_title_error_desc->SetForegroundColour(0x909090); @@ -671,7 +671,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) sizer_error_desc->Add(st_title_error_desc_doc, 0, wxALL, 0); sizer_error_desc->Add(m_st_txt_error_desc, 0, wxALL, 0); - auto st_title_extra_info = new wxStaticText(m_sw_print_failed_info, wxID_ANY, wxT("Extra info")); + auto st_title_extra_info = new wxStaticText(m_sw_print_failed_info, wxID_ANY, _L("Extra info")); auto st_title_extra_info_doc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, ": "); m_st_txt_extra_info = new Label(m_sw_print_failed_info, wxEmptyString); st_title_extra_info->SetForegroundColour(0x909090); diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index d478c37f8f..3241a1566c 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -412,7 +412,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater) sizer_error_code->Add(st_title_error_code_doc, 0, wxALL, 0); sizer_error_code->Add(m_st_txt_error_code, 0, wxALL, 0); - auto st_title_error_desc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, wxT("Error desc")); + auto st_title_error_desc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, _L("Error desc")); auto st_title_error_desc_doc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, ": "); m_st_txt_error_desc = new Label(m_sw_print_failed_info, wxEmptyString); st_title_error_desc->SetForegroundColour(0x909090); @@ -429,7 +429,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater) sizer_error_desc->Add(st_title_error_desc_doc, 0, wxALL, 0); sizer_error_desc->Add(m_st_txt_error_desc, 0, wxALL, 0); - auto st_title_extra_info = new wxStaticText(m_sw_print_failed_info, wxID_ANY, wxT("Extra info")); + auto st_title_extra_info = new wxStaticText(m_sw_print_failed_info, wxID_ANY, _L("Extra info")); auto st_title_extra_info_doc = new wxStaticText(m_sw_print_failed_info, wxID_ANY, ": "); m_st_txt_extra_info = new Label(m_sw_print_failed_info, wxEmptyString); st_title_extra_info->SetForegroundColour(0x909090); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 5cbf3e2a83..dcd5f9b774 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -5722,7 +5722,7 @@ wxBoxSizer *ScoreDialog::get_photo_btn_sizer() { m_add_photo->Bind(wxEVT_LEFT_DOWN, [this](auto &e) { // add photo logic - wxFileDialog openFileDialog(this, "Select Images", "", "", "Image files (*.png;*.jpg;*jpeg)|*.png;*.jpg;*.jpeg", wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE); + wxFileDialog openFileDialog(this, _L("Select Images"), "", "", _L("Image files (*.png;*.jpg;*jpeg)|*.png;*.jpg;*.jpeg"), wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE); if (openFileDialog.ShowModal() == wxID_CANCEL) return; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index a0697b8784..0903abbec6 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -7440,11 +7440,11 @@ wxSizer* Tab::compatible_widget_create(wxWindow* parent, PresetDependencies &dep } if(deps.type == Preset::TYPE_PRINTER){ - deps.dialog_title = "Compatible printers"; - deps.dialog_label = "Select printers"; + deps.dialog_title = _L("Compatible printers"); + deps.dialog_label = _L("Select printers"); }else{ - deps.dialog_title = "Compatible process profiles"; - deps.dialog_label = "Select profiles"; + deps.dialog_title = _L("Compatible process profiles"); + deps.dialog_label = _L("Select profiles"); } MultiChoiceDialog dlg(parent, deps.dialog_label, deps.dialog_title, presets); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 2da4beea23..d4287b9c35 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -2281,7 +2281,7 @@ void DiffPresetDialog::update_tree() const Preset* left_preset = presets->find_preset(get_selection(preset_combos.presets_left)); const Preset* right_preset = presets->find_preset(get_selection(preset_combos.presets_right)); if (!left_preset || !right_preset) { - bottom_info = "One of the presets does not exist"; + bottom_info = _L("One of the presets does not exist"); preset_combos.equal_bmp->SetBitmap_(ScalableBitmap(this, "question")); preset_combos.equal_bmp->SetToolTip(bottom_info); continue; @@ -2292,7 +2292,7 @@ void DiffPresetDialog::update_tree() const DynamicPrintConfig& right_congig = right_preset->config; if (left_pt != right_preset->printer_technology()) { - bottom_info = "Compared presets has different printer technology"; + bottom_info = _L("Compared presets has different printer technology"); preset_combos.equal_bmp->SetBitmap_(ScalableBitmap(this, "question")); preset_combos.equal_bmp->SetToolTip(bottom_info); continue; @@ -2336,7 +2336,7 @@ void DiffPresetDialog::update_tree() wxString left_val = from_u8((boost::format("%1%") % left_config.opt("extruder_colour")->values.size()).str()); wxString right_val = from_u8((boost::format("%1%") % right_congig.opt("extruder_colour")->values.size()).str()); - m_tree->Append("extruders_count", type, "General", "Capabilities", local_label, left_val, right_val, + m_tree->Append("extruders_count", type, _L("General"), _L("Capabilities"), local_label, left_val, right_val, get_category_icon("Basic information")); } diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 4b8acc9455..4222ce745b 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -506,7 +506,7 @@ void ZUserLogin::OnScriptMessage(wxWebViewEvent &evt) return; } } catch (std::exception &e) { - wxMessageBox(e.what(), "parse json failed", wxICON_WARNING); + wxMessageBox(e.what(), _L("parse json failed"), wxICON_WARNING); Close(); } } diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.cpp b/src/slic3r/GUI/Widgets/ProgressDialog.cpp index 0ace737d8d..0575e584f4 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.cpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.cpp @@ -556,7 +556,7 @@ bool ProgressDialog::Update(int value, const wxString &newmsg, bool *skip) if (newmsg.empty()) { // also provide the finishing message if the application didn't - m_msg->SetLabel(wxGetTranslation("Done.")); + m_msg->SetLabel(_L("Done.")); } // allow the window to repaint: