Skip to content

Commit ebe38af

Browse files
committed
fix(ui): correct punctuation and grammar in UI warning/tip strings
Adds missing spaces after 'Warning:'/'Error:'/'Tip:' prefixes and fixes grammar in user-facing strings across several GUI source files. Source-string changes only; translation catalogs are left to the upstream gettext pipeline. Closes #10853
1 parent 3f126b7 commit ebe38af

13 files changed

Lines changed: 28 additions & 28 deletions

src/slic3r/GUI/AMSSetting.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void AMSSetting::create()
128128
m_sizer_starting_tip_inline = new wxBoxSizer(wxVERTICAL);
129129

130130
m_tip_starting_line1 = new Label(m_panel_body,
131-
_L("The AMS will automatically read the information of inserted filament on start-up. It will take about 1 minute.The reading process will roll filament spools.")
131+
_L("The AMS will automatically read the information of inserted filament on start-up. It will take about 1 minute. The reading process will roll filament spools.")
132132
);
133133
m_tip_starting_line1->SetFont(::Label::Body_13);
134134
m_tip_starting_line1->SetForegroundColour(AMS_SETTING_GREY700);

src/slic3r/GUI/BindDialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
485485
m_link_Terms_title->Wrap(FromDIP(450));
486486
m_link_Terms_title->SetForegroundColour(wxColour("#00AE42"));
487487
m_link_Terms_title->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {
488-
wxString txt = _L("Thank you for purchasing a Bambu Lab device.Before using your Bambu Lab device, please read the termsand conditions.By clicking to agree to use your Bambu Lab device, you agree to abide by the Privacy Policy and Terms of Use(collectively, the \"Terms\"). If you do not comply with or agree to the Bambu Lab Privacy Policy, please do not use Bambu Lab equipment and services.");
488+
wxString txt = _L("Thank you for purchasing a Bambu Lab device. Before using your Bambu Lab device, please read the terms and conditions. By clicking to agree to use your Bambu Lab device, you agree to abide by the Privacy Policy and Terms of Use (collectively, the \"Terms\"). If you do not comply with or agree to the Bambu Lab Privacy Policy, please do not use Bambu Lab equipment and services.");
489489
ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Terms and Conditions"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM);
490490
confirm_dlg.update_text(txt);
491491
confirm_dlg.CenterOnParent();

src/slic3r/GUI/ConfigManipulation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void ConfigManipulation::check_chamber_temperature(DynamicPrintConfig* config)
189189
auto iter = recommend_temp_map.find(filament_type);
190190
if (iter!=recommend_temp_map.end()) {
191191
if (iter->second < config->option<ConfigOptionInts>("chamber_temperatures")->get_at(0)) {
192-
wxString msg_text = wxString::Format(_L("Current chamber temperature is higher than the material's safe temperature,it may result in material softening and clogging.The maximum safe temperature for the material is %d"), iter->second);
192+
wxString msg_text = wxString::Format(_L("Current chamber temperature is higher than the material's safe temperature, it may result in material softening and clogging. The maximum safe temperature for the material is %d"), iter->second);
193193
MessageDialog dialog(m_msg_dlg_parent, msg_text, "", wxICON_WARNING | wxOK);
194194
is_msg_dlg_already_exist = true;
195195
dialog.ShowModal();

src/slic3r/GUI/DeviceManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ wxString Slic3r::get_stage_string(int stage)
197197
case 35:
198198
return _L("Pause (nozzle clog)");
199199
case 36:
200-
return _L("Measuring motion percision");
200+
return _L("Measuring motion precision");
201201
case 37:
202-
return _L("Enhancing motion percision");
202+
return _L("Enhancing motion precision");
203203
case 38:
204204
return _L("Measure motion accuracy");
205205
case 39:
@@ -2955,7 +2955,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
29552955
if (jj["errno"].is_number()) {
29562956
wxString text;
29572957
if (jj["errno"].get<int>() == -2) {
2958-
text = _L("Low temperature filament(PLA/PETG/TPU) is loaded in the extruder.In order to avoid extruder clogging,it is not allowed to set the chamber temperature.");
2958+
text = _L("Low temperature filament (PLA/PETG/TPU) is loaded in the extruder. In order to avoid extruder clogging, it is not allowed to set the chamber temperature.");
29592959
}
29602960
else if (jj["errno"].get<int>() == -4) {
29612961
text = _L("When you set the chamber temperature below 40\u2103, the chamber temperature control will not be activated. And the target chamber temperature will automatically be set to 0\u2103.");

src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2795,7 +2795,7 @@ void GLGizmoAdvancedCut::render_input_window_warning() const
27952795
(m_info_stats.outside_cut_contour == 1 ? _L("connector is out of cut contour") : _L("connectors are out of cut contour"));
27962796
if (m_info_stats.outside_bb > size_t(0))
27972797
out += "\n - " + std::to_string(m_info_stats.outside_bb) +
2798-
(m_info_stats.outside_bb == 1 ? _L("connector is out of object") : _L("connectors is out of object"));
2798+
(m_info_stats.outside_bb == 1 ? _L("connector is out of object") : _L("connectors are out of object"));
27992799
if (m_info_stats.is_overlap)
28002800
out += "\n - " + _L("Some connectors are overlapped");
28012801
m_imgui->warning_text(out);

src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,14 +1886,14 @@ void GLGizmoMeasure::show_selection_ui()
18861886
if (m_selected_wrong_feature_waring_tip) {
18871887
if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY) {
18881888
if (m_assembly_mode == AssemblyMode::FACE_FACE) {
1889-
m_imgui->warning_text(_L("Warning:please select Plane's feature."));
1889+
m_imgui->warning_text(_L("Warning: Please select a Plane feature."));
18901890
} else if (m_assembly_mode == AssemblyMode::POINT_POINT) {
1891-
m_imgui->warning_text(_L("Warning:please select Point's or Circle's feature."));
1891+
m_imgui->warning_text(_L("Warning: Please select a Point or Circle feature."));
18921892
}
18931893
}
18941894
}
18951895
if (m_measure_mode == EMeasureMode::ONLY_ASSEMBLY && m_hit_different_volumes.size() == 1) {
1896-
m_imgui->warning_text(_L("Warning:please select two different mesh."));
1896+
m_imgui->warning_text(_L("Warning: Please select two different meshes."));
18971897
}
18981898
}
18991899

src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ void GLGizmoSVG::draw_window()
13551355
draw_model_type();
13561356
}
13571357
if (!m_can_use_surface) {
1358-
m_imgui->text_wrapped(_L("Tip:If you want to place svg file on another part surface,you should select part first, and then drag svg file to the part surface."),
1358+
m_imgui->text_wrapped(_L("Tip: If you want to place an SVG file on another part surface, select the part first, then drag the SVG file to the part surface."),
13591359
m_gui_cfg->input_offset + m_gui_cfg->input_width + m_gui_cfg->icon_width);
13601360
}
13611361
}

src/slic3r/GUI/Gizmos/GLGizmoText.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,24 +2400,24 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit)
24002400
std::string text = m_text;
24012401
auto cur_world = m_model_object_in_world_tran.get_matrix() * m_text_tran_in_object.get_matrix();
24022402
if (!is_only_text_case() && has_reflection(cur_world)) {
2403-
m_imgui->warning_text_wrapped(_L("Warning:There is a mirror in the text matrix, and dragging it will completely regenerate it."), full_width);
2403+
m_imgui->warning_text_wrapped(_L("Warning: There is a mirror in the text matrix, and dragging it will completely regenerate it."), full_width);
24042404
m_parent.request_extra_frame();
24052405
}
24062406
if (m_warning_font) {
2407-
m_imgui->warning_text_wrapped(_L("Warning:Due to font upgrades,previous font may not necessarily be replaced successfully, and recommend you to modify the font."), full_width);
2407+
m_imgui->warning_text_wrapped(_L("Warning: Due to font upgrades, previous font may not necessarily be replaced successfully. Please modify the font."), full_width);
24082408
m_parent.request_extra_frame();
24092409
}
24102410
if (m_show_warning_text_create_fail) {
2411-
m_imgui->warning_text(_L("Warning:create text fail."));
2411+
m_imgui->warning_text(_L("Warning: Text creation failed."));
24122412
}
24132413
if (m_show_text_normal_error) {
2414-
m_imgui->warning_text(_L("Warning:text normal is error."));
2414+
m_imgui->warning_text(_L("Warning: Text normal has an error."));
24152415
}
24162416
if (m_show_text_normal_reset_tip) {
2417-
m_imgui->warning_text(_L("Warning:text normal has been reset."));
2417+
m_imgui->warning_text(_L("Warning: Text normal has been reset."));
24182418
}
24192419
if (m_font_version == NEW_FONT_BEGIN_VERSION) {
2420-
m_imgui->warning_text_wrapped(_L("Warning:current text spacing is not very reasonable. If you continue editing, a more reasonable text spacing will be generated.")
2420+
m_imgui->warning_text_wrapped(_L("Warning: Current text spacing is not optimal. If you continue editing, a more reasonable text spacing will be generated.")
24212421
,full_width);
24222422
}
24232423
/* if (m_show_warning_regenerated && m_font_version != CUR_FONT_VERSION) {
@@ -2426,25 +2426,25 @@ void GLGizmoText::on_render_input_window(float x, float y, float bottom_limit)
24262426
m_parent.request_extra_frame();
24272427
}*/
24282428
if (m_show_warning_old_tran) {
2429-
m_imgui->warning_text_wrapped(_L("Warning:old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please "
2430-
"dragging text or cancel using current pose, save and reedit again."),
2429+
m_imgui->warning_text_wrapped(_L("Warning: Old matrix has at least two parameters: mirroring, scaling, and rotation. If you continue editing, it may not be correct. Please "
2430+
"drag the text or cancel the current pose, save and reedit again."),
24312431
full_width);
24322432
m_parent.request_extra_frame();
24332433
}
24342434
if (m_show_warning_error_mesh) {
24352435
m_imgui->warning_text_wrapped(
2436-
_L("Error:Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes.Please drag text,save it then reedit it again."),
2436+
_L("Error: Detecting an incorrect mesh id or an unknown error, regenerating text may result in incorrect outcomes. Please drag text, save it then reedit it again."),
24372437
full_width);
24382438
m_parent.request_extra_frame();
24392439
}
24402440
if (m_show_warning_lost_rotate) {
24412441
m_imgui->warning_text_wrapped(
2442-
_L("Warning:Due to functional upgrade, rotation information cannot be restored. Please drag or modify text,save it and reedit it will ok."),
2442+
_L("Warning: Due to functional upgrade, rotation information cannot be restored. Please drag or modify text, save it and reedit it to fix the issue."),
24432443
full_width);
24442444
m_parent.request_extra_frame();
24452445
}
24462446
if (m_last_text_mv && m_rr.mesh_id < 0 && !is_only_text_case()) {
2447-
m_imgui->warning_text_wrapped(_L("Warning") + ":"+ _L("Detected that text did not adhere to mesh surface. Please manually drag yellow square to mesh surface that needs to be adhered."),
2447+
m_imgui->warning_text_wrapped(_L("Warning") + ": " + _L("Detected that text did not adhere to mesh surface. Please manually drag yellow square to mesh surface that needs to be adhered."),
24482448
full_width);
24492449
m_parent.request_extra_frame();
24502450
}

src/slic3r/GUI/Jobs/PlaterWorker.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class PlaterWorker: public Worker {
9090
if (eptr) try {
9191
std::rethrow_exception(eptr);
9292
} catch (std::exception &e) {
93-
show_error(m_plater, _L("An unexpected error occured") + ": " + e.what());
93+
show_error(m_plater, _L("An unexpected error occurred") + ": " + e.what());
9494
eptr = nullptr;
9595
}
9696
}

src/slic3r/GUI/MediaPlayCtrl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void MediaPlayCtrl::Play()
373373

374374
if (m_lan_proto <= MachineObject::LVL_Disable && (m_lan_mode || !m_remote_proto)) {
375375
Stop(m_lan_proto == MachineObject::LVL_None
376-
? _L("Problem occured. Please update the printer firmware and try again.")
376+
? _L("Problem occurred. Please update the printer firmware and try again.")
377377
: _L("LAN Only Liveview is off. Please turn on the liveview on printer screen."));
378378
return;
379379
}

0 commit comments

Comments
 (0)