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)
+            index = (INT)SendDlgItemMessage(hwndDlg,
+                                          IDC_ENERGYLIST,
+                                          CB_FINDSTRING,
+                                          -1,
+                                          (LPARAM)SaveSchemeData.pNewScheme->pszName);
+
+            if (index == CB_ERR)
             {
-                SendMessage(hwndList,
-                            CB_SETITEMDATA,
-                            index,
-                            (LPARAM)SaveSchemeData.pNewScheme);
+                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);
-
-                LoadConfig(hwndDlg, pPageData, 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