Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync codes to 1.10.0.73 #5002

Merged
merged 2 commits into from
Oct 15, 2024
Merged

sync codes to 1.10.0.73 #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
801ae9a
ENH:Update some translations
walterwongbbl Oct 15, 2024
97e39d7
ci: update build version to 01.10.00.73
Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion bbl/i18n/BambuStudio.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -4574,6 +4574,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/cs/BambuStudio_cs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: 2023-10-18 10:45+0800\n"
"Last-Translator: René Mošner <renemosner@seznam.cz>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -4756,6 +4756,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/de/BambuStudio_de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4926,6 +4926,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/en/BambuStudio_en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -4823,6 +4823,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/es/BambuStudio_es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4901,6 +4901,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/fr/BambuStudio_fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4907,6 +4907,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/hu/BambuStudio_hu.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4872,6 +4872,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/it/BambuStudio_it.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4882,6 +4882,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/ja/BambuStudio_ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4758,6 +4758,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/ko/BambuStudio_ko.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4774,6 +4774,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/nl/BambuStudio_nl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4901,6 +4901,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/pl/BambuStudio_pl.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4891,6 +4891,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/pt-BR/BambuStudio_pt-BR.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -4869,6 +4869,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/ru/BambuStudio_ru.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.9.7.52 Public Official\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: 2024-09-27 23:58+0700\n"
"Last-Translator: \n"
"Language-Team: Andylg <andylg@yandex.ru>\n"
Expand Down Expand Up @@ -4984,6 +4984,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/sv/BambuStudio_sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -4840,6 +4840,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/tr/BambuStudio_tr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: 2024-09-29 02:13+0300\n"
"Last-Translator: Fatih AYDIN <fatihaydin5228@gmail.com>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -4858,6 +4858,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/uk/BambuStudio_uk.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Bambu Studio\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: BambuLab Україна\n"
Expand Down Expand Up @@ -4877,6 +4877,9 @@ msgstr ""
msgid "Are you sure you want to trigger auto homing?"
msgstr ""

msgid "Homing"
msgstr ""

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
5 changes: 4 additions & 1 deletion bbl/i18n/zh_cn/BambuStudio_zh_CN.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Slic3rPE\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-14 20:57+0800\n"
"POT-Creation-Date: 2024-10-15 16:47+0800\n"
"PO-Revision-Date: 2024-03-21 10:39+0800\n"
"Last-Translator: Jiang Yue <maze1024@gmail.com>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -4685,6 +4685,9 @@ msgstr "自动回中"
msgid "Are you sure you want to trigger auto homing?"
msgstr "确定触发自动回中吗？"

msgid "Homing"
msgstr "回中"

msgid ""
"Please heat the nozzle to above 170 degree before loading or unloading "
"filament."
Expand Down
Binary file modified resources/i18n/zh_cn/BambuStudio.mo
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/slic3r/GUI/StatusPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3275,7 +3275,7 @@ void StatusPanel::on_axis_ctrl_xy(wxCommandEvent &event)
if (axis_go_home_dlg == nullptr) {
axis_go_home_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Auto homing"));
axis_go_home_dlg->update_text(_L("Are you sure you want to trigger auto homing?"));
axis_go_home_dlg->m_button_ok->SetLabel("Homing");
axis_go_home_dlg->m_button_ok->SetLabel(_L("Homing"));
axis_go_home_dlg->Bind(EVT_SECONDARY_CHECK_CONFIRM, [this](wxCommandEvent& e) {
if (obj) {
BOOST_LOG_TRIVIAL(info) << "Axis have go home";
Expand Down
2 changes: 1 addition & 1 deletion version.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ endif()

# The build_version should start from 50 in master branch

set(SLIC3R_VERSION "01.10.00.72")
set(SLIC3R_VERSION "01.10.00.73")

string(REPLACE "." "," SLIC3R_COMMA_SEPARATED_VERSION ${SLIC3R_VERSION})
set(SLIC3R_COMMA_SEPARATED_VERSION "${SLIC3R_COMMA_SEPARATED_VERSION}")
Loading