diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 61ab7d2b16..ca12f08ad3 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -4155,7 +4155,7 @@ msgstr "" msgid "Assembly Return" msgstr "" -msgid "return" +msgid "Return" msgstr "" msgid "Paint Toolbar" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index 96646dde82..347a39e2e3 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -4475,8 +4475,8 @@ msgstr "Seleccioneu Placar" msgid "Assembly Return" msgstr "Tornar a Agrupar" -msgid "return" -msgstr "tornar" +msgid "Return" +msgstr "Tornar" msgid "Paint Toolbar" msgstr "Barra d'eines de pintura" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index eaa3c2cf49..127143996e 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -4381,7 +4381,7 @@ msgstr "Vybrat Podložku" msgid "Assembly Return" msgstr "Návrat k sestavení" -msgid "return" +msgid "Return" msgstr "Návrat" msgid "Paint Toolbar" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 1cbc91cf3c..c63e2026a2 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -4520,7 +4520,7 @@ msgstr "Druckplatte wählen" msgid "Assembly Return" msgstr "Zurücksetzen der Montage" -msgid "return" +msgid "Return" msgstr "Zurück" msgid "Paint Toolbar" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 59e19f9476..85340084c0 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -4221,7 +4221,7 @@ msgstr "" msgid "Assembly Return" msgstr "" -msgid "return" +msgid "Return" msgstr "" msgid "Paint Toolbar" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index e67e825714..be6825d30c 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -4501,8 +4501,8 @@ msgstr "Seleccionr Bandeja" msgid "Assembly Return" msgstr "Volver a agrupar" -msgid "return" -msgstr "volver" +msgid "Return" +msgstr "Volver" msgid "Paint Toolbar" msgstr "Barra de herramientas de pintura" diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 9e56b2ea1c..58ab3ad1a9 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -4508,8 +4508,8 @@ msgstr "Sélectionner le plateau" msgid "Assembly Return" msgstr "Retour d'assemblage" -msgid "return" -msgstr "retour" +msgid "Return" +msgstr "Retour" msgid "Paint Toolbar" msgstr "Barre d'outils de peinture" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index e849e8e5a5..7bc4ae8066 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -4323,8 +4323,8 @@ msgstr "Tálca kiválasztása" msgid "Assembly Return" msgstr "Vissza az összeszereléshez" -msgid "return" -msgstr "vissza" +msgid "Return" +msgstr "Vissza" msgid "Paint Toolbar" msgstr "Festés eszköztár" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 837c8ef6d4..ccc1b119f7 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -4507,8 +4507,8 @@ msgstr "Seleziona Piatto" msgid "Assembly Return" msgstr "Ritorna al montaggio" -msgid "return" -msgstr "indietro" +msgid "Return" +msgstr "Indietro" msgid "Paint Toolbar" msgstr "Barra strumenti di pittura" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 0bce755a07..5e3cdadb68 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -4258,7 +4258,7 @@ msgstr "プレートを選択" msgid "Assembly Return" msgstr "戻る" -msgid "return" +msgid "Return" msgstr "戻る" msgid "Paint Toolbar" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index a4f44e1915..64e1138857 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -4355,7 +4355,7 @@ msgstr "플레이트 선택" msgid "Assembly Return" msgstr "조립 되돌리기" -msgid "return" +msgid "Return" msgstr "돌아가기" msgid "Paint Toolbar" diff --git a/localization/i18n/lt/OrcaSlicer_lt.po b/localization/i18n/lt/OrcaSlicer_lt.po index c577115c2c..633e0ef0a3 100644 --- a/localization/i18n/lt/OrcaSlicer_lt.po +++ b/localization/i18n/lt/OrcaSlicer_lt.po @@ -4459,8 +4459,8 @@ msgstr "Pasirinkti plokštę" msgid "Assembly Return" msgstr "Sugrąžinti surinkimą" -msgid "return" -msgstr "grąžinti" +msgid "Return" +msgstr "Grąžinti" msgid "Paint Toolbar" msgstr "Piešimo įrankių juosta" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index f76a72491f..4a438b2b3b 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -4376,7 +4376,7 @@ msgstr "Printbed selecteren" msgid "Assembly Return" msgstr "Montage terug" -msgid "return" +msgid "Return" msgstr "Terug" msgid "Paint Toolbar" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index aebf1ec5fb..5b6d0cc74c 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -4463,8 +4463,8 @@ msgstr "Wybierz płytę" msgid "Assembly Return" msgstr "Powrót do montażu" -msgid "return" -msgstr "wróć" +msgid "Return" +msgstr "Wróć" msgid "Paint Toolbar" msgstr "Pasek narzędzi do malowania" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 3df3f6171a..5423da39d7 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -4467,8 +4467,8 @@ msgstr "Selecionar Placa" msgid "Assembly Return" msgstr "Retornar à Montagem" -msgid "return" -msgstr "retornar" +msgid "Return" +msgstr "Retornar" msgid "Paint Toolbar" msgstr "Barra de Ferramentas de Pintura" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index ea804ea347..b8d74dde7e 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -4521,7 +4521,7 @@ msgstr "Выбор печатной пластины" msgid "Assembly Return" msgstr "Выйти из сборки" -msgid "return" +msgid "Return" msgstr "Назад" msgid "Paint Toolbar" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 15cee8df7f..6b80d894d0 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -4321,8 +4321,8 @@ msgstr "Välj Byggplatta" msgid "Assembly Return" msgstr "Monterings retur" -msgid "return" -msgstr "tillbaka" +msgid "Return" +msgstr "Tillbaka" msgid "Paint Toolbar" msgstr "Färgläggningsverktyg" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index 2031ab46e6..9e0321190f 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -4427,8 +4427,8 @@ msgstr "Plaka Seç" msgid "Assembly Return" msgstr "Montaj İptali" -msgid "return" -msgstr "geri dön" +msgid "Return" +msgstr "Geri dön" msgid "Paint Toolbar" msgstr "Boyama Araç Çubuğu" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 9cafd4a05f..4d2d844d9f 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -4465,8 +4465,8 @@ msgstr "Вибрати пластину" msgid "Assembly Return" msgstr "Повернення збірки" -msgid "return" -msgstr "повернення" +msgid "Return" +msgstr "Повернення" msgid "Paint Toolbar" msgstr "Панель інструментів малювання" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 1ff69c32e7..2b8a23c4c5 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -4275,7 +4275,7 @@ msgstr "选择盘" msgid "Assembly Return" msgstr "退出装配体视图" -msgid "return" +msgid "Return" msgstr "返回" msgid "Paint Toolbar" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index 012d351c65..2bb42e2bdb 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -4283,7 +4283,7 @@ msgstr "選擇列印板" msgid "Assembly Return" msgstr "退出組裝視角" -msgid "return" +msgid "Return" msgstr "返回" msgid "Paint Toolbar" diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index 779aed4951..5142701577 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -840,7 +840,7 @@ void AuxiliaryPanel::init_tabpanel() std::pair(wxColour(0, 137, 123), StateColor::Pressed), std::pair(wxColour(38, 166, 154), StateColor::Hovered), std::pair(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->SetBackgroundColor(btn_bg_green); back_btn->SetTextColor(StateColor (std::pair(wxColour("#FDFFFD"), StateColor::Normal))); // ORCA fixes color change on text. icon stays white color but text changes to black without this diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 3e207b0d03..a1e7f55b9c 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -8252,7 +8252,7 @@ void GLCanvas3D::_render_return_toolbar() const ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.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) wxPostEvent(m_canvas, SimpleEvent(EVT_GLVIEWTOOLBAR_3D)); const_cast(&m_gizmos)->reset_all_states();