From 5c7c95f6194bba7e4ce15a7a75e0bcb14137c686 Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Sun, 8 May 2011 13:16:30 +0000 Subject: [PATCH] [DESK] * Fix scheme selection in Czech, Greek, French, Hungarian, Italian, Dutch, Polish, Swedish and Ukrainian languages. svn path=/trunk/; revision=51643 --- reactos/dll/cpl/desk/lang/cs-CZ.rc | 2 +- reactos/dll/cpl/desk/lang/el-GR.rc | 2 +- reactos/dll/cpl/desk/lang/fr-FR.rc | 22 +++++++++++----------- reactos/dll/cpl/desk/lang/hu-HU.rc | 2 +- reactos/dll/cpl/desk/lang/it-IT.rc | 2 +- reactos/dll/cpl/desk/lang/nl-NL.rc | 2 +- reactos/dll/cpl/desk/lang/pl-PL.rc | 2 +- reactos/dll/cpl/desk/lang/sv-SE.rc | 2 +- reactos/dll/cpl/desk/lang/uk-UA.rc | 2 +- reactos/dll/cpl/desk/resource.h | 9 ++++----- 10 files changed, 23 insertions(+), 24 deletions(-) diff --git a/reactos/dll/cpl/desk/lang/cs-CZ.rc b/reactos/dll/cpl/desk/lang/cs-CZ.rc index 727eb9dcac8..bdc74c6baa9 100644 --- a/reactos/dll/cpl/desk/lang/cs-CZ.rc +++ b/reactos/dll/cpl/desk/lang/cs-CZ.rc @@ -59,7 +59,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Položka:", IDC_STATIC, 7, 159, 26, 9 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/lang/el-GR.rc b/reactos/dll/cpl/desk/lang/el-GR.rc index 9c832b0846b..4ce871c079c 100644 --- a/reactos/dll/cpl/desk/lang/el-GR.rc +++ b/reactos/dll/cpl/desk/lang/el-GR.rc @@ -52,7 +52,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Óõíäõáóìüò ÷ñùìÜôùí", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Ãéá ðñï÷ùñçìÝíïõò", IDC_APPEARANCE_ADVANCED, 178, 170, 68, 15 END diff --git a/reactos/dll/cpl/desk/lang/fr-FR.rc b/reactos/dll/cpl/desk/lang/fr-FR.rc index a0b3ee3f6d6..7db68b3b66d 100644 --- a/reactos/dll/cpl/desk/lang/fr-FR.rc +++ b/reactos/dll/cpl/desk/lang/fr-FR.rc @@ -55,8 +55,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Modèle de couleurs", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effets...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Avancé", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -101,22 +101,22 @@ END IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 340, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effets" +CAPTION "Effects" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Utiliser l'effet de transition suivant pour les menus et les bulles d'aides :",IDC_EFFAPPEARANCE_ANIMATION,"button", + CONTROL "&Utilisez l'effet de transition suivant pour les menus et les bulles d'aides:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 330, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&tiliser la méthode suivante pour lisser les bords des polices d'écran :",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "U&tilisez la méthode suivante pour aplanir les bords des polices d'écran:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 330, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "Uti&liser de grandes icones",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 330, 19 - CONTROL "&Montrer les ombres sous les menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "&Montrer ombrage sous les menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 330, 19 - CONTROL "Montrer le contenu des fenêtres lorsqu'elles sont bougées",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Montrer contenu des fenêtres lorsqu'elles sont bougés",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 330, 19 - CONTROL "&Cacher les lettres soulignées pour la navigation au clavier jusqu'à ce que j'appuie sur la touche Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + 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, 330, 19 PUSHBUTTON "Annuler", IDCANCEL, 281, 165, 50, 14 DEFPUSHBUTTON "Accepter", IDOK, 227, 165, 50, 14 @@ -181,8 +181,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Effet de glissement" - IDS_FADEEFFECT "Effet de fondu" + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" END STRINGTABLE DISCARDABLE @@ -263,6 +263,6 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_DISPLAY_SETTINGS "Paramètres d'affichage" - IDS_APPLY_FAILED "Échec lors de l'application des nouveaux paramètres..." + IDS_APPLY_FAILED "Echec lors de l'application des nouveaux paramètres..." IDS_APPLY_NEEDS_RESTART "Vous devez redémarrer votre ordinateur pour appliquer les modifications." END diff --git a/reactos/dll/cpl/desk/lang/hu-HU.rc b/reactos/dll/cpl/desk/lang/hu-HU.rc index 202fe1559fd..544d7f0ca36 100644 --- a/reactos/dll/cpl/desk/lang/hu-HU.rc +++ b/reactos/dll/cpl/desk/lang/hu-HU.rc @@ -53,7 +53,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/lang/it-IT.rc b/reactos/dll/cpl/desk/lang/it-IT.rc index 30af0cd3ded..3c80466aaaf 100644 --- a/reactos/dll/cpl/desk/lang/it-IT.rc +++ b/reactos/dll/cpl/desk/lang/it-IT.rc @@ -52,7 +52,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schema dei colori", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effetti...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "A&vanzato...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/lang/nl-NL.rc b/reactos/dll/cpl/desk/lang/nl-NL.rc index 9165bcecee1..1b49da6be45 100644 --- a/reactos/dll/cpl/desk/lang/nl-NL.rc +++ b/reactos/dll/cpl/desk/lang/nl-NL.rc @@ -54,7 +54,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Kleurenschema:", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effecten...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Geavan&ceerd...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/lang/pl-PL.rc b/reactos/dll/cpl/desk/lang/pl-PL.rc index 418502be1df..367abd95404 100644 --- a/reactos/dll/cpl/desk/lang/pl-PL.rc +++ b/reactos/dll/cpl/desk/lang/pl-PL.rc @@ -63,7 +63,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schemat kolorów", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/lang/sv-SE.rc b/reactos/dll/cpl/desk/lang/sv-SE.rc index b73e7fa6ca6..fe9659a9b3c 100644 --- a/reactos/dll/cpl/desk/lang/sv-SE.rc +++ b/reactos/dll/cpl/desk/lang/sv-SE.rc @@ -55,7 +55,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/lang/uk-UA.rc b/reactos/dll/cpl/desk/lang/uk-UA.rc index ff8888a85a9..76e91399fd4 100644 --- a/reactos/dll/cpl/desk/lang/uk-UA.rc +++ b/reactos/dll/cpl/desk/lang/uk-UA.rc @@ -60,7 +60,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Êîë³ðíà ñõåìà", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Åôåêòè...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Äîäàòêîâî", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END diff --git a/reactos/dll/cpl/desk/resource.h b/reactos/dll/cpl/desk/resource.h index ae02abac30f..aafa9407264 100644 --- a/reactos/dll/cpl/desk/resource.h +++ b/reactos/dll/cpl/desk/resource.h @@ -92,11 +92,10 @@ /* Appearance Page */ #define IDC_APPEARANCE_PREVIEW 1500 -#define IDC_APPEARANCE_UI_ITEM 1501 -#define IDC_APPEARANCE_COLORSCHEME 1502 -#define IDC_APPEARANCE_FONTSIZE 1503 -#define IDC_APPEARANCE_EFFECTS 1504 -#define IDC_APPEARANCE_ADVANCED 1505 +#define IDC_APPEARANCE_COLORSCHEME 1501 +#define IDC_APPEARANCE_FONTSIZE 1502 +#define IDC_APPEARANCE_EFFECTS 1503 +#define IDC_APPEARANCE_ADVANCED 1504 #define IDS_INACTWIN 1510 #define IDS_ACTWIN 1511