Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [CRT_APITEST] Add testcase for mbtowc() (#2652)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07640a9a2110311d4e3e4… commit 07640a9a2110311d4e3e429a0836995d6c5e73e5 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 26 12:18:41 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 13:18:41 2020 +0300 [CRT_APITEST] Add testcase for mbtowc() (#2652) --- .../rostests/apitests/crt/crtdll_crt_apitest.cmake | 2 +- modules/rostests/apitests/crt/mbtowc.c | 61 ++++++++++++++++++++++ .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/ntdll_crt_apitest.cmake | 1 + modules/rostests/apitests/crt/testlist.c | 2 + 5 files changed, 66 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index 8361b7b1105..768168681e8 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -425,7 +425,7 @@ list(APPEND SOURCE_CRTDLL # malloc.c # mblen.c mbstowcs.c -# mbtowc.c + mbtowc.c # memchr.c # memcmp.c # memcpy.c diff --git a/modules/rostests/apitests/crt/mbtowc.c b/modules/rostests/apitests/crt/mbtowc.c new file mode 100644 index 00000000000..50b014f66a0 --- /dev/null +++ b/modules/rostests/apitests/crt/mbtowc.c @@ -0,0 +1,61 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for mbtowc + * COPYRIGHT: Copyright 2020 Bișoc George <fraizeraust99 at gmail dot com> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <stdlib.h> + +START_TEST(mbtowc) +{ + int Length; + wchar_t BufferDest[3]; + char *ch; + + ch = AllocateGuarded(sizeof(ch)); + if (!ch) + { + skip("Buffer allocation failed!\n"); + return; + } + + /* Assign a character for tests */ + *ch = 'A'; + + /* Everything is NULL */ + Length = mbtowc(NULL, NULL, 0); + ok(Length == 0, "Expected 0 characters to be converted as everything is NULL but got %u.\n", Length); + + /* Don't examine the number of bytes pointed by multibyte parameter */ + Length = mbtowc(BufferDest, ch, 0); + ok(Length == 0, "Expected 0 characters to be converted but got %u.\n", Length); + + /* Wide character argument is invalid */ + Length = mbtowc(NULL, ch, 0); + ok(Length == 0, "Expected 0 characters to be converted but got %u.\n", Length); + + /* The multibyte argument is invalid */ + Length = mbtowc(BufferDest, NULL, 0); + ok(Length == 0, "Expected 0 characters to be converted but got %u.\n", Length); + + /* The multibyte argument is invalid but count number for examination is correct */ + Length = mbtowc(BufferDest, NULL, MB_CUR_MAX); + ok(Length == 0, "Expected 0 characters to be converted but got %u.\n", Length); + + /* Don't give the output but the count character inspection argument is valid */ + Length = mbtowc(NULL, ch, MB_CUR_MAX); + ok(Length == 1, "The number of bytes to check should be 1 but got %u.\n", Length); + + /* Convert the character and validate the output that we should get */ + Length = mbtowc(BufferDest, ch, MB_CUR_MAX); + ok(Length == 1, "Expected 1 character to be converted but got %u.\n", Length); + ok_int(BufferDest[0], L'A'); + + FreeGuarded(ch); +} diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 619fcdfa780..2e3aaf9f3fc 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1119,7 +1119,7 @@ list(APPEND SOURCE_MSVCRT # mbsrtowcs_s mbstowcs.c # mbstowcs_s Not exported in 2k3 Sp1 -# mbtowc.c + mbtowc.c # memchr.c # memcmp.c # memcpy.c diff --git a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake index b9ffc61c5f4..41322e1c338 100644 --- a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake @@ -72,6 +72,7 @@ list(APPEND SOURCE_NTDLL # labs.c # log.c mbstowcs.c + mbtowc.c # memchr.c # memcmp.c # memcpy == memmove diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index 61516d82068..3afeb450484 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -17,6 +17,7 @@ extern void func__snwprintf(void); extern void func__vsnprintf(void); extern void func__vsnwprintf(void); extern void func_mbstowcs(void); +extern void func_mbtowc(void); extern void func_sprintf(void); extern void func_strcpy(void); extern void func_strlen(void); @@ -35,6 +36,7 @@ const struct test winetest_testlist[] = { "_vsnprintf", func__vsnprintf }, { "_vsnwprintf", func__vsnwprintf }, { "mbstowcs", func_mbstowcs }, + { "mbtowc", func_mbtowc }, { "_snprintf", func__snprintf }, { "_snwprintf", func__snwprintf }, { "sprintf", func_sprintf },

4 years, 5 months

[reactos] 01/01: [NETID] fr-fr translation fix and component size (#2586)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab4b001e94203682efc28… commit ab4b001e94203682efc28410615878cd112633be Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Apr 26 11:54:42 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 11:54:42 2020 +0200 [NETID] fr-fr translation fix and component size (#2586) --- dll/win32/netid/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc index 281815f9efc..72c806ab482 100644 --- a/dll/win32/netid/lang/fr-FR.rc +++ b/dll/win32/netid/lang/fr-FR.rc @@ -15,7 +15,7 @@ BEGIN EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 103, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer un utilisateur local, cliquez sur Identification Réseau.", IDC_STATIC, 6, 108, 160, 24 PUSHBUTTON "ID &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15 - LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Changer.", IDC_STATIC, 6, 149, 160, 17 + LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Modifier.", IDC_STATIC, 6, 149, 160, 17 PUSHBUTTON "Modifier...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15 LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 244, 18 END

4 years, 5 months

[reactos] 01/01: [POWERCFG] Power Scheme fix as per CORE-16893 (#2593)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52cd931f228ee91dfd7a1… commit 52cd931f228ee91dfd7a1e6bd2880aea6275d2a4 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sun Apr 26 10:20:22 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 10:20:22 2020 +0200 [POWERCFG] Power Scheme fix as per CORE-16893 (#2593) Related to CORE-16900 Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- boot/bootdata/hivedef.inf | 24 +++++++------- dll/cpl/powercfg/lang/bg-BG.rc | 7 +++-- dll/cpl/powercfg/lang/cs-CZ.rc | 7 +++-- dll/cpl/powercfg/lang/de-DE.rc | 7 +++-- dll/cpl/powercfg/lang/el-GR.rc | 7 +++-- dll/cpl/powercfg/lang/en-US.rc | 7 +++-- dll/cpl/powercfg/lang/es-ES.rc | 7 +++-- dll/cpl/powercfg/lang/fr-FR.rc | 11 ++++--- dll/cpl/powercfg/lang/he-IL.rc | 7 +++-- dll/cpl/powercfg/lang/id-ID.rc | 3 +- dll/cpl/powercfg/lang/it-IT.rc | 7 +++-- dll/cpl/powercfg/lang/ja-JP.rc | 7 +++-- dll/cpl/powercfg/lang/nl-NL.rc | 7 +++-- dll/cpl/powercfg/lang/no-NO.rc | 7 +++-- dll/cpl/powercfg/lang/pl-PL.rc | 7 +++-- dll/cpl/powercfg/lang/pt-PT.rc | 7 +++-- dll/cpl/powercfg/lang/ro-RO.rc | 7 +++-- dll/cpl/powercfg/lang/ru-RU.rc | 7 +++-- dll/cpl/powercfg/lang/sk-SK.rc | 7 +++-- dll/cpl/powercfg/lang/sq-AL.rc | 7 +++-- dll/cpl/powercfg/lang/th-TH.rc | 7 +++-- dll/cpl/powercfg/lang/tr-TR.rc | 7 +++-- dll/cpl/powercfg/lang/uk-UA.rc | 7 +++-- dll/cpl/powercfg/lang/zh-CN.rc | 7 +++-- dll/cpl/powercfg/lang/zh-TW.rc | 7 +++-- dll/cpl/powercfg/powershemes.c | 71 ++++++++++++++++++++++++++---------------- dll/cpl/powercfg/resource.h | 1 + dll/win32/netid/lang/fr-FR.rc | 6 ++-- 28 files changed, 156 insertions(+), 114 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 7324c6243bb..0f1388e8d17 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2723,18 +2723,18 @@ EVENT_LABEL_24 = "Question" EVENT_LABEL_25 = "Lancement de ReactOS" EVENT_LABEL_26 = "Fermeture de session ReactOS" EVENT_LABEL_27 = "Ouverture de session ReactOS" -POWERCFG_NAME_0="Home/Office Desk" -POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." -POWERCFG_NAME_1="Portable/Laptop" -POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." -POWERCFG_NAME_2="Presentation" -POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." -POWERCFG_NAME_3="Always On" -POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." -POWERCFG_NAME_4="Minimal Power Management" -POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." -POWERCFG_NAME_5="Max Battery" -POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +POWERCFG_NAME_0="PC de bureau ou familial" +POWERCFG_DESC_0="Ce modèle est destiné à la plupart des ordinateurs personnels qui sont branchés en permanence." +POWERCFG_NAME_1="PC Portable" +POWERCFG_DESC_1="Ce modèle est destiné pour étendre la durée de vie des PC portables." +POWERCFG_NAME_2="Présentation" +POWERCFG_DESC_2="Ce modèle garde l'écran allumé en permanence pour réaliser des présentations." +POWERCFG_NAME_3="Toujours allumé" +POWERCFG_DESC_3="Ce modèle garde l'ordinateur en fonctionnement de sorte à pouvoir être accédé par le réseau. Utilisez ce modèle si vous n'avez pas de matériel capable d'un réveil par le réseau." +POWERCFG_NAME_4="Gestion minimale de l'énergie" +POWERCFG_DESC_4="Ce modèle garde l'ordinateur allumé et l'optimise pour de hautes performances." +POWERCFG_NAME_5="Niveau de batterie maximal" +POWERCFG_DESC_5="Ce modèle optimise l'économie d'énergie." DESKTOP_SCHEME_0="ReactOS Standard" DESKTOP_SCHEME_1="Brique" DESKTOP_SCHEME_2="Aubergine" diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc index 7787455db4c..99fc03ef386 100644 --- a/dll/cpl/powercfg/lang/bg-BG.rc +++ b/dll/cpl/powercfg/lang/bg-BG.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Изберете най- подходящата настройка за този компютър. Обърнете внимание, че промяната на долните настройки ще променят избраната наредба.", -1, 45, 13, 194, 36 GROUPBOX "За&хранване", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Запис като...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Изтриване", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "Неизвестно", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "Никога" IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc index 779e1b5e219..524bb4ac0b3 100644 --- a/dll/cpl/powercfg/lang/cs-CZ.rc +++ b/dll/cpl/powercfg/lang/cs-CZ.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Vyberte napájecí schéma, které se nejvíce hodí pro tento počítač. Všechny změny nastavení se uloží do vybraného schématu.", -1, 37, 6, 209, 36 GROUPBOX "&Schéma napájení", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Uložit jako...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Odstranit", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Neznámý", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "Nikdy" IDS_DEL_SCHEME "Opravdu si přejete smazat toto schéma napájení: ""%s""?" IDS_DEL_SCHEME_TITLE "Smazat schéma" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc index 07a1948b5b1..c520e563983 100644 --- a/dll/cpl/powercfg/lang/de-DE.rc +++ b/dll/cpl/powercfg/lang/de-DE.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Wählen Sie das Energieschema mit den am besten zu diesem Computer passenden Einstellungen. Bedenken Sie, dass die Einstellungen das unten ausgewählte Schema modifizieren.", -1, 45, 13, 194, 36 GROUPBOX "&Energieschemata", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Speichern &unter...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "Unbekannt", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Energieschema speichern unter:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Abbrechen", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 133, 40, 50, 14 END @@ -174,4 +174,5 @@ BEGIN IDS_TIMEOUT16 "Nie" IDS_DEL_SCHEME "Soll folgendes Energieschema gelöscht werden: ""%s""?" IDS_DEL_SCHEME_TITLE "Schema löschen" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc index 5bb10ca2813..4718ce978e3 100644 --- a/dll/cpl/powercfg/lang/el-GR.rc +++ b/dll/cpl/powercfg/lang/el-GR.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 209, 36 GROUPBOX "Σ&υνδυασμοί τροφοδοσίας", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Αποθήκευση ως...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Διαγραφή", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Άγνωστο", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "Ποτέ" IDS_DEL_SCHEME "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον συνδιασμό τροφοδοσίας: ""%s""" IDS_DEL_SCHEME_TITLE "Διαγραφή συνδιασμού" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc index c9d1f2dafd9..fd7005ead15 100644 --- a/dll/cpl/powercfg/lang/en-US.rc +++ b/dll/cpl/powercfg/lang/en-US.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", -1, 37, 6, 209, 36 GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Save As...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Delete", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "Never" IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc index b9ea2d1d328..ee8447ba84a 100644 --- a/dll/cpl/powercfg/lang/es-ES.rc +++ b/dll/cpl/powercfg/lang/es-ES.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Seleccione la combinación de energía cuya configuración sea la más adecuada para su equipo. Tenga en cuenta que, si cambia la configuración siguiente, se modificará la combinación seleccionada.", -1, 37, 6, 209, 36 GROUPBOX "C&ombinaciones de energía", -1, 6, 43, 250, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "E&liminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Desconocido ", IDC_GRPDETAIL, 6, 95, 250, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "Nunca" IDS_DEL_SCHEME "¿Está seguro de que desea eliminar la combinación de energía: ""%s""?" IDS_DEL_SCHEME_TITLE "Eliminar combinación" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc index a57abdda3ba..e161af70825 100644 --- a/dll/cpl/powercfg/lang/fr-FR.rc +++ b/dll/cpl/powercfg/lang/fr-FR.rc @@ -41,7 +41,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Choisissez le profil d'alimentation le plus approprié pour cet ordinateur. Notez que modifier les réglages suivants modifiera le profil sélectionné.", -1, 45, 13, 194, 36 GROUPBOX "P&rofils d'alimentation", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Sauvegarder sous...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Supprimer", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "Inconnu", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -127,13 +127,13 @@ END IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Save Scheme" +CAPTION "Enregistrement du modèle" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 + LTEXT "Enregistrer ce modèle sous :", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "Jamais" IDS_DEL_SCHEME "Êtes-vous sûr de vouloir supprimer le profil d'alimentation: ""%s"" ?" IDS_DEL_SCHEME_TITLE "Supprimer le profil" + IDS_DEL_SCHEME_ERROR "Impossible de supprimer le profil d'alimentation" END diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc index b8cdec65ff8..2044cbae4d3 100644 --- a/dll/cpl/powercfg/lang/he-IL.rc +++ b/dll/cpl/powercfg/lang/he-IL.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", -1, 37, 6, 209, 36 GROUPBOX "תכנית צריכת חשמל", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "מחק", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "אף פעם" IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "מחק ערכה" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc index 408700284ad..f5bb79a27cf 100644 --- a/dll/cpl/powercfg/lang/id-ID.rc +++ b/dll/cpl/powercfg/lang/id-ID.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Pilih skema tenaga dengan setelan paling benar untuk komputer ini. Catatan bahwa mengubah setelan di bawah akan mengubah skema yang dipilih.", -1, 45, 13, 194, 36 GROUPBOX "Skema Tena&ga", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Simpan Sebagai...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Hapus", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "Tidak Dikenal", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "Tidak pernah" IDS_DEL_SCHEME "Anda yakin ingin menghapus skema daya: ""%s""?" IDS_DEL_SCHEME_TITLE "Hapus Skema" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc index 0752a8932f8..1e3bafdb58d 100644 --- a/dll/cpl/powercfg/lang/it-IT.rc +++ b/dll/cpl/powercfg/lang/it-IT.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20 LTEXT "Scegliere lo schema di gestione dell'energia con le impostazioni piu' appropriate per questo computer. La modifica delle impostazioni seguenti altera lo schema selezionato.", -1, 40, 8, 194, 36 GROUPBOX "Schema di gestione dell'energia", -1, 8, 48, 240, 48 - COMBOBOX IDC_ENERGYLIST, 15, 61, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 15, 61, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Salva come...", IDC_SAVEAS_BTN, 101, 76, 75, 15, WS_DISABLED PUSHBUTTON "&Cancella", IDC_DELETE_BTN, 181, 76, 55, 15, WS_DISABLED GROUPBOX "sconosciuto", IDC_GRPDETAIL, 8, 100, 240, 112 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "Mai" IDS_DEL_SCHEME "Siete sicuro di voler cancellare lo schema: ""%s""?" IDS_DEL_SCHEME_TITLE "Cancellazione schema" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc index f2d45998d0d..d5c88fdac0e 100644 --- a/dll/cpl/powercfg/lang/ja-JP.rc +++ b/dll/cpl/powercfg/lang/ja-JP.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 209, 36 GROUPBOX "電源設定(&O)", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "名前を付けて保存(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "削除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "不明", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "なし" IDS_DEL_SCHEME "この電源設定を削除しますか: ""%s""?" IDS_DEL_SCHEME_TITLE "電源設定の削除" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc index a129b748ed2..07c4f0f0508 100644 --- a/dll/cpl/powercfg/lang/nl-NL.rc +++ b/dll/cpl/powercfg/lang/nl-NL.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Selecteer het energie schema met de beste instellingen voor deze computer. Instellingen worden gewijzigd in het geselecteerde schema.", -1, 45, 13, 194, 36 GROUPBOX "&Energie schema's", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "Onbekend", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "Nooit" IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc index a8f122bb06e..8dfbcab24e9 100644 --- a/dll/cpl/powercfg/lang/no-NO.rc +++ b/dll/cpl/powercfg/lang/no-NO.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Velg Strømstyringsplan med den mest passende innstilling for denne datamaskinen. Vær oppmerksom på å endre innstillingene under vil forandre valgte plan.", -1, 37, 6, 209, 36 GROUPBOX "S&trømstyringsplan", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Lagre som...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Slett", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Ukjent", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "Aldri" IDS_DEL_SCHEME "Er du sikker på at du vil slette strømplanen: ""%s""?" IDS_DEL_SCHEME_TITLE "Slett planen" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc index 6e5c87f9933..dbe9d1abd05 100644 --- a/dll/cpl/powercfg/lang/pl-PL.rc +++ b/dll/cpl/powercfg/lang/pl-PL.rc @@ -16,7 +16,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Wybierz schemat zasilana najbardziej pasujący do Twojego komputera. Miej na uwadze, że zmiany poniżej spowodują modyfikację wybranego schematu.", -1, 45, 13, 194, 36 GROUPBOX "&Schematy zasilania", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Zapisz jako...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Usuń", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "Nieznany", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -138,8 +138,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Zapisz ten schemat zasilania jako:", -1, 7, 7, 114, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Anuluj", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -179,4 +179,5 @@ BEGIN IDS_TIMEOUT16 "Nigdy" IDS_DEL_SCHEME "Czy na pewno chcesz skasować schemat oszczędzania energii: ""%s""?" IDS_DEL_SCHEME_TITLE "Usuń schemat" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/pt-PT.rc b/dll/cpl/powercfg/lang/pt-PT.rc index a4a615561ca..35498b058f6 100644 --- a/dll/cpl/powercfg/lang/pt-PT.rc +++ b/dll/cpl/powercfg/lang/pt-PT.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Seleccione o esquema de energia com as configurações mais apropriadas para este computador. Note que a alteração das configurações abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36 GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Eliminar", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Desconhecido", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Guardar este esquema de energia como:", -1, 7, 7, 144, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "&OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "&Cancelar", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "&OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "&Cancelar", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "Nunca" IDS_DEL_SCHEME "Tem certeza de que deseja excluir o esquema de energia: ""%s""?" IDS_DEL_SCHEME_TITLE "Excluir esquema" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc index 8e85332b4b6..64bc43cafbf 100644 --- a/dll/cpl/powercfg/lang/ro-RO.rc +++ b/dll/cpl/powercfg/lang/ro-RO.rc @@ -13,7 +13,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Alegeți un regim de consum al energiei cât mai potrivit pentru dumneavoastră. Aveți în vedere că modificările aduse vor fi memorate în regimul curent.", -1, 37, 6, 209, 36 GROUPBOX "&Regimuri de consum", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Păstrare…", IDC_SAVEAS_BTN, 124, 72, 55, 14, WS_DISABLED PUSHBUTTON "Șt&erge", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Nespecificat", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -135,8 +135,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -176,4 +176,5 @@ BEGIN IDS_TIMEOUT16 "dezactivată" IDS_DEL_SCHEME "Sigur doriți eliminarea aceastui regim de consum energetic: ""%s""?" IDS_DEL_SCHEME_TITLE "Eliminarea regumului de consum" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc index 7c96be71518..9ac3f8f8058 100644 --- a/dll/cpl/powercfg/lang/ru-RU.rc +++ b/dll/cpl/powercfg/lang/ru-RU.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32 LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 5, 194, 36 GROUPBOX "&Схемы управления питанием", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Сохранить &как...", IDC_SAVEAS_BTN, 103, 85, 75, 15, WS_DISABLED PUSHBUTTON "&Удалить", IDC_DELETE_BTN, 183, 85, 55, 15, WS_DISABLED GROUPBOX "Нет данных", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "никогда" IDS_DEL_SCHEME "Вы уверены, что хотите удалить схему питания: ""%s""?" IDS_DEL_SCHEME_TITLE "Удалить Схему" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc index f203b8efb9c..c9230ee8c08 100644 --- a/dll/cpl/powercfg/lang/sk-SK.rc +++ b/dll/cpl/powercfg/lang/sk-SK.rc @@ -16,7 +16,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Vyberte schému napájania, ktorej nastavenie je najvhodnejšie pre tento počítač. Všimnite si, že zmenou nastavení v tomto okne sa zmení aj zvolená schéma.", -1, 37, 6, 209, 36 GROUPBOX "&Schémy napájania", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Uložiť ako...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "O&dstrániť", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Neznáme", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -138,8 +138,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -179,4 +179,5 @@ BEGIN IDS_TIMEOUT16 "Nikdy" IDS_DEL_SCHEME "Ste si istý, že chcete vymazať schému napájania: ""%s""?" IDS_DEL_SCHEME_TITLE "Vymazať schému" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc index afbe1ef091d..9e95da32502 100644 --- a/dll/cpl/powercfg/lang/sq-AL.rc +++ b/dll/cpl/powercfg/lang/sq-AL.rc @@ -13,7 +13,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Zgjidhni skemën energjisë me parametrat më të përshtatshme për këtë kompjuter. Vini re se ndryshimet e parametrave te më poshtëm do të ndryshojë skemën e zgjedhur.", -1, 37, 6, 209, 36 GROUPBOX "Skema e Energjisë", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ruaj Si...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "i panjohur", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -135,8 +135,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -176,4 +176,5 @@ BEGIN IDS_TIMEOUT16 "Kurrë" IDS_DEL_SCHEME "Jeni te sigurte qe doni te fshini skemën energjise: ""%s""?" IDS_DEL_SCHEME_TITLE "Fshij Skemen" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc index 7404de106c5..7e93a5c5891 100644 --- a/dll/cpl/powercfg/lang/th-TH.rc +++ b/dll/cpl/powercfg/lang/th-TH.rc @@ -8,7 +8,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Select the power scheme with the most appropriate settings for this computer. Note that changing the settings below will modify the selected scheme.", -1, 45, 13, 194, 36 GROUPBOX "P&ower schemes", -1, 7, 57, 240, 46 - COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 70, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&บันทึกเป็น...", IDC_SAVEAS_BTN, 100, 85, 75, 15, WS_DISABLED PUSHBUTTON "&ลบ", IDC_DELETE_BTN, 180, 85, 55, 15, WS_DISABLED GROUPBOX "ไม่ทราบค่า", IDC_GRPDETAIL, 7, 108, 240, 105 @@ -130,8 +130,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -171,4 +171,5 @@ BEGIN IDS_TIMEOUT16 "ไม่ตั้งค่า" IDS_DEL_SCHEME "Are you sure you want to delete the power scheme: ""%s""?" IDS_DEL_SCHEME_TITLE "Delete Scheme" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc index 96d61ce9d89..5931cd96d45 100644 --- a/dll/cpl/powercfg/lang/tr-TR.rc +++ b/dll/cpl/powercfg/lang/tr-TR.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. Aşağıdaki ayarların değiştirilmesi seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 209, 36 GROUPBOX "&Güç Düzenleri", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Ayrı Sakla...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "&Sil", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Bilinmiyor", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "Hiçbir Zaman" IDS_DEL_SCHEME "Güç düzenini silmek istediğinizden emin misiniz: ""%s""?" IDS_DEL_SCHEME_TITLE "Düzeni Sil" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc index 442301171b6..718cbcc29b1 100644 --- a/dll/cpl/powercfg/lang/uk-UA.rc +++ b/dll/cpl/powercfg/lang/uk-UA.rc @@ -16,7 +16,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 209, 36 GROUPBOX "&Схеми керування живленням", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Зберегти &як...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "В&идалити", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "Немає даних", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -138,8 +138,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -179,4 +179,5 @@ BEGIN IDS_TIMEOUT16 "ніколи" IDS_DEL_SCHEME "Ви дійсно бажаєте видалити схему керування електроживленням: ""%s""?" IDS_DEL_SCHEME_TITLE "Видалення схеми" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc index 9480303a3b6..422965da682 100644 --- a/dll/cpl/powercfg/lang/zh-CN.rc +++ b/dll/cpl/powercfg/lang/zh-CN.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 209, 36 GROUPBOX "电源使用方案(&O)", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "另存为(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "删除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "从不" IDS_DEL_SCHEME "您确定要删除电源使用方案吗: ""%s""?" IDS_DEL_SCHEME_TITLE "删除方案" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index 4f6874693c4..53a1a4c1884 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -10,7 +10,7 @@ BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36 GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50 - COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "另存爲(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136 @@ -132,8 +132,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8 EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 79, 40, 50, 14 - DEFPUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14 END STRINGTABLE @@ -173,4 +173,5 @@ BEGIN IDS_TIMEOUT16 "從不" IDS_DEL_SCHEME "您確定要刪除電源使用方案嗎: ""%s""?" IDS_DEL_SCHEME_TITLE "刪除方案" + IDS_DEL_SCHEME_ERROR "Unable to delete power scheme" END diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index 3ef3abfc684..d4feb28f5d9 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -10,7 +10,7 @@ */ #include "powercfg.h" - +#include <debug.h> typedef struct _POWER_SCHEME { @@ -245,16 +245,19 @@ LoadConfig( PPOWER_POLICY pp; HWND hwndCtrl; - if (pScheme == NULL) - { - iCurSel = (INT)SendDlgItemMessage(hwndDlg, + iCurSel = (INT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); - if (iCurSel == CB_ERR) - return; + if (iCurSel == CB_ERR) + return; + + EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), + (iCurSel > 0)); + if (pScheme == NULL) + { pScheme = (PPOWER_SCHEME)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETITEMDATA, @@ -323,10 +326,7 @@ LoadConfig( { SendMessage(hwndCtrl, CB_SETCURSEL, i, 0); } - } - - EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), - (pScheme != pPageData->pActivePowerScheme)); + } } @@ -519,8 +519,7 @@ Pos_SaveData( if (SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy)) { - pPageData->pActivePowerScheme = pScheme; - EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), FALSE); + pPageData->pActivePowerScheme = pScheme; } } @@ -536,6 +535,7 @@ DelScheme( INT iCurSel; HWND hList; PPOWER_SCHEME pScheme; + WCHAR szErrorText[512]; hList = GetDlgItem(hwnd, IDC_ENERGYLIST); @@ -556,8 +556,9 @@ DelScheme( if (MessageBoxW(hwnd, szCookedBuffer, szTitleBuffer, MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) { if (!DeletePwrScheme(pScheme->uId)) - { - // FIXME: Show an error message box + { + LoadStringW(hApplet, IDS_DEL_SCHEME_ERROR, szErrorText, sizeof(szErrorText) / sizeof(WCHAR)); + MessageBoxW(NULL, szErrorText, NULL, MB_OK | MB_ICONERROR); return FALSE; } @@ -569,7 +570,13 @@ DelScheme( iCurSel = SendMessage(hList, CB_FINDSTRING, -1, (LPARAM)pPageData->pActivePowerScheme->pszName); if (iCurSel != CB_ERR) + { SendMessage(hList, CB_SETCURSEL, iCurSel, 0); + } + else + { + SendMessage(hList, CB_SETCURSEL, 0, 0); + } LoadConfig(hwnd, pPageData, NULL); return TRUE; @@ -693,21 +700,31 @@ SaveScheme( { hwndList = GetDlgItem(hwndDlg, IDC_ENERGYLIST); - index = (INT)SendMessage(hwndList, - CB_ADDSTRING, - 0, - (LPARAM)SaveSchemeData.pNewScheme->pszName); - if (index != CB_ERR) - { - SendMessage(hwndList, - CB_SETITEMDATA, - index, - (LPARAM)SaveSchemeData.pNewScheme); - - SendMessage(hwndList, CB_SETCURSEL, (WPARAM)index, 0); + index = (INT)SendDlgItemMessage(hwndDlg, + IDC_ENERGYLIST, + CB_FINDSTRING, + -1, + (LPARAM)SaveSchemeData.pNewScheme->pszName); - LoadConfig(hwndDlg, pPageData, SaveSchemeData.pNewScheme); + if (index == CB_ERR) + { + index = (INT)SendMessage(hwndList, + CB_ADDSTRING, + 0, + (LPARAM)SaveSchemeData.pNewScheme->pszName); + if (index != CB_ERR) + { + SendMessage(hwndList, + CB_SETITEMDATA, + index, + (LPARAM)SaveSchemeData.pNewScheme); + + SendMessage(hwndList, CB_SETCURSEL, (WPARAM)index, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_BTN), TRUE); + } + } + LoadConfig(hwndDlg, pPageData, SaveSchemeData.pNewScheme); } } diff --git a/dll/cpl/powercfg/resource.h b/dll/cpl/powercfg/resource.h index b3a5095922a..16b6cefcca1 100644 --- a/dll/cpl/powercfg/resource.h +++ b/dll/cpl/powercfg/resource.h @@ -47,6 +47,7 @@ #define IDS_TIMEOUT15 165 #define IDS_DEL_SCHEME 166 #define IDS_DEL_SCHEME_TITLE 167 +#define IDS_DEL_SCHEME_ERROR 168 #define IDI_AC 175 #define IDI_DC 176 diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc index 4768ec5eb7b..281815f9efc 100644 --- a/dll/win32/netid/lang/fr-FR.rc +++ b/dll/win32/netid/lang/fr-FR.rc @@ -14,10 +14,10 @@ BEGIN LTEXT "Groupe de travail :", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 103, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer un utilisateur local, cliquez sur Identification Réseau.", IDC_STATIC, 6, 108, 160, 24 - PUSHBUTTON "&Identification &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15 + PUSHBUTTON "ID &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15 LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Changer.", IDC_STATIC, 6, 149, 160, 17 - PUSHBUTTON "&Changer...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15 - LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 250, 18 + PUSHBUTTON "Modifier...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15 + LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 244, 18 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

4 years, 5 months

[reactos] 01/01: [MSPAINT] Add to recent documents (#2651)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cc32161d1afc9fd69f0e… commit 0cc32161d1afc9fd69f0e09e83c8d7a94e76fa58 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 26 09:07:14 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 09:07:14 2020 +0900 [MSPAINT] Add to recent documents (#2651) Add to recent documents upon file save. CORE-3588 --- base/applications/mspaint/dib.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index dbe9003d667..ce74c093bd8 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -69,6 +69,8 @@ SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC, LPSYSTEMTIME time, int // TODO: update hRes and vRes CloseHandle(hFile); + + registrySettings.SetMostRecentFile(FileName); } void ShowFileLoadError(LPCTSTR name)

4 years, 5 months

[reactos] 01/01: [NOTEPAD] Add to recent documents (#2649)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f28cc0fc78060816e9d42… commit f28cc0fc78060816e9d42fcf5f9977d92cce5488 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 26 09:06:39 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 09:06:39 2020 +0900 [NOTEPAD] Add to recent documents (#2649) Add to recent documents upon file save. CORE-3588 --- base/applications/notepad/dialog.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index f69773e3b04..ca2711c8513 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -305,6 +305,12 @@ static BOOL DoSaveFile(VOID) CloseHandle(hFile); HeapFree(GetProcessHeap(), 0, pTemp); + + if (bRet) + { + SetFileName(Globals.szFileName); + } + return bRet; }

4 years, 5 months

[reactos] 01/01: [CONTROL] Fix hang while calling RunControlPanel() CORE-11373

by Robert Naumann

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=032b5aacd233cd7b83ab6… commit 032b5aacd233cd7b83ab6282aad638c161fdc400 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Thu Apr 23 19:28:14 2020 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Apr 25 19:04:09 2020 +0200 [CONTROL] Fix hang while calling RunControlPanel() CORE-11373 - based on a patch by Jira user "wimh" - also addressed Hermes' suggestion to use ARRAYSIZE instead of MAX_PATH --- base/applications/control/control.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index e08ed829b2f..a13000c1153 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -57,18 +57,12 @@ OpenShellFolder(LPWSTR lpFolderCLSID) static INT RunControlPanel(LPCWSTR lpCmd) { - /* - * Old method: - * WCHAR szParameters[MAX_PATH]; - wcscpy(szParameters, L"shell32.dll,Control_RunDLL "); - wcscat(szParameters, lpCmd); - return RUNDLL(szParameters); - */ + StringCchCopyW(szParameters, ARRAYSIZE(szParameters), L"shell32.dll,Control_RunDLL "); + if (FAILED(StringCchCatW(szParameters, ARRAYSIZE(szParameters), lpCmd))) + return 0; - /* New method: */ - Control_RunDLLW(GetDesktopWindow(), 0, lpCmd, SW_SHOW); - return 1; + return RUNDLL(szParameters); } INT

4 years, 5 months

[reactos] 01/01: [DESK][THEMEUI] Update French translation (#2591)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e15746849a38dd827a4af… commit e15746849a38dd827a4aff446738f794eee7d12a Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Apr 25 18:34:41 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 25 18:34:41 2020 +0200 [DESK][THEMEUI] Update French translation (#2591) Co-authored-by: Sylvain Deverre <deverre.sylv(a)gmail.com> --- boot/bootdata/hivecls.inf | 12 ++++++ boot/bootdata/hivedef.inf | 88 ++++++++++++++++++++--------------------- dll/cpl/desk/lang/bg-BG.rc | 1 + dll/cpl/desk/lang/cs-CZ.rc | 1 + dll/cpl/desk/lang/de-DE.rc | 1 + dll/cpl/desk/lang/el-GR.rc | 1 + dll/cpl/desk/lang/en-GB.rc | 1 + dll/cpl/desk/lang/en-US.rc | 1 + dll/cpl/desk/lang/es-ES.rc | 1 + dll/cpl/desk/lang/et-EE.rc | 1 + dll/cpl/desk/lang/fr-FR.rc | 63 ++++++++++++++--------------- dll/cpl/desk/lang/he-IL.rc | 1 + dll/cpl/desk/lang/hu-HU.rc | 1 + dll/cpl/desk/lang/id-ID.rc | 1 + dll/cpl/desk/lang/it-IT.rc | 1 + dll/cpl/desk/lang/ja-JP.rc | 1 + dll/cpl/desk/lang/nl-NL.rc | 1 + dll/cpl/desk/lang/no-NO.rc | 1 + dll/cpl/desk/lang/pl-PL.rc | 1 + dll/cpl/desk/lang/pt-BR.rc | 1 + dll/cpl/desk/lang/pt-PT.rc | 1 + dll/cpl/desk/lang/ro-RO.rc | 1 + dll/cpl/desk/lang/ru-RU.rc | 1 + dll/cpl/desk/lang/sk-SK.rc | 1 + dll/cpl/desk/lang/sq-AL.rc | 1 + dll/cpl/desk/lang/sv-SE.rc | 1 + dll/cpl/desk/lang/tr-TR.rc | 1 + dll/cpl/desk/lang/uk-UA.rc | 1 + dll/cpl/desk/lang/zh-CN.rc | 1 + dll/cpl/desk/lang/zh-TW.rc | 1 + dll/cpl/desk/resource.h | 1 + dll/win32/themeui/lang/fr-FR.rc | 35 ++++++++++++++++ dll/win32/themeui/themeui.rc | 3 ++ 33 files changed, 154 insertions(+), 75 deletions(-) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 0d8f8bd83ea..cded7be80a2 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -849,6 +849,18 @@ MIDFILE="Séquence MIDI" CDAFILE="Piste de CD Audio" AVIFILE="Clip Vidéo" +CSSFILE="Fichier CSS" +SCFFILE="Commande de l'explorateur ReactOS" + +;; For .reg files, right-click menu +MERGE="Fusionner" + +;; For screensaver (*.scr) and MSI install package (*.msi) files, right-click menu +CONFIGURE="Configurer" +INSTALL="Installer" +UNINSTALL="Désinstaller" +REPAIR="Réparer" +TEST="Tester" ; LANG_ITALIAN SUBLANG_NEUTRAL [Strings.0010] diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index a8651695214..7324c6243bb 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -223,7 +223,7 @@ HKCU,"Control Panel\Appearance\New Schemes","SelectedStyle",0x00020000,"0" HKCU,"Control Panel\Appearance\New Schemes\0","DisplayName",0x00020000,"@themeui.dll,-883" HKCU,"Control Panel\Appearance\New Schemes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -294,7 +294,7 @@ HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-850" HKCU,"Control Panel\Appearance\New Schemes\1","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -365,7 +365,7 @@ HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x00020000,"@themeui.dll,-852" HKCU,"Control Panel\Appearance\New Schemes\2","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -436,7 +436,7 @@ HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\3","DisplayName",0x00020000,"@themeui.dll,-877" HKCU,"Control Panel\Appearance\New Schemes\3","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -507,7 +507,7 @@ HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\4","DisplayName",0x00020000,"@themeui.dll,-853" HKCU,"Control Panel\Appearance\New Schemes\4","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -578,7 +578,7 @@ HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\5","DisplayName",0x00020000,"@themeui.dll,-856" HKCU,"Control Panel\Appearance\New Schemes\5","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -649,7 +649,7 @@ HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\6","DisplayName",0x00020000,"@themeui.dll,-859" HKCU,"Control Panel\Appearance\New Schemes\6\","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -720,7 +720,7 @@ HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\7","DisplayName",0x00020000,"@themeui.dll,-862" HKCU,"Control Panel\Appearance\New Schemes\7","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -791,7 +791,7 @@ HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\8","DisplayName",0x00020000,"@themeui.dll,-865" HKCU,"Control Panel\Appearance\New Schemes\8","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -862,7 +862,7 @@ HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\9","DisplayName",0x00020000,"@themeui.dll,-867" HKCU,"Control Panel\Appearance\New Schemes\9","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -933,7 +933,7 @@ HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Size #8",0x000b0001,12,00 HKCU,"Control Panel\Appearance\New Schemes\10","DisplayName",0x00020000,"@themeui.dll,-868" HKCU,"Control Panel\Appearance\New Schemes\10","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1004,7 +1004,7 @@ HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\11","DisplayName",0x00020000,"@themeui.dll,-869" HKCU,"Control Panel\Appearance\New Schemes\11","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1075,7 +1075,7 @@ HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\12","DisplayName",0x00020000,"@themeui.dll,-870" HKCU,"Control Panel\Appearance\New Schemes\12","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1146,7 +1146,7 @@ HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\13","DisplayName",0x00020000,"@themeui.dll,-872" HKCU,"Control Panel\Appearance\New Schemes\13","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1217,7 +1217,7 @@ HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\14","DisplayName",0x00020000,"@themeui.dll,-880" HKCU,"Control Panel\Appearance\New Schemes\14","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1288,7 +1288,7 @@ HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\15","DisplayName",0x00020000,"@themeui.dll,-874" HKCU,"Control Panel\Appearance\New Schemes\15","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1359,7 +1359,7 @@ HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\16","DisplayName",0x00020000,"@themeui.dll,-851" HKCU,"Control Panel\Appearance\New Schemes\16","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1430,7 +1430,7 @@ HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\17","DisplayName",0x00020000,"@themeui.dll,-884" HKCU,"Control Panel\Appearance\New Schemes\17","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1501,7 +1501,7 @@ HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\18","DisplayName",0x00020000,"@themeui.dll,-876" HKCU,"Control Panel\Appearance\New Schemes\18","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1572,7 +1572,7 @@ HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\19","DisplayName",0x00020000,"@themeui.dll,-878" HKCU,"Control Panel\Appearance\New Schemes\19","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1643,7 +1643,7 @@ HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\20","DisplayName",0x00020000,"@themeui.dll,-879" HKCU,"Control Panel\Appearance\New Schemes\20","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1714,7 +1714,7 @@ HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\21","DisplayName",0x00020000,"@themeui.dll,-871" HKCU,"Control Panel\Appearance\New Schemes\21","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1785,7 +1785,7 @@ HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Size #8",0x000b0001,12,0 HKCU,"Control Panel\Appearance\New Schemes\22","DisplayName",0x00020000,"@themeui.dll,-873" HKCU,"Control Panel\Appearance\New Schemes\22","LegacyName",0x00020000,"%DESKTOP_SCHEME_22%" HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" -HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" +HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_22%" HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\22\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -2736,28 +2736,28 @@ POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high per POWERCFG_NAME_5="Max Battery" POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." DESKTOP_SCHEME_0="ReactOS Standard" -DESKTOP_SCHEME_1="Brick" -DESKTOP_SCHEME_2="Eggplant" -DESKTOP_SCHEME_3="Green Olive" -DESKTOP_SCHEME_4="High Contrast 1" -DESKTOP_SCHEME_5="High Contrast 2" -DESKTOP_SCHEME_6="High Contrast Black" -DESKTOP_SCHEME_7="High Contrast White" -DESKTOP_SCHEME_8="Lilac" -DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_1="Brique" +DESKTOP_SCHEME_2="Aubergine" +DESKTOP_SCHEME_3="Epicéa" +DESKTOP_SCHEME_4="Contraste élevé n°1" +DESKTOP_SCHEME_5="Contraste élevé n°2" +DESKTOP_SCHEME_6="Contraste élevé noir" +DESKTOP_SCHEME_7="Contraste élevé blanc" +DESKTOP_SCHEME_8="Lilas" +DESKTOP_SCHEME_9="Erable" DESKTOP_SCHEME_10="Marine" -DESKTOP_SCHEME_11="Plum" -DESKTOP_SCHEME_12="Pumpkin" -DESKTOP_SCHEME_13="Rainy Day" -DESKTOP_SCHEME_14="ReactOS Classic" -DESKTOP_SCHEME_15="Rose" -DESKTOP_SCHEME_16="Sand" -DESKTOP_SCHEME_17="Sky" -DESKTOP_SCHEME_18="Slate" -DESKTOP_SCHEME_19="Storm" -DESKTOP_SCHEME_20="Teal" -DESKTOP_SCHEME_21="Wheat" -DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_11="Prune" +DESKTOP_SCHEME_12="Citrouille" +DESKTOP_SCHEME_13="Jour pluvieux" +DESKTOP_SCHEME_14="ReactOS Classique" +DESKTOP_SCHEME_15="Rose saumon" +DESKTOP_SCHEME_16="Désert" +DESKTOP_SCHEME_17="Ciel" +DESKTOP_SCHEME_18="Ardoise" +DESKTOP_SCHEME_19="Tempête" +DESKTOP_SCHEME_20="Sarcelle" +DESKTOP_SCHEME_21="Blé" +DESKTOP_SCHEME_22="Bleu, blanc, rouge" DESKTOP_SCHEME_SIZE_0="Taille par défaut" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index 0b01e181d4b..0d348d5162d 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -76,6 +76,7 @@ CAPTION "Разширен облик" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Част", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index 134efa238e5..73e7fe8e454 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -82,6 +82,7 @@ CAPTION "Upřesnit vzhled" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Položka", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index 61b618a2b69..ff36b9b078a 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -76,6 +76,7 @@ CAPTION "Erweiterte Darstellung" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index e758ac99377..faef0bf8fc9 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -76,6 +76,7 @@ CAPTION "Πρόσθετες ρυθμίσεις εμφάνισης" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Αντικείμενο", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 02c71f9edd5..9ac99cd9eb9 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -76,6 +76,7 @@ CAPTION "Advanced Appearance" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index a0fa23477f9..0d7fbf1dfa0 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -76,6 +76,7 @@ CAPTION "Advanced Appearance" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 1f13b440d9c..590b19d09c1 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -86,6 +86,7 @@ CAPTION "Opciones avanzadas de apariencia" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Elemento", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index b17803a396c..ef85fcab0f2 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -83,6 +83,7 @@ CAPTION "Täpsem ilme" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Üksus", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index f58397ca572..9560b8fb5d8 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -3,30 +3,30 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_THEMES DIALOGEX 0, 0, 246, 210 -CAPTION "Themes" +CAPTION "Thèmes" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 - LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 + LTEXT "Un thème est un fond d'écran et un ensemble de sons, icones et autres éléments vous permettant de personnaliser votre ordinateur en un clic.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Thème :", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 - PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14 + PUSHBUTTON "Enregistrer sous...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 + PUSHBUTTON "&Supprimer", IDC_THEMES_DELETE, 170, 70, 70, 14 CONTROL "", IDC_THEMES_PREVIEW, "STATIC", SS_BITMAP, 5, 90, 235, 115, WS_EX_CLIENTEDGE END IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fond d'écran" +CAPTION "Bureau" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86 - LTEXT "Sélectionnez une image à utiliser comme fond d'écran", IDC_STATIC, 8, 93, 230, 9 + LTEXT "Arrière-plan :", IDC_STATIC, 8, 93, 230, 9 PUSHBUTTON "&Parcourir...", IDC_BROWSE_BUTTON, 188, 104, 55, 15 PUSHBUTTON "&Couleur...", IDC_COLOR_BUTTON, 188, 167, 55, 15 - LTEXT "Position", IDC_STATIC, 188, 128, 55, 9 + LTEXT "Position :", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -78,53 +78,54 @@ CAPTION "Apparence avancée" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Élément", 8, 5, 160, 50, 9 + LTEXT "Si vous sélectionnez un paramètre de boutons et de fenêtres autre que ReactOS classique, celui-ci va remplacer les paramètres suivants exception faite de certains programmes plus anciens.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE + LTEXT "Élément :", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Taille", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 + LTEXT "&Taille :", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&1ère Couleur", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "Couleur 1 :", IDC_ADVAPPEARANCE_COLOR1_T, 180, 160, 34, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&2ème Couleur", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 - CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Police", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + LTEXT "Couleur 2 :", IDC_ADVAPPEARANCE_COLOR2_T, 215, 160, 34, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 218, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "Police :", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Taille", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + LTEXT "Taille :", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Couleur", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 + LTEXT "Couleur :", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP - AUTOCHECKBOX "G", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE - AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "G", IDC_ADVAPPEARANCE_FONTBOLD, 218, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 232, 200, 14, 13, BS_PUSHLIKE PUSHBUTTON "Annuler", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END -IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 +IDD_EFFAPPEARANCE DIALOGEX 0, 0, 370, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "Effets" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Utilisez l'effet de transition suivant pour les menus et les bulles d'aides", + CONTROL "&Utilisez l'effet de transition suivant pour les menus et les info-bulles :", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&tilisez la méthode suivante pour aplanir les bords des polices d'écran", IDC_EFFAPPEARANCE_SMOOTHING, + CONTROL "U&tilisez la méthode suivante pour lisser les bords des polices d'écran :", IDC_EFFAPPEARANCE_SMOOTHING, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Uti&liser de grandes icones", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 - CONTROL "&Montrer ombrage sous les menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, + CONTROL "&Afficher une ombre sous les menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 - CONTROL "Montrer contenu des fenêtres lorsqu'elles sont bougés", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, + CONTROL "Afficher le contenu des fenêtres pendant leur déplacement", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 - CONTROL "&Cacher les lettres soulignées pour la navigation du clavier jusqu'à ce que j'appuie sur la touche Alt", - IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 - CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + CONTROL "Masquer les lettres soulignées pour la navigation au clavier jusqu'à ce que j'appuie sur la touche Alt", + IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 360, 19 + CONTROL "Utiliser les menus plats", IDC_EFFAPPEARANCE_FLATMENUS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Annuler", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "Accepter", IDOK, 172, 165, 50, 14 @@ -135,7 +136,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paramètres" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arragement physique de vos moniteurs.", -1, 3, 3, 240, 20 + LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arrangement physique de vos moniteurs.", -1, 3, 3, 240, 20 CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE LTEXT "&Affichage", 1820, 3, 107, 70, 9 @@ -199,14 +200,14 @@ END STRINGTABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" + IDS_SLIDEEFFECT "Effet de déroulement" + IDS_FADEEFFECT "Effet de fondu" END STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "Anticrénelage FreeType" + IDS_CLEARTYPEEFFECT "FreeType" END STRINGTABLE @@ -272,7 +273,7 @@ BEGIN IDS_ELEMENT_13 "Fond de l'application" IDS_ELEMENT_14 "Espace entre les icônes (horizontal)" IDS_ELEMENT_15 "Espace entre les icônes (vertical)" - IDS_ELEMENT_16 "Info rapide" + IDS_ELEMENT_16 "Info-bulle" IDS_ELEMENT_17 "Icône" // IDS_ELEMENT_18 "Éléments de menu désactivés" END diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index 24669317823..5d68fa765ec 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -76,6 +76,7 @@ CAPTION "מראה מתקדם" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 981997c08fe..c7cb68ea178 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -78,6 +78,7 @@ CAPTION "Advanced Appearance" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index 369f8e1fbb1..34d02af8965 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -76,6 +76,7 @@ CAPTION "Penampilan Lanjutan" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Elemen", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index 0b69f3621f3..385baadfc01 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -76,6 +76,7 @@ CAPTION "Avanzato" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Elemento", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index f1615452c8f..648199a1c82 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -76,6 +76,7 @@ CAPTION "デザインの詳細" FONT 9, "MS UI Gothic" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "設定要素:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 7643fad12ec..37ce5c267d9 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -76,6 +76,7 @@ CAPTION "Geavanceerde vormgeving" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 6b94d4eaa58..060659b6582 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -76,6 +76,7 @@ CAPTION "Avansert utseende" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 0b895a709c2..6d6be0c3e15 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -85,6 +85,7 @@ CAPTION "Ustawienia zaawansowane" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index 713244ef103..a0977cf3180 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -76,6 +76,7 @@ CAPTION "Aparência avançada" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Item:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index 34dd73e3097..e84f7541c10 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -81,6 +81,7 @@ CAPTION "Aspecto avançado" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Item:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index ac1ba9a0504..b1e44b96cae 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -81,6 +81,7 @@ CAPTION "Opțiuni avansate" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index ba2182d5a1f..e7cabdf5342 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -76,6 +76,7 @@ CAPTION "Дополнительное оформление" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Элемент", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index ce05f458549..1fc3c37250f 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -78,6 +78,7 @@ CAPTION "Spresnenie vzhľadu" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "P&oložka", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index c8828797235..fa3e656793c 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -80,6 +80,7 @@ CAPTION "Shfaqje e Avancuar" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Elemente", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index ddadce8161d..7cd1380ae32 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -78,6 +78,7 @@ CAPTION "Advanced Appearance" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index 261272b52da..3e67344fc8c 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -78,6 +78,7 @@ CAPTION "Gelişmiş Görünüm" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "&Öğe", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index b7363988db0..f3221751a19 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -84,6 +84,7 @@ CAPTION "Додаткове оформлення" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "Елемент", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index 25be422366b..bf09c1058b2 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -84,6 +84,7 @@ CAPTION "高级外观" FONT 9, "宋体" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "项目:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index bcd863afce2..0d25112685e 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -79,6 +79,7 @@ CAPTION "進階外觀" FONT 9, "新細明體" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE LTEXT "項目:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index fb00e1228dc..4e754afd061 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -128,6 +128,7 @@ #define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 #define IDC_ADVAPPEARANCE_FONTBOLD 3116 #define IDC_ADVAPPEARANCE_FONTITALIC 3117 +#define IDC_ADVAPPEARANCE_DISCLAIMER 3118 #define IDS_ELEMENT_0 3200 #define IDS_ELEMENT_1 3201 diff --git a/dll/win32/themeui/lang/fr-FR.rc b/dll/win32/themeui/lang/fr-FR.rc new file mode 100644 index 00000000000..19313ef2899 --- /dev/null +++ b/dll/win32/themeui/lang/fr-FR.rc @@ -0,0 +1,35 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_BRICK "Brique" + IDS_EGGPLANT "Aubergine" + IDS_GOLIVE "Epicéa" + IDS_HCONTRAST_1 "Contraste élevé n°1" + IDS_HCONTRAST_2 "Contraste élevé n°2" + IDS_HCONTRAST_BLACK "Contraste élevé noir" + IDS_HCONTRAST_WHITE "Contraste élevé blanc" + IDS_LILAC "Lilas" + IDS_MAPLE "Erable" + IDS_MARINE "Marine" + IDS_PLUM "Prune" + IDS_PUMPKIN "Citrouille" + IDS_RAIN "Jour pluvieux" + IDS_RWB "Bleu, blanc, rouge" + IDS_CLASSIC "ReactOS Classique" + IDS_STANDARD "ReactOS Standard" + IDS_ROSE "Rose saumon" + IDS_SAND "Désert" + IDS_SLATE "Ardoise" + IDS_SKY "Ciel" + IDS_STORM "Tempête" + IDS_TEAL "Sarcelle" + IDS_WHEAT "Blé" +END + +STRINGTABLE +BEGIN + IDS_SIZE_NORMAL "Normal" + IDS_SIZE_LARGE "Large" + IDS_SIZE_XLARGE "Extra Large" +END diff --git a/dll/win32/themeui/themeui.rc b/dll/win32/themeui/themeui.rc index 8d9cb6615c3..ed174eecdb0 100644 --- a/dll/win32/themeui/themeui.rc +++ b/dll/win32/themeui/themeui.rc @@ -25,6 +25,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif

4 years, 5 months

[reactos] 01/01: [COMDLG32][REGEDIT] Fix display problems (CORE-16890) (#2638)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c682e4c1670be4f23d02… commit 9c682e4c1670be4f23d02503b21256886e18b2b1 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Apr 25 10:41:01 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 25 10:41:01 2020 +0200 [COMDLG32][REGEDIT] Fix display problems (CORE-16890) (#2638) --- dll/win32/comdlg32/filedlg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 1c05df91c22..1847d837c09 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -1915,7 +1915,11 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* change Open to Save */ if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { +#ifdef __REACTOS__ + WCHAR buf[24]; +#else WCHAR buf[16]; +#endif LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, ARRAY_SIZE(buf)); SetDlgItemTextW(hwnd, IDOK, buf); LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, ARRAY_SIZE(buf));

4 years, 5 months

[reactos] 01/01: [SHELL32] Command 'start C:' should open 'C:\' (#2642)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d32858413d9bd5153153b… commit d32858413d9bd5153153be2168702691d2559d98 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 25 11:01:20 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 25 11:01:20 2020 +0900 [SHELL32] Command 'start C:' should open 'C:\' (#2642) Based on JIRA user amaneureka's idea. In SHELL_execute function, add a backslash for Drive "C:", "D:" or "E:" etc. CORE-16384 --- dll/win32/shell32/shlexec.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 3514c9c380a..4e31cfff625 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1824,6 +1824,14 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) if(l > dwApplicationNameLen) dwApplicationNameLen = l + 1; wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen * sizeof(WCHAR)); memcpy(wszApplicationName, sei_tmp.lpFile, l * sizeof(WCHAR)); + + if (wszApplicationName[2] == 0 && wszApplicationName[1] == L':' && + ((L'A' <= wszApplicationName[0] && wszApplicationName[0] <= L'Z') || + (L'a' <= wszApplicationName[0] && wszApplicationName[0] <= L'z'))) + { + // 'C:' --> 'C:\' + PathAddBackslashW(wszApplicationName); + } } wszParameters = parametersBuffer;

4 years, 5 months

[reactos] 01/01: [SDK] Raise KERNEL_VERSION_PATCH_LEVEL to 15 in the version.cmake

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=950124bd0719814a9bc07… commit 950124bd0719814a9bc075159d13530874448ba1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Apr 24 22:22:22 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Apr 24 22:22:22 2020 +0200 [SDK] Raise KERNEL_VERSION_PATCH_LEVEL to 15 in the version.cmake --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index af97b8fb45c..95cde4307a2 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -2,7 +2,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "14") +set(KERNEL_VERSION_PATCH_LEVEL "15") set(COPYRIGHT_YEAR "2020") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds

4 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020