From: Eric Kohl Date: Sun, 29 Apr 2018 15:09:37 +0000 (+0200) Subject: [WINLOGON] Localize the shutdown timeout X-Git-Tag: 0.4.9-RC~107 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ec2bfa2e1160070bdd83b080121b81c439ee7e7a [WINLOGON] Localize the shutdown timeout --- diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index c4909af9af4..d4b753de2a0 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/base/system/winlogon/lang/bg-BG.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Приготвяне за сън..." IDS_SAVEYOURSETTINGS "Записване на настройките ви..." IDS_REACTOSISSTARTINGUP "РеактОС тръгва..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 0647df45458..29f7bb22461 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Příprava k přechodu do režimu hibernace..." IDS_SAVEYOURSETTINGS "Ukládání osobního nastavení..." IDS_REACTOSISSTARTINGUP "ReactOS se spouští..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index 0c6065a3e89..8b8ca8f14f3 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Vorbereiten für den Ruhezustand..." IDS_SAVEYOURSETTINGS "Speichern Ihrer persönlichen Einstellungen..." IDS_REACTOSISSTARTINGUP "ReactOS startet..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d Tage" END STRINGTABLE diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index c1fa72745a4..4a12e0f9a73 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Γίνεται αποθήκευση των ρυθμίσεών σας..." IDS_REACTOSISSTARTINGUP "Το ReactOS ξεκινά..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 1fa1c71d8bc..151cd80e72c 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/base/system/winlogon/lang/en-US.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Saving your settings..." IDS_REACTOSISSTARTINGUP "ReactOS is starting up..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index 772184ebe3e..450d66e697a 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/base/system/winlogon/lang/es-ES.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparando para hibernar..." IDS_SAVEYOURSETTINGS "Guardando su configuración personal..." IDS_REACTOSISSTARTINGUP "ReactOS se está iniciando..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index b1f9b92512f..a551a2fb64a 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Préparation de l'hibernation..." IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." IDS_REACTOSISSTARTINGUP "Démarrage de ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index d4f37858507..0fd7515079a 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "מתכונן לשינה..." IDS_SAVEYOURSETTINGS "שומר את הגדרותיך..." IDS_REACTOSISSTARTINGUP "ReactOS מופעל..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index ef62ded49ee..110a1bde938 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." IDS_SAVEYOURSETTINGS "Beállítások mentése..." IDS_REACTOSISSTARTINGUP "A ReactOS indul..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index 129140fff33..d48ecd14c98 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Menyiapkan untuk Hibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan setelan anda..." IDS_REACTOSISSTARTINGUP "ReactOS dimulai..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index dc2ab0d8ee8..9c5556d2ed3 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparazione Hibernate..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." IDS_REACTOSISSTARTINGUP "ReactOS sta avviandosi..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index 30eeb77fb2a..5dbeabc573f 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/base/system/winlogon/lang/ja-JP.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "休止状態の準備をしています..." IDS_SAVEYOURSETTINGS "設定を保存しています..." IDS_REACTOSISSTARTINGUP "ReactOS を起動しています..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index 6aba0931c62..e217a4a57cf 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/base/system/winlogon/lang/lt-LT.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Ruošiamasi išjungti įrašant..." IDS_SAVEYOURSETTINGS "Išsaugomos nuostatos..." IDS_REACTOSISSTARTINGUP "Paleidžiama ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index 2d2bfff416a..2e5bffa4558 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Bersedia untuk berhibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan seting anda..." IDS_REACTOSISSTARTINGUP "ReactOS sedang bermula komputer anda..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index fa28236f5cc..c4ea1c70f76 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/base/system/winlogon/lang/nl-NL.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Slaapstand wordt voorbereid..." IDS_SAVEYOURSETTINGS "Persoonlijke instellingen worden opgeslagen..." IDS_REACTOSISSTARTINGUP "ReactOS is aan het opstarten..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index 0f7ef7e4b3f..56527d56bc8 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/base/system/winlogon/lang/no-NO.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Forbreder dvalemodus..." IDS_SAVEYOURSETTINGS "Lagrer innstillingene..." IDS_REACTOSISSTARTINGUP "ReactOS starter opp..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 71e8e7828c0..6bcff294018 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -56,6 +56,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawień..." IDS_REACTOSISSTARTINGUP "Trwa uruchamianie systemu ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 7715d3242c8..691855be070 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparando para Hibernar..." IDS_SAVEYOURSETTINGS "Salvando suas configurações..." IDS_REACTOSISSTARTINGUP "ReactOS está iniciando..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index d8b13f03096..30bdee4a922 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -58,6 +58,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Stare de hibernare în curs de pregătire…" IDS_SAVEYOURSETTINGS "Configurații personale în curs de păstrare…" IDS_REACTOSISSTARTINGUP "Sistem de operare în curs de pornire…" + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index e38d1ff5912..a8d1df05258 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Подготовка к переходу в спящий режим..." IDS_SAVEYOURSETTINGS "Сохраняются настройки..." IDS_REACTOSISSTARTINGUP "ReactOS загружается..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index 59447f5e04d..0b151f349a1 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -54,6 +54,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Systém sa pripravuje na prechod do režimu dlhodobého spánku..." IDS_SAVEYOURSETTINGS "Systém ukladá Vaše nastavenia..." IDS_REACTOSISSTARTINGUP "Systém ReactOS sa spúšťa..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index 699ec03d254..5051bf3745c 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -53,6 +53,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Pergatitet per letargji..." IDS_SAVEYOURSETTINGS "Ruan konfigurimin tuaj..." IDS_REACTOSISSTARTINGUP "ReactOS po fillon..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index 6f1c3e42d6d..a9451e329eb 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/base/system/winlogon/lang/sv-SE.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Förbereder för viloläge..." IDS_SAVEYOURSETTINGS "Sparar dina inställningar..." IDS_REACTOSISSTARTINGUP "ReactOS startas..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 2a3119823fc..3e7e4b609ee 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Anıkta Beklemeye Anıklanıyor..." IDS_SAVEYOURSETTINGS "Ayarlarınız Saklanıyor..." IDS_REACTOSISSTARTINGUP "ReactOS Başlatılıyor..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index d88737ca639..dfccc9ab4bd 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Підготовка до сплячого режиму..." IDS_SAVEYOURSETTINGS "Збереження параметрів..." IDS_REACTOSISSTARTINGUP "Запуск ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 346dc27fc22..328b22dd396 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -52,6 +52,8 @@ BEGIN IDS_PREPARETOHIBERNATE "正在准备休眠..." IDS_SAVEYOURSETTINGS "正在保存设置..." IDS_REACTOSISSTARTINGUP "ReactOS 正在启动..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index 580707a5c3c..a2d45339c01 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "正在準備休眠..." IDS_SAVEYOURSETTINGS "正在儲存設定..." IDS_REACTOSISSTARTINGUP "ReactOS 正在啟動..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index 41037647d12..b57902dbae1 100644 --- a/base/system/winlogon/resource.h +++ b/base/system/winlogon/resource.h @@ -33,5 +33,7 @@ #define IDS_PREPARETOHIBERNATE 1686 #define IDS_SAVEYOURSETTINGS 1687 #define IDS_REACTOSISSTARTINGUP 1690 +#define IDS_TIMEOUTSHORTFORMAT 1695 +#define IDS_TIMEOUTLONGFORMAT 1696 #define IDS_FAILEDACTIVATEUSERSHELL 1001 diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index d3b86aa1408..f708b9690a4 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -77,7 +77,8 @@ OnTimer( HWND hwndDlg, PSYS_SHUTDOWN_PARAMS pShutdownParams) { - WCHAR szBuffer[12]; + WCHAR szFormatBuffer[32]; + WCHAR szBuffer[32]; INT iSeconds, iMinutes, iHours, iDays; if (!pShutdownParams->bShuttingDown) @@ -95,12 +96,15 @@ OnTimer( iMinutes = iSeconds / 60; iSeconds -= iMinutes * 60; - swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); + LoadStringW(hAppInstance, IDS_TIMEOUTSHORTFORMAT, szFormatBuffer, ARRAYSIZE(szFormatBuffer)); + swprintf(szBuffer, szFormatBuffer, iHours, iMinutes, iSeconds); } else { iDays = (INT)(pShutdownParams->dwTimeout / SECONDS_PER_DAY); - swprintf(szBuffer, L"%d days", iDays); // FIXME: Localize + + LoadStringW(hAppInstance, IDS_TIMEOUTLONGFORMAT, szFormatBuffer, ARRAYSIZE(szFormatBuffer)); + swprintf(szBuffer, szFormatBuffer, iDays); } SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer);