diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index fcb5921141..e2c5119b6b 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -648,7 +648,7 @@ void PageWelcome::set_run_reason(ConfigWizard::RunReason run_reason) } PageUpdateManager::PageUpdateManager(ConfigWizard* parent_in) - : ConfigWizardPage(parent_in, _L("Manage Configuration Updates"), _L("Configuration Manager")) + : ConfigWizardPage(parent_in, _L("Configuration sources"), _L("Configuration Sources")) { this->SetFont(wxGetApp().normal_font()); @@ -656,7 +656,7 @@ PageUpdateManager::PageUpdateManager(ConfigWizard* parent_in) manager = std::make_unique(this, wxGetApp().plater()->get_preset_archive_database(), em); - warning_text = new wxStaticText(this, wxID_ANY, _L("WARNING: Select at least one repository.")); + warning_text = new wxStaticText(this, wxID_ANY, _L("WARNING: Select at least one source.")); warning_text->SetFont(wxGetApp().bold_font()); warning_text->Hide(); diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index c80105eda6..8fb5aef1f7 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -257,14 +257,14 @@ static std::string to_string(libvgcode::EMoveType type) switch (type) { // TRN: Following strings are labels in the G-code Viewer legend. - case libvgcode::EMoveType::Noop: { return _u8L("Noop"); } + case libvgcode::EMoveType::Noop: { return ("Noop"); } case libvgcode::EMoveType::Retract: { return _u8L("Retract"); } case libvgcode::EMoveType::Unretract: { return _u8L("Unretract"); } case libvgcode::EMoveType::Seam: { return _u8L("Seam"); } case libvgcode::EMoveType::ToolChange: { return _u8L("Tool Change"); } case libvgcode::EMoveType::ColorChange: { return _u8L("Color Change"); } case libvgcode::EMoveType::PausePrint: { return _u8L("Pause Print"); } - case libvgcode::EMoveType::CustomGCode: { return _u8L("Custom GCode"); } + case libvgcode::EMoveType::CustomGCode: { return _u8L("Custom G-code"); } case libvgcode::EMoveType::Travel: { return _u8L("Travel"); } case libvgcode::EMoveType::Wipe: { return _u8L("Wipe"); } case libvgcode::EMoveType::Extrude: { return _u8L("Extrude"); } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index c78dcd5220..25b2cb6cef 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3521,8 +3521,8 @@ bool GUI_App::check_updates(const bool invoked_by_user) if (!plater()->get_preset_archive_database()->extract_archives_with_check(failed_paths)) { int cnt = std::count(failed_paths.begin(), failed_paths.end(), '\n') + 1; // TRN: %1% contains paths from which loading failed. They are separated by \n, there is no \n at the end. - failed_paths = GUI::format(_L_PLURAL("It was not possible to extract data from %1%. The repository will not be updated.", - "It was not possible to extract data for following local repositories. They will not be updated.\n\n %1%", cnt), failed_paths); + failed_paths = GUI::format(_L_PLURAL("It was not possible to extract data from %1%. The source will not be updated.", + "It was not possible to extract data for following local sources. They will not be updated.\n\n %1%", cnt), failed_paths); show_error(nullptr, failed_paths); } // then its time for preset_updater sync @@ -3919,7 +3919,7 @@ void GUI_App::search_and_select_filaments(const std::string& material, size_t ex { out_message += /*(extruder_count == 1) ? GUI::format(_L("Selected Filament:\n%1%"), filament_preset.preset->name) - : */GUI::format(_L("Extruder %1%: Selected Filament %2%\n"), extruder_index + 1, filament.preset->name); + : */GUI::format(_L("Extruder %1%: Selected filament %2%\n"), extruder_index + 1, filament.preset->name); return; } } @@ -3934,7 +3934,7 @@ void GUI_App::search_and_select_filaments(const std::string& material, size_t ex && filament.preset->name.compare(0, 9, "Prusament") == 0 && select_filament_preset(filament.preset, extruder_index)) { - out_message += GUI::format(_L("Extruder %1%: Selected and installed filament %2%\n"), extruder_index + 1, filament.preset->name); + out_message += GUI::format(_L("Extruder %1%: Installed and selected filament %2%\n"), extruder_index + 1, filament.preset->name); return; } } diff --git a/src/slic3r/GUI/LoginDialog.cpp b/src/slic3r/GUI/LoginDialog.cpp index f106ddd61f..3512b88436 100644 --- a/src/slic3r/GUI/LoginDialog.cpp +++ b/src/slic3r/GUI/LoginDialog.cpp @@ -11,14 +11,14 @@ namespace GUI { LoginDialog::LoginDialog(wxWindow* parent, UserAccount* user_account) // TRN: This is the dialog title. - : DPIDialog(parent, wxID_ANY, _L("Prusa Account"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + : DPIDialog(parent, wxID_ANY, ("Prusa Account"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) , p_user_account(user_account) { const int em = wxGetApp().em_unit(); bool logged = p_user_account->is_logged(); wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); // sizer with black border - wxStaticBoxSizer* static_box_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _L("Log into your Prusa Account")); + wxStaticBoxSizer* static_box_sizer = new wxStaticBoxSizer(wxVERTICAL, this, ("Log into your Prusa Account")); static_box_sizer->SetMinSize(wxSize(em * 30, em * 15)); // avatar boost::filesystem::path path = p_user_account->get_avatar_path(logged); @@ -26,18 +26,18 @@ LoginDialog::LoginDialog(wxWindow* parent, UserAccount* user_account) m_avatar_bitmap = new wxStaticBitmap(this, wxID_ANY, logo.bmp(), wxDefaultPosition, wxDefaultSize); static_box_sizer->Add(m_avatar_bitmap, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 10); // username - const wxString username = GUI::format_wxstr("%1%", logged ? from_u8(p_user_account->get_username()) : _L("Anonymous")); + const wxString username = GUI::format_wxstr("%1%", logged ? from_u8(p_user_account->get_username()) : ("Anonymous")); m_username_label = new wxStaticText(this, wxID_ANY, username, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER); m_username_label->SetFont(m_username_label->GetFont().Bold()); static_box_sizer->Add(m_username_label, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 5); // login button m_login_button_id = NewControlId(); - m_login_button = new wxButton(this, m_login_button_id, logged ? _L("Log out") : _L("Log in")); + m_login_button = new wxButton(this, m_login_button_id, logged ? ("Log out") : ("Log in")); static_box_sizer->Add(m_login_button, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 10); // TODO: why is m_login_button always hovered? main_sizer->Add(static_box_sizer, 1, wxEXPAND | wxALL, 10); // continue button - m_continue_button = new wxButton(this, wxID_OK, logged ? _L("Continue") : _L("Continue without Prusa Account")); + m_continue_button = new wxButton(this, wxID_OK, logged ? ("Continue") : ("Continue without Prusa Account")); main_sizer->Add(m_continue_button, 0, wxALIGN_CENTER_HORIZONTAL | wxALL, 10); SetSizerAndFit(main_sizer); @@ -61,7 +61,7 @@ void LoginDialog::update_account() { bool logged = p_user_account->is_logged(); - const wxString username = GUI::format_wxstr("%1%", logged ? from_u8(p_user_account->get_username()) : _L("Anonymous")); + const wxString username = GUI::format_wxstr("%1%", logged ? from_u8(p_user_account->get_username()) : ("Anonymous")); m_username_label->SetLabel(username); boost::filesystem::path path = p_user_account->get_avatar_path(logged); @@ -71,8 +71,8 @@ void LoginDialog::update_account() m_avatar_bitmap->SetBitmap(logo.bmp()); } - m_login_button->SetLabel(logged ? _L("Log out") : _L("Log in")); - m_continue_button->SetLabel(logged ? _L("Continue") : _L("Continue without Prusa Account")); + m_login_button->SetLabel(logged ? ("Log out") : ("Log in")); + m_continue_button->SetLabel(logged ? ("Continue") : ("Continue without Prusa Account")); // TODO: resize correctly m_continue_button //m_continue_button->Fit(); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 6b6151dd16..8cd5f672f1 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -625,7 +625,7 @@ void MainFrame::set_callbacks_for_topbar_menus() m_bar_menus.set_account_menu_callbacks( []() -> void { wxGetApp().plater()->act_with_user_account(); }, [this]() -> void { - wxString preferences_item = _L("Show \"Log in\" button in application top bar"); + wxString preferences_item = _L("Show Log in button in application top bar"); wxString msg = _L("PrusaSlicer will remember your choice.") + "\n\n" + format_wxstr(_L("Visit \"Preferences\" and check \"%1%\"\nto changes your choice."), preferences_item); @@ -1913,7 +1913,7 @@ void MainFrame::export_configbundle(bool export_physical_printers /*= false*/) wxSecretStore store = wxSecretStore::GetDefault(); wxString errmsg; if (!store.IsOk(&errmsg)) { - std::string msg = GUI::format("%1% (%2%).", _u8L("Failed to load credentials from the system secret store."), errmsg); + std::string msg = GUI::format("%1% (%2%).", _u8L("Failed to load credentials from the system password store."), errmsg); BOOST_LOG_TRIVIAL(error) << msg; show_error(nullptr, msg); // Do not try again. System store is not reachable. @@ -1924,7 +1924,7 @@ void MainFrame::export_configbundle(bool export_physical_printers /*= false*/) wxString username; wxSecretValue password; if (!store.Load(service, username, password)) { - std::string msg = GUI::format(_u8L("Failed to load credentials from the system secret store for printer %1%."), printer_id); + std::string msg = GUI::format(_u8L("Failed to load credentials from the system password store for printer %1%."), printer_id); BOOST_LOG_TRIVIAL(error) << msg; show_error(nullptr, msg); return false; diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 9730f14290..11ca1249c9 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -189,7 +189,7 @@ bool save_secret(const std::string& id, const std::string& opt, const std::strin const wxString username = boost::nowide::widen(usr); const wxSecretValue password(boost::nowide::widen(psswd)); if (!store.Save(service, username, password)) { - std::string msg(_u8L("Failed to save credentials to the system secret store.")); + std::string msg(_u8L("Failed to save credentials to the system password store.")); BOOST_LOG_TRIVIAL(error) << msg; show_error(nullptr, msg); return false; @@ -215,7 +215,7 @@ bool load_secret(const std::string& id, const std::string& opt, std::string& usr wxString username; wxSecretValue password; if (!store.Load(service, username, password)) { - std::string msg(_u8L("Failed to load credentials from the system secret store.")); + std::string msg(_u8L("Failed to load credentials from the system password store.")); BOOST_LOG_TRIVIAL(error) << msg; show_error(nullptr, msg); return false; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index ca0b19bfd2..cc2ce67606 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5965,7 +5965,7 @@ bool load_secret(const std::string& id, const std::string& opt, std::string& usr wxString username; wxSecretValue password; if (!store.Load(service, username, password)) { - std::string msg(_u8L("Failed to load credentials from the system secret store.")); + std::string msg(_u8L("Failed to load credentials from the system password store.")); BOOST_LOG_TRIVIAL(error) << msg; show_error(nullptr, msg); return false; diff --git a/src/slic3r/GUI/PresetArchiveDatabase.cpp b/src/slic3r/GUI/PresetArchiveDatabase.cpp index 2a825cdc5e..642c6bf6c1 100644 --- a/src/slic3r/GUI/PresetArchiveDatabase.cpp +++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp @@ -33,7 +33,7 @@ bool unzip_repository(const fs::path& source_path, const fs::path& target_path) mz_zip_archive archive; mz_zip_zero_struct(&archive); if (!open_zip_reader(&archive, source_path.string())) { - BOOST_LOG_TRIVIAL(error) << "Couldn't open zipped Archive Repository. " << source_path; + BOOST_LOG_TRIVIAL(error) << "Couldn't open zipped Archive source. " << source_path; return false; } size_t num_files = mz_zip_reader_get_num_files(&archive); @@ -70,21 +70,21 @@ bool extract_repository_header(const pt::ptree& ptree, ArchiveRepository::Reposi if (const auto name = ptree.get_optional("name"); name){ data.name = *name; } else { - BOOST_LOG_TRIVIAL(error) << "Failed to find \"name\" parameter in repository manifest. Repository is invalid."; + BOOST_LOG_TRIVIAL(error) << "Failed to find \"name\" parameter in source manifest. Source is invalid."; return false; } if (const auto id = ptree.get_optional("id"); id) { data.id = *id; } else { - BOOST_LOG_TRIVIAL(error) << "Failed to find \"id\" parameter in repository manifest. Repository is invalid."; + BOOST_LOG_TRIVIAL(error) << "Failed to find \"id\" parameter in source manifest. Source is invalid."; return false; } if (const auto url = ptree.get_optional("url"); url) { data.url = *url; } else { - BOOST_LOG_TRIVIAL(error) << "Failed to find \"url\" parameter in repository manifest. Repository is invalid."; + BOOST_LOG_TRIVIAL(error) << "Failed to find \"url\" parameter in source manifest. Source is invalid."; return false; } // optional atributes @@ -140,13 +140,13 @@ bool extract_local_archive_repository( ArchiveRepository::RepositoryManifest& ma pt::ptree ptree; pt::read_json(manifest_path.string(), ptree); if (!extract_repository_header(ptree, manifest_data)) { - BOOST_LOG_TRIVIAL(error) << "Failed to load repository: " << manifest_data.tmp_path; + BOOST_LOG_TRIVIAL(error) << "Failed to load source " << manifest_data.tmp_path; return false; } } catch (const std::exception& e) { - BOOST_LOG_TRIVIAL(error) << "Failed to read repository manifest JSON " << manifest_path << ". reason: " << e.what(); + BOOST_LOG_TRIVIAL(error) << "Failed to read source manifest JSON " << manifest_path << ". reason: " << e.what(); return false; } return true; @@ -353,7 +353,7 @@ bool PresetArchiveDatabase::set_selected_repositories(const std::vectoris_extracted()) { // non existent local repo since start selected msg = GUI::format( - _L("Cannot select local repository from path: %1%. It was not extracted."), + _L("Cannot select local source from path: %1%. It was not extracted."), archive->get_manifest().source_path ); return false; @@ -362,7 +362,7 @@ bool PresetArchiveDatabase::set_selected_repositories(const std::vectorsecond, name); + msg = GUI::format(_L("Cannot select two sources with the same id: %1% and %2%"), it->second, name); return false; } used_set.emplace(id, name); @@ -501,7 +501,7 @@ void PresetArchiveDatabase::load_app_manifest_json() } else { assert(true); - BOOST_LOG_TRIVIAL(error) << "Failed to read Archive Repository Manifest at " << path; + BOOST_LOG_TRIVIAL(error) << "Failed to read Archive Source Manifest at " << path; } if (data.empty()) { return; @@ -546,7 +546,7 @@ void PresetArchiveDatabase::load_app_manifest_json() std::string uuid = get_next_uuid(); if (!extract_repository_header(subtree.second, manifest)) { assert(true); - BOOST_LOG_TRIVIAL(error) << "Failed to read one of repository headers."; + BOOST_LOG_TRIVIAL(error) << "Failed to read one of source headers."; continue; } // "selected" flag @@ -876,7 +876,7 @@ bool sync_inner(std::string& manifest) http .timeout_max(30) .on_error([&](std::string body, std::string error, unsigned http_status) { - BOOST_LOG_TRIVIAL(error) << "Failed to get online archive repository manifests: "<< body << " ; " << error << " ; " << http_status; + BOOST_LOG_TRIVIAL(error) << "Failed to get online archive source manifests: "<< body << " ; " << error << " ; " << http_status; ret = false; }) .on_complete([&](std::string body, unsigned /* http_status */) { diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 81ad1b5cc4..fc00ac88b9 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -5515,7 +5515,7 @@ void TabSLAMaterial::update_description_lines() auto cfg = m_preset_bundle->full_config(); double lh = cfg.opt_float("layer_height"); int zlayers = cfg.opt_int("zcorrection_layers"); - m_z_correction_to_mm_description->SetText(GUI::format_wxstr(_L("Current Z correction depth is: %1% mm"), zlayers * lh)); + m_z_correction_to_mm_description->SetText(GUI::format_wxstr(_L("The current Z-axis height correction is: %1% mm"), zlayers * lh)); } Tab::update_description_lines(); diff --git a/src/slic3r/GUI/TopBarMenus.cpp b/src/slic3r/GUI/TopBarMenus.cpp index bb88ddd383..89324b3a85 100644 --- a/src/slic3r/GUI/TopBarMenus.cpp +++ b/src/slic3r/GUI/TopBarMenus.cpp @@ -98,7 +98,7 @@ void TopBarMenus::UpdateAccountMenu() if (is_logged) RemoveHideLoginItem(); if (m_login_item) { - m_login_item->SetItemLabel(is_logged ? _L("Prusa Account Log out") : _L("Prusa Account Log in")); + m_login_item->SetItemLabel(is_logged ? _L("Log out") : _L("Log in")); set_menu_item_bitmap(m_login_item, is_logged ? "logout" : "login"); } } diff --git a/src/slic3r/GUI/UpdatesUIManager.cpp b/src/slic3r/GUI/UpdatesUIManager.cpp index 6a749f2c93..58208c3827 100644 --- a/src/slic3r/GUI/UpdatesUIManager.cpp +++ b/src/slic3r/GUI/UpdatesUIManager.cpp @@ -26,7 +26,7 @@ RepositoryUpdateUIManager::RepositoryUpdateUIManager(wxWindow* parent, PresetArc ,m_pad(pad) ,m_main_sizer(new wxBoxSizer(wxVERTICAL)) { - auto online_label = new wxStaticText(m_parent, wxID_ANY, _L("Online Repositories")); + auto online_label = new wxStaticText(m_parent, wxID_ANY, _L("Online sources")); online_label->SetFont(wxGetApp().bold_font()); m_main_sizer->Add(online_label, 0, wxTOP | wxLEFT, 2 * em); @@ -40,7 +40,7 @@ RepositoryUpdateUIManager::RepositoryUpdateUIManager(wxWindow* parent, PresetArc m_main_sizer->AddSpacer(em); - auto offline_label = new wxStaticText(m_parent, wxID_ANY, _L("Local Repositories")); + auto offline_label = new wxStaticText(m_parent, wxID_ANY, _L("Local sources")); offline_label->SetFont(wxGetApp().bold_font()); m_main_sizer->Add(offline_label, 0, wxTOP | wxLEFT, 2 * em); @@ -98,7 +98,7 @@ void RepositoryUpdateUIManager::fill_grids() // header // TRN: This string appears in Configuration Wizard in the 'Configuration Manager' step. - for (const wxString& l : std::initializer_list{ _L("Use"), "", _L("Name"), _L("Description") }) { + for (const wxString& l : std::initializer_list{ "", "", _L("Name"), _L("Description")}) { auto text = new wxStaticText(m_parent, wxID_ANY, l); text->SetFont(wxGetApp().bold_font()); add(text); @@ -139,7 +139,7 @@ void RepositoryUpdateUIManager::fill_grids() // header - for (const wxString& l : std::initializer_list{ _L("Use"), _L("Name"), _L("Descrition"), "", _L("Source file"), "", "" }) { + for (const wxString& l : std::initializer_list{ "", _L("Name"), _L("Description"), "", _L("Source file"), "", ""}) { auto text = new wxStaticText(m_parent, wxID_ANY, l); text->SetFont(wxGetApp().bold_font()); add(text); diff --git a/src/slic3r/GUI/UserAccountCommunication.cpp b/src/slic3r/GUI/UserAccountCommunication.cpp index 934c61d9bc..25e3c70e09 100644 --- a/src/slic3r/GUI/UserAccountCommunication.cpp +++ b/src/slic3r/GUI/UserAccountCommunication.cpp @@ -92,7 +92,7 @@ bool save_secret(const std::string& opt, const std::string& usr, const std::stri const wxString username = boost::nowide::widen(usr); const wxSecretValue password(boost::nowide::widen(psswd)); if (!store.Save(service, username, password)) { - std::string msg(_u8L("Failed to save credentials to the system secret store.")); + std::string msg(_u8L("Failed to save credentials to the system password store.")); BOOST_LOG_TRIVIAL(error) << msg; //show_error(nullptr, msg); return false; @@ -118,7 +118,7 @@ bool load_secret(const std::string& opt, std::string& usr, std::string& psswd) wxString username; wxSecretValue password; if (!store.Load(service, username, password)) { - std::string msg(_u8L("Failed to load credentials from the system secret store.")); + std::string msg(_u8L("Failed to load credentials from the system password store.")); BOOST_LOG_TRIVIAL(error) << msg; //show_error(nullptr, msg); return false; diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index 3843f3c884..f7939253c7 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -1053,7 +1053,7 @@ bool PresetUpdater::priv::perform_updates(Updates &&updates, const SharedArchive if (it != repositories.end()) get_or_copy_missing_resource((*it), vp.id, resource, vp.repo_id); else { - BOOST_LOG_TRIVIAL(error) << "Failed to prepare " << resource << " for " << vp.id << " " << model.id << ": Missing record for repository with repo_id " << vp.repo_id; + BOOST_LOG_TRIVIAL(error) << "Failed to prepare " << resource << " for " << vp.id << " " << model.id << ": Missing record for source with repo_id " << vp.repo_id; } } catch (const std::exception& e) diff --git a/src/slic3r/Utils/PrusaConnect.cpp b/src/slic3r/Utils/PrusaConnect.cpp index 2f86e3cf18..c85eb054aa 100644 --- a/src/slic3r/Utils/PrusaConnect.cpp +++ b/src/slic3r/Utils/PrusaConnect.cpp @@ -315,11 +315,11 @@ bool PrusaConnectNew::get_storage(wxArrayString& storage_path, wxArrayString& st wxString PrusaConnectNew::get_test_ok_msg() const { - return _L("Test OK."); + return _L("Test passed."); } wxString PrusaConnectNew::get_test_failed_msg(wxString& msg) const { - return _L("Test NOK."); + return _L("Test failed."); } std::string PrusaConnectNew::get_team_id(const std::string& data) const