From 15b1bf9ef50cd57b29d336a6095cdc5c0624e6d6 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Thu, 20 Feb 2025 20:11:47 -0300 Subject: [PATCH] Fix text on file/config overwrite dialog --- localization/i18n/OrcaSlicer.pot | 4 ++-- localization/i18n/ca/OrcaSlicer_ca.po | 8 ++++---- localization/i18n/cs/OrcaSlicer_cs.po | 8 ++++---- localization/i18n/de/OrcaSlicer_de.po | 4 ++-- localization/i18n/en/OrcaSlicer_en.po | 8 ++++---- localization/i18n/es/OrcaSlicer_es.po | 4 ++-- localization/i18n/fr/OrcaSlicer_fr.po | 4 ++-- localization/i18n/hu/OrcaSlicer_hu.po | 8 ++++---- localization/i18n/it/OrcaSlicer_it.po | 4 ++-- localization/i18n/ja/OrcaSlicer_ja.po | 8 ++++---- localization/i18n/ko/OrcaSlicer_ko.po | 4 ++-- localization/i18n/nl/OrcaSlicer_nl.po | 8 ++++---- localization/i18n/pl/OrcaSlicer_pl.po | 8 ++++---- localization/i18n/pt_BR/OrcaSlicer_pt_BR.po | 8 ++++---- localization/i18n/ru/OrcaSlicer_ru.po | 8 ++++---- localization/i18n/sv/OrcaSlicer_sv.po | 8 ++++---- localization/i18n/tr/OrcaSlicer_tr.po | 8 ++++---- localization/i18n/uk/OrcaSlicer_uk.po | 8 ++++---- localization/i18n/zh_CN/OrcaSlicer_zh_CN.po | 8 ++++---- localization/i18n/zh_TW/OrcaSlicer_zh_TW.po | 8 ++++---- src/slic3r/GUI/MainFrame.cpp | 6 +++--- 21 files changed, 71 insertions(+), 71 deletions(-) diff --git a/localization/i18n/OrcaSlicer.pot b/localization/i18n/OrcaSlicer.pot index 95cd5567fb2..c0147dd2989 100644 --- a/localization/i18n/OrcaSlicer.pot +++ b/localization/i18n/OrcaSlicer.pot @@ -4700,11 +4700,11 @@ msgid "&Help" msgstr "" #, possible-c-format, possible-boost-format -msgid "A file exists with the same name: %s, do you want to override it." +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "" #, possible-c-format, possible-boost-format -msgid "A config exists with the same name: %s, do you want to override it." +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "" msgid "Overwrite file" diff --git a/localization/i18n/ca/OrcaSlicer_ca.po b/localization/i18n/ca/OrcaSlicer_ca.po index 603194c38a4..b0a9e439cbd 100644 --- a/localization/i18n/ca/OrcaSlicer_ca.po +++ b/localization/i18n/ca/OrcaSlicer_ca.po @@ -5021,12 +5021,12 @@ msgstr "&Vista" msgid "&Help" msgstr "&Ajuda" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Existeix un fitxer amb el mateix nom: %s, el voleu sobreescriure." -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Hi ha una configuració amb el mateix nom: %s, la voleu sobreescriure." msgid "Overwrite file" diff --git a/localization/i18n/cs/OrcaSlicer_cs.po b/localization/i18n/cs/OrcaSlicer_cs.po index f82d0181be8..e3de238de54 100644 --- a/localization/i18n/cs/OrcaSlicer_cs.po +++ b/localization/i18n/cs/OrcaSlicer_cs.po @@ -4935,12 +4935,12 @@ msgstr "&Zobrazení" msgid "&Help" msgstr "&Pomoc" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Existuje soubor se stejným názvem: %s, chcete jej přepsat." -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Existuje konfigurace se stejným názvem: %s, chcete ji přepsat." msgid "Overwrite file" diff --git a/localization/i18n/de/OrcaSlicer_de.po b/localization/i18n/de/OrcaSlicer_de.po index 51c07f3a5ad..86c7cc91091 100644 --- a/localization/i18n/de/OrcaSlicer_de.po +++ b/localization/i18n/de/OrcaSlicer_de.po @@ -5076,13 +5076,13 @@ msgid "&Help" msgstr "&Hilfe" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "" "Es existiert bereits eine Datei mit demselben Namen: %s. Möchten Sie sie " "überschreiben?" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "" "Eine Konfiguration mit dem gleichen Namen existiert bereits: %s. Möchten Sie " "sie überschreiben?" diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 116f20f8279..41a120ba5c9 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -4898,12 +4898,12 @@ msgid "&Help" msgstr "&Help" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." -msgstr "A file exists with the same name: %s. Do you want to override it?" +msgid "A file exists with the same name: %s, do you want to overwrite it?" +msgstr "A file exists with the same name: %s. Do you want to overwrite it?" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." -msgstr "A config exists with the same name: %s. Do you want to override it?" +msgid "A config exists with the same name: %s, do you want to overwrite it?" +msgstr "A config exists with the same name: %s. Do you want to overwrite it?" msgid "Overwrite file" msgstr "Overwrite file" diff --git a/localization/i18n/es/OrcaSlicer_es.po b/localization/i18n/es/OrcaSlicer_es.po index f2293951079..22e172f0f2e 100644 --- a/localization/i18n/es/OrcaSlicer_es.po +++ b/localization/i18n/es/OrcaSlicer_es.po @@ -5067,11 +5067,11 @@ msgid "&Help" msgstr "Ayuda (&H)" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Existe un archivo con el mismo nombre: %s, ¿desea sobreescribirlo?." #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "" "Existe una configuración con el mismo nombre: %s, ¿desea sobreescribirla?." diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 4bc5bb05221..1e3c00fd75e 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -5063,12 +5063,12 @@ msgid "&Help" msgstr "&Aide" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "" "Il existe un fichier portant le même nom : %s. Voulez-vous le remplacer ?" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "" "Il existe une configuration portant le même nom : %s. Voulez-vous la " "remplacer ?" diff --git a/localization/i18n/hu/OrcaSlicer_hu.po b/localization/i18n/hu/OrcaSlicer_hu.po index 7d30d004579..8ae1c45aff0 100644 --- a/localization/i18n/hu/OrcaSlicer_hu.po +++ b/localization/i18n/hu/OrcaSlicer_hu.po @@ -4939,12 +4939,12 @@ msgid "&Help" msgstr "&Segítség" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." -msgstr "A file exists with the same name: %s. Do you want to override it?" +msgid "A file exists with the same name: %s, do you want to overwrite it?" +msgstr "" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." -msgstr "A config exists with the same name: %s. Do you want to override it?" +msgid "A config exists with the same name: %s, do you want to overwrite it?" +msgstr "" msgid "Overwrite file" msgstr "Overwrite file" diff --git a/localization/i18n/it/OrcaSlicer_it.po b/localization/i18n/it/OrcaSlicer_it.po index 1a4838e309b..e985c95d3f2 100644 --- a/localization/i18n/it/OrcaSlicer_it.po +++ b/localization/i18n/it/OrcaSlicer_it.po @@ -5040,11 +5040,11 @@ msgid "&Help" msgstr "&Aiuto" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Esiste un file con lo stesso nome: %s. Vuoi sovrascriverlo?" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Esiste una configurazione con lo stesso nome: %s. Vuoi sovrascriverla?" msgid "Overwrite file" diff --git a/localization/i18n/ja/OrcaSlicer_ja.po b/localization/i18n/ja/OrcaSlicer_ja.po index 92b9edc6c18..1dd9e534fd4 100644 --- a/localization/i18n/ja/OrcaSlicer_ja.po +++ b/localization/i18n/ja/OrcaSlicer_ja.po @@ -4877,12 +4877,12 @@ msgid "&Help" msgstr "ヘルプ" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." -msgstr "A file exists with the same name: %s. Do you want to override it?" +msgid "A file exists with the same name: %s, do you want to overwrite it?" +msgstr "" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." -msgstr "A config exists with the same name: %s. Do you want to override it?" +msgid "A config exists with the same name: %s, do you want to overwrite it?" +msgstr "" msgid "Overwrite file" msgstr "ファイルを上書き" diff --git a/localization/i18n/ko/OrcaSlicer_ko.po b/localization/i18n/ko/OrcaSlicer_ko.po index 8ec3603f0db..ef8d5021dcc 100644 --- a/localization/i18n/ko/OrcaSlicer_ko.po +++ b/localization/i18n/ko/OrcaSlicer_ko.po @@ -4908,11 +4908,11 @@ msgid "&Help" msgstr "도움말 (&H)" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "같은 이름을 가진 파일이 존재합니다: %s, 덮어 쓰겠습니까." #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "같은 이름을 가진 설정이 존재합니다: %s, 덮어 쓰겠습니까." msgid "Overwrite file" diff --git a/localization/i18n/nl/OrcaSlicer_nl.po b/localization/i18n/nl/OrcaSlicer_nl.po index 513d4feaeb3..e9ca7553be8 100644 --- a/localization/i18n/nl/OrcaSlicer_nl.po +++ b/localization/i18n/nl/OrcaSlicer_nl.po @@ -4978,12 +4978,12 @@ msgid "&Help" msgstr "&Help" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." -msgstr "A file exists with the same name: %s. Do you want to override it?" +msgid "A file exists with the same name: %s, do you want to overwrite it?" +msgstr "" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." -msgstr "A config exists with the same name: %s. Do you want to override it?" +msgid "A config exists with the same name: %s, do you want to overwrite it?" +msgstr "" msgid "Overwrite file" msgstr "Bestand overschrijven" diff --git a/localization/i18n/pl/OrcaSlicer_pl.po b/localization/i18n/pl/OrcaSlicer_pl.po index 4f2e2a0674f..375b51a9696 100644 --- a/localization/i18n/pl/OrcaSlicer_pl.po +++ b/localization/i18n/pl/OrcaSlicer_pl.po @@ -5021,12 +5021,12 @@ msgstr "i Widok" msgid "&Help" msgstr "i Pomoc" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Istnieje plik o tej samej nazwie: %s. Czy chcesz go nadpisać ?." -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Istnieje plik o tej samej nazwie: %s. Czy chcesz go nadpisać ?." msgid "Overwrite file" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index 8b023117bb1..d5a238c6b72 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -5015,12 +5015,12 @@ msgid "&Help" msgstr "&Ajuda" #, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." -msgstr "Existe um arquivo com o mesmo nome: %s, você deseja substituí-lo?" +msgid "A file exists with the same name: %s, do you want to overwrite it?" +msgstr "Existe um arquivo com o mesmo nome: %s, deseja substituí-lo?" #, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." -msgstr "Já existe uma configuração com o mesmo nome: %s. Deseja substituí-la?" +msgid "A config exists with the same name: %s, do you want to overwrite it?" +msgstr "Existe uma configuração com o mesmo nome: %s, deseja substituí-la?" msgid "Overwrite file" msgstr "Substituir arquivo" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 285c452820a..e5080bfb5a6 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -5084,12 +5084,12 @@ msgstr "&Вид" msgid "&Help" msgstr "&Помощь" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Файл с именем %s уже существует. Перезаписать его?" -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Конфигурация с именем %s уже существует. Перезаписать её?" msgid "Overwrite file" diff --git a/localization/i18n/sv/OrcaSlicer_sv.po b/localization/i18n/sv/OrcaSlicer_sv.po index 9a1b35193f6..ababe06b8cb 100644 --- a/localization/i18n/sv/OrcaSlicer_sv.po +++ b/localization/i18n/sv/OrcaSlicer_sv.po @@ -4908,12 +4908,12 @@ msgstr "&Visa" msgid "&Help" msgstr "&Hjälp" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Det finns en fil med samma namn: %s. Vill du åsidosätta den?" -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Det finns en konfiguration med samma namn: %s. Vill du åsidosätta den?" msgid "Overwrite file" diff --git a/localization/i18n/tr/OrcaSlicer_tr.po b/localization/i18n/tr/OrcaSlicer_tr.po index def2055d350..56c70864592 100644 --- a/localization/i18n/tr/OrcaSlicer_tr.po +++ b/localization/i18n/tr/OrcaSlicer_tr.po @@ -4978,12 +4978,12 @@ msgstr "&Görünüm" msgid "&Help" msgstr "&Yardım" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Aynı adda bir dosya var: %s, üzerine yazmak istiyor musunuz." -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Aynı adda bir yapılandırma mevcut: %s, üzerine yazmak istiyor musunuz." msgid "Overwrite file" diff --git a/localization/i18n/uk/OrcaSlicer_uk.po b/localization/i18n/uk/OrcaSlicer_uk.po index 830b5598bbb..aba4dc829fa 100644 --- a/localization/i18n/uk/OrcaSlicer_uk.po +++ b/localization/i18n/uk/OrcaSlicer_uk.po @@ -5009,12 +5009,12 @@ msgstr "&Вигляд" msgid "&Help" msgstr "&Допомога" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "Існує файл із таким же ім'ям: %s, ви хочете перевизначити його." -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "Існує конфігурація з таким же ім'ям: %s, ви хочете перевизначити її." msgid "Overwrite file" diff --git a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po index 27051c28cb1..03443a5a899 100644 --- a/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po +++ b/localization/i18n/zh_CN/OrcaSlicer_zh_CN.po @@ -4825,12 +4825,12 @@ msgstr "视图" msgid "&Help" msgstr "帮助" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "有一个同名的文件 %s。你想覆盖它吗?" -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "有一个同名的配置 %s。你想覆盖它吗?" msgid "Overwrite file" diff --git a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po index cce65f2d3db..4fafff54888 100644 --- a/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po +++ b/localization/i18n/zh_TW/OrcaSlicer_zh_TW.po @@ -4832,12 +4832,12 @@ msgstr "視角" msgid "&Help" msgstr "幫助" -#, c-format, boost-format -msgid "A file exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A file exists with the same name: %s, do you want to overwrite it?" msgstr "檔案名稱為 %s 的檔案已存在,是否要覆蓋它?" -#, c-format, boost-format -msgid "A config exists with the same name: %s, do you want to override it." +#, fuzzy, c-format, boost-format +msgid "A config exists with the same name: %s, do you want to overwrite it?" msgstr "已存在名稱為 %s 的設定檔,是否要覆蓋它?" msgid "Overwrite file" diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 38cee631f43..fac3041a211 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -3217,10 +3217,10 @@ struct ConfigsOverwriteConfirmDialog : MessageDialog { ConfigsOverwriteConfirmDialog(wxWindow *parent, wxString name, bool exported) : MessageDialog(parent, - wxString::Format(exported ? _L("A file exists with the same name: %s, do you want to override it.") : - _L("A config exists with the same name: %s, do you want to override it."), + wxString::Format(exported ? _L("A file exists with the same name: %s, do you want to overwrite it?") : + _L("A config exists with the same name: %s, do you want to overwrite it?"), name), - _L(exported ? "Overwrite file" : "Overwrite config"), + exported ? _L("Overwrite file") : _L("Overwrite config"), wxYES_NO | wxNO_DEFAULT) { add_button(wxID_YESTOALL, false, _L("Yes to All"));