Ros-diffs July 2019

ros-diffs@reactos.org

22 participants
146 discussions

[reactos] 01/01: [WIN32SS][NTGDI][NTUSER] Make gusLanguageID USHORT (#1776)
by Katayama Hirofumi MZ 31 Jul '19

31 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6642dbc470721468d44ac… commit 6642dbc470721468d44acdf27211ea53c35f9e3b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 31 22:24:01 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 31 22:24:01 2019 +0900 [WIN32SS][NTGDI][NTUSER] Make gusLanguageID USHORT (#1776) Every language ID is an unsigned integer. - Make gusLanguageID unsigned. - Make the return value type of UserGetLanguageID unsigned. --- win32ss/gdi/ntgdi/misc.h | 4 ++-- win32ss/user/ntuser/main.c | 2 +- win32ss/user/ntuser/misc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/ntgdi/misc.h b/win32ss/gdi/ntgdi/misc.h index 12c7a73351d..eb25a53467e 100644 --- a/win32ss/gdi/ntgdi/misc.h +++ b/win32ss/gdi/ntgdi/misc.h @@ -21,9 +21,9 @@ extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave, extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave); extern HGDIOBJ StockObjects[]; -extern SHORT gusLanguageID; +extern USHORT gusLanguageID; -SHORT FASTCALL UserGetLanguageID(VOID); +USHORT FASTCALL UserGetLanguageID(VOID); PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID); diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 9e63ce8f22e..27964ba20fb 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -26,7 +26,7 @@ NTSTATUS GdiThreadDestroy(PETHREAD Thread); PSERVERINFO gpsi = NULL; // Global User Server Information. -SHORT gusLanguageID; +USHORT gusLanguageID; PPROCESSINFO ppiScrnSaver; PPROCESSINFO gppiList = NULL; diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 78408cac7a7..03707cd8829 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -91,7 +91,7 @@ UserGetLanguageToggle(VOID) return dwValue; } -SHORT +USHORT FASTCALL UserGetLanguageID(VOID) { @@ -137,7 +137,7 @@ UserGetLanguageID(VOID) ZwClose(KeyHandle); } TRACE("Language ID = %x\n",Ret); - return (SHORT) Ret; + return (USHORT) Ret; } HBRUSH

1 0

[reactos] 01/01: [FREETYPE] Improve font rendering with font hinting workaround (#1771)
by Katayama Hirofumi MZ 31 Jul '19

31 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87279857bbc581a6ad31e… commit 87279857bbc581a6ad31e8b73588739ea15d9049 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 31 21:57:42 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 31 21:57:42 2019 +0900 [FREETYPE] Improve font rendering with font hinting workaround (#1771) CORE-15762, CORE-16232 It seems some fonts are blurry or in bad rendering because of FreeType Font Hinting implementation. This PR is subpixel2.patch from CORE-16232, based on the following comment: https://bugs.launchpad.net/ubuntu/+source/freetype/+bug/1722508/comments/29 --- sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h b/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h index 28888510811..ae2c8bc3883 100644 --- a/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h +++ b/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h @@ -118,7 +118,7 @@ FT_BEGIN_HEADER /* rendering technology that produces excellent output without LCD */ /* filtering. */ /* */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING /*************************************************************************/ @@ -654,7 +654,7 @@ FT_BEGIN_HEADER /* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */ /* */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */ -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */

1 0

[reactos] 01/01: [SETUP] Add codepage-specific font substitutes (#1772)
by Katayama Hirofumi MZ 31 Jul '19

31 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cfe7f84bbc85cd303a72… commit 4cfe7f84bbc85cd303a72d7aecd302d46014128f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 31 17:43:08 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 31 17:43:08 2019 +0900 [SETUP] Add codepage-specific font substitutes (#1772) Add codepage-specific font substitutes for i18n. CORE-16266 --- base/setup/lib/muifonts.h | 150 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 150dee0e61b..a01176ac088 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -4,8 +4,18 @@ MUI_SUBFONT LatinFonts[] = { /*Font Substitute */ { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Georgia", L"FreeSerif" }, @@ -21,6 +31,11 @@ MUI_SUBFONT LatinFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -29,8 +44,18 @@ MUI_SUBFONT LatinFonts[] = MUI_SUBFONT CyrillicFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, { L"Georgia", L"FreeSerif" }, @@ -46,6 +71,11 @@ MUI_SUBFONT CyrillicFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -54,8 +84,18 @@ MUI_SUBFONT CyrillicFonts[] = MUI_SUBFONT GreekFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, { L"Georgia", L"FreeSerif" }, @@ -71,6 +111,11 @@ MUI_SUBFONT GreekFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -79,8 +124,18 @@ MUI_SUBFONT GreekFonts[] = MUI_SUBFONT HebrewFonts[] = { { L"Arial", L"DejaVu Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, { L"Georgia", L"FreeSerif" }, @@ -96,6 +151,11 @@ MUI_SUBFONT HebrewFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"Ubuntu", L"Tahoma" }, @@ -110,8 +170,18 @@ WCHAR CSF_LocalName4[] = {'M', 'S', 0x5B8B, 0x4F53, 0}; /* MS Song */ MUI_SUBFONT ChineseSimplifiedFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, @@ -133,6 +203,11 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -152,8 +227,18 @@ WCHAR CTF_LocalName3[] = {0x83EF, 0x5EB7, 0x7C97, 0x660E, 0x9AD4, 0}; /* D MUI_SUBFONT ChineseTraditionalFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"DLCMingBold", L"Droid Sans Fallback" }, { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, @@ -176,6 +261,11 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -194,8 +284,18 @@ WCHAR JF_LocalName3[] = {0xFF2D, 0xFF33, ' ', 0xFF30, 0x30B4, 0x30B7, 0x30C3, 0x MUI_SUBFONT JapaneseFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, @@ -217,6 +317,11 @@ MUI_SUBFONT JapaneseFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -237,10 +342,20 @@ WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */ MUI_SUBFONT KoreanFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Batang", L"Droid Sans Fallback" }, { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, @@ -262,6 +377,11 @@ MUI_SUBFONT KoreanFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -278,8 +398,18 @@ MUI_SUBFONT KoreanFonts[] = MUI_SUBFONT UnicodeFonts[] = { { L"Arial", L"DejaVu Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"DejaVu Sans Mono" }, { L"Courier New", L"DejaVu Sans Mono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Georgia", L"FreeSerif" }, @@ -295,6 +425,11 @@ MUI_SUBFONT UnicodeFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL } @@ -304,8 +439,18 @@ MUI_SUBFONT HindiFonts[] = { /*Font Substitute */ { L"Arial", L"Liberation Sans" }, + { L"Arial Baltic,186", L"Arial,186" }, + { L"Arial CE,238", L"Arial,238" }, + { L"Arial CYR,204", L"Arial,204" }, + { L"Arial Greek,161", L"Arial,161" }, + { L"Arial TUR,162", L"Arial,162" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"Courier New Baltic,186", L"Courier New,186" }, + { L"Courier New CE,238", L"Courier New,238" }, + { L"Courier New CYR,204", L"Courier New,204" }, + { L"Courier New Greek,161", L"Courier New,161" }, + { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, { L"Georgia", L"FreeSerif" }, @@ -321,6 +466,11 @@ MUI_SUBFONT HindiFonts[] = { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, + { L"Times New Roman Baltic,186", L"Times New Roman,186" }, + { L"Times New Roman CE,238", L"Times New Roman,238" }, + { L"Times New Roman CYR,204", L"Times New Roman,204" }, + { L"Times New Roman Greek,161", L"Times New Roman,161" }, + { L"Times New Roman TUR,162", L"Times New Roman,162" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { NULL, NULL }

1 0

[reactos] 01/01: [INTL] Addendum to CORE-16252
by Joachim Henze 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e581e44a9365f1b9f115… commit 3e581e44a9365f1b9f11541b1258a14ebce4f26f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jul 31 01:58:42 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jul 31 01:58:42 2019 +0200 [INTL] Addendum to CORE-16252 That change was not intended.in commit 0.4.13-dev-740-g 8b67edd8fa2b51d7d5a710e8867123246b72f524 Thx to Stas'M for noticing the windres warning. --- dll/cpl/intl/lang/pt-BR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/intl/lang/pt-BR.rc b/dll/cpl/intl/lang/pt-BR.rc index ea41f64031b..585a56d1241 100644 --- a/dll/cpl/intl/lang/pt-BR.rc +++ b/dll/cpl/intl/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION

1 0

[reactos] 01/01: [INPUT][INTL][SYSSETUP] Limit Combobox height CORE-16252
by Joachim Henze 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b67edd8fa2b51d7d5a71… commit 8b67edd8fa2b51d7d5a710e8867123246b72f524 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Jul 30 23:12:24 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Jul 30 23:14:31 2019 +0200 [INPUT][INTL][SYSSETUP] Limit Combobox height CORE-16252 v6 comboboxes default to displaying up to 30entries and give a bad user experience in 2nd stage where we usually have low vertical screen resolution. Therefore limit the height of the expanded boxes to bring us close to how they were drawn before 0.4.12-dev-882-g e3e173ffaafbccb0e9b52926d41626d5a4dc38cd Adding CBS_NOINTEGRALHEIGHT gives similar result for both: comctl32 v5 and v6 comboboxes. --- dll/cpl/input/lang/bg-BG.rc | 4 ++-- dll/cpl/input/lang/cs-CZ.rc | 4 ++-- dll/cpl/input/lang/de-DE.rc | 4 ++-- dll/cpl/input/lang/el-GR.rc | 4 ++-- dll/cpl/input/lang/en-US.rc | 4 ++-- dll/cpl/input/lang/es-ES.rc | 4 ++-- dll/cpl/input/lang/fr-FR.rc | 4 ++-- dll/cpl/input/lang/he-IL.rc | 4 ++-- dll/cpl/input/lang/it-IT.rc | 4 ++-- dll/cpl/input/lang/ja-JP.rc | 4 ++-- dll/cpl/input/lang/no-NO.rc | 4 ++-- dll/cpl/input/lang/pl-PL.rc | 4 ++-- dll/cpl/input/lang/pt-BR.rc | 4 ++-- dll/cpl/input/lang/ro-RO.rc | 4 ++-- dll/cpl/input/lang/ru-RU.rc | 4 ++-- dll/cpl/input/lang/sk-SK.rc | 4 ++-- dll/cpl/input/lang/sq-AL.rc | 4 ++-- dll/cpl/input/lang/tr-TR.rc | 4 ++-- dll/cpl/input/lang/uk-UA.rc | 4 ++-- dll/cpl/input/lang/zh-CN.rc | 4 ++-- dll/cpl/input/lang/zh-TW.rc | 4 ++-- dll/cpl/intl/lang/bg-BG.rc | 6 +++--- dll/cpl/intl/lang/cs-CZ.rc | 6 +++--- dll/cpl/intl/lang/de-DE.rc | 6 +++--- dll/cpl/intl/lang/en-US.rc | 6 +++--- dll/cpl/intl/lang/es-ES.rc | 6 +++--- dll/cpl/intl/lang/fr-FR.rc | 6 +++--- dll/cpl/intl/lang/he-IL.rc | 6 +++--- dll/cpl/intl/lang/it-IT.rc | 6 +++--- dll/cpl/intl/lang/ja-JP.rc | 6 +++--- dll/cpl/intl/lang/no-NO.rc | 6 +++--- dll/cpl/intl/lang/pl-PL.rc | 6 +++--- dll/cpl/intl/lang/pt-BR.rc | 8 ++++---- dll/cpl/intl/lang/pt-PT.rc | 6 +++--- dll/cpl/intl/lang/ro-RO.rc | 6 +++--- dll/cpl/intl/lang/ru-RU.rc | 6 +++--- dll/cpl/intl/lang/sk-SK.rc | 6 +++--- dll/cpl/intl/lang/sq-AL.rc | 6 +++--- dll/cpl/intl/lang/tr-TR.rc | 6 +++--- dll/cpl/intl/lang/uk-UA.rc | 6 +++--- dll/cpl/intl/lang/zh-CN.rc | 6 +++--- dll/cpl/intl/lang/zh-TW.rc | 6 +++--- dll/win32/syssetup/lang/bg-BG.rc | 2 +- dll/win32/syssetup/lang/cs-CZ.rc | 2 +- dll/win32/syssetup/lang/da-DK.rc | 2 +- dll/win32/syssetup/lang/de-DE.rc | 2 +- dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/en-US.rc | 2 +- dll/win32/syssetup/lang/es-ES.rc | 2 +- dll/win32/syssetup/lang/et-EE.rc | 2 +- dll/win32/syssetup/lang/fi-FI.rc | 2 +- dll/win32/syssetup/lang/fr-FR.rc | 2 +- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/hi-IN.rc | 2 +- dll/win32/syssetup/lang/hu-HU.rc | 2 +- dll/win32/syssetup/lang/id-ID.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/ja-JP.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 2 +- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/no-NO.rc | 2 +- dll/win32/syssetup/lang/pl-PL.rc | 2 +- dll/win32/syssetup/lang/pt-BR.rc | 2 +- dll/win32/syssetup/lang/pt-PT.rc | 2 +- dll/win32/syssetup/lang/ro-RO.rc | 2 +- dll/win32/syssetup/lang/ru-RU.rc | 2 +- dll/win32/syssetup/lang/sk-SK.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 2 +- dll/win32/syssetup/lang/sv-SE.rc | 2 +- dll/win32/syssetup/lang/th-TH.rc | 2 +- dll/win32/syssetup/lang/tr-TR.rc | 2 +- dll/win32/syssetup/lang/uk-UA.rc | 2 +- dll/win32/syssetup/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 2 +- 74 files changed, 138 insertions(+), 138 deletions(-) diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 41dd8bb86f1..ffc54fcc3ab 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -48,9 +48,9 @@ CAPTION "Добавяне език на писане" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Език на &въвеждане:", -1, 7, 7, 90, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "Клавиатурна подредба/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "Добре", IDOK, 116, 68, 50, 14 PUSHBUTTON "Отказ", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index c419a0b3583..df2c7d2756c 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -53,9 +53,9 @@ CAPTION "Přidat vstupní jazyk" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Vstupní jazyk:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Rozložení kláves/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 3ed70ae1071..702e67219c9 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -48,9 +48,9 @@ CAPTION "Eingabesprache hinzufügen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index ee3f853adeb..87691f00b1c 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -48,9 +48,9 @@ CAPTION "Προσθήκη γλώσσας εισαγωγής" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Γλώσσα εισαγωγής:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Διάταξη πληκτρολογίου/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Άκυρο", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index fc38485460e..1abf3968a41 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -48,9 +48,9 @@ CAPTION "Add Input language" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index b7a75faa187..433bb279f5b 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -57,9 +57,9 @@ CAPTION "Agregar idioma de entrada" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Idioma de dispositivo de entrada:", -1, 7, 7, 120, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Distribución del teclado/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "Aceptar", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 35c84450c13..5c1bfa13fc7 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -48,9 +48,9 @@ CAPTION "Ajouter une langue de saisie" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Langue de sa&isie :", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "Configuration du clavier/IME :", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index 4b88559d9c5..45f66e737f3 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -50,9 +50,9 @@ CAPTION "הוספת שפת כתיבה" FONT 8, "MS Shell Dlg" BEGIN LTEXT "שפת כתיבה:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "אישור", IDOK, 116, 68, 50, 14 PUSHBUTTON "ביטול", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index 2d00b07d791..06f46fafb64 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -48,9 +48,9 @@ CAPTION "Aggiunta lingua" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Lingua:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Layout/IME tastiera:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 0257bb8ed59..bebf3fc39fe 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -48,9 +48,9 @@ CAPTION "入力言語の追加" FONT 9, "MS UI Gothic" BEGIN LTEXT "入力言語(&I):", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "キーボードレイアウト/IME(&K):", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "キャンセル", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index 1121937fefd..60bdf8f482f 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -48,9 +48,9 @@ CAPTION "Teksttjenester og inndataspråk" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Inndataspråk:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Tastaturoppsett/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index 4b96bf762b6..93672cc60b1 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -56,9 +56,9 @@ CAPTION "Dodawanie języków" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Język:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Układ klawiatury/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 18b1c70f0ea..e65e2aa4dd1 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -48,9 +48,9 @@ CAPTION "Adicionar idioma de entrada" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Idioma de entrada:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "L&ayout do teclado/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index a51b5868d3f..a280fbdd318 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -50,9 +50,9 @@ CAPTION "Adăguare limbă de intrare" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Limbă:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Aranjament de tastatură/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "Con&firmă", IDOK, 116, 68, 50, 14 PUSHBUTTON "A&nulează", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index b71ce0530c9..01f8359a284 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -48,9 +48,9 @@ CAPTION "Добавление языка ввода" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Язык ввода:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Раскладка клавиатуры:", -1, 7, 36, 170, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Отмена", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 0f36c4b79e8..c0899d3e311 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -53,9 +53,9 @@ CAPTION "Add Input language" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index b4ad5728a0e..5eda787ad32 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -52,9 +52,9 @@ CAPTION "Shto gjuhën hyrese" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Gjuha hyrese:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Paraqitja Tastieres/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Anulo", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 5e8500a4f01..d36026518ec 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -50,9 +50,9 @@ CAPTION "Giriş Dili Ekle" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Giriş Dili:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Düğme Takımı Düzeni/IME:", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "Tamam", IDOK, 116, 68, 50, 14 PUSHBUTTON "İptal", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index 990d29aa8b3..a341ebaffdb 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -56,9 +56,9 @@ CAPTION "Додавання мови вводу" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Мова вводу:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "&Розкладка клавіатури або засіб вводу (IME):", -1, 7, 36, 140, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Скасувати", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index 935909185cf..868179b848a 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -50,9 +50,9 @@ CAPTION "添加输入语言" FONT 9, "宋体" BEGIN LTEXT "输入语言(&I):", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "键盘布局/输入法(&K):", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "确定", IDOK, 116, 68, 50, 14 PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index 09266166f4f..8e51aecf02e 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -50,9 +50,9 @@ CAPTION "添加輸入語言" FONT 9, "新細明體" BEGIN LTEXT "輸入語言(&I):", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL LTEXT "鍵盤佈局/輸入法(&K):", -1, 7, 36, 110, 10 - COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + COMBOBOX IDC_KEYBOARD_LO_COMBO, 7, 47, 212, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "確定", IDOK, 116, 68, 50, 14 PUSHBUTTON "取消", IDCANCEL, 169, 68, 50, 14 END diff --git a/dll/cpl/intl/lang/bg-BG.rc b/dll/cpl/intl/lang/bg-BG.rc index ac3176a8ee5..c5c278d9e58 100644 --- a/dll/cpl/intl/lang/bg-BG.rc +++ b/dll/cpl/intl/lang/bg-BG.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Стандарти и изписвания", -1, 5, 5, 240, 162 LTEXT "Тази настройка засяга начина, по който някои приложения изписват числата, паричните единици, датата и времето.", -1, 14, 17, 230, 25 LTEXT "Изберете предмет, отговарящ на нуждите ви или натиснете „Нагласяване”, за да зададете собствено изписване:", -1, 14, 37, 230, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "На&гласяване...", IDC_SETUP_BUTTON, 178, 56, 60, 13 LTEXT "Образци:", -1, 14, 73, 70, 10 LTEXT "Числа:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Географско положение", -1, 5, 172, 240, 55 LTEXT "Указване на положението ви, заради услуги, които биха могли да ви осигуряват местни услуги от рода на новини и доклади за времето.", -1, 14, 181, 230, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 270, 150, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 270, 150, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Разширени" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Език за неуникод приложения", -1, 6, 7, 233, 80 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 67, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 67, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Тази настройка позволява на неуникод приложенията да показват правилно изборниците и прозорците на присъщия им език. Тя не засяга уникод приложенията, но засяга всички потребители на компютъра.", -1, 14, 18, 216, 33 LTEXT "Изберете подходящ език за неуникод приложенията:", -1, 14, 55, 216, 10 GROUPBOX "Знаков набор", -1, 6, 92, 233, 88 diff --git a/dll/cpl/intl/lang/cs-CZ.rc b/dll/cpl/intl/lang/cs-CZ.rc index c64e8fc33cb..df203eecfea 100644 --- a/dll/cpl/intl/lang/cs-CZ.rc +++ b/dll/cpl/intl/lang/cs-CZ.rc @@ -13,7 +13,7 @@ BEGIN GROUPBOX "Standardy a formáty", -1, 5, 5, 234, 162 LTEXT "Toto nastavení ovlivní, jak některé programy formátují čísla, měny, data a čas.", -1, 14, 17, 220, 25 LTEXT "Zvolte položku odpovídající požadovaným vlastnostem, nebo klepnutím na Vlastní vyberte vlastní formáty:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Vlastní...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Ukázky", -1, 14, 73, 70, 10 LTEXT "Číslo:", -1, 16, 86, 48, 10 @@ -28,7 +28,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Zeměpisné umístění", -1, 5, 172, 234, 55 LTEXT "Zvolením svého umístění umožníte některým službám dodávat místní informace, například zprávy nebo předpověď počasí.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -51,7 +51,7 @@ CAPTION "Rozšířené" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Jazyky ne-Unicode programů", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Toto nastavení systému umožní ne-Unicode programům zobrazovat nabídky a dialogy v jejich původním jazyce. Unicode programy nebudou ovlivněny, ale nastaveni bude použit pro všechny uživatele na tomto počítači.", -1, 14, 18, 223, 33 LTEXT "Zvolte jazyk odpovídající jazykové verzi ne-Unicode programů, které chcete používat:", -1, 14, 55, 223, 18 GROUPBOX "Převodní tabulky znakových stránek", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/de-DE.rc b/dll/cpl/intl/lang/de-DE.rc index 65997bc1618..5cae8fd0375 100644 --- a/dll/cpl/intl/lang/de-DE.rc +++ b/dll/cpl/intl/lang/de-DE.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Standards und Formate", -1, 5, 5, 234, 162 LTEXT "Diese Einstellungen beeinflussen, wie einige Programme Zahlen, Währung, Datum, und Zeit formatieren.", -1, 14, 17, 220, 25 LTEXT "Wählen Sie ein Element, um dessen Einstellungen anzuzeigen, oder wählen Sie ""Anpassen..."", um Ihr eigenes Format zu wählen:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Anpassen...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Beispiele", -1, 14, 73, 70, 10 LTEXT "Zahl:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Geografische Lage", -1, 5, 172, 234, 55 LTEXT "Wählen Sie Ihren Standort, sodass Dienste Sie mit lokalen Informationen, wie Nachrichten und Wettervorhersagen, versorgen können.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 210, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Erweitert" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Sprache für Unicode-Inkompatible Programme", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Diese Einstellung ermöglicht es, Unicode-Inkompatiblen Programmen, Menüs und Dialoge in der örtlichen Sprache darzustellen. Dies beeinflusst Unicode-Kompatible Programme nicht, wird aber für alle Nutzer des Computers angewendet.", -1, 14, 18, 223, 33 LTEXT "Wählen Sie eine Sprache aus, die der Sprachversion des Programmes entspricht, das Sie nutzen wollen:", -1, 14, 55, 223, 18 GROUPBOX "Codepage Konvertierungstabellen", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/en-US.rc b/dll/cpl/intl/lang/en-US.rc index f0787060275..3951b3e6705 100644 --- a/dll/cpl/intl/lang/en-US.rc +++ b/dll/cpl/intl/lang/en-US.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Standards and formats", -1, 5, 5, 234, 162 LTEXT "This option affects how some programs format numbers, currencies, dates, and time.", -1, 14, 17, 220, 25 LTEXT "&Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Customi&ze...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Samples", -1, 14, 73, 70, 10 LTEXT "Number:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Geographic location", -1, 5, 172, 234, 55 LTEXT "Se&t up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Advanced" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Language for non-Unicode programs", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "This system setting enables non-Unicode programs to display menus and dialogs in their native language. It does not affect Unicode programs, but it does apply to all users of this computer.", -1, 14, 18, 223, 33 LTEXT "&Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 GROUPBOX "&Code page conversion tables", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/es-ES.rc b/dll/cpl/intl/lang/es-ES.rc index dd556d76055..c44babe1416 100644 --- a/dll/cpl/intl/lang/es-ES.rc +++ b/dll/cpl/intl/lang/es-ES.rc @@ -10,7 +10,7 @@ BEGIN GROUPBOX "Estándares y formatos ", -1, 5, 5, 234, 162 LTEXT "Esta opción afecta al formato que algunas aplicaciones dan a los números, monedas, fechas y horas.", -1, 14, 17, 220, 25 LTEXT "Seleccione un elemento para que coincida con sus preferencias o haga clic en Personalizar para elegir su propia configuración:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizar...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Ejemplos", -1, 14, 73, 70, 10 LTEXT "Número:", -1, 16, 86, 48, 10 @@ -25,7 +25,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Ubicación geográfica ", -1, 5, 172, 234, 55 LTEXT "Seleccione su ubicación actual para ayudar a los servicios a suministrarle información local, como noticias y el tiempo.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ CAPTION "Opciones avanzadas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Idioma para programas no Unicode ", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Esta configuración de sistema permite que algunos programas no Unicode muestren menús y diálogos en sus idiomas originales. No afecta a los programas Unicode pero afecta a todos los usuarios de este equipo.", -1, 14, 18, 223, 33 LTEXT "Seleccione un idioma que coincida con la versión de idioma de los programas no Unicode que desea utilizar:", -1, 14, 55, 223, 18 GROUPBOX "Tablas de conversión de páginas de código ", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/fr-FR.rc b/dll/cpl/intl/lang/fr-FR.rc index a84c6be323b..ab9aaa024c8 100644 --- a/dll/cpl/intl/lang/fr-FR.rc +++ b/dll/cpl/intl/lang/fr-FR.rc @@ -10,7 +10,7 @@ BEGIN GROUPBOX "Standards et formats", -1, 5, 5, 234, 162 LTEXT "Cette option modifie comment certains programmes disposent les nombres, les monnaies, les dates et l'heure.", -1, 14, 17, 220, 20 LTEXT "Sélectionnez un élément pour utiliser ses préférences, ou cliquez sur Personnaliser pour choisir vos propres formats :", -1, 14, 37, 220, 18 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 152, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 152, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Personnaliser...", IDC_SETUP_BUTTON, 169, 56, 61, 13 LTEXT "Exemples", -1, 14, 73, 70, 10 LTEXT "Nombre :", -1, 16, 86, 70, 10 @@ -25,7 +25,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Localisation géographique", -1, 5, 171, 234, 55 LTEXT "Configurez votre localisation pour que des services puissent vous fournir des informations locales, comme par exemple, les nouvelles et la météo", -1, 14, 180, 215, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ CAPTION "Avancé" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Langue pour les programmes non-Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Ce paramètre système permet aux programmes non-Unicode d'afficher les menus et les dialogues dans leur langue native. Cela n'affecte pas es programmes Unicode, mais s'applique à tous les utilisateurs de cet ordinateur.", -1, 14, 18, 223, 33 LTEXT "Sélectionnez une langue qui corresponde à la version de la langue des programmes que vous voulez utiliser :", -1, 14, 55, 223, 18 GROUPBOX "Tables de conversion des pages de code", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/he-IL.rc b/dll/cpl/intl/lang/he-IL.rc index 8e35235e187..a62ae834423 100644 --- a/dll/cpl/intl/lang/he-IL.rc +++ b/dll/cpl/intl/lang/he-IL.rc @@ -10,7 +10,7 @@ BEGIN GROUPBOX "סטנדרטים ועיצובי", -1, 5, 5, 234, 162 LTEXT "This option affects how some programs format numbers, currencies, dates, and time.", -1, 14, 17, 220, 25 LTEXT "Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "התאם...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "דוגמאות", -1, 14, 73, 70, 10 LTEXT "מספרים:", -1, 16, 86, 48, 10 @@ -25,7 +25,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "מיקום גאוגרפי", -1, 5, 172, 234, 55 LTEXT "Set up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ CAPTION "מתקדם" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Language for non-Unicode programs", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "This system setting enables non-Unicode programs to display menus and dialogs in their native language. It does not affect Unicode programs, but it does apply to all users of this computer.", -1, 14, 18, 223, 33 LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/it-IT.rc b/dll/cpl/intl/lang/it-IT.rc index e0e269bf3c5..2d29c423bd0 100644 --- a/dll/cpl/intl/lang/it-IT.rc +++ b/dll/cpl/intl/lang/it-IT.rc @@ -10,7 +10,7 @@ BEGIN GROUPBOX "Standard e formati", -1, 5, 5, 234, 162 LTEXT "Questa opzione determina la formattazione di numeri, valute, ora e date.", -1, 14, 17, 220, 25 LTEXT "Selezionare l'elemento corrispondente alle preferenze oppure fare click su personalizza per scegliere formati personalizzati:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizza...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Esempi", -1, 14, 73, 70, 10 LTEXT "Numero:", -1, 16, 86, 48, 10 @@ -25,7 +25,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Posizione geografica", -1, 5, 172, 234, 55 LTEXT "Per ottenere informazioni locali, come notizie e previsioni meteo, selezionare la località corrente:", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ CAPTION "Avanzate" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Lingua per programmi non Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "In base a questa impostazione di sistema è possibile visualizzare menù e finestre di dialogo di programmi non Unicode nella lingua di origine.", -1, 14, 18, 223, 17 LTEXT "I programmi Unicode resteranno invariati, ma l'impostazione verrà applicata per tutti gli utenti che utilizzano il computer.", -1, 14, 35, 223, 17 LTEXT "Selezionare una lingua per i programmi non Unicode da utilizzare:", -1, 14, 55, 223, 18 diff --git a/dll/cpl/intl/lang/ja-JP.rc b/dll/cpl/intl/lang/ja-JP.rc index da2990fec90..83e27d5d355 100644 --- a/dll/cpl/intl/lang/ja-JP.rc +++ b/dll/cpl/intl/lang/ja-JP.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "標準と形式", -1, 5, 5, 234, 162 LTEXT "このオプションは、いくつかのプログラムによる数値、通貨、日付、時間の書式設定に影響します。", -1, 14, 17, 220, 25 LTEXT "プロパティに一致する項目を選択するか、あなた自身の形式を選ぶためにカスタマイズをクリックして下さい(&S):", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "カスタマイズ(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "サンプル", -1, 14, 73, 70, 10 LTEXT "数値:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "場所", -1, 5, 172, 234, 55 LTEXT "いくつかのサービスがあなたに地域情報（例えばニュースや天気情報）を提供できるようにあなたの場所をセットアップして下さい(&T)", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "上級者向け" FONT 9, "MS UI Gothic" BEGIN GROUPBOX "非Unicodeプログラム用の言語", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "このシステム設定は、非Unicodeプログラムがメニューやダイアログをその地域の言語で表示することを可能にします。これは、Unicodeプログラムには影響しませんが、このコンピューターのすべてのユーザーに適用されます。", -1, 14, 18, 223, 33 LTEXT "使いたい非Unicodeプログラムの言語バージョンに一致する言語を選んで下さい(&S):", -1, 14, 55, 223, 18 GROUPBOX "コードページ変換表(&C)", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/no-NO.rc b/dll/cpl/intl/lang/no-NO.rc index 6e3712361e0..0e67330ed07 100644 --- a/dll/cpl/intl/lang/no-NO.rc +++ b/dll/cpl/intl/lang/no-NO.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Standarder og format", -1, 5, 5, 234, 162 LTEXT "Dette valget påvirker hvordan programmer formater tall, valuta, dato, og tid.", -1, 14, 17, 220, 25 LTEXT "Velg en enhet for å tilpasse til egenskaper, eller klikk tilpasning for å velge dine egne formater:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Tilpasni&ng...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Utvalg", -1, 14, 73, 70, 10 LTEXT "Tall:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Geografisk plassering", -1, 5, 172, 234, 55 LTEXT "Still din lokalisering så at noen tjenester kan skaffe deg lokal informasjon; som for eksempel, nyheter og vær rapporter.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Avansert" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Språk for ikke-Unicode programmer", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Denne systeminnstillingen gjør at programmet som ikke støtter Unicode, viser menyer og dialogbokser på det opprinnlige språket. Det påvirker ikke Unicode-programmer, men det gjelder for alle brukere på denne datamaskinen.", -1, 14, 18, 223, 33 LTEXT "Velg et språk som tilsvarer språkversjonen av programmet du vil bruke, som ikke er Unicode-programmer:", -1, 14, 55, 223, 18 GROUPBOX "Konverteringstabeller for tegntabell", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/pl-PL.rc b/dll/cpl/intl/lang/pl-PL.rc index a66af11018a..e0badd936da 100644 --- a/dll/cpl/intl/lang/pl-PL.rc +++ b/dll/cpl/intl/lang/pl-PL.rc @@ -16,7 +16,7 @@ BEGIN GROUPBOX "Standardy i formaty", -1, 5, 5, 234, 162 LTEXT "Te opcje wpływają na to jak niektóre programy odczytują liczby, waluty, daty i czas.", -1, 14, 17, 220, 25 LTEXT "Wybierz opcję z listy, albo kliknij na Dostosuj, by wprowadzić własny format:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Do&stosuj...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Przykłady", -1, 14, 73, 70, 10 LTEXT "Liczby:", -1, 16, 86, 48, 10 @@ -31,7 +31,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Lokalizacja geograficzna", -1, 5, 171, 234, 55 LTEXT "Ustaw swoją obecną lokalizację, by pewne usługi mogły dostarczać lokalnych informacji; na przykład wiadomości i prognozy pogody.", -1, 14, 180, 215, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ CAPTION "Zaawansowane" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Języki dla programów bez wsparcia Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Te ustawienia umożliwiają programom niewspierających Unicode wyświetlanie menu i dialogów w odpowiednich językach. Nie ma to wpływu na programy Unicode ale dotyczy profili domyślnych.", -1, 14, 18, 223, 33 LTEXT "Wybierz taki język, który ma być używany przez programy bez Unicode:", -1, 14, 55, 223, 18 GROUPBOX "Tabele konwersji stron kodowych", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/pt-BR.rc b/dll/cpl/intl/lang/pt-BR.rc index db19dc5e26c..ea41f64031b 100644 --- a/dll/cpl/intl/lang/pt-BR.rc +++ b/dll/cpl/intl/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Padrões e formatos", -1, 5, 5, 234, 162 LTEXT "Esta opção afeta a maneira como alguns programas formatam números, unidades monetárias, horários e datas.", -1, 14, 17, 220, 25 LTEXT "Seleci&one um item correspondente a suas preferências ou clique em 'Personalizar' para escolher seus próprios formatos:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizar...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Exemplos", -1, 14, 73, 70, 10 LTEXT "Número:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Local", -1, 5, 172, 234, 55 LTEXT "Para aj&udar os serviços a fornecer-lhe informações locais, como notícias e meteorologia, selecione seu local atual:", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Avançado" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Idioma para programas não-Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Este sistema permite que programas não-Unicode exibam menus e caixas de diálogo em seus idiomas de origem. Ele não afeta programas Unicode, mas se aplica a todos os usuários do computador.", -1, 14, 18, 223, 33 LTEXT "&Selecione um idioma correspondente à versão de idioma dos programas não-Unicode que você deseja usar:", -1, 14, 55, 223, 18 GROUPBOX "&Tabelas de conversão de páginas de código", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/pt-PT.rc b/dll/cpl/intl/lang/pt-PT.rc index c4ddc94205d..493602fbef8 100644 --- a/dll/cpl/intl/lang/pt-PT.rc +++ b/dll/cpl/intl/lang/pt-PT.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Padrões e formatos", -1, 5, 5, 234, 162 LTEXT "Esta opção influencia a forma como alguns programas formatam números, unidades monetárias, horários e datas.", -1, 14, 17, 220, 25 LTEXT "Selecci&one um item para definir as suas preferências ou clique em 'Personalizar' para escolher seus próprios formatos:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizar...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Exemplos", -1, 14, 73, 70, 10 LTEXT "Número:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Localização", -1, 5, 172, 234, 55 LTEXT "Para aj&udar os serviços a fornecer-lhe informações locais, tal como notícias e meteorologia, seleccione a sua localização actual:", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Avançado" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Idioma para programas não-Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Esta definição de sistema permite aos programas não-Unicode apresentar menus e diálogos no seu idioma de origem. Não afecta os programas Unicode, mas se aplica a todos os utilizadores deste computador.", -1, 14, 18, 223, 33 LTEXT "&Seleccione um idioma que corresponda à versão dos programas traduzidos não-Unicode que deseja usar:", -1, 14, 55, 223, 18 GROUPBOX "&Tabelas de conversão de páginas de código", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/ro-RO.rc b/dll/cpl/intl/lang/ro-RO.rc index 94f2404a4fe..51286d8a73b 100644 --- a/dll/cpl/intl/lang/ro-RO.rc +++ b/dll/cpl/intl/lang/ro-RO.rc @@ -10,7 +10,7 @@ BEGIN GROUPBOX "Standarde și formate", -1, 5, 5, 234, 162 LTEXT "Această opțiune afectează modul în care numerele, valutele, data și ora sunt reprezentare în anumite aplicații.", -1, 14, 17, 220, 25 LTEXT "Alegeți o configurație prestabilită sau specificați una particularizată pentru formatele de afișare:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 150, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 150, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Particularizare…", IDC_SETUP_BUTTON, 168, 56, 62, 13 LTEXT "Exemple", -1, 14, 73, 70, 10 LTEXT "Număr:", -1, 16, 86, 68, 10 @@ -25,7 +25,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Amplasare geografică", -1, 5, 172, 234, 55 LTEXT "Specificați poziția geografică pentru a permite servicii localizate, cum ar fi știri locale sau informații meteo.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ CAPTION "Avansate" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Limba pentru programe ne-Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Această opțiune specifică limba de afișare pentru programele care nu utilizează Unicode în textele din meniuri și ferestrele de dialog. Opțiunea nu afectează aplicațiile Unicode, dar va afecta toți utilizatorii din sistem.", -1, 14, 18, 223, 33 LTEXT "Alegeți limba ce corespunde cu limba aplicațiilor ne-Unicode pe care doriți să le utilizați:", -1, 14, 55, 223, 18 GROUPBOX "Tabele de conversie cod-pagină", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/ru-RU.rc b/dll/cpl/intl/lang/ru-RU.rc index a18192b88b4..67b7f8cc989 100644 --- a/dll/cpl/intl/lang/ru-RU.rc +++ b/dll/cpl/intl/lang/ru-RU.rc @@ -8,7 +8,7 @@ BEGIN GROUPBOX "Языковые стандарты и форматы", -1, 5, 5, 234, 162 LTEXT "Этот параметр влияет на способ отображения некоторыми программами чисел, денежных сумм, дат и времени.", -1, 14, 17, 220, 25 LTEXT "Выберите элемент из списка или нажмите кнопку ""Настройка"" для того, чтобы задать форматы самостоятельно:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Настро&йка...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Образцы", -1, 14, 73, 70, 10 LTEXT "Число:", -1, 16, 86, 48, 10 @@ -23,7 +23,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Расположение", -1, 5, 171, 234, 55 LTEXT "&Укажите ваше расположение для того, чтобы службы могли снабжать вас местной информацией, например, новостями и сводками погоды:", -1, 14, 180, 217, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -46,7 +46,7 @@ CAPTION "Дополнительно" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Язык программ, не поддерживающих Юникод", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Этот параметр позволяет программам, не поддерживающим Юникод, отображать меню и диалоги на своем языке. Он не влияет на Юникод-совместимые программы, но применяется для всех пользователей этого компьютера.", -1, 14, 18, 223, 33 LTEXT "Выберите язык, соответствующий языку используемых программ, которые не поддерживают Юникод:", -1, 14, 55, 223, 18 GROUPBOX "Кодовые страницы таблиц преобразования", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/sk-SK.rc b/dll/cpl/intl/lang/sk-SK.rc index e0341e7507f..c200c3b37bc 100644 --- a/dll/cpl/intl/lang/sk-SK.rc +++ b/dll/cpl/intl/lang/sk-SK.rc @@ -13,7 +13,7 @@ BEGIN GROUPBOX "Štandardy a formáty", -1, 5, 5, 234, 159 LTEXT "Táto možnosť ovplyvňuje spôsob, ktorým niektoré programy formátujú čísla, meny, dátumy a čas.", -1, 14, 17, 220, 17 LTEXT "Vyb&erte položku vyhovujúcu svojim požiadavkám, alebo kliknite na tlačidlo Prispôsobiť a vyberte svoj vlastný formát:", -1, 14, 37, 220, 18 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Prispôsobiť...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Ukážky", -1, 14, 73, 70, 10 LTEXT "Číslo:", -1, 16, 86, 48, 10 @@ -28,7 +28,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Umiestnenie", -1, 5, 168, 234, 59 LTEXT "&Vyberte svoje aktuálne umiestnenie, aby vám rôzne služby mohli poskytovať miestne informácie, napríklad správy alebo predpovede počasia.", -1, 14, 179, 210, 26 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -51,7 +51,7 @@ CAPTION "Rozšírené nastavenia" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Jazyk pre programy bez podpory kódovania Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Toto systémové nastavenie umožňuje, aby mohli programy bez podpory kódovania Unicode zobrazovať ponuky a dialógové okná v rodnom jazyku. Neovplyvňuje programy s kódovaním Unicode, ale vzťahuje sa na všetkých používateľov tohto počítača.", -1, 14, 18, 223, 33 LTEXT "Vyberte jazyk zodpovedajúci jazykovej verzii príslušných programov bez podpory kódovania &Unicode:", -1, 14, 55, 223, 18 GROUPBOX "&Tabuľky na konverziu kódových stránok", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/sq-AL.rc b/dll/cpl/intl/lang/sq-AL.rc index 8bcb829281c..b36cdb56a19 100644 --- a/dll/cpl/intl/lang/sq-AL.rc +++ b/dll/cpl/intl/lang/sq-AL.rc @@ -12,7 +12,7 @@ BEGIN GROUPBOX "Standarte dhe formatet", -1, 5, 5, 234, 162 LTEXT "Ky opsion ndikon se si disa programe format numrash, monedhat, datat, dhe koha.", -1, 14, 17, 220, 25 LTEXT "Përzgjidhni një objekt që të shkojë me pronat e saj, ose kliko modifiko për të zgjedhur vetë formatet tuaja:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Modifik&o...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Shembuj", -1, 14, 73, 70, 10 LTEXT "Numer:", -1, 16, 86, 48, 10 @@ -27,7 +27,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Pozita gjeografike", -1, 5, 172, 234, 55 LTEXT "Vendosni vendndodhjen tuaj në mënyrë që disa shërbime mund të furnizojnë me informacione lokale, për shembull, raportet lajme dhe moti.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -50,7 +50,7 @@ CAPTION "Avancuar" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Gjuhë për programe jo-Unicode", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Ky sistem mundëson vendosjen programet jo-Unicode për të shfaqur menutë dhe dialogun në gjuhën e tyre amtare. Kjo nuk ndikon programe Unicode, por kjo vlen për të gjithë përdoruesit e këtij kompjuteri.", -1, 14, 18, 223, 33 LTEXT "Zgjidhni një gjuhë që të përputhet me Versionin e gjuhës së programeve jo-Unicode që ju doni të përdorni përdorni:", -1, 14, 55, 223, 18 GROUPBOX "Tabela konvertimit dhe kodet e faqeve ", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/tr-TR.rc b/dll/cpl/intl/lang/tr-TR.rc index 7ef0fa3d02f..fc2e4e4ff2d 100644 --- a/dll/cpl/intl/lang/tr-TR.rc +++ b/dll/cpl/intl/lang/tr-TR.rc @@ -10,7 +10,7 @@ BEGIN GROUPBOX "Ölçünler ve Biçimler", -1, 5, 5, 234, 162 LTEXT "Bu seçenek, birtakım izlencelerin sayı, para birimi, târih ve saat biçimlerini etkiler.", -1, 14, 17, 220, 25 LTEXT "Husûsiyetleri karşılaştırmak için bir öğe seçiniz veyâ kendi biçiminizi seçmek için Husûsileştir'e tıklayınız.", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Husûsileştir...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Örnekler", -1, 14, 73, 70, 10 LTEXT "Sayı:", -1, 16, 86, 48, 10 @@ -25,7 +25,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Coğrâfî Konum", -1, 5, 172, 234, 55 LTEXT "Konumunuzu belirleyiniz, böylece birtakım hizmetler size haberler ve hava durumları gibi yerli bilgiler sağlayabilir.", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -48,7 +48,7 @@ CAPTION "Gelişmiş" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Evrenlik Kodlu Olmayan İzlenceler İçin Dil", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Bu dizge ayârı, Evrenlik Kodlu olmayan izlenceleri, kendi dillerinde seçkeleri ve iletişim pencerelerini görüntülemeyle etkinleştirir. Evrenlik Kodlu izlenceleri etkilemez ancak bu bilgisayarın tüm kullanıcılarına uygular.", -1, 14, 18, 223, 33 LTEXT "&Kullanmak istediğiniz Evrenlik Kodlu olmayan izlencelerin dil sürümünü karşılaştırmak için bir dil seçiniz:", -1, 14, 55, 223, 18 GROUPBOX "Kod Sayfası Dönüştürme Çizelgesi", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/uk-UA.rc b/dll/cpl/intl/lang/uk-UA.rc index f145b88eaca..80ef1a76215 100644 --- a/dll/cpl/intl/lang/uk-UA.rc +++ b/dll/cpl/intl/lang/uk-UA.rc @@ -16,7 +16,7 @@ BEGIN GROUPBOX "Мовні стандарти й формати", -1, 5, 5, 234, 162 LTEXT "Цей параметр впливає на відображення чисел, грошових сум, дати й часу в деяких програмах.", -1, 14, 17, 220, 25 LTEXT "&Виберіть зі списку найбільш прийнятний елемент або натисніть кнопку ""Налаштування"", щоб указати формати самостійно:", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Налашту&вання...", IDC_SETUP_BUTTON, 175, 56, 60, 13 LTEXT "Зразки", -1, 14, 73, 70, 10 LTEXT "Число:", -1, 16, 86, 48, 10 @@ -31,7 +31,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Географічне розташування", -1, 5, 171, 234, 55 LTEXT "Укажіть ваше поточне розташування, щоб служби могли надавати вам місцеву інформацію, наприклад, новини та прогноз погоди", -1, 14, 180, 215, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -54,7 +54,7 @@ CAPTION "Додатково" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Мова програм, які не підтримують Юнікод", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "Цей системний параметр дає змогу програмам, які не підтримують Юнікод, показувати меню та діалоги рідною мовою. Він не впливає на програми з підтримкою Юнікоду, але застосовується до всіх користувачів цього комп'ютера.", -1, 14, 18, 223, 33 LTEXT "Виберіть мову, яка відповідає мовній версії бажаних програм без підтримки Юнікоду.", -1, 14, 55, 223, 18 GROUPBOX "Таблиці перетворення кодових сторінок", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/zh-CN.rc b/dll/cpl/intl/lang/zh-CN.rc index db0d7d50407..bec6d875d60 100644 --- a/dll/cpl/intl/lang/zh-CN.rc +++ b/dll/cpl/intl/lang/zh-CN.rc @@ -11,7 +11,7 @@ BEGIN GROUPBOX "标准和格式", -1, 5, 5, 234, 162 LTEXT "这个选项将会影响一些程序的数字、货币、日期和时间格式。", -1, 14, 17, 220, 25 LTEXT "选择一个与其首选项匹配的项或单击“自定义”选择您自己的格式(&S):", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "自定义(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "示例", -1, 14, 73, 70, 10 LTEXT "数字:", -1, 16, 86, 48, 10 @@ -26,7 +26,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "位置", -1, 5, 172, 234, 55 LTEXT "为了便于为您提供当地信息如新闻和天气，请选择您的所在地(&T):", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -49,7 +49,7 @@ CAPTION "高级" FONT 9, "宋体" BEGIN GROUPBOX "非 Unicode 程序的语言", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "这个设置启动某些非 Unicode 程序以便用母语显示菜单和对话。这不会影响到 Unicode 的程序，但是会应用在这台计算机上的所有用户。", -1, 14, 18, 223, 33 LTEXT "选择一种语言，使之与您想使用的非 Unicode 程序的语言版本相匹配(&S):", -1, 14, 55, 223, 18 GROUPBOX "代码页转换表(&C)", -1, 5, 101, 234, 88 diff --git a/dll/cpl/intl/lang/zh-TW.rc b/dll/cpl/intl/lang/zh-TW.rc index a62596482e4..0a96176b13f 100644 --- a/dll/cpl/intl/lang/zh-TW.rc +++ b/dll/cpl/intl/lang/zh-TW.rc @@ -11,7 +11,7 @@ BEGIN GROUPBOX "標準和格式", -1, 5, 5, 234, 162 LTEXT "這個選項將會影響一些程式的數字、貨幣、日期和時間格式。", -1, 14, 17, 220, 25 LTEXT "選擇一個與其首選項匹配的項或點選 [自訂] 選擇您自己的格式(&S):", -1, 14, 37, 220, 22 - COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "自訂(&Z)...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "示例", -1, 14, 73, 70, 10 LTEXT "數字:", -1, 16, 86, 48, 10 @@ -26,7 +26,7 @@ BEGIN EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "位置", -1, 5, 172, 234, 55 LTEXT "為了便於為您提供當地資訊如新聞和天氣，請選擇您的所在地(&T):", -1, 14, 184, 210, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 @@ -49,7 +49,7 @@ CAPTION "進階" FONT 9, "新細明體" BEGIN GROUPBOX "非 Unicode 程式的語言", -1, 5, 5, 234, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "這個設定啟動某些非 Unicode 程式以便用母語顯示選單和對話。這不會影響到 Unicode 的程式，但是會應用在這部電腦上的所有使用者。", -1, 14, 18, 223, 33 LTEXT "選擇一種語言，使之與您想使用的非 Unicode 程式的語言版本相匹配(&S):", -1, 14, 55, 223, 18 GROUPBOX "內碼表轉換表(&C)", -1, 5, 101, 234, 88 diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index cd4f5d44252..b5022a60af3 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Часови пояс", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Самопревключване на часовника за зимно и лятно време", IDC_AUTODAYLIGHT, 53, 124, 220, 10 END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index aa29f4df3d8..99a4505e586 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -85,7 +85,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Časové pásmo", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automaticky nastavit hodiny při přechodu na &letní čas a zpět", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 5320f5a8fe1..44678b4e1d9 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 5d6fe837c3c..22f6486d0ae 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Zeitzone", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index d36cb5e0239..5754105de1a 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Ζώνη ώρας", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "&Αυτόματη ρύθμιση με την αλλαγή θερινής ώρας", IDC_AUTODAYLIGHT, 53, 114, 190, 20 END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index df258eba562..bd37f8f4ad2 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 89efc6efdad..3a83a1870f8 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -87,7 +87,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Zona horaria", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ajustar el reloj automáticamente durante el horario de verano", IDC_AUTODAYLIGHT, 53, 124, 230, 10 //201 END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 31f67df37c3..e5a3c41a6ef 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Ajavöönd:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Säti &suveajale üleminekul kellaaeg automaatselt", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 499930e6964..1c132723381 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index dcf989f8ce2..1050e7e2aab 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Fuseau horaire :", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ajuster automatiquement l'horloge pour l'heure &d'été", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index da022874efa..351bb266ac5 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "אזור זמן:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 7a04d9ad73f..aca7e2365fd 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -86,7 +86,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "समय क्षेत्र:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "&डेलाइट बचत में परिवर्तन के लिए खुद ब खुद रूप से घड़ी समायोजित करें", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 582a7e10120..45c759a7039 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Idõzóna", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatikus átállás a nyári idõszámításra", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 479374bda3d..b00f016e8ec 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Zonawaktu", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Otomatis menyesuaikan waktu atas perubahan &daylight saving", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index de4ebe4e629..c30141ca067 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Fuso orario", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Cambia automaticamente con l'ora &legale", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 3db2c066f9a..6d1581d80c6 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "タイムゾーン:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "自動的にサマータイムの調整をする(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 00940196809..ef56bcff3be 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 05bee579b98..3a4ccc69d0b 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 0d784f40512..d3b30cb7d01 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Tidssone", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Juster klokken automatisk for &sommertid", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index d4395a13822..e158534672c 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Strefa czasowa", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatycznie ustaw zegar przy &zmianie czasu (DST)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 0f5569fa537..9b065c57f40 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Fuso Horário:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ajustar o relógio automaticamente para o horário de &verão", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 7b0bd229f57..be85577b0a4 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -79,7 +79,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Fuso Horário:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ajustar o relógio automaticamente para o horário de &verão", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 26f2f23a72a..4a0369ea026 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -88,7 +88,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Fus orar:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Aj&ustează ora automat la schimbarea fusului orar", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 714d325d536..4b3d7f3e4ca 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -81,7 +81,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Часовой пояс:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ав&томатический переход на летнее время и обратно.", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index dc4f5aef933..a85cae8db79 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -85,7 +85,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Časové pásmo", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automaticky posunúť hodiny pri prechode na &letný čas a späť", IDC_AUTODAYLIGHT, 53, 124, 220, 10 END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 1fc34c68556..dd71148eb36 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "ZonëKohore:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Adaptohen automatikisht orën për ditën me diell dhe ruaj ndryshimet", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 1c05b9f2dda..430050a31f5 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 801472c91f6..6ef8cbdf87d 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -98,7 +98,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index da4c4fbf635..fe7e29b9fcf 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -81,7 +81,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Zaman Dilimi:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "&Gün ışığı tutum değişiklikleri için saati kendiliğinden ayarla.", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 915bc4e8943..e416c4748c6 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -87,7 +87,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "Часовий пояс", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Автомати&чне переведення годинника на літний/зимовий час", IDC_AUTODAYLIGHT, 53, 124, 219, 10 END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 5df73c83420..afb83e0650d 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -81,7 +81,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "时间区域", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "夏令时自动调整时间(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index f246c25e73d..ce4b0ad1080 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -101,7 +101,7 @@ BEGIN CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "時區:", IDC_STATIC, 53, 42, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "夏時制自動調整時間(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END

1 0

[reactos] 01/01: [LSASRV] Improvements to LsapLogonUser()
by Eric Kohl 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=034c6fd0c56e6717f9756… commit 034c6fd0c56e6717f97568a08348cfaaa3f04e44 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Jul 30 23:09:32 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Jul 30 23:10:33 2019 +0200 [LSASRV] Improvements to LsapLogonUser() - Token handle duplication must be the last step because we cannot close the duplicated token handle if something fails. - Call LsaApLogonTerminated(), delete the logon session and free the profile buffer if something fails. --- dll/win32/lsasrv/authpackage.c | 55 ++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 6c8b47a954f..29bb465d80b 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -1641,22 +1641,6 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, goto done; } - /* Duplicate the token handle into the client process */ - Status = NtDuplicateObject(NtCurrentProcess(), - TokenHandle, - LogonContext->ClientProcessHandle, - &RequestMsg->LogonUser.Reply.Token, - 0, - 0, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); - if (!NT_SUCCESS(Status)) - { - ERR("NtDuplicateObject failed (Status 0x%08lx)\n", Status); - goto done; - } - -// TokenHandle = NULL; - if (LogonType == Interactive || LogonType == Batch || LogonType == Service) @@ -1680,12 +1664,41 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, goto done; } + /* + * Duplicate the token handle into the client process. + * This must be the last step because we cannot + * close the duplicated token handle in case something fails. + */ + Status = NtDuplicateObject(NtCurrentProcess(), + TokenHandle, + LogonContext->ClientProcessHandle, + &RequestMsg->LogonUser.Reply.Token, + 0, + 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); + if (!NT_SUCCESS(Status)) + { + ERR("NtDuplicateObject failed (Status 0x%08lx)\n", Status); + goto done; + } + done: -// if (!NT_SUCCESS(Status)) -// { - if (TokenHandle != NULL) - NtClose(TokenHandle); -// } + if (!NT_SUCCESS(Status)) + { + /* Notify the authentification package of the failure */ + Package->LsaApLogonTerminated(&RequestMsg->LogonUser.Reply.LogonId); + + /* Delete the logon session */ + LsapDeleteLogonSession(&RequestMsg->LogonUser.Reply.LogonId); + + /* Release the profile buffer */ + LsapFreeClientBuffer((PLSA_CLIENT_REQUEST)LogonContext, + RequestMsg->LogonUser.Reply.ProfileBuffer); + RequestMsg->LogonUser.Reply.ProfileBuffer = NULL; + } + + if (TokenHandle != NULL) + NtClose(TokenHandle); /* Free the local groups */ if (LocalGroups != NULL)

1 0

[reactos] 01/01: [CONFIGURE] Add MSVC compiler 19.22.27905 (VS Community 2019) (#1774)
by Stanislav Motylkov 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cff9163e99ec596f4cfc… commit 5cff9163e99ec596f4cfc47cc2fc380e8614f823 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jul 31 00:01:23 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 30 23:01:23 2019 +0200 [CONFIGURE] Add MSVC compiler 19.22.27905 (VS Community 2019) (#1774) --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 4113375bfde..4509ff04231 100755 --- a/configure.cmd +++ b/configure.cmd @@ -75,6 +75,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.16." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.20." > NUL && set VS_VERSION=16 cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16 + cl 2>&1 | find "19.22." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

[reactos] 01/01: [SETUP] Sort font substitutes (#1770)
by Katayama Hirofumi MZ 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f054844f33a9d8927ea71… commit f054844f33a9d8927ea716a2a17d90c2c7e7c521 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 22:05:11 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 22:05:11 2019 +0900 [SETUP] Sort font substitutes (#1770) Sort the font substitute setting lists in base/setup/lib/muifonts.h . --- base/setup/lib/muifonts.h | 104 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 1cdb78ecece..150dee0e61b 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -8,21 +8,21 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -33,21 +33,21 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -58,21 +58,21 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -83,21 +83,21 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Tahoma" }, { NULL, NULL } }; @@ -114,27 +114,27 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS Song", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"NSimSun", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"SimHei", L"Droid Sans Fallback" }, + { L"SimSun", L"Droid Sans Fallback" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"SimSun", L"Droid Sans Fallback" }, - { L"NSimSun", L"Droid Sans Fallback" }, - { L"SimHei", L"Droid Sans Fallback" }, - { L"MS Song", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, @@ -154,7 +154,11 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -163,21 +167,17 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"MingLiU", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ming Light", L"Droid Sans Fallback" }, - { L"MingLiU", L"Droid Sans Fallback" }, - { L"PMingLiU", L"Droid Sans Fallback" }, - { L"DLCMingMedium", L"Droid Sans Fallback" }, - { L"DLCMingBold", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, @@ -197,28 +197,28 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Gothic", L"Droid Sans Fallback" }, + { L"MS Mincho", L"Droid Sans Fallback" }, + { L"MS PGothic", L"Droid Sans Fallback" }, + { L"MS PMincho", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"MS Mincho", L"Droid Sans Fallback" }, - { L"MS PMincho", L"Droid Sans Fallback" }, - { L"MS Gothic", L"Droid Sans Fallback" }, - { L"MS PGothic", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, @@ -237,9 +237,17 @@ WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */ MUI_SUBFONT KoreanFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, + { L"Gulim", L"Droid Sans Fallback" }, + { L"GulimChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -248,22 +256,14 @@ MUI_SUBFONT KoreanFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Batang", L"Droid Sans Fallback" }, - { L"BatangChe", L"Droid Sans Fallback" }, - { L"Gungsuh", L"Droid Sans Fallback" }, - { L"GungsuhChe", L"Droid Sans Fallback" }, - { L"Gulim", L"Droid Sans Fallback" }, - { L"GulimChe", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, @@ -282,21 +282,21 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New", L"DejaVu Sans Mono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -308,20 +308,20 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, + { L"Palatino Linotype", L"FreeSans" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"FreeSans" }, { NULL, NULL } };

1 0

[reactos] 01/01: [SETUP] Delete 'Comic Sans MS' font substitutes (#1769)
by Katayama Hirofumi MZ 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d31e814314763b789af41… commit d31e814314763b789af41f7a02544662c46ae23a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 19:09:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 19:09:23 2019 +0900 [SETUP] Delete 'Comic Sans MS' font substitutes (#1769) Enable real 'Comic Sans MS' font by deleting the 'Comic Sans MS' font substitutes. CORE-16251 --- base/setup/lib/muifonts.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 72292afc466..1cdb78ecece 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -21,7 +21,6 @@ MUI_SUBFONT LatinFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -47,7 +46,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -73,7 +71,6 @@ MUI_SUBFONT GreekFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -99,7 +96,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Tahoma" }, @@ -137,7 +133,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"SimHei", L"Droid Sans Fallback" }, { L"MS Song", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -180,7 +175,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"DLCMingBold", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, @@ -222,7 +216,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, @@ -268,7 +261,6 @@ MUI_SUBFONT KoreanFonts[] = { L"Gulim", L"Droid Sans Fallback" }, { L"GulimChe", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, @@ -303,7 +295,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -330,7 +321,6 @@ MUI_SUBFONT HindiFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"FreeSans" }, { NULL, NULL }

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Fix and improve font dumping (#1768)
by Katayama Hirofumi MZ 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c9755b47dc8b193ea6d3… commit 7c9755b47dc8b193ea6d3dfc91a4767b4b559c4f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 18:15:56 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 18:15:56 2019 +0900 [WIN32SS][NTGDI] Fix and improve font dumping (#1768) Fix and improve font dumping. CORE-16245 - FontGDI->FontObj is not a pointer. - "%s" does null check, so we remove redundant null checks. - Add FaceName and StyleName dumping. --- win32ss/gdi/ntgdi/freetype.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3d94d788681..37ff3fbf5a7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -382,11 +382,12 @@ static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) #if DBG -VOID DumpFontGDI(PFONTGDI FontGDI) +VOID DumpFontEntry(PFONT_ENTRY FontEntry) { const char *family_name; const char *style_name; FT_Face Face; + PFONTGDI FontGDI = FontEntry->Font; if (!FontGDI) { @@ -398,12 +399,7 @@ VOID DumpFontGDI(PFONTGDI FontGDI) if (Face) { family_name = Face->family_name; - if (!family_name) - family_name = "<NULL>"; - style_name = Face->style_name; - if (!style_name) - style_name = "<NULL>"; } else { @@ -411,32 +407,32 @@ VOID DumpFontGDI(PFONTGDI FontGDI) style_name = "<invalid>"; } - DPRINT("family_name '%s', style_name '%s', FontGDI %p, FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n", - family_name, - style_name, - FontGDI, - FontGDI->FontObj, - FontGDI->iUnique, - FontGDI->SharedFace, - Face, - FontGDI->CharSet, - FontGDI->Filename); + DPRINT("family_name '%s', style_name '%s', FaceName '%wZ', StyleName '%wZ', FontGDI %p, " + "FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n", + family_name, + style_name, + &FontEntry->FaceName, + &FontEntry->StyleName, + FontGDI, + &FontGDI->FontObj, + FontGDI->iUnique, + FontGDI->SharedFace, + Face, + FontGDI->CharSet, + FontGDI->Filename); } VOID DumpFontList(PLIST_ENTRY Head) { PLIST_ENTRY Entry; PFONT_ENTRY CurrentEntry; - PFONTGDI FontGDI; DPRINT("## DumpFontList(%p)\n", Head); for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) { CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); - FontGDI = CurrentEntry->Font; - - DumpFontGDI(FontGDI); + DumpFontEntry(CurrentEntry); } } @@ -1365,11 +1361,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont) Entry->NotEnum = (Characteristics & FR_NOT_ENUM); InsertTailList(&LoadedFontList, &Entry->ListEntry); - DPRINT("Font loaded: %s (%s)\n", - Face->family_name ? Face->family_name : "<NULL>", - Face->style_name ? Face->style_name : "<NULL>"); - DPRINT("Num glyphs: %d\n", Face->num_glyphs); - DPRINT("CharSet: %d\n", FontGDI->CharSet); + DPRINT("Font loaded: %s (%s), CharSet %u, Num glyphs %d\n", + Face->family_name, Face->style_name, FontGDI->CharSet, Face->num_glyphs); } IntLockFreeType();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2019