Ros-diffs September 2022

ros-diffs@reactos.org

21 participants
142 discussions

[reactos] 01/01: [NOTEPAD] Follow-up of 'CJK font workaround'

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5fa4891e5fb907f4ac1a… commit a5fa4891e5fb907f4ac1ae0675422d324c7c0fb0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Sep 7 00:54:31 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Sep 7 00:54:31 2022 +0900 [NOTEPAD] Follow-up of 'CJK font workaround' - Revert some code. - Add font name comments. CORE-11700 --- base/applications/notepad/lang/ja-JP.rc | 2 +- base/applications/notepad/lang/zh-CN.rc | 2 +- base/applications/notepad/lang/zh-HK.rc | 2 +- base/applications/notepad/lang/zh-TW.rc | 2 +- base/applications/notepad/settings.c | 17 ++++++++++++++--- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 3bddaac5438..9ccc5f27419 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -167,7 +167,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d 行、%d 列" STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" - STRING_DEFAULTFONT "ＭＳゴシック" + STRING_DEFAULTFONT "ＭＳゴシック" /* MS Gothic */ STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 53ce5d64653..0fade682a67 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -174,7 +174,7 @@ BEGIN STRING_CR "Mac（CR）" STRING_LINE_COLUMN "行 %d，列 %d" STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" - STRING_DEFAULTFONT "宋体" + STRING_DEFAULTFONT "宋体" /* SimSun */ STRING_TEXT_DOCUMENT "文本文档" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index f8a42cc9ee9..cd08e43b22c 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -175,7 +175,7 @@ BEGIN STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\ 請檢查印表機是否已經開機及正確設定。" - STRING_DEFAULTFONT "新細明體" + STRING_DEFAULTFONT "新細明體" /* PMingLiU */ STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 4e0c36cdab3..a1cfd19ca4d 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -174,7 +174,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" - STRING_DEFAULTFONT "新細明體" + STRING_DEFAULTFONT "新細明體" /* PMingLiU */ STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 8eadf20d8e5..d0295937b43 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -184,11 +184,13 @@ void NOTEPAD_LoadSettingsFromRegistry(void) ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); Globals.lfFont.lfCharSet = DEFAULT_CHARSET; + Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; + Globals.lfFont.lfEscapement = 0; LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName)); - Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; - Globals.lfFont.lfWeight = FW_NORMAL; - Globals.lfFont.lfHeight = HeightFromPointSize(100); + Globals.lfFont.lfItalic = FALSE; + Globals.lfFont.lfOrientation = 0; + Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS; /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ switch (PRIMARYLANGID(GetUserDefaultLangID())) @@ -198,7 +200,16 @@ void NOTEPAD_LoadSettingsFromRegistry(void) case LANG_KOREAN: Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; break; + default: + Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + break; } + + Globals.lfFont.lfQuality = PROOF_QUALITY; + Globals.lfFont.lfStrikeOut = FALSE; + Globals.lfFont.lfUnderline = FALSE; + Globals.lfFont.lfWeight = FW_NORMAL; + Globals.lfFont.lfHeight = HeightFromPointSize(100); } hFont = CreateFontIndirect(&Globals.lfFont);

2 years, 3 months

[reactos] 01/01: [NOTEPAD] CJK font workaround

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ecf017ce2b6c6c8a6a28… commit 5ecf017ce2b6c6c8a6a28f99ea60fe340f8bd825 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 6 15:35:14 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 6 15:35:14 2022 +0900 [NOTEPAD] CJK font workaround Far East Asian users may not have suitable fixed-pitch fonts. CORE-11700 --- base/applications/notepad/settings.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 1e5e5ae9732..8eadf20d8e5 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -184,19 +184,21 @@ void NOTEPAD_LoadSettingsFromRegistry(void) ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); Globals.lfFont.lfCharSet = DEFAULT_CHARSET; - Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; - Globals.lfFont.lfEscapement = 0; LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, ARRAY_SIZE(Globals.lfFont.lfFaceName)); - Globals.lfFont.lfItalic = FALSE; - Globals.lfFont.lfOrientation = 0; - Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS; Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; - Globals.lfFont.lfQuality = PROOF_QUALITY; - Globals.lfFont.lfStrikeOut = FALSE; - Globals.lfFont.lfUnderline = FALSE; Globals.lfFont.lfWeight = FW_NORMAL; Globals.lfFont.lfHeight = HeightFromPointSize(100); + + /* WORKAROUND: Far East Asian users may not have suitable fixed-pitch fonts. */ + switch (PRIMARYLANGID(GetUserDefaultLangID())) + { + case LANG_CHINESE: + case LANG_JAPANESE: + case LANG_KOREAN: + Globals.lfFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + break; + } } hFont = CreateFontIndirect(&Globals.lfFont);

2 years, 3 months

[reactos] 01/01: [NOTEPAD] Use DEFAULT_CHARSET instead of ANSI_CHARSET

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d725449d2cf69deb3cfb… commit 2d725449d2cf69deb3cfb5f77400235ba4023de3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 6 14:21:46 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 6 14:21:46 2022 +0900 [NOTEPAD] Use DEFAULT_CHARSET instead of ANSI_CHARSET Fix the font problem. CORE-11700 --- base/applications/notepad/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index fcbcf0300b1..1e5e5ae9732 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -183,7 +183,7 @@ void NOTEPAD_LoadSettingsFromRegistry(void) ARRAY_SIZE(Globals.szFooter)); ZeroMemory(&Globals.lfFont, sizeof(Globals.lfFont)); - Globals.lfFont.lfCharSet = ANSI_CHARSET; + Globals.lfFont.lfCharSet = DEFAULT_CHARSET; Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; Globals.lfFont.lfEscapement = 0; LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName,

2 years, 3 months

[reactos] 01/01: [NOTEPAD] Add STRING_DEFAULTFONT for default font

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cef42ec44306db7c1025b… commit cef42ec44306db7c1025bf742d6871ed69bcb24c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 6 14:05:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Sep 6 14:05:59 2022 +0900 [NOTEPAD] Add STRING_DEFAULTFONT for default font CORE-11700 --- base/applications/notepad/lang/bg-BG.rc | 1 + base/applications/notepad/lang/cs-CZ.rc | 1 + base/applications/notepad/lang/da-DK.rc | 1 + base/applications/notepad/lang/de-DE.rc | 1 + base/applications/notepad/lang/el-GR.rc | 1 + base/applications/notepad/lang/en-US.rc | 1 + base/applications/notepad/lang/es-ES.rc | 1 + base/applications/notepad/lang/et-EE.rc | 1 + base/applications/notepad/lang/eu-ES.rc | 1 + base/applications/notepad/lang/fi-FI.rc | 1 + base/applications/notepad/lang/fr-FR.rc | 1 + base/applications/notepad/lang/he-IL.rc | 1 + base/applications/notepad/lang/hi-IN.rc | 1 + base/applications/notepad/lang/hr-HR.rc | 1 + base/applications/notepad/lang/hu-HU.rc | 1 + base/applications/notepad/lang/hy-AM.rc | 1 + base/applications/notepad/lang/id-ID.rc | 1 + base/applications/notepad/lang/it-IT.rc | 1 + base/applications/notepad/lang/ja-JP.rc | 1 + base/applications/notepad/lang/lt-LT.rc | 1 + base/applications/notepad/lang/ms-MY.rc | 1 + base/applications/notepad/lang/nl-NL.rc | 1 + base/applications/notepad/lang/no-NO.rc | 1 + base/applications/notepad/lang/pl-PL.rc | 1 + base/applications/notepad/lang/pt-BR.rc | 1 + base/applications/notepad/lang/pt-PT.rc | 1 + base/applications/notepad/lang/ro-RO.rc | 1 + base/applications/notepad/lang/ru-RU.rc | 1 + base/applications/notepad/lang/sk-SK.rc | 1 + base/applications/notepad/lang/sl-SI.rc | 1 + base/applications/notepad/lang/sq-AL.rc | 1 + base/applications/notepad/lang/sv-SE.rc | 1 + base/applications/notepad/lang/th-TH.rc | 1 + base/applications/notepad/lang/tr-TR.rc | 1 + base/applications/notepad/lang/uk-UA.rc | 1 + base/applications/notepad/lang/uz-UZ.rc | 1 + base/applications/notepad/lang/zh-CN.rc | 1 + base/applications/notepad/lang/zh-HK.rc | 1 + base/applications/notepad/lang/zh-TW.rc | 1 + base/applications/notepad/notepad_res.h | 1 + base/applications/notepad/settings.c | 3 ++- 41 files changed, 42 insertions(+), 1 deletion(-) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 5b900b511f3..075c3bcfd3f 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -166,6 +166,7 @@ BEGIN STRING_CR "Мак (CR)" STRING_LINE_COLUMN "Ред %d, стълб %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Възпроизводствено право 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 36fd1d28b52..ad4e4f87391 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -167,6 +167,7 @@ paměti." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Řádek %d, sloupec %d" STRING_PRINTERROR "Soubor '%s' nebylo možné vytisknout.\n\nZkontrolujte, zda je tiskárna zapnutá a správně nastavená." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Textový dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index 8ab2d8f4c07..6bb09d1e48d 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -167,6 +167,7 @@ hukommelse, og prøv så igen." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index c1c491f3e03..c8168630ddb 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -168,6 +168,7 @@ um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Zeile %d, Spalte %d" STRING_PRINTERROR "Die Datei '%s' kann nicht gedruckt werden.\n\nStellen Sie sicher, dass der Drucker angeschlossen und richtig konfiguriert ist." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Textdokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 32e23f3f00a..a9a39044505 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -167,6 +167,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 242fb18c426..3fda7325bc4 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -166,6 +166,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 3700fe740cd..786b1b3c1d9 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -169,6 +169,7 @@ aumentar la cantidad\nde memoria libre." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Línea %d, columna %d" STRING_PRINTERROR "No se puede imprimir el archivo '%s'.\n\nAsegúrese de que la impresora esté encendida y configurada correctamente." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index f5b3afa982b..625b5011163 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -174,6 +174,7 @@ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Rida %d, veerg %d" STRING_PRINTERROR "Ei suuda printida faili '%s'.\n\nVeendu et printer on sisse lülitatud ja korralikult sättestatud." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Tekstidokument" STRING_NOTEPAD_AUTHORS "Autoriõigus 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index bb082e9fbb6..c39b5d5aca6 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -167,6 +167,7 @@ memoria librearen\nkopurua handitzeko." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d linea, %d columna" STRING_PRINTERROR "'%s' fitxategia inprimatu ez ahal du.\n\nZihurtatu behar duzu inmprimagailua pistuta eta ongi konfiguratuta dago." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index d13c7ce9337..31278ed53d1 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -167,6 +167,7 @@ muistia." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 6fba3e8d9c0..35340a79710 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -167,6 +167,7 @@ de la mémoire." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Ligne %d, colonne %d" STRING_PRINTERROR "Impossible d'imprimer le fichier '%s'.\n\nVérifiez que l'imprimante est allumée et correctement configurée." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Document Texte" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index f4929cf8d5f..14208a81b3a 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -169,6 +169,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_CR "מקינטוש (CR)" STRING_LINE_COLUMN "שורה %d, עמודה %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 24ecb4b0094..f205d05538e 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -173,6 +173,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "लाइन%d, स्तंभ%d" STRING_PRINTERROR "फ़ाइल '%s' मुद्रित नहीं कर सकता।\n\n सुनिश्चित करें कि प्रिंटर चालू है और ठीक से कॉन्फ़िगर किया गया है।" + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "टेक्स्ट डॉक्यूमॅन्ट" STRING_NOTEPAD_AUTHORS "कॉपीराइट 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index 92eeafd4af5..4ec5d860647 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -173,6 +173,7 @@ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linija %d, Stupac %d" STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\nProvjerite je li pisač uključen i je li pravilno konfiguiran." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Tekstni dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index e23208079ff..cf257619dd9 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -167,6 +167,7 @@ Szeretné menteni a változásokat?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Sor: %d, oszlop: %d" STRING_PRINTERROR "Nem sikerült kinyomtatni a következő fájlt: '%s'.\n\nEllenőrizze hogy a nyomtató be van-e kapcsolva és megfelelően van-e konfigurálva." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Szöveges dokumentum" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index d14af947fd7..d6b34ddf072 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -166,6 +166,7 @@ Would you like to save the changes ?" STRING_CR "Մակինտոշ (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 594ddac068d..f080b0d01e9 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -167,6 +167,7 @@ bebas." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Baris %d, kolom %d" STRING_PRINTERROR "Tidak bisa mencetak '%s'.\n\nPastikan pencetak telah menyala dan bisa digunakan dengan benar." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Teks Dokumen" STRING_NOTEPAD_AUTHORS "Hak Cipta 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index d06b07dceb9..03f5ce48fa0 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -167,6 +167,7 @@ di memoria libera." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linea %d, colonna %d" STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Documento di testo" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 5b43cd0352e..3bddaac5438 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -167,6 +167,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d 行、%d 列" STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" + STRING_DEFAULTFONT "ＭＳゴシック" STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 040a66a6755..dd8baa3418e 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -166,6 +166,7 @@ Ar norite išsaugoti pakeitimus?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Eilutė %d, stulpelis %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "(C) 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index 9674fdef67d..24b94da7ebd 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -168,6 +168,7 @@ tugas ini.\nTutup satu atau lebih aplikasi untuk menambah jumlah\ningatan kosong STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Garisan %d, Kolum %d" STRING_PRINTERROR "Tidak boleh mencetak fail '%s'.\n\nPastikan pencetak dihidupkan dan dikonfigurasikan dengan betul." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index a0ffe227096..cd1f4f4a3a6 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -166,6 +166,7 @@ Wilt u de wijzigingen opslaan?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index b58fdf6b475..ab0b3fe71f8 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -167,6 +167,7 @@ minne." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linje %d, kolonne %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Enerett 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 708ead6edfb..2ea5139af72 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -161,6 +161,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linia %d, kolumna %d" STRING_PRINTERROR "Nie można wydrukować pliku '%s'.\n\nUpewnij się, że drukarka jest włączona i poprawnie skonfigurowana." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Dokument tekstowy" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 08f8714b570..a3012bf1ecc 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -166,6 +166,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linha %d, coluna %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 857c587bcb2..3a15441d46b 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -166,6 +166,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linha %d, coluna %d" STRING_PRINTERROR "Impossível imprimir o ficheiro '%s'.\n\nCertifique-se de que a impressora está ligada e correctamente configurada." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index cfe4487fe18..230c34a52b6 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -171,6 +171,7 @@ Păstrați modificările aduse?" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linia %d, coloana %d" STRING_PRINTERROR "Fișierul „%s” nu a putut fi imprimat.\n\nAsigurați-vă că imprimanta este pornită și configurată corespunzător." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Document text" STRING_NOTEPAD_AUTHORS "Drept de autor 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index c6c729b5fc9..916152413de 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -166,6 +166,7 @@ BEGIN STRING_CR "Macintosh (CR)" STRING_LINE_COLUMN "Строка %d, столбец %d" STRING_PRINTERROR "Невозможно распечатать файл '%s'.\n\nПроверьте, включен ли принтер, и настроен ли он правильно." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Текстовый документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 7a272f3fb41..0f5fc7ac423 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -174,6 +174,7 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Riadok %d, stĺpec %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 5dacaf8b8a9..7cb591e0df3 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -166,6 +166,7 @@ operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in posk STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 82c55454577..3381c59ffbe 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -170,6 +170,7 @@ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linje %d, kolonë %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 49160f0fc62..8f124547918 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -166,6 +166,7 @@ den här åtgärden.\nAvsluta ett eller flera program för att frigöra mer minn STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index ac24b8d2d5e..b59aeffba94 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -161,6 +161,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Line %d, column %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 5a862b887c0..1485fa6c107 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -164,6 +164,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d. Satır, %d. Sütun" STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Metin Belgesi" STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a46758205ab..312dbd390c9 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -166,6 +166,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Рядок %d, стовпчик %d" STRING_PRINTERROR "Неможливо розпечатати файл '%s'.\n\nПереконайтесь, що принтер ввімкнено, та налаштовано." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Текстовий документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index abc5f6088ce..0ed6903c641 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -166,6 +166,7 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_CR "Macintosh (CR)" STRING_LINE_COLUMN "Qator %d, Ustun %d" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_DEFAULTFONT "Lucida Console" STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 5b02a2fd733..53ce5d64653 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -174,6 +174,7 @@ BEGIN STRING_CR "Mac（CR）" STRING_LINE_COLUMN "行 %d，列 %d" STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" + STRING_DEFAULTFONT "宋体" STRING_TEXT_DOCUMENT "文本文档" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index c5e455fa877..f8a42cc9ee9 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -175,6 +175,7 @@ BEGIN STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\ 請檢查印表機是否已經開機及正確設定。" + STRING_DEFAULTFONT "新細明體" STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 2cae1d75fd9..4e0c36cdab3 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -174,6 +174,7 @@ BEGIN STRING_CR "Mac (CR)" STRING_LINE_COLUMN "第 %d 行，第 %d 字元" STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" + STRING_DEFAULTFONT "新細明體" STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index 7b463383dc8..c4556771b2e 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -100,6 +100,7 @@ #define STRING_LINE_COLUMN 0x188 #define STRING_PRINTERROR 0x189 +#define STRING_DEFAULTFONT 0x18A #define STRING_TEXT_DOCUMENT 0x200 diff --git a/base/applications/notepad/settings.c b/base/applications/notepad/settings.c index 40d8a9e7c67..fcbcf0300b1 100644 --- a/base/applications/notepad/settings.c +++ b/base/applications/notepad/settings.c @@ -186,7 +186,8 @@ void NOTEPAD_LoadSettingsFromRegistry(void) Globals.lfFont.lfCharSet = ANSI_CHARSET; Globals.lfFont.lfClipPrecision = CLIP_STROKE_PRECIS; Globals.lfFont.lfEscapement = 0; - _tcscpy(Globals.lfFont.lfFaceName, _T("Lucida Console")); + LoadString(Globals.hInstance, STRING_DEFAULTFONT, Globals.lfFont.lfFaceName, + ARRAY_SIZE(Globals.lfFont.lfFaceName)); Globals.lfFont.lfItalic = FALSE; Globals.lfFont.lfOrientation = 0; Globals.lfFont.lfOutPrecision = OUT_STRING_PRECIS;

2 years, 3 months

[reactos] 01/01: [AMSTREAM_WINETEST] Add missing dependency

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e8827a59326ce6bbfac… commit 98e8827a59326ce6bbfacf9cfbd1fd34f45bcd74 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 5 18:25:14 2022 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Mon Sep 5 18:27:25 2022 +0200 [AMSTREAM_WINETEST] Add missing dependency --- modules/rostests/winetests/amstream/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/winetests/amstream/CMakeLists.txt b/modules/rostests/winetests/amstream/CMakeLists.txt index f7808e7a204..5e7433c27a6 100644 --- a/modules/rostests/winetests/amstream/CMakeLists.txt +++ b/modules/rostests/winetests/amstream/CMakeLists.txt @@ -4,3 +4,4 @@ target_link_libraries(amstream_winetest uuid) set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32) add_rostests_file(TARGET amstream_winetest) +add_dependencies(amstream_winetest dxsdk)

2 years, 3 months

[reactos] 01/01: [NOTEPAD] Improve UTF-8 encoding support and improve status bar (#4649)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d73b6cedf2482b68afc62… commit d73b6cedf2482b68afc625aad2fae6451d47763d Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Mon Sep 5 23:21:27 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 18:21:27 2022 +0200 [NOTEPAD] Improve UTF-8 encoding support and improve status bar (#4649) - Add write support for UTF-8 without BOM. - Add "UTF-8 with BOM" encoding to the "Save As" dialog. - Show line endings and encoding on the status bar (like Notepad in Windows 10). - Remove ignored WS_EX_STATICEDGE - Add grip to the status window. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/notepad/dialog.c | 87 +++++++++++++++++++++++++++++++-- base/applications/notepad/dialog.h | 1 + base/applications/notepad/lang/bg-BG.rc | 1 + base/applications/notepad/lang/cs-CZ.rc | 1 + base/applications/notepad/lang/da-DK.rc | 1 + base/applications/notepad/lang/de-DE.rc | 1 + base/applications/notepad/lang/el-GR.rc | 1 + base/applications/notepad/lang/en-US.rc | 1 + base/applications/notepad/lang/es-ES.rc | 1 + base/applications/notepad/lang/et-EE.rc | 1 + base/applications/notepad/lang/eu-ES.rc | 1 + base/applications/notepad/lang/fi-FI.rc | 1 + base/applications/notepad/lang/fr-FR.rc | 1 + base/applications/notepad/lang/he-IL.rc | 1 + base/applications/notepad/lang/hi-IN.rc | 1 + base/applications/notepad/lang/hr-HR.rc | 1 + base/applications/notepad/lang/hu-HU.rc | 1 + base/applications/notepad/lang/hy-AM.rc | 1 + base/applications/notepad/lang/id-ID.rc | 1 + base/applications/notepad/lang/it-IT.rc | 1 + base/applications/notepad/lang/ja-JP.rc | 1 + base/applications/notepad/lang/lt-LT.rc | 1 + base/applications/notepad/lang/ms-MY.rc | 1 + base/applications/notepad/lang/nl-NL.rc | 1 + base/applications/notepad/lang/no-NO.rc | 1 + base/applications/notepad/lang/pl-PL.rc | 1 + base/applications/notepad/lang/pt-BR.rc | 1 + base/applications/notepad/lang/pt-PT.rc | 1 + base/applications/notepad/lang/ro-RO.rc | 1 + base/applications/notepad/lang/ru-RU.rc | 1 + base/applications/notepad/lang/sk-SK.rc | 1 + base/applications/notepad/lang/sl-SI.rc | 1 + base/applications/notepad/lang/sq-AL.rc | 1 + base/applications/notepad/lang/sv-SE.rc | 1 + base/applications/notepad/lang/th-TH.rc | 1 + base/applications/notepad/lang/tr-TR.rc | 1 + base/applications/notepad/lang/uk-UA.rc | 1 + base/applications/notepad/lang/uz-UZ.rc | 1 + base/applications/notepad/lang/zh-CN.rc | 1 + base/applications/notepad/lang/zh-HK.rc | 1 + base/applications/notepad/lang/zh-TW.rc | 1 + base/applications/notepad/main.c | 9 +++- base/applications/notepad/main.h | 3 +- base/applications/notepad/notepad_res.h | 23 ++++----- base/applications/notepad/text.c | 20 ++++---- 45 files changed, 154 insertions(+), 28 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 1b10084e99b..6e45d05798e 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -33,6 +33,27 @@ static const TCHAR empty_str[] = _T(""); static const TCHAR szDefaultExt[] = _T("txt"); static const TCHAR txt_files[] = _T("*.txt"); +/* Status bar parts index */ +#define SBPART_CURPOS 0 +#define SBPART_EOLN 1 +#define SBPART_ENCODING 2 + +/* Line endings - string resource ID mapping table */ +static UINT EolnToStrId[] = { + STRING_CRLF, + STRING_LF, + STRING_CR +}; + +/* Encoding - string resource ID mapping table */ +static UINT EncToStrId[] = { + STRING_ANSI, + STRING_UNICODE, + STRING_UNICODE_BE, + STRING_UTF8, + STRING_UTF8_BOM +}; + static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); VOID ShowLastError(VOID) @@ -104,6 +125,45 @@ void UpdateWindowCaption(BOOL clearModifyAlert) SetWindowText(Globals.hMainWnd, szCaption); } +VOID DIALOG_StatusBarAlignParts(VOID) +{ + static const int defaultWidths[] = {120, 120, 120}; + RECT rcStatusBar; + int parts[3]; + + GetClientRect(Globals.hStatusBar, &rcStatusBar); + + parts[0] = rcStatusBar.right - (defaultWidths[1] + defaultWidths[2]); + parts[1] = rcStatusBar.right - defaultWidths[2]; + parts[2] = -1; // the right edge of the status bar + + parts[0] = max(parts[0], defaultWidths[0]); + parts[1] = max(parts[1], defaultWidths[0] + defaultWidths[1]); + + SendMessageW(Globals.hStatusBar, SB_SETPARTS, (WPARAM)ARRAY_SIZE(parts), (LPARAM)parts); +} + +static VOID DIALOG_StatusBarUpdateLineEndings(VOID) +{ + WCHAR szText[128]; + + LoadStringW(Globals.hInstance, EolnToStrId[Globals.iEoln], szText, ARRAY_SIZE(szText)); + + SendMessageW(Globals.hStatusBar, SB_SETTEXTW, SBPART_EOLN, (LPARAM)szText); +} + +static VOID DIALOG_StatusBarUpdateEncoding(VOID) +{ + WCHAR szText[128] = L""; + + if (Globals.encFile != ENCODING_AUTO) + { + LoadStringW(Globals.hInstance, EncToStrId[Globals.encFile], szText, ARRAY_SIZE(szText)); + } + + SendMessageW(Globals.hStatusBar, SB_SETTEXTW, SBPART_ENCODING, (LPARAM)szText); +} + int DIALOG_StringMsgBox(HWND hParent, int formatId, LPCTSTR szString, DWORD dwFlags) { TCHAR szMessage[MAX_STRING_LEN]; @@ -403,6 +463,11 @@ VOID DoOpenFile(LPCTSTR szFileName) SetFileName(szFileName); UpdateWindowCaption(TRUE); NOTEPAD_EnableSearchMenu(); + + /* Update line endings and encoding on the status bar */ + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); + done: if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); @@ -497,6 +562,9 @@ DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) LoadString(Globals.hInstance, STRING_UTF8, szText, ARRAY_SIZE(szText)); SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + LoadString(Globals.hInstance, STRING_UTF8_BOM, szText, ARRAY_SIZE(szText)); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM) szText); + SendMessage(hCombo, CB_SETCURSEL, Globals.encFile, 0); hCombo = GetDlgItem(hDlg, ID_EOLN); @@ -562,6 +630,11 @@ BOOL DIALOG_FileSaveAs(VOID) if (DoSaveFile()) { UpdateWindowCaption(TRUE); + + /* Update line endings and encoding on the status bar */ + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); + return TRUE; } else @@ -852,7 +925,7 @@ VOID DoCreateStatusBar(VOID) if (Globals.hStatusBar == NULL) { /* Try to create the status bar */ - Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, + Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, NULL, Globals.hMainWnd, CMD_STATUSBAR_WND_ID); @@ -865,9 +938,6 @@ VOID DoCreateStatusBar(VOID) /* Load the string for formatting column/row text output */ LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH - 1); - - /* Set the status bar for single-text output */ - SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } /* Set status bar visiblity according to the settings. */ @@ -916,8 +986,15 @@ VOID DoCreateStatusBar(VOID) TRUE); } + /* Set the status bar for multiple-text output */ + DIALOG_StatusBarAlignParts(); + /* Update content with current row/column text */ DIALOG_StatusBarUpdateCaretPos(); + + /* Update line endings and encoding on the status bar */ + DIALOG_StatusBarUpdateLineEndings(); + DIALOG_StatusBarUpdateEncoding(); } VOID DoCreateEditWindow(VOID) @@ -1195,7 +1272,7 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID) col = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0); _stprintf(buff, Globals.szStatusBarLineCol, line + 1, col + 1); - SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); + SendMessage(Globals.hStatusBar, SB_SETTEXT, SBPART_CURPOS, (LPARAM)buff); } VOID DIALOG_ViewStatusBar(VOID) diff --git a/base/applications/notepad/dialog.h b/base/applications/notepad/dialog.h index 98104dcc6e5..3d5572cfad7 100644 --- a/base/applications/notepad/dialog.h +++ b/base/applications/notepad/dialog.h @@ -46,6 +46,7 @@ VOID DIALOG_GoTo(VOID); VOID DIALOG_SelectFont(VOID); VOID DIALOG_ViewStatusBar(VOID); +VOID DIALOG_StatusBarAlignParts(VOID); VOID DIALOG_StatusBarUpdateCaretPos(VOID); VOID DIALOG_HelpContents(VOID); diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index d17e24ab300..5b900b511f3 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -160,6 +160,7 @@ BEGIN STRING_UNICODE "Уникод" STRING_UNICODE_BE "Уникод (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Уьиндоуьс (CR + LF)" STRING_LF "Юникс (LF)" STRING_CR "Мак (CR)" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 1338063e8e9..36fd1d28b52 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -161,6 +161,7 @@ paměti." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index f24b93562cb..8ab2d8f4c07 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -161,6 +161,7 @@ hukommelse, og prøv så igen." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 12304456c6f..c1c491f3e03 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -162,6 +162,7 @@ um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (Big-Endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index c27cb97636a..32e23f3f00a 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -161,6 +161,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 6f284bdbf21..242fb18c426 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -160,6 +160,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index a22083ca956..3700fe740cd 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -163,6 +163,7 @@ aumentar la cantidad\nde memoria libre." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 3df808c417e..f5b3afa982b 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -168,6 +168,7 @@ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index 0923ac47c4d..bb082e9fbb6 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -161,6 +161,7 @@ memoria librearen\nkopurua handitzeko." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index a12be32822e..d13c7ce9337 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -161,6 +161,7 @@ muistia." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 29bac1aa9c9..6fba3e8d9c0 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -161,6 +161,7 @@ de la mémoire." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index 63c3a2c2f46..f4929cf8d5f 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -163,6 +163,7 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_UNICODE "יוניקוד" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "חלונות (CR + LF)" STRING_LF "יוניקס (LF)" STRING_CR "מקינטוש (CR)" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index abb0c2810fd..24ecb4b0094 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -167,6 +167,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index fa683dd091d..92eeafd4af5 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -167,6 +167,7 @@ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 48d1086851f..e23208079ff 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -161,6 +161,7 @@ Szeretné menteni a változásokat?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index 7c82d538f26..d14af947fd7 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -160,6 +160,7 @@ Would you like to save the changes ?" STRING_UNICODE "Յունիկոդ" STRING_UNICODE_BE "Յունիկոդ (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Պատւոհաններ (CR + LF)" STRING_LF "Յունիքս (LF)" STRING_CR "Մակինտոշ (CR)" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 32f002e078a..594ddac068d 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -161,6 +161,7 @@ bebas." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index b239f11b7e8..d06b07dceb9 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -161,6 +161,7 @@ di memoria libera." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index ad1359f9aca..5b43cd0352e 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -161,6 +161,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 494161c1eb3..040a66a6755 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -160,6 +160,7 @@ Ar norite išsaugoti pakeitimus?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index 26787eeb4ef..9674fdef67d 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -162,6 +162,7 @@ tugas ini.\nTutup satu atau lebih aplikasi untuk menambah jumlah\ningatan kosong STRING_UNICODE "Unikod" STRING_UNICODE_BE "Unikod (endian besar)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index d6c30f26403..a0ffe227096 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -160,6 +160,7 @@ Wilt u de wijzigingen opslaan?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index ae83e8a270c..b58fdf6b475 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -161,6 +161,7 @@ minne." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 70c29377898..708ead6edfb 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -155,6 +155,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 1ba2f1788b5..08f8714b570 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -160,6 +160,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 5e597417040..857c587bcb2 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -160,6 +160,7 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index a032dc0d67e..cfe4487fe18 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -165,6 +165,7 @@ Păstrați modificările aduse?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 4ebb9037727..c6c729b5fc9 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -160,6 +160,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (Big Endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Macintosh (CR)" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 730ac82e4b9..7a272f3fb41 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -168,6 +168,7 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (veľký indián)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index a694e53c068..5dacaf8b8a9 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -160,6 +160,7 @@ operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in posk STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 542b5b93936..82c55454577 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -164,6 +164,7 @@ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 6536306b1e7..49160f0fc62 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -160,6 +160,7 @@ den här åtgärden.\nAvsluta ett eller flera program för att frigöra mer minn STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index ed6277314a8..ac24b8d2d5e 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -155,6 +155,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 (มี BOM)" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 391b0e70d83..5a862b887c0 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -158,6 +158,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (Büyük Sonlu)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index 8c39417b9ec..a46758205ab 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -160,6 +160,7 @@ BEGIN STRING_UNICODE "Юнікод" STRING_UNICODE_BE "Юнікод (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index e6857a5f546..abc5f6088ce 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -160,6 +160,7 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Macintosh (CR)" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index de8877d9f17..5b02a2fd733 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -168,6 +168,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode（大端）" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows（CR + LF）" STRING_LF "Unix（LF）" STRING_CR "Mac（CR）" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index 6a47644ff58..c5e455fa877 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -168,6 +168,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode（大端序）" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index db550b17012..2cae1d75fd9 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -168,6 +168,7 @@ BEGIN STRING_UNICODE "Unicode" STRING_UNICODE_BE "Unicode (big endian)" STRING_UTF8 "UTF-8" + STRING_UTF8_BOM "UTF-8 with BOM" STRING_CRLF "Windows (CR + LF)" STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 3fed529fb3e..42bf2493911 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -427,8 +427,13 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) LOWORD(wParam), SWP_NOZORDER); - if (hdwp != NULL) - EndDeferWindowPos(hdwp); + if (hdwp == NULL) + break; + + EndDeferWindowPos(hdwp); + + /* Align status bar parts, only if the status bar resize operation succeeds */ + DIALOG_StatusBarAlignParts(); } else SetWindowPos(Globals.hEdit, diff --git a/base/applications/notepad/main.h b/base/applications/notepad/main.h index 349be218118..ce7fc850877 100644 --- a/base/applications/notepad/main.h +++ b/base/applications/notepad/main.h @@ -40,7 +40,8 @@ typedef enum ENCODING_ANSI = 0, ENCODING_UTF16LE = 1, ENCODING_UTF16BE = 2, - ENCODING_UTF8 = 3 + ENCODING_UTF8 = 3, + ENCODING_UTF8BOM = 4 } ENCODING; // #define MIN_ENCODING 0 diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index b53ff22cb57..7b463383dc8 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -88,17 +88,18 @@ #define STRING_OUT_OF_MEMORY 0x17C #define STRING_CANNOTFIND 0x17D -#define STRING_ANSI 0x17E -#define STRING_UNICODE 0x17F -#define STRING_UNICODE_BE 0x180 -#define STRING_UTF8 0x181 - -#define STRING_CRLF 0x182 -#define STRING_LF 0x183 -#define STRING_CR 0x184 - -#define STRING_LINE_COLUMN 0x186 -#define STRING_PRINTERROR 0x187 +#define STRING_ANSI 0x180 +#define STRING_UNICODE 0x181 +#define STRING_UNICODE_BE 0x182 +#define STRING_UTF8 0x183 +#define STRING_UTF8_BOM 0x184 + +#define STRING_CRLF 0x185 +#define STRING_LF 0x186 +#define STRING_CR 0x187 + +#define STRING_LINE_COLUMN 0x188 +#define STRING_PRINTERROR 0x189 #define STRING_TEXT_DOCUMENT 0x200 diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 0afdde89b6c..6a83a89d64f 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -140,7 +140,7 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, } else if ((dwSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) { - encFile = ENCODING_UTF8; + encFile = ENCODING_UTF8BOM; dwPos += 3; } else @@ -166,10 +166,11 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, case ENCODING_ANSI: case ENCODING_UTF8: - if (encFile == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (encFile == ENCODING_UTF8) + case ENCODING_UTF8BOM: + if (encFile == ENCODING_UTF8 || encFile == ENCODING_UTF8BOM) iCodePage = CP_UTF8; + else + iCodePage = CP_ACP; if ((dwSize - dwPos) > 0) { @@ -312,10 +313,11 @@ static BOOL WriteEncodedText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENC case ENCODING_ANSI: case ENCODING_UTF8: - if (encFile == ENCODING_ANSI) - iCodePage = CP_ACP; - else if (encFile == ENCODING_UTF8) + case ENCODING_UTF8BOM: + if (encFile == ENCODING_UTF8 || encFile == ENCODING_UTF8BOM) iCodePage = CP_UTF8; + else + iCodePage = CP_ACP; iRequiredBytes = WideCharToMultiByte(iCodePage, 0, &pszText[dwPos], dwTextLen - dwPos, NULL, 0, NULL, NULL); if (iRequiredBytes <= 0) @@ -371,8 +373,8 @@ BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, ENCODING encFile, LPCWSTR pszLF = L"\n"; DWORD dwPos, dwNext; - /* Write the proper byte order marks if not ANSI */ - if (encFile != ENCODING_ANSI) + /* Write the proper byte order marks if not ANSI or UTF-8 without BOM */ + if (encFile != ENCODING_ANSI && encFile != ENCODING_UTF8) { wcBom = 0xFEFF; if (!WriteEncodedText(hFile, &wcBom, 1, encFile))

2 years, 3 months

[reactos] 01/01: [DESKADP] Add Russian (ru-RU) translation. Addendum to cb6b07ee.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b70fff80879d2b568efe… commit 6b70fff80879d2b568efec57877c80275aca9325 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Sep 5 16:24:16 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Sep 5 16:24:16 2022 +0300 [DESKADP] Add Russian (ru-RU) translation. Addendum to cb6b07ee. --- dll/shellext/deskadp/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/deskadp/lang/ru-RU.rc b/dll/shellext/deskadp/lang/ru-RU.rc index c2b193bb9e6..fb064c19416 100644 --- a/dll/shellext/deskadp/lang/ru-RU.rc +++ b/dll/shellext/deskadp/lang/ru-RU.rc @@ -45,5 +45,5 @@ BEGIN IDS_16BPP "Высокое (16 бит)" IDS_24BPP "Самое высокое (24 бита)" IDS_32BPP "Самое высокое (32 бита)" - IDS_NOTAVAIL "Not Available" + IDS_NOTAVAIL "Нет данных" END

2 years, 3 months

[reactos] 01/01: [DESKADP] Improve default display of advanced adapter properties (#4665)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb6b07eec8ad1ac323d52… commit cb6b07eec8ad1ac323d52586469b00644e2202be Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Sep 5 15:01:41 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 15:01:41 2022 +0200 [DESKADP] Improve default display of advanced adapter properties (#4665) + fix caption width in french resources. --- dll/shellext/deskadp/deskadp.c | 25 +++++++++++++++++++------ dll/shellext/deskadp/lang/bg-BG.rc | 1 + dll/shellext/deskadp/lang/cs-CZ.rc | 1 + dll/shellext/deskadp/lang/de-DE.rc | 1 + dll/shellext/deskadp/lang/el-GR.rc | 1 + dll/shellext/deskadp/lang/en-US.rc | 1 + dll/shellext/deskadp/lang/es-ES.rc | 1 + dll/shellext/deskadp/lang/eu-ES.rc | 1 + dll/shellext/deskadp/lang/fr-FR.rc | 23 ++++++++++++----------- dll/shellext/deskadp/lang/he-IL.rc | 1 + dll/shellext/deskadp/lang/hi-IN.rc | 1 + dll/shellext/deskadp/lang/it-IT.rc | 1 + dll/shellext/deskadp/lang/no-NO.rc | 1 + dll/shellext/deskadp/lang/pl-PL.rc | 1 + dll/shellext/deskadp/lang/pt-PT.rc | 1 + dll/shellext/deskadp/lang/ro-RO.rc | 1 + dll/shellext/deskadp/lang/ru-RU.rc | 1 + dll/shellext/deskadp/lang/sk-SK.rc | 1 + dll/shellext/deskadp/lang/sq-AL.rc | 1 + dll/shellext/deskadp/lang/tr-TR.rc | 1 + dll/shellext/deskadp/lang/uk-UA.rc | 1 + dll/shellext/deskadp/lang/zh-CN.rc | 1 + dll/shellext/deskadp/lang/zh-HK.rc | 1 + dll/shellext/deskadp/lang/zh-TW.rc | 1 + dll/shellext/deskadp/resource.h | 1 + 25 files changed, 54 insertions(+), 17 deletions(-) diff --git a/dll/shellext/deskadp/deskadp.c b/dll/shellext/deskadp/deskadp.c index a247f5e79a7..ba55d444103 100644 --- a/dll/shellext/deskadp/deskadp.c +++ b/dll/shellext/deskadp/deskadp.c @@ -291,7 +291,8 @@ static VOID InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This) { LPTSTR lpAdapterName; - + TCHAR lpNA[64]; + This->lpDeviceId = QueryDeskCplString(This->pdtobj, RegisterClipboardFormat(DESK_EXT_DISPLAYID)); EnableWindow(GetDlgItem(This->hwndDlg, @@ -308,28 +309,40 @@ InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This) LocalFree((HLOCAL)lpAdapterName); } + LoadString(hInstance, + IDS_NOTAVAIL, + lpNA, + _countof(lpNA)); + if (This->DeskExtInterface != NULL) { SetDlgItemTextW(This->hwndDlg, IDC_CHIPTYPE, - This->DeskExtInterface->ChipType); + *(This->DeskExtInterface->ChipType) ? This->DeskExtInterface->ChipType : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_DACTYPE, - This->DeskExtInterface->DacType); + *(This->DeskExtInterface->DacType) ? This->DeskExtInterface->DacType : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_MEMORYSIZE, - This->DeskExtInterface->MemorySize); + *(This->DeskExtInterface->MemorySize) ? This->DeskExtInterface->MemorySize : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_ADAPTERSTRING, - This->DeskExtInterface->AdapterString); + *(This->DeskExtInterface->AdapterString) ? This->DeskExtInterface->AdapterString : lpNA); SetDlgItemTextW(This->hwndDlg, IDC_BIOSINFORMATION, - This->DeskExtInterface->BiosString); + *(This->DeskExtInterface->BiosString) ? This->DeskExtInterface->BiosString : lpNA); This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); } else + { This->lpDevModeOnInit = NULL; + SetDlgItemTextW(This->hwndDlg, IDC_CHIPTYPE, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_DACTYPE, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_MEMORYSIZE, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_ADAPTERSTRING, lpNA); + SetDlgItemTextW(This->hwndDlg, IDC_BIOSINFORMATION, lpNA); + } This->lpSelDevMode = This->lpDevModeOnInit; } diff --git a/dll/shellext/deskadp/lang/bg-BG.rc b/dll/shellext/deskadp/lang/bg-BG.rc index 54a38b67eaa..226c92a30fe 100644 --- a/dll/shellext/deskadp/lang/bg-BG.rc +++ b/dll/shellext/deskadp/lang/bg-BG.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Висока цветност (16 разряда)" IDS_24BPP "Истинска цветност (24 разряда)" IDS_32BPP "Истинска цветност (32 разряда)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/cs-CZ.rc b/dll/shellext/deskadp/lang/cs-CZ.rc index 79bd343a8b0..ce635d65fb3 100644 --- a/dll/shellext/deskadp/lang/cs-CZ.rc +++ b/dll/shellext/deskadp/lang/cs-CZ.rc @@ -50,4 +50,5 @@ BEGIN IDS_16BPP "High Color (16 bitů)" IDS_24BPP "True Color (24 bitů)" IDS_32BPP "True Color (32 bitů)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/de-DE.rc b/dll/shellext/deskadp/lang/de-DE.rc index db59fff9e2f..268f2267ce4 100644 --- a/dll/shellext/deskadp/lang/de-DE.rc +++ b/dll/shellext/deskadp/lang/de-DE.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 Bit)" IDS_24BPP "True Color (24 Bit)" IDS_32BPP "True Color (32 Bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/el-GR.rc b/dll/shellext/deskadp/lang/el-GR.rc index 315ddc88d98..23336e3fbe5 100644 --- a/dll/shellext/deskadp/lang/el-GR.rc +++ b/dll/shellext/deskadp/lang/el-GR.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Πολλά χρώματα (16 bit)" IDS_24BPP "Φυσικά χρώματα (24 bit)" IDS_32BPP "Φυσικά χρώματα (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/en-US.rc b/dll/shellext/deskadp/lang/en-US.rc index 3e9b7227607..71d5237f7a9 100644 --- a/dll/shellext/deskadp/lang/en-US.rc +++ b/dll/shellext/deskadp/lang/en-US.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/es-ES.rc b/dll/shellext/deskadp/lang/es-ES.rc index 704da2f0ace..3293fc82519 100644 --- a/dll/shellext/deskadp/lang/es-ES.rc +++ b/dll/shellext/deskadp/lang/es-ES.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "Color de alto contraste (16 bit)" IDS_24BPP "Color verdadero (24 bit)" IDS_32BPP "Color verdadero (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/eu-ES.rc b/dll/shellext/deskadp/lang/eu-ES.rc index 0e926b955e9..178c95a0744 100644 --- a/dll/shellext/deskadp/lang/eu-ES.rc +++ b/dll/shellext/deskadp/lang/eu-ES.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Kontraste handiko kolorea (16 bit)" IDS_24BPP "Benetako kolorea (24 bit)" IDS_32BPP "Benetako kolorea (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/fr-FR.rc b/dll/shellext/deskadp/lang/fr-FR.rc index 812d55ffcea..f2edf43b85b 100644 --- a/dll/shellext/deskadp/lang/fr-FR.rc +++ b/dll/shellext/deskadp/lang/fr-FR.rc @@ -10,17 +10,17 @@ BEGIN LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Propriétés", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Informations sur l'adaptateur", -1, 7, 56, 237, 75 - LTEXT "Type de puce:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX - LTEXT "Type de CNA:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX - LTEXT "Taille de la mémoire:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX - LTEXT "Texte de l'adaptateur:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX - LTEXT "Informations du BIOS:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX - PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 75, 14 + LTEXT "Type de puce :", -1, 13, 68, 85, 8 + LTEXT "", IDC_CHIPTYPE, 87, 68, 148, 8, SS_NOPREFIX + LTEXT "Type de CNA :", -1, 13, 80, 85, 8 + LTEXT "", IDC_DACTYPE, 87, 80, 148, 8, SS_NOPREFIX + LTEXT "Taille de la mémoire :", -1, 13, 92, 85, 8 + LTEXT "", IDC_MEMORYSIZE, 87, 92, 148, 8, SS_NOPREFIX + LTEXT "Adaptateur :", -1, 13, 104, 85, 8 + LTEXT "", IDC_ADAPTERSTRING, 87, 104, 148, 8, SS_NOPREFIX + LTEXT "Informations du BIOS :", -1, 13, 116, 85, 8 + LTEXT "", IDC_BIOSINFORMATION, 87, 116, 148, 8, SS_NOPREFIX + PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 80, 14 END IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Couleurs élevées (16 bit)" IDS_24BPP "Vraies couleurs (24 bit)" IDS_32BPP "Vraies couleurs (32 bit)" + IDS_NOTAVAIL "Non disponible" END diff --git a/dll/shellext/deskadp/lang/he-IL.rc b/dll/shellext/deskadp/lang/he-IL.rc index cd9d89f7bb9..d9fda3723b0 100644 --- a/dll/shellext/deskadp/lang/he-IL.rc +++ b/dll/shellext/deskadp/lang/he-IL.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "צבעים גבוהים (16 סיביות)" IDS_24BPP "צבעים מלאים (24 סיביות)" IDS_32BPP "צבעים מלאים (32 סיביות)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/hi-IN.rc b/dll/shellext/deskadp/lang/hi-IN.rc index 921a1008b39..44717d95ab8 100644 --- a/dll/shellext/deskadp/lang/hi-IN.rc +++ b/dll/shellext/deskadp/lang/hi-IN.rc @@ -52,4 +52,5 @@ BEGIN IDS_16BPP "उच्च कलर (16 बिट)" IDS_24BPP "ट्रू कलर (24 बिट)" IDS_32BPP "ट्रू कलर (32 बिट)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/it-IT.rc b/dll/shellext/deskadp/lang/it-IT.rc index 7290cdde97f..79f6ce9b2d6 100644 --- a/dll/shellext/deskadp/lang/it-IT.rc +++ b/dll/shellext/deskadp/lang/it-IT.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/no-NO.rc b/dll/shellext/deskadp/lang/no-NO.rc index 4177b6b2687..3cb248bc027 100644 --- a/dll/shellext/deskadp/lang/no-NO.rc +++ b/dll/shellext/deskadp/lang/no-NO.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Middels farger (16 bit)" IDS_24BPP "Høyest farger (24 bit)" IDS_32BPP "Høyest farger (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/pl-PL.rc b/dll/shellext/deskadp/lang/pl-PL.rc index 4d7fb520861..2b28c09cd49 100644 --- a/dll/shellext/deskadp/lang/pl-PL.rc +++ b/dll/shellext/deskadp/lang/pl-PL.rc @@ -54,4 +54,5 @@ BEGIN IDS_16BPP "64k kolorów (16 bitów)" IDS_24BPP "16m kolorów (24 bity)" IDS_32BPP "16m +kanał alfa (32 bity)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/pt-PT.rc b/dll/shellext/deskadp/lang/pt-PT.rc index bec057f42f1..a765064da21 100644 --- a/dll/shellext/deskadp/lang/pt-PT.rc +++ b/dll/shellext/deskadp/lang/pt-PT.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/ro-RO.rc b/dll/shellext/deskadp/lang/ro-RO.rc index 7b85d35c40a..e0358c515af 100644 --- a/dll/shellext/deskadp/lang/ro-RO.rc +++ b/dll/shellext/deskadp/lang/ro-RO.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "Culoare de înaltă calitate (16 biți)" IDS_24BPP "Calitate fotografică (24 biți)" IDS_32BPP "Calitate fotografică (32 biți)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/ru-RU.rc b/dll/shellext/deskadp/lang/ru-RU.rc index 0ea1e2ec1a3..c2b193bb9e6 100644 --- a/dll/shellext/deskadp/lang/ru-RU.rc +++ b/dll/shellext/deskadp/lang/ru-RU.rc @@ -45,4 +45,5 @@ BEGIN IDS_16BPP "Высокое (16 бит)" IDS_24BPP "Самое высокое (24 бита)" IDS_32BPP "Самое высокое (32 бита)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/sk-SK.rc b/dll/shellext/deskadp/lang/sk-SK.rc index d13982add2d..7a1e19d045f 100644 --- a/dll/shellext/deskadp/lang/sk-SK.rc +++ b/dll/shellext/deskadp/lang/sk-SK.rc @@ -52,4 +52,5 @@ BEGIN IDS_16BPP "Veľa farieb (16 bit)" IDS_24BPP "Pravé farby (24 bit)" IDS_32BPP "Pravé farby (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/sq-AL.rc b/dll/shellext/deskadp/lang/sq-AL.rc index 7c4bb085907..e4901706abb 100644 --- a/dll/shellext/deskadp/lang/sq-AL.rc +++ b/dll/shellext/deskadp/lang/sq-AL.rc @@ -49,4 +49,5 @@ BEGIN IDS_16BPP "High Color (16 bit)" IDS_24BPP "True Color (24 bit)" IDS_32BPP "True Color (32 bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/tr-TR.rc b/dll/shellext/deskadp/lang/tr-TR.rc index 611ee9eab75..7d0ed9eef5c 100644 --- a/dll/shellext/deskadp/lang/tr-TR.rc +++ b/dll/shellext/deskadp/lang/tr-TR.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "Yüksek Renk (16 Bit)" IDS_24BPP "Gerçek Renk (24 Bit)" IDS_32BPP "Gerçek Renk (32 Bit)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/uk-UA.rc b/dll/shellext/deskadp/lang/uk-UA.rc index e83a84dc281..f98d60ae05d 100644 --- a/dll/shellext/deskadp/lang/uk-UA.rc +++ b/dll/shellext/deskadp/lang/uk-UA.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "High Color (16 біт)" IDS_24BPP "True Color (24 біти)" IDS_32BPP "True Color (32 біти)" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/zh-CN.rc b/dll/shellext/deskadp/lang/zh-CN.rc index 8395369b33c..eb08d41cc12 100644 --- a/dll/shellext/deskadp/lang/zh-CN.rc +++ b/dll/shellext/deskadp/lang/zh-CN.rc @@ -47,4 +47,5 @@ BEGIN IDS_16BPP "增强色（16 位）" IDS_24BPP "真彩色（24 位）" IDS_32BPP "真彩色（32 位）" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/zh-HK.rc b/dll/shellext/deskadp/lang/zh-HK.rc index 5272e476bf9..bbb370f85c0 100644 --- a/dll/shellext/deskadp/lang/zh-HK.rc +++ b/dll/shellext/deskadp/lang/zh-HK.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "增強色（16 位）" IDS_24BPP "真彩色（24 位）" IDS_32BPP "真彩色（32 位）" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/lang/zh-TW.rc b/dll/shellext/deskadp/lang/zh-TW.rc index 34365353f71..aefd9ed2fc6 100644 --- a/dll/shellext/deskadp/lang/zh-TW.rc +++ b/dll/shellext/deskadp/lang/zh-TW.rc @@ -53,4 +53,5 @@ BEGIN IDS_16BPP "增強色（16 位）" IDS_24BPP "真彩色（24 位）" IDS_32BPP "真彩色（32 位）" + IDS_NOTAVAIL "Not Available" END diff --git a/dll/shellext/deskadp/resource.h b/dll/shellext/deskadp/resource.h index 7e3b06b83ff..13eadf83651 100644 --- a/dll/shellext/deskadp/resource.h +++ b/dll/shellext/deskadp/resource.h @@ -24,3 +24,4 @@ #define IDS_16BPP 107 #define IDS_24BPP 108 #define IDS_32BPP 109 +#define IDS_NOTAVAIL 110

2 years, 3 months

[reactos] 01/01: [TRANSLATION] Croatian translation of games (Solitare and Spider) (#4664)

by Andrej Bartulin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b0417d48eee02bfb9a2c… commit 3b0417d48eee02bfb9a2cf844306d7bedf2aa5b9 Author: Andrej Bartulin <andrej.bartulinvr(a)gmail.com> AuthorDate: Mon Sep 5 14:58:00 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 5 14:58:00 2022 +0200 [TRANSLATION] Croatian translation of games (Solitare and Spider) (#4664) --- base/applications/games/solitaire/lang/hr-HR.rc | 92 +++++++++++++++++++++++++ base/applications/games/solitaire/rsrc.rc | 3 + base/applications/games/spider/lang/hr-HR.rc | 80 +++++++++++++++++++++ base/applications/games/spider/rsrc.rc | 3 + 4 files changed, 178 insertions(+) diff --git a/base/applications/games/solitaire/lang/hr-HR.rc b/base/applications/games/solitaire/lang/hr-HR.rc new file mode 100644 index 00000000000..0f38cca40d2 --- /dev/null +++ b/base/applications/games/solitaire/lang/hr-HR.rc @@ -0,0 +1,92 @@ +/* + * PROJECT: ReactOS Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * PURPOSE: Croatian resource file + * TRANSLATOR: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Opcije" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Kartice", -1, 7, 7, 90, 40 + AUTORADIOBUTTON "Nacrtaj &jednu", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Nacrtaj &tri", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 + GROUPBOX "Rezultat", -1, 100, 7, 75, 53 + AUTORADIOBUTTON "&Standardno", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 + AUTORADIOBUTTON "&Ništa", IDC_OPT_NOSCORE, 107, 45, 60, 10 + AUTOCHECKBOX "&Pokaži vrijeme", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP + AUTOCHECKBOX "Sta&tusna traka", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "&Zadrži rezultat", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + DEFPUSHBUTTON "U redu", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Odustani", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 345, 185 +CAPTION "Odaberite stražnju stranu kartice" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71 + DEFPUSHBUTTON "U redu", IDOK, 114, 165, 54, 14 + PUSHBUTTON "Odustani", IDCANCEL, 176, 165, 54, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire od J Brown\n\nCardLib verzija 1.0." + IDS_SOL_QUIT "Napusti trenutnu igru?" + IDS_SOL_WIN "Čestitke, pobijedili ste!" + IDS_SOL_DEAL "Ponovi?" + IDS_SOL_SCORE "Rezultat: %d" + IDS_SOL_TIME "Vrijeme: %d" +END + +/* Menus */ + +IDR_MENU1 MENU +BEGIN + POPUP "&Igra" + BEGIN + MENUITEM "Po&kreni\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Poništi", IDM_GAME_UNDO, GRAYED + MENUITEM "Špi&l...", IDM_GAME_DECK + MENUITEM "&Opcije...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Izađi", IDM_GAME_EXIT + END + POPUP "&Pomoć" + BEGIN + MENUITEM "&Sadržaj\tF1", IDM_HELP_CONTENTS + MENUITEM "&O Solitaire", IDM_HELP_ABOUT + END +END + +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END diff --git a/base/applications/games/solitaire/rsrc.rc b/base/applications/games/solitaire/rsrc.rc index 2cbb326ccd9..3e4c6af2684 100644 --- a/base/applications/games/solitaire/rsrc.rc +++ b/base/applications/games/solitaire/rsrc.rc @@ -42,6 +42,9 @@ IDI_SOLITAIRE ICON "solitaire.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif diff --git a/base/applications/games/spider/lang/hr-HR.rc b/base/applications/games/spider/lang/hr-HR.rc new file mode 100644 index 00000000000..1812d575de4 --- /dev/null +++ b/base/applications/games/spider/lang/hr-HR.rc @@ -0,0 +1,80 @@ +/* + * PROJECT: Spider Solitaire + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Croatian resource file + * TRANSLATOR: Copyright 2022 Andrej Bartulin <andrej.bartulinvr(a)gmail.com> + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_CROATIAN_CROATIA + +/* Dialogs */ + +IDD_CARDBACK DIALOGEX 6, 6, 345, 185 +CAPTION "Odaberite zadnju stranu kartice" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71 + DEFPUSHBUTTON "U redu", IDOK, 114, 165, 54, 14 + PUSHBUTTON "Odustani", IDCANCEL, 176, 165, 54, 14 +END + +IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Težina" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "Lagano: &Jedna boja", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Srednje: &Dvije boje", IDC_DIF_TWOCOLORS, 8, 23, 80, 10 + AUTORADIOBUTTON "Teško: Č&etiri boje", IDC_DIF_FOURCOLORS, 8, 36, 80, 10 + DEFPUSHBUTTON "U redu", IDOK, 8, 58, 40, 14 + PUSHBUTTON "Odustani", IDCANCEL, 58, 58, 40, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SPI_NAME "Spider" + IDS_SPI_ABOUT "Spider Solitaire od Gregor Schneider\n\nCardLib verzija 1.0" + IDS_SPI_QUIT "Napusti trenutnu igru?" + IDS_SPI_WIN "Čestitke, pobijedili ste!" + IDS_SPI_DEAL "Ponovno?" +END + +/* Menus */ + +IDR_MENU1 MENU +BEGIN + POPUP "&Igra" + BEGIN + MENUITEM "&Nova igra\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "Š&pil...", IDM_GAME_DECK + MENUITEM SEPARATOR + MENUITEM "&Izađi", IDM_GAME_EXIT + END + POPUP "&Pomoć" + BEGIN + MENUITEM "&Sadržaj\tF1", IDM_HELP_CONTENTS + MENUITEM "&O Spider-u", IDM_HELP_ABOUT + END +END + +/* Accelerator */ +IDR_ACCELERATOR1 ACCELERATORS +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END diff --git a/base/applications/games/spider/rsrc.rc b/base/applications/games/spider/rsrc.rc index d268d89069e..40e5b53ae82 100644 --- a/base/applications/games/spider/rsrc.rc +++ b/base/applications/games/spider/rsrc.rc @@ -33,6 +33,9 @@ IDI_SPIDER ICON "spider.ico" #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HR_HR + #include "lang/hr-HR.rc" +#endif #ifdef LANGUAGE_HU_HU #include "lang/hu-HU.rc" #endif

2 years, 3 months

[reactos] 01/01: [NEWDEV] Improve Japanese translation (ja-JP)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b03ca35fb50dfa171e5ff… commit b03ca35fb50dfa171e5ff75d4c5ffdec84fd85e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 5 11:41:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 5 11:41:25 2022 +0900 [NEWDEV] Improve Japanese translation (ja-JP) --- dll/win32/newdev/lang/ja-JP.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/newdev/lang/ja-JP.rc b/dll/win32/newdev/lang/ja-JP.rc index c165295844d..92a86f5aaec 100644 --- a/dll/win32/newdev/lang/ja-JP.rc +++ b/dll/win32/newdev/lang/ja-JP.rc @@ -88,10 +88,10 @@ END STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New Hardware Wizard" - IDS_UPDATEWIZARDTITLE "Update Driver Wizard" - IDS_CHSOURCE_TITLE "Choose search and install options" - IDS_SEARCHDRV_TITLE "Searching..." - IDS_INSTALLDRV_TITLE "Installing..." - IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." + IDS_INSTALLWIZARDTITLE "新しいハードウェアのウィザード" + IDS_UPDATEWIZARDTITLE "ドライバ更新のウィザード" + IDS_CHSOURCE_TITLE "検索対象とインストールオプションを選んで下さい。" + IDS_SEARCHDRV_TITLE "検索中..." + IDS_INSTALLDRV_TITLE "インストール中..." + IDS_BROWSE_FOR_FOLDER_TITLE "このハードウェアに対する適切なドライバを含むフォルダを選択して下さい。" END

2 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2022