[DESK] _countof and rc-trivia (reactos#7298)

- use _countof() consistently throughout the module instead of mixed ARRAYSIZE/countof.

In *.rc:
- the 3 AUTORADIOBUTTONS should not end with dots. In Windows 2k3sp2 ARB do never end with dots, I double-checked that here also in desk.cpl
- all 3 ARB should have an accel. I added the german ones, and added FIXMEs where I didn't know the correct accels
- the GROUPBOX IDC_SCREENS_DUMMY2 should not have an accel, but the only button in there PUSHBUTTON IDC_SCREENS_POWER_BUTTON should have an accel. This fixes a few existing accel collisions, e.g. in nl-NL.rc
- add a few additional FIXMEs for missing accels where I stumbled over them (most of them I fixed by guessing in the older branches, but I think it makes sense to let the actual native speakers fix them with the same accel that would be used in the 2k3sp2-version of *their* language)
- ro-RO.rc: Fix the forbidden characters according to the romanian-translation-rules

I noticed those glitches while porting back stuff, and acted on the FIXMEs in the backport instead of just fingerpointing to them (what I did on master).

dll/cpl/desk/advmon.c

@@ -1,7 +1,6 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
- * FILE:            dll/cpl/desk/advmon.c
  * PURPOSE:         Advanced monitor/display settings
  */
 
@@ -55,7 +54,7 @@ BuildAdvPropTitle(IDataObject *pdo, LPTSTR lpBuffer, DWORD dwBufferLen)
     LPTSTR lpMonitorName, lpDisplayName;
     TCHAR szFormatBuff[32];
 
-    if (!LoadString(hApplet, IDS_ADVANCEDTITLEFMT, szFormatBuff, sizeof(szFormatBuff) / sizeof(szFormatBuff[0])))
+    if (!LoadString(hApplet, IDS_ADVANCEDTITLEFMT, szFormatBuff, _countof(szFormatBuff)))
     {
         szFormatBuff[0] = _T('\0');
     }
@@ -89,7 +88,7 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
-    psh.dwFlags =  PSH_PROPTITLE;
+    psh.dwFlags = PSH_PROPTITLE;
     psh.hwndParent = hWndParent;
     psh.hInstance = hApplet;
     psh.pszCaption = szCaption;
@@ -100,7 +99,7 @@ DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice)
     pdo = CreateDevSettings(DisplayDevice);
 
     if (pdo != NULL)
-        BuildAdvPropTitle(pdo, szCaption, sizeof(szCaption) / sizeof(szCaption[0]));
+        BuildAdvPropTitle(pdo, szCaption, _countof(szCaption));
 
     hpsxaDev = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo);
     if (hpsxaDev != NULL)

dll/cpl/desk/effappdlg.c

@@ -1,11 +1,9 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Display Control Panel
- * FILE:            dll/cpl/desk/effappdlg.c
  * PURPOSE:         Effects appearance dialog
- *
- * PROGRAMMERS:     Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com)
- *                  Ismael Ferreras Morezuelas ([email protected])
+ * PROGRAMMERS:     Jan Roeloffzen <[email protected]>
+ *                  Ismael Ferreras Morezuelas <[email protected]>
  */
 
 #include "desk.h"
@@ -70,7 +68,7 @@ AddToCombobox(INT Combo, HWND hwndDlg, INT From, INT To)
 
     for (iElement = From; iElement <= To; iElement++)
     {
-        LoadString(hApplet, iElement, (LPTSTR)tstrText, ARRAYSIZE(tstrText));
+        LoadString(hApplet, iElement, (LPTSTR)tstrText, _countof(tstrText));
         SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)tstrText);
     }
 }
@@ -164,9 +162,7 @@ EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 case IDC_EFFAPPEARANCE_KEYBOARDCUES:
                 case IDC_EFFAPPEARANCE_FLATMENUS:
                     if (HIWORD(wParam) == BN_CLICKED)
-                    {
                         EffAppearanceDlgUpdateControls(hwndDlg, g);
-                    }
                     break;
 
                 case IDC_EFFAPPEARANCE_ANIMATIONTYPE:

dll/cpl/desk/lang/bg-BG.rc

@@ -6,7 +6,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30
-    LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10
+    LTEXT "&Theme:", IDC_STATIC, 5, 42, 55, 10
     COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14
     PUSHBUTTON "&Delete", IDC_THEMES_DELETE, 170, 70, 70, 14
@@ -21,10 +21,10 @@ BEGIN
     CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74
     CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
             LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 104, 174, 86
-    LTEXT "Изберете изображение за украса на работната си площ", IDC_STATIC, 8, 93, 230, 9
-    PUSHBUTTON "&Обзор...", IDC_BROWSE_BUTTON, 188, 104, 55, 15
+    LTEXT "Изберете изображение за украса на работната си площ:", IDC_STATIC, 8, 93, 230, 9//FIXME: add accel. I used "&Тапет за работен плот:" for the backport, because that doesn't overflow the length of the IDC_BACKGROUND_LIST below and therefore looks better
+    PUSHBUTTON "&Обзор...", IDC_BROWSE_BUTTON, 188, 104, 55, 15//I used "Об&зор..." for the backport to have the &O free
     PUSHBUTTON "&Цвят...", IDC_COLOR_BUTTON, 188, 167, 55, 15
-    LTEXT "Разположение", IDC_STATIC, 188, 128, 55, 9
+    LTEXT "Разположение:", IDC_STATIC, 188, 128, 55, 9//FIXME: add accel. I used "Расп&оложение:" for the backport
     COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15
 END
@@ -44,11 +44,11 @@ BEGIN
     CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT |
             UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 72, 123, 12, 13
     LTEXT "минути", IDC_MINTEXT, 86, 125, 26, 9
-    CONTROL "Искане на парола при изход", IDC_SCREENS_USEPASSCHK, "button",
+    CONTROL "Искане на парола при изход", IDC_SCREENS_USEPASSCHK, "button",//FIXME: add accel. I used "Искане &на парола при изход" for the backport
             BS_AUTOCHECKBOX | WS_TABSTOP, 116, 120, 109, 19
-    GROUPBOX "&Енергоспестяващи възможности на монитора", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
+    GROUPBOX "Енергоспестяващи възможности на монитора", IDC_SCREENS_DUMMY2, 8, 150, 230, 41
     LTEXT "За настройка захранването на монитора, натиснете „Захранване...“.", IDC_STATIC, 16, 161, 146, 27
-    PUSHBUTTON "Захранване...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15
+    PUSHBUTTON "Захранване...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15//FIXME: add accel. I used "&Захранване..." for the backport
 END
 
 IDD_APPEARANCE DIALOGEX 0, 0, 246, 212
@@ -57,17 +57,17 @@ CAPTION "Облик"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
-    LTEXT "Стил", IDC_STATIC, 7, 130, 104, 9
+    LTEXT "Стил:", IDC_STATIC, 7, 130, 104, 9//FIXME: add accel. I used "&Стил:" for the backport
     COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Второстепенен стил", IDC_STATIC, 7, 157, 104, 9
+    LTEXT "Второстепенен стил:", IDC_STATIC, 7, 157, 104, 9//FIXME: add accel. I kept the existing "&Разцветка:" for the backport
     COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 167, 134, 90, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Големина", IDC_STATIC, 7, 184, 104, 9
+    LTEXT "Големина:", IDC_STATIC, 7, 184, 104, 9//FIXME: add accel. I used "&Големина:" for the backport
     COMBOBOX IDC_APPEARANCE_SIZE, 7, 194, 134, 90, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON "&Ефекти", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15
-    PUSHBUTTON "Още", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15
+    PUSHBUTTON "Още", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15//FIXME: add accel. I used "&Още" for the backport
 END
 
 IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239
@@ -78,7 +78,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
     LTEXT "If you select a theme other than ReactOS classic, it will override the following settings, except in some older programs.", IDC_ADVAPPEARANCE_DISCLAIMER, 7, 133, 232, 30, BS_MULTILINE
-    LTEXT "Част", 8, 5, 160, 50, 9
+    LTEXT "Част", 8, 5, 160, 50, 9//FIXME: add accel. I used "&Част" for the backport
     COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP
     LTEXT "&Размер", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9
@@ -89,12 +89,12 @@ BEGIN
     CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP
     LTEXT "Цвят &2", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9
     CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP
-    LTEXT "Шрифт", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9
+    LTEXT "Шрифт", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9//FIXME: add accel. I used "&Шрифт" for the backport
     COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN |
              CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT "Размер на шрифта", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9
+    LTEXT "Размер на шрифта", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9//FIXME: add accel, and shrink the text! It is too long to fit here. I used "Р&азмер" for the backport. The context to "Шрифт", IDC_ADVAPPEARANCE_FONT_T is obvious due to the placement.
     COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL
-    LTEXT "Цвят", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9
+    LTEXT "Цвят", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9//FIXME: add accel. I used "&Цвят" for the backport
     CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP
     AUTOCHECKBOX "Ч", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE
     AUTOCHECKBOX "К ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE
@@ -112,7 +112,7 @@ BEGIN
             IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP
-    CONTROL "&Използване на следния похват за изглаждане ръбовете на екранните шрифтове", IDC_EFFAPPEARANCE_SMOOTHING,
+    CONTROL "&Използване на следния похват за изглаждане ръбовете на екранните шрифтове", IDC_EFFAPPEARANCE_SMOOTHING,//FIXME: text truncation. I used "&Изгладете ръбовете на екранните шрифтове чрез" for the backport
             "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19
     COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST |
              CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -122,7 +122,7 @@ BEGIN
             "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19
     CONTROL "Показване на съдържанието на &прозорците по време на влачене", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,
             "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19
-    CONTROL "С&криване на подчертаването за клавиатурното насочване, до натискане на Alt",
+    CONTROL "С&криване на подчертаването за клавиатурното насочване, до натискане на Alt",//FIXME: text truncation. I used "С&криване на осветяването за клавиатурата, докато не бъде натиснат Alt" for the backport
             IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19
     CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS,
             "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19
@@ -179,14 +179,14 @@ CAPTION "Общи"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Екран", -1, 7, 6, 237, 56, WS_GROUP
-    LTEXT "Размер на шрифта:", -1, 14, 20, 222, 9
+    LTEXT "Размер на шрифта:", -1, 14, 20, 222, 9//FIXME: add accel. I used "&Размер на шрифта:" for the backport. 2k3sp2 calls this "&DPI setting:" now. Feel free to translate that.
     COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12
     GROUPBOX "Съвместимост", -1, 7, 67, 237, 97
     LTEXT "Някои приложения няма да работят правилно, ако не презапуснете компютъра, след като промените цветовите настройки.\nСлед като променя цветовите настройки", -1, 12, 78, 228, 34
-    AUTORADIOBUTTON "&Презапуск преди прилагане на новите цветови настройки.", IDC_RESTART_RB, 14, 116, 228, 10
-    AUTORADIOBUTTON "Прилагане на новите настройки без презапуск.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10
-    AUTORADIOBUTTON "Питане преди прилагане на новите настройки", IDC_ASKME_RB, 14, 146, 228, 10
+    AUTORADIOBUTTON "&Презапуск преди прилагане на новите цветови настройки", IDC_RESTART_RB, 14, 116, 228, 10
+    AUTORADIOBUTTON "Прилагане на новите настройки без презапуск", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10//FIXME: add accel. I used "Пр&илагане на новите настройки без презапуск" for the backport
+    AUTORADIOBUTTON "Питане преди прилагане на новите настройки", IDC_ASKME_RB, 14, 146, 228, 10//FIXME: add accel. I used "Пи&тане преди прилагане на новите настройки" for the backport
 END
 
 IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57