From 393a88a3721a1d72f49060f3245befec5bebf8e5 Mon Sep 17 00:00:00 2001
From: Joachim Henze <joachim.henze@reactos.org>
Date: Fri, 10 Nov 2023 00:33:17 +0100
Subject: [PATCH] [POWERCFG] 640x480-ify and overhaul (#5933)

Main goal was making the dlg display well in 640x480 resolution.
Since the dialogs in that propsheet had very different sizes between the languages
that was a lot of work. Now all of the propsheet-dlgs are harmonized in size to 252x220.
Also I found a way to align some controls in a way that they are more immune
to differing languages lengths for specific strings, so we can currently
to 100% use the same controls dimensions and positions also,
which is a very nice trait. I double-checked all dialogs visually in ResHacker
for all languages (except no-NO.rc for technical reasons), and they do look all
very well like that. The slider for the alarms dlg I enlarged in x,
it has 100 distinct positions, so a larger slider helps the user
not having to position the mouse extremely accurate.
I also fixed various typos, and several places where text cutoff occurred for many languages,
too many to name them all.
Some dummy-strings "unknown" I changed to "?" instead.
That still allows to see its position in a previewer,
but does not lure all the translators into translating that nonsense,
and therefore keeps the rcs better in sync. It also shrinks binary size.
---
 dll/cpl/powercfg/lang/bg-BG.rc | 176 +++++++++++++++----------------
 dll/cpl/powercfg/lang/cs-CZ.rc | 154 +++++++++++++--------------
 dll/cpl/powercfg/lang/de-DE.rc | 179 ++++++++++++++++---------------
 dll/cpl/powercfg/lang/el-GR.rc | 152 +++++++++++++--------------
 dll/cpl/powercfg/lang/en-US.rc | 152 +++++++++++++--------------
 dll/cpl/powercfg/lang/es-ES.rc | 170 +++++++++++++++---------------
 dll/cpl/powercfg/lang/fr-FR.rc | 178 ++++++++++++++++---------------
 dll/cpl/powercfg/lang/he-IL.rc | 154 +++++++++++++--------------
 dll/cpl/powercfg/lang/id-ID.rc | 182 ++++++++++++++++----------------
 dll/cpl/powercfg/lang/it-IT.rc | 184 ++++++++++++++++----------------
 dll/cpl/powercfg/lang/ja-JP.rc | 154 +++++++++++++--------------
 dll/cpl/powercfg/lang/nl-NL.rc | 176 +++++++++++++++----------------
 dll/cpl/powercfg/lang/no-NO.rc | 154 +++++++++++++--------------
 dll/cpl/powercfg/lang/pl-PL.rc | 185 ++++++++++++++++-----------------
 dll/cpl/powercfg/lang/pt-PT.rc | 160 ++++++++++++++--------------
 dll/cpl/powercfg/lang/ro-RO.rc | 152 +++++++++++++--------------
 dll/cpl/powercfg/lang/ru-RU.rc | 178 ++++++++++++++++---------------
 dll/cpl/powercfg/lang/sk-SK.rc | 158 +++++++++++++---------------
 dll/cpl/powercfg/lang/sq-AL.rc | 157 +++++++++++++---------------
 dll/cpl/powercfg/lang/th-TH.rc | 158 ++++++++++++++--------------
 dll/cpl/powercfg/lang/tr-TR.rc | 152 +++++++++++++--------------
 dll/cpl/powercfg/lang/uk-UA.rc | 172 +++++++++++++++---------------
 dll/cpl/powercfg/lang/zh-CN.rc | 152 +++++++++++++--------------
 dll/cpl/powercfg/lang/zh-HK.rc | 152 +++++++++++++--------------
 dll/cpl/powercfg/lang/zh-TW.rc | 152 +++++++++++++--------------
 25 files changed, 1988 insertions(+), 2105 deletions(-)

diff --git a/dll/cpl/powercfg/lang/bg-BG.rc b/dll/cpl/powercfg/lang/bg-BG.rc
index 99fc03ef386..fde8d52289d 100644
--- a/dll/cpl/powercfg/lang/bg-BG.rc
+++ b/dll/cpl/powercfg/lang/bg-BG.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Наредби на захранването"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Когато компютърът се:", IDC_SAT, 15, 120, 60, 18
-    LTEXT "Захранва от мрежата", IDC_SAC, 100, 120, 45, 18
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "Захранва от батерии", IDC_SDC, 197, 120, 45, 18
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "Изключване на &монитора:", IDC_MONITOR, 15, 140, 80, 20
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Изключване на &твърдите дискове:", IDC_DISK, 15, 160, 80, 20
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Системата из&чаква:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Изберете най- подходящата настройка за този компютър. Обърнете внимание, че промяната на долните настройки ще променят избраната наредба.", -1, 37, 6, 208, 36
+    GROUPBOX "За&хранване", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Запис като...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Изтриване", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Когато компютърът се:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Захранва от мрежата", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Захранва от батерии", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Изключване на &монитора:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Изключване на &твърдите дискове:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Системата из&чаква:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Системата за&спива:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Системата за&спива:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Наредби на захранването"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Изключване на &монитора:", IDC_MONITOR, 15, 140, 80, 20
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Изключване на &твърдите дискове:", IDC_DISK, 15, 160, 80, 20
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Системата из&чаква:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Изберете най- подходящата настройка за този компютър. Обърнете внимание, че промяната на долните настройки ще променят избраната наредба.", -1, 37, 6, 208, 36
+    GROUPBOX "За&хранване", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Запис като...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Изтриване", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Изключване на &монитора:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Изключване на &твърдите дискове:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Системата из&чаква:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Системата за&спива:", IDC_HIBERNATE, 15, 195, 80, 10
+    LTEXT "Системата за&спива:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Тревоги"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Тревога при слаба батерия", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Тревога за &слаба батерия при ниво под:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "неизвестно", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Действие при &тревога...", -1, 5, 70, 85, 15, WS_DISABLED
-    LTEXT "Уведомяване:", -1, 95, 70, 50, 10
-    LTEXT "Неизвестно", IDC_ALARMMSG1, 180, 70, 55, 10
-    LTEXT "Действие:", -1, 95, 80, 45, 10
-    LTEXT "Неизвестно", IDC_ALARMAKTION1, 180, 80, 55, 10
-    LTEXT "Изпълняване на приложение:", -1, 95, 90, 50, 10
-    LTEXT "Неизвестно", IDC_ALARMPROG1, 180, 90, 55, 10
-    GROUPBOX "Тревога за разредена батерия", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Тревога при разреждане на батерията под:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "неизвестно", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "&Действие при тревога", -1, 10, 170, 85, 15, WS_DISABLED
-    LTEXT "Известяване:", -1, 95, 170, 50, 10
-    LTEXT "Неизвестно", IDC_ALARMMSG2, 180, 170, 55, 10
-    LTEXT "Действие:", -1, 95, 180, 45, 10
-    LTEXT "Неизвестно", IDC_ALARMAKTION2, 180, 180, 55, 10
-    LTEXT "Запуск на приложение:", -1, 95, 190, 90, 10
-    LTEXT "Неизвестно", IDC_ALARMPROG2, 180, 190, 55, 10
+    GROUPBOX "Тревога при слаба батерия", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Тревога за &слаба батерия при ниво под:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Действие при &тревога...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Уведомяване:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Действие:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Изпълняване на приложение:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Тревога за разредена батерия", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Тревога при разреждане на батерията под:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "&Действие при тревога...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Известяване:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Действие:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Запуск на приложение:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Разширени"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Изберете енергоспестяващи настройки.", -1, 30, 5, 205, 20
-    GROUPBOX "Възможности", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "Винаги има значе в задачната лента", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Искане на парола при излизане от изчакване", IDC_PASSWORDLOGON, 15, 55, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Затъмняване на екрана при работа на батерии", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Клавиши за захранване", -1, 5, 100, 230, 105
-    LTEXT "&При затваряне на капака на преносимия ми компютър:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "П&ри натискане на копчето за изключване на компютъра:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Пр&и натискане на копчето за приспиване на компютъра:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Изберете енергоспестяващи настройки.", -1, 37, 6, 208, 20
+    GROUPBOX "Възможности", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "Винаги има значе в задачната лента", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Искане на парола при излизане от изчакване", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Затъмняване на екрана при работа на батерии", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Клавиши за захранване", -1, 6, 101, 240, 110
+    LTEXT "&При затваряне на капака на преносимия ми компютър:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "П&ри натискане на копчето за изключване на компютъра:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Пр&и натискане на копчето за приспиване на компютъра:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Заспиване"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Когато компютърът ви заспи, той съхранява съдържанието на паметта си на твърдия диск, а когато се събуди го връща обратно.", -1, 35, 5, 195, 35
-    GROUPBOX "Заспиване", -1, 5, 45, 235, 25
-    AUTOCHECKBOX "Включване на за&спиването", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Дисково място за заспиване", -1, 5, 80, 240, 60
-    LTEXT "Свободно дисково място:", -1, 10, 90, 155, 10
-    LTEXT "Неизвестно", IDC_FREESPACE, 180, 90, 70, 10
-    LTEXT "Необходимо дисково място за заспиване:", -1, 10, 100, 155, 10
-    LTEXT "Неизвестно", IDC_SPACEFORHIBERNATEFILE, 180, 100, 55, 10
-    LTEXT "Трябва да освободите дисково пространство, за да може да заспива компютърът ви. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Когато компютърът ви заспи, той съхранява съдържанието на паметта си на твърдия диск, а когато се събуди го връща обратно.", -1, 37, 6, 208, 35
+    GROUPBOX "Заспиване", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "Включване на за&спиването", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Дисково място за заспиване", -1, 6, 80, 240, 76
+    LTEXT "Свободно дисково място:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Необходимо дисково място за заспиване:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Трябва да освободите дисково пространство, за да може да заспива компютърът ви.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/cs-CZ.rc b/dll/cpl/powercfg/lang/cs-CZ.rc
index 524bb4ac0b3..e4eea9d4c7b 100644
--- a/dll/cpl/powercfg/lang/cs-CZ.rc
+++ b/dll/cpl/powercfg/lang/cs-CZ.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schémata napájení"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "&Schéma napájení", -1, 6, 43, 240, 50
     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
-    LTEXT "Pokud je počítač:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "Připojen", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Funguje na baterie", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Vypnout &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Uložit jako...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Odstranit", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Pokud je počítač:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Připojen", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Funguje na baterie", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Vypnout &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Vypnout pevné &disky:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Vypnout pevné &disky:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schémata napájení"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "&Schéma napájení", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Vypnout &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Uložit jako...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Odstranit", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Vypnout &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Vypnout pevné &disky:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Vypnout pevné &disky:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Režim spánku:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Varování"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Varování o nízkém stavu baterie", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Aktivovat &varování o nízkém stavu baterie, když úroveň nabití dosáhne:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "neznámá", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "&Akce při varování...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Oznámení:", -1, 95, 71, 57, 10
-    LTEXT "Neznámé", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Akce:", -1, 95, 83, 55, 10
-    LTEXT "Neznámá", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Spustit program:", -1, 95, 95, 55, 10
-    LTEXT "Neznámý", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Varování o kritickém stavu baterie", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Aktivovat varování o &kritickém stavu baterie, když úroveň nabití dosáhne:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "neznámá", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Akce &při varování...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Oznámení:", -1, 95, 185, 50, 10
-    LTEXT "Neznámé", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Akce:", -1, 95, 198, 45, 10
-    LTEXT "Neznámá", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Spustit program:", -1, 95, 211, 50, 10
-    LTEXT "Neznámý", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Varování o nízkém stavu baterie", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Alarm nízká baterie na dosažení úro&vně:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "&Akce při varování...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Oznámení:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Akce:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Spustit program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Varování o kritickém stavu baterie", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Alarm &kritické baterie při dosažení úrovně nabití:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Akce &při varování...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Oznámení:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Akce:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Spustit program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Upřesnit"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Vyberte, které nastavení snížené spotřeby chcete použít.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Vyberte, které nastavení snížené spotřeby chcete použít.", -1, 37, 6, 208, 20
     GROUPBOX "Možnosti", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Vždy zobrazovat &ikonu na hlavním panelu", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "Dotázat se na &heslo při přechodu z úsporného režimu", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Snížit jas displeje při chodu na baterie.", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Tlačítka napájení", -1, 6, 101, 240, 127
+    AUTOCHECKBOX "&Snížit jas displeje při chodu na baterie", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Tlačítka napájení", -1, 6, 101, 240, 110
     LTEXT "&Při sklopení displeje přenosného počítače:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Při stisknutí tlačítka &napájení:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Při stisknutí tlačítka režimu &spánku:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Při stisknutí tlačítka &napájení:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Při stisknutí tlačítka režimu &spánku:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Režim spánku"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Pokud Váš počítač přejde do režimu spánku, uloží obsah své paměti na pevný disk a vypne se. Po opětovném spuštění se vrátí do původního stavu.", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Pokud Váš počítač přejde do režimu spánku, uloží obsah své paměti na pevný disk a vypne se. Po opětovném spuštění se vrátí do původního stavu.", -1, 37, 6, 208, 35
     GROUPBOX "Režim spánku", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Zapnout funkci režim &spánku", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Místo na disku potřebné pro režim spánku", -1, 6, 80, 240, 76
-    LTEXT "Volné místo:", -1, 15, 95, 140, 10
-    LTEXT "Neznámé", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Potřebné místo na disku:", -1, 15, 115, 140, 10
-    LTEXT "Neznámé", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Pro funkci režim spánku musíte uvolnit místo na disku. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Volné místo:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Potřebné místo na disku:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Pro funkci režim spánku musíte uvolnit místo na disku.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/de-DE.rc b/dll/cpl/powercfg/lang/de-DE.rc
index c520e563983..95c3ea447b0 100644
--- a/dll/cpl/powercfg/lang/de-DE.rc
+++ b/dll/cpl/powercfg/lang/de-DE.rc
@@ -1,128 +1,124 @@
-/* German translation by Lohnegrim Lohnegrim at gmx dot net */
+// COPYRIGHT: Lohnegrim <Lohnegrim@gmx.net>
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 218
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Energieschemata"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Bei:", IDC_SAT, 15, 120, 60, 10
-    LTEXT "Netzbetrieb", IDC_SAC, 100, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "Batteriebetrieb", IDC_SDC, 190, 120, 50, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "&Monitor ausschalten:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Festplatten ausschalten:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Standby:", IDC_STANDBY, 15, 180, 55, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 37, 6, 208, 36
+    GROUPBOX "&Energieschemata", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Speichern &unter...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Bei:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Netzbetrieb", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Batteriebetrieb", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "&Monitor ausschalten:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Festplatten ausschalten:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Standby:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Ruhezustand:", IDC_HIBERNATE, 15, 195, 55, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Ruhezustand:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 218
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Energieschemata"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "&Monitor ausschalten:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Festplatten ausschalten:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Standby:", IDC_STANDBY, 15, 180, 55, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 37, 6, 208, 36
+    GROUPBOX "&Energieschemata", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "Speichern &unter...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Löschen", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "&Monitor ausschalten:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Festplatten ausschalten:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Standby:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Ruhezustand:", IDC_HIBERNATE, 15, 195, 55, 10
+    LTEXT "&Ruhezustand:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarm bei niedrigem Batteriestand", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Alarm bei folgendem &Energiestand auslösen:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "Unbekannt", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Alar&maktion...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Benachrichtigung:", -1, 95, 70, 60, 10
-    LTEXT "Unbekannt", IDC_ALARMMSG1, 155, 70, 95, 10
-    LTEXT "Aktion:", -1, 95, 80, 45, 10
-    LTEXT "Unbekannt", IDC_ALARMAKTION1, 155, 80, 95, 10
-    LTEXT "Ausführen:", -1, 95, 90, 50, 10
-    LTEXT "Unbekannt", IDC_ALARMPROG1, 155, 90, 40, 10
-    GROUPBOX "Alarm bei kritischem Batteriestand", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Alarm bei folgendem &Energiestand auslösen:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "Unbekannt", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Alar&maktion...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Benachrichtigung:", -1, 95, 170, 60, 10
-    LTEXT "Unbekannt", IDC_ALARMMSG2, 155, 170, 95, 10
-    LTEXT "Aktion:", -1, 95, 180, 45, 10
-    LTEXT "Unbekannt", IDC_ALARMAKTION2, 155, 180, 95, 10
-    LTEXT "Ausführen:", -1, 95, 190, 50, 10
-    LTEXT "Unbekannt", IDC_ALARMPROG2, 155, 190, 40, 10
+    GROUPBOX "Alarm bei niedrigem Batteriestand", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "&Alarm bei folgendem Energiestand auslösen:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Alar&maktion...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Benachrichtigung:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Aktion:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Ausführen:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarm bei kritischem Batteriestand", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Alarm bei folgendem &Energiestand auslösen:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Alar&maktion...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Benachrichtigung:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Aktion:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Ausführen:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Erweitert"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Wählen Sie die Energiesparoptionen aus, die Sie verwenden möchten.", -1, 30, 5, 205, 20
-    GROUPBOX "Optionen", -1, 5, 35, 240, 55
-    AUTOCHECKBOX "&Symbol in der Taskleiste anzeigen", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Kennwort beim Reaktivieren aus dem Standbymodus anfordern", IDC_PASSWORDLOGON, 15, 55, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Helligkeit der Anzeige beim Batteriebetrieb verringern", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Netzschaltervorgänge", -1, 5, 100, 240, 105
-    LTEXT "Beim Schließen des &Laptops:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Beim Drücken des &Netzschalters am Computer:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Beim Drücken des Schalters für den &Ruhezustand am Computer:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Wählen Sie die Energiesparoptionen aus, die Sie verwenden möchten.", -1, 37, 6, 208, 20
+    GROUPBOX "Optionen", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "&Symbol in der Taskleiste anzeigen", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Kennwort beim Reaktivieren aus dem Standbymodus anfordern", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Helligkeit der Anzeige beim Batteriebetrieb verringern", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Netzschaltervorgänge", -1, 6, 101, 240, 110
+    LTEXT "Beim Schließen des &Laptops:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Beim Drücken des &Netzschalters am Computer:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Beim Drücken des Schalters für den &Ruhezustand am Computer:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ruhezustand"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Wenn der Computer in den Ruhezustand wechselt, wird der Inhalt des Arbeitsspeichers gespeichert und der Computer heruntergefahren. Wenn er wieder gestartet wird, kehrt er zum vorherigen Zustand zurück.", -1, 35, 5, 195, 35
-    GROUPBOX "Ruhezustand", -1, 5, 45, 240, 25
-    AUTOCHECKBOX "&Ruhezustand aktivieren", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Speicherplatz für den Ruhezustand", -1, 5, 80, 240, 60
-    LTEXT "Freier Speicherplatz:", -1, 10, 90, 100, 10
-    LTEXT "Unbekannt", IDC_FREESPACE, 120, 90, 70, 10
-    LTEXT "Für Ruhezustand benötigt:", -1, 10, 100, 115, 10
-    LTEXT "Unbekannt", IDC_SPACEFORHIBERNATEFILE, 120, 100, 55, 10
-    LTEXT "Geben Sie Speicherplatz frei, bevor Sie den Computer in den Ruhezustand versetzen.", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Wenn der Computer in den Ruhezustand wechselt, wird der Inhalt des Arbeitsspeichers gespeichert und der Computer heruntergefahren. Wenn er wieder gestartet wird, kehrt er zum vorherigen Zustand zurück.", -1, 37, 6, 208, 35
+    GROUPBOX "Ruhezustand", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "&Ruhezustand aktivieren", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Speicherplatz für den Ruhezustand", -1, 6, 80, 240, 76
+    LTEXT "Freier Speicherplatz:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Für Ruhezustand benötigt:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Geben Sie Speicherplatz frei, bevor Sie den Computer in den Ruhezustand versetzen.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,13 +126,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Schema speichern"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Energieschema speichern unter:", -1, 7, 7, 104, 8
+    LTEXT "Energieschema speichern unter:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Abbrechen", IDCANCEL, 133, 40, 50, 14
 END
 
-
 STRINGTABLE
 BEGIN
     IDS_CPLNAME_1 "Energie"
diff --git a/dll/cpl/powercfg/lang/el-GR.rc b/dll/cpl/powercfg/lang/el-GR.rc
index 4718ce978e3..7dd95c9bbd1 100644
--- a/dll/cpl/powercfg/lang/el-GR.rc
+++ b/dll/cpl/powercfg/lang/el-GR.rc
@@ -1,91 +1,87 @@
-/* Greek translation by Dj Apal (djapal at gmail dot com) */
+// COPYRIGHT: Dj Apal <djapal@gmail.com>
 
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Συνδυασμοί τροφοδοσίας"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 208, 36
     GROUPBOX "Σ&υνδυασμοί τροφοδοσίας", -1, 6, 43, 240, 50
     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
-    LTEXT "Όταν ο υπολογιστής:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "είναι στην πρίζα", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "λειτουργεί με μπαταρίες", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Σβήσιμο &οθόνης:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Αποθήκευση ως...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Διαγραφή", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Όταν ο υπολογιστής:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "είναι στην πρίζα", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "λειτουργεί με μπαταρίες", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Σβήσιμο &οθόνης:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Απενεργοποίηση &σκληρών δίσκων:", IDC_DISK, 13, 166, 84, 18
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σκληρός δίσκος:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Συνδυασμοί τροφοδοσίας"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Επιλέξτε τις ρυθμίσεις με τον πιο κατάλληλο συνδυασμό τροφοδοσίας για αυτόν τον υπολογιστή. Σημειώστε ότι αλλάζοντας τις παρακάτω ρυθμίσεις, θα τροποποιηθεί ο επιλεγμένος συνδυασμός.", -1, 37, 6, 208, 36
     GROUPBOX "Σ&υνδυασμοί τροφοδοσίας", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Σβήσιμο &οθόνης:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Αποθήκευση ως...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Διαγραφή", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Σβήσιμο &οθόνης:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Απενεργοποίηση &σκληρών δίσκων:", IDC_DISK, 13, 166, 84, 18
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&σκληρών δίσκων:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σύστημα σε α&ναμονή:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Σύστημα σε α&δράνεια:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ειδοποιήσεις"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Ειδοποίηση πεσμένης μπαταρίας", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Ενεργοποίηση ειδοποίησης όταν η ενέργεια φτάσει:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "Ειδοποίηση...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Ειδοποίηση:", -1, 95, 71, 57, 10
-    LTEXT "Άγνωστο", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Ενέργεια:", -1, 95, 83, 55, 10
-    LTEXT "Άγνωστο", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Εκτέλεση:", -1, 95, 95, 55, 10
-    LTEXT "Άγνωστο", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Ειδοποίηση κρίσιμου σημείου μπαταρίας", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Ενεργοποίηση ειδοποίησης όταν η ενέργεια φτάσει:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Ειδοποίηση...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Ειδοποίηση:", -1, 95, 185, 50, 10
-    LTEXT "Unknown", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Ενέργεια:", -1, 95, 198, 45, 10
-    LTEXT "Unknown", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Εκτέλεση:", -1, 95, 211, 50, 10
-    LTEXT "Unknown", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Ειδοποίηση πεσμένης μπαταρίας", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Ενεργοποίηση ειδοποίησης όταν η ενέργεια φτάσει:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Ειδοποίηση...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Ειδοποίηση:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Ενέργεια:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Εκτέλεση:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Ειδοποίηση κρίσιμου σημείου μπαταρίας", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Ενεργοποίηση ειδοποίησης όταν η ενέργεια φτάσει:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Ειδοποίηση...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Ειδοποίηση:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Ενέργεια:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Εκτέλεση:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
 IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
@@ -93,36 +89,36 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Για προχωρημένους"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Επιλέξτε τις ρυθμίσεις εξοικονόμησης ενέργειας που θέλετε να χρησιμοποιήσετε.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Επιλέξτε τις ρυθμίσεις εξοικονόμησης ενέργειας που θέλετε να χρησιμοποιήσετε.", -1, 37, 6, 208, 20
     GROUPBOX "Επιλογές", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Εμφάνιση του εικονιδίου στη γραμμή εργασιών", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Κωδικός πρόσβασης κατά την επαναφορά από αναμονή", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Εμφάνιση ένδειξης όταν εξαντλείται η μπαταρία", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Κουμπιά τροφοδοσίας", -1, 6, 101, 240, 127
+    GROUPBOX "Κουμπιά τροφοδοσίας", -1, 6, 101, 240, 110
     LTEXT "&Κατά το κλείσιμο του καλύμματος του φορητού υπολογιστή μου:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Κατά το κ&λείσιμο του υπολογιστή μου:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Κατά την &αναστολή λειτουεγίας του υπολογιστή μου:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Κατά το κ&λείσιμο του υπολογιστή μου:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Κατά την &αναστολή λειτουεγίας του υπολογιστή μου:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Αδρανοποίηση"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Όταν ο υπολογιστής αδρανοποιείται, αποθηκεύει ό,τι έχει στη μνήμη στο σκληρό δίσκο και μετά τερματίζεται η λειτουργία του. Όταν επανέρχεται από την αδρανοποίηση, επιστρέφει στο αρχικό του επίπεδο. ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Όταν ο υπολογιστής αδρανοποιείται, αποθηκεύει ό,τι έχει στη μνήμη στο σκληρό δίσκο και μετά τερματίζεται η λειτουργία του. Όταν επανέρχεται από την αδρανοποίηση, επιστρέφει στο αρχικό του επίπεδο. ", -1, 37, 6, 208, 35
     GROUPBOX "Αδρανοποίηση", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Ενε&ργοποίηση αδρανοποίησης", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Χώρος του δίσκου για λειτουργία αδρανοποίησης", -1, 6, 80, 240, 76
-    LTEXT "Διαθέσιμος χώρος στο δίσκο:", -1, 15, 95, 140, 10
-    LTEXT "Unknown", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Απαιτούμενος χώρος για αδρανοποίηση:", -1, 15, 115, 140, 10
-    LTEXT "Unknown", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Θα πρέπει να ελευθερώσετε χώρο στο δίσκο σας πριν ο υπολογιστής σας μπορέσει αν τεθεί σε κατάσταση αδρανοποίησης. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Διαθέσιμος χώρος στο δίσκο:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Απαιτούμενος χώρος για αδρανοποίηση:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Θα πρέπει να ελευθερώσετε χώρο στο δίσκο σας πριν ο υπολογιστής σας μπορέσει αν τεθεί σε κατάσταση αδρανοποίησης.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/en-US.rc b/dll/cpl/powercfg/lang/en-US.rc
index fd7005ead15..acdbf13abb3 100644
--- a/dll/cpl/powercfg/lang/en-US.rc
+++ b/dll/cpl/powercfg/lang/en-US.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Power Schemes"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50
     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
-    LTEXT "When computer is:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "Plugged in", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Running on batteries", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Turn off &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Save As...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Delete", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "When computer is:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Plugged in", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Running on batteries", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Turn off &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System s&tandby:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System s&tandby:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Power Schemes"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Turn off &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Save As...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Delete", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Turn off &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System s&tandby:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System s&tandby:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarms"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Low battery alarm", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "Alar&m Action...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Notification:", -1, 95, 71, 57, 10
-    LTEXT "Unknown", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Action:", -1, 95, 83, 55, 10
-    LTEXT "Unknown", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Run Program:", -1, 95, 95, 55, 10
-    LTEXT "Unknown", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Critical battery alarm", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, 15, 131, 195, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Alar&m Action...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Notification:", -1, 95, 185, 50, 10
-    LTEXT "Unknown", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Action:", -1, 95, 198, 45, 10
-    LTEXT "Unknown", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Run Program:", -1, 95, 211, 50, 10
-    LTEXT "Unknown", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Low battery alarm", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notification:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Action:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Run Program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Critical battery alarm", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notification:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Action:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Run Program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Select the power-saving settings you want to use.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Select the power-saving settings you want to use.", -1, 37, 6, 208, 20
     GROUPBOX "Options", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Alway&s show icon on the taskbar", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Prompt for password when computer resumes from standby", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Dim display when running on batteries", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Power buttons", -1, 6, 101, 240, 127
+    GROUPBOX "Power buttons", -1, 6, 101, 240, 110
     LTEXT "&When I close the lid of my portable computer:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernate"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state. ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state.", -1, 37, 6, 208, 35
     GROUPBOX "Hibernate", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Enable &hibernation", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Disk space for hibernation", -1, 6, 80, 240, 76
-    LTEXT "Free disk space:", -1, 15, 95, 140, 10
-    LTEXT "Unknown", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Disk space required to hibernate:", -1, 15, 115, 140, 10
-    LTEXT "Unknown", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "You must free some disk space before your computer can hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Free disk space:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Disk space required to hibernate:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "You must free some disk space before your computer can hibernate.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/es-ES.rc b/dll/cpl/powercfg/lang/es-ES.rc
index ee8447ba84a..9a8500c9e25 100644
--- a/dll/cpl/powercfg/lang/es-ES.rc
+++ b/dll/cpl/powercfg/lang/es-ES.rc
@@ -1,128 +1,124 @@
-/* Spanish translation by Javier Remacha 2007-12-23 */
+// COPYRIGHT: 2007 Javier Remacha
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 262, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Combinaciones de energía"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
+    GROUPBOX "C&ombinaciones de energía", -1, 6, 43, 240, 50
     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
-    LTEXT "Cuando el equipo está:", IDC_SAT, 12, 109, 65, 14
-    LTEXT "Enchufado", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Con batería", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Apagar &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "E&liminar", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Cuando el equipo está:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Enchufado", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Con batería", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Apagar &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Apagar los &discos duros:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Apagar los &discos duros:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 262, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Combinaciones de energía"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
+    GROUPBOX "C&ombinaciones de energía", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Apagar &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "E&liminar", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Apagar &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Apagar los &discos duros:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Apagar los &discos duros:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Suspender el equipo:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "El sistema &hiberna:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 262, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmas"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarma de batería baja ", -1, 6, 7, 249, 104
-    AUTOCHECKBOX "Activar la a&larma de batería baja cuando la potencia alcance un nivel:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "Desconocido", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "Acción de la alar&ma...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Notificación:", -1, 95, 71, 57, 10
-    LTEXT "Desconocido", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Acción:", -1, 95, 83, 55, 10
-    LTEXT "Desconocido", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Ejecutar programa:", -1, 95, 95, 55, 10
-    LTEXT "Desconocido", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Alarma de batería crítica ", -1, 6, 120, 249, 106
-    AUTOCHECKBOX "Activar la a&larma de batería baja cuando la potencia alcance un nivel:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "Desconocido", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Acción de la alar&ma...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Notificación:", -1, 95, 185, 50, 10
-    LTEXT "Desconocido", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Acción:", -1, 95, 198, 45, 10
-    LTEXT "Desconocido", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Ejecutar programa:", -1, 95, 211, 50, 10
-    LTEXT "Desconocido", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Alarma de batería baja", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Activar &la alarma cuando alcanza el nivel de potencia:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Acción de la alar&ma...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notificación:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Acción:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Ejecutar programa:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarma de batería crítica", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "A&ctivar la alarma cuando alcanza el nivel de potencia:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Acción de la alar&ma...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notificación:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Acción:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Ejecutar programa:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 262, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Opciones avanzadas"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Seleccione los ajustes de ahorro energético que desee usar.", -1, 37, 6, 207, 20
-    GROUPBOX "Opciones", -1, 6, 30, 250, 65
-    AUTOCHECKBOX "Mo&strar siempre el icono en la barra de tareas", IDC_SYSTRAYBATTERYMETER, 17, 43, 230, 10, WS_TABSTOP
-    AUTOCHECKBOX "S&olicitar una contraseña tras un tiempo de inactividad", IDC_PASSWORDLOGON, 17, 56, 230, 14, WS_TABSTOP
-    AUTOCHECKBOX "&Atenuar monitor cuando esté funcionando con batería", IDC_VIDEODIMDISPLAY, 17, 78, 230, 10, WS_TABSTOP
-    GROUPBOX "Botones de encendido", -1, 6, 101, 250, 127
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Seleccione los ajustes de ahorro energético que desee usar.", -1, 37, 6, 208, 20
+    GROUPBOX "Opciones", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "Mo&strar siempre el icono en la barra de tareas", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "S&olicitar una contraseña tras un tiempo de inactividad", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Atenuar monitor cuando esté funcionando con batería", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Botones de encendido", -1, 6, 101, 240, 110
     LTEXT "&Cuando cierre la tapa de mi ordenador portátil:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Cuando pr&esione el botón de encendido de mi equipo:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Cua&ndo presione el botón de suspender del equipo:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Cuando pr&esione el botón de encendido de mi equipo:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Cua&ndo presione el botón de suspender del equipo:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 262, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernación"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Cuando su equipo hiberna, almacena lo que hay en memoria en el disco duro y luego se apaga. Cuando sale del modo de hibernación vuelve a su estado anterior. ", -1, 37, 6, 210, 35
-    GROUPBOX "Hibernar ", -1, 6, 41, 250, 32
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Cuando su equipo hiberna, almacena lo que hay en memoria en el disco duro y luego se apaga. Cuando sale del modo de hibernación vuelve a su estado anterior. ", -1, 37, 6, 208, 35
+    GROUPBOX "Hibernar ", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Habilitar &hibernación", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Espacio en disco para hibernación ", -1, 6, 80, 250, 76
-    LTEXT "Espacio libre en disco:", -1, 15, 95, 140, 10
-    LTEXT "Desconocido", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Espacio en disco requerido para hibernar:", -1, 15, 115, 140, 10
-    LTEXT "Desconocido", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Debe liberar algo de espacio en el disco para que su equipo pueda hibernar. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    GROUPBOX "Espacio en disco para hibernación ", -1, 6, 80, 240, 76
+    LTEXT "Espacio libre en disco:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Espacio en disco requerido para hibernar:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Debe liberar algo de espacio en el disco para que su equipo pueda hibernar.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/fr-FR.rc b/dll/cpl/powercfg/lang/fr-FR.rc
index e161af70825..89d354c6e91 100644
--- a/dll/cpl/powercfg/lang/fr-FR.rc
+++ b/dll/cpl/powercfg/lang/fr-FR.rc
@@ -1,128 +1,124 @@
-/* French translation by Usurp (spetreolle at users dot sourceforge dot net) */
+// COPYRIGHT: Usurp <spetreolle@users.sourceforge.net>
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Profils d'alimentation"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Alimentation :", IDC_SAT, 15, 120, 60, 10
-    LTEXT "Branché", IDC_SAC, 100, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "Sur piles", IDC_SDC, 197, 120, 45, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "Éteindre le &moniteur :", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Éteindre les d&isques durs :", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Mode s&tandby :", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 37, 6, 208, 36
+    GROUPBOX "P&rofils d'alimentation", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Sauvegarder sous...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Supprimer", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Alimentation :", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Branché", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Sur piles", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Éteindre le &moniteur :", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Éteindre les d&isques durs :", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Mode s&tandby :", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Mise en veille du système :", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Mise en veille du système :", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Profils d'alimentation"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Éteindre le &moniteur :", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Éteindre les d&isques durs :", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Mode s&tandby :", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 37, 6, 208, 36
+    GROUPBOX "P&rofils d'alimentation", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Sauvegarder sous...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Supprimer", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Éteindre le &moniteur :", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Éteindre les d&isques durs :", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Mode s&tandby :", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Mise en veille du système :", IDC_HIBERNATE, 15, 195, 80, 10
+    LTEXT "Mise en veille du système :", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmes"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarme de batterie faible", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Activer l'alarme de batterie faible quand le niveau d'énergie atteint :", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "Inconnu", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Action d'alarme...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Notification :", -1, 95, 70, 50, 10
-    LTEXT "Inconnu", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Action :", -1, 95, 80, 45, 10
-    LTEXT "Inconnu", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Lancer le Programme :", -1, 95, 90, 50, 10
-    LTEXT "Inconnu", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Alarme de batterie Critique", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Activer l'alarme de batterie critique quand le niveau d'énergie atteint :", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "Inconnu", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Action d'alarme...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Notification :", -1, 95, 170, 50, 10
-    LTEXT "Inconnu", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Action :", -1, 95, 180, 45, 10
-    LTEXT "Inconnu", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Lancer le Programme:", -1, 95, 190, 50, 10
-    LTEXT "Inconnu", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Alarme de batterie faible", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Activer l'alarme lorsque le niveau d'énergie atteint :", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Action d'alarme...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Notification :", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Action :", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Lancer le Programme :", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarme de batterie Critique", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Activer l'alarme lorsque le niveau d'énergie atteint :", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Action d'alarme...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Notification :", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Action :", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Lancer le Programme :", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Avancé"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Choisissez les options d'économie d'énergie que vous voulez utiliser.", -1, 30, 5, 205, 20
-    GROUPBOX "Options", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "Toujours &afficher l'icône sur la barre des tâches", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Demander un mot de passe pour sortir de la mise en veille", IDC_PASSWORDLOGON, 15, 55, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Luminosité faible quand l'ordinateur est sur piles.", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Boutons d'alimentation", -1, 5, 100, 230, 105
-    LTEXT "&Quand je ferme le couvercle de mon portable :", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Quand j'appuie sur le bouton Power de l'ordinateur :", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Quand j'appuie sur le bouton Sleep de l'ordinateur :", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Choisissez les options d'économie d'énergie que vous voulez utiliser.", -1, 37, 6, 208, 20
+    GROUPBOX "Options", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "Toujours &afficher l'icône sur la barre des tâches", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Demander un mot de passe pour sortir de la mise en veille", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Luminosité faible quand l'ordinateur est sur piles", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Boutons d'alimentation", -1, 6, 101, 240, 110
+    LTEXT "&Quand je ferme le couvercle de mon portable :", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Quand j'appuie sur le bouton Power de l'ordinateur :", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Quand j'appuie sur le bouton Sleep de l'ordinateur :", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Mise en veille"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Quand votre ordinateur se met en veille, il enregistre tout ce qu'il a en memoire sur le disque dur et s'arrête. Quand votre ordinateur sort de la mise en veille, il reprend son état précédent. ", -1, 35, 5, 195, 35
-    GROUPBOX "Mise en veille", -1, 5, 45, 235, 25
-    AUTOCHECKBOX "Activer la mise en veille", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Espace disque pour la mise en veille", -1, 5, 80, 240, 60
-    LTEXT "Espace disque libre:", -1, 10, 90, 100, 10
-    LTEXT "Inconnu", IDC_FREESPACE, 120, 90, 70, 10
-    LTEXT "Espace disque nécessaire :", -1, 10, 100, 115, 10
-    LTEXT "Inconnu", IDC_SPACEFORHIBERNATEFILE, 120, 100, 55, 10
-    LTEXT "Vous devez libérer de l'espace avant que votre ordinateur ne se mette en veille. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Quand votre ordinateur se met en veille, il enregistre tout ce qu'il a en memoire sur le disque dur et s'arrête. Quand votre ordinateur sort de la mise en veille, il reprend son état précédent.", -1, 37, 6, 208, 35
+    GROUPBOX "Mise en veille", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "Activer la mise en veille", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Espace disque pour la mise en veille", -1, 6, 80, 240, 76
+    LTEXT "Espace disque libre :", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Espace disque nécessaire :", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Vous devez libérer de l'espace avant que votre ordinateur ne se mette en veille.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Enregistrement du modèle"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Enregistrer ce modèle sous :", -1, 7, 7, 104, 8
+    LTEXT "Enregistrer ce modèle sous :", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Annuler", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/he-IL.rc b/dll/cpl/powercfg/lang/he-IL.rc
index 2044cbae4d3..11333019498 100644
--- a/dll/cpl/powercfg/lang/he-IL.rc
+++ b/dll/cpl/powercfg/lang/he-IL.rc
@@ -1,128 +1,124 @@
-/* Translated by Baruch Rutman (peterooch at gmail dot com) */
+// COPYRIGHT: Baruch Rutman <peterooch@gmail.com>
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "תכניות צריכת חשמל"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "תכנית צריכת חשמל", -1, 6, 43, 240, 50
     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
-    LTEXT "מתי שהמחשב:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "מחובר", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "פועל על סוללות", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "כיבוי מסך:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "מחק", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "מתי שהמחשב:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "מחובר", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "פועל על סוללות", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "כיבוי מסך:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "כיבוי כוננים קשיחים:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "מצב המתנה:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "כיבוי כוננים קשיחים:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "מצב המתנה:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "תכניות צריכת חשמל"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "תכנית צריכת חשמל", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "כיבוי מסך:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "שמור בשם...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "מחק", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "כיבוי מסך:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "כיבוי כוננים קשיחים:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "מצב המתנה:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "כיבוי כוננים קשיחים:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "מצב המתנה:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "מצב שינה:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "התראות"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "התראת סוללה נמוכה", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "הפעל התראת סוללה נמוכה מתי שכוח הסוללה מגיע ל:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "פעולת התראה...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "הודעה:", -1, 95, 71, 57, 10
-    LTEXT "Unknown", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "פעולה", -1, 95, 83, 55, 10
-    LTEXT "Unknown", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "הפעל תכנית:", -1, 95, 95, 55, 10
-    LTEXT "Unknown", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "התראת סוללה קריטית", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "הפעל התראת סוללה קריטית מתי שכוח הסוללה מגיע ל:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "פעולת התראה:", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "הודעה:", -1, 95, 185, 50, 10
-    LTEXT "Unknown", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "פעולה", -1, 95, 198, 45, 10
-    LTEXT "Unknown", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "הפעל תכנית:", -1, 95, 211, 50, 10
-    LTEXT "Unknown", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "התראת סוללה נמוכה", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "הפעל התראת סוללה נמוכה מתי שכוח הסוללה מגיע ל:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "פעולת התראה...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "הודעה:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "פעולה", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "הפעל תכנית:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "התראת סוללה קריטית", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "הפעל התראת סוללה קריטית מתי שכוח הסוללה מגיע ל:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "פעולת התראה...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "הודעה:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "פעולה", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "הפעל תכנית:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "מתקדם"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "בחר את אפשרויות צריכת החשמל שברצונך להשתמש:", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "בחר את אפשרויות צריכת החשמל שברצונך להשתמש:", -1, 37, 6, 208, 20
     GROUPBOX "אפשרויות", -1, 6, 30, 240, 65
     AUTOCHECKBOX "תמיר הראה סמל על שורת המשימות", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "בקש סיסמה מתי שחוזר מהמתנה", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "עמעם תצוגה בזמן פעולה על סוללות", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "לחצני הפעלה", -1, 6, 101, 240, 127
+    GROUPBOX "לחצני הפעלה", -1, 6, 101, 240, 110
     LTEXT "כאשר אני סוגר את מכסה:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "כאשר אני לוחץ על לחצן ההפעלה:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "כאשר אני לוחץ על לחצן השינה:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "כאשר אני לוחץ על לחצן ההפעלה:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "כאשר אני לוחץ על לחצן השינה:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "תרדמת"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state. ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state.", -1, 37, 6, 208, 35
     GROUPBOX "תרדמת", -1, 6, 41, 240, 32
     AUTOCHECKBOX "אפשר תרדמת", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "שטח כונן לתרדמת", -1, 6, 80, 240, 76
-    LTEXT "שטח כונן פנוי:", -1, 15, 95, 140, 10
-    LTEXT "Unknown", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "שטח כונן הדרוש לתרדמת", -1, 15, 115, 140, 10
-    LTEXT "Unknown", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "You must free some disk space before your computer can hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "שטח כונן פנוי:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "שטח כונן הדרוש לתרדמת", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "You must free some disk space before your computer can hibernate.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/id-ID.rc b/dll/cpl/powercfg/lang/id-ID.rc
index f5bb79a27cf..4c156f5d295 100644
--- a/dll/cpl/powercfg/lang/id-ID.rc
+++ b/dll/cpl/powercfg/lang/id-ID.rc
@@ -1,128 +1,124 @@
-/* Indonesian translation by Zaenal Mutaqin (ade999 at gmail dot com) */
+// COPYRIGHT: Zaenal Mutaqin <ade999@gmail.com>
 
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Skema Tenaga"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Ketika komputer:", IDC_SAT, 15, 120, 60, 10
-    LTEXT "Dicolok listrik", IDC_SAC, 100, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "Berjalan pada batere", IDC_SDC, 197, 120, 45, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "Matikan &monitor:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Matikan hardd&isk:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistem s&tandby:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Pilih skema tenaga dengan setelan paling benar untuk komputer ini. Catatan bahwa mengubah setelan di bawah akan mengubah skema yang dipilih.", -1, 37, 6, 208, 36
+    GROUPBOX "Skema Tena&ga", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Simpan Sebagai...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Hapus", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Ketika komputer:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Dicolok listrik", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Berjalan pada batere", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Matikan &monitor:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Matikan hardd&isk:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistem s&tandby:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Skema Tenaga"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Matikan &monitor:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Matikan hardd&isk:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistem s&tandby:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Pilih skema tenaga dengan setelan paling benar untuk komputer ini. Catatan bahwa mengubah setelan di bawah akan mengubah skema yang dipilih.", -1, 37, 6, 208, 36
+    GROUPBOX "Skema Tena&ga", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Simpan Sebagai...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Hapus", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Matikan &monitor:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Matikan hardd&isk:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistem s&tandby:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 15, 195, 80, 10
+    LTEXT "Sistem &hibernasi:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarm"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarm batere renah", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "A&ktifkan alarm batere renah saat tingkat tenaga mencapai:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "tidak dikenal", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Aksi Alar&m...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Pemberitahuan:", -1, 95, 70, 50, 10
-    LTEXT "Tidak dikenal", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Aksi:", -1, 95, 80, 45, 10
-    LTEXT "Tidak dikenal", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Jalankan Program:", -1, 95, 90, 50, 10
-    LTEXT "Tidak dikenal", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Alarm batere kritis", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Aktifkan ala&rm batere rendah saat tingkat tenaga mencapai:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "tidak dikenal", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Aksi Alar&m...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Pemberitahuan:", -1, 95, 170, 50, 10
-    LTEXT "Tidak dikenal", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Aksi:", -1, 95, 180, 45, 10
-    LTEXT "Tidak dikenal", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Jalankan Program:", -1, 95, 190, 50, 10
-    LTEXT "Tidak dikenal", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Alarm batere renah", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "A&ktifkan alarm batere renah saat tingkat tenaga mencapai:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Aksi Alar&m...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Pemberitahuan:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Aksi:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Jalankan Program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarm batere kritis", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Aktifkan ala&rm batere rendah saat tingkat tenaga mencapai:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Aksi Alar&m...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Pemberitahuan:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Aksi:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Jalankan Program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Lanjutan"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Pilih setelan hemat-tenaga yang ingin anda pakai.", -1, 30, 5, 205, 20
-    GROUPBOX "Opsi", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "Selalu menampilkan ikon pada taskbar", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Prompt kata sandi saat komputer melanjutkan dari standby", IDC_PASSWORDLOGON, 15, 55, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Dim tampilan ketika berjalan dengan baterai.", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Tombol tenaga", -1, 5, 100, 230, 105
-    LTEXT "&Ketika Saya menutup lid komputer portabel saya:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "K&etika Saya menekan tombol tenaga pada komputer saya:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Ke&tika Saya menekan tombol tidur pada komputer saya:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Pilih setelan hemat-tenaga yang ingin anda pakai.", -1, 37, 6, 208, 20
+    GROUPBOX "Opsi", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "Selalu menampilkan ikon pada taskbar", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Prompt kata sandi saat komputer melanjutkan dari standby", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Dim tampilan ketika berjalan dengan baterai", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Tombol tenaga", -1, 6, 101, 240, 110
+    LTEXT "&Ketika Saya menutup lid komputer portabel saya:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "K&etika Saya menekan tombol tenaga pada komputer saya:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ke&tika Saya menekan tombol tidur pada komputer saya:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernasi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Ketika komputer anda hibernasi, ia menyimpan apapun yang ada di memori pada harddisk anda dan kemudian mematikan komputer. Ketika komputer anda keluar dari hibernasi, ia kembali ke keadaan sebelumnya. ", -1, 35, 5, 195, 35
-    GROUPBOX "Hibernasi", -1, 5, 45, 235, 25
-    AUTOCHECKBOX "Hidupkan &hibernasi", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Ruang disk untuk hibernasi", -1, 5, 80, 240, 60
-    LTEXT "Ruang bebas disk:", -1, 10, 90, 100, 10
-    LTEXT "Tidak dikenal", IDC_FREESPACE, 120, 90, 70, 10
-    LTEXT "Ruang disk diperlukan untuk hibernasi:", -1, 10, 100, 115, 10
-    LTEXT "Tidak dikenal", IDC_SPACEFORHIBERNATEFILE, 120, 100, 55, 10
-    LTEXT "Anda harus membebaskan beberapa ruang disk sebelum komputer anda bisa hibernasi. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Ketika komputer anda hibernasi, ia menyimpan apapun yang ada di memori pada harddisk anda dan kemudian mematikan komputer. Ketika komputer anda keluar dari hibernasi, ia kembali ke keadaan sebelumnya. ", -1, 37, 6, 208, 35
+    GROUPBOX "Hibernasi", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "Hidupkan &hibernasi", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Ruang disk untuk hibernasi", -1, 6, 80, 240, 76
+    LTEXT "Ruang bebas disk:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Ruang disk diperlukan untuk hibernasi:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Anda harus membebaskan beberapa ruang disk sebelum komputer anda bisa hibernasi.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,10 +126,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Simpan Skema"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Simpan skema daya sebagai:", -1, 7, 7, 104, 8
+    LTEXT "Simpan skema daya sebagai:", -1, 7, 7, 180, 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 "Batal", IDCANCEL, 133, 40, 50, 14
+    DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
+    PUSHBUTTON "Batal", IDCANCEL, 133, 40, 50, 14
 END
 
 STRINGTABLE
diff --git a/dll/cpl/powercfg/lang/it-IT.rc b/dll/cpl/powercfg/lang/it-IT.rc
index 1e3bafdb58d..70f03add5a7 100644
--- a/dll/cpl/powercfg/lang/it-IT.rc
+++ b/dll/cpl/powercfg/lang/it-IT.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Gestione risparmio energia"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Quando il computer è:", IDC_SAT, 16, 112, 72, 16
-    LTEXT "Alimentato\rda rete", IDC_SAC, 120, 112, 45, 15
-    ICON IDI_AC, IDC_IAC, 96, 112, 21, 20
-    LTEXT "Alimentato\ra batterie", IDC_SDC, 192, 112, 45, 15
-    ICON IDI_DC, IDC_IDC, 168, 112, 21, 20
-    LTEXT "Spegni il &monitor:", IDC_MONITOR, 16, 143, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 101, 141, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 176, 141, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Spegni i d&ischi fissi:", IDC_DISK, 16, 158, 80, 10
-    COMBOBOX IDC_DISKACLIST, 101, 156, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 176, 156, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Standby:", IDC_STANDBY, 16, 178, 80, 10
-    COMBOBOX IDC_STANDBYACLIST, 101, 176, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 176, 176, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sospensione:", IDC_HIBERNATE, 16, 193, 80, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 101, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 176, 191, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 37, 6, 208, 36
+    GROUPBOX "Schema di gestione dell'energia", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Salva come...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Cancella", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Quando il computer è:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Alimentato\rda rete", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Alimentato\ra batterie", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Spegni il &monitor:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Spegni i d&ischi fissi:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Standby:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sospensione:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Gestione risparmio energia"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Spegni il &monitor:", IDC_MONITOR, 16, 143, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 101, 141, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Spegni i d&ischi fissi:", IDC_DISK, 16, 158, 80, 10
-    COMBOBOX IDC_DISKACLIST, 101, 156, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Standby:", IDC_STANDBY, 16, 178, 80, 10
-    COMBOBOX IDC_STANDBYACLIST, 101, 176, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sospensione:", IDC_HIBERNATE, 16, 193, 80, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 101, 191, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 37, 6, 208, 36
+    GROUPBOX "Schema di gestione dell'energia", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Salva come...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Cancella", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Spegni il &monitor:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Spegni i d&ischi fissi:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Standby:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sospensione:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Allarmi"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Allarme di batteria bassa", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Attiva l'Allarme di batteria bassa quando il livello batteria è:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "sconosciuto", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Azione allarmi...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Notifiche:", -1, 95, 70, 50, 10
-    LTEXT "Unknown", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Azione:", -1, 95, 80, 45, 10
-    LTEXT "Unknown", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Esegui:", -1, 95, 90, 50, 10
-    LTEXT "Unknown", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Allarme critico di batteria", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Attiva l'Allarme di batteria bassa quando il livello batteria è:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Azione allarmi...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Notifiche:", -1, 95, 170, 50, 10
-    LTEXT "Unknown", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Azione:", -1, 95, 180, 45, 10
-    LTEXT "Unknown", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Esegui:", -1, 95, 190, 50, 10
-    LTEXT "Unknown", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Allarme di batteria bassa", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Attiva l'Allarme di batteria bassa quando il livello batteria è:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Azione allarmi...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Notifiche:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Azione:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Esegui:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Allarme critico di batteria", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Attiva l'Allarme di batteria bassa quando il livello batteria è:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Azione allarmi...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Notifiche:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Azione:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Esegui:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Avanzate"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Scegli le impostazioni di risparmi energia che intendi usare.", -1, 30, 5, 205, 20
-    GROUPBOX "Opzioni", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "Mostra sempre l'icona nella barra dei task", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "Chiedi la password al ripristino dallo standby", IDC_PASSWORDLOGON, 15, 55, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "Attenua il video durante il funzionamento a batteria.", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Pulsanti di gestione", -1, 5, 100, 230, 105
-    LTEXT "Quando chiudo lo schermo del computer portatile:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Quando premo il pulsante di alimentazione del computer:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Quando premo il pulsante di sospensione del computer:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Scegli le impostazioni di risparmi energia che intendi usare.", -1, 37, 6, 208, 20
+    GROUPBOX "Opzioni", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "Mostra sempre l'icona nella barra dei task", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "Chiedi la password al ripristino dallo standby", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "Attenua il video durante il funzionamento a batteria", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Pulsanti di gestione", -1, 6, 101, 240, 110
+    LTEXT "Quando chiudo lo schermo del computer portatile:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Quando premo il pulsante di alimentazione del computer:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Quando premo il pulsante di sospensione del computer:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Sospensione"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Quando il computer viene sospeso, il contenuto della RAM viene salvato su disco e poi il sistema si spegne. Alla riaccensione il computer si ripresenta nello stato in cui si trovava.", -1, 35, 5, 195, 35
-    GROUPBOX "Sospensione", -1, 5, 45, 239, 25
-    AUTOCHECKBOX "Abilita la Sospensione", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Spazio su disco per la Sospensione", -1, 5, 80, 240, 73
-    LTEXT "Spazio su disco libero:", -1, 10, 90, 100, 10
-    LTEXT "Unknown", IDC_FREESPACE, 120, 90, 70, 10
-    LTEXT "Spazio su disco richiesto per la sospensione:", -1, 10, 100, 101, 17
-    LTEXT "Unknown", IDC_SPACEFORHIBERNATEFILE, 120, 100, 55, 10
-    LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso.", IDC_TOLESSFREESPACE, 10, 129, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Quando il computer viene sospeso, il contenuto della RAM viene salvato su disco e poi il sistema si spegne. Alla riaccensione il computer si ripresenta nello stato in cui si trovava.", -1, 37, 6, 208, 35
+    GROUPBOX "Sospensione", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "Abilita la Sospensione", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Spazio su disco per la Sospensione", -1, 6, 80, 240, 76
+    LTEXT "Spazio su disco libero:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Spazio su disco richiesto per la sospensione:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Deve essere liberato dello spazio su disco prima che il computer possa essere sospeso.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/ja-JP.rc b/dll/cpl/powercfg/lang/ja-JP.rc
index eadcfdcb6bc..787588d63b5 100644
--- a/dll/cpl/powercfg/lang/ja-JP.rc
+++ b/dll/cpl/powercfg/lang/ja-JP.rc
@@ -1,128 +1,124 @@
-/* Japanese translation by Tomoya Kitagawa (jptomoya at yahoo dot co dot jp) */
+// COPYRIGHT: Tomoya Kitagawa <jptomoya@yahoo.co.jp>
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源設定"
 FONT 9, "MS UI Gothic"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 208, 36
     GROUPBOX "電源設定(&O)", -1, 6, 43, 240, 50
     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
-    LTEXT "コンピュータの状態:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "電源に接続", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "バッテリ使用", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "モニタの電源を切る(&M):", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "名前を付けて保存(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "削除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "コンピュータの状態:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "電源に接続", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "バッテリ使用", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "モニタの電源を切る(&M):", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "ハードディスクの電源を切る(&I):", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "システム スタンバイ(&T):", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "ハードディスクの電源を切る(&I):", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "システム スタンバイ(&T):", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源設定"
 FONT 9, "MS UI Gothic"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "このコンピュータに最も適した電源設定を選択してください。下の設定を変更すると、選択された電源設定も変更される点に注意してください。", -1, 37, 6, 208, 36
     GROUPBOX "電源設定(&O)", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "モニタの電源を切る(&M):", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "名前を付けて保存(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "削除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "モニタの電源を切る(&M):", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "ハードディスクの電源を切る(&I):", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "システム スタンバイ(&T):", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "ハードディスクの電源を切る(&I):", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "システム スタンバイ(&T):", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "システムを休止状態にする(&H):", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "アラーム"
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX "バッテリ低下アラーム", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "電源レベルが次に達したらバッテリ低下アラームで知らせる(&L):", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "不明", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "アラームの動作(&M)...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "通知方法:", -1, 95, 71, 57, 10
-    LTEXT "不明", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "動作:", -1, 95, 83, 55, 10
-    LTEXT "不明", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "プログラムの実行:", -1, 95, 95, 55, 10
-    LTEXT "不明", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "バッテリ限界アラーム", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "電源レベルが次に達したらバッテリ限界アラームで知らせる(&C):", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "不明", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "アラームの動作(&M)...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "通知方法:", -1, 95, 185, 50, 10
-    LTEXT "不明", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "動作:", -1, 95, 198, 45, 10
-    LTEXT "不明", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "プログラムの実行:", -1, 95, 211, 50, 10
-    LTEXT "不明", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "バッテリ低下アラーム", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "電源レベルが次に達したらバッテリ低下アラームで知らせる(&L):", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "アラームの動作(&M)...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知方法:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "動作:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "プログラムの実行:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "バッテリ限界アラーム", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "電源レベルが次に達したらバッテリ限界アラームで知らせる(&C):", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "アラームの動作(&M)...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知方法:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "動作:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "プログラムの実行:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "詳細設定"
 FONT 9, "MS UI Gothic"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "使用する省電力設定を選択してください。", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "使用する省電力設定を選択してください。", -1, 37, 6, 208, 20
     GROUPBOX "オプション", -1, 6, 30, 240, 65
     AUTOCHECKBOX "アイコンを常にタスク バーに表示する(&S)", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "スタンバイから回復するときにパスワードの入力を求める(&P)", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "バッテリを使用するときは、薄暗く表示する(&D)", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "電源ボタン", -1, 6, 101, 240, 127
+    GROUPBOX "電源ボタン", -1, 6, 101, 240, 110
     LTEXT "ポータブル コンピュータを閉じたとき(&W):", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "コンピュータの電源ボタンを押したとき(&E):", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "コンピュータのスリープ ボタンを押したとき(&N):", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "コンピュータの電源ボタンを押したとき(&E):", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "コンピュータのスリープ ボタンを押したとき(&N):", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "休止状態"
 FONT 9, "MS UI Gothic"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "休止状態になると、コンピュータはメモリ上にあるものをすべてハード ディスクに格納してからシャットダウンします。休止状態が解除されると、コンピュータは以前の状態に戻ります。 ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "休止状態になると、コンピュータはメモリ上にあるものをすべてハード ディスクに格納してからシャットダウンします。休止状態が解除されると、コンピュータは以前の状態に戻ります。", -1, 37, 6, 208, 35
     GROUPBOX "休止状態", -1, 6, 41, 240, 32
     AUTOCHECKBOX "休止状態を有効にする(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "休止のためのディスク領域", -1, 6, 80, 240, 76
-    LTEXT "ディスクの空き領域:", -1, 15, 95, 140, 10
-    LTEXT "不明", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "休止状態に必要なディスク領域:", -1, 15, 115, 140, 10
-    LTEXT "不明", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "休止状態をサポートするには、ディスクの空き領域を増やす必要があります。 ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "ディスクの空き領域:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "休止状態に必要なディスク領域:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "休止状態をサポートするには、ディスクの空き領域を増やす必要があります。", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "設定の保存"
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT "この電源設定を次の名前で保存:", -1, 7, 7, 104, 8
+    LTEXT "この電源設定を次の名前で保存:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "キャンセル", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/nl-NL.rc b/dll/cpl/powercfg/lang/nl-NL.rc
index 07c4f0f0508..a0cfe638b58 100644
--- a/dll/cpl/powercfg/lang/nl-NL.rc
+++ b/dll/cpl/powercfg/lang/nl-NL.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Energie schema's"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Wanneer computer:", IDC_SAT, 15, 120, 60, 10
-    LTEXT "Op netvoeding werkt", IDC_SAC, 100, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "Op batterijen werkt", IDC_SDC, 197, 120, 45, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "Beeldscherm &uitschakelen:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "V&aste schijven uitschakelen:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Op stand-&by:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Selecteer het energie schema met de beste instellingen voor deze computer. Instellingen worden gewijzigd in het geselecteerde schema.", -1, 37, 6, 208, 36
+    GROUPBOX "&Energie schema's", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Wanneer computer:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Op netvoeding werkt", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Op batterijen werkt", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Beeldscherm &uitschakelen:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "V&aste schijven:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Op stand-&by:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "In slaapstand:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "In slaapstand:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Energie schema's"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Beeldscherm &uitschakelen:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "V&aste schijven uitschakelen:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Op stand-&by:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Selecteer het energie schema met de beste instellingen voor deze computer. Instellingen worden gewijzigd in het geselecteerde schema.", -1, 37, 6, 208, 36
+    GROUPBOX "&Energie schema's", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Verwijderen", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Beeldscherm &uitschakelen:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "V&aste schijven:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Op stand-&by:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "In slaapstand:", IDC_HIBERNATE, 15, 195, 80, 10
+    LTEXT "In slaapstand:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Waarschuwingen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Low battery alarm", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM1, 15, 25, 185, 15, WS_TABSTOP
-    LTEXT "Onbekend", IDC_ALARMVALUE1, 200, 28, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Alar&m Action...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Notification:", -1, 95, 70, 50, 10
-    LTEXT "Onbekend", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Action:", -1, 95, 80, 45, 10
-    LTEXT "Onbekend", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Run Program:", -1, 95, 90, 50, 10
-    LTEXT "Onbekend", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Critical battery alarm", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM2, 15, 125, 185, 15, WS_TABSTOP
-    LTEXT "Onbekend", IDC_ALARMVALUE2, 200, 128, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Alar&m Action...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Notification:", -1, 95, 170, 50, 10
-    LTEXT "Onbekend", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Action:", -1, 95, 180, 45, 10
-    LTEXT "Onbekend", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Run Program:", -1, 95, 190, 50, 10
-    LTEXT "Onbekend", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Low battery alarm", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notification:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Action:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Run Program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Critical battery alarm", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notification:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Action:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Run Program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Geavanceerd"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Selecteer de energiebesparende instellingen die u wilt gebruiken.", -1, 30, 5, 205, 20
-    GROUPBOX "Opties", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "&Pictogram altijd in het systeemvak weergeven", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Wachtwoord vragen als de computer uit stand-by wordt gehaald", IDC_PASSWORDLOGON, 15, 55, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Beeldscherm dimmen als de computer op batterijen werkt.", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Energie knoppen", -1, 5, 100, 230, 105
-    LTEXT "W&anneer ik het deksel van mijn computer sluit:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wanneer ik de aan/&uit-schakelaar van de computer indruk:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wanneer ik de slaap&knop van de computer indruk:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Selecteer de energiebesparende instellingen die u wilt gebruiken.", -1, 37, 6, 208, 20
+    GROUPBOX "Opties", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "&Pictogram altijd in het systeemvak weergeven", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Wachtwoord vragen als de computer uit stand-by wordt gehaald", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Beeldscherm dimmen als de computer op batterijen werkt", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Energie knoppen", -1, 6, 101, 240, 110
+    LTEXT "W&anneer ik het deksel van mijn computer sluit:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wanneer ik de aan/&uit-schakelaar van de computer indruk:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wanneer ik de slaap&knop van de computer indruk:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Slaapstand"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Als de computer in de slaapstand gaat, wordt de hele inhoud van het geheugen op schijf opgeslagen, waarna de computer wordt afgesloten. Zodra de computer uit de slaapstand komt, wordt de oude situatie hersteld.", -1, 35, 5, 195, 35
-    GROUPBOX "Slaapstand", -1, 5, 45, 235, 25
-    AUTOCHECKBOX "&Slaapstand inschakelen", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Schijfruimte voor slaapstand", -1, 5, 80, 240, 60
-    LTEXT "Beschikbare schijfruimte:", -1, 10, 90, 100, 10
-    LTEXT "Onbekend", IDC_FREESPACE, 120, 90, 70, 10
-    LTEXT "Benodigde schijfruimte voor slaapstand:", -1, 10, 100, 115, 10
-    LTEXT "Onbekend", IDC_SPACEFORHIBERNATEFILE, 120, 100, 55, 10
-    LTEXT "U heeft onvoldoende schijfruimte om slaapstand in te schakelen. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Als de computer in de slaapstand gaat, wordt de hele inhoud van het geheugen op schijf opgeslagen, waarna de computer wordt afgesloten. Zodra de computer uit de slaapstand komt, wordt de oude situatie hersteld.", -1, 37, 6, 208, 35
+    GROUPBOX "Slaapstand", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "&Slaapstand inschakelen", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Schijfruimte voor slaapstand", -1, 6, 80, 240, 76
+    LTEXT "Beschikbare schijfruimte:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Benodigde schijfruimte voor slaapstand:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "U heeft onvoldoende schijfruimte om slaapstand in te schakelen.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/no-NO.rc b/dll/cpl/powercfg/lang/no-NO.rc
index 8dfbcab24e9..3a825f65ab5 100644
--- a/dll/cpl/powercfg/lang/no-NO.rc
+++ b/dll/cpl/powercfg/lang/no-NO.rc
@@ -1,128 +1,124 @@
-/* Norwegian translation by LMH1 */
+// COPYRIGHT: LMH1
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Strømstyringsplan"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "S&trømstyringsplan", -1, 6, 43, 240, 50
     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
-    LTEXT "Mens datamaskinen er:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "Koblet til", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Kjører på batterier", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Slå av &skjermen:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Lagre som...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Slett", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Mens datamaskinen er:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Koblet til", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Kjører på batterier", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Slå av &skjermen:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Slå av hardd&isker:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Slå av hardd&isker:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Strømstyringsplan"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "S&trømstyringsplan", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Slå av &skjermen:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Lagre som...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Slett", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Slå av &skjermen:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Slå av hardd&isker:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Slå av hardd&isker:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System h&vilemodus:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &dvalemodus:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmer"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Svakt battery alarm", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Aktivere &svakt batteri alarm mens strømnivået passerer:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "ukjent", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "Alar&m handling...", -1, 17, 69, 70, 14,WS_DISABLED
-    LTEXT "Varsel:", -1, 95, 71, 57, 10
-    LTEXT "Ukjent", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Handling:", -1, 95, 83, 55, 10
-    LTEXT "Ukjent", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Kjør Program:", -1, 95, 95, 55, 10
-    LTEXT "Ukjent", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Kritisk batteri alarm", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Aktivere svakt batteri alarm mens strømnivået passerer:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "Ukjent", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Alar&m handling...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Handling:", -1, 95, 185, 50, 10
-    LTEXT "Ukjent", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Handling:", -1, 95, 198, 45, 10
-    LTEXT "Ukjent", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Kjør program:", -1, 95, 211, 50, 10
-    LTEXT "Ukjent", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Svakt battery alarm", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Aktivere &svakt batteri alarm mens strømnivået passerer:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Varsel:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Handling:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Kjør Program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Kritisk batteri alarm", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Aktivere svakt batteri alarm mens strømnivået passerer:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Varsel:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Handling:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Kjør program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Avansert"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Velg strøm-sparing innstillinger som du vil bruke.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Velg strøm-sparing innstillinger som du vil bruke.", -1, 37, 6, 208, 20
     GROUPBOX "Valg", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Allti&d vis ikon på oppgavelinjen", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Spør etter passord ved gjenopptakelse etter dvalemodus", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Dim vis når pcen kjører på batteri strøm", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Strømknapper", -1, 6, 101, 240, 127
+    GROUPBOX "Strømknapper", -1, 6, 101, 240, 110
     LTEXT "&When I close the lid of my portable computer:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dvalemodus"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Når din datamaskin går i dvalemodus, lagres all data i minnet til din harddisk også blir pcen slått av. Når din datamaskin våkner fra dvalemodus, gjennoppretter den økten til forrige stand. ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Når din datamaskin går i dvalemodus, lagres all data i minnet til din harddisk også blir pcen slått av. Når din datamaskin våkner fra dvalemodus, gjennoppretter den økten til forrige stand.", -1, 37, 6, 208, 35
     GROUPBOX "Dvalemodus", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Aktiver &dvalemodus", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Ledig plass for dvalemodus", -1, 6, 80, 240, 76
-    LTEXT "Ledig plass:", -1, 15, 95, 140, 10
-    LTEXT "Ukjent", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Ledig plass som trengs for dvalemodus:", -1, 15, 115, 140, 10
-    LTEXT "Ukjent", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Du trenger ledig plass før din datamaskin kan gå i dvalemodus. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Ledig plass:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Ledig plass som trengs for dvalemodus:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Du trenger ledig plass før din datamaskin kan gå i dvalemodus.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/pl-PL.rc b/dll/cpl/powercfg/lang/pl-PL.rc
index dcb26b61fa2..b2e202083d4 100644
--- a/dll/cpl/powercfg/lang/pl-PL.rc
+++ b/dll/cpl/powercfg/lang/pl-PL.rc
@@ -1,134 +1,125 @@
-/*
- *    Translated by aart3k
- *    aart3k@gmail.com
- *    https://sourceforge.net/projects/reactospl
- *    Updated by Caemyr - Olaf Siejka (Jan, 2008)
- *    UTF-8 conversion by Caemyr (May, 2011)
- */
+// COPYRIGHT: aart3k <aart3k@gmail.com>
+//            2008-2011 Caemyr - Olaf Siejka
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schematy zasilania"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "Kiedy komputer jest:", IDC_SAT, 15, 120, 60, 10
-    LTEXT "Podłączony", IDC_SAC, 100, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "Zasilany akumulatorem", IDC_SDC, 197, 120, 45, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "Wyłącz &monitor:", IDC_MONITOR, 15, 142, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 15, 157, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 177, 90, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Wybierz schemat zasilana najbardziej pasujący do Twojego komputera. Miej na uwadze, że zmiany poniżej spowodują modyfikację wybranego schematu.", -1, 37, 6, 208, 36
+    GROUPBOX "&Schematy zasilania", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Zapisz jako...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Usuń", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Kiedy komputer jest:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Podłączony", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Zasilany akumulatorem", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Wyłącz &monitor:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System w stan &czuwania:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &hibernuje:", IDC_HIBERNATE, 15, 192, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernuje:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schematy zasilania"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Wyłącz &monitor:", IDC_MONITOR, 15, 142, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 15, 157, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System w stan &czuwania:", IDC_STANDBY, 15, 177, 90, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Wybierz schemat zasilana najbardziej pasujący do Twojego komputera. Miej na uwadze, że zmiany poniżej spowodują modyfikację wybranego schematu.", -1, 37, 6, 208, 36
+    GROUPBOX "&Schematy zasilania", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&Zapisz jako...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Usuń", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Wyłącz &monitor:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wyłącz &dysk twardy:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System w stan &czuwania:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &hibernuje:", IDC_HIBERNATE, 15, 192, 80, 10
+    LTEXT "System &hibernuje:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ostrzeżenia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Słaba bateria", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Aktywuj ostrzeżenie, kiedy &poziom mocy sięga:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "nieznany", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Działanie &alarmu...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Powiadomienie:", -1, 95, 70, 50, 10
-    LTEXT "Nieznane", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Działanie:", -1, 95, 80, 45, 10
-    LTEXT "Nieznane", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Uruchom program:", -1, 95, 90, 50, 10
-    LTEXT "Nieznany", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Krytycznie słaba bateria", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Aktywuj ostrzeżenie, kiedy &poziom mocy sięga:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "nieznany", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Działanie &alarmu...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Powiadomienie:", -1, 95, 170, 50, 10
-    LTEXT "Nieznane", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Działanie:", -1, 95, 180, 45, 10
-    LTEXT "Nieznane", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Uruchom program:", -1, 95, 190, 50, 10
-    LTEXT "Nieznany", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Słaba bateria", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Aktywuj ostrzeżenie, kiedy &poziom mocy sięga:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP //FIXME: accelerator collision &p
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Działanie &alarmu...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &a
+    LTEXT "Powiadomienie:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Działanie:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Uruchom program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Krytycznie słaba bateria", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Aktywuj ostrzeżenie, kiedy &poziom mocy sięga:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP //FIXME: accelerator collision &p
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Działanie &alarmu...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &a
+    LTEXT "Powiadomienie:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Działanie:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Uruchom program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Zaawansowane"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Wybierz, których ustawień oszczędzania energii chcesz używać.", -1, 30, 5, 205, 20
-    GROUPBOX "Opcje", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "&Zawsze pokazuj ikonę w zasobniku systemowym", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "Zapytaj o &hasło kiedy komputer powraca ze stanu czuwania", IDC_PASSWORDLOGON, 15, 55, 210, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Przyciemniaj ekran, kiedy zasilanie z akumulatora", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Przyciski zasilania", -1, 5, 100, 230, 105
-    LTEXT "&Kiedy zamykam mój komputer przenośny:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "K&iedy naciskam przycisk zasilania mojego komputera:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Ki&edy naciskam przycisk uśpienia:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Wybierz, których ustawień oszczędzania energii chcesz używać.", -1, 37, 6, 208, 20
+    GROUPBOX "Opcje", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "&Zawsze pokazuj ikonę w zasobniku systemowym", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "Zapytaj o &hasło kiedy komputer powraca ze stanu czuwania", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Przyciemniaj ekran, kiedy zasilanie z akumulatora", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Przyciski zasilania", -1, 6, 101, 240, 110
+    LTEXT "&Kiedy zamykam mój komputer przenośny:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "K&iedy naciskam przycisk zasilania mojego komputera:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ki&edy naciskam przycisk uśpienia:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernacja"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Kiedy Twój komputer przechodzi w stan hibernacji cała zawartość pamięci jest zrzucana na dysk twardy i komputer jest wyłączany. Kiedy komputer budzi się z hibernacji, powraca on do poprzedniego stanu. ", -1, 35, 5, 195, 35
-    GROUPBOX "Hibernacja", -1, 5, 45, 235, 25
-    AUTOCHECKBOX "Włącz &hibernację", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Przestrzeń dyskowa dla hibernacji", -1, 5, 80, 240, 60
-    LTEXT "Wolna przestrzeń dyskowa:", -1, 10, 90, 100, 10
-    LTEXT "Nieznana", IDC_FREESPACE, 140, 90, 70, 10
-    LTEXT "Przestrzeń wymagana do hibernacji:", -1, 10, 100, 135, 10
-    LTEXT "Nieznana", IDC_SPACEFORHIBERNATEFILE, 140, 100, 55, 10
-    LTEXT "Musisz zwolnić więcej miejsca na dysku przed przejściem w stan hibernacji. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Kiedy Twój komputer przechodzi w stan hibernacji cała zawartość pamięci jest zrzucana na dysk twardy i komputer jest wyłączany. Kiedy komputer budzi się z hibernacji, powraca on do poprzedniego stanu. ", -1, 37, 6, 208, 35
+    GROUPBOX "Hibernacja", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "Włącz &hibernację", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Przestrzeń dyskowa dla hibernacji", -1, 6, 80, 240, 76
+    LTEXT "Wolna przestrzeń dyskowa:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Przestrzeń wymagana do hibernacji:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Musisz zwolnić więcej miejsca na dysku przed przejściem w stan hibernacji.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -136,7 +127,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Zapisywanie schematu"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Zapisz ten schemat zasilania jako:", -1, 7, 7, 114, 8
+    LTEXT "Zapisz ten schemat zasilania jako:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Anuluj", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/pt-PT.rc b/dll/cpl/powercfg/lang/pt-PT.rc
index 3d1f3f666f1..f7422a59c5f 100644
--- a/dll/cpl/powercfg/lang/pt-PT.rc
+++ b/dll/cpl/powercfg/lang/pt-PT.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Esquemas de energia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "Seleccione o esquema de energia com as definições mais apropriadas para este computador. Note que a alteração às definições abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36
-    GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Seleccione o esquema de energia com as definições mais apropriadas para este computador. Note que a alteração às definições abaixo, modificará o esquema seleccionado.", -1, 37, 6, 208, 36
+    GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 //FIXME: accelerator collision &e
     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
-    LTEXT "Quando o computador está:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "ligado à corrente", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "ligado a baterias", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Eliminar", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED //FIXME: accelerator collision &e
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Quando o computador está:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "ligado à corrente", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "ligado a baterias", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Desligar &discos rígidos:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Entra em modo de &espera:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Desligar &discos rígidos:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Entra em modo de &espera:", IDC_STANDBY, 13, 178, 85, 10 //FIXME: accelerator collision &e
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Esquemas de energia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "Seleccione o esquema de energia com as definições mais apropriadas para este computador. Note que a alteração das definições abaixo, modificará o esquema seleccionado.", -1, 37, 6, 209, 36
-    GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Seleccione o esquema de energia com as definições mais apropriadas para este computador. Note que a alteração das definições abaixo, modificará o esquema seleccionado.", -1, 37, 6, 208, 36
+    GROUPBOX "&Esquemas de energia", -1, 6, 43, 240, 50 //FIXME: accelerator collision &e
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Guardar como...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Eliminar", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED //FIXME: accelerator collision &e
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Desligar o &monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Desligar &discos rígidos:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Entra em modo de &espera:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Desligar &discos rígidos:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Entra em modo de &espera:", IDC_STANDBY, 13, 178, 85, 10 //FIXME: accelerator collision &e
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Entra em &hibernação:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarmes"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarme de bateria fraca", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Activar o alarme de bateria &fraca quando o nível de energia atingir:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "&Acção do alarme...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Notificação:", -1, 95, 71, 57, 10
-    LTEXT "Desconhecida", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Acção:", -1, 95, 83, 55, 10
-    LTEXT "Desconhecida", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Executar programa:", -1, 95, 95, 55, 10
-    LTEXT "Desconhecido", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Alarme de bateria muito fraca", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Activar o alarme de bateria &muito fraca quando o nível de energia atingir:", IDC_ALARM2, 15, 131, 195, 15, WS_TABSTOP
-    LTEXT "Desconhecida", IDC_ALARMVALUE2, 215, 134, 20, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Acção do alarme...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Notificação:", -1, 95, 185, 50, 10
-    LTEXT "Desconhecida", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Acção:", -1, 95, 198, 45, 10
-    LTEXT "Desconhecida", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Executar programa:", -1, 95, 211, 50, 10
-    LTEXT "Desconhecido", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Alarme de bateria fraca", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Ative o a&larme quando o nível de energia atingir:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "&Acção do alarme...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Notificação:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Acção:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Executar programa:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarme de bateria muito fraca", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Ative o alar&me quando o nível de energia atingir:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Acção do alarme...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Notificação:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Acção:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Executar programa:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Avançadas"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Seleccione as definições de poupança de energia que deseja utilizar.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Seleccione as definições de poupança de energia que deseja utilizar.", -1, 37, 6, 208, 20
     GROUPBOX "Opções", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Mostrar sempre o &icone na barra de tarefas", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Perguntar a palavra-passe quando o computador reiniciar.", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Ajustar o brilho quando ligado a baterias.", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Botões de energia", -1, 6, 101, 240, 127
+    AUTOCHECKBOX "&Perguntar a palavra-passe quando o computador reiniciar", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Ajustar o brilho quando ligado a baterias", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Botões de energia", -1, 6, 101, 240, 110
     LTEXT "Ao baixar a &tampa do portátil:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Ao premir o botão de &energia do computador:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Ao premir o botão de &suspensão do computador:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ao premir o botão de &energia do computador:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ao premir o botão de &suspensão do computador:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernar"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Quando o computador hiberna, armazena no disco rígido tudo o que tem na memória e encerra. Quando sai de hibernação regressa ao estado anterior.", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Quando o computador hiberna, armazena no disco rígido tudo o que tem na memória e encerra. Quando sai de hibernação regressa ao estado anterior.", -1, 37, 6, 208, 35
     GROUPBOX "Hibernar", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Permitir &hibernação", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Espaço em disco para hibernação", -1, 6, 80, 240, 76
-    LTEXT "Espaço disponível em disco:", -1, 15, 95, 140, 10
-    LTEXT "Desconhecido", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Espaço em disco necessário para hibernação:", -1, 15, 115, 140, 10
-    LTEXT "Desconhecido", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Terá de libertar espaço em disco para que o computador possa hibernar. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Espaço disponível em disco:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Espaço em disco necessário para hibernação:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Terá de libertar espaço em disco para que o computador possa hibernar.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Guardar esquema"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Guardar este esquema de energia como:", -1, 7, 7, 144, 8
+    LTEXT "Guardar este esquema de energia como:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "&OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "&Cancelar", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc
index 680c4798b24..58c8884ff21 100644
--- a/dll/cpl/powercfg/lang/ro-RO.rc
+++ b/dll/cpl/powercfg/lang/ro-RO.rc
@@ -9,127 +9,123 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Regim de consum"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "&Regimuri de consum", -1, 6, 43, 240, 50
     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
-    LTEXT "Când calculatorul este:", IDC_SAT, 12, 109, 75, 12
-    LTEXT "În priză", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Pe baterii", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Închiderea e&cranului:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Păstrare…", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "Șt&erge", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Când calculatorul este:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "În priză", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Pe baterii", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Închiderea e&cranului:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Oprirea &discurilor:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Oprirea &discurilor:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Regim de consum"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "&Regimuri de consum", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Închiderea e&cranului:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Păstrare…", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "Șt&erge", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Închiderea e&cranului:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Oprirea &discurilor:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Oprirea &discurilor:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Starea de &veghe:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Hibernarea:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarmă baterie decongestionată", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Alarmează „baterie &decongestionată” când va ajunge la:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "nespecificat", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "A&cțiune alarmă…", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Notificare:", -1, 95, 71, 57, 10
-    LTEXT "Nespecificat", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Acțiune:", -1, 95, 83, 55, 10
-    LTEXT "Nespecificat", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Exec. program:", -1, 95, 95, 55, 10
-    LTEXT "Nespecificat", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Alarmă baterie descărcată", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Alarmează „baterie d&escărcată” când va ajunge la:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "nespecificat", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Acți&une alarmă…", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Notificare:", -1, 95, 185, 50, 10
-    LTEXT "Nespecificat", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Acțiune:", -1, 95, 198, 45, 10
-    LTEXT "Nespecificat", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Exec. program:", -1, 95, 211, 50, 10
-    LTEXT "Nespecificat", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Alarmă baterie decongestionată", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Alarmează „baterie &decongestionată” când va ajunge la:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "A&cțiune alarmă…", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Notificare:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Acțiune:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Exec. program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarmă baterie descărcată", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Alarmează „baterie d&escărcată” când va ajunge la:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Acți&une alarmă…", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Notificare:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Acțiune:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Exec. program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Avansate"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Specificați opțiunile de economisire ale consumului de energie al calculatorului.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Specificați opțiunile de economisire ale consumului de energie al calculatorului.", -1, 37, 6, 208, 20
     GROUPBOX "Opțiuni", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Afișează pictogramă în &zona de notificare", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "Solicită &reautentificare la revenirea din starea de veghe", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "Înt&unecă ecranul când calculatorul merge pe baterii", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Consecințe ale acțiunilor de utilizator", -1, 6, 101, 240, 127
+    GROUPBOX "Consecințe ale acțiunilor de utilizator", -1, 6, 101, 240, 110
     LTEXT "&Plierea calculatorul portabil determină:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Apăsarea &butonului de alimentare determină:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Apăsarea butonului stării de &veghe determină:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Apăsarea &butonului de alimentare determină:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Apăsarea butonului stării de &veghe determină:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernare"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Intrarea în starea de hibernare presupune stocarea pe disc a întregului conținut de memorie operativă, urmată de închiderea completă a calculatorului. La revenirea din hibernare, calculatorul revine exact la starea anterioară hibernării.", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Intrarea în starea de hibernare presupune stocarea pe disc a întregului conținut de memorie operativă, urmată de închiderea completă a calculatorului. La revenirea din hibernare, calculatorul revine exact la starea anterioară hibernării.", -1, 37, 6, 208, 35
     GROUPBOX "Hibernare", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Doresc folosirea funcționalității &Hibernare", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Spațiul necesar pentru hibernare", -1, 6, 80, 240, 76
-    LTEXT "Spațiul de stocare disponibil:", -1, 15, 95, 140, 10
-    LTEXT "Nespecificat", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Spațiul necesar pentru hibernare:", -1, 15, 115, 140, 10
-    LTEXT "Nespecificat", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Este necesar mai mult spațiu liber pe dispozitivul de stocare înainte de a putea activa funcționalitatea de hibernare.", IDC_TOLESSFREESPACE, 15, 135, 224, 30
+    LTEXT "Spațiul de stocare disponibil:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Spațiul necesar pentru hibernare:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Este necesar mai mult spațiu liber pe dispozitivul de stocare înainte de a putea activa funcționalitatea de hibernare.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -137,7 +133,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/ru-RU.rc b/dll/cpl/powercfg/lang/ru-RU.rc
index 8ff19108dfb..3664bb9e660 100644
--- a/dll/cpl/powercfg/lang/ru-RU.rc
+++ b/dll/cpl/powercfg/lang/ru-RU.rc
@@ -1,128 +1,124 @@
-/* Russian translation by Andrey Korotaev (unC0Rr@gmail.com) */
+// COPYRIGHT: Andrey Korotaev <unC0Rr@gmail.com>
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Схемы управления питанием"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "При питании:", IDC_SAT, 15, 120, 60, 10
-    LTEXT "от сети", IDC_SAC, 113, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 85, 115, 25, 15
-    LTEXT "от батарей", IDC_SDC, 190, 120, 45, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "Отключить &монитор:", IDC_MONITOR, 15, 142, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Отключить &диски:", IDC_DISK, 15, 157, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Ждущий режим через:", IDC_STANDBY, 15, 177, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 6, 208, 36
+    GROUPBOX "&Схемы управления питанием", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "Сохранить &как...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Удалить", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "При питании:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "от сети", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "от батарей", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Отключить &монитор:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Отключить &диски:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Ждущий режим через:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "С&пящий режим через:", IDC_HIBERNATE, 15, 192, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "С&пящий режим через:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Схемы управления питанием"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "Отключить &монитор:", IDC_MONITOR, 15, 142, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Отключить &диски:", IDC_DISK, 15, 157, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Ждущий режим через:", IDC_STANDBY, 15, 177, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Выберите схему управления электропитанием с наиболее подходящими параметрами для этого компьютера. Изменение нижеследующих параметров изменит выбранную схему.", -1, 37, 6, 208, 36
+    GROUPBOX "&Схемы управления питанием", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "Сохранить &как...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Удалить", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Отключить &монитор:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Отключить &диски:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Ждущий режим через:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "С&пящий режим через:", IDC_HIBERNATE, 15, 192, 80, 10
+    LTEXT "С&пящий режим через:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Уведомления"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Сигнал низкого заряда батарей", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Включить сигнал н&изкого заряда при уровне:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "Нет данных", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "Д&ействие...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Уведомление:", -1, 95, 70, 50, 10
-    LTEXT "Нет данных", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Действие:", -1, 95, 80, 45, 10
-    LTEXT "Нет данных", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Запуск программы:", -1, 95, 90, 50, 10
-    LTEXT "Нет данных", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Сигнал критически низкого заряда батарей", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Включить такой &сигнал при уровне:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "Нет данных", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "Де&йствие...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Уведомление:", -1, 95, 170, 50, 10
-    LTEXT "Нет данных", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Действие:", -1, 95, 180, 45, 10
-    LTEXT "Нет данных", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Запуск программы:", -1, 95, 190, 50, 10
-    LTEXT "Нет данных", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Сигнал низкого заряда батарей", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Включить сигнал н&изкого заряда при уровне:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Д&ействие...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Уведомление:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Действие:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Запуск программы:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Сигнал критически низкого заряда батарей", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Включить такой &сигнал при уровне:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Де&йствие...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Уведомление:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Действие:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Запуск программы:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Дополнительно"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 32, 32
-    LTEXT "Выберите желаемые параметры энергосбережения.", -1, 37, 5, 205, 20
-    GROUPBOX "Параметры", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "&Всегда отображать значок на панели задач", IDC_SYSTRAYBATTERYMETER, 15, 48, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Запрашивать пароль при выходе из ждущего режима", IDC_PASSWORDLOGON, 15, 60, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Снизить яркость монитора при работе от батарей", IDC_VIDEODIMDISPLAY, 15, 72, 200, 10, WS_TABSTOP
-    GROUPBOX "Кнопки питания", -1, 5, 100, 230, 105
-    LTEXT "&При закрытии крышки переносного компьютера:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "При &нажатии кнопки включения питания компьютера:", IDC_SPOWERBUTTON, 10, 140, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "При нажатии &кнопки перехода в спящий режим:", IDC_SSLEEPBUTTON, 10, 170, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Выберите желаемые параметры энергосбережения.", -1, 37, 6, 208, 20
+    GROUPBOX "Параметры", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "&Всегда отображать значок на панели задач", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Запрашивать пароль при выходе из ждущего режима", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Снизить яркость монитора при работе от батарей", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Кнопки питания", -1, 6, 101, 240, 110
+    LTEXT "&При закрытии крышки переносного компьютера:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "При &нажатии кнопки включения питания компьютера:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "При нажатии &кнопки перехода в спящий режим:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Спящий режим"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 32, 32
-    LTEXT "При переходе в спящий режим компьютер переносит содержимое оперативной памяти на диск и выключается. При выходе из спящего режима компьютер возвращается в прежнее состояние.", -1, 37, 5, 195, 35
-    GROUPBOX "Спящий режим", -1, 5, 57, 235, 25
-    AUTOCHECKBOX "&Разрешить переход в спящий режим", IDC_HIBERNATEFILE, 10, 67, 210, 10, WS_TABSTOP
-    GROUPBOX "Место на диске для перехода в спящий режим", -1, 5, 92, 240, 60
-    LTEXT "Свободно места на диске:", -1, 10, 102, 100, 10
-    LTEXT "Нет данных", IDC_FREESPACE, 130, 102, 70, 10
-    LTEXT "Требуется для спящего режима:", -1, 10, 112, 115, 10
-    LTEXT "Нет данных", IDC_SPACEFORHIBERNATEFILE, 130, 112, 55, 10
-    LTEXT "Для возможности перехода в спящий режим требуется освободить место на диске.", IDC_TOLESSFREESPACE, 10, 127, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "При переходе в спящий режим компьютер переносит содержимое оперативной памяти на диск и выключается. При выходе из спящего режима компьютер возвращается в прежнее состояние.", -1, 37, 6, 208, 35
+    GROUPBOX "Спящий режим", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "&Разрешить переход в спящий режим", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Место на диске для перехода в спящий режим", -1, 6, 80, 240, 76
+    LTEXT "Свободно места на диске:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Требуется для спящего режима:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Для возможности перехода в спящий режим требуется освободить место на диске.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Сохранить схему"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Сохранить эту схему питания как:", -1, 7, 7, 120, 8
+    LTEXT "Сохранить эту схему питания как:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "ОК", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Отмена", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/sk-SK.rc b/dll/cpl/powercfg/lang/sk-SK.rc
index c9230ee8c08..cc124be1a03 100644
--- a/dll/cpl/powercfg/lang/sk-SK.rc
+++ b/dll/cpl/powercfg/lang/sk-SK.rc
@@ -1,133 +1,123 @@
-/*
- * FILE:        dll/cpl/powercfg/lang/sk-SK.rc
- * PURPOSE:     Slovak Language File for powercfg
- * TRANSLATOR:  Kario <kario@szm.sk>
- * DATE OF TR.: 29-07-2007
- * LAST CHANGE: 01-03-2008
- */
+// COPYRIGHT: 2007-2008 Kario <kario@szm.sk>
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schémy napájania"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "&Schémy napájania", -1, 6, 43, 240, 50
     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
-    LTEXT "Keď je počítač:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "Pripojený do siete", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Napájaný z batérie", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "&Vypnúť monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Uložiť ako...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "O&dstrániť", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Keď je počítač:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Pripojený do siete", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Napájaný z batérie", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "&Vypnúť monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Vypnúť p&evné disky:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 210, 84, 18
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Vypnúť p&evné disky:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Schémy napájania"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "&Schémy napájania", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "&Vypnúť monitor:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Uložiť ako...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "O&dstrániť", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "&Vypnúť monitor:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Vypnúť p&evné disky:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 210, 84, 18
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Vypnúť p&evné disky:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Úsporný &režim:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Režim dl&hodobého spánku:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Signalizácie"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Signalizácia vybitia batérie", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Zapnúť signalizáciu &vybitia batérie pri hodnote:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "neznáma", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "&Spôsob signalizácie...", -1, 12, 69, 75, 14, WS_DISABLED
-    LTEXT "Upozornenie:", -1, 95, 71, 57, 10
-    LTEXT "Neznáme", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Akcia:", -1, 95, 83, 55, 10
-    LTEXT "Neznáma", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Spustiť program:", -1, 95, 95, 55, 10
-    LTEXT "Neznámy", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Signalizácia kritického stavu batérie", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Zapnúť signalizáciu &kritického stavu batérie pri hodnote:", IDC_ALARM2, 15, 131, 188, 15, WS_TABSTOP
-    LTEXT "neznáma", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Spôsob si&gnalizácie...", -1, 12, 183, 75, 14, WS_DISABLED
-    LTEXT "Upozornenie:", -1, 95, 185, 50, 10
-    LTEXT "Neznáme", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Akcia:", -1, 95, 198, 45, 10
-    LTEXT "Neznáma", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Spustiť program:", -1, 95, 211, 50, 10
-    LTEXT "Neznámy", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Signalizácia vybitia batérie", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Zapnúť signalizáciu &vybitia batérie pri hodnote:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "&Spôsob signalizácie...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Upozornenie:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Akcia:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Spustiť program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Signalizácia kritického stavu batérie", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Zapnúť signalizáciu &kritického stavu batérie pri hodnote:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Spôsob si&gnalizácie...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Upozornenie:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Akcia:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Spustiť program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Spresnenie"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Vyberte požadované možnosti šetrenia energie.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Vyberte požadované možnosti šetrenia energie.", -1, 37, 6, 208, 20
     GROUPBOX "Možnosti", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Vždy &zobraziť ikonu na paneli úloh", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "Vyžiadať &heslo pri prechode z úsporného režimu", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "Stmaviť &obrazovku pri napájaní z batérie", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Tlačidlá napájania", -1, 6, 101, 240, 127
+    GROUPBOX "Tlačidlá napájania", -1, 6, 101, 240, 110
     LTEXT "Pri zatváraní &krytu prenosného počítača:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Pri &stlačení tlačidla napájania počítača:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Pri stlačení &tlačidla režimu spánku počítača:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Pri &stlačení tlačidla napájania počítača:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Pri stlačení &tlačidla režimu spánku počítača:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dlhodobý spánok"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Keď počítač prechádza do režimu dlhodobého spánku, uloží obsah pamäte na pevný disk a potom sa vypne. Pri návrate počítača z režimu dlhodobého spánku sa všetko vráti do pôvodného stavu.", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Keď počítač prechádza do režimu dlhodobého spánku, uloží obsah pamäte na pevný disk a potom sa vypne. Pri návrate počítača z režimu dlhodobého spánku sa všetko vráti do pôvodného stavu.", -1, 37, 6, 208, 35
     GROUPBOX "Dlhodobý spánok", -1, 6, 41, 240, 32
     AUTOCHECKBOX "&Povoliť režim dlhodobého spánku", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Miesto na disku pre režim dlhodobého spánku", -1, 6, 80, 240, 76
-    LTEXT "Voľné miesto na disku:", -1, 15, 95, 140, 10
-    LTEXT "Neznáme", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Miesto na disku požadované pre režim dlhodobého spánku:", -1, 15, 115, 140, 18
-    LTEXT "Neznáme", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+    LTEXT "Voľné miesto na disku:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Miesto na disku pre režim dlhodobého spánku:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
     LTEXT "Pred prechodom počítača do režimu dlhodobého spánku, musíte uvoľniť časť miesta na disku.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
@@ -136,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/sq-AL.rc b/dll/cpl/powercfg/lang/sq-AL.rc
index 9e95da32502..4bfd9831c33 100644
--- a/dll/cpl/powercfg/lang/sq-AL.rc
+++ b/dll/cpl/powercfg/lang/sq-AL.rc
@@ -1,131 +1,124 @@
-/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani@gmail.com)
- * DATE OF TRANSLATION:  18-01-2014
-*/
-
+// COPYRIGHT: 2014 Ardit Dani (Ard1t) <ardit.dani@gmail.com>
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Skema e Energjisë"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "Skema e Energjisë", -1, 6, 43, 240, 50
     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
-    LTEXT "Kur kompjuteri është i:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "Hyrese në", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Punon në bateri", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Ruaj Si...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Kur kompjuteri është i:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Hyrese në", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Punon në bateri", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Skema e Energjisë"
 FONT 8, "MS Shell Dlg"
 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
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
     GROUPBOX "Skema e Energjisë", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Ruaj Si...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Fshi", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Fik &monitorin:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Fik hard d&iskun:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi gatishmërisë:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &hibernates:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Alarm të ulët bateri", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Aktivizo alarmin e ulët baterie kur niveli i energjisë arrin:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "i panjohur", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "Veprim Alar&mi...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Njoftim:", -1, 95, 71, 57, 10
-    LTEXT "i panjohur", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Veprim:", -1, 95, 83, 55, 10
-    LTEXT "i panjohur", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Run Program:", -1, 95, 95, 55, 10
-    LTEXT "i panjohur", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Alarm Kritik baterie", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Aktivizo alarmin kritik baterie kur niveli i energjisë arrin:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "i panjohur", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Veprim Alar&mi...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Njoftim:", -1, 95, 185, 50, 10
-    LTEXT "i panjohur", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Veprim:", -1, 95, 198, 45, 10
-    LTEXT "i panjohur", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Ekzekuto Programin:", -1, 95, 211, 50, 10
-    LTEXT "i panjohur", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Alarm të ulët bateri", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Aktivizo alarmin e ulët baterie kur niveli i energjisë arrin:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Veprim Alar&mi...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Njoftim:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Veprim:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Ekzekuto Programin:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Alarm Kritik baterie", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Aktivizo alarmin kritik baterie kur niveli i energjisë arrin:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Veprim Alar&mi...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Njoftim:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Veprim:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Ekzekuto Programin:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Advancuar"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Zgjidhni cilësimet e ruaj-energjinë që ju doni të përdorni.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Zgjidhni cilësimet e ruaj-energjinë që ju doni të përdorni.", -1, 37, 6, 208, 20
     GROUPBOX "Alternativa", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Gjithmonë shfaq ikonën në taskbar", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "Shfaq për fjalëkalimin kur kompjuteri rifillon nga gatishmëria", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Dim ekranin kur punon në bateri", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Butonat e Energjise", -1, 6, 101, 240, 127
+    GROUPBOX "Butonat e Energjise", -1, 6, 101, 240, 110
     LTEXT "&Kur e mbyllni kapakun e kompjuterit tim portativ:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Kur unë shtypni butonin e energjise në kompjuterin tim:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Kur unë shtypni butonin flej në kompjuterin tim:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Kur unë shtypni butonin e energjise në kompjuterin tim:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Kur unë shtypni butonin flej në kompjuterin tim:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernate"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Kur kompjuteri juaj hibernates, ajo ruan çdo gjë që ajo ka në kujtesën e në diskun tuaj të vështirë dhe pastaj mbyllet. Kur kompjuteri juaj vjen nga letargjia, ajo kthehet në gjendjen e mëparshme. ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Kur kompjuteri juaj hibernates, ajo ruan çdo gjë që ajo ka në kujtesën e në diskun tuaj të vështirë dhe pastaj mbyllet. Kur kompjuteri juaj vjen nga letargjia, ajo kthehet në gjendjen e mëparshme. ", -1, 37, 6, 208, 35
     GROUPBOX "Hibernate", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Mundëso &hibernation", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Hapësirë ​​në disk për letargji", -1, 6, 80, 240, 76
-    LTEXT "Hapsira Lirë n'disk:", -1, 15, 95, 140, 10
-    LTEXT "i panjohur", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Hapësirë ​​në disk të nevojshme për hibernate:", -1, 15, 115, 140, 10
-    LTEXT "i panjohur", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "Ju duhet të lironi një hapësirë ​​në disk para se kompjuteri juaj mund të hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Hapsira Lirë n'disk:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Hapësirë ​​në disk për letargji:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Ju duhet të lironi një hapësirë ​​në disk para se kompjuteri juaj mund të hibernate.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -133,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/th-TH.rc b/dll/cpl/powercfg/lang/th-TH.rc
index 7e93a5c5891..8fffbea87a6 100644
--- a/dll/cpl/powercfg/lang/th-TH.rc
+++ b/dll/cpl/powercfg/lang/th-TH.rc
@@ -1,126 +1,122 @@
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Power Schemes"
 FONT 8, "MS Shell Dlg"
 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 | 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
-    LTEXT "เมื่อคอมพิวเตอร์เป็น:", IDC_SAT, 15, 120, 60, 10
-    LTEXT "Plugged in", IDC_SAC, 100, 120, 45, 15
-    ICON IDI_AC, IDC_IAC, 75, 115, 25, 15
-    LTEXT "กำลังใช้งานอุปกรณ์จ่ายไฟฟ้า", IDC_SDC, 197, 120, 45, 15
-    ICON IDI_DC, IDC_IDC, 165, 115, 25, 15
-    LTEXT "ปิด&จอภาพ:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_MONITORDCLIST, 175, 140, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Turn off hard d&isks:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 175, 155, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System s&tandby:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
+    GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&บันทึกเป็น...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&ลบ", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "เมื่อคอมพิวเตอร์เป็น:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Plugged in", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "กำลังใช้งานอุปกรณ์จ่ายไฟฟ้า", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "ปิด&จอภาพ:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System s&tandby:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 175, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &hibernates:", IDC_HIBERNATE, 15, 195, 80, 10
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 175, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 250, 220
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Power Schemes"
 FONT 8, "MS Shell Dlg"
 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
-    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
-    LTEXT "ปิด&จอภาพ:", IDC_MONITOR, 15, 145, 80, 10
-    COMBOBOX IDC_MONITORACLIST, 100, 140, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Turn off hard d&isks:", IDC_DISK, 15, 160, 80, 10
-    COMBOBOX IDC_DISKACLIST, 100, 155, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System s&tandby:", IDC_STANDBY, 15, 180, 80, 10
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    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, 208, 36
+    GROUPBOX "P&ower schemes", -1, 6, 43, 240, 50
+    COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
+    PUSHBUTTON "&บันทึกเป็น...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&ลบ", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "ปิด&จอภาพ:", IDC_MONITOR, 13, 148, 85, 10
+    COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Turn off hard d&isks:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "System s&tandby:", IDC_STANDBY, 13, 178, 85, 10
     COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "System &hibernates:", IDC_HIBERNATE, 15, 195, 80, 10
+    LTEXT "System &hibernates:", IDC_HIBERNATE, 13, 193, 85, 10
     COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alarms"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Low battery alarm", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "Alar&m Action...", -1, 17, 69, 70, 14, WS_DISABLED
-    LTEXT "Notification:", -1, 95, 71, 57, 10
-    LTEXT "Unknown", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Action:", -1, 95, 83, 55, 10
-    LTEXT "Unknown", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Run Program:", -1, 95, 95, 55, 10
-    LTEXT "Unknown", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Critical battery alarm", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "unknown", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "Alar&m Action...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Notification:", -1, 95, 185, 50, 10
-    LTEXT "Unknown", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Action:", -1, 95, 198, 45, 10
-    LTEXT "Unknown", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Run Program:", -1, 95, 211, 50, 10
-    LTEXT "Unknown", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Low battery alarm", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Activate &low battery alarm when power level reaches:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notification:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Action:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Run Program:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Critical battery alarm", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "Alar&m Action...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "Notification:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Action:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Run Program:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Advanced"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Select the power-saving settings you want to use.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Select the power-saving settings you want to use.", -1, 37, 6, 208, 20
     GROUPBOX "Options", -1, 6, 30, 240, 65
     AUTOCHECKBOX "Alway&s show icon on the taskbar", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Prompt for password when computer resumes from standby", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Dim display when running on batteries", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Power buttons", -1, 6, 101, 240, 127
+    GROUPBOX "Power buttons", -1, 6, 101, 240, 110
     LTEXT "&When I close the lid of my portable computer:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Wh&en I press the power button on my computer:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Whe&n I press the sleep button on my computer:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hibernate"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state. ", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "When your computer hibernates, it stores whatever it has in memory on your hard disk and then shuts down. When your computer comes out of hibernation, it returns to its previous state.", -1, 37, 6, 208, 35
     GROUPBOX "Hibernate", -1, 6, 41, 240, 32
     AUTOCHECKBOX "Enable &hibernation", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Disk space for hibernation", -1, 6, 80, 240, 76
-    LTEXT "Free disk space:", -1, 15, 95, 140, 10
-    LTEXT "Unknown", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Disk space required to hibernate:", -1, 15, 115, 140, 10
-    LTEXT "Unknown", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
-    LTEXT "You must free some disk space before your computer can hibernate. ", IDC_TOLESSFREESPACE, 15, 135, 224, 20
+    LTEXT "Free disk space:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Disk space required to hibernate:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "You must free some disk space before your computer can hibernate.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -128,7 +124,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/tr-TR.rc b/dll/cpl/powercfg/lang/tr-TR.rc
index ca69faebee4..e5648b2f599 100644
--- a/dll/cpl/powercfg/lang/tr-TR.rc
+++ b/dll/cpl/powercfg/lang/tr-TR.rc
@@ -1,127 +1,123 @@
-/* TRANSLATOR: 2013, 2014, 2020 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
+// COPYRIGHT: 2013-2020 Erdem Ersoy
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Güç Düzenleri"
 FONT 8, "MS Shell Dlg"
 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ştirilmesinin seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. Aşağıdaki ayarların değiştirilmesinin seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 208, 36
     GROUPBOX "&Güç Düzenleri", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "&Farklı Kaydet...", 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
-    LTEXT "Bilgisyar:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "Adaptöre Takılıyken", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "Pilde Çalışıyorken", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "&Monitörü Kapat:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Farklı Kaydet...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Sil", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Bilgisyar:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "Adaptöre Takılıyken", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "Pilde Çalışıyorken", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "&Monitörü Kapat:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sabit &Diskleri Kapat:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi &Uykuya Geçir:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi &Hazırda Beklet:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sabit &Diskleri Kapat:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &Uykuya Geçir:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &Hazırda Beklet:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Güç Düzenleri"
 FONT 8, "MS Shell Dlg"
 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ştirilmesinin seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Bu bilgisayar için en uygun ayarlarla bir güç düzeni seçiniz. Aşağıdaki ayarların değiştirilmesinin seçili düzeni değiştireceğini göz önünde bulundurunuz.", -1, 37, 6, 208, 36
     GROUPBOX "&Güç Düzenleri", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    PUSHBUTTON "&Farklı Kaydet...", 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
-    LTEXT "&Monitörü Kapat:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "&Farklı Kaydet...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "&Sil", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "&Monitörü Kapat:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sabit &Diskleri Kapat:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi &Uykuya Geçir:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Sistemi &Hazırda Beklet:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sabit &Diskleri Kapat:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &Uykuya Geçir:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Sistemi &Hazırda Beklet:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Uyarılar"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Düşük Pil Uyarısı", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "&Güç düzeyi şuraya geldiğinde düşük pil uyarısını etkinleştir:", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "Bilinmiyor", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "%%0", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "%%100", -1, 214, 43, 25, 10
-    PUSHBUTTON "&Uyarı Eylemi...", -1, 17, 69, 70, 14,WS_DISABLED
-    LTEXT "Bildirim:", -1, 95, 71, 57, 10
-    LTEXT "Bilinmiyor", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "Eylem:", -1, 95, 83, 55, 10
-    LTEXT "Bilinmiyor", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "Program Çalıştır:", -1, 95, 95, 55, 10
-    LTEXT "Bilinmiyor", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "Kritik Pil Uyarısı", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "G&üç düzeyi şuraya geldiğinde kritik pil uyarısını etkinleştir:", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "Bilinmiyor", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "%%0", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "%%100", -1, 214, 154, 25, 10
-    PUSHBUTTON "U&yarı Eylemi...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "Bildirim:", -1, 95, 185, 50, 10
-    LTEXT "Bilinmiyor", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "Eylem:", -1, 95, 198, 45, 10
-    LTEXT "Bilinmiyor", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "Program Çalıştır:", -1, 95, 211, 50, 10
-    LTEXT "Bilinmiyor", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "Düşük Pil Uyarısı", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "&Güç düzeyi şuraya geldiğinde düşük pil uyarısını etkinleştir:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "&Uyarı Eylemi...", -1, 148, 50, 88, 14, WS_DISABLED
+    LTEXT "Bildirim:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Eylem:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Program Çalıştır:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Kritik Pil Uyarısı", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "G&üç düzeyi şuraya geldiğinde kritik pil uyarısını etkinleştir:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "U&yarı Eylemi...", -1, 148, 158, 88, 14, WS_DISABLED
+    LTEXT "Bildirim:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Eylem:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Program Çalıştır:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Gelişmiş"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "Kullanmak istediğiniz güç tasarrufu ayarlarını seçiniz.", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Kullanmak istediğiniz güç tasarrufu ayarlarını seçiniz.", -1, 37, 6, 208, 20
     GROUPBOX "Seçenekler", -1, 6, 30, 240, 65
     AUTOCHECKBOX "&Görev çubuğunda sürekli simge göster", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Bilgisayar uykudan döndüğünde parola iste", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "&Pilde çalışıyorken görüntü parlaklığını azalt", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "Güç Düğmeleri", -1, 6, 101, 240, 127
+    GROUPBOX "Güç Düğmeleri", -1, 6, 101, 240, 110
     LTEXT "&Taşınabilir bilgisayarımın kapağını kapattığımda:", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Bi&lgisayarımdaki güç düğmesine bastığımda:", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Bilgi&sayarımdaki uyku düğmesine bastığımda:", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Bi&lgisayarımdaki güç düğmesine bastığımda:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Bilgi&sayarımdaki uyku düğmesine bastığımda:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hazırda Bekleme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "Bilgisayar hazırda bekletildiğinde sabit diskinize bellekte ne varsa kaydedilir ve sonra bilgisayar kapatılır. Bilgisayarınız hazırda beklemeden çıktığında bir önceki durumuna döner.", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Bilgisayar hazırda bekletildiğinde sabit diskinize bellekte ne varsa kaydedilir ve sonra bilgisayar kapatılır. Bilgisayarınız hazırda beklemeden çıktığında bir önceki durumuna döner.", -1, 37, 6, 208, 35
     GROUPBOX "Hazırda Bekleme", -1, 6, 41, 240, 32
     AUTOCHECKBOX "&Hazırda beklemeyi etkinleştir", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "Hazırda Bekleme İçin Disk Alanı", -1, 6, 80, 240, 76
-    LTEXT "Boş disk alanı:", -1, 15, 95, 140, 10
-    LTEXT "Bilinmiyor", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "Hazırda bekleme için gereken disk alanı:", -1, 15, 115, 140, 10
-    LTEXT "Bilinmiyor", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+    LTEXT "Boş disk alanı:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Hazırda bekleme için gereken disk alanı:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
     LTEXT "Bilgisayarınızın hazırda bekleyebilmesinden önce biraz disk alanı oluşturmalısınız.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
@@ -130,7 +126,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Düzeni Kaydet"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Bu güç düzenini şöyle kaydet:", -1, 7, 7, 104, 8
+    LTEXT "Bu güç düzenini şöyle kaydet:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "Tamam", IDOK, 79, 40, 50, 14
     PUSHBUTTON "İptal", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/uk-UA.rc b/dll/cpl/powercfg/lang/uk-UA.rc
index 718cbcc29b1..a7a75acd944 100644
--- a/dll/cpl/powercfg/lang/uk-UA.rc
+++ b/dll/cpl/powercfg/lang/uk-UA.rc
@@ -1,134 +1,128 @@
 /*
  * PROJECT:     ReactOS Power Configuration Applet
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll/cpl/powercfg/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for powercfg
  * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Схеми керування живленням"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 208, 36
     GROUPBOX "&Схеми керування живленням", -1, 6, 43, 240, 50
     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
-    LTEXT "При живленні:", IDC_SAT, 12, 109, 60, 12
-    LTEXT "від мережі", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "від батарей", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "Вимкнення дисп&лея:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "Зберегти &як...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "В&идалити", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "При живленні:", IDC_SAT, 12, 110, 60, 15
+    LTEXT "від мережі", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "від батарей", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "Вимкнення дисп&лея:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Вимкнення дисків:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Вимкнення дисків:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Схеми керування живленням"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Виберіть схему керування живленням із найбільш прийнятними для цього комп'ютера параметрами. Якщо змінити нижченаведені параметри, вибрана схема також зміниться.", -1, 37, 6, 208, 36
     GROUPBOX "&Схеми керування живленням", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "Вимкнення дисп&лея:", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "Зберегти &як...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "В&идалити", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "Вимкнення дисп&лея:", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "&Вимкнення дисків:", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "&Вимкнення дисків:", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "Ре&жим очікування:", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "С&плячий режим:", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Сигналізація"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Сигнал значної розрядки батарей", -1, 10, 15, 235, 95
-    AUTOCHECKBOX "Подават&и сигнал, якщо рівень живлення досягає:", IDC_ALARM1, 15, 25, 180, 15, WS_TABSTOP
-    LTEXT "немає даних", IDC_ALARMVALUE1, 200, 25, 40, 10
-    LTEXT "0%", -1, 20, 40, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15
-    LTEXT "100%", -1, 215, 40, 25, 10
-    PUSHBUTTON "&Дія...", -1, 20, 70, 70, 15, WS_DISABLED
-    LTEXT "Сповіщення:", -1, 95, 70, 50, 10
-    LTEXT "Немає даних", IDC_ALARMMSG1, 145, 70, 95, 10
-    LTEXT "Дія:", -1, 95, 80, 45, 10
-    LTEXT "Немає даних", IDC_ALARMAKTION1, 145, 80, 95, 10
-    LTEXT "Запуск програми:", -1, 95, 90, 50, 10
-    LTEXT "Немає даних", IDC_ALARMPROG1, 150, 90, 40, 10
-    GROUPBOX "Сигнал критичної розрядки батарей", -1, 10, 115, 235, 95
-    AUTOCHECKBOX "Подавати &сигнал, якщо рівень живлення досягає:", IDC_ALARM2, 15, 125, 180, 15, WS_TABSTOP
-    LTEXT "немає даних", IDC_ALARMVALUE2, 200, 125, 40, 10
-    LTEXT "0%", -1, 20, 140, 15, 15
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15
-    LTEXT "100%", -1, 215, 140, 25, 10
-    PUSHBUTTON "&Дія...", -1, 20, 170, 70, 15, WS_DISABLED
-    LTEXT "Сповіщення:", -1, 95, 170, 50, 10
-    LTEXT "Немає даних", IDC_ALARMMSG2, 145, 170, 95, 10
-    LTEXT "Дія:", -1, 95, 180, 45, 10
-    LTEXT "Немає даних", IDC_ALARMAKTION2, 145, 180, 95, 10
-    LTEXT "Запуск програми:", -1, 95, 190, 50, 10
-    LTEXT "Немає даних", IDC_ALARMPROG2, 150, 190, 40, 10
+    GROUPBOX "Сигнал значної розрядки батарей", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "Подават&и сигнал, якщо рівень живлення досягає:", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "&Дія...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &Д
+    LTEXT "Сповіщення:", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "Дія:", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "Запуск програми:", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "Сигнал критичної розрядки батарей", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "Подавати &сигнал, якщо рівень живлення досягає:", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "&Дія...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &Д
+    LTEXT "Сповіщення:", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "Дія:", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "Запуск програми:", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Додатково"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 5, 5, 20, 20
-    LTEXT "Виберіть бажані параметри енергозбереження.", -1, 30, 5, 205, 20
-    GROUPBOX "Параметри", -1, 5, 35, 225, 55
-    AUTOCHECKBOX "За&вжди показувати значок на панелі завдань", IDC_SYSTRAYBATTERYMETER, 15, 45, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Запитувати пароль при виході з режиму очікування", IDC_PASSWORDLOGON, 15, 55, 200, 10, WS_TABSTOP
-    AUTOCHECKBOX "З&меншити яскравість монітора в разі живлення від батарей.", IDC_VIDEODIMDISPLAY, 15, 65, 200, 10, WS_TABSTOP
-    GROUPBOX "Кнопки живлення", -1, 5, 100, 230, 105
-    LTEXT "&При закритті кришки &портативного комп'ютера:", IDC_SLIDCLOSE, 10, 110, 210, 10
-    COMBOBOX IDC_LIDCLOSE, 10, 120, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "При нат&исненні вимикача живлення на моєму комп'ютері:", IDC_SPOWERBUTTON, 10, 135, 210, 10
-    COMBOBOX IDC_POWERBUTTON, 10, 150, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "При нати&сненні кнопки переходу до сплячого режиму:", IDC_SSLEEPBUTTON, 10, 165, 210, 10
-    COMBOBOX IDC_SLEEPBUTTON, 10, 180, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "Виберіть бажані параметри енергозбереження.", -1, 37, 6, 208, 20
+    GROUPBOX "Параметри", -1, 6, 30, 240, 65
+    AUTOCHECKBOX "За&вжди показувати значок на панелі завдань", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Запитувати пароль при виході з режиму очікування", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
+    AUTOCHECKBOX "З&меншити яскравість монітора в разі живлення від батарей", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "Кнопки живлення", -1, 6, 101, 240, 110
+    LTEXT "&При закритті кришки &портативного комп'ютера:", IDC_SLIDCLOSE, 15, 115, 222, 10
+    COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "При нат&исненні вимикача живлення на моєму комп'ютері:", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "При нати&сненні кнопки переходу до сплячого режиму:", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 250, 220
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Сплячий режим"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 5, 5, 20, 20
-    LTEXT "Коли комп'ютер переходить до сплячого режиму, увесь вміст пам'яті записується на жорсткий диск і робота завершується. Виходячи зі сплячого режиму, комп'ютер повертається до попереднього стану. ", -1, 35, 5, 195, 35
-    GROUPBOX "Сплячий режим", -1, 5, 45, 235, 25
-    AUTOCHECKBOX "Дозволити сплячий &режим", IDC_HIBERNATEFILE, 10, 55, 210, 10, WS_TABSTOP
-    GROUPBOX "Місце на диску для сплячого режиму", -1, 5, 80, 240, 60
-    LTEXT "Доступно на диску:", -1, 10, 90, 100, 10
-    LTEXT "немає даних", IDC_FREESPACE, 120, 90, 70, 10
-    LTEXT "Для сплячого режиму потрібно:", -1, 10, 100, 115, 10
-    LTEXT "Немає даних", IDC_SPACEFORHIBERNATEFILE, 120, 100, 55, 10
-    LTEXT "Перед переведенням комп'ютера до сплячого режиму слід звільнити місце на диску. ", IDC_TOLESSFREESPACE, 10, 115, 220, 20
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "Коли комп'ютер переходить до сплячого режиму, увесь вміст пам'яті записується на жорсткий диск і робота завершується. Виходячи зі сплячого режиму, комп'ютер повертається до попереднього стану. ", -1, 37, 6, 208, 35
+    GROUPBOX "Сплячий режим", -1, 6, 41, 240, 32
+    AUTOCHECKBOX "Дозволити сплячий &режим", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
+    GROUPBOX "Місце на диску для сплячого режиму", -1, 6, 80, 240, 76
+    LTEXT "Доступно на диску:", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "Для сплячого режиму потрібно:", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
+    LTEXT "Перед переведенням комп'ютера до сплячого режиму слід звільнити місце на диску.", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
 IDD_SAVEPOWERSCHEME DIALOGEX 0, 0, 190, 62
@@ -136,7 +130,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Scheme"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Save this power scheme as:", -1, 7, 7, 104, 8
+    LTEXT "Save this power scheme as:", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "OK", IDOK, 79, 40, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/zh-CN.rc b/dll/cpl/powercfg/lang/zh-CN.rc
index 81283c23831..06af4323604 100644
--- a/dll/cpl/powercfg/lang/zh-CN.rc
+++ b/dll/cpl/powercfg/lang/zh-CN.rc
@@ -9,126 +9,122 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "电源使用方案"
 FONT 9, "宋体"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 208, 36
     GROUPBOX "电源使用方案(&O)", -1, 6, 43, 240, 50
     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
-    LTEXT "当计算机：", IDC_SAT, 12, 109, 60, 12
-    LTEXT "接通电源", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "使用电池", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "关闭监视器(&M)：", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "另存为(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "删除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "当计算机：", IDC_SAT, 12, 110, 60, 15
+    LTEXT "接通电源", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "使用电池", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "关闭监视器(&M)：", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "关闭硬盘(&I)：", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系统待机(&T)：", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系统休眠(&H)：", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "关闭硬盘(&I)：", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系统待机(&T)：", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系统休眠(&H)：", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "电源使用方案"
 FONT 9, "宋体"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "请选定对于您使用计算机方式最适合的电源使用方案。请注意，更改下面的设置将修改选定的方案。", -1, 37, 6, 208, 36
     GROUPBOX "电源使用方案(&O)", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "关闭监视器(&M)：", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "另存为(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "删除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "关闭监视器(&M)：", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "关闭硬盘(&I)：", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系统待机(&T)：", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系统休眠(&H)：", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "关闭硬盘(&I)：", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系统待机(&T)：", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系统休眠(&H)：", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "警报"
 FONT 9, "宋体"
 BEGIN
-    GROUPBOX "电池不足警报", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "当电量降低到以下水平时，发出电池不足警报(&L)：", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "未知", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "警报操作(&M)...", -1, 17, 69, 70, 14,WS_DISABLED
-    LTEXT "通知：", -1, 95, 71, 57, 10
-    LTEXT "未知", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "操作：", -1, 95, 83, 55, 10
-    LTEXT "未知", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "运行程序：", -1, 95, 95, 55, 10
-    LTEXT "未知", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "电池严重短缺警报", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "当电力降低到以下水平时，发出电池严重短缺警报(&C)：", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "未知", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "警报操作(&M)...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "通知：", -1, 95, 185, 50, 10
-    LTEXT "未知", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "操作：", -1, 95, 198, 45, 10
-    LTEXT "未知", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "运行程序：", -1, 95, 211, 50, 10
-    LTEXT "未知", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "电池不足警报", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "当电量降低到以下水平时，发出电池不足警报(&L)：", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "警报操作(&M)...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知：", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "操作：", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "运行程序：", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "电池严重短缺警报", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "当电力降低到以下水平时，发出电池严重短缺警报(&C)：", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "警报操作(&M)...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知：", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "操作：", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "运行程序：", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "高级"
 FONT 9, "宋体"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "请选择要使用的节能设置。", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "请选择要使用的节能设置。", -1, 37, 6, 208, 20
     GROUPBOX "选项", -1, 6, 30, 240, 65
     AUTOCHECKBOX "总是在任务栏上显示图标(&S)", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "在计算机从待机状态恢复时，提示输入密码(&P)", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "在使用电池时弱显示(&D)。", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "电源按钮", -1, 6, 101, 240, 127
+    AUTOCHECKBOX "在使用电池时弱显示(&D)", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "电源按钮", -1, 6, 101, 240, 110
     LTEXT "在合上便携式计算机时(&W)：", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "在按下计算机电源按钮时(&E)：", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "在按下计算机睡眠按钮时(&N)：", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "在按下计算机电源按钮时(&E)：", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "在按下计算机睡眠按钮时(&N)：", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "休眠"
 FONT 9, "宋体"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "在计算机休眠时，它将内存中所有信息保存到硬盘上，然后关闭计算机。在退出休眠状态时，计算机会恢复到原来的状态。", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "在计算机休眠时，它将内存中所有信息保存到硬盘上，然后关闭计算机。在退出休眠状态时，计算机会恢复到原来的状态。", -1, 37, 6, 208, 35
     GROUPBOX "休眠", -1, 6, 41, 240, 32
     AUTOCHECKBOX "启用休眠(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "用于休眠的磁盘空间", -1, 6, 80, 240, 76
-    LTEXT "空闲的磁盘空间：", -1, 15, 95, 140, 10
-    LTEXT "未知", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "休眠所需的磁盘空间：", -1, 15, 115, 140, 10
-    LTEXT "未知", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+    LTEXT "空闲的磁盘空间：", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "休眠所需的磁盘空间：", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
     LTEXT "在计算机进入休眠之前，您必须释放一些磁盘空间。", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
@@ -137,7 +133,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "保存方案"
 FONT 9, "宋体"
 BEGIN
-    LTEXT "将该电源方案保存为：", -1, 7, 7, 104, 8
+    LTEXT "将该电源方案保存为：", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "确定", IDOK, 79, 40, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/zh-HK.rc b/dll/cpl/powercfg/lang/zh-HK.rc
index 8c1a58d26a1..a08552f1c28 100644
--- a/dll/cpl/powercfg/lang/zh-HK.rc
+++ b/dll/cpl/powercfg/lang/zh-HK.rc
@@ -8,126 +8,122 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源使用方案"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "請選擇對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "請選擇對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 208, 36
     GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50
     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
-    LTEXT "當電腦：", IDC_SAT, 12, 109, 60, 12
-    LTEXT "接通電源", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "使用電池", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "關閉顯示器(&M)：", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "另存新檔(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "當電腦：", IDC_SAT, 12, 110, 60, 15
+    LTEXT "接通電源", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "使用電池", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "關閉顯示器(&M)：", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "關閉硬碟(&I)：", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統待機(&T)：", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統休眠(&H)：", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "關閉硬碟(&I)：", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統待機(&T)：", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統休眠(&H)：", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源使用方案"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "請選擇對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "請選擇對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 208, 36
     GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "關閉顯示器(&M)：", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "另存新檔(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "關閉顯示器(&M)：", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "關閉硬碟(&I)：", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統待機(&T)：", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統休眠(&H)：", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "關閉硬碟(&I)：", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統待機(&T)：", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統休眠(&H)：", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "警報"
 FONT 9, "新細明體"
 BEGIN
-    GROUPBOX "電池不足警報", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "當電量降低到以下水平時，發出電池不足警報(&L)：", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "不明", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "警報操作(&M)...", -1, 17, 69, 70, 14,WS_DISABLED
-    LTEXT "通知：", -1, 95, 71, 57, 10
-    LTEXT "不明", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "操作：", -1, 95, 83, 55, 10
-    LTEXT "不明", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "執行程序：", -1, 95, 95, 55, 10
-    LTEXT "不明", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "電池嚴重短缺警報", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "當電力降低到以下水平時，發出電池嚴重不足警報(&C)：", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "不明", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "警報操作(&M)...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "通知：", -1, 95, 185, 50, 10
-    LTEXT "不明", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "操作：", -1, 95, 198, 45, 10
-    LTEXT "不明", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "執行程序：", -1, 95, 211, 50, 10
-    LTEXT "不明", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "電池不足警報", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "當電量降低到以下水平時，發出電池不足警報(&L)：", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "警報操作(&M)...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知：", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "操作：", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "執行程序：", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "電池嚴重短缺警報", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "當電力降低到以下水平時，發出電池嚴重不足警報(&C)：", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "警報操作(&M)...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知：", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "操作：", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "執行程序：", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "進階"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "請選擇要使用的節能設置。", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "請選擇要使用的節能設置。", -1, 37, 6, 208, 20
     GROUPBOX "選項", -1, 6, 30, 240, 65
     AUTOCHECKBOX "總是在任務欄上顯示圖標(&S)", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "在電腦從待機狀態恢復時，提示輸入密碼(&P)", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "在使用電池時將顯示器變暗(&D)。", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "電源按鈕", -1, 6, 101, 240, 127
+    AUTOCHECKBOX "在使用電池時將顯示器變暗(&D)", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "電源按鈕", -1, 6, 101, 240, 110
     LTEXT "在合上便攜式電腦時(&W)：", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "在按下電腦電源按鈕時(&E)：", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "在按下電腦睡眠按鈕時(&N)：", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "在按下電腦電源按鈕時(&E)：", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "在按下電腦睡眠按鈕時(&N)：", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "休眠"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "在電腦休眠時，會將記憶體中所有資料儲存到硬碟內，然後關閉電腦。在退出休眠狀態時，電腦會恢復到原來的狀態。", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "在電腦休眠時，會將記憶體中所有資料儲存到硬碟內，然後關閉電腦。在退出休眠狀態時，電腦會恢復到原來的狀態。", -1, 37, 6, 208, 35
     GROUPBOX "休眠", -1, 6, 41, 240, 32
     AUTOCHECKBOX "啟用休眠(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "用於休眠的磁碟空間", -1, 6, 80, 240, 76
-    LTEXT "空閒的磁碟空間：", -1, 15, 95, 140, 10
-    LTEXT "不明", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "休眠所需的磁碟空間：", -1, 15, 115, 140, 10
-    LTEXT "不明", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+    LTEXT "空閒的磁碟空間：", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "休眠所需的磁碟空間：", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
     LTEXT "在電腦進入休眠之前，您必須釋放一些磁碟空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
@@ -136,7 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "儲存方案"
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "儲存這個電源使用方案為：", -1, 7, 7, 104, 8
+    LTEXT "儲存這個電源使用方案為：", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 79, 40, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 133, 40, 50, 14
diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc
index 3fcc93319ef..b63a9ddec32 100644
--- a/dll/cpl/powercfg/lang/zh-TW.rc
+++ b/dll/cpl/powercfg/lang/zh-TW.rc
@@ -8,126 +8,122 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_ACDC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源使用方案"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 208, 36
     GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50
     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
-    LTEXT "當電腦︰", IDC_SAT, 12, 109, 60, 12
-    LTEXT "接通電源", IDC_SAC, 123, 110, 45, 15
-    ICON IDI_AC, IDC_IAC, 97, 108, 21, 20
-    LTEXT "使用電池", IDC_SDC, 195, 110, 45, 15
-    ICON IDI_DC, IDC_IDC, 170, 108, 21, 20
-    LTEXT "關閉顯示器(&M)︰", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "另存新檔(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "當電腦︰", IDC_SAT, 12, 110, 60, 15
+    LTEXT "接通電源", IDC_SAC, 100, 110, 50, 15
+    ICON IDI_AC, IDC_IAC, 141, 122, 0, 0
+    LTEXT "使用電池", IDC_SDC, 173, 110, 50, 15
+    ICON IDI_DC, IDC_IDC, 218, 122, 0, 0
+    LTEXT "關閉顯示器(&M)︰", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "關閉硬碟(&I)︰", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統待機(&T)︰", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統休眠(&H)︰", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX IDC_HIBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "關閉硬碟(&I)︰", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_DISKDCLIST, 173, 160, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統待機(&T)︰", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_STANDBYDCLIST, 173, 175, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統休眠(&H)︰", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX IDC_HIBERNATEDCLIST, 173, 190, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 237
+IDD_POWERSCHEMESPAGE_AC DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "電源使用方案"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22
-    LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 208, 36
     GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50
     COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL
-    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
-    LTEXT "關閉顯示器(&M)︰", IDC_MONITOR, 13, 148, 84, 10
+    PUSHBUTTON "另存新檔(&S)...", IDC_SAVEAS_BTN, 85, 72, 80, 14, WS_DISABLED
+    PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 173, 72, 64, 14, WS_DISABLED
+    GROUPBOX "", IDC_GRPDETAIL, 6, 95, 240, 119
+    LTEXT "關閉顯示器(&M)︰", IDC_MONITOR, 13, 148, 85, 10
     COMBOBOX IDC_MONITORACLIST, 100, 145, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "關閉硬碟(&I)︰", IDC_DISK, 13, 171, 84, 10
-    COMBOBOX IDC_DISKACLIST, 100, 167, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統待機(&T)︰", IDC_STANDBY, 13, 191, 84, 10
-    COMBOBOX IDC_STANDBYACLIST, 100, 188, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT "系統休眠(&H)︰", IDC_HIBERNATE, 13, 212, 84, 10
-    COMBOBOX IDC_HIBERNATEACLIST, 100, 209, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "關閉硬碟(&I)︰", IDC_DISK, 13, 163, 85, 10
+    COMBOBOX IDC_DISKACLIST, 100, 160, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統待機(&T)︰", IDC_STANDBY, 13, 178, 85, 10
+    COMBOBOX IDC_STANDBYACLIST, 100, 175, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "系統休眠(&H)︰", IDC_HIBERNATE, 13, 193, 85, 10
+    COMBOBOX IDC_HIBERNATEACLIST, 100, 190, 140, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEALARMS DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "警報"
 FONT 9, "新細明體"
 BEGIN
-    GROUPBOX "電池不足警報", -1, 6, 7, 239, 104
-    AUTOCHECKBOX "當電量降低到以下水平時，發出電池不足警報(&L)︰", IDC_ALARM1, 15, 17, 190, 15, WS_TABSTOP
-    LTEXT "未知", IDC_ALARMVALUE1, 215, 20, 20, 10
-    LTEXT "0%", -1, 28, 43, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15
-    LTEXT "100%", -1, 214, 43, 25, 10
-    PUSHBUTTON "警報操作(&M)...", -1, 17, 69, 70, 14,WS_DISABLED
-    LTEXT "通知︰", -1, 95, 71, 57, 10
-    LTEXT "未知", IDC_ALARMMSG1, 154, 71, 84, 10
-    LTEXT "操作︰", -1, 95, 83, 55, 10
-    LTEXT "未知", IDC_ALARMAKTION1, 154, 83, 84, 10
-    LTEXT "執行程序︰", -1, 95, 95, 55, 10
-    LTEXT "未知", IDC_ALARMPROG1, 154, 95, 84, 10
-    GROUPBOX "電池嚴重短缺警報", -1, 6, 120, 239, 106
-    AUTOCHECKBOX "當電力降低到以下水平時，發出電池嚴重短缺警報(&C)︰", IDC_ALARM2, 15, 131, 180, 15, WS_TABSTOP
-    LTEXT "未知", IDC_ALARMVALUE2, 209, 133, 33, 10
-    LTEXT "0%", -1, 28, 154, 15, 10
-    CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15
-    LTEXT "100%", -1, 214, 154, 25, 10
-    PUSHBUTTON "警報操作(&M)...", -1, 17, 183, 70, 14, WS_DISABLED
-    LTEXT "通知︰", -1, 95, 185, 50, 10
-    LTEXT "未知", IDC_ALARMMSG2, 154, 185, 84, 10
-    LTEXT "操作︰", -1, 95, 198, 45, 10
-    LTEXT "未知", IDC_ALARMAKTION2, 154, 198, 84, 10
-    LTEXT "執行程序︰", -1, 95, 211, 50, 10
-    LTEXT "未知", IDC_ALARMPROG2, 154, 211, 84, 10
+    GROUPBOX "電池不足警報", -1, 6, 7, 239, 99
+    AUTOCHECKBOX "當電量降低到以下水平時，發出電池不足警報(&L)︰", IDC_ALARM1, 15, 17, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE1, 28, 32, 20, 10
+    CONTROL "", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 32, 194, 15
+    PUSHBUTTON "警報操作(&M)...", -1, 148, 50, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知︰", -1, 28, 67, 89, 10
+    LTEXT "?", IDC_ALARMMSG1, 118, 67, 125, 10
+    LTEXT "操作︰", -1, 28, 79, 89, 10
+    LTEXT "?", IDC_ALARMAKTION1, 118, 79, 125, 10
+    LTEXT "執行程序︰", -1, 28, 91, 89, 10
+    LTEXT "?", IDC_ALARMPROG1, 118, 91, 125, 10
+    GROUPBOX "電池嚴重短缺警報", -1, 6, 115, 239, 99
+    AUTOCHECKBOX "當電力降低到以下水平時，發出電池嚴重短缺警報(&C)︰", IDC_ALARM2, 15, 125, 225, 10, WS_TABSTOP
+    LTEXT "xxx%", IDC_ALARMVALUE2, 28, 140, 20, 10
+    CONTROL "", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 47, 140, 194, 15
+    PUSHBUTTON "警報操作(&M)...", -1, 148, 158, 88, 14, WS_DISABLED //FIXME: accelerator collision &m
+    LTEXT "通知︰", -1, 28, 175, 89, 10
+    LTEXT "?", IDC_ALARMMSG2, 118, 175, 125, 10
+    LTEXT "操作︰", -1, 28, 187, 89, 10
+    LTEXT "?", IDC_ALARMAKTION2, 118, 187, 125, 10
+    LTEXT "執行程序︰", -1, 28, 199, 89, 10
+    LTEXT "?", IDC_ALARMPROG2, 118, 199, 125, 10
 END
 
-IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "進階"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_ACDC, IDI_ACDC, 7, 7, 20, 20
-    LTEXT "請選擇要使用的節能設定。", -1, 37, 6, 207, 20
+    ICON IDI_ACDC, IDI_ACDC, 7, 7, 0, 0
+    LTEXT "請選擇要使用的節能設定。", -1, 37, 6, 208, 20
     GROUPBOX "選項", -1, 6, 30, 240, 65
     AUTOCHECKBOX "總是在任務欄上顯示圖標(&S)", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP
     AUTOCHECKBOX "在電腦從待機狀態恢復時，提示輸入密碼(&P)", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP
-    AUTOCHECKBOX "在使用電池時將顯示器變暗(&D)。", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
-    GROUPBOX "電源按鈕", -1, 6, 101, 240, 127
+    AUTOCHECKBOX "在使用電池時將顯示器變暗(&D)", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP
+    GROUPBOX "電源按鈕", -1, 6, 101, 240, 110
     LTEXT "在便攜式電腦合上時(&W)︰", IDC_SLIDCLOSE, 15, 115, 222, 10
     COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "在按下電腦電源按鈕時(&E)︰", IDC_SPOWERBUTTON, 15, 153, 222, 10
-    COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "在按下電腦睡眠按鈕時(&N)︰", IDC_SSLEEPBUTTON, 15, 191, 222, 10
-    COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "在按下電腦電源按鈕時(&E)︰", IDC_SPOWERBUTTON, 15, 145, 222, 10
+    COMBOBOX IDC_POWERBUTTON, 15, 157, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT "在按下電腦睡眠按鈕時(&N)︰", IDC_SSLEEPBUTTON, 15, 175, 222, 10
+    COMBOBOX IDC_SLEEPBUTTON, 15, 187, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 237
+IDD_PROPPAGEHIBERNATE DIALOGEX 0, 0, 252, 220
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "休眠"
 FONT 9, "新細明體"
 BEGIN
-    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20
-    LTEXT "當電腦休眠時，會將所有在記憶體的資訊儲存到硬碟上，然後關閉電腦。在結束休眠狀態時，電腦會恢復到原來的狀態。", -1, 37, 6, 210, 35
+    ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 0, 0
+    LTEXT "當電腦休眠時，會將所有在記憶體的資訊儲存到硬碟上，然後關閉電腦。在結束休眠狀態時，電腦會恢復到原來的狀態。", -1, 37, 6, 208, 35
     GROUPBOX "休眠", -1, 6, 41, 240, 32
     AUTOCHECKBOX "啟用休眠(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP
     GROUPBOX "用於休眠的磁碟空間", -1, 6, 80, 240, 76
-    LTEXT "可用的磁碟空間︰", -1, 15, 95, 140, 10
-    LTEXT "未知", IDC_FREESPACE, 160, 95, 80, 10
-    LTEXT "休眠所需的磁碟空間︰", -1, 15, 115, 140, 10
-    LTEXT "未知", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10
+    LTEXT "可用的磁碟空間︰", -1, 15, 95, 150, 10
+    LTEXT "?", IDC_FREESPACE, 170, 95, 70, 10
+    LTEXT "休眠所需的磁碟空間︰", -1, 15, 115, 150, 10
+    LTEXT "?", IDC_SPACEFORHIBERNATEFILE, 170, 115, 70, 10
     LTEXT "在電腦進入休眠之前，您必須釋放一些磁碟空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20
 END
 
@@ -136,7 +132,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "儲存方案"
 FONT 9, "新細明體"
 BEGIN
-    LTEXT "儲存這個電源使用方案為︰", -1, 7, 7, 104, 8
+    LTEXT "儲存這個電源使用方案為︰", -1, 7, 7, 180, 8
     EDITTEXT IDC_SCHEMENAME, 7, 18, 176, 14, ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
     DEFPUSHBUTTON "確定", IDOK, 79, 40, 50, 14
     PUSHBUTTON "取消", IDCANCEL, 133, 40, 50, 14