3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-06 22:47:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use proper case for "return" (#9831)
Some checks failed
Build all / Build All (push) Has been cancelled
Details
Build all / Flatpak (push) Has been cancelled
Details
Publish docs to Wiki / Publish docs to Wiki (push) Has been cancelled
Details

Browse source 
init
This commit is contained in:
yw4z 2025-06-10 04:42:06 +03:00 • committed by GitHub
parent 3b2fa4469a
commit a60b65367a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
localization/i18n/OrcaSlicer.pot
View file

@ -4155,7 +4155,7 @@ msgstr ""
msgid "Assembly Return" msgid "Assembly Return"
msgstr "" msgstr ""
msgid "return" msgid "Return"
msgstr "" msgstr ""
msgid "Paint Toolbar" msgid "Paint Toolbar"

4
localization/i18n/ca/OrcaSlicer_ca.po
View file

@ -4475,8 +4475,8 @@ msgstr "Seleccioneu Placar"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Tornar a Agrupar" msgstr "Tornar a Agrupar"
msgid "return" msgid "Return"
msgstr "tornar" msgstr "Tornar"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Barra d'eines de pintura" msgstr "Barra d'eines de pintura"

2
localization/i18n/cs/OrcaSlicer_cs.po
View file

@ -4381,7 +4381,7 @@ msgstr "Vybrat Podložku"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Návrat k sestavení" msgstr "Návrat k sestavení"
msgid "return" msgid "Return"
msgstr "Návrat" msgstr "Návrat"
msgid "Paint Toolbar" msgid "Paint Toolbar"

2
localization/i18n/de/OrcaSlicer_de.po
View file

@ -4520,7 +4520,7 @@ msgstr "Druckplatte wählen"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Zurücksetzen der Montage" msgstr "Zurücksetzen der Montage"
msgid "return" msgid "Return"
msgstr "Zurück" msgstr "Zurück"
msgid "Paint Toolbar" msgid "Paint Toolbar"

2
localization/i18n/en/OrcaSlicer_en.po
View file

@ -4221,7 +4221,7 @@ msgstr ""
msgid "Assembly Return" msgid "Assembly Return"
msgstr "" msgstr ""
msgid "return" msgid "Return"
msgstr "" msgstr ""
msgid "Paint Toolbar" msgid "Paint Toolbar"

4
localization/i18n/es/OrcaSlicer_es.po
View file

@ -4501,8 +4501,8 @@ msgstr "Seleccionr Bandeja"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Volver a agrupar" msgstr "Volver a agrupar"
msgid "return" msgid "Return"
msgstr "volver" msgstr "Volver"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Barra de herramientas de pintura" msgstr "Barra de herramientas de pintura"

4
localization/i18n/fr/OrcaSlicer_fr.po
View file

@ -4508,8 +4508,8 @@ msgstr "Sélectionner le plateau"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Retour d'assemblage" msgstr "Retour d'assemblage"
msgid "return" msgid "Return"
msgstr "retour" msgstr "Retour"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Barre d'outils de peinture" msgstr "Barre d'outils de peinture"

4
localization/i18n/hu/OrcaSlicer_hu.po
View file

@ -4323,8 +4323,8 @@ msgstr "Tálca kiválasztása"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Vissza az összeszereléshez" msgstr "Vissza az összeszereléshez"
msgid "return" msgid "Return"
msgstr "vissza" msgstr "Vissza"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Festés eszköztár" msgstr "Festés eszköztár"

4
localization/i18n/it/OrcaSlicer_it.po
View file

@ -4507,8 +4507,8 @@ msgstr "Seleziona Piatto"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Ritorna al montaggio" msgstr "Ritorna al montaggio"
msgid "return" msgid "Return"
msgstr "indietro" msgstr "Indietro"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Barra strumenti di pittura" msgstr "Barra strumenti di pittura"

2
localization/i18n/ja/OrcaSlicer_ja.po
View file

@ -4258,7 +4258,7 @@ msgstr "プレートを選択"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "戻る" msgstr "戻る"
msgid "return" msgid "Return"
msgstr "戻る" msgstr "戻る"
msgid "Paint Toolbar" msgid "Paint Toolbar"

2
localization/i18n/ko/OrcaSlicer_ko.po
View file

@ -4355,7 +4355,7 @@ msgstr "플레이트 선택"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "조립 되돌리기" msgstr "조립 되돌리기"
msgid "return" msgid "Return"
msgstr "돌아가기" msgstr "돌아가기"
msgid "Paint Toolbar" msgid "Paint Toolbar"

4
localization/i18n/lt/OrcaSlicer_lt.po
View file

@ -4459,8 +4459,8 @@ msgstr "Pasirinkti plokštę"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Sugrąžinti surinkimą" msgstr "Sugrąžinti surinkimą"
msgid "return" msgid "Return"
msgstr "grąžinti" msgstr "Grąžinti"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Piešimo įrankių juosta" msgstr "Piešimo įrankių juosta"

2
localization/i18n/nl/OrcaSlicer_nl.po
View file

@ -4376,7 +4376,7 @@ msgstr "Printbed selecteren"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Montage terug" msgstr "Montage terug"
msgid "return" msgid "Return"
msgstr "Terug" msgstr "Terug"
msgid "Paint Toolbar" msgid "Paint Toolbar"

4
localization/i18n/pl/OrcaSlicer_pl.po
View file

@ -4463,8 +4463,8 @@ msgstr "Wybierz płytę"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Powrót do montażu" msgstr "Powrót do montażu"
msgid "return" msgid "Return"
msgstr "wróć" msgstr "Wróć"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Pasek narzędzi do malowania" msgstr "Pasek narzędzi do malowania"

4
localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
View file

@ -4467,8 +4467,8 @@ msgstr "Selecionar Placa"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Retornar à Montagem" msgstr "Retornar à Montagem"
msgid "return" msgid "Return"
msgstr "retornar" msgstr "Retornar"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Barra de Ferramentas de Pintura" msgstr "Barra de Ferramentas de Pintura"

2
localization/i18n/ru/OrcaSlicer_ru.po
View file

@ -4521,7 +4521,7 @@ msgstr "Выбор печатной пластины"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Выйти из сборки" msgstr "Выйти из сборки"
msgid "return" msgid "Return"
msgstr "Назад" msgstr "Назад"
msgid "Paint Toolbar" msgid "Paint Toolbar"

4
localization/i18n/sv/OrcaSlicer_sv.po
View file

@ -4321,8 +4321,8 @@ msgstr "Välj Byggplatta"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Monterings retur" msgstr "Monterings retur"
msgid "return" msgid "Return"
msgstr "tillbaka" msgstr "Tillbaka"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Färgläggningsverktyg" msgstr "Färgläggningsverktyg"

4
localization/i18n/tr/OrcaSlicer_tr.po
View file

@ -4427,8 +4427,8 @@ msgstr "Plaka Seç"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Montaj İptali" msgstr "Montaj İptali"
msgid "return" msgid "Return"
msgstr "geri dön" msgstr "Geri dön"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Boyama Araç Çubuğu" msgstr "Boyama Araç Çubuğu"

4
localization/i18n/uk/OrcaSlicer_uk.po
View file

@ -4465,8 +4465,8 @@ msgstr "Вибрати пластину"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "Повернення збірки" msgstr "Повернення збірки"
msgid "return" msgid "Return"
msgstr "повернення" msgstr "Повернення"
msgid "Paint Toolbar" msgid "Paint Toolbar"
msgstr "Панель інструментів малювання" msgstr "Панель інструментів малювання"

2
localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
View file

@ -4275,7 +4275,7 @@ msgstr "选择盘"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "退出装配体视图" msgstr "退出装配体视图"
msgid "return" msgid "Return"
msgstr "返回" msgstr "返回"
msgid "Paint Toolbar" msgid "Paint Toolbar"

2
localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
View file

@ -4283,7 +4283,7 @@ msgstr "選擇列印板"
msgid "Assembly Return" msgid "Assembly Return"
msgstr "退出組裝視角" msgstr "退出組裝視角"
msgid "return" msgid "Return"
msgstr "返回" msgstr "返回"
msgid "Paint Toolbar" msgid "Paint Toolbar"

2
src/slic3r/GUI/Auxiliary.cpp
View file

@ -840,7 +840,7 @@ void AuxiliaryPanel::init_tabpanel()
std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed), std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered), std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)); std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal));
auto back_btn = new Button(this, _L("return"), "assemble_return", wxBORDER_NONE | wxBU_LEFT | wxBU_EXACTFIT); auto back_btn = new Button(this, _L("Return"), "assemble_return", wxBORDER_NONE | wxBU_LEFT | wxBU_EXACTFIT);
back_btn->SetSize(wxSize(FromDIP(220), FromDIP(18))); back_btn->SetSize(wxSize(FromDIP(220), FromDIP(18)));
back_btn->SetBackgroundColor(btn_bg_green); back_btn->SetBackgroundColor(btn_bg_green);
back_btn->SetTextColor(StateColor (std::pair<wxColour, int>(wxColour("#FDFFFD"), StateColor::Normal))); // ORCA fixes color change on text. icon stays white color but text changes to black without this back_btn->SetTextColor(StateColor (std::pair<wxColour, int>(wxColour("#FDFFFD"), StateColor::Normal))); // ORCA fixes color change on text. icon stays white color but text changes to black without this

2
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -8252,7 +8252,7 @@ void GLCanvas3D::_render_return_toolbar() const
ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
ImVec2 margin = ImVec2(10.0f, 5.0f); ImVec2 margin = ImVec2(10.0f, 5.0f);
if (ImGui::ImageTextButton(real_size,_utf8(L("return")).c_str(), m_return_toolbar.get_return_texture_id(), button_icon_size, uv0, uv1, -1, bg_col, tint_col, margin)) { if (ImGui::ImageTextButton(real_size,_utf8(L("Return")).c_str(), m_return_toolbar.get_return_texture_id(), button_icon_size, uv0, uv1, -1, bg_col, tint_col, margin)) {
if (m_canvas != nullptr) if (m_canvas != nullptr)
wxPostEvent(m_canvas, SimpleEvent(EVT_GLVIEWTOOLBAR_3D)); wxPostEvent(m_canvas, SimpleEvent(EVT_GLVIEWTOOLBAR_3D));
const_cast<GLGizmosManager*>(&m_gizmos)->reset_all_states(); const_cast<GLGizmosManager*>(&m_gizmos)->reset_all_states();