diff --git a/base/applications/cmdutils/help/lang/ro-RO.rc b/base/applications/cmdutils/help/lang/ro-RO.rc
index d5ba86bc290..b2d546c6255 100644
--- a/base/applications/cmdutils/help/lang/ro-RO.rc
+++ b/base/applications/cmdutils/help/lang/ro-RO.rc
@@ -1,5 +1,5 @@
 /*
- * FILE:       base/shell/cmd/lang/ro-RO.rc
+ * FILE:       base/applications/cmdutils/help/lang/ro-RO.rc
  *             ReactOS Project (http://www.reactos.org)
  * AUTHOR:     Magnus Olsen, 2005
  * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md)
diff --git a/base/applications/cmdutils/help/lang/uk-UA.rc b/base/applications/cmdutils/help/lang/uk-UA.rc
index edb926700e4..2ef104e46c3 100644
--- a/base/applications/cmdutils/help/lang/uk-UA.rc
+++ b/base/applications/cmdutils/help/lang/uk-UA.rc
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Command-line interface
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/shell/cmd/lang/uk-UA.rc
+ * FILE:        base/applications/cmdutils/help/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for Command-line interface
  * TRANSLATORS: Artem Reznikov, Igor Paliychuk
  */
diff --git a/base/applications/cmdutils/xcopy/lang/Ro.rc b/base/applications/cmdutils/xcopy/lang/Ro.rc
index c1b61889813..978fa076f65 100644
--- a/base/applications/cmdutils/xcopy/lang/Ro.rc
+++ b/base/applications/cmdutils/xcopy/lang/Ro.rc
@@ -20,7 +20,7 @@ BEGIN
     STRING_FILE_CHAR "F"
     STRING_DIR_CHAR "D"
     STRING_HELP
-"XCOPY - Copiază fișiere sau arbori de directoare sursă într-o destinație\n\
+"XCOPY - Copiază fișiere sau arbori de directoare sursă într-o destinație.\n\
 \n\
 Sintaxă:\n\
 XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
@@ -28,27 +28,27 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \nCu:\n\
 \n\
 [/I]  Creează director dacă destinația nu există și se copiază două sau\n\
-\tmai multe fișiere\n\
-[/S]  Copiază directoarele și subdirectoarele\n\
-[/E]  Copiază directoarele și subdirectoarele, inclusiv pe cele goale\n\
+\tmai multe fișiere.\n\
+[/S]  Copiază directoarele și subdirectoarele.\n\
+[/E]  Copiază directoarele și subdirectoarele, inclusiv pe cele goale.\n\
 [/Q]  Nu afișa numele în timpul copierii.\n\
-[/F]  Arată numele întreg pentru sursă și destinație în timpul copierii\n\
-[/L]  Simulează operațiunea, afișând numele care ar fi copiate\n\
-[/W]  Solicită confirmarea înainte de a începe copierea\n\
-[/T]  Creează o structură de directoare goale, dar nu copiază fișiere\n\
-[/Y]  Nu solicita confirmarea la suprascrierea fișierelor\n\
-[/-Y] Solicită confirmarea la suprascrierea fișierelor\n\
-[/P]  Solicită confirmarea înainte de copierea fiecărui fișier sursă\n\
-[/N]  Copiază utilizând prescurtări de nume\n\
-[/U]  Copiază numai fișierele care există deja în destinație\n\
-[/R]  Suprascrie orice fișiere cu protecție la modificări\n\
-[/H]  Include în copie fișierele ascunse și de sistem\n\
-[/C]  Continuă chiar dacă apare o eroare în timpul copierii\n\
-[/A]  Copiază numai fișierele cu atributul de arhivă activat\n\
+[/F]  Arată numele întreg pentru sursă și destinație în timpul copierii.\n\
+[/L]  Simulează operațiunea, afișând numele care ar fi copiate.\n\
+[/W]  Solicită confirmarea înainte de a începe copierea.\n\
+[/T]  Creează o structură de directoare goale, dar nu copiază fișiere.\n\
+[/Y]  Nu solicita confirmarea la suprascrierea fișierelor.\n\
+[/-Y] Solicită confirmarea la suprascrierea fișierelor.\n\
+[/P]  Solicită confirmarea înainte de copierea fiecărui fișier sursă.\n\
+[/N]  Copiază utilizând prescurtări de nume.\n\
+[/U]  Copiază numai fișierele care există deja în destinație.\n\
+[/R]  Suprascrie orice fișiere cu protecție la modificări.\n\
+[/H]  Include în copie fișierele ascunse și de sistem.\n\
+[/C]  Continuă chiar dacă apare o eroare în timpul copierii.\n\
+[/A]  Copiază numai fișierele cu atributul de arhivă activat.\n\
 [/M]  Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\
-\tapoi atributul\n\
+\tapoi atributul.\n\
 [/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\
 \t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\
 \t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\
-\t\tsursă\n\n"
+\t\tsursă.\n\n"
 END
diff --git a/base/applications/games/solitaire/lang/bg-BG.rc b/base/applications/games/solitaire/lang/bg-BG.rc
index 2714612b1e3..a19f9edf2cf 100644
--- a/base/applications/games/solitaire/lang/bg-BG.rc
+++ b/base/applications/games/solitaire/lang/bg-BG.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Отказ", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Избор на гръб за картите"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Добре", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Отказ", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Добре", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Отказ", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/ca-ES.rc b/base/applications/games/solitaire/lang/ca-ES.rc
index 3d88376835a..db483b2e5f6 100644
--- a/base/applications/games/solitaire/lang/ca-ES.rc
+++ b/base/applications/games/solitaire/lang/ca-ES.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Cancel·lar", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Seleccioneu l'anvers"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Acceptar", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancel·lar", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Acceptar", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancel·lar", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/cs-CZ.rc b/base/applications/games/solitaire/lang/cs-CZ.rc
index 64de79d9d56..5b52155c189 100644
--- a/base/applications/games/solitaire/lang/cs-CZ.rc
+++ b/base/applications/games/solitaire/lang/cs-CZ.rc
@@ -27,25 +27,25 @@ BEGIN
     PUSHBUTTON "Storno", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Vybrat rub karet"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Storno", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Storno", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/de-DE.rc b/base/applications/games/solitaire/lang/de-DE.rc
index 819772c2d53..331096f604a 100644
--- a/base/applications/games/solitaire/lang/de-DE.rc
+++ b/base/applications/games/solitaire/lang/de-DE.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Kartenhintergrund wählen"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Abbrechen", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/el-GR.rc b/base/applications/games/solitaire/lang/el-GR.rc
index b84cb5d9225..7dbaa6e8450 100644
--- a/base/applications/games/solitaire/lang/el-GR.rc
+++ b/base/applications/games/solitaire/lang/el-GR.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Ακύρωση", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/en-US.rc b/base/applications/games/solitaire/lang/en-US.rc
index 9d2c65215b9..e31b0e64d4e 100644
--- a/base/applications/games/solitaire/lang/en-US.rc
+++ b/base/applications/games/solitaire/lang/en-US.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/es-ES.rc b/base/applications/games/solitaire/lang/es-ES.rc
index 76d6833bff7..24a282d302f 100644
--- a/base/applications/games/solitaire/lang/es-ES.rc
+++ b/base/applications/games/solitaire/lang/es-ES.rc
@@ -30,25 +30,25 @@ BEGIN
     PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Seleccionar el reverso"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Aceptar", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancelar", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Aceptar", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/eu-ES.rc b/base/applications/games/solitaire/lang/eu-ES.rc
index d30ed76cd45..8a3c97956b4 100644
--- a/base/applications/games/solitaire/lang/eu-ES.rc
+++ b/base/applications/games/solitaire/lang/eu-ES.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Utzi", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Hautatu karten atzealdea"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Ados", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Utzi", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Ados", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Utzi", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/fr-FR.rc b/base/applications/games/solitaire/lang/fr-FR.rc
index e9a66d5f335..9f83c7268b8 100644
--- a/base/applications/games/solitaire/lang/fr-FR.rc
+++ b/base/applications/games/solitaire/lang/fr-FR.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Sélectionnez le tarot des cartes"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Annuler", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/he-IL.rc b/base/applications/games/solitaire/lang/he-IL.rc
index 39cabae99f3..067c1351031 100644
--- a/base/applications/games/solitaire/lang/he-IL.rc
+++ b/base/applications/games/solitaire/lang/he-IL.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "ביטול", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "בחירת גב הקלפים"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "אישור", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "ביטול", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "אישור", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/hu-HU.rc b/base/applications/games/solitaire/lang/hu-HU.rc
index 6bc2723232a..21e93ddbbf5 100644
--- a/base/applications/games/solitaire/lang/hu-HU.rc
+++ b/base/applications/games/solitaire/lang/hu-HU.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Mégsem", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "A kártyák hátlapja"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Mégsem", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Mégsem", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/id-ID.rc b/base/applications/games/solitaire/lang/id-ID.rc
index feed12ac668..70167b3160f 100644
--- a/base/applications/games/solitaire/lang/id-ID.rc
+++ b/base/applications/games/solitaire/lang/id-ID.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/it-IT.rc b/base/applications/games/solitaire/lang/it-IT.rc
index 464a6b92091..c767ebff5ea 100644
--- a/base/applications/games/solitaire/lang/it-IT.rc
+++ b/base/applications/games/solitaire/lang/it-IT.rc
@@ -30,25 +30,25 @@ BEGIN
     PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Scegli il retro delle carte"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Annulla", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/ja-JP.rc b/base/applications/games/solitaire/lang/ja-JP.rc
index 14bd313293d..8691c521218 100644
--- a/base/applications/games/solitaire/lang/ja-JP.rc
+++ b/base/applications/games/solitaire/lang/ja-JP.rc
@@ -28,25 +28,25 @@ BEGIN
     PUSHBUTTON "キャンセル", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "カードの背景を選択"
 FONT 9, "MS UI Gothic"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "キャンセル", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/ko-KR.rc b/base/applications/games/solitaire/lang/ko-KR.rc
index b5c84f34e29..eb04a2d6903 100644
--- a/base/applications/games/solitaire/lang/ko-KR.rc
+++ b/base/applications/games/solitaire/lang/ko-KR.rc
@@ -23,25 +23,25 @@ BEGIN
     PUSHBUTTON "취소", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "카드 무늬 선택"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "확인", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "취소", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "확인", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "취소", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/lt-LT.rc b/base/applications/games/solitaire/lang/lt-LT.rc
index ee60886ae06..38b9219d929 100644
--- a/base/applications/games/solitaire/lang/lt-LT.rc
+++ b/base/applications/games/solitaire/lang/lt-LT.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Atsisakyti", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Kortų viršelio pasirinkimas"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Gerai", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Atsisakyti", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Gerai", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Atsisakyti", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/nl-NL.rc b/base/applications/games/solitaire/lang/nl-NL.rc
index bb3906ca592..d8bed184acd 100644
--- a/base/applications/games/solitaire/lang/nl-NL.rc
+++ b/base/applications/games/solitaire/lang/nl-NL.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Annuleren", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Achterzijde selecteren"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Annuleren", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Annuleren", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/no-NO.rc b/base/applications/games/solitaire/lang/no-NO.rc
index 78ee4941222..c9c9e259436 100644
--- a/base/applications/games/solitaire/lang/no-NO.rc
+++ b/base/applications/games/solitaire/lang/no-NO.rc
@@ -21,25 +21,25 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Velg kort"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Avbryt", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/pl-PL.rc b/base/applications/games/solitaire/lang/pl-PL.rc
index 8ba4f725869..bb046fb80e4 100644
--- a/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/base/applications/games/solitaire/lang/pl-PL.rc
@@ -31,25 +31,25 @@ BEGIN
     PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Wybieranie koszulki karty"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Anuluj", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/ro-RO.rc b/base/applications/games/solitaire/lang/ro-RO.rc
index bf3609e011b..ed6a1f975ed 100644
--- a/base/applications/games/solitaire/lang/ro-RO.rc
+++ b/base/applications/games/solitaire/lang/ro-RO.rc
@@ -3,7 +3,9 @@
  * LICENSE: Freeware, permission to use under Public Domain
  * FILE:    base/applications/games/solitaire/lang/ro-RO.rc
  * PURPOSE: Romanian Language File for Solitaire
- *          2011-10-18  minor changes (Fulea Ștefan)
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -17,37 +19,37 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "Cărți", -1, 7, 7, 90, 40
     AUTORADIOBUTTON "Câte &una", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Câte t&rei", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-    GROUPBOX "Scoring", -1, 100, 7, 75, 53
+    AUTORADIOBUTTON "Câte &trei", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
+    GROUPBOX "Scor", -1, 100, 7, 75, 53
     AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10
-    AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10
+    AUTORADIOBUTTON "Fă&ră", IDC_OPT_NOSCORE, 107, 45, 60, 10
     AUTOCHECKBOX "&Afișează timp", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
     AUTOCHECKBOX "&Bară de stare", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
-    AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
+    AUTOCHECKBOX "&Păstrează scor", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP
     DEFPUSHBUTTON "Con&firmă", IDOK, 35, 97, 50, 14
     PUSHBUTTON "A&nulează", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Selectare culoare dorsală"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Con&firmă", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "A&nulează", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Con&firmă", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "A&nulează", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
@@ -59,8 +61,8 @@ BEGIN
     IDS_SOL_QUIT "Abandonați jocul curent?"
     IDS_SOL_WIN "Felicitări, ați câștigat!"
     IDS_SOL_DEAL "O nouă rundă?"
-    IDS_SOL_SCORE "Score: %d"
-    IDS_SOL_TIME "Time: %d"
+    IDS_SOL_SCORE "Scor: %d"
+    IDS_SOL_TIME "Timp: %d"
 END
 
 /* Menus */
diff --git a/base/applications/games/solitaire/lang/ru-RU.rc b/base/applications/games/solitaire/lang/ru-RU.rc
index ebaebb7896f..23260d95aa0 100644
--- a/base/applications/games/solitaire/lang/ru-RU.rc
+++ b/base/applications/games/solitaire/lang/ru-RU.rc
@@ -23,25 +23,25 @@ BEGIN
     PUSHBUTTON "Отмена", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Выбор обложки карт"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Отмена", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Отмена", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Строки */
diff --git a/base/applications/games/solitaire/lang/sk-SK.rc b/base/applications/games/solitaire/lang/sk-SK.rc
index a907a0c0630..69f57b46f90 100644
--- a/base/applications/games/solitaire/lang/sk-SK.rc
+++ b/base/applications/games/solitaire/lang/sk-SK.rc
@@ -30,25 +30,25 @@ BEGIN
     PUSHBUTTON "Zrušiť", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Výber rubu kariet"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Zrušiť", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Zrušiť", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/sq-AL.rc b/base/applications/games/solitaire/lang/sq-AL.rc
index f677504c99a..387c408b6d0 100644
--- a/base/applications/games/solitaire/lang/sq-AL.rc
+++ b/base/applications/games/solitaire/lang/sq-AL.rc
@@ -30,25 +30,25 @@ BEGIN
     PUSHBUTTON "Anulo", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Zgjidh Leter Mbrapa"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Anulo", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/sv-SE.rc b/base/applications/games/solitaire/lang/sv-SE.rc
index 795407d6797..c1d15301f1d 100644
--- a/base/applications/games/solitaire/lang/sv-SE.rc
+++ b/base/applications/games/solitaire/lang/sv-SE.rc
@@ -21,25 +21,25 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Välj Kort Baksida"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Avbryt", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/th-TH.rc b/base/applications/games/solitaire/lang/th-TH.rc
index 0017ad42b18..ebabeab9946 100644
--- a/base/applications/games/solitaire/lang/th-TH.rc
+++ b/base/applications/games/solitaire/lang/th-TH.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "ยกเลิก", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc
index 55cbc0cd7bd..d3a4cdded1b 100644
--- a/base/applications/games/solitaire/lang/tr-TR.rc
+++ b/base/applications/games/solitaire/lang/tr-TR.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "İptal", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Kâğıt Arkalığı Seç"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Tamam", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "İptal", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Tamam", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "İptal", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/uk-UA.rc b/base/applications/games/solitaire/lang/uk-UA.rc
index bac156f72dd..299492e8022 100644
--- a/base/applications/games/solitaire/lang/uk-UA.rc
+++ b/base/applications/games/solitaire/lang/uk-UA.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "Скасувати", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Вибрати сорочку"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Скасувати", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/zh-CN.rc b/base/applications/games/solitaire/lang/zh-CN.rc
index 14eb3813a1b..321ca8e8d3b 100644
--- a/base/applications/games/solitaire/lang/zh-CN.rc
+++ b/base/applications/games/solitaire/lang/zh-CN.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "选定纸牌背面图案"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "确定", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "取消", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "确定", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "取消", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/lang/zh-TW.rc b/base/applications/games/solitaire/lang/zh-TW.rc
index f80b9aa53d2..dbfddf963bb 100644
--- a/base/applications/games/solitaire/lang/zh-TW.rc
+++ b/base/applications/games/solitaire/lang/zh-TW.rc
@@ -29,25 +29,25 @@ BEGIN
     PUSHBUTTON "取消", IDCANCEL, 101, 97, 50, 14
 END
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "選擇紙牌背面圖案"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "確定", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "取消", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "確定", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "取消", IDCANCEL, 176, 165, 54, 14
 END
 
 /* Strings */
diff --git a/base/applications/games/solitaire/solcreate.cpp b/base/applications/games/solitaire/solcreate.cpp
index 1f185713b41..00d29d856d6 100644
--- a/base/applications/games/solitaire/solcreate.cpp
+++ b/base/applications/games/solitaire/solcreate.cpp
@@ -23,7 +23,7 @@ void CreateSol()
     // Compute the value for yRowStackCardOffset based on the height of the card, so the card number isn't hidden on larger cards
     yRowStackCardOffset = (int)(__cardheight / 6.7);
 
-    pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDER, 2, 1);
+    pDeck = SolWnd.CreateRegion(DECK_ID, true, X_BORDER, Y_BORDERWITHFRAME, 2, 1);
     pDeck->SetEmptyImage(CS_EI_CIRC);
     pDeck->SetThreedCount(6);
     pDeck->SetDragRule(CS_DRAG_NONE, 0);
@@ -32,7 +32,7 @@ void CreateSol()
     pDeck->SetDblClickProc(DeckClickProc);
     pDeck->SetFaceDirection(CS_FACE_DOWN, 0);
 
-    pPile = SolWnd.CreateRegion(PILE_ID, true, X_BORDER + __cardwidth + X_PILE_BORDER, Y_BORDER, CS_DEFXOFF, 1);
+    pPile = SolWnd.CreateRegion(PILE_ID, true, X_BORDER + __cardwidth + X_PILE_BORDER, Y_BORDERWITHFRAME, CS_DEFXOFF, 1);
     pPile->SetEmptyImage(CS_EI_NONE);
     pPile->SetDragRule(CS_DRAG_TOP, 0);
     pPile->SetDropRule(CS_DROP_NONE, 0);
@@ -45,7 +45,7 @@ void CreateSol()
     //
     for(i = 0; i < 4; i++)
     {
-        pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, Y_BORDER, 0, 0);
+        pSuitStack[i] = SolWnd.CreateRegion(SUIT_ID+i, true, 0, Y_BORDERWITHFRAME, 0, 0);
         pSuitStack[i]->SetEmptyImage(CS_EI_SUNK);
         pSuitStack[i]->SetPlacement(CS_XJUST_CENTER, 0, i * (__cardwidth + X_SUITSTACK_BORDER) , 0);
 
@@ -61,7 +61,7 @@ void CreateSol()
     //
     for(i = 0; i < NUM_ROW_STACKS; i++)
     {
-        pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset);
+        pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDERWITHFRAME + __cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset);
         pRowStack[i]->SetEmptyImage(CS_EI_SUNK);
         pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i);
 
diff --git a/base/applications/games/solitaire/solitaire.h b/base/applications/games/solitaire/solitaire.h
index f05b2f4a797..9905ec51a9a 100644
--- a/base/applications/games/solitaire/solitaire.h
+++ b/base/applications/games/solitaire/solitaire.h
@@ -17,9 +17,8 @@ extern bool fGameStarted;
 #define CARDBACK_END             IDC_CARDBACK12
 #define NUM_CARDBACKS            (CARDBACK_END - CARDBACK_START + 1)
 #define CARDBACK_RES_START       53
-/* Display option cards with half the size */
-#define CARDBACK_OPTIONS_WIDTH   36
-#define CARDBACK_OPTIONS_HEIGHT  48
+#define CARDBACK_OPTIONS_WIDTH   72
+#define CARDBACK_OPTIONS_HEIGHT  112
 
 extern DWORD dwOptions;
 
@@ -51,7 +50,8 @@ void NewGame(void);
 #define X_PILE_BORDER            18
 #define X_ROWSTACK_BORDER        10
 #define X_SUITSTACK_BORDER       10
-#define Y_BORDER                 20
+#define Y_BORDER                 30
+#define Y_BORDERWITHFRAME        20
 #define Y_ROWSTACK_BORDER        32
 extern int yRowStackCardOffset;
 
diff --git a/base/applications/games/spider/lang/bg-BG.rc b/base/applications/games/spider/lang/bg-BG.rc
index e46cdc7f225..9cae6648e27 100644
--- a/base/applications/games/spider/lang/bg-BG.rc
+++ b/base/applications/games/spider/lang/bg-BG.rc
@@ -2,25 +2,25 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Избор на гръб на картите"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Добре", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Отказ", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Добре", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Отказ", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/de-DE.rc b/base/applications/games/spider/lang/de-DE.rc
index 6e458dd763a..a6564598d07 100644
--- a/base/applications/games/spider/lang/de-DE.rc
+++ b/base/applications/games/spider/lang/de-DE.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Kartenhintergrund wählen"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Abbrechen", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Abbrechen", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 120, 80
diff --git a/base/applications/games/spider/lang/en-US.rc b/base/applications/games/spider/lang/en-US.rc
index 8ad364565dd..3fe9e3ba3fb 100644
--- a/base/applications/games/spider/lang/en-US.rc
+++ b/base/applications/games/spider/lang/en-US.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancel", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/es-ES.rc b/base/applications/games/spider/lang/es-ES.rc
index 0bf24eabaf7..a87e000132a 100644
--- a/base/applications/games/spider/lang/es-ES.rc
+++ b/base/applications/games/spider/lang/es-ES.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Escoge Reverso de Carta"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Aceptar", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancelar", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Aceptar", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/fr-FR.rc b/base/applications/games/spider/lang/fr-FR.rc
index b7a142f74a6..330d6b9189d 100644
--- a/base/applications/games/spider/lang/fr-FR.rc
+++ b/base/applications/games/spider/lang/fr-FR.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Sélectionnez le tarot des cartes"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Annuler", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Annuler", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/he-IL.rc b/base/applications/games/spider/lang/he-IL.rc
index 64a9b07edb7..14aeedf9101 100644
--- a/base/applications/games/spider/lang/he-IL.rc
+++ b/base/applications/games/spider/lang/he-IL.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "בחר חפיסה"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "אישור", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "ביטול", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "אישור", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "ביטול", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/hu-HU.rc b/base/applications/games/spider/lang/hu-HU.rc
index 1da94b682eb..d1aba5cf1e0 100644
--- a/base/applications/games/spider/lang/hu-HU.rc
+++ b/base/applications/games/spider/lang/hu-HU.rc
@@ -2,25 +2,25 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Hátlap kiválasztása"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Mégsem", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Mégsem", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/it-IT.rc b/base/applications/games/spider/lang/it-IT.rc
index d3e6c157e75..9e1be1d81ca 100644
--- a/base/applications/games/spider/lang/it-IT.rc
+++ b/base/applications/games/spider/lang/it-IT.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Scelta del mazzo"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Annulla", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Annulla", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/ja-JP.rc b/base/applications/games/spider/lang/ja-JP.rc
index e26b828141a..889d5134c78 100644
--- a/base/applications/games/spider/lang/ja-JP.rc
+++ b/base/applications/games/spider/lang/ja-JP.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "カードの背景を選択"
 FONT 9, "MS UI Gothic"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "キャンセル", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "キャンセル", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/nl-NL.rc b/base/applications/games/spider/lang/nl-NL.rc
index 39e5bc7f59f..a68639eddb5 100644
--- a/base/applications/games/spider/lang/nl-NL.rc
+++ b/base/applications/games/spider/lang/nl-NL.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Achterzijde selecteren"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Annuleren", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Annuleren", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/pl-PL.rc b/base/applications/games/spider/lang/pl-PL.rc
index eb15a245118..f44421e142a 100644
--- a/base/applications/games/spider/lang/pl-PL.rc
+++ b/base/applications/games/spider/lang/pl-PL.rc
@@ -11,25 +11,25 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Wybierz koszulkę talii"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Anuluj", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Anuluj", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/pt-BR.rc b/base/applications/games/spider/lang/pt-BR.rc
index 1c4c54b8db9..dae2ab6e86e 100644
--- a/base/applications/games/spider/lang/pt-BR.rc
+++ b/base/applications/games/spider/lang/pt-BR.rc
@@ -2,25 +2,25 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Selecionar Carta Anterior"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Cancelar", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Cancelar", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/ro-RO.rc b/base/applications/games/spider/lang/ro-RO.rc
index 107e586d3df..558be7814a0 100644
--- a/base/applications/games/spider/lang/ro-RO.rc
+++ b/base/applications/games/spider/lang/ro-RO.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 /* Dialoguri */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Selectare culoare dorsală"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Con&firmă", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "A&nulează", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Con&firmă", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "A&nulează", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/ru-RU.rc b/base/applications/games/spider/lang/ru-RU.rc
index d2c017f570c..dce30db9b09 100644
--- a/base/applications/games/spider/lang/ru-RU.rc
+++ b/base/applications/games/spider/lang/ru-RU.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Выбор оформления"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Отмена", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Отмена", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 112, 80
diff --git a/base/applications/games/spider/lang/sk-SK.rc b/base/applications/games/spider/lang/sk-SK.rc
index 28308a7dd4d..b4cb268e88e 100644
--- a/base/applications/games/spider/lang/sk-SK.rc
+++ b/base/applications/games/spider/lang/sk-SK.rc
@@ -11,25 +11,25 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Výber rubu kariet"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Zrušiť", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Zrušiť", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/sq-AL.rc b/base/applications/games/spider/lang/sq-AL.rc
index ccf0f802ca6..2c5ade12dae 100644
--- a/base/applications/games/spider/lang/sq-AL.rc
+++ b/base/applications/games/spider/lang/sq-AL.rc
@@ -11,25 +11,25 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Perzgjedh Letren Mbrapa"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "aNULO", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Anulo", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/sv-SE.rc b/base/applications/games/spider/lang/sv-SE.rc
index c2259601de0..c49a336f929 100644
--- a/base/applications/games/spider/lang/sv-SE.rc
+++ b/base/applications/games/spider/lang/sv-SE.rc
@@ -9,25 +9,25 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Välj Kort Baksidan"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Avbryt", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Avbryt", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/tr-TR.rc b/base/applications/games/spider/lang/tr-TR.rc
index 5a83387815c..6057b15e5af 100644
--- a/base/applications/games/spider/lang/tr-TR.rc
+++ b/base/applications/games/spider/lang/tr-TR.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Kâğıt Arkalığı Seç"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Tamam", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "İptal", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "Tamam", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "İptal", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/uk-UA.rc b/base/applications/games/spider/lang/uk-UA.rc
index 13d71ae0d94..7cd813603d1 100644
--- a/base/applications/games/spider/lang/uk-UA.rc
+++ b/base/applications/games/spider/lang/uk-UA.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "Вибір оформлення"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "Скасувати", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "Скасувати", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/zh-CN.rc b/base/applications/games/spider/lang/zh-CN.rc
index 414edbc8621..119fae76d24 100644
--- a/base/applications/games/spider/lang/zh-CN.rc
+++ b/base/applications/games/spider/lang/zh-CN.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "选择牌背图案"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "确定", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "取消", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "确定", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "取消", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/lang/zh-TW.rc b/base/applications/games/spider/lang/zh-TW.rc
index 32fdc623a6c..90ce6530cf3 100644
--- a/base/applications/games/spider/lang/zh-TW.rc
+++ b/base/applications/games/spider/lang/zh-TW.rc
@@ -10,25 +10,25 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 /* Dialogs */
 
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
+IDD_CARDBACK DIALOGEX 6, 6, 345, 185
 CAPTION "選擇紙牌圖案"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
-    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "確定", IDOK, 66, 84, 54, 13
-    PUSHBUTTON "取消", IDCANCEL, 126, 84, 54, 13
+    CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71
+    CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71
+    CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71
+    CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71
+    CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71
+    CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71
+    CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71
+    CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71
+    CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71
+    CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71
+    CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71
+    CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71
+    DEFPUSHBUTTON "確定", IDOK, 114, 165, 54, 14
+    PUSHBUTTON "取消", IDCANCEL, 176, 165, 54, 14
 END
 
 IDD_DIFFICULTY DIALOGEX 100, 100, 106, 80
diff --git a/base/applications/games/spider/spider.cpp b/base/applications/games/spider/spider.cpp
index 95df4c32de6..b59bc33aaa3 100644
--- a/base/applications/games/spider/spider.cpp
+++ b/base/applications/games/spider/spider.cpp
@@ -359,7 +359,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             MINMAXINFO *mmi;
 
             mmi = (MINMAXINFO *)lParam;
-            mmi->ptMinTrackSize.x = NUM_STACKS * __cardwidth + (NUM_STACKS + 3) * X_BORDER;
+            mmi->ptMinTrackSize.x = NUM_STACKS * __cardwidth + (NUM_STACKS + 3) * X_BORDER + 20; // Border left and right of 10px
             mmi->ptMinTrackSize.y = GetSystemMetrics(SM_CYCAPTION) +
                                     GetSystemMetrics(SM_CYMENU) +
                                     2 * Y_BORDER +
diff --git a/base/applications/games/spider/spider.h b/base/applications/games/spider/spider.h
index 69c0b80d1d4..5385de7af55 100644
--- a/base/applications/games/spider/spider.h
+++ b/base/applications/games/spider/spider.h
@@ -12,12 +12,11 @@
 #define CARDBACK_END             IDC_CARDBACK12
 #define NUM_CARDBACKS            (CARDBACK_END - CARDBACK_START + 1)
 #define CARDBACK_RES_START       53
-/* Display option cards with half the size */
-#define CARDBACK_OPTIONS_WIDTH   36
-#define CARDBACK_OPTIONS_HEIGHT  48
+#define CARDBACK_OPTIONS_WIDTH   72
+#define CARDBACK_OPTIONS_HEIGHT  112
 
 #define X_BORDER                  6
-#define Y_BORDER                 12
+#define Y_BORDER                  6
 
 #define NUM_STACKS         10
 
diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc
index 473f8755e5c..2ddd76f241d 100644
--- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc
+++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-/* Romanian translation by Dimitriu Petru with Fulea Ștefan - minor changes (2011.12.19) */
+/* Romanian translation by Petru Dimitriu and Ștefan Fulea */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -10,9 +10,9 @@ BEGIN
         MENUITEM "Se&curitate", ID_LOG_SECURITY
         MENUITEM "&Sistem", ID_LOG_SYSTEM
         MENUITEM SEPARATOR
-        MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED
+        MENUITEM "Păstrare p&rotocol…", ID_SAVE_PROTOCOL, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED
+        MENUITEM "Înlăt&ură toate evenimentele", ID_CLEAR_EVENTS, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "I&eșire", IDM_EXIT
     END
@@ -101,8 +101,8 @@ BEGIN
     IDS_EVENTLOG_AUDIT_FAILURE "Eșec audit"
     IDS_EVENTLOG_SUCCESS "Succes"
     IDS_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut"
-    IDS_CLEAREVENTS_MSG "Do you want to save this event log before clearing it?"
-    IDS_SAVE_FILTER "Event Log (*.evt)\0*.evt\0"
+    IDS_CLEAREVENTS_MSG "Doriți păstrarea acestui jurnal de evenimente înainte de a-l închide?"
+    IDS_SAVE_FILTER "Jurnal de evenimente (*.evt)\0*.evt\0"
 END
 
 STRINGTABLE
diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc
new file mode 100644
index 00000000000..56241fa2a5f
--- /dev/null
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -0,0 +1,69 @@
+/* 
+ * FILE:       base/applications/network/net/lang/ro-RO.rc
+ *             ReactOS Project (http://www.reactos.org)
+ * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_ACCOUNTS_SYNTAX "Utilizare:\nNET ACCOUNTS [/FORCELOGOFF:{Minute|NO}] [/MINPWLEN:Lungime]\n\
+             [/MAXPWAGE:{Zile|UNLIMITED}] [/MINPWAGE:Zile]\n\
+             [/UNIQUEPW:Număr] [/DOMAIN]\n"
+    IDS_ACCOUNTS_HELP "ACCOUNTS\n..."
+    IDS_COMPUTER_SYNTAX "Utilizare:\nNET COMPUTER ..."
+    IDS_COMPUTER_HELP "COMPUTER\n..."
+    IDS_CONFIG_SYNTAX "Utilizare:\nNET CONFIG ..."
+    IDS_CONFIG_HELP "CONFIG\n..."
+    IDS_CONTINUE_SYNTAX "Utilizare:\nNET CONTINUE <nume serviciu>"
+    IDS_CONTINUE_HELP "CONTINUE\n..."
+    IDS_FILE_SYNTAX "Utilizare:\nNET FILE ..."
+    IDS_FILE_HELP "FILE\n..."
+    IDS_GROUP_SYNTAX "Utilizare:\nNET GROUP ..."
+    IDS_GROUP_HELP "GROUP\n..."
+    IDS_HELPMSG_SYNTAX "Utilizare:\nNET HELPMSG <Error Code>"
+    IDS_HELPMSG_HELP "HELPMSG\n..."
+    IDS_LOCALGROUP_SYNTAX "Utilizare:\nNET LOCALGROUP ..."
+    IDS_LOCALGROUP_HELP "LOCALGROUP\n..."
+    IDS_NAME_SYNTAX "Utilizare:\nNET NAME ..."
+    IDS_NAME_HELP "NAME\n..."
+    IDS_PRINT_SYNTAX  "Utilizare:\nNET PRINT ..."
+    IDS_PRINT_HELP "PRINT\n..."
+    IDS_PAUSE_SYNTAX "Utilizare:\nNET PAUSE <nume serviciu>"
+    IDS_PAUSE_HELP "PAUSE\n..."
+    IDS_SEND_SYNTAX "Utilizare:\nNET SEND ..."
+    IDS_SEND_HELP "SEND\n..."
+    IDS_SESSION_SYNTAX "Utilizare:\nNET SESSION ..."
+    IDS_SESSION_HELP "SESSION\n..."
+    IDS_SHARE_SYNTAX "Utilizare:\nNET SHARE ..."
+    IDS_SHARE_HELP "SHARE\n..."
+    IDS_START_SYNTAX "Utilizare:\nNET START ..."
+    IDS_START_HELP "START\n..."
+    IDS_STATISTICS_SYNTAX "Utilizare:\nNET STATISTICS ..."
+    IDS_STATISTICS_HELP "STATISTICS\n..."
+    IDS_STOP_SYNTAX "Utilizare:\nNET STOP <nume serviciu>"
+    IDS_STOP_HELP "STOP\n..."
+    IDS_TIME_SYNTAX "Utilizare:\nNET TIME ..."
+    IDS_TIME_HELP "TIME\n..."
+    IDS_USE_SYNTAX "Utilizare:\nNET USE ..."
+    IDS_USE_HELP "USE\n..."
+    IDS_USER_SYNTAX "Utilizare:\nNET USER ..."
+    IDS_USER_HELP "USER\n..."
+    IDS_VIEW_SYNTAX "Utilizare:\nNET VIEW ..."
+    IDS_VIEW_HELP "VIEW\n..."
+    IDS_HELP_SYNTAX "Utilizare:\nNET HELP <comandă>\n   - sau -\nNET <comandă> /HELP\n\n\
+   Sunt disponibile următoarele comenzi:\n\n\
+   NET ACCOUNTS             NET HELP                 NET SHARE\n\
+   NET COMPUTER             NET HELPMSG              NET START\n\
+   NET CONFIG               NET LOCALGROUP           NET STATISTICS\n\
+   NET CONFIG SERVER        NET NAME                 NET STOP\n\
+   NET CONFIG WORKSTATION   NET PAUSE                NET TIME\n\
+   NET CONTINUE             NET PRINT                NET USE\n\
+   NET FILE                 NET SEND                 NET USER\n\
+   NET GROUP                NET SESSION              NET VIEW\n\n\
+   ..."
+    IDS_NET_SYNTAX "Utilizare:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\
+      HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\
+      SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n"
+END
diff --git a/base/applications/network/net/net.rc b/base/applications/network/net/net.rc
index ef6ba03f034..52b896c680f 100644
--- a/base/applications/network/net/net.rc
+++ b/base/applications/network/net/net.rc
@@ -15,3 +15,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
diff --git a/base/applications/rapps/rapps/7zip.txt b/base/applications/rapps/rapps/7zip.txt
index 9938f9cf308..859768f4c8d 100644
--- a/base/applications/rapps/rapps/7zip.txt
+++ b/base/applications/rapps/rapps/7zip.txt
@@ -3,44 +3,44 @@
 
 [Section]
 Name = 7-Zip
-Version = 9.32a
+Version = 9.34a
 Licence = LGPL
 Description = A file archiving utility with support for 7zip, zip, tar, rar and many other archive formats.
-Size = 1.1 MB
+Size = 1.14 MB
 Category = 12
 URLSite = http://www.7-zip.org/
-URLDownload = http://dl.7-zip.org/7z932.exe
+URLDownload = http://dl.7-zip.org/7z934.msi
 CDPath = none
 
 [Section.0407]
 Description = Ein Dateiarchivierungswerkzeug zum Erstellen und Öffnen von 7zip, zip, tar, rar und vielen anderen Archivformaten.
 
 [Section.040a]
-Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. (FIXME)
+Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos.
 
 [Section.040c]
-Description = Utilitaire pour créer et ouvrir les fichiers 7zip, zip, tar, rar et autres archives. (FIXME)
-Size = 1,1 Mo
+Description = Utilitaire pour créer et ouvrir les fichiers 7zip, zip, tar, rar et autres archives.
+Size = 1,14 Mo
 
 [Section.0410]
-Description = Utilità per creare e aprire 7zip, zip, tar, rar e altri file archivio. (FIXME)
+Description = Utilità per creare e aprire 7zip, zip, tar, rar e altri file archivio.
 
 [Section.0413]
-Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME)
+Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden.
 
 [Section.0415]
-Description = Narzędzie do tworzenia i otwierania plików typu 7zip, zip, tar, i innych plików archiwizacyjnych. (FIXME)
+Description = Narzędzie do tworzenia i otwierania plików typu 7zip, zip, tar, i innych plików archiwizacyjnych.
 
 [Section.0418]
 Description = Un utilitar de arhivare a fișierelor, compatibil cu 7zip, zip, tar, rar și multe alte formate de arhive.
-Size = 1,1 Mo
+Size = 1,14 Mo
 
 [Section.041f]
 Description = 7zip, zip, tar, rar ve başka birçok belgelik biçimi destekli bir kütük belgelikleme aracı.
-Size = 1,1 MB
+Size = 1,14 MB
 
 [Section.0422]
-Description = Утиліта для створення та відкриття 7zip, zip, tar, rar та інших архівних файлів. (FIXME)
+Description = Утиліта для створення та відкриття 7zip, zip, tar, rar та інших архівних файлів.
 
 [Section.0813]
-Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME)
+Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden.
diff --git a/base/applications/rapps/rapps/abyss.txt b/base/applications/rapps/rapps/abyss.txt
index 9e0e0f6349b..83c92f68a24 100644
--- a/base/applications/rapps/rapps/abyss.txt
+++ b/base/applications/rapps/rapps/abyss.txt
@@ -1,9 +1,9 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Abyss Web server X1
-Version = 2.9.3.2
+Version = 2.9.3.5
 Licence = Freeware
 Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle.
 Size = 2.1 MB
diff --git a/base/applications/rapps/rapps/ac97forvirtualbox.txt b/base/applications/rapps/rapps/ac97forvirtualbox.txt
index bfcb24a1703..dd4b00e476f 100644
--- a/base/applications/rapps/rapps/ac97forvirtualbox.txt
+++ b/base/applications/rapps/rapps/ac97forvirtualbox.txt
@@ -14,12 +14,12 @@ CDPath = none
 [Section.0405]
 Name = Ovladač AC97 pro VirtualBox
 Licence = Neznámá
-Description = Rozbalte do složky "ReactOS" a pak ReactOS dvakrát restartujte. (FIXME)
+Description = Rozbalte do složky "ReactOS" a pak ReactOS dvakrát restartujte.
 
 [Section.0407]
 Name = AC97 Treiber für VirtualBox
 Licence = Unbekannt
-Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. (FIXME)
+Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten.
 
 [Section.0410]
 Name = Driver AC97 per VirtualBox
@@ -29,39 +29,39 @@ Descrizione = Estrarre nella cartella "ReactOS" e poi riavviare ReactOs due volt
 [Section.040a]
 Name = Driver AC97 para VirtualBox
 Licence = Desconocida
-Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. (FIXME)
+Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces.
 
 [Section.040c]
 Name = Pilote AC97 pour VirtualBox
 Licence = Inconnue
-Description = Décompresser dans le dossier "ReactOS" puis redémarrer ReactOS deux fois. (FIXME)
+Description = Décompresser dans le dossier "ReactOS" puis redémarrer ReactOS deux fois.
 Size = 185,5 ko
 
 [Section.0410]
 Name = Driver AC97 per VirtualBox
 Licence = Sconosciuta
-Description = Decomprimere nella cartella "ReactOS" e riavviare ReactOS. (FIXME)
+Description = Decomprimere nella cartella "ReactOS" e riavviare ReactOS.
 
 [Section.0413]
 Name = AC97 Driver voor VirtualBox
 Licence = Ongekend
-Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op. (FIXME)
+Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op.
 
 [Section.0415]
 Name = Sterownik AC97 dla VirtualBox
 Licence = Nieznana
-Description = Rozpakuj zawartość w folderze "ReactOS" i dwukrotnie zrestartuj system. (FIXME)
+Description = Rozpakuj zawartość w folderze "ReactOS" i dwukrotnie zrestartuj system.
 
 [Section.0418]
 Name = Modul pilot AC97 pentru VirtualBox
 Licence = Nespecificată
-Description = Dezarhivați în dosarul „ReactOS” apoi reporniți ReactOS de două ori. (FIXME)
+Description = Dezarhivați în dosarul ReactOS apoi reporniți ReactOS de două ori.
 Size = 185,5 ko
 
 [Section.0419]
 Name = Драйвер AC97 для VirtualBox
 Licence = Не указано
-Description = Pазархивируйте содержимое в папку "ReactOS", затем дважды перезагрузите систему. (FIXME)
+Description = Pазархивируйте содержимое в папку "ReactOS", затем дважды перезагрузите систему.
 
 [Section.041f]
 Name = VirtualBox için AC97 Sürücüsü
@@ -72,9 +72,9 @@ Size = 185,5 KB
 [Section.0422]
 Name = Драйвер AC97 для VirtualBox
 Licence = Невідома
-Description = Pозархівуйте вміст в теку "ReactOS" після чого двічі перезавантажте систему. (FIXME)
+Description = Pозархівуйте вміст в теку "ReactOS" після чого двічі перезавантажте систему.
 
 [Section.0813]
 Name = AC97 Driver voor VirtualBox
 Licence = Ongekend
-Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op. (FIXME)
+Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op.
diff --git a/base/applications/rapps/rapps/alreader.txt b/base/applications/rapps/rapps/alreader.txt
index c932ab20444..173cbe2a7d9 100644
--- a/base/applications/rapps/rapps/alreader.txt
+++ b/base/applications/rapps/rapps/alreader.txt
@@ -11,16 +11,16 @@ URLDownload = http://svn.reactos.org/packages/AlReader2Setup.exe
 CDPath = none
 
 [Section.0407]
-Description = Ein FB2 eBook Reader. Unterstützung für folgende Formate: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ZIP und GZ Archive werden ebenfalls unterstützt. (FIXME?)
+Description = Ein FB2 eBook Reader. Unterstützung für folgende Formate: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ZIP und GZ Archive werden ebenfalls unterstützt.
 
 [Section.0410]
-Description = Un eBook Reader. Legge i formati fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supporta gli archivi ZIP e GZ. (FIXME)
+Description = Un eBook Reader. Legge i formati fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supporta gli archivi ZIP e GZ.
 
 [Section.0415]
-Description = Czytnik eBooków. Obsługuje formaty: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Obsługiwane są także pliki w archivach ZIP i GZ. (FIXME)
+Description = Czytnik eBooków. Obsługuje formaty: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Obsługiwane są także pliki w archivach ZIP i GZ.
 
 [Section.0418]
-Description = Cititor de cărți electronice în format FB2. Supported read formats: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supported ZIP and GZ archives. (FIXME)
+Description = Un cititor de cărți electronice. Poate citi fișiere de tip: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Include suport pentru arhive ZIP și GZ.
 Size = 4,6 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/ants.txt b/base/applications/rapps/rapps/ants.txt
index 3294e86a91c..c39378a108f 100644
--- a/base/applications/rapps/rapps/ants.txt
+++ b/base/applications/rapps/rapps/ants.txt
@@ -9,22 +9,22 @@ Licence = Freeware
 Description = A card strategic game. Build your own castle and try to destroy enemy castle. You need a ZIP decompression program to install it.
 Size = 632 kB
 Category = 4
-URLSite = http://peter.hostuju.cz/index.htm
+URLSite = http://peter.hostuju.cz/
 URLDownload = http://petr.hostuju.cz/program/download/ANTS.zip
 CDPath = none
 
 [Section.0407]
-Description = Ein strategisches Kartenspiel. Sie bauen Ihr eigenes Schloss und versuchen, die gegnerische Burg zu zerstören. Sie benötigen ein ZIP-Programm, um es zu installieren. (FIXME)
+Description = Ein strategisches Kartenspiel. Sie bauen Ihr eigenes Schloss und versuchen, die gegnerische Burg zu zerstören. Sie benötigen ein ZIP-Programm, um es zu installieren.
 
 [Section.0410]
 Description = Un gioco di carte strategico. Costruisci il tuo castello e prova a distruggere il castello nemico. Necessita di un programma di estrazione ZIP per essere installato.
 
 [Section.0415]
-Description = Karciana gra strategiczna. Budujesz zamek, przy okazji próbujesz zniszczyć zamek wroga. Wymaga programu archiwizującego do wypakowania. (FIXME)
+Description = Karciana gra strategiczna. Budujesz zamek, przy okazji próbujesz zniszczyć zamek wroga. Wymaga programu archiwizującego do wypakowania.
 
 [Section.0418]
 Licence = Gratuită
-Description = Un joc strategic de cărți. Jucătorul își va construi un castel și încerca să distrugă castelele oponenților. Este necesar un utilitar de dezarhivare ZIP pentru a instala acest joc. (FIXME)
+Description = Un joc strategic de cărți. Jucătorul își va construi un castel și încerca să distrugă castelele oponenților. Este necesar un utilitar de dezarhivare ZIP pentru a instala acest joc.
 Size = 632 ko
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/bittorrent.txt b/base/applications/rapps/rapps/bittorrent.txt
index faaa324b0a1..6fe557e1a7b 100644
--- a/base/applications/rapps/rapps/bittorrent.txt
+++ b/base/applications/rapps/rapps/bittorrent.txt
@@ -3,10 +3,10 @@
 
 [Section]
 Name = BitTorrent
-Version = 7.8
+Version = 7.9.2
 Licence = Freeware for non-commercial uses
 Description = The Original BitTorrent Client.
-Size = 1.07 MB
+Size = 1.9 MB
 Category = 5
 URLSite = http://www.bittorrent.com/
 URLDownload = http://download-new.utorrent.com/endpoint/bittorrent/os/windows/track/stable/BitTorrent.exe
@@ -26,9 +26,9 @@ Description = Oryginalny klient BitTorrent.
 [Section.0418]
 Licence = Gratuită pentru uz necomercial
 Description = Originalul client BitTorrent.
-Size = 1,07 Mo
+Size = 1,9 Mo
 
 [Section.041f]
 Licence = Tecimlik olmayan kullanımlar için ücretsiz.
 Description = Özgün BitTorrent istemcisi.
-Size = 1,07 MB
+Size = 1,9 MB
diff --git a/base/applications/rapps/rapps/bochs.txt b/base/applications/rapps/rapps/bochs.txt
index 445e35730ca..584b555be01 100644
--- a/base/applications/rapps/rapps/bochs.txt
+++ b/base/applications/rapps/rapps/bochs.txt
@@ -1,16 +1,16 @@
-; UTF-8
+; UTF-8
 ; Polish translation by wojo664
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Bochs
-Version = 2.6.5
+Version = 2.6.6
 Licence = LGPL v2
 Description = Bochs is a highly portable open source IA-32 (x86) PC emulator written in C++, that runs on most popular platforms.
 Size = 4.7 MB
 Category = 15
 URLSite = http://bochs.sourceforge.net/
-URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.5/Bochs-2.6.5.exe
+URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.6/Bochs-2.6.6.exe
 CDPath = none
 
 [Section.0407]
@@ -23,7 +23,7 @@ Description = Bochs è un emulatore pc IA-32 (x86) scritto in C++ open source e
 Description = Bochs to przenośny (portable) emulator platformy IA-32 (x86) napisany w C++, działa na wielu popularnych platformach sprzętowych.
 
 [Section.0418]
-Description = Bochs este un emulator PC (x86) cu surse publice și portabilitate înaltă, scris în C++, compatibil cu majoritatea platformelor.
+Description = Bochs este un emulator PC (x86) cu surse deschise și portabilitate înaltă, scris în C++, compatibil cu majoritatea platformelor.
 Size = 4,7 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/boundaround.txt b/base/applications/rapps/rapps/boundaround.txt
index 7474e9ebb8b..67148955a42 100644
--- a/base/applications/rapps/rapps/boundaround.txt
+++ b/base/applications/rapps/rapps/boundaround.txt
@@ -18,6 +18,11 @@ Description = Ein Spiel, ähnlich zu Frozen Fruits.
 Name = Bound Around (Versione di prova)
 Description = Un gioco simile a Frozen Fruits.
 
+[Section.0418]
+Licence = Versiune de evaluare
+Description = Un joc similar jocului Frozen Fruits.
+Size = 1,95 Mo
+
 [Section.041f]
 Name = Bound Around (Göstermelik)
 Licence = Paylaşımlı
diff --git a/base/applications/rapps/rapps/christmasbound.txt b/base/applications/rapps/rapps/christmasbound.txt
index ffb8384ff44..575c2babe61 100644
--- a/base/applications/rapps/rapps/christmasbound.txt
+++ b/base/applications/rapps/rapps/christmasbound.txt
@@ -18,6 +18,11 @@ Description = Ein Spiel, ähnlich zu Frozen Fruits.
 [Section.0410]
 Description = Un gioco simile a Frozen Fuits.
 
+[Section.0418]
+Licence = Gratuită
+Description = Un joc similar jocului Frozen Fruits.
+Size = 892 ko
+
 [Section.041f]
 Licence = Ücretsiz
 Description = Frozen Fruits benzeri bir oyun.
diff --git a/base/applications/rapps/rapps/cnt.txt b/base/applications/rapps/rapps/cnt.txt
index ac5a3753d52..41eb34e4737 100644
--- a/base/applications/rapps/rapps/cnt.txt
+++ b/base/applications/rapps/rapps/cnt.txt
@@ -8,7 +8,7 @@ Licence = Freeware
 Description = Freeware virtual keyboard application.
 Size = 1.3 MB
 Category = 12
-URLSite = http://http://cnt.lakefolks.com
+URLSite = http://cnt.lakefolks.com
 URLDownload = http://svn.reactos.org/packages/CNTzip.exe
 CDPath = none
 
diff --git a/base/applications/rapps/rapps/codeblocks.txt b/base/applications/rapps/rapps/codeblocks.txt
index 25ce4191c34..653dd3bceb9 100644
--- a/base/applications/rapps/rapps/codeblocks.txt
+++ b/base/applications/rapps/rapps/codeblocks.txt
@@ -18,6 +18,11 @@ Description = Eine quelloffene, plattformübergreifende, mächtige IDE. Diese en
 [Section.0410]
 Description = Un IDE potente, open source, multipiattaforma. Non contiene un compilatore.
 
+[Section.0418]
+Name = Code::Blocks (fără compilator)
+Description = Un IDE (mediu de dezvoltare integrat) puternic, multi-platformă, cu sursă deschisă. Nu conține nici un compilator.
+Size = 29,2 Mo
+
 [Section.041f]
 Name = Code::Blocks (Derleyicisiz)
 Licence = GPL 3. sürüm
diff --git a/base/applications/rapps/rapps/codeblocks_gcc.txt b/base/applications/rapps/rapps/codeblocks_gcc.txt
index de4d727bda7..63e8b56b21e 100644
--- a/base/applications/rapps/rapps/codeblocks_gcc.txt
+++ b/base/applications/rapps/rapps/codeblocks_gcc.txt
@@ -18,6 +18,11 @@ Description = Eine quelloffene, plattformübergreifende, mächtige IDE. Diese en
 [Section.0410]
 Description = Un IDE potente, open source, multipiattaforma. Contiene il compilatore TDM-GCC (versione 4.7.1, 32 bit).
 
+[Section.0418]
+Name = Code::Blocks TDM-GCC (versiunea 4.7.1 pe 32 biți)
+Description = Un IDE (mediu de dezvoltare integrat) puternic, multi-platformă, cu sursă deschisă. Conține compilatorul TDM-GCC (versiunea 4.7.1 pe 32 biți).
+Size = 97,8 Mo
+
 [Section.041f]
 Name = Code::Blocks TDM-GCC (sürüm 4.7.1, 32 bitlik)
 Licence = GPL 3. sürüm
diff --git a/base/applications/rapps/rapps/codeblocks_gcc_2.txt b/base/applications/rapps/rapps/codeblocks_gcc_2.txt
index 8b287d335ca..e7bf474582f 100644
--- a/base/applications/rapps/rapps/codeblocks_gcc_2.txt
+++ b/base/applications/rapps/rapps/codeblocks_gcc_2.txt
@@ -18,6 +18,11 @@ Description = Eine quelloffene, plattformübergreifende, mächtige IDE. Diese en
 [Section.0410]
 Description = Un IDE potente, open source, multipiattaforma. Contiene il compilatore TDM-GCC (versione 4.8.1, 32 bit).
 
+[Section.0418]
+Name = Code::Blocks TDM-GCC (versiunea 4.8.1 pe 32 biți)
+Description = Un IDE (mediu de dezvoltare integrat) puternic, multi-platformă, cu sursă deschisă. Conține compilatorul TDM-GCC (versiunea 4.8.1 pe 32 biți).
+Size = 100 Mo
+
 [Section.041f]
 Name = Code::Blocks TDM-GCC (sürüm 4.8.1, 32 bitlik)
 Licence = GPL 3. sürüm
diff --git a/base/applications/rapps/rapps/devcpp_mingw32.txt b/base/applications/rapps/rapps/devcpp_mingw32.txt
index 55463540924..3042fe5ece1 100644
--- a/base/applications/rapps/rapps/devcpp_mingw32.txt
+++ b/base/applications/rapps/rapps/devcpp_mingw32.txt
@@ -1,15 +1,15 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Orwell Dev-C++ MinGW32
-Version = 5.6.3
+Version = 5.7.0
 Licence = GPLv2
 Description = A maintained version of Dev-C++. It contains MinGW32 compiler.
 Size = 60.2 MB
 Category = 7
 URLSite = http://orwelldevcpp.blogspot.com/
-URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-Cpp%205.6.3%20MinGW%204.8.1%20Setup.exe
+URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-Cpp%205.7.0%20MinGW%204.8.1%20Setup.exe
 CDPath = none
 
 [Section.0407]
@@ -18,6 +18,10 @@ Description = Eine gepflegte Version von Dev-C++. Der MinGW32 Compiler liegt bei
 [Section.0410]
 Description = Una versione mantenuta di Dev-C++. Contiene il compilatore MinGW32.
 
+[Section.0418]
+Description = O versiune menținută a Dev-C++. Conține compilatorul MinGW32.
+Size = 60,2 Mo
+
 [Section.041f]
 Licence = GPL 2. sürüm
 Description = Dev-C++'nın sürdürülen bir sürümü. MinGW32 derleyicisi içerir.
diff --git a/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt b/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
index 1264f0aab44..96b026e3891 100644
--- a/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
+++ b/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
@@ -1,15 +1,15 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Orwell Dev-C++ TDM GCC x64
-Version = 5.6.3
+Version = 5.7.0
 Licence = GPLv2
 Description = A maintained version of Dev-C++. It contains 64 bit TDM-GCC compiler.
-Size = 44.8 MB
+Size = 44.7 MB
 Category = 7
 URLSite = http://orwelldevcpp.blogspot.com/
-URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-Cpp%205.6.3%20TDM-GCC%20x64%204.8.1%20Setup.exe
+URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-Cpp%205.7.0%20TDM-GCC%20x64%204.8.1%20Setup.exe
 CDPath = none
 
 [Section.0407]
@@ -18,7 +18,11 @@ Description = Eine gepflegte Version von Dev-C++. Der 64 bit TDM-GCC Compiler li
 [Section.0410]
 Description = Una versione sostenuta di Dev-C++. Contiene il compilatore a 64bit TDM-GCC.
 
+[Section.0418]
+Description = O versiune menținută a Dev-C++. Conține compilatorul TDM-GCC pe 64 biți.
+Size = 44,7 Mo
+
 [Section.041f]
 Licence = GPL 2. sürüm
 Description = Dev-C++'nın sürdürülen bir sürümü. 64 bitlik TDM-GCC derleyicisi içerir.
-Size = 44,8 MB
+Size = 44,7 MB
diff --git a/base/applications/rapps/rapps/doublecommander.txt b/base/applications/rapps/rapps/doublecommander.txt
index 2541aeef471..842c91e030d 100644
--- a/base/applications/rapps/rapps/doublecommander.txt
+++ b/base/applications/rapps/rapps/doublecommander.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
@@ -25,7 +25,7 @@ Description = Double Commander is een open-bron file-manager met twee panelen zi
 Description = Double Commander to menedżer plików, o otwartym źródle, z klasycznym układem dwóch paneli obok siebie. Do rozpakowania archiwum potrzebny jest 7-zip lub podobny program.
 
 [Section.0418]
-Description = Double Commander este un gestionar (open-source) de fișiere după modelul «două paneluri alăturate».  Este necesar 7-Zip sau un utilitar similar de dezarhivare pentru a-l putea extrage.
+Description = Double Commander este un gestionar (cu surse deschise) de fișiere după modelul «două paneluri alăturate».  Este necesar 7-Zip sau un utilitar similar de dezarhivare pentru a-l putea extrage.
 Size = 7,6 Mo
 
 [Section.0419]
diff --git a/base/applications/rapps/rapps/dplus.txt b/base/applications/rapps/rapps/dplus.txt
index ce6f72e46fb..567e824c3be 100644
--- a/base/applications/rapps/rapps/dplus.txt
+++ b/base/applications/rapps/rapps/dplus.txt
@@ -16,6 +16,10 @@ CDPath = none
 License = GPL versione 3
 Description = DPlus è un web browser grafico con un accenno alla sicurezza, le prestazioni e portabilità. è basata su Dillo ed è diviso dal progetto Dillo-Win32.
 
+[Section.0418]
+Description = DPlus este un navigator web cu accent pe securitate, performanță și portabilitate. Este bazat pe Dillo și este preluat din proiectul Dillo-Win32.
+Size = 1,36 Mo
+
 [Section.041f]
 Name = D+ Tarayıcı
 Licence = GPL 3. sürüm
diff --git a/base/applications/rapps/rapps/fap.txt b/base/applications/rapps/rapps/fap.txt
index 4307548e526..c955ca3536a 100644
--- a/base/applications/rapps/rapps/fap.txt
+++ b/base/applications/rapps/rapps/fap.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
diff --git a/base/applications/rapps/rapps/fira.txt b/base/applications/rapps/rapps/fira.txt
index 4dde9d6beb2..e3b26688642 100644
--- a/base/applications/rapps/rapps/fira.txt
+++ b/base/applications/rapps/rapps/fira.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Polish translation by wojo664
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
@@ -15,7 +15,7 @@ CDPath = none
 
 [Section.0407]
 Licence = Unbekannt
-Description = Mozilla Fira Font Pack, Beinhaltet Mono und Sans Schriften. Bitte in den "ReactOS" Ordner entpacken. (FIXME)
+Description = Mozilla Fira Font Pack, Beinhaltet Mono und Sans Schriften. Bitte in den "ReactOS" Ordner entpacken.
 
 [Section.0410]
 Licence = Sconosciuta
@@ -23,11 +23,11 @@ Description = Fira Font Pack di Mozilla, Include i font Mono e Sans. Estrare nel
 
 [Section.0415]
 Licence = Nieznana
-Description = Pakiet czcionek Mozilla Fira Font, zawiera czcionki Mono i Sans. Wypakuj do folderu "ReactOS". (FIXME)
+Description = Pakiet czcionek Mozilla Fira Font, zawiera czcionki Mono i Sans. Wypakuj do folderu "ReactOS".
 
 [Section.0418]
 Licence = Nespecificată
-Description = Pachetul Mozilla Fira Font, include fonturile Mono și Sans. Dezarhivați în dosarul „ReactOS”. (FIXME)
+Description = Pachetul Mozilla Fira Font, include fonturile Mono și Sans. Dezarhivați în dosarul ReactOS.
 Size = 1,1 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/firefox.txt b/base/applications/rapps/rapps/firefox.txt
index 425b7a5d192..ee31b35dc51 100644
--- a/base/applications/rapps/rapps/firefox.txt
+++ b/base/applications/rapps/rapps/firefox.txt
@@ -1,84 +1,96 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
-Name = Mozilla Firefox 29
-Version = 29.0.1
+Name = Mozilla Firefox 31
+Version = 31.0
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Web Browsers out there.
-Size = 27.7 MB
+Size = 30.75 MB
 Category = 5
 URLSite = http://www.mozilla.org/en-US/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/en-US/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/en-US/Firefox%20Setup%2031.0.exe
 CDPath = none
 
+[Section.0405]
+Description = Nejpopulárnější a jeden z nejlepších svobodných webových prohlížečů.
+Size = 30.6 MB
+URLSite = http://www.mozilla.org/cs/
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/cs/Firefox%20Setup%2031.0.exe
+
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
-Size = 27.5 MB
+Size = 30.56 MB
 URLSite = http://www.mozilla.org/de/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/de/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/de/Firefox%20Setup%2031.0.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
-Size = 27.5 MB
+Size = 30.5 MB
 URLSite = http://www.mozilla.org/es-ES/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/es-ES/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/es-ES/Firefox%20Setup%2031.0.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
-Size = 27,8 Mo
+Size = 30,85 Mo
 URLSite = http://www.mozilla.org/fr/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/fr/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/fr/Firefox%20Setup%2031.0.exe
 
 [Section.0410]
 Description = Il più popolare e uno dei migliori web browser gratuiti.
-Size = 27.5 MB
+Size = 30.49 MB
 URLSite = http://www.mozilla.org/it/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/it/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/it/Firefox%20Setup%2031.0.exe
 
 [Section.0413]
 Description = De meest populaire en een van de beste gratis Web browsers.
-Size = 28.2 MB
+Size = 31.2 MB
 URLSite = http://www.mozilla.org/nl/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/nl/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nl/Firefox%20Setup%2031.0.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
-Size = 27.5 MB
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/nb-NO/Firefox%20Setup%2029.0.1.exe
+Size = 30.55 MB
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nb-NO/Firefox%20Setup%2031.0.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
-Size = 28.4 MB
+Size = 31.42 MB
 URLSite = http://www.mozilla.org/pl/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/pl/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/pl/Firefox%20Setup%2031.0.exe
 
 [Section.0418]
 Description = Cel mai popular și unul dintre cele mai bune navigatoare web gratuite existente.
-Size = 28,0 Mo
+Size = 31,0 Mo
 URLSite = http://www.mozilla.org/ro/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/ro/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/ro/Firefox%20Setup%2031.0.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных браузеров.
-Size = 27.9 MB
+Size = 30.94 MB
 URLSite = http://www.mozilla.org/ru/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/ru/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/ru/Firefox%20Setup%2031.0.exe
 
 [Section.041b] 
 Description = Najpopulárnejší a jeden z najlepších slobodný webových prehliadačov.
-Size = 28.2 MB
+Size = 31.23 MB
 URLSite = http://www.mozilla.org/sk/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/sk/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/sk/Firefox%20Setup%2031.0.exe
 
 [Section.041f]
 Description = Özgür Umûmî Ağ tarayıcıları arasında en tutulanı ve en iyilerinden biri.
-Size = 27,5 MB
+Size = 30,58 MB
 URLSite = http://www.mozilla.org/tr/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/tr/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/tr/Firefox%20Setup%2031.0.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих безплатних веб-браузерів.
-Size = 27.9 MB
+Size = 30.97 MB
 URLSite = http://www.mozilla.org/uk/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/uk/Firefox%20Setup%2029.0.1.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/uk/Firefox%20Setup%2031.0.exe
+
+[Section.0813]
+Description = De meest populaire en een van de beste gratis Web browsers.
+Size = 31.2 MB
+URLSite = http://www.mozilla.org/nl/
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nl/Firefox%20Setup%2031.0.exe
diff --git a/base/applications/rapps/rapps/firefox36.txt b/base/applications/rapps/rapps/firefox36.txt
index 0d8ad6bf44f..4dc264b1f8c 100644
--- a/base/applications/rapps/rapps/firefox36.txt
+++ b/base/applications/rapps/rapps/firefox36.txt
@@ -12,6 +12,12 @@ URLSite = http://www.mozilla.org/en-US/
 URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/en-US/Firefox%20Setup%203.6.28.exe
 CDPath = none
 
+[Section.0405]
+Description = Nejpopulárnější a jeden z nejlepších svobodných webových prohlížečů.
+Size = 8.06 MB
+URLSite = http://www.mozilla.org/cs/
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/cs/Firefox%20Setup%203.6.28.exe
+
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 8.22 MB
diff --git a/base/applications/rapps/rapps/freebasic.txt b/base/applications/rapps/rapps/freebasic.txt
index d9519fdd7f2..b0f2d474ab9 100644
--- a/base/applications/rapps/rapps/freebasic.txt
+++ b/base/applications/rapps/rapps/freebasic.txt
@@ -29,7 +29,7 @@ Description = Compilatore BASIC open source. La sintassi del BASIC è compatibil
 Description = Otwarty kompilator BASIC, ze składnią kompatybilną z QBASIC.
 
 [Section.0418]
-Description = Compilator (open-source) BASIC. Sintaxa BASIC este compatibilă cu QBASIC.
+Description = Compilator (cu surse deschise) BASIC. Sintaxa BASIC este compatibilă cu QBASIC.
 Size = 7,4 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/ghostscript.txt b/base/applications/rapps/rapps/ghostscript.txt
new file mode 100644
index 00000000000..2592d420443
--- /dev/null
+++ b/base/applications/rapps/rapps/ghostscript.txt
@@ -0,0 +1,17 @@
+[Section]
+Name = Ghostscript
+Version = 9.14
+Licence = AGPL
+Description = An open interpreter for the PostScript language and for PDF.
+Size = 12.44 MB
+Category = 6
+URLSite =  http://www.ghostscript.com/
+URLDownload = http://downloads.ghostscript.com/public/gs914w32.exe
+CDPath = none
+
+[Section.0407]
+Description = Ein offener Interpreter für die PostScript Sprache und PDF.
+
+[Section.0418]
+Description = Un interpretor pentru limbajul PostScript și pentru PDF.
+Size = 12,44 Mo
diff --git a/base/applications/rapps/rapps/ghostview.txt b/base/applications/rapps/rapps/ghostview.txt
new file mode 100644
index 00000000000..11a88172ffe
--- /dev/null
+++ b/base/applications/rapps/rapps/ghostview.txt
@@ -0,0 +1,18 @@
+[Section]
+Name = GSview
+Version = 5.0
+Licence = Aladdin Free Public Licence
+Description = A graphical interface for Ghostscript.
+Size = 1.94 MB
+Category = 6
+URLSite = http://pages.cs.wisc.edu/~ghost/gsview/
+URLDownload = http://pages.cs.wisc.edu/~ghost/gsview/download/gsv50w32.exe
+CDPath = none
+
+[Section.0407]
+Description = Ein grafisches Interface für Ghostscript.
+
+[Section.0418]
+Licence = Licență publică gratuită „Aladdin”
+Description = O interfață grafică pentru GhostScript.
+Size = 1,94 Mo
diff --git a/base/applications/rapps/rapps/irfanview.txt b/base/applications/rapps/rapps/irfanview.txt
index 6737655192c..438352d240a 100644
--- a/base/applications/rapps/rapps/irfanview.txt
+++ b/base/applications/rapps/rapps/irfanview.txt
@@ -3,13 +3,13 @@
 
 [Section]
 Name = IrfanView
-Version = 4.37
+Version = 4.38
 Licence = Freeware (for personal use)
 Description = Viewer for all kinds of graphics/audio files/video files.
-Size = 1.8 MB
+Size = 1.81 MB
 Category = 3
 URLSite = http://www.irfanview.com/
-URLDownload = http://ring.maffin.ad.jp/archives/pc/forest/i/irfanview/10829/iview437_setup.exe
+URLDownload = http://www.irfanview.info/files/iview438_setup.exe
 CDPath = none
 
 [Section.0407]
@@ -23,7 +23,7 @@ Description = Visor para toda clase de archivos de imagen,audio y video.
 [Section.040c]
 Licence = Gratuit (pour un usage personnel)
 Description = Visionneur pour tous les types de fichiers graphiques/audio/vidéo.
-Size = 1,8 Mo
+Size = 1,81 Mo
 
 [Section.0410]
 Licence = Gratuita (per uso personale)
@@ -40,12 +40,12 @@ Description = Przeglądarka dla bardzo wielu typów obrazów, plików audio oraz
 [Section.0418]
 Licence = Gratuită (pentru uz personal)
 Description = Lector pentru multiple formaturi de fișiere grafice/audio/video.
-Size = 1,8 Mo
+Size = 1,81 Mo
 
 [Section.041f]
 Licence = Şahsî kullanım için ücretsiz.
 Description = Çizgelerin, ses kütüklerinin, vidyo kütüklerinin tüm türleri için görüntüleyici.
-Size = 1,8 MB
+Size = 1,81 MB
 
 [Section.0422]
 Licence = Freeware (для домашнього використання)
diff --git a/base/applications/rapps/rapps/irfanviewplugins.txt b/base/applications/rapps/rapps/irfanviewplugins.txt
index 4fbd6e85630..8956a2eb8a9 100644
--- a/base/applications/rapps/rapps/irfanviewplugins.txt
+++ b/base/applications/rapps/rapps/irfanviewplugins.txt
@@ -3,13 +3,13 @@
 
 [Section]
 Name = IrfanView Plugins
-Version = 4.37
+Version = 4.38
 Licence = Freeware (for personal use)
 Description = Additional Plugins for supporting more file types.
-Size = 10.2 MB
+Size = 10.24 MB
 Category = 3
 URLSite = http://www.irfanview.com/
-URLDownload = http://ring.maffin.ad.jp/archives/pc/forest/i/irfanview/10830/irfanview_plugins_437_setup.exe
+URLDownload = http://www.irfanview.info/files/irfanview_plugins_438_setup.exe
 CDPath = none
 
 [Section.0407]
@@ -23,7 +23,7 @@ Description = Complementos adicionales para soportar más formatos.
 [Section.040c]
 Licence = Gratuit (pour un usage personnel)
 Description = Modules additionnels pour supporter plus de types de fichiers.
-Size = 10,2 Mo
+Size = 10,24 Mo
 
 [Section.0410]
 Licence = Gratuita (per uso personale)
@@ -40,13 +40,13 @@ Description = Wtyczki otwierające dodatkowe typy plików w Irfanview.
 [Section.0418]
 Licence = Gratuită (pentru uz personal)
 Description = Extensii adiționale pentru a spori numărul de formate de fișiere recunoscute.
-Size = 10,2 Mo
+Size = 10,24 Mo
 
 [Section.041f]
 Name = IrfanView Eklentileri
 Licence = Şahsî kullanım için ücretsiz.
 Description = Daha çok kütük türü desteklemek için eklentiler.
-Size = 10,2 MB
+Size = 10,24 MB
 
 [Section.0422]
 Licence = Freeware (для домашнього використання)
diff --git a/base/applications/rapps/rapps/lazaruside.txt b/base/applications/rapps/rapps/lazaruside.txt
index 53381f3cc44..0ac6b58d0e7 100644
--- a/base/applications/rapps/rapps/lazaruside.txt
+++ b/base/applications/rapps/rapps/lazaruside.txt
@@ -1,16 +1,16 @@
-; UTF-8
+; UTF-8
 ; Polish translation by wojo664
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Lazarus
-Version = 1.2.2
+Version = 1.2.4
 Licence = modified LGPL, GPL
 Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable.
 Size = 114 MB
 Category = 7
 URLSite = http://www.lazarus.freepascal.org/
-URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bits/Lazarus%201.2.2/lazarus-1.2.2-fpc-2.6.4-win32.exe
+URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bits/Lazarus%201.2.4/lazarus-1.2.4-fpc-2.6.4-win32.exe
 CDPath = none
 
 [Section.0407]
diff --git a/base/applications/rapps/rapps/libreoffice.txt b/base/applications/rapps/rapps/libreoffice.txt
index 4ca07becdda..be2d68556c9 100644
--- a/base/applications/rapps/rapps/libreoffice.txt
+++ b/base/applications/rapps/rapps/libreoffice.txt
@@ -1,46 +1,46 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = LibreOffice
-Version = 4.2.4
+Version = 4.2.5
 Licence = LGPL
 Description = A powerful and open source office suite. It has been forked from OpenOffice.
-Size = 209.3 MB
+Size = 209.36 MB
 Category = 6
 URLSite = http://www.documentfoundation.org/
-URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.4/win/x86/LibreOffice_4.2.4_Win_x86.msi
+URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.5/win/x86/LibreOffice_4.2.5_Win_x86.msi
 CDPath = none
 
 [Section.0407]
-Description = Vorher bekannt als OpenOffice. Open Source Office Suite. (FIXME)
+Description = Vorher bekannt als OpenOffice. Open Source Office Suite.
 
 [Section.040a]
-Description = La suite de ofimática de código abierto. (FIXME)
+Description = La suite de ofimática de código abierto.
 
 [Section.040c]
-Description = Précédemment appelé OpenOffice. Suite bureautique open source. (FIXME)
-Size = 209,3 Mo
+Description = Précédemment appelé OpenOffice. Suite bureautique open source.
+Size = 209,36 Mo
 
 [Section.0410]
-Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. (FIXME)
+Description = Precedentemente chiamato OpenOffice. Open Source Office Suite.
 
 [Section.0413]
-Description = Voorheen OpenOffice. Open-bron Office pakket. (FIXME)
+Description = Voorheen OpenOffice. Open-bron Office pakket.
 
 [Section.0415]
-Description = Otwarty pakiet biurowy. (FIXME)
+Description = Otwarty pakiet biurowy.
 
 [Section.0418]
-Description = Fostul OpenOffice. Suita de aplicații de birotică open-source. (FIXME)
-Size = 209,3 Mo
+Description = O suită office completă, cu surse deschise. Reprezintă o bifurcare a dezvoltării OpenOffice.
+Size = 209,36 Mo
 
 [Section.041f]
 Description = Güçlü ve açık kaynak bir büro takımı. OpenOffice'ten çatallanılmıştır.
-Size = 209,3 MB
+Size = 209,36 MB
 
 [Section.0422]
-Description = Відкритий офісний пакет. (FIXME)
+Description = Відкритий офісний пакет.
 
 [Section.0813]
-Description = Voorheen OpenOffice. Open-bron Office pakket. (FIXME)
+Description = Voorheen OpenOffice. Open-bron Office pakket.
diff --git a/base/applications/rapps/rapps/mcwin32.txt b/base/applications/rapps/rapps/mcwin32.txt
index da08dec77c6..a364e6f8c10 100644
--- a/base/applications/rapps/rapps/mcwin32.txt
+++ b/base/applications/rapps/rapps/mcwin32.txt
@@ -23,6 +23,12 @@ Name = Midnight Commander dla Windows
 Licence = GPL wersja 3
 Description = 32-bitowy port GNU Midnight Commander dla Windows.
 
+[Section.0418]
+Name = Midnight Commander pentru Windows
+Version = Versiunea 183 (4.8.11)
+Description = GNU Midnight Commander pentru Windows pe 32-biți.
+Size = 2,35 Mo
+
 [Section.041f]
 Name = Midnight Commander (Windows için)
 Version = Yapı 183 (4.8.11)
diff --git a/base/applications/rapps/rapps/miktex.txt b/base/applications/rapps/rapps/miktex.txt
new file mode 100644
index 00000000000..e074b1eb440
--- /dev/null
+++ b/base/applications/rapps/rapps/miktex.txt
@@ -0,0 +1,18 @@
+[Section]
+Name = MikTEX 2.9
+Version = 2.9.5105
+Licence = Freeware
+Description = MiKTeX is an up-to-date implementation of TeX/LaTeX and related programs for Windows.
+Size = 163.18 MB
+Category = 6
+URLSite = http://www.miktex.org/
+URLDownload = http://mirrors.ctan.org/systems/win32/miktex/setup/basic-miktex-2.9.5105.exe
+CDPath = none
+
+[Section.0407]
+Description = MiKTeX ist eine aktuelle Implementierung von TeX/LaTeX und zugehöriger Programme für Windows.
+
+[Section.0418]
+Licence = Gratuită
+Description = MikTEX este o implementare actualizată de TeX/LaTeX și aprogramelor aferente.
+Size = 163,18 Mo
diff --git a/base/applications/rapps/rapps/mirandaim.txt b/base/applications/rapps/rapps/mirandaim.txt
index afe7ebbcb97..64974cd2728 100644
--- a/base/applications/rapps/rapps/mirandaim.txt
+++ b/base/applications/rapps/rapps/mirandaim.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
@@ -32,7 +32,7 @@ Description = Open-bron multi-protocol instant message toepassing - werkt mogeli
 Description = Otwarty komunikator internetowy, obsługujący wiele różnych protokołów (m.in. GG, Tlen, Jabber, ICQ, IRC) - może nie działać prawidłowo.
 
 [Section.0418]
-Description = Aplicație de mesagerie instant multiprotocol (open-source) - posibil cu limitări în funcționalitate.
+Description = Aplicație de mesagerie instant multiprotocol (cu surse deschise) - posibil cu limitări în funcționalitate.
 Size = 3,8 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/mirc.txt b/base/applications/rapps/rapps/mirc.txt
index b8bde6c9037..c66a9f604b3 100644
--- a/base/applications/rapps/rapps/mirc.txt
+++ b/base/applications/rapps/rapps/mirc.txt
@@ -3,13 +3,13 @@
 
 [Section]
 Name = mIRC 7
-Version = 7.32
+Version = 7.34
 Licence = Shareware
 Description = The most popular client for the Internet Relay Chat (IRC).
-Size = 1.85 MB
+Size = 1.89 MB
 Category = 5
 URLSite = http://www.mirc.com/
-URLDownload = http://download.mirc.com/8/mirc732.exe
+URLDownload = http://download.mirc.com/9/mirc734.exe
 CDPath = none
 
 [Section.0407]
@@ -20,7 +20,7 @@ Description = El más popular cliente para Internet Relay Chat (IRC).
 
 [Section.040c]
 Description = Le client le plus populaire pour l'Internet Relay Chat (IRC).
-Size = 1,85 Mo
+Size = 1,89 Mo
 
 [Section.0410]
 Description = Il famoso client per Internet Relay Chat (IRC).
@@ -34,12 +34,12 @@ Description = Najpopularniejszy klient IRC (Internet Relay Chat).
 [Section.0418]
 Licence = Versiune de evaluare
 Description = Cel mai popular client de IRC (Internet Relay Chat).
-Size = 1,85 Mo
+Size = 1,89 Mo
 
 [Section.041f]
 Licence = Paylaşımlı
 Description = Umûmî Ağ Eş Zamanlı Söyleşi (IRC) için en çok tutulan istemci.
-Size = 1,85 MB
+Size = 1,89 MB
 
 [Section.0422]
 Description = Найпопулярніший клієнт IRC (Internet Relay Chat).
diff --git a/base/applications/rapps/rapps/mono2.txt b/base/applications/rapps/rapps/mono2.txt
index 7f97d095cc1..e691987514a 100644
--- a/base/applications/rapps/rapps/mono2.txt
+++ b/base/applications/rapps/rapps/mono2.txt
@@ -8,7 +8,7 @@ Licence = Unknown
 Description = Open-source .NET Framework.
 Size = 91.93 MB
 Category = 14
-URLSite = http://www.mono-project.com/Main_Page
+URLSite = http://www.mono-project.com/
 URLDownload = http://download.mono-project.com/archive/2.11.4/windows-installer/mono-2.11.4-gtksharp-2.12.11-win32-0.exe
 CDPath = none
 
@@ -30,7 +30,7 @@ Description = Pakiet Mono .NET Framework dla Programistów.
 
 [Section.0418]
 Licence = Nespecificată
-Description = Platformă .NET (open-source).
+Description = Platformă .NET (cu surse deschise).
 Size = 91,93 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/mpc.txt b/base/applications/rapps/rapps/mpc.txt
index d02be1dc9e4..c383b171e7e 100644
--- a/base/applications/rapps/rapps/mpc.txt
+++ b/base/applications/rapps/rapps/mpc.txt
@@ -1,15 +1,15 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Media Player Classic Home Cinema
-Version = 1.7.5
+Version = 1.7.6
 Licence = GPL
 Description = A media player.
-Size = 10.1 MB
+Size = 10.3 MB
 Category = 2
 URLSite = http://mpc-hc.org/
-URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.5_x86/MPC-HC.1.7.5.x86.exe
+URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32/MPC-HC_v1.7.6_x86/MPC-HC.1.7.6.x86.exe
 CDPath = none
 
 [Section.0407]
@@ -20,7 +20,7 @@ Description = Reproductor multimedia.
 
 [Section.040c]
 Description = Un lecteur media.
-Size = 10,1 Mo
+Size = 10,3 Mo
 
 [Section.0410]
 Description = Lettore multimediale.
@@ -33,7 +33,7 @@ Description = Odtwarzacz multimediów.
 
 [Section.0418]
 Description = Lector multimedia.
-Size = 10,1 Mo
+Size = 10,3 Mo
 
 [Section.0419]
 Description = Мультимедийный проигрыватель.
@@ -43,7 +43,7 @@ Description = Multimediálny prehrávač.
 
 [Section.041f]
 Description = Bir ortam oynatıcısı.
-Size = 10,1 MB
+Size = 10,3 MB
 
 [Section.0422]
 Description = Мультимедійний програвач.
diff --git a/base/applications/rapps/rapps/net11.txt b/base/applications/rapps/rapps/net11.txt
index bafa8ae5ee4..6a2cf8f1af1 100644
--- a/base/applications/rapps/rapps/net11.txt
+++ b/base/applications/rapps/rapps/net11.txt
@@ -44,7 +44,7 @@ URLDownload = http://download.microsoft.com/download/c/9/f/c9f672f3-c14b-4cff-96
 
 [Section.0418]
 Licence = Nespecificată
-Description = Platforma Microsoft .NET versiunea 1.1 - Pachet redistributabl.
+Description = Platforma Microsoft .NET versiunea 1.1 - Pachet redistributabil.
 Size = 23,14 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/net20sp2.txt b/base/applications/rapps/rapps/net20sp2.txt
index ede7fa23f0c..f11e5a45963 100644
--- a/base/applications/rapps/rapps/net20sp2.txt
+++ b/base/applications/rapps/rapps/net20sp2.txt
@@ -8,30 +8,31 @@ Licence = Unknown
 Description = Microsoft .NET Framework Version 2.0 Service Pack 2.
 Size = 23.84 MB
 Category = 14
-URLSite = http://www.microsoft.com/en-us/download/details.aspx?id=1639
+URLSite = http://www.microsoft.com/en-US/download/details.aspx?id=1639
 URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe
 CDPath = none
 
 [Section.0407]
 Description = Microsoft .NET Framework Version 2.0 Service Pack 2.
 URLSite = http://www.microsoft.com/de-DE/download/details.aspx?id=1639
-URLDownload = http://www.microsoft.com/de-de/download/confirmation.aspx?id=1639&6B49FDFB-8E5B-4B07-BC31-15695C5A2143=1
 
 [Section.040a]
 Description = Microsoft .NET Framework versión 2.0 Service Pack 2.
 URLSite = http://www.microsoft.com/es-ES/download/details.aspx?id=1639
-URLDownload = http://www.microsoft.com/es-es/download/confirmation.aspx?id=1639&6B49FDFB-8E5B-4B07-BC31-15695C5A2143=1
 
 [Section.040c]
 Description = Microsoft .NET Framework version 2.0 Service Pack 2.
 Size = 23,84 Mo
 URLSite = http://www.microsoft.com/fr-FR/download/details.aspx?id=1639
-URLDownload = http://www.microsoft.com/fr-fr/download/confirmation.aspx?id=1639&6B49FDFB-8E5B-4B07-BC31-15695C5A2143=1
+
+[Section.0410]
+Description = Microsoft .NET Framework Version 2.0 - Redistributable Package.
+Size = 23.8 MB
+URLSite = http://www.microsoft.com/it-IT/download/details.aspx?id=1639
 
 [Section.0415]
 Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2.
 URLSite = http://www.microsoft.com/pl-PL/download/details.aspx?id=1639
-URLDownload = http://www.microsoft.com/pl-pl/download/confirmation.aspx?id=1639&6B49FDFB-8E5B-4B07-BC31-15695C5A2143=1
 
 [Section.0418]
 Licence = Nespecificată
@@ -44,4 +45,3 @@ Licence = Bilinmiyor
 Description = Microsoft .NET Çatısı Sürüm 2.0 - Hizmet Paketi 2
 Size = 23,84 MB
 URLSite = http://www.microsoft.com/tr-TR/download/details.aspx?id=1639
-URLDownload = http://www.microsoft.com/tr-tr/download/confirmation.aspx?id=1639&6B49FDFB-8E5B-4B07-BC31-15695C5A2143=1
diff --git a/base/applications/rapps/rapps/nirlauncher.txt b/base/applications/rapps/rapps/nirlauncher.txt
new file mode 100644
index 00000000000..f144d19cc2d
--- /dev/null
+++ b/base/applications/rapps/rapps/nirlauncher.txt
@@ -0,0 +1,13 @@
+[Section]
+Name = NirLauncher
+Version = 1.18.69
+Licence = Freeware
+Description = A package of more than 180 utilities for Windows.
+Size = 19.8 MB
+Category = 12
+URLSite = http://launcher.nirsoft.net/
+URLDownload = http://download.nirsoft.net/nirsoft_package_1.18.69.zip
+CDPath = none
+
+[Section.0407]
+Description = Ein Paket von mehr als 180 Utilities für Windows.
diff --git a/base/applications/rapps/rapps/npp.txt b/base/applications/rapps/rapps/npp.txt
index 1789aee6f58..645f55bcf79 100644
--- a/base/applications/rapps/rapps/npp.txt
+++ b/base/applications/rapps/rapps/npp.txt
@@ -1,15 +1,15 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Notepad++
-Version = 6.6.3
+Version = 6.6.8
 Licence = GPL
 Description = A text editor.
-Size = 7.3 MB
+Size = 7.55 MB
 Category = 6
 URLSite = http://notepad-plus-plus.org/
-URLDownload = http://download.tuxfamily.org/notepadplus/6.6.3/npp.6.6.3.Installer.exe
+URLDownload = http://download.tuxfamily.org/notepadplus/6.6.8/npp.6.6.8.Installer.exe
 CDPath = none
 
 [Section.0407]
@@ -20,7 +20,7 @@ Description = Un editor de text.
 
 [Section.040c]
 Description = Un éditeur de texte.
-Size = 7,3 Mo
+Size = 7,55 Mo
 URLSite = http://notepad-plus-plus.org/fr/
 
 [Section.0410]
@@ -34,7 +34,7 @@ Description = Edytor tekstu.
 
 [Section.0418]
 Description = Un editor de text.
-Size = 7,3 Mo
+Size = 7,55 Mo
 
 [Section.0419]
 Description = Текстовый редактор.
@@ -44,7 +44,7 @@ Description = Textový editor.
 
 [Section.041f]
 Description = Bir metin düzenleyicisi.
-Size = 7,3 MB
+Size = 7,55 MB
 
 [Section.0422]
 Description = Текстовый редактор.
diff --git a/base/applications/rapps/rapps/offbyone.txt b/base/applications/rapps/rapps/offbyone.txt
index 5899978b181..5154ff79884 100644
--- a/base/applications/rapps/rapps/offbyone.txt
+++ b/base/applications/rapps/rapps/offbyone.txt
@@ -8,7 +8,7 @@ Licence = Freeware
 Description = The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.
 Size = 1010.89 kB
 Category = 5
-URLSite = http://offbyone.com/offbyone/
+URLSite = http://offbyone.com/
 URLDownload = http://offbyone.com/offbyone/images/OffByOneSetup.exe
 CDPath = none
 
diff --git a/base/applications/rapps/rapps/openoffice.txt b/base/applications/rapps/rapps/openoffice.txt
index b7f0daef081..8f253bcdd64 100644
--- a/base/applications/rapps/rapps/openoffice.txt
+++ b/base/applications/rapps/rapps/openoffice.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
@@ -13,7 +13,7 @@ URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0
 CDPath = none
 
 [Section.0407]
-Description = DIE Open Source Office Suite. (FIXME)
+Description = DIE Open Source Office Suite.
 Size = 154.88 MB
 URLSite = http://www.openoffice.org/de/
 URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries/de/Apache_OpenOffice_4.1.0_Win_x86_install_de.exe
@@ -37,7 +37,7 @@ URLSite = http://www.openoffice.org/it/
 URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries/it/Apache_OpenOffice_4.1.0_Win_x86_install_it.exe
 
 [Section.0413]
-Description = Open-bron Office Pakket. (FIXME)
+Description = Open-bron Office Pakket.
 Size = 132.11 MB
 URLSite = http://www.openoffice.org/nl/
 URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries/nl/Apache_OpenOffice_4.1.0_Win_x86_install_nl.exe
@@ -49,7 +49,7 @@ URLSite = http://www.openoffice.org/pl/
 URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries/pl/Apache_OpenOffice_4.1.0_Win_x86_install_pl.exe
 
 [Section.0418]
-Description = Suita de aplicații de birotică open-source.
+Description = Suita de aplicații de birotică cu surse deschise.
 Size = 136,79 Mo
 URLSite = http://www.openoffice.org/ro/
 
@@ -65,7 +65,7 @@ Size = 136.79 MB
 URLSite = http://www.openoffice.org/ua/
 
 [Section.0813]
-Description = Open-bron Office Pakket. (FIXME)
+Description = Open-bron Office Pakket.
 Size = 132.11 MB
 URLSite = http://www.openoffice.org/nl/
 URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries/nl/Apache_OpenOffice_4.1.0_Win_x86_install_nl.exe
diff --git a/base/applications/rapps/rapps/openoffice2.4.txt b/base/applications/rapps/rapps/openoffice2.4.txt
index 6f7fa511d38..6a05f637898 100644
--- a/base/applications/rapps/rapps/openoffice2.4.txt
+++ b/base/applications/rapps/rapps/openoffice2.4.txt
@@ -13,7 +13,7 @@ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/stab
 CDPath = none
 
 [Section.0407]
-Description = DIE Open Source Office Suite. (FIXME)
+Description = DIE Open Source Office Suite.
 Size = 114.25 MB
 URLSite = http://www.openoffice.org/de/
 URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2.4.3/OOo_2.4.3_Win32Intel_install_de.exe
@@ -39,7 +39,7 @@ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/loca
 
 [Section.0413]
 Version = 2.4.2
-Description = Open-bron Office Pakket. (FIXME)
+Description = Open-bron Office Pakket.
 Size = 113.8 MB
 URLSite = http://www.openoffice.org/nl/
 URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/2.4.2/OOo_2.4.2_Win32Intel_install_nl.exe
@@ -52,7 +52,7 @@ URLSite = http://www.openoffice.org/pl/
 URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe
 
 [Section.0418]
-Description = Suita de aplicații de birotică open-source.
+Description = Suita de aplicații de birotică cu surse deschise.
 Size = 113 Mo
 URLSite = http://www.openoffice.org/ro/
 
@@ -68,7 +68,7 @@ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/loca
 
 [Section.0813]
 Version = 2.4.2
-Description = Open-bron Office Pakket. (FIXME)
+Description = Open-bron Office Pakket.
 Size = 113.8 MB
 URLSite = http://www.openoffice.org/nl/
 URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/2.4.2/OOo_2.4.2_Win32Intel_install_nl.exe
diff --git a/base/applications/rapps/rapps/openttd.txt b/base/applications/rapps/rapps/openttd.txt
index a22ab3aa28e..d2ea313d237 100644
--- a/base/applications/rapps/rapps/openttd.txt
+++ b/base/applications/rapps/rapps/openttd.txt
@@ -3,13 +3,13 @@
 
 [Section]
 Name = OpenTTD
-Version = 1.4.0
+Version = 1.4.1
 Licence = GPL v2
 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.
 Size = 7.0 MB
 Category = 4
 URLSite = http://www.openttd.org/
-URLDownload = http://binaries.openttd.org/releases/1.4.0/openttd-1.4.0-windows-win32.exe
+URLDownload = http://binaries.openttd.org/releases/1.4.1/openttd-1.4.1-windows-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -32,7 +32,7 @@ Description = Open-bron kloon van de "Transport Tycoon Deluxe" spelletjesmotor.
 Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego działania potrzebna jest kopia gry Transport Tycoon.
 
 [Section.0418]
-Description = Clona (open-source a) motorului de joc "Transport Tycoon Deluxe". Este necesară o copie a jocului Transport Tycoon.
+Description = Clona (cu surse deschise a) motorului de joc "Transport Tycoon Deluxe". Este necesară o copie a jocului Transport Tycoon.
 Size = 7,0 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/opera.txt b/base/applications/rapps/rapps/opera.txt
index 38fcabbd6ab..f27bf72fa2e 100644
--- a/base/applications/rapps/rapps/opera.txt
+++ b/base/applications/rapps/rapps/opera.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
diff --git a/base/applications/rapps/rapps/opera9.txt b/base/applications/rapps/rapps/opera9.txt
index 52f11828c74..74e8511130f 100644
--- a/base/applications/rapps/rapps/opera9.txt
+++ b/base/applications/rapps/rapps/opera9.txt
@@ -12,6 +12,9 @@ URLSite = http://www.opera.com/
 URLDownload = http://arc.opera.com/pub/opera/win/964/int/Opera_964_int_Setup.exe
 CDPath = none
 
+[Section.0405]
+Description = Populární prohlížeč Opera s mnoha pokročilými vlastnostmi, včetně vestavené podpory pro e-mail a BitTorrent.
+
 [Section.0407]
 Description = Der populäre Opera Browser mit vielen fortschrittlichen Eigenschaften, enthält einen Mail und BitTorrent Client.
 
diff --git a/base/applications/rapps/rapps/peazip.txt b/base/applications/rapps/rapps/peazip.txt
index 5ab4aa06a87..f52aa0f50f6 100644
--- a/base/applications/rapps/rapps/peazip.txt
+++ b/base/applications/rapps/rapps/peazip.txt
@@ -1,15 +1,15 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = PeaZip
-Version = 5.3.1
+Version = 5.4.0
 Licence = LGPL v3, OpenCandy EULA
 Description = PeaZip is a free, cross-platform, open source file and archive manager. It supports over 150 archive formats.
 Size = 5.8 MB
 Category = 12
 URLSite = http://peazip.sourceforge.net/
-URLDownload = http://download.sourceforge.net/project/peazip/5.3.1/peazip-5.3.1.WINDOWS.exe
+URLDownload = http://download.sourceforge.net/project/peazip/5.4.0/peazip-5.4.0.WINDOWS.exe
 CDPath = none
 
 [Section.0407]
@@ -21,6 +21,10 @@ Description = PeaZip è un manager di file e archivi gratis, multipiattaforma e
 [Section.0415]
 PeaZip to darmowy, wieloplatformowy menedżer plików i archiwów, o otwartym źródle. Obsługuje ponad 150 formatów archiwów.
 
+[Section.0418]
+Description = PeaZip este un gestionar de fișiere și arhive gratuit, multi-platformă, cu sursă deschisă. Recunoaște peste 150 tipuri de arhive.
+Size = 5,8 Mo
+
 [Section.041f]
 Licence = LGPL 3. sürüm, OpenCandy EULA
 Description = PeaZip; ücretsiz, çapraz platform, açık kaynak kütük ve belgelik yöneticisidir. 150'den çok belgelikleme biçimini destekler.
diff --git a/base/applications/rapps/rapps/pptview.txt b/base/applications/rapps/rapps/pptview.txt
index ff2c7fd034b..378207f5719 100644
--- a/base/applications/rapps/rapps/pptview.txt
+++ b/base/applications/rapps/rapps/pptview.txt
@@ -43,7 +43,9 @@ Size = 60.43 MB
 URLDownload = http://download.microsoft.com/download/9/E/4/9E4A5F9A-210D-44B7-ADA2-F47CE00541ED/PowerPointViewer.exe
 
 [Section.0418]
+Name = Lector Microsoft Powerpoint
 Licence = Necunoscută
+Description = Lector Microsoft Powerpoint
 Size = 60,4 Mo
 URLDownload = http://download.microsoft.com/download/5/6/E/56E4DBA3-D725-43EA-B1E5-DC148022999C/PowerPointViewer.exe
 
diff --git a/base/applications/rapps/rapps/ptanks.txt b/base/applications/rapps/rapps/ptanks.txt
index 71839f61e10..271b6991836 100644
--- a/base/applications/rapps/rapps/ptanks.txt
+++ b/base/applications/rapps/rapps/ptanks.txt
@@ -29,5 +29,5 @@ Size = 2,86 Mo
 
 [Section.041f]
 Licence = Paylaşımlı
-Description = Şimdiye kadar oynayacağınız en hızlı topçuluk oyunu.
+Description = Şimdiye dek oynayacağınız en hızlı topçuluk oyunu.
 Size = 2,86 MB
diff --git a/base/applications/rapps/rapps/python.txt b/base/applications/rapps/rapps/python.txt
index c05adef8109..d60fd11133d 100644
--- a/base/applications/rapps/rapps/python.txt
+++ b/base/applications/rapps/rapps/python.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
diff --git a/base/applications/rapps/rapps/qmmp.txt b/base/applications/rapps/rapps/qmmp.txt
index ef7cb476bee..dcee228f144 100644
--- a/base/applications/rapps/rapps/qmmp.txt
+++ b/base/applications/rapps/rapps/qmmp.txt
@@ -1,16 +1,16 @@
-; UTF-8
+; UTF-8
 ; Polish translation by wojo664
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = Qmmp (Qt-based Multimedia Player)
-Version = 0.7.7
+Version = 0.8.0
 Licence = GPL
 Description = Qmmp is an audio-player, written with the help of the Qt library. The user interface is similar to WinAMP or XMMS. Alternative user interfaces also are available.
-Size = 10.5 MB
+Size = 12.49 MB
 Category = 1
 URLSite = http://qmmp.ylsoftware.com/index.php
-URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.7.7-win32.exe
+URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.8.0-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -23,8 +23,9 @@ Description = Qmmp è un lettore multimediale, scritto con l'aiuto della libreri
 Description = Gmmp to odtwarzacz audio, napisany z pomocą biblioteki Qt. Interfejs podobny jest do Winampa lub XMMS. Dostępnme są także dodatkowe skórki.
 
 [Section.0418]
+Name = Qmmp (Lector Multimedia bazat pe Qt)
 Description = Qmmp este un lector audio, ce utilizează biblioteca QT. Interfața de utilizare e asemănătoare cu cea din WinAMP sau XMMS. De asemenea sunt disponibile interfețe de utilizare alternative.
-Size = 10,5 Mo
+Size = 12,49 Mo
 
 [Section.0419]
 Description = Аудиоплеер Qmmp (Qt-based Multimedia Player).
@@ -32,4 +33,4 @@ Description = Аудиоплеер Qmmp (Qt-based Multimedia Player).
 [Section.041f]
 Name = Qmmp (Qt Tabanlı Çoklu Ortam Oynatıcısı)
 Description = Qmmp, Qt kitaplığının yardımıyla yazılmış bir ses oynatıcısıdır. Kullanıcı arayüzü WinAMP'a ve XMMS'ye benzer. Başka kullanıcı arayüzleri de vardır.
-Size = 10,5 MB
+Size = 12,49 MB
diff --git a/base/applications/rapps/rapps/rosbearm.txt b/base/applications/rapps/rapps/rosbearm.txt
index 8c46951979d..d6dc1acb59e 100644
--- a/base/applications/rapps/rapps/rosbearm.txt
+++ b/base/applications/rapps/rapps/rosbearm.txt
@@ -12,6 +12,9 @@ URLSite = http://reactos.org/wiki/Build_Environment/
 URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/arm/1.0/RosBE-ARM-1.0.exe
 CDPath = none
 
+[Section.0405]
+Description = Dovoluje zkompilovat zdrojový kód systému ReactOS ARM. Pro další detaily viz. ReactOS wiki.
+
 [Section.0407]
 Description = Erlaubt es Ihnen den ReactOS ARM Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nähere Anweisungen.
 
diff --git a/base/applications/rapps/rapps/sbforvmware.txt b/base/applications/rapps/rapps/sbforvmware.txt
index 97f9ea34666..91cff0030fa 100644
--- a/base/applications/rapps/rapps/sbforvmware.txt
+++ b/base/applications/rapps/rapps/sbforvmware.txt
@@ -14,49 +14,49 @@ CDPath = none
 [Section.0405]
 Name = Ovladač SoundBlaster pro VMWare
 Licence = Neznámá
-Description = Rozbalte do složky "ReactOS" a pak ReactOS dvakrát restartujte. (FIXME)
+Description = Rozbalte do složky "ReactOS" a pak ReactOS dvakrát restartujte.
 
 [Section.0407]
 Name = SoundBlaster Treiber für VMWare
 Licence = Unbekannt
-Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. (FIXME)
+Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten.
 
 [Section.040a]
 Name = Driver SoundBlaster para VMWare
 Licence = Desconocida
-Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. (FIXME)
+Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces.
 
 [Section.040c]
 Name = Pilote SoundBlaster pour VMWare
 Licence = Inconnue
-Description = Dézippez dans le répertoire "ReactOS" puis redémarrez deux fois. (FIXME)
+Description = Dézippez dans le répertoire "ReactOS" puis redémarrez deux fois.
 Size = 2,22 Mo
 
 [Section.0410]
 Name = Driver SoundBlaster per VMWare
 Licence = Sconosciuta
-Description = Estrarre nella cartella "ReactOS" e riavviare ReactOS due volte. (FIXME)
+Description = Estrarre nella cartella "ReactOS" e riavviare ReactOS due volte.
 
 [Section.0413]
 Name = SoundBlaster Driver voor VMWare
 Licence = Ongekend
-Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op. (FIXME)
+Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op.
 
 [Section.0415]
 Name = Sterownik SoundBlaster dla VMWare
 Licence = Nieznana
-Description = Rozpakuj zawartość w folderze "ReactOS" i dwukrotnie zrestartuj system. (FIXME)
+Description = Rozpakuj zawartość w folderze "ReactOS" i dwukrotnie zrestartuj system.
 
 [Section.0418]
 Name = Modul pilot SoundBlaster pentru VMWare
 Licence = Nespecificată
-Description = Dezarhivați în dosarul „ReactOS” apoi reporniți ReactOS de două ori. (FIXME)
+Description = Dezarhivați în dosarul ReactOS apoi reporniți ReactOS de două ori.
 Size = 2,22 Mo
 
 [Section.0419]
 Name = Драйвер SoundBlaster для VMWare
 Licence = Не указано
-Description = Pазархивируйте содержимое в папку "ReactOS", затем дважды перезагрузите систему. (FIXME)
+Description = Pазархивируйте содержимое в папку "ReactOS", затем дважды перезагрузите систему.
 
 [Section.041f]
 Name = VMWare için SoundBlaster Sürücüsü
@@ -67,9 +67,9 @@ Size = 2,22 MB
 [Section.0422]
 Name = Драйвер SoundBlaster для VMWare
 Licence = Невідома
-Description = Pозархівуйте вміст в теку "ReactOS" після чого двічі перезавантажте систему. (FIXME)
+Description = Pозархівуйте вміст в теку "ReactOS" після чого двічі перезавантажте систему.
 
 [Section.0813]
 Name = SoundBlaster Driver voor VMWare
 Licence = Ongekend
-Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op. (FIXME)
+Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op.
diff --git a/base/applications/rapps/rapps/scite.txt b/base/applications/rapps/rapps/scite.txt
index 09b89c5c45a..54a5e1db32f 100644
--- a/base/applications/rapps/rapps/scite.txt
+++ b/base/applications/rapps/rapps/scite.txt
@@ -1,15 +1,15 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
 Name = SciTE
-Version = 3.4.3
+Version = 3.4.4
 Licence = Freeware
 Description = SciTE is a SCIntilla based text editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.
-Size = 737 kB
+Size = 736 kB
 Category = 7
 URLSite = http://www.scintilla.org/
-URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.3/Sc343.exe
+URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.4/Sc344.exe
 CDPath = none
 
 [Section.0407]
@@ -20,7 +20,7 @@ Description = Editor de texto basado en SCIntilla. Originalmente creado para dem
 
 [Section.040c]
 Description = SciTE est un éditeur de texte basé sur SCIntilla. Originelement réalisé pour montrer Scintilla, il a évolué pour devenir un éditeur généralement utile avec des options pour compiler et lancer des programmes.
-Size = 737 ko
+Size = 736 ko
 
 [Section.0410]
 Description = SciTE è un editor di testo basato su scintilla. Originariamente costruito per dimostrare Scintilla, è cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi.
@@ -34,12 +34,12 @@ Description = SciTE to edytor tekstu bazowany na SCIntilla. Oryginalnie stworzon
 [Section.0418]
 Licence = Gratuită
 Description = SciTE este un editor de text bazat pe SCIntilla. Construit inițial pentru a demonstra Scintilla, a crescut ulterior într-un editor de uz general cu funcționalități de compilare și execuție a programelor.
-Size = 737 ko
+Size = 736 ko
 
 [Section.041f]
 Licence = Ücretsiz
-Description = SciTE, bir Scintilla tabanlı metin düzenleyicisidir. İlk başta Scintilla'yı göstermek için yapıldı, izlenceleri yapmak ve çalıştırmak yetenekleriyle bir umûmiyetle kullanışlı düzenleyici olmak için gelişti.
-Size = 737 KB
+Description = SciTE, bir Scintilla tabanlı metin düzenleyicisidir. İlk başta Scintilla'yı göstermek için yapıldı; izlenceleri yapmak ve çalıştırmak yetenekleriyle, umûmiyetle kullanışlı bir düzenleyici olmak için gelişti.
+Size = 736 KB
 
 [Section.0422]
 Description = Текстовий редактор на основі SCIntilla. Був зібраний як презентація Scintilla, але виріс до редактора загального користування з засобами збирання та запуску програм.
diff --git a/base/applications/rapps/rapps/scummvm.txt b/base/applications/rapps/rapps/scummvm.txt
index 5984063d547..b3c3c710d2f 100644
--- a/base/applications/rapps/rapps/scummvm.txt
+++ b/base/applications/rapps/rapps/scummvm.txt
@@ -3,44 +3,44 @@
 
 [Section]
 Name = ScummVM
-Version = 1.6.0
+Version = 1.7.0
 Licence = GPL
 Description = Software that reproduce the working of graphical engine for videogames (Sam and Max, Day of the Tentacle, etc.) on ReactOS.
-Size = 6.28 MB
+Size = 6.9 MB
 Category = 4
 URLSite = http://scummvm.org/
-URLDownload = http://download.sourceforge.net/project/scummvm/scummvm/1.6.0/scummvm-1.6.0-win32.exe
+URLDownload = http://download.sourceforge.net/project/scummvm/scummvm/1.7.0/scummvm-1.7.0-win32.exe
 CDPath = none
 
 [Section.0407]
-Description = Sam and Max, Day of the Tentacle usw in ReactOS. (FIXME)
+Description = Sam and Max, Day of the Tentacle usw in ReactOS.
 
 [Section.040a]
-Description = Sam and Max, Day of the Tentacle en ReactOS. (FIXME)
+Description = Sam and Max, Day of the Tentacle en ReactOS.
 
 [Section.040c]
-Description = Sam and Max, Day of the Tentacle, etc sur ReactOS. (FIXME)
-Size = 6,28 Mo
+Description = Sam and Max, Day of the Tentacle, etc sur ReactOS.
+Size = 6,9 Mo
 
 [Section.0410]
-Description = Software che riproduce il funzionamento di motori grafici per videogiochi (Sam and Max, Day of the Tentacle, etc) su ReactOS. (FIXME?)
+Description = Software che riproduce il funzionamento di motori grafici per videogiochi (Sam and Max, Day of the Tentacle, etc) su ReactOS.
 
 [Section.0413]
-Description = Sam and Max, Day of the Tentacle, enz. op ReactOS. (FIXME)
+Description = Sam and Max, Day of the Tentacle, enz. op ReactOS.
 
 [Section.0415]
 Description = Program pozwalający uruchomić stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS.
 
 [Section.0418]
-Description = Motor de execuție pentru jocuri SCUMM. (FIXME)
-Size = 6,28 Mo
+Description = Program care reproduce rezultatul motorului grafic pentru jocuri (Sam and Max, Day of the Tentacle, etc) în ReactOS.
+Size = 6,9 Mo
 
 [Section.041f]
 Description = ReactOS üzerinde Sam ve Max, Day of the Tentacle gibi vidyo oyunlarının oyun motorlarının çalışmasını taklit eden yazılım.
-Size = 6,28 MB
+Size = 6,9 MB
 
 [Section.0422]
-Description = Дозволить грати Sam and Max, Day of the Tentacle та інші класичні ігри в ReactOS. (FIXME)
+Description = Дозволить грати Sam and Max, Day of the Tentacle та інші класичні ігри в ReactOS.
 
 [Section.0813]
-Description = Sam and Max, Day of the Tentacle, enz. op ReactOS. (FIXME)
+Description = Sam and Max, Day of the Tentacle, enz. op ReactOS.
diff --git a/base/applications/rapps/rapps/sdl_mixer.txt b/base/applications/rapps/rapps/sdl_mixer.txt
index 67b89b3982e..46647c2621b 100644
--- a/base/applications/rapps/rapps/sdl_mixer.txt
+++ b/base/applications/rapps/rapps/sdl_mixer.txt
@@ -35,7 +35,7 @@ Description = Gebruikt door veel open-bron-spelletjes. Gebruik 7-zip om het uit
 Description = Biblioteka wymagana przez niektóre gry (zwłaszcza te o otwartym źródle). Do jej rozpakowania potrzebny jest 7-Zip lub podobny program.
 
 [Section.0418]
-Description = Necesar pentru execuția unor jocuri (open-source). Dezarhivați cu 7-Zip sau cu un utilitar asemănător.
+Description = Necesar pentru execuția unor jocuri (cu surse deschise). Dezarhivați cu 7-Zip sau cu un utilitar asemănător.
 Size = 548,02 ko
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/sdl_runtime.txt b/base/applications/rapps/rapps/sdl_runtime.txt
index 89849bec9d7..b14b37c6971 100644
--- a/base/applications/rapps/rapps/sdl_runtime.txt
+++ b/base/applications/rapps/rapps/sdl_runtime.txt
@@ -12,6 +12,9 @@ URLSite = http://www.libsdl.org/
 URLDownload = http://www.libsdl.org/release/SDL-1.2.15-win32.zip
 CDPath = none
 
+[Section.0405]
+Description = Nutný pro spuštění některých open source her. K rozbalení je nutný 7-zip nebo podobný nástroj.
+
 [Section.0407]
 Name = Simple Direct Media Layer (SDL) Laufzeitsystem
 Description = Erforderlich um einige Open Source Spiele auszuführen. Sie brauchen 7-Zip oder einen ähnlichen Entpacker um es zu entpacken.
@@ -36,7 +39,7 @@ Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL)
 Description = Wymagana przez wiele gier (głównie o otwartym źródle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny.
 
 [Section.0418]
-Description = Necesar pentru execuția multor jocuri (open-source). Dezarhivați cu 7-Zip sau cu un utilitar asemănător.
+Description = Necesar pentru execuția multor jocuri (cu surse deschise). Dezarhivați cu 7-Zip sau cu un utilitar asemănător.
 Size = 136,67 ko
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/seamonkey.txt b/base/applications/rapps/rapps/seamonkey.txt
index 16621853755..67f398860b0 100644
--- a/base/applications/rapps/rapps/seamonkey.txt
+++ b/base/applications/rapps/rapps/seamonkey.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
@@ -43,8 +43,8 @@ Size = 24.72 MB
 URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/pl/SeaMonkey%20Setup%202.26.exe
 
 [Section.0418]
-Description = Suita Mozilla. Acest pachet ce încorporează navigator, poștă electronică, client IRC și editor HTML, acoperind astfel o arie largă de necesități.
-Size = 23,90 Mo
+Description = Suita Mozilla. Acest pachet încorporează navigator, poștă electronică, client IRC și editor HTML, acoperind astfel o arie largă de necesități.
+Size = 24,7 Mo
 
 [Section.0419]
 Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
diff --git a/base/applications/rapps/rapps/smplayer.txt b/base/applications/rapps/rapps/smplayer.txt
index 80fab3ea53d..326e3bf8ac3 100644
--- a/base/applications/rapps/rapps/smplayer.txt
+++ b/base/applications/rapps/rapps/smplayer.txt
@@ -8,31 +8,31 @@ Licence = GPL
 Description = Graphical Frontend for MPlayer.
 Size = 20.7 MB
 Category = 2
-URLSite = http://smplayer.sourceforge.net/en/info
+URLSite = http://smplayer.sourceforge.net/en/
 URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/14.3.0/smplayer-14.3.0-oc2-win32.exe
 CDPath = none
 
 [Section.0407]
 Description = Grafische Oberfläche für MPlayer.
-URLSite = http://smplayer.sourceforge.net/de/info
+URLSite = http://smplayer.sourceforge.net/de/
 
 [Section.040a]
 Description = Interfaz gráfico para Mplayer (reproductor multimedia).
-URLSite = http://smplayer.sourceforge.net/es/info
+URLSite = http://smplayer.sourceforge.net/es/
 
 [Section.040c]
 Size = 20,7 Mo
-URLSite = http://smplayer.sourceforge.net/fr/info
+URLSite = http://smplayer.sourceforge.net/fr/
 
 [Section.0410]
-URLSite = http://smplayer.sourceforge.net/it/info
+URLSite = http://smplayer.sourceforge.net/it/
 
 [Section.0413]
 Description = Mediaspeler, grafische interface voor MPlayer.
 
 [Section.0415]
 Description = Graficzna nakładka na MPlayer, otwarty odtwarzacz filmów.
-URLSite = http://smplayer.sourceforge.net/pl/info
+URLSite = http://smplayer.sourceforge.net/pl/
 
 [Section.0418]
 Description = Lector multimedia (interfață pentru MPlayer).
@@ -41,11 +41,11 @@ Size = 20,7 Mo
 [Section.041f]
 Description = MPlayer için çizgelik ön yüz.
 Size = 20,7 MB
-URLSite = http://smplayer.sourceforge.net/tr/info
+URLSite = http://smplayer.sourceforge.net/tr/
 
 [Section.0422]
 Description = Графічний інтерфейс для MPlayer (мультимедійний плеєр).
-URLSite = http://smplayer.sourceforge.net/uk/info
+URLSite = http://smplayer.sourceforge.net/uk/
 
 [Section.0813]
 Description = Mediaspeler, grafische interface voor MPlayer.
diff --git a/base/applications/rapps/rapps/snoopy.txt b/base/applications/rapps/rapps/snoopy.txt
index cfc98f0028c..ce477e6378e 100644
--- a/base/applications/rapps/rapps/snoopy.txt
+++ b/base/applications/rapps/rapps/snoopy.txt
@@ -19,6 +19,11 @@ URLSite = http://www.blueskied.com/spiele-spielen/snoopy.htm
 [Section.0410]
 Description = Il remake del gioco Snoopy per Commodore 64.
 
+[Section.0418]
+Licence = Gratuită
+Description = Recrearea jocului Snoppy (original pe C64).
+Size = 704 ko
+
 [Section.041f]
 Licence = Ücretsiz
 Description = Özgün C64 Snoopy'in yeniden yapılmışı.
diff --git a/base/applications/rapps/rapps/sumatrapdf.txt b/base/applications/rapps/rapps/sumatrapdf.txt
index 9c508a32000..ca3b4f641d1 100644
--- a/base/applications/rapps/rapps/sumatrapdf.txt
+++ b/base/applications/rapps/rapps/sumatrapdf.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
@@ -13,29 +13,29 @@ URLDownload = https://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-2.5.2-in
 CDPath = none
 
 [Section.0407]
-Description = Sumatra PDF ist ein freies, schlankes, Open-Source PDF-Anzeigeprogramm. (FIXME)
+Description = Sumatra PDF ist ein freies, schlankes, Open-Source PDF-Anzeigeprogramm.
 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-de.html
 
 [Section.040a]
-Description = Sumatra PDF es un lector PDF ligero, libre y open-source. (FIXME)
+Description = Sumatra PDF es un lector PDF ligero, libre y open-source.
 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-es.html
 
 [Section.040c]
-Description = Sumatra PDF est un lecteur PDF léger, libre et open-source. (FIXME)
+Description = Sumatra PDF est un lecteur PDF léger, libre et open-source.
 Size = 4,0 Mo
 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-fr.html
 
 [Section.0410]
-Description = Sumatra PDF è un visualizzatore di file PDF, leggero e open source. (FIXME)
+Description = Sumatra PDF è un visualizzatore di file PDF, leggero e open source.
 
 [Section.0413]
-Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. (FIXME)
+Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer.
 
 [Section.0415]
-Description = Sumatra PDF to mały, darmowy, otwarty czytnik PDF. (FIXME)
+Description = Sumatra PDF to mały, darmowy, otwarty czytnik PDF.
 
 [Section.0418]
-Description = Lector PDF - ușor, gratuit (open-source), și portabil. (FIXME)
+Description = Lector PDF - ușor, gratuit (cu surse deschise), și portabil.
 Size = 4,0 Mo
 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-ro.html
 
@@ -45,4 +45,4 @@ Description = SumatraPDF; yeğni, ücretsiz ve açık kaynak bir PDF okuyucusudu
 Size = 4,0 MB
 
 [Section.0813]
-Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. (FIXME)
+Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer.
diff --git a/base/applications/rapps/rapps/summerbound.txt b/base/applications/rapps/rapps/summerbound.txt
index d9889a9da90..82c884450d3 100644
--- a/base/applications/rapps/rapps/summerbound.txt
+++ b/base/applications/rapps/rapps/summerbound.txt
@@ -19,6 +19,11 @@ URLSite = http://www.blueskied.com/freeware-spiele/runterladen.htm
 [Section.0410]
 Description = Un gioco simile a Frozen Fuits
 
+[Section.0418]
+Licence = Gratuită
+Description = Un joc similar jocului Frozen Fruits.
+Size = 764 ko
+
 [Section.041f]
 Licence = Ücretsiz
 Description = Frozen Fruits'e benzeyen bir oyun.
diff --git a/base/applications/rapps/rapps/supertux.txt b/base/applications/rapps/rapps/supertux.txt
index c7416cc0f33..6f8881f2a0d 100644
--- a/base/applications/rapps/rapps/supertux.txt
+++ b/base/applications/rapps/rapps/supertux.txt
@@ -23,7 +23,7 @@ Description = SuperTux è un gioco open-source gratuito in 2D.
 Description = SuperTux to darmowa dwu wymiarowa gra platformowa  OpenSource.
 
 [Section.0418]
-Description = SuperTux este un joc gratuit, cu surse publice, pe platformă bi-dimensională.
+Description = SuperTux este un joc gratuit, cu surse deschise, pe platformă bi-dimensională.
 Size = 7,3 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/thunderbird.txt b/base/applications/rapps/rapps/thunderbird.txt
index 61cadb98e24..a7a5aab6e71 100644
--- a/base/applications/rapps/rapps/thunderbird.txt
+++ b/base/applications/rapps/rapps/thunderbird.txt
@@ -1,79 +1,79 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
-Name = Mozilla Thunderbird 24
-Version = 24.5.0
+Name = Mozilla Thunderbird 31
+Version = 31.0
 Licence = MPL/GPL/LGPL
 Description = The most popular and one of the best free Mail Clients out there.
-Size = 21.12 MB
+Size = 25.25 MB
 Category = 5
 URLSite = https://www.mozilla.org/en-US/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/en-US/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/en-US/Thunderbird%20Setup%2031.0.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Mail-Clients.
-Size = 20.96 MB
+Size = 25.09 MB
 URLSite = https://www.mozilla.org/de/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/de/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/de/Thunderbird%20Setup%2031.0.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores clientes mail que hay.
-Size = 20.92 MB
+Size = 25.04 MB
 URLSite = https://www.mozilla.org/es-ES/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/es-ES/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/es-ES/Thunderbird%20Setup%2031.0.exe
 
 [Section.040c]
 Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible.
-Size = 21,27 Mo
+Size = 25,39 Mo
 URLSite = https://www.mozilla.org/fr/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/fr/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/fr/Thunderbird%20Setup%2031.0.exe
 
 [Section.0410]
 Description = Il più popolare e il migliore Client mail gratuito.
-Size = 20.91 MB
+Size = 25.04 MB
 URLSite = https://www.mozilla.org/it/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/it/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/it/Thunderbird%20Setup%2031.0.exe
 
 [Section.0413]
 Description = De meest populaire en een van de beste gratis e-mail-programma's.
-Size = 21.61 MB
+Size = 25.73 MB
 URLSite = https://www.mozilla.org/nl/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/nl/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/nl/Thunderbird%20Setup%2031.0.exe
 
 [Section.0415]
 Description = Najpopularniejszy i jeden z najlepszych darmowych klientów poczty.
-Size = 21.80 MB
+Size = 25.95 MB
 URLSite = https://www.mozilla.org/pl/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/pl/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/pl/Thunderbird%20Setup%2031.0.exe
 
 [Section.0418]
 Description = Cel mai popular și unul dintre cele mai bune clientele gratuite de poștă electronică.
-Size = 21,48 Mo
+Size = 25,61 Mo
 URLSite = https://www.mozilla.org/ro/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/ro/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/ro/Thunderbird%20Setup%2031.0.exe
 
 [Section.0419]
 Description = Один из самых популярных и лучших бесплатных почтовых клиентов.
-Size = 21.38 MB
+Size = 25.5 MB
 URLSite = https://www.mozilla.org/ru/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/ru/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/ru/Thunderbird%20Setup%2031.0.exe
 
 [Section.041f]
 Description = Özgür posta istemcileri arasında en tutulanı ve en iyilerinden biri.
-Size = 20,99 MB
+Size = 25,12 MB
 URLSite = https://www.mozilla.org/tr/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/tr/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/tr/Thunderbird%20Setup%2031.0.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращих поштових клієнтів.
-Size = 21.41 MB
+Size = 25.54 MB
 URLSite = https://www.mozilla.org/uk/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/uk/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/uk/Thunderbird%20Setup%2031.0.exe
 
 [Section.0813]
 Description = De meest populaire en een van de beste gratis e-mail-programma's.
-Size = 9.71 MB
+Size = 25.73 MB
 URLSite = https://www.mozilla.org/nl/thunderbird/
-URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/nl/Thunderbird%20Setup%2024.5.0.exe
+URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/nl/Thunderbird%20Setup%2031.0.exe
diff --git a/base/applications/rapps/rapps/totalcommander.txt b/base/applications/rapps/rapps/totalcommander.txt
index e7980801ee6..415fb579db2 100644
--- a/base/applications/rapps/rapps/totalcommander.txt
+++ b/base/applications/rapps/rapps/totalcommander.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
diff --git a/base/applications/rapps/rapps/ultravnc.txt b/base/applications/rapps/rapps/ultravnc.txt
index 1a7446a9945..e18e1094f89 100644
--- a/base/applications/rapps/rapps/ultravnc.txt
+++ b/base/applications/rapps/rapps/ultravnc.txt
@@ -32,7 +32,7 @@ Description = Open-bron VNC afnemer/aanbieder.
 Description = Otwarty klient/serwer VNC.
 
 [Section.0418]
-Description = Client/server VNC (open-source).
+Description = Client/server VNC (cu surse deschise).
 Size = 3,27 Mo
 
 [Section.041f]
diff --git a/base/applications/rapps/rapps/utorrent.txt b/base/applications/rapps/rapps/utorrent.txt
index b5206838136..b465ecaca74 100644
--- a/base/applications/rapps/rapps/utorrent.txt
+++ b/base/applications/rapps/rapps/utorrent.txt
@@ -1,4 +1,4 @@
-; UTF-8
+; UTF-8
 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy@live.com)
 
 [Section]
diff --git a/base/applications/rapps/rapps/vlc.txt b/base/applications/rapps/rapps/vlc.txt
index 205f84ed336..772bb84186e 100644
--- a/base/applications/rapps/rapps/vlc.txt
+++ b/base/applications/rapps/rapps/vlc.txt
@@ -3,13 +3,13 @@
 
 [Section]
 Name = VLC media player
-Version = 2.1.3
+Version = 2.1.5
 Licence = GPL
 Description = A media player.
-Size = 23.5 MB
+Size = 23.6 MB
 Category = 2
 URLSite = http://www.videolan.org/vlc/
-URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.1.3/win32/vlc-2.1.3-win32.exe
+URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.1.5/win32/vlc-2.1.5-win32.exe
 CDPath = none
 
 [Section.0407]
@@ -20,7 +20,7 @@ Description = Reproductor multimedia.
 
 [Section.040c]
 Description = Un lecteur media.
-Size = 23,5 Mo
+Size = 23,6 Mo
 
 [Section.0410]
 Description = Lettore multimediale.
@@ -33,7 +33,7 @@ Description = Odtwarzacz multimediów.
 
 [Section.0418]
 Description = Lector multimedia.
-Size = 23,5 Mo
+Size = 23,6 Mo
 
 [Section.0419]
 Description = Мультимедийный проигрыватель.
@@ -44,7 +44,7 @@ Description = Multimediálny prehrávač.
 [Section.041f]
 Name = VLC Ortam Oynatıcısı
 Description = Bir ortam oynatıcısı.
-Size = 23,5 MB
+Size = 23,6 MB
 
 [Section.0422]
 Description = Мультимедійний програвач.
diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc
index f12aa7f14c4..7ab4b540b73 100644
--- a/base/setup/reactos/lang/ro-RO.rc
+++ b/base/setup/reactos/lang/ro-RO.rc
@@ -1,10 +1,17 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: ReactOS GUI first stage setup application
+ * FILE:    base/setup/reactos/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for ReactOS GUI first stage setup
+ * TRANSLATORS:
+ *          Petre Dumitriu (petrimetri-at-gmail-dot-com)
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Bun venit la Instalarea ReactOS", IDC_STARTTITLE, 115, 8, 195, 24
@@ -14,7 +21,7 @@ END
 
 IDD_LANGSELPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
@@ -27,7 +34,7 @@ END
 
 IDD_TYPEPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Tipul de instalare", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
@@ -38,7 +45,7 @@ END
 
 IDD_DEVICEPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Configurare dispozitive", IDC_STATIC, "Button", BS_GROUPBOX, 10, 0, 297, 172
@@ -53,7 +60,7 @@ END
 
 IDD_DRIVEPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Partiția pentru instalarea ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10, 1, 298, 176
@@ -98,7 +105,7 @@ END
 
 IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Sumar", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
@@ -107,18 +114,18 @@ END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Acțiune de instalare", IDC_ACTION, "Button", BS_GROUPBOX, 10, 0, 297, 172
-    LTEXT "Instalarea fișierelor…", IDC_ACTIVITY, 20, 50, 277, 10
+    LTEXT "Se instalează fișierele…", IDC_ACTIVITY, 20, 50, 277, 10
     LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10
     CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8
 END
 
 IDD_RESTARTPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Finalizarea primei etape", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10, 0, 297, 172
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index fce9d70af8e..558011d80b8 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -881,14 +881,13 @@ static MUI_ENTRY roROSelectPartitionEntries[] =
     {
         8,
         15,
-        "\x07  Press P to create a primary partition.",
-//        "\x07  Tasta�i C pentru a crea o nou� parti�ie.",
+        "\x07  Tasta�i P pentru a crea o parti�ie primar�.",
         TEXT_STYLE_NORMAL
     },
     {
         8,
         17,
-        "\x07  Press E to create an extended partition.",
+        "\x07  Tasta�i E pentru a crea o parti�ie extins�.",
         TEXT_STYLE_NORMAL
     },
     {
@@ -1349,7 +1348,7 @@ MUI_ERROR roROErrorEntries[] =
 {
     {
         // NOT_AN_ERROR
-        "Success\n"
+        "Succes\n"
     },
     {
         //ERROR_NOT_INSTALLED
@@ -1579,29 +1578,29 @@ MUI_ERROR roROErrorEntries[] =
     },
     {
         //ERROR_PARTITION_TABLE_FULL,
-        "You can not create a new primary or extended partition in the\n"
-        "partition table of this disk because the partition table is full.\n"
+        "Nu se poate crea o nou� parti�ie primar� sau extins� �n tabela\n"
+        "de parti�ii a acestui disc deoarece tabela de parti�ii e plin�.\n"
         "\n"
-        "  * Press any key to continue."
+        "  * Tasta�i pentru a continua."
     },
     {
         //ERROR_ONLY_ONE_EXTENDED,
-        "You can not create more than one extended partition per disk.\n"
+        "Nu se poate crea mai mult de o parti�ie extins� pe un disc.\n"
         "\n"
-        "  * Press any key to continue."
+        "  * Tasta�i pentru a continua."
     },
     {
         //ERROR_NOT_BEHIND_EXTENDED,
-        "You can not create a partition behind an extended partition.\n"
+        "Nu se poate crea o parti�ie dup� o parti�ie extins�.\n"
         "\n"
-        "  * Press any key to continue."
+        "  * Tasta�i pentru a continua."
     },
     {
         //ERROR_EXTENDED_NOT_LAST,
-        "An extended partition must always be the last\n"
-        "partition in a partition table.\n"
+        "O parti�ie extins� trebuie s� fie �ntotdeauna\n"
+        "ultima parti�ie din tabela de parti�ii.\n"
         "\n"
-        "  * Press any key to continue."
+        "  * Tasta�i pentru a continua."
     },
     {
         NULL,
@@ -1714,23 +1713,21 @@ MUI_STRING roROStrings[] =
     {STRING_PLEASEWAIT,
      "   A�tepta�i..."},
     {STRING_INSTALLCREATEPARTITION,
-     "   ENTER = Install   P = Create Primary   E = Create Extended   F3 = Quit"},
-//     "   ENTER = Instalare   C = Creare parti�ie   F3 = Ie�ire"},
+     "   ENTER = Instalare   P/E = Creare parti�ie Primar�/Extins�   F3 = Ie�ire"},
     {STRING_INSTALLCREATELOGICAL,
      "   ENTER = Install   L = Create Logical Partition   F3 = Quit"},
     {STRING_INSTALLDELETEPARTITION,
      "   ENTER = Instalare   D = �tergere parti�ie   F3 = Ie�ire"},
     {STRING_DELETEPARTITION,
-     "   D = Delete Partition   F3 = Quit"},
+     "   D = �tergere parti�ie   F3 = Ie�ire"},
     {STRING_PARTITIONSIZE,
      "M�rimea noii parti�ii:"},
     {STRING_CHOOSENEWPARTITION,
-     "You have chosen to create a primary partition on"},
-//     "A�i ales crearea unei noi parti�ii pe"},
+     "A�i ales crearea unei parti�ii primare pe"},
     {STRING_CHOOSE_NEW_EXTENDED_PARTITION,
-     "You have chosen to create an extended partition on"},
+     "A�i ales crearea unei parti�ii extinse pe"},
     {STRING_CHOOSE_NEW_LOGICAL_PARTITION,
-     "You have chosen to create a logical partition on"},
+     "A�i ales crearea unei parti�ii logice pe"},
     {STRING_HDDSIZE,
     "Introduce�i m�rimea noii parti�ii �n megaocte�i."},
     {STRING_CREATEPARTITION,
@@ -1814,7 +1811,7 @@ MUI_STRING roROStrings[] =
     {STRING_MAXSIZE,
     "Mo (max. %lu Mo)"},
     {STRING_EXTENDED_PARTITION,
-    "Extended Partition"},
+    "Parti�ie extins�"},
     {STRING_UNFORMATTED,
     "Part. nou� (neformatat�)"},
     {STRING_FORMATUNUSED,
diff --git a/base/setup/vmwinst/lang/ro-RO.rc b/base/setup/vmwinst/lang/ro-RO.rc
index 05c7954a54d..f44a31b1164 100644
--- a/base/setup/vmwinst/lang/ro-RO.rc
+++ b/base/setup/vmwinst/lang/ro-RO.rc
@@ -8,7 +8,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Instalatorul ReactOS a descoperit faptul că ReactOS este executat în VMware(r).", -1, 117, 8, 140, 24
@@ -17,7 +17,7 @@ END
 
 IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Instalatorul ReactOS nu are inclus modulul pilot VMware(r) SVGA.\n\nDe aceea, mergeți la „VM” din meniul stației de lucru VMware(r) și alegeți instalarea instrumentelor VMware\n\n\nApăsați „Înainte” pentru a continua sau „Anulează” pentru a omite instalarea modulului pilot video SVGA.", -1, 25, 25, 225, 85
@@ -25,7 +25,7 @@ END
 
 IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "{STATUS}", IDC_INSTALLINGSTATUS, 25, 68, 225, 8
@@ -34,7 +34,7 @@ END
 
 IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Modulul pilot video VMware(r) SVGA a fost instalat cu succes. Alegeți rezoluția preferată a ecranului:", -1, 25, 5, 225, 20
@@ -55,7 +55,7 @@ END
 
 IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Instalatorul ReactOS nu a reușit instalarea modulului pilot VMware(r) SVGA.\n\n\nAlegeți „Sfârșit” pentru a reveni la instalarea ReactOS.", -1, 25, 25, 225, 85
@@ -63,7 +63,7 @@ END
 
 IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Modulul pilot video VMware(r) SVGA este deja instalat.\n\nPuteți în continuare să:", -1, 25, 5, 225, 30
@@ -75,7 +75,7 @@ END
 
 IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Alegeți modulul grafic pe care doriți să-l folosiți:", -1, 25, 25, 225, 15
@@ -86,7 +86,7 @@ END
 
 IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul de instalare module video"
+CAPTION "Asistent de instalare module video"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Instalatorul ReactOS e pe cale de a vă dezinstala modulul pilot VMware(r) SVGA!!!\n\n\nApăsați „Sfârșit” pentru a dezinstala modulul pilot sau „Anulează” pentru a-l lăsa așa cum este.", -1, 25, 25, 225, 85
@@ -114,24 +114,24 @@ END
 STRINGTABLE
 BEGIN
     IDS_SEARCHINGFORCDROM "Accesarea suportului CD-ROM cu instrumentele VMware(r)…"
-    IDS_COPYINGFILES "Copierea fișierelor…"
+    IDS_COPYINGFILES "Se copie fișierele…"
     IDS_ENABLINGDRIVER "Activarea modulului pilot VMware(r) SVGA…"
 END
 
 STRINGTABLE
 BEGIN
-    IDD_INSERT_VMWARE_TOOLSTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_INSERT_VMWARE_TOOLSTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_INSERT_VMWARE_TOOLSSUBTITLE "Introduceți suportul CD-ROM cu instrumentele VMware."
-    IDD_INSTALLING_VMWARE_TOOLSTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_INSTALLING_VMWARE_TOOLSTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Căutarea și copierea modulului pilot VMware (r) SVGA."
-    IDD_CONFIGTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_CONFIGTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_CONFIGSUBTITLE "Alegeți rezoluția preferată a ecranului."
-    IDD_INSTALLATION_FAILEDTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_INSTALLATION_FAILEDTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_INSTALLATION_FAILEDSUBTITLE "Instalarea modulului pilot VMware (r) SVGA a eșuat."
-    IDD_CHOOSEACTIONTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_CHOOSEACTIONTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_CHOOSEACTIONSUBTITLE "Alegeți în continuare."
-    IDD_SELECTDRIVERTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_SELECTDRIVERTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_SELECTDRIVERSUBTITLE "Alegeți un modul pilot."
-    IDD_DOUNINSTALLTITLE "Asistentul de instalare al modulului pilot VMware (r) SVGA"
+    IDD_DOUNINSTALLTITLE "Asistent de instalare al modulului pilot VMware (r) SVGA"
     IDD_DOUNINSTALLSUBTITLE "Dezinstalați modulul pilot."
 END
diff --git a/base/shell/cmd/cmd.rc b/base/shell/cmd/cmd.rc
index 5281f4d6302..895c05644d7 100644
--- a/base/shell/cmd/cmd.rc
+++ b/base/shell/cmd/cmd.rc
@@ -14,14 +14,14 @@
 STRINGTABLE
 BEGIN
     STRING_FREEDOS_DEV "    Tim Norman        Matt Rains\n\
-        Evan Jeffrey      Steffen Kaiser\n\
-        Svante Frey       Oliver Mueller\n\
-        Aaron Kaufman     Marc Desrochers\n\
-        Rob Lake          John P Price\n\
-        Hans B Pufal\n"
+    Evan Jeffrey      Steffen Kaiser\n\
+    Svante Frey       Oliver Mueller\n\
+    Aaron Kaufman     Marc Desrochers\n\
+    Rob Lake          John P Price\n\
+    Hans B Pufal\n"
     STRING_REACTOS_DEV  "    Eric Kohl         Emanuele Aliberti\n\
-        Paolo Pantaleo    Phillip Susi\n\
-        Sylvain Petreolle\n"
+    Paolo Pantaleo    Phillip Susi\n\
+    Sylvain Petreolle\n"
 END
 
 1 ICON "res/terminal.ico"
diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc
index 458b1576639..5a981a1f884 100644
--- a/base/system/diskpart/lang/en-US.rc
+++ b/base/system/diskpart/lang/en-US.rc
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 /* Basic application information */
 STRINGTABLE
diff --git a/base/system/format/lang/de-DE.rc b/base/system/format/lang/de-DE.rc
index e92cf42c0cd..791b9beb93c 100644
--- a/base/system/format/lang/de-DE.rc
+++ b/base/system/format/lang/de-DE.rc
@@ -11,7 +11,7 @@ BEGIN
                    empfohlen, grundsätzlich Standardeinstellungen zu verwenden!\n\
                    NTFS unterstützt 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\
                    FAT unterstützt 8192, 16K, 32K, 64K, 128K, 256K.\n\
-                   NTFS-Kompression wird für Blockgrössen über 4096 nicht\n\
+                   NTFS-Kompression wird für Blockgrößen über 4096 nicht\n\
                    unterstützt.\n\
   -C               Auf dem neuen Datenträger erstellte Dateien werden\n\
                    standardmäßig komprimiert.\n\n"
@@ -35,8 +35,8 @@ BEGIN
     STRING_CREATE_FSYS "Erzeuge Dateisystem-Strukturen.\n"
     STRING_FMT_COMPLETE "Formatierung abgeschlossen.\n"
     STRING_VOL_COMPRESS "Medium unterstützt keine Kompression.\n"
-    STRING_ENTER_LABEL "Datenträgerbezeichnung (11 Zeichen, Enter für keine)? "
+    STRING_ENTER_LABEL "Datenträgerbezeichnung (11 Zeichen, Eingabetaste für keine)? "
     STRING_NO_LABEL "Konnte Datenträger nicht benennen"
-    STRING_FREE_SPACE "\n%I64d Byte Speicherkapazität.\n%I64d bytes freier Speicher.\n"
+    STRING_FREE_SPACE "\n%I64d Bytes Speicherkapazität.\n%I64d Bytes freier Speicher.\n"
     STRING_SERIAL_NUMBER "\nDatenträger-Seriennummer ist %04X-%04X\n"
 END
diff --git a/base/system/regsvr32/lang/de-DE.rc b/base/system/regsvr32/lang/de-DE.rc
index d14a4a32bbc..f18a7de72f0 100644
--- a/base/system/regsvr32/lang/de-DE.rc
+++ b/base/system/regsvr32/lang/de-DE.rc
@@ -4,7 +4,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_UsageMessage "%s\n\nSyntax: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\
+    IDS_UsageMessage "%s\n\nSyntax: regsvr32 [/u] [/s] [/c] [/n] [/i[:Befehlszeile]] DLL-Name\n\
 /u -	Serverregistrierung aufheben\n\
 /s -	Hintergrundmodus; Meldungen werden nicht angezeigt\n\
 /c -	Konsolenausgabe verwenden\n\
@@ -15,9 +15,9 @@ BEGIN
     IDS_NoDllSpecified "Es wurde kein DLL-Name angegeben."
     IDS_InvalidFlag "Ungültiger Parameter: %s"
     IDS_SwitchN_NoI "Ungültiger Parameter: /n muss zusammen mit dem /i-Schalter verwendet werden."
-    IDS_DllNotLoaded "LoadLibrary('%s') ist fehlgeschlagen.\nGetLastError-Rückgabewert 0x%08x."
+    IDS_DllNotLoaded "LoadLibrary('%s') ist fehlgeschlagen.\nRückgabewert von GetLastError: 0x%08x."
     IDS_MissingEntry "%s wurde geladen, aber der %s Einstiegspunkt wurde nicht gefunden.\n\n\
-%s wurde möglicherweise nicht exportiert, oder eine fehlerhafte Version von %s befindet sich im Speicher. Erwägen Sie die Verwendung von PView, um es festzustellen und zu löschen."
+%s wurde möglicherweise nicht exportiert, oder eine fehlerhafte Version von %s befindet sich im Speicher.\n Mit PView können Sie diese finden und löschen."
     IDS_FailureMessage "%s in %s ist fehlgeschlagen.\nRückgabewert: 0x%08x"
     IDS_SuccessMessage "%s in %s war erfolgreich."
 END
diff --git a/base/system/rundll32/lang/de-DE.rc b/base/system/rundll32/lang/de-DE.rc
index a3ab595aa1a..4eefc1b74ee 100644
--- a/base/system/rundll32/lang/de-DE.rc
+++ b/base/system/rundll32/lang/de-DE.rc
@@ -4,6 +4,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_DllNotLoaded "LoadLibrary laden von '%s' fehlgeschlagen"
+    IDS_DllNotLoaded "LoadLibrary konnte '%s' nicht laden"
     IDS_MissingEntry "Fehlender Eintrag:%s\nIn %s"
 END
diff --git a/base/system/runonce/lang/de-DE.rc b/base/system/runonce/lang/de-DE.rc
index b2366527fa7..7038d5aaf3c 100644
--- a/base/system/runonce/lang/de-DE.rc
+++ b/base/system/runonce/lang/de-DE.rc
@@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_RUNONCE_DLG DIALOG 0, 0, 239, 170
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS-Setup"
+CAPTION "ReactOS-Installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "ReactOS nimmt nun die folgenden Einstellungen vor:", -1, 38, 8, 196, 18
diff --git a/base/system/subst/lang/de-DE.rc b/base/system/subst/lang/de-DE.rc
new file mode 100644
index 00000000000..9f080742213
--- /dev/null
+++ b/base/system/subst/lang/de-DE.rc
@@ -0,0 +1,18 @@
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_INCORRECT_PARAMETER_COUNT "Falsche Anzahl an Parametern - %s\n"
+    IDS_INVALID_PARAMETER "Falsche Anzahl an Parametern - %s\n"
+    IDS_INVALID_PARAMETER2 "Falscher Parameter - %s\n"
+    IDS_DRIVE_ALREADY_SUBSTED "SUBST wurde hier schon ausgeführt.\n"
+    IDS_FAILED_WITH_ERRORCODE "Fehlgeschlagen - Code 0x%x: %s\n"
+    IDS_USAGE "Weist einem Pfad einen Laufwerksbuchstaben zu.n\n\
+SUBST [Laufwerk1: [Laufwerk2:]Pfad]\n\
+SUBST Laufwerk1: /D\n\n\
+  Laufwerk1:        Laufwerksbezeichnung, die dem Pfad zugewiesen werden soll.\n\
+  [Laufwerk2:]Pfad  Laufwerk und Pfad, die als virtuelles Laufwerk (Laufwerk1:)\n\
+                    angesprochen werden sollen.\n\
+  /D                Löscht ein virtuelles Laufwerk.\n\n\
+SUBST ohne Parameter zeigt alle bereits erstellten, virtuellen Laufwerke an.\n"
+END
diff --git a/base/system/subst/subst.rc b/base/system/subst/subst.rc
index 31e1dc30b09..a9321d1e743 100644
--- a/base/system/subst/subst.rc
+++ b/base/system/subst/subst.rc
@@ -13,6 +13,9 @@
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc
index 5f412849d66..e7778e6db73 100644
--- a/base/system/winlogon/lang/de-DE.rc
+++ b/base/system/winlogon/lang/de-DE.rc
@@ -17,8 +17,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT
 CAPTION "Benutzerinterface-Fehler"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Die Logon-Benutzerschnittstellen-DLL %s konnte nicht geladen werden.", IDC_GINALOADFAILED, 39, 16, 156, 24
-    LTEXT "Kontaktieren Sie Ihren Systemadministrator, um die DLL zu ersetzen, oder stellen Sie die Original-DLL wieder her.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25
+    LTEXT "Die DLL %s konnte nicht geladen werden.", IDC_GINALOADFAILED, 39, 16, 156, 24
+    LTEXT "Kontaktieren Sie Ihren Systemadministrator, um die Datei zu ersetzen, oder stellen Sie die Originaldatei wieder her.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25
     DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14
 END
 
@@ -28,7 +28,7 @@ BEGIN
     IDS_APPLYINGCOMPUTERSETTINGS "Computereinstellungen laden..."
     IDS_RUNNINGSTARTUPSCRIPTS "Startskripte ausführen..."
     IDS_RUNNINGSHUTDOWNSCRIPTS "Skripte zum Herunterfahren ausführen..."
-    IDS_APPLYINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen setzen..."
+    IDS_APPLYINGYOURPERSONALSETTINGS "Persönliche Einstellungen werden übernommen..."
     IDS_RUNNINGLOGOFFSCRIPTS "Abmeldeskripte ausführen..."
     IDS_RUNNINGLOGONSCRIPTS "Anmeldeskripte ausführen..."
     IDS_LOADINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen laden..."
diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc
index dc64d3b3f8f..d290b69459c 100644
--- a/base/system/winlogon/lang/ro-RO.rc
+++ b/base/system/winlogon/lang/ro-RO.rc
@@ -1,4 +1,11 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: ReactOS Winlogon
+ * FILE:    base/system/winlogon/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for Winlogon
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -33,11 +40,11 @@ BEGIN
     IDS_RUNNINGLOGONSCRIPTS "Se execută operațiile de autentificare…"
     IDS_LOADINGYOURPERSONALSETTINGS "Se reconstituie configurațiile personale…"
     IDS_CLOSINGNETWORKCONNECTIONS "Se închid conexiunile în rețea…"
-    IDS_REACTOSISSHUTTINGDOWN "Se oprește sistemului de operare…"
+    IDS_REACTOSISSHUTTINGDOWN "Se oprește sistemul de operare…"
     IDS_PREPARETOSTANDBY "Se pregătește stărea de veghe…"
     IDS_PREPARETOHIBERNATE "Se pregătește starea de hibernare…"
     IDS_SAVEYOURSETTINGS "Se rețin configurațiile personale…"
-    IDS_REACTOSISSTARTINGUP "Se pornește sistemului de operare…"
+    IDS_REACTOSISSTARTINGUP "Se pornește sistemul de operare…"
 END
 
 STRINGTABLE
diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf
index 058a16578a8..b1ebd726d8e 100644
--- a/boot/bootdata/hivecls.inf
+++ b/boot/bootdata/hivecls.inf
@@ -1,4 +1,4 @@
-[Version]
+[Version]
 Signature="$ReactOS$"
 
 [AddReg]
@@ -477,14 +477,19 @@ CPLFILE_OPENWITH="Open with Control Panel"
 CPLFILE="Systemsteuerungselement"
 CPLFILE_OPENWITH="Mit der Systemsteuerung öffnen"
 
-; LANG_POLISH SUBLANG_NEUTRAL
-[Strings.0015]
-CPLFILE="Aplet Panelu Sterowania"
-CPLFILE_OPENWITH="Otwórz poprzez Panel Sterowania"
-
 ; LANG_FRENCH SUBLANG_NEUTRAL
 [Strings.000C]
 CPLFILE="Extension du Panneau de Contrôle"
 CPLFILE_OPENWITH="Ouvrir avec le Panneau de Contrôle"
 
+; LANG_POLISH SUBLANG_NEUTRAL
+[Strings.0015]
+CPLFILE="Aplet Panelu Sterowania"
+CPLFILE_OPENWITH="Otwórz poprzez Panel Sterowania"
+
+; LANG_ROMANIAN SUBLANG_NEUTRAL
+[Strings.0018]
+CPLFILE="Extensie pentru panou de control"
+CPLFILE_OPENWITH="Deschide în panou de control"
+
 ; EOF
diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc
index 40c05fa8e33..3c8891e84b1 100644
--- a/dll/cpl/appwiz/lang/ro-RO.rc
+++ b/dll/cpl/appwiz/lang/ro-RO.rc
@@ -8,7 +8,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul pentru creare de legătură"
+CAPTION "Asistent pentru creare de legătură"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Text1", -1, 115, 15, 160, 24
@@ -17,7 +17,7 @@ END
 
 IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul pentru creare de legătură"
+CAPTION "Asistent pentru creare de legătură"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Text1",-1,10,0,225,40
@@ -27,10 +27,10 @@ END
 
 IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul pentru creare de scurtătură"
+CAPTION "Asistent pentru creare de scurtătură"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT       "Acest expert vă va asista în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30
+    LTEXT       "Acest asistent vă va ajuta în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30
     LTEXT       "Scrieți adresa elementului:", -1, 120, 50, 120, 10
     EDITTEXT                   IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT
     PUSHBUTTON  "Spe&cificare…",  IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT
@@ -39,10 +39,10 @@ END
 
 IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200
 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Asistentul pentru creare de scurtătură"
+CAPTION "Asistent pentru creare de scurtătură"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    LTEXT     "Scrieți un &nume pentru scurtătură:", -1, 120, 15, 150, 10
+    LTEXT     "Scrieți un n&ume pentru scurtătură:", -1, 120, 15, 150, 10
     EDITTEXT                   IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT
     LTEXT     "Apăsați „Sfârșit” pentru a crea scurtătura.", -1, 118, 97, 178, 17
 END
@@ -51,7 +51,7 @@ STRINGTABLE
 BEGIN
     IDS_CPLSYSTEMNAME         "Gestionar de programe"
     IDS_CPLSYSTEMDESCRIPTION  "Instalează programe și crează scurtături."
-    IDS_CREATE_SHORTCUT       "Asistentul pentru creare de scurtătură"
+    IDS_CREATE_SHORTCUT       "Asistent pentru creare de scurtătură"
     IDS_ERROR_NOT_FOUND       "Elementul „%s” nu poate fi localizat."
 END
 
diff --git a/dll/cpl/hdwwiz/lang/ro-RO.rc b/dll/cpl/hdwwiz/lang/ro-RO.rc
index f1e34ff80e5..e2067a47c8f 100644
--- a/dll/cpl/hdwwiz/lang/ro-RO.rc
+++ b/dll/cpl/hdwwiz/lang/ro-RO.rc
@@ -1,10 +1,17 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: ReactOS Add hardware control panel
+ * FILE:    dll/cpl/hdwwiz/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for add hardware control panel
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_STARTPAGE DIALOG 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Bun venit la adăugarea de componente fizice", IDC_FINISHTITLE, 114, 8, 203, 24
@@ -18,7 +25,7 @@ END
 
 IDD_SEARCHPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32
@@ -27,7 +34,7 @@ END
 
 IDD_ISCONNECTEDPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Componenta fizică este conectată la calculator?", -1, 20, 11, 275, 8
@@ -37,7 +44,7 @@ END
 
 IDD_PROBELISTPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Alegeți din lista de mai jos un dispozitiv instalat, apoi apăsați „Înainte” pentru a-i inspecta proprietățile sau pentru a depana o posibilă problemă.", -1, 21, 8, 275, 22
@@ -48,7 +55,7 @@ END
 
 IDD_SELECTWAYPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Asistentul poate încerca detectarea și instalarea automată a componentelor fizice. Altfel, dacă știți exact modelul dispozitivului, îl veți putea manual alege dintr-o listă.", -1, 21, 8, 280, 24
@@ -59,7 +66,7 @@ END
 
 IDD_DETECTEDHWPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40
@@ -69,7 +76,7 @@ END
 
 IDD_HWTYPESPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Dacă nu regăsiți categoria pe care o căutați, specificați „afișează toate”.", IDC_STATUSTEXT, 21, 9, 275, 18
@@ -79,7 +86,7 @@ END
 
 IDD_PROGRESSPAGE DIALOG 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Căutarea componentei fizice poate dura câteva minute.", -1, 21, 8, 275, 15
@@ -91,7 +98,7 @@ END
 
 IDD_FINISHPAGE DIALOG 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 203, 24
@@ -102,7 +109,7 @@ END
 
 IDD_ISFOUNDPAGE DIALOG 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Încheiere proces de instalare", IDC_FINISHTITLE, 114, 8, 203, 24
@@ -113,7 +120,7 @@ END
 
 IDD_HWSTATUSPAGE DIALOG 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Încheire proces de instalare", IDC_FINISHTITLE, 114, 8, 195, 28
@@ -125,7 +132,7 @@ END
 
 IDD_NOTCONNECTEDPAGE DIALOG 0, 0, 317, 186
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de adăugare a componentelor fizice"
+CAPTION "Asistent de adăugare a componentelor fizice"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Nu se mai poate continua Adăugarea componentelor fizice", IDC_FINISHTITLE, 114, 8, 203, 28
diff --git a/dll/cpl/liccpa/lang/ro-RO.rc b/dll/cpl/liccpa/lang/ro-RO.rc
index da573f1de45..79e8f4eea3b 100644
--- a/dll/cpl/liccpa/lang/ro-RO.rc
+++ b/dll/cpl/liccpa/lang/ro-RO.rc
@@ -1,9 +1,7 @@
 /* 
  * FILE:       dll/cpl/liccpa/lang/ro-RO.rc
  *             ReactOS Project (http://www.reactos.org)
- * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum to fulea.stefan)
- * CHANGE LOG: 2011-09-02  initial translation
- *             2011-11-20  minor change
+ * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md)
  */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@@ -21,7 +19,7 @@ BEGIN
     CONTROL "Con&firmă", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14
     CONTROL "A&nulează", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14
     CONTROL "Informații", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14
-    CONTROL "Replicarea…", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14
+    CONTROL "Replicare…", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14
     CONTROL "Adaugă licențe", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15
     CONTROL "Elimină licențe", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16
     CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12
diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc
index 5117390ac53..1baa62513dc 100644
--- a/dll/cpl/sysdm/lang/ro-RO.rc
+++ b/dll/cpl/sysdm/lang/ro-RO.rc
@@ -1,4 +1,11 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: ReactOS System Control Panel Applet
+ * FILE:    dll/cpl/sysdm/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for System Control Panel Applet
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -279,6 +286,6 @@ BEGIN
     IDS_WARNMAXIMUMRANGE "Dimensiunea maximă a fișierului de paginare trebuie să fie încadrată între dimensiunea inițială și spațiul liber disponibil al unității selectate."
     IDS_PAGEFILE_NONE "nespecificat"
     IDS_PAGEFILE_SYSTEM "gestionat de sistem"
-    IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes."
+    IDS_INFOREBOOT "Pentru aplicarea modificărilor este necesară repornirea calculatorului."
     IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa de dezvoltare\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil Horníček\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nIngineri de distribuție\n\nColin Finck\nZ98\n\nEchipa paginii web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEchipa multimedia\n\nMindflyer\nWierd_W\n\nmulțumiri adresate către\n\ntoți Contribuitorii\nEchipa Wine\n\n"
 END
diff --git a/dll/cpl/wined3dcfg/lang/ro-RO.rc b/dll/cpl/wined3dcfg/lang/ro-RO.rc
index 8f89c1b0af0..f154fecc172 100644
--- a/dll/cpl/wined3dcfg/lang/ro-RO.rc
+++ b/dll/cpl/wined3dcfg/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-/* 2012.03.10 - Fulea Ștefan: resource first addition */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -8,27 +8,27 @@ CAPTION "Generale"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20
-    GROUPBOX "Shaders", -1, 5, 25, 230, 80
-    LTEXT "Enable GLSL:", -1, 15, 42, 80, 10
+    GROUPBOX "Efecte de umbrire", -1, 5, 25, 230, 80
+    LTEXT "Activează GLSL:", -1, 15, 42, 80, 10
     COMBOBOX IDC_GLSL, 95, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Maximum GS Level:", -1, 15, 57, 80, 10
+    LTEXT "Nivelul GS maxim:", -1, 15, 57, 80, 10
     COMBOBOX IDC_GSLEVEL, 95, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Maximum PS Level:", -1, 15, 72, 80, 10
+    LTEXT "Nivelul PS maxim:", -1, 15, 72, 80, 10
     COMBOBOX IDC_PSLEVEL, 95, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Maximum VS Level:", -1, 15, 87, 80, 10
+    LTEXT "Nivelul VS maxim:", -1, 15, 87, 80, 10
     COMBOBOX IDC_VSLEVEL, 95, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    GROUPBOX "Rendering", -1, 5, 110, 230, 110
+    GROUPBOX "Randare", -1, 5, 110, 230, 110
     LTEXT "Multisampling:", -1, 15, 127, 80, 10
     COMBOBOX IDC_MULTISAMPLING, 95, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Strict draw ordering:", -1, 15, 142, 80, 10
+    LTEXT "Ordinea strictă de desenare:", -1, 15, 142, 80, 10
     COMBOBOX IDC_STRICTDRAWORDERING, 95, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Offscreen rendering:", -1, 15, 157, 80, 10
+    LTEXT "Randarea extra-ecran:", -1, 15, 157, 80, 10
     COMBOBOX IDC_OFFSCREEN, 95, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Always offscreen:", -1, 15, 172, 72, 10, SS_LEFT
+    LTEXT "Întotdeauna extra-ecran:", -1, 15, 172, 72, 10, SS_LEFT
     COMBOBOX IDC_ALWAYSOFFSCREEN, 95, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "Video memory size:", -1, 15, 187, 72, 10, SS_LEFT
+    LTEXT "Dimensiunea memoriei video:", -1, 15, 187, 72, 10, SS_LEFT
     COMBOBOX IDC_VIDMEMSIZE, 95, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
-    LTEXT "DirectDraw Renderer:", -1, 15, 202, 72, 10, SS_LEFT
+    LTEXT "Randator DirectDraw:", -1, 15, 202, 72, 10, SS_LEFT
     COMBOBOX IDC_DDRENDERER, 95, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
 END
 
diff --git a/dll/directx/wine/dsound/dsound_main.c b/dll/directx/wine/dsound/dsound_main.c
index 43e143276f6..c25418d480b 100644
--- a/dll/directx/wine/dsound/dsound_main.c
+++ b/dll/directx/wine/dsound/dsound_main.c
@@ -150,7 +150,8 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum)
     hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL,
             CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum);
     if(FAILED(hr)){
-        CoUninitialize();
+        if(SUCCEEDED(init_hr))
+            CoUninitialize();
         *devenum = NULL;
         ERR("CoCreateInstance failed: %08x\n", hr);
         return hr;
diff --git a/dll/directx/wine/quartz/enumfilters.c b/dll/directx/wine/quartz/enumfilters.c
index c8efcc9ce87..5d13fa06c4f 100644
--- a/dll/directx/wine/quartz/enumfilters.c
+++ b/dll/directx/wine/quartz/enumfilters.c
@@ -113,6 +113,7 @@ static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface)
     if (!refCount)
     {
         IGraphVersion_Release(This->pVersionSource);
+        CoTaskMemFree(This);
         return 0;
     }
     else
diff --git a/dll/directx/wine/quartz/filesource.c b/dll/directx/wine/quartz/filesource.c
index e63a5f42cdc..46229cc6087 100644
--- a/dll/directx/wine/quartz/filesource.c
+++ b/dll/directx/wine/quartz/filesource.c
@@ -465,7 +465,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii
 static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface)
 {
     AsyncReader *This = impl_from_IBaseFilter(iface);
-    ULONG refCount = BaseFilterImpl_Release(iface);
+    ULONG refCount = InterlockedDecrement(&This->filter.refCount);
     
     TRACE("(%p)->() Release from %d\n", This, refCount + 1);
     
@@ -485,6 +485,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface)
         CoTaskMemFree(This->pszFileName);
         if (This->pmt)
             FreeMediaType(This->pmt);
+        BaseFilter_Destroy(&This->filter);
         CoTaskMemFree(This);
         return 0;
     }
diff --git a/dll/directx/wine/quartz/nullrenderer.c b/dll/directx/wine/quartz/nullrenderer.c
index b70c81df700..432749a976b 100644
--- a/dll/directx/wine/quartz/nullrenderer.c
+++ b/dll/directx/wine/quartz/nullrenderer.c
@@ -108,7 +108,7 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface)
 static ULONG WINAPI NullRendererInner_Release(IUnknown *iface)
 {
     NullRendererImpl *This = impl_from_IUnknown(iface);
-    ULONG refCount = BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface);
+    ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface);
 
     if (!refCount)
     {
diff --git a/dll/directx/wine/quartz/parser.c b/dll/directx/wine/quartz/parser.c
index 8476838984b..705c784577d 100644
--- a/dll/directx/wine/quartz/parser.c
+++ b/dll/directx/wine/quartz/parser.c
@@ -180,6 +180,7 @@ void Parser_Destroy(ParserImpl *This)
     }
 
     CoTaskMemFree(This->ppPins);
+    BaseFilter_Destroy(&This->filter);
 
     TRACE("Destroying parser\n");
     CoTaskMemFree(This);
@@ -188,7 +189,7 @@ void Parser_Destroy(ParserImpl *This)
 ULONG WINAPI Parser_Release(IBaseFilter * iface)
 {
     ParserImpl *This = impl_from_IBaseFilter(iface);
-    ULONG refCount = BaseFilterImpl_Release(iface);
+    ULONG refCount = InterlockedDecrement(&This->filter.refCount);
 
     TRACE("(%p)->() Release from %d\n", This, refCount + 1);
 
diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c
index 201a48dc11f..40a5f30f588 100644
--- a/dll/ntdll/ldr/ldrutils.c
+++ b/dll/ntdll/ldr/ldrutils.c
@@ -2334,7 +2334,7 @@ LdrpGetProcedureAddress(IN PVOID BaseAddress,
         if (!ExportDir)
         {
             DPRINT1("Image %wZ has no exports, but were trying to get procedure %Z. BaseAddress asked 0x%p, got entry BA 0x%p\n",
-                    &LdrEntry->BaseDllName, &Name, BaseAddress, LdrEntry->DllBase);
+                    &LdrEntry->BaseDllName, Name, BaseAddress, LdrEntry->DllBase);
             Status = STATUS_PROCEDURE_NOT_FOUND;
             _SEH2_YIELD(goto Quickie;)
         }
diff --git a/dll/opengl/opengl32/dllmain.c b/dll/opengl/opengl32/dllmain.c
index 9d8f9dfe5a3..9d4ced2114c 100644
--- a/dll/opengl/opengl32/dllmain.c
+++ b/dll/opengl/opengl32/dllmain.c
@@ -19,16 +19,15 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 #endif
     switch ( Reason )
     {
-        /* The DLL is loading due to process
-         * initialization or a call to LoadLibrary.
-         */
         case DLL_PROCESS_ATTACH:
 #ifdef OPENGL32_USE_TLS
             OglTlsIndex = TlsAlloc();
             if(OglTlsIndex == TLS_OUT_OF_INDEXES)
                 return FALSE;
 #endif
-        /* Fall through */
+            /* Initialize Context list */
+            InitializeListHead(&ContextListHead);
+            /* no break */
         case DLL_THREAD_ATTACH:
 #ifdef OPENGL32_USE_TLS
             ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ThreadData));
@@ -45,28 +44,36 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
             break;
 
         case DLL_THREAD_DETACH:
+            /* Set NULL context for this thread */
+            wglMakeCurrent(NULL, NULL);
             /* Clean up */
 #ifdef OPENGL32_USE_TLS
             ThreadData = TlsGetValue(OglTlsIndex);
             if(ThreadData)
                 HeapFree(GetProcessHeap(), 0, ThreadData);
 #else
-            NtCurrentTeb->glTable = NULL;
+            NtCurrentTeb()->glTable = NULL;
 #endif // defined(OPENGL32_USE_TLS)
-            break;
-        
+        break;
         case DLL_PROCESS_DETACH:
             /* Clean up */
+            if (!Reserved)
+            {
+                /* The process is not shutting down: release everything */
+                wglMakeCurrent(NULL, NULL);
+                IntDeleteAllContexts();
+                IntDeleteAllICDs();
+#ifdef OPENGL32_USE_TLS
+                ThreadData = TlsGetValue(OglTlsIndex);
+                if(ThreadData)
+                    HeapFree(GetProcessHeap(), 0, ThreadData);
+#endif
+            }
 #ifdef OPENGL32_USE_TLS
-            ThreadData = TlsGetValue(OglTlsIndex);
-            if(ThreadData)
-                HeapFree(GetProcessHeap(), 0, ThreadData);
             TlsFree(OglTlsIndex);
-#else
-            NtCurrentTeb->glTable = NULL;
-#endif // defined(OPENGL32_USE_TLS)
+#endif
             break;
     }
 
     return TRUE;
-}
\ No newline at end of file
+}
diff --git a/dll/opengl/opengl32/icdload.c b/dll/opengl/opengl32/icdload.c
index f4029cfe651..9068c6f8fb5 100644
--- a/dll/opengl/opengl32/icdload.c
+++ b/dll/opengl/opengl32/icdload.c
@@ -37,6 +37,11 @@ static DHGLRC wglGetDHGLRC(struct wgl_context* context)
     return context->dhglrc;
 }
 
+/* GDI entry points (win32k) */
+extern INT APIENTRY GdiDescribePixelFormat(HDC hdc, INT ipfd, UINT cjpfd, PPIXELFORMATDESCRIPTOR ppfd);
+extern BOOL APIENTRY GdiSetPixelFormat(HDC hdc, INT ipfd);
+extern BOOL APIENTRY GdiSwapBuffers(HDC hdc);
+
 /* Retrieves the ICD data (driver version + relevant DLL entry points) for a device context */
 struct ICD_Data* IntGetIcdData(HDC hdc)
 {
@@ -245,6 +250,17 @@ struct ICD_Data* IntGetIcdData(HDC hdc)
     DRV_LOAD(DrvSwapLayerBuffers);
 #undef DRV_LOAD
     
+    /* Let's see if GDI should handle this instead of the ICD DLL */
+    // FIXME: maybe there is a better way
+    if (GdiDescribePixelFormat(hdc, 0, 0, NULL) != 0)
+    {
+        /* GDI knows what to do with that. Override */
+        TRACE("Forwarding WGL calls to win32k!\n");
+        data->DrvDescribePixelFormat = GdiDescribePixelFormat;
+        data->DrvSetPixelFormat = GdiSetPixelFormat;
+        data->DrvSwapBuffers = GdiSwapBuffers;
+    }
+
     /* Copy the DriverName */
     wcscpy(data->DriverName, DrvInfo.DriverName);
     
@@ -264,4 +280,20 @@ fail:
     FreeLibrary(data->hModule);
     HeapFree(GetProcessHeap(), 0, data);
     return NULL;
-}
\ No newline at end of file
+}
+
+void IntDeleteAllICDs(void)
+{
+    struct ICD_Data* data;
+
+    EnterCriticalSection(&icdload_cs);
+
+    while (ICD_Data_List != NULL)
+    {
+        data = ICD_Data_List;
+        ICD_Data_List = data->next;
+
+        FreeLibrary(data->hModule);
+        HeapFree(GetProcessHeap(), 0, data);
+    }
+}
diff --git a/dll/opengl/opengl32/opengl32.h b/dll/opengl/opengl32/opengl32.h
index ea2ea2c31ec..d26f1071616 100644
--- a/dll/opengl/opengl32/opengl32.h
+++ b/dll/opengl/opengl32/opengl32.h
@@ -21,11 +21,56 @@
 
 #include "icd.h"
 
+/* *$%$£^§! headers inclusion */
+static __inline
+BOOLEAN
+RemoveEntryList(
+    _In_ PLIST_ENTRY Entry)
+{
+    PLIST_ENTRY OldFlink;
+    PLIST_ENTRY OldBlink;
+
+    OldFlink = Entry->Flink;
+    OldBlink = Entry->Blink;
+    OldFlink->Blink = OldBlink;
+    OldBlink->Flink = OldFlink;
+    return (OldFlink == OldBlink);
+}
+
+static __inline
+VOID
+InsertTailList(
+    _In_ PLIST_ENTRY ListHead,
+    _In_ PLIST_ENTRY Entry
+)
+{
+    PLIST_ENTRY OldBlink;
+    OldBlink = ListHead->Blink;
+    Entry->Flink = ListHead;
+    Entry->Blink = OldBlink;
+    OldBlink->Flink = Entry;
+    ListHead->Blink = Entry;
+}
+
+
+static __inline
+VOID
+InitializeListHead(
+    _Inout_ PLIST_ENTRY ListHead
+)
+{
+    ListHead->Flink = ListHead->Blink = ListHead;
+}
+
+extern LIST_ENTRY ContextListHead;
+
 struct wgl_context
 {
     DWORD magic;
     volatile LONG lock;
 
+    LIST_ENTRY ListEntry;
+
     DHGLRC dhglrc;
     struct ICD_Data* icd_data;
     INT pixelformat;
@@ -59,6 +104,10 @@ struct wgl_dc_data
     struct wgl_dc_data* next;
 };
 
+/* Clean up functions */
+void IntDeleteAllContexts(void);
+void IntDeleteAllICDs(void);
+
 #ifdef OPENGL32_USE_TLS
 extern DWORD OglTlsIndex;
 
diff --git a/dll/opengl/opengl32/wgl.c b/dll/opengl/opengl32/wgl.c
index 8da98b9d350..701cc19bbb1 100644
--- a/dll/opengl/opengl32/wgl.c
+++ b/dll/opengl/opengl32/wgl.c
@@ -14,6 +14,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl);
 static CRITICAL_SECTION dc_data_cs = {NULL, -1, 0, 0, 0, 0};
 static struct wgl_dc_data* dc_data_list = NULL;
 
+LIST_ENTRY ContextListHead;
+
 /* FIXME: suboptimal */
 static
 struct wgl_dc_data*
@@ -139,7 +141,11 @@ INT WINAPI wglDescribePixelFormat(HDC hdc, INT format, UINT size, PIXELFORMATDES
     /* Query ICD if needed */
     if(format <= dc_data->nb_icd_formats)
     {
-        if(!dc_data->icd_data->DrvDescribePixelFormat(hdc, format, size, descr))
+        struct ICD_Data* icd_data = dc_data->icd_data;
+        /* SetPixelFormat may have NULLified this */
+        if (!icd_data)
+            icd_data = IntGetIcdData(hdc);
+        if(!icd_data->DrvDescribePixelFormat(hdc, format, size, descr))
         {
             ret = 0;
         }
@@ -174,7 +180,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd)
     if (!count) return 0;
 
     best_format = 0;
-    best.dwFlags = 0;
+    best.dwFlags = PFD_GENERIC_FORMAT;
     best.cAlphaBits = -1;
     best.cColorBits = -1;
     best.cDepthBits = -1;
@@ -329,6 +335,9 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd)
         continue;
 
     found:
+        /* Prefer HW accelerated formats */
+        if ((format.dwFlags & PFD_GENERIC_FORMAT) && !(best.dwFlags & PFD_GENERIC_FORMAT))
+            continue;
         best_format = i;
         best = format;
         bestDBuffer = format.dwFlags & PFD_DOUBLEBUFFER;
@@ -422,6 +431,9 @@ HGLRC WINAPI wglCreateContext(HDC hdc)
     context->pixelformat = dc_data->pixelformat;
     context->thread_id = 0;
     
+    /* Insert into the list */
+    InsertTailList(&ContextListHead, &context->ListEntry);
+
     context->magic = 'GLRC';
     TRACE("Success!\n");
     return (HGLRC)context;
@@ -525,6 +537,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc)
         sw_DeleteContext(context->dhglrc);
     
     context->magic = 0;
+    RemoveEntryList(&context->ListEntry);
     HeapFree(GetProcessHeap(), 0, context);
     
     return TRUE;
@@ -902,3 +915,18 @@ DWORD WINAPI wglSwapMultipleBuffers(UINT count, CONST WGLSWAP * toSwap)
 {
     return 0;
 }
+
+/* Clean up on DLL unload */
+void
+IntDeleteAllContexts(void)
+{
+    struct wgl_context* context;
+    LIST_ENTRY* Entry = ContextListHead.Flink;
+
+    while (Entry != &ContextListHead)
+    {
+        context = CONTAINING_RECORD(Entry, struct wgl_context, ListEntry);
+        wglDeleteContext((HGLRC)context);
+        Entry = ContextListHead.Flink;
+    }
+}
diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c
index c4518ba376e..bd9ae62c9f0 100644
--- a/dll/win32/advapi32/reg/reg.c
+++ b/dll/win32/advapi32/reg/reg.c
@@ -3168,13 +3168,11 @@ RegGetKeySecurity(HKEY hKey,
         return RtlNtStatusToDosError(Status);
     }
 
-#if 0
     Status = NtQuerySecurityObject(KeyHandle,
                                    SecurityInformation,
                                    pSecurityDescriptor,
                                    *lpcbSecurityDescriptor,
                                    lpcbSecurityDescriptor);
-#endif
 
     ClosePredefKey(KeyHandle);
 
@@ -3896,7 +3894,6 @@ RegQueryInfoKeyW(HKEY hKey,
         *lpcbMaxValueLen = FullInfo->MaxValueDataLen;
     }
 
-#if 0
     if (lpcbSecurityDescriptor != NULL)
     {
         Status = NtQuerySecurityObject(KeyHandle,
@@ -3906,7 +3903,7 @@ RegQueryInfoKeyW(HKEY hKey,
                                        NULL,
                                        0,
                                        lpcbSecurityDescriptor);
-        if (!NT_SUCCESS(Status))
+        if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL)
         {
             if (lpClass != NULL)
             {
@@ -3919,7 +3916,6 @@ RegQueryInfoKeyW(HKEY hKey,
             goto Cleanup;
         }
     }
-#endif
 
     if (lpftLastWriteTime != NULL)
     {
diff --git a/dll/win32/cards/cards.h b/dll/win32/cards/cards.h
index bfbcf98eec1..6340ef6af7f 100644
--- a/dll/win32/cards/cards.h
+++ b/dll/win32/cards/cards.h
@@ -41,8 +41,8 @@
 #define ectSAVEEDGESMASK    0x80000000
 
 #if defined(CARDSTYLE_DEFAULT)
-#   define CARD_WIDTH       72  // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX
-#   define CARD_HEIGHT      96
+#   define CARD_WIDTH       72  // The original Microsoft cards are 71px wide, but ours are taken from http://united3dartists.com
+#   define CARD_HEIGHT      112
 #elif defined(CARDSTYLE_BAVARIAN)
 #   define CARD_WIDTH       110
 #   define CARD_HEIGHT      198
diff --git a/dll/win32/cards/res/default/Background_1.bmp b/dll/win32/cards/res/default/Background_1.bmp
index 65cb9323f6f..d6086d1cb2c 100644
Binary files a/dll/win32/cards/res/default/Background_1.bmp and b/dll/win32/cards/res/default/Background_1.bmp differ
diff --git a/dll/win32/cards/res/default/Background_10.bmp b/dll/win32/cards/res/default/Background_10.bmp
index 4484c3530ff..debb83af8c2 100644
Binary files a/dll/win32/cards/res/default/Background_10.bmp and b/dll/win32/cards/res/default/Background_10.bmp differ
diff --git a/dll/win32/cards/res/default/Background_11.bmp b/dll/win32/cards/res/default/Background_11.bmp
index 6e73bcadc1f..1bf424904b7 100644
Binary files a/dll/win32/cards/res/default/Background_11.bmp and b/dll/win32/cards/res/default/Background_11.bmp differ
diff --git a/dll/win32/cards/res/default/Background_12.bmp b/dll/win32/cards/res/default/Background_12.bmp
index 6ce31dfbfe3..b198f66af41 100644
Binary files a/dll/win32/cards/res/default/Background_12.bmp and b/dll/win32/cards/res/default/Background_12.bmp differ
diff --git a/dll/win32/cards/res/default/Background_2.bmp b/dll/win32/cards/res/default/Background_2.bmp
index 042d7d42522..d116e50fff9 100644
Binary files a/dll/win32/cards/res/default/Background_2.bmp and b/dll/win32/cards/res/default/Background_2.bmp differ
diff --git a/dll/win32/cards/res/default/Background_3.bmp b/dll/win32/cards/res/default/Background_3.bmp
index d0ded932761..9e89c4bf8b3 100644
Binary files a/dll/win32/cards/res/default/Background_3.bmp and b/dll/win32/cards/res/default/Background_3.bmp differ
diff --git a/dll/win32/cards/res/default/Background_4.bmp b/dll/win32/cards/res/default/Background_4.bmp
index 57d6039366a..8a1046e9af0 100644
Binary files a/dll/win32/cards/res/default/Background_4.bmp and b/dll/win32/cards/res/default/Background_4.bmp differ
diff --git a/dll/win32/cards/res/default/Background_5.bmp b/dll/win32/cards/res/default/Background_5.bmp
index 6ac051ab638..8866d892d9b 100644
Binary files a/dll/win32/cards/res/default/Background_5.bmp and b/dll/win32/cards/res/default/Background_5.bmp differ
diff --git a/dll/win32/cards/res/default/Background_6.bmp b/dll/win32/cards/res/default/Background_6.bmp
index 9266d4f6560..694b5c31786 100644
Binary files a/dll/win32/cards/res/default/Background_6.bmp and b/dll/win32/cards/res/default/Background_6.bmp differ
diff --git a/dll/win32/cards/res/default/Background_7.bmp b/dll/win32/cards/res/default/Background_7.bmp
index 0a989092aee..26f4c2dc7f4 100644
Binary files a/dll/win32/cards/res/default/Background_7.bmp and b/dll/win32/cards/res/default/Background_7.bmp differ
diff --git a/dll/win32/cards/res/default/Background_8.bmp b/dll/win32/cards/res/default/Background_8.bmp
index 7bd35e19f79..57c9816ebe4 100644
Binary files a/dll/win32/cards/res/default/Background_8.bmp and b/dll/win32/cards/res/default/Background_8.bmp differ
diff --git a/dll/win32/cards/res/default/Background_9.bmp b/dll/win32/cards/res/default/Background_9.bmp
index 4c4fde84af8..f25fa905125 100644
Binary files a/dll/win32/cards/res/default/Background_9.bmp and b/dll/win32/cards/res/default/Background_9.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Ace.bmp b/dll/win32/cards/res/default/Clubs_Ace.bmp
index 8bbbc98f1c3..796bfc35bd4 100644
Binary files a/dll/win32/cards/res/default/Clubs_Ace.bmp and b/dll/win32/cards/res/default/Clubs_Ace.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Eight.bmp b/dll/win32/cards/res/default/Clubs_Eight.bmp
index df8e9f75f47..b229e5422a0 100644
Binary files a/dll/win32/cards/res/default/Clubs_Eight.bmp and b/dll/win32/cards/res/default/Clubs_Eight.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Five.bmp b/dll/win32/cards/res/default/Clubs_Five.bmp
index 42fd106774c..24e06a68143 100644
Binary files a/dll/win32/cards/res/default/Clubs_Five.bmp and b/dll/win32/cards/res/default/Clubs_Five.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Four.bmp b/dll/win32/cards/res/default/Clubs_Four.bmp
index 0403a293a2a..80a90555dfe 100644
Binary files a/dll/win32/cards/res/default/Clubs_Four.bmp and b/dll/win32/cards/res/default/Clubs_Four.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Jack.bmp b/dll/win32/cards/res/default/Clubs_Jack.bmp
index 496e75244de..5bf64eec8c1 100644
Binary files a/dll/win32/cards/res/default/Clubs_Jack.bmp and b/dll/win32/cards/res/default/Clubs_Jack.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_King.bmp b/dll/win32/cards/res/default/Clubs_King.bmp
index b29e0231b92..4873f868ee1 100644
Binary files a/dll/win32/cards/res/default/Clubs_King.bmp and b/dll/win32/cards/res/default/Clubs_King.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Nine.bmp b/dll/win32/cards/res/default/Clubs_Nine.bmp
index f97410e0bb0..ee440b0643d 100644
Binary files a/dll/win32/cards/res/default/Clubs_Nine.bmp and b/dll/win32/cards/res/default/Clubs_Nine.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Queen.bmp b/dll/win32/cards/res/default/Clubs_Queen.bmp
index ff4ef71f6a8..00c6c5adc1d 100644
Binary files a/dll/win32/cards/res/default/Clubs_Queen.bmp and b/dll/win32/cards/res/default/Clubs_Queen.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Seven.bmp b/dll/win32/cards/res/default/Clubs_Seven.bmp
index 1eff56c72ed..20cc1cc3bf7 100644
Binary files a/dll/win32/cards/res/default/Clubs_Seven.bmp and b/dll/win32/cards/res/default/Clubs_Seven.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Six.bmp b/dll/win32/cards/res/default/Clubs_Six.bmp
index e7acccc5737..0a49309b4bb 100644
Binary files a/dll/win32/cards/res/default/Clubs_Six.bmp and b/dll/win32/cards/res/default/Clubs_Six.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Ten.bmp b/dll/win32/cards/res/default/Clubs_Ten.bmp
index 271e2a28ffe..1c68ad07b81 100644
Binary files a/dll/win32/cards/res/default/Clubs_Ten.bmp and b/dll/win32/cards/res/default/Clubs_Ten.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Three.bmp b/dll/win32/cards/res/default/Clubs_Three.bmp
index 74e433a353d..04e1af069e4 100644
Binary files a/dll/win32/cards/res/default/Clubs_Three.bmp and b/dll/win32/cards/res/default/Clubs_Three.bmp differ
diff --git a/dll/win32/cards/res/default/Clubs_Two.bmp b/dll/win32/cards/res/default/Clubs_Two.bmp
index 5e68611c876..d5ea09d88d0 100644
Binary files a/dll/win32/cards/res/default/Clubs_Two.bmp and b/dll/win32/cards/res/default/Clubs_Two.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Ace.bmp b/dll/win32/cards/res/default/Diamonds_Ace.bmp
index 396c47f91a8..b6ddd1f62bf 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Ace.bmp and b/dll/win32/cards/res/default/Diamonds_Ace.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Eight.bmp b/dll/win32/cards/res/default/Diamonds_Eight.bmp
index 5879b4fa7ba..4ef1c57f89a 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Eight.bmp and b/dll/win32/cards/res/default/Diamonds_Eight.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Five.bmp b/dll/win32/cards/res/default/Diamonds_Five.bmp
index 63eb5d03c7a..50ed7940ed9 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Five.bmp and b/dll/win32/cards/res/default/Diamonds_Five.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Four.bmp b/dll/win32/cards/res/default/Diamonds_Four.bmp
index 3568d40e31f..071b2cd02ce 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Four.bmp and b/dll/win32/cards/res/default/Diamonds_Four.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Jack.bmp b/dll/win32/cards/res/default/Diamonds_Jack.bmp
index a69627d7469..c4295e44482 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Jack.bmp and b/dll/win32/cards/res/default/Diamonds_Jack.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_King.bmp b/dll/win32/cards/res/default/Diamonds_King.bmp
index 36ce862b80e..324b9fc3b4c 100644
Binary files a/dll/win32/cards/res/default/Diamonds_King.bmp and b/dll/win32/cards/res/default/Diamonds_King.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Nine.bmp b/dll/win32/cards/res/default/Diamonds_Nine.bmp
index cdeefe36231..a3e0970c979 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Nine.bmp and b/dll/win32/cards/res/default/Diamonds_Nine.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Queen.bmp b/dll/win32/cards/res/default/Diamonds_Queen.bmp
index 0a3f72d27ff..c4b9a1ac520 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Queen.bmp and b/dll/win32/cards/res/default/Diamonds_Queen.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Seven.bmp b/dll/win32/cards/res/default/Diamonds_Seven.bmp
index 9f911f02914..2efe38859e2 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Seven.bmp and b/dll/win32/cards/res/default/Diamonds_Seven.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Six.bmp b/dll/win32/cards/res/default/Diamonds_Six.bmp
index 3a99938eeb8..19aded5ecbf 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Six.bmp and b/dll/win32/cards/res/default/Diamonds_Six.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Ten.bmp b/dll/win32/cards/res/default/Diamonds_Ten.bmp
index adf1ff8db22..d50af0e6d1d 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Ten.bmp and b/dll/win32/cards/res/default/Diamonds_Ten.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Three.bmp b/dll/win32/cards/res/default/Diamonds_Three.bmp
index 07d2e3ddd1a..4dfc65bcdcd 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Three.bmp and b/dll/win32/cards/res/default/Diamonds_Three.bmp differ
diff --git a/dll/win32/cards/res/default/Diamonds_Two.bmp b/dll/win32/cards/res/default/Diamonds_Two.bmp
index 89fa636bcba..38b3f326025 100644
Binary files a/dll/win32/cards/res/default/Diamonds_Two.bmp and b/dll/win32/cards/res/default/Diamonds_Two.bmp differ
diff --git a/dll/win32/cards/res/default/FreeCard.bmp b/dll/win32/cards/res/default/FreeCard.bmp
index 04f677d2169..d15c321f6b5 100644
Binary files a/dll/win32/cards/res/default/FreeCard.bmp and b/dll/win32/cards/res/default/FreeCard.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Ace.bmp b/dll/win32/cards/res/default/Hearts_Ace.bmp
index 11248fa829d..ea01402bf6d 100644
Binary files a/dll/win32/cards/res/default/Hearts_Ace.bmp and b/dll/win32/cards/res/default/Hearts_Ace.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Eight.bmp b/dll/win32/cards/res/default/Hearts_Eight.bmp
index 96ceaee36b5..d1df40c02d9 100644
Binary files a/dll/win32/cards/res/default/Hearts_Eight.bmp and b/dll/win32/cards/res/default/Hearts_Eight.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Five.bmp b/dll/win32/cards/res/default/Hearts_Five.bmp
index ba688d5d511..637511caa1b 100644
Binary files a/dll/win32/cards/res/default/Hearts_Five.bmp and b/dll/win32/cards/res/default/Hearts_Five.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Four.bmp b/dll/win32/cards/res/default/Hearts_Four.bmp
index 57cf96079e6..4744ad57b1a 100644
Binary files a/dll/win32/cards/res/default/Hearts_Four.bmp and b/dll/win32/cards/res/default/Hearts_Four.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Jack.bmp b/dll/win32/cards/res/default/Hearts_Jack.bmp
index 42e40475d54..abba288ec0e 100644
Binary files a/dll/win32/cards/res/default/Hearts_Jack.bmp and b/dll/win32/cards/res/default/Hearts_Jack.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_King.bmp b/dll/win32/cards/res/default/Hearts_King.bmp
index 3de0a265b95..36f16979f8d 100644
Binary files a/dll/win32/cards/res/default/Hearts_King.bmp and b/dll/win32/cards/res/default/Hearts_King.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Nine.bmp b/dll/win32/cards/res/default/Hearts_Nine.bmp
index c82749cdbe1..6012df423bb 100644
Binary files a/dll/win32/cards/res/default/Hearts_Nine.bmp and b/dll/win32/cards/res/default/Hearts_Nine.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Queen.bmp b/dll/win32/cards/res/default/Hearts_Queen.bmp
index 87391005117..2388e132c65 100644
Binary files a/dll/win32/cards/res/default/Hearts_Queen.bmp and b/dll/win32/cards/res/default/Hearts_Queen.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Seven.bmp b/dll/win32/cards/res/default/Hearts_Seven.bmp
index 08dcf34dc98..c003b0070a8 100644
Binary files a/dll/win32/cards/res/default/Hearts_Seven.bmp and b/dll/win32/cards/res/default/Hearts_Seven.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Six.bmp b/dll/win32/cards/res/default/Hearts_Six.bmp
index 7baff3ff8a0..9191f4e9c46 100644
Binary files a/dll/win32/cards/res/default/Hearts_Six.bmp and b/dll/win32/cards/res/default/Hearts_Six.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Ten.bmp b/dll/win32/cards/res/default/Hearts_Ten.bmp
index cc4ed36aa18..fecefaea352 100644
Binary files a/dll/win32/cards/res/default/Hearts_Ten.bmp and b/dll/win32/cards/res/default/Hearts_Ten.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Three.bmp b/dll/win32/cards/res/default/Hearts_Three.bmp
index 276c8598045..6e0db7d73a6 100644
Binary files a/dll/win32/cards/res/default/Hearts_Three.bmp and b/dll/win32/cards/res/default/Hearts_Three.bmp differ
diff --git a/dll/win32/cards/res/default/Hearts_Two.bmp b/dll/win32/cards/res/default/Hearts_Two.bmp
index fbb0743527a..384c87ddf36 100644
Binary files a/dll/win32/cards/res/default/Hearts_Two.bmp and b/dll/win32/cards/res/default/Hearts_Two.bmp differ
diff --git a/dll/win32/cards/res/default/Joker.bmp b/dll/win32/cards/res/default/Joker.bmp
index a8873d1df87..40a3adf2a62 100644
Binary files a/dll/win32/cards/res/default/Joker.bmp and b/dll/win32/cards/res/default/Joker.bmp differ
diff --git a/dll/win32/cards/res/default/OSign.bmp b/dll/win32/cards/res/default/OSign.bmp
index b364d01afdf..7ecfbf32165 100644
Binary files a/dll/win32/cards/res/default/OSign.bmp and b/dll/win32/cards/res/default/OSign.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Ace.bmp b/dll/win32/cards/res/default/Spades_Ace.bmp
index 12356c4ee31..3050eb6b9e2 100644
Binary files a/dll/win32/cards/res/default/Spades_Ace.bmp and b/dll/win32/cards/res/default/Spades_Ace.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Eight.bmp b/dll/win32/cards/res/default/Spades_Eight.bmp
index 1ea2fc03fbc..2ac0134e04b 100644
Binary files a/dll/win32/cards/res/default/Spades_Eight.bmp and b/dll/win32/cards/res/default/Spades_Eight.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Five.bmp b/dll/win32/cards/res/default/Spades_Five.bmp
index c719604ba83..ded2b1b7a85 100644
Binary files a/dll/win32/cards/res/default/Spades_Five.bmp and b/dll/win32/cards/res/default/Spades_Five.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Four.bmp b/dll/win32/cards/res/default/Spades_Four.bmp
index ecd14ff01c5..bd053291a3f 100644
Binary files a/dll/win32/cards/res/default/Spades_Four.bmp and b/dll/win32/cards/res/default/Spades_Four.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Jack.bmp b/dll/win32/cards/res/default/Spades_Jack.bmp
index 573195a8b87..ef75244e125 100644
Binary files a/dll/win32/cards/res/default/Spades_Jack.bmp and b/dll/win32/cards/res/default/Spades_Jack.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_King.bmp b/dll/win32/cards/res/default/Spades_King.bmp
index 7f5e62dc33c..6787367f948 100644
Binary files a/dll/win32/cards/res/default/Spades_King.bmp and b/dll/win32/cards/res/default/Spades_King.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Nine.bmp b/dll/win32/cards/res/default/Spades_Nine.bmp
index 9e8a5a43c5a..b47fdcd2012 100644
Binary files a/dll/win32/cards/res/default/Spades_Nine.bmp and b/dll/win32/cards/res/default/Spades_Nine.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Queen.bmp b/dll/win32/cards/res/default/Spades_Queen.bmp
index cfe6c5b5196..906e53ae0ec 100644
Binary files a/dll/win32/cards/res/default/Spades_Queen.bmp and b/dll/win32/cards/res/default/Spades_Queen.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Seven.bmp b/dll/win32/cards/res/default/Spades_Seven.bmp
index d939f54d317..74d2f9a064c 100644
Binary files a/dll/win32/cards/res/default/Spades_Seven.bmp and b/dll/win32/cards/res/default/Spades_Seven.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Six.bmp b/dll/win32/cards/res/default/Spades_Six.bmp
index e3188f76694..f97061a7109 100644
Binary files a/dll/win32/cards/res/default/Spades_Six.bmp and b/dll/win32/cards/res/default/Spades_Six.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Ten.bmp b/dll/win32/cards/res/default/Spades_Ten.bmp
index e178860794f..401adfb89b5 100644
Binary files a/dll/win32/cards/res/default/Spades_Ten.bmp and b/dll/win32/cards/res/default/Spades_Ten.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Three.bmp b/dll/win32/cards/res/default/Spades_Three.bmp
index d4de0fc690c..690de8a9ed5 100644
Binary files a/dll/win32/cards/res/default/Spades_Three.bmp and b/dll/win32/cards/res/default/Spades_Three.bmp differ
diff --git a/dll/win32/cards/res/default/Spades_Two.bmp b/dll/win32/cards/res/default/Spades_Two.bmp
index bf0f5c99aaa..5938cd05534 100644
Binary files a/dll/win32/cards/res/default/Spades_Two.bmp and b/dll/win32/cards/res/default/Spades_Two.bmp differ
diff --git a/dll/win32/cards/res/default/XSign.bmp b/dll/win32/cards/res/default/XSign.bmp
index 63ff5a2a837..97b2a4e7407 100644
Binary files a/dll/win32/cards/res/default/XSign.bmp and b/dll/win32/cards/res/default/XSign.bmp differ
diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c
index 8293604c078..3da57d00b21 100644
--- a/dll/win32/msgina/gui.c
+++ b/dll/win32/msgina/gui.c
@@ -9,6 +9,7 @@
 
 #include <wingdi.h>
 #include <winnls.h>
+#include <winreg.h>
 
 typedef struct _DISPLAYSTATUSMSG
 {
@@ -20,6 +21,13 @@ typedef struct _DISPLAYSTATUSMSG
     HANDLE StartupEvent;
 } DISPLAYSTATUSMSG, *PDISPLAYSTATUSMSG;
 
+typedef struct _LEGALNOTICEDATA
+{
+    LPWSTR pszCaption;
+    LPWSTR pszText;
+} LEGALNOTICEDATA, *PLEGALNOTICEDATA;
+
+
 static BOOL
 GUIInitialize(
     IN OUT PGINA_CONTEXT pgContext)
@@ -1162,14 +1170,90 @@ LoggedOutWindowProc(
     return FALSE;
 }
 
+
+static
+INT_PTR
+CALLBACK
+LegalNoticeDialogProc(
+    IN HWND hwndDlg,
+    IN UINT uMsg,
+    IN WPARAM wParam,
+    IN LPARAM lParam)
+{
+    PLEGALNOTICEDATA pLegalNotice;
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+            pLegalNotice = (PLEGALNOTICEDATA)lParam;
+            SetWindowTextW(hwndDlg, pLegalNotice->pszCaption);
+            SetDlgItemTextW(hwndDlg, IDC_LEGALNOTICE_TEXT, pLegalNotice->pszText);
+            return TRUE;
+
+        case WM_COMMAND:
+            switch (LOWORD(wParam))
+            {
+                case IDOK:
+                    EndDialog(hwndDlg, 0);
+                    return TRUE;
+
+                case IDCANCEL:
+                    EndDialog(hwndDlg, 0);
+                    return TRUE;
+            }
+            break;
+    }
+
+    return FALSE;
+}
+
+
 static INT
 GUILoggedOutSAS(
     IN OUT PGINA_CONTEXT pgContext)
 {
+    LEGALNOTICEDATA LegalNotice = {NULL, NULL};
+    HKEY hKey = NULL;
+    LONG rc;
     int result;
 
     TRACE("GUILoggedOutSAS()\n");
 
+    rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                       L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon",
+                       0,
+                       KEY_QUERY_VALUE,
+                       &hKey);
+    if (rc == ERROR_SUCCESS)
+    {
+        ReadRegSzValue(hKey,
+                       L"LegalNoticeCaption",
+                       &LegalNotice.pszCaption);
+
+        ReadRegSzValue(hKey,
+                       L"LegalNoticeText",
+                       &LegalNotice.pszText);
+
+        RegCloseKey(hKey);
+    }
+
+    if (LegalNotice.pszCaption != NULL && wcslen(LegalNotice.pszCaption) != 0 &&
+        LegalNotice.pszText != NULL && wcslen(LegalNotice.pszText) != 0)
+    {
+        pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx,
+                                                pgContext->hDllInstance,
+                                                MAKEINTRESOURCEW(IDD_LEGALNOTICE_DLG),
+                                                GetDesktopWindow(),
+                                                LegalNoticeDialogProc,
+                                                (LPARAM)&LegalNotice);
+    }
+
+    if (LegalNotice.pszCaption != NULL)
+        HeapFree(GetProcessHeap(), 0, LegalNotice.pszCaption);
+
+    if (LegalNotice.pszText != NULL)
+        HeapFree(GetProcessHeap(), 0, LegalNotice.pszText);
+
     result = pgContext->pWlxFuncs->WlxDialogBoxParam(
         pgContext->hWlx,
         pgContext->hDllInstance,
diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc
index cee7c055f8e..48c47163834 100644
--- a/dll/win32/msgina/lang/bg-BG.rc
+++ b/dll/win32/msgina/lang/bg-BG.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Отказ", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Здравейте!"
diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc
index 05c71e7f97c..32f720f679e 100644
--- a/dll/win32/msgina/lang/cs-CZ.rc
+++ b/dll/win32/msgina/lang/cs-CZ.rc
@@ -133,6 +133,15 @@ BEGIN
     PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Vítejte!"
diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc
index 82d9a6a236c..05323c37dd5 100644
--- a/dll/win32/msgina/lang/de-DE.rc
+++ b/dll/win32/msgina/lang/de-DE.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Willkommen!"
diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc
index c8828ca2313..3c9f78ae8ce 100644
--- a/dll/win32/msgina/lang/en-US.rc
+++ b/dll/win32/msgina/lang/en-US.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Welcome!"
diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc
index 45a0f3dd9eb..d010c77e748 100644
--- a/dll/win32/msgina/lang/es-ES.rc
+++ b/dll/win32/msgina/lang/es-ES.rc
@@ -130,6 +130,15 @@ BEGIN
     PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "¡Bienvenido!"
diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc
index 4f0d3242a07..e478d64e797 100644
--- a/dll/win32/msgina/lang/fr-FR.rc
+++ b/dll/win32/msgina/lang/fr-FR.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Bienvenue!"
diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc
index bb76396143e..b9c10a38491 100644
--- a/dll/win32/msgina/lang/he-IL.rc
+++ b/dll/win32/msgina/lang/he-IL.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "ברוכים הבאים!"
diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc
index 6e33eb6a7fe..a1ca38456bb 100644
--- a/dll/win32/msgina/lang/id-ID.rc
+++ b/dll/win32/msgina/lang/id-ID.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Selamat datang!"
diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc
index 30a3facf970..8367dbdff4e 100644
--- a/dll/win32/msgina/lang/it-IT.rc
+++ b/dll/win32/msgina/lang/it-IT.rc
@@ -137,6 +137,15 @@ BEGIN
     PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Benvenuti!"
diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc
index 118f1b10ce8..81b361eef1a 100644
--- a/dll/win32/msgina/lang/ja-JP.rc
+++ b/dll/win32/msgina/lang/ja-JP.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "キャンセル", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "ようこそ!"
diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc
index 062cc610a9b..7e7f6e1458c 100644
--- a/dll/win32/msgina/lang/no-NO.rc
+++ b/dll/win32/msgina/lang/no-NO.rc
@@ -128,6 +128,15 @@ BEGIN
     PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Velkommen!"
diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc
index 986522e6d97..16e357f36c7 100644
--- a/dll/win32/msgina/lang/pl-PL.rc
+++ b/dll/win32/msgina/lang/pl-PL.rc
@@ -138,6 +138,15 @@ BEGIN
     PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Witaj!"
diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc
index 853a394f80a..fc0d12b4463 100644
--- a/dll/win32/msgina/lang/ro-RO.rc
+++ b/dll/win32/msgina/lang/ro-RO.rc
@@ -1,4 +1,11 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: ReactOS msgina.dll
+ * FILE:    dll/win32/msgina/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for ReactOS Logon GINA DLL
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -130,6 +137,15 @@ BEGIN
     PUSHBUTTON "A&nulează", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "Î&nchide", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Bun venit!"
@@ -150,8 +166,8 @@ BEGIN
     IDS_LOGONTITLE "Mesaj de autentificare"
     IDS_LOGONWRONGUSERORPWD "Sistemul nu vă poate autentifica. Asigurați-vă că numele și domeniul sunt corecte apoi tastați din nou parola. În parolă se face distincție între majuscule și minuscule."
     IDS_LOGONUSERDISABLED "Contul dumneavoastră a fost dezactivat. Contactați administratorul de sistem."
-    IDS_PASSWORDMUSTCHANGE "You are required to change your password at first logon."
-    IDS_PASSWORDEXPIRED "Your password has expired and must be changed."
+    IDS_PASSWORDMUSTCHANGE "Este imperativ să vă schimbați parola la prima autentificare."
+    IDS_PASSWORDEXPIRED "Parola v-a expirat și trebuie schimbată."
 END
 
 /* Shutdown Dialog Strings */
diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc
index da9d9756297..10876beebd8 100644
--- a/dll/win32/msgina/lang/ru-RU.rc
+++ b/dll/win32/msgina/lang/ru-RU.rc
@@ -130,6 +130,15 @@ BEGIN
     PUSHBUTTON "Отмена", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Добро пожаловать!"
diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc
index 3b624ab09a1..cd312152239 100644
--- a/dll/win32/msgina/lang/sk-SK.rc
+++ b/dll/win32/msgina/lang/sk-SK.rc
@@ -133,6 +133,15 @@ BEGIN
     PUSHBUTTON "Zrušiť", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Vitajte!"
diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc
index 17257a22837..361616df207 100644
--- a/dll/win32/msgina/lang/sq-AL.rc
+++ b/dll/win32/msgina/lang/sq-AL.rc
@@ -131,6 +131,15 @@ BEGIN
     PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Mirëseerdhët!"
diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc
index b6e731a5353..f030a8d71eb 100644
--- a/dll/win32/msgina/lang/tr-TR.rc
+++ b/dll/win32/msgina/lang/tr-TR.rc
@@ -130,6 +130,15 @@ BEGIN
     PUSHBUTTON "İptal", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Hoşgeldiniz!"
diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc
index 191b3053dd2..3761b450a05 100644
--- a/dll/win32/msgina/lang/uk-UA.rc
+++ b/dll/win32/msgina/lang/uk-UA.rc
@@ -136,6 +136,15 @@ BEGIN
     PUSHBUTTON "Скасувати", IDCANCEL, 204, 122, 55, 14
 END
 
+IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200
+STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+    EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14
+END
+
 STRINGTABLE
 BEGIN
     IDS_LOGGEDOUTSAS "Ласкаво просимо!"
diff --git a/dll/win32/msgina/msgina.c b/dll/win32/msgina/msgina.c
index 4f5d10cdd2f..6974725befc 100644
--- a/dll/win32/msgina/msgina.c
+++ b/dll/win32/msgina/msgina.c
@@ -57,10 +57,10 @@ WlxNegotiate(
     return TRUE;
 }
 
-static LONG
-ReadRegSzKey(
+LONG
+ReadRegSzValue(
     IN HKEY hKey,
-    IN LPCWSTR pszKey,
+    IN LPCWSTR pszValue,
     OUT LPWSTR* pValue)
 {
     LONG rc;
@@ -72,7 +72,7 @@ ReadRegSzKey(
         return ERROR_INVALID_PARAMETER;
 
     *pValue = NULL;
-    rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, NULL, &cbData);
+    rc = RegQueryValueExW(hKey, pszValue, NULL, &dwType, NULL, &cbData);
     if (rc != ERROR_SUCCESS)
         return rc;
     if (dwType != REG_SZ)
@@ -80,7 +80,7 @@ ReadRegSzKey(
     Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR));
     if (!Value)
         return ERROR_NOT_ENOUGH_MEMORY;
-    rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData);
+    rc = RegQueryValueExW(hKey, pszValue, NULL, NULL, (LPBYTE)Value, &cbData);
     if (rc != ERROR_SUCCESS)
     {
         HeapFree(GetProcessHeap(), 0, Value);
@@ -94,9 +94,9 @@ ReadRegSzKey(
 }
 
 static LONG
-ReadRegDwordKey(
+ReadRegDwordValue(
     IN HKEY hKey,
-    IN LPCWSTR pszKey,
+    IN LPCWSTR pszValue,
     OUT LPDWORD pValue)
 {
     LONG rc;
@@ -108,7 +108,7 @@ ReadRegDwordKey(
         return ERROR_INVALID_PARAMETER;
 
     cbData = sizeof(DWORD);
-    rc = RegQueryValueExW(hKey, pszKey, NULL, &dwType, (LPBYTE)&dwValue, &cbData);
+    rc = RegQueryValueExW(hKey, pszValue, NULL, &dwType, (LPBYTE)&dwValue, &cbData);
     if (rc == ERROR_SUCCESS && dwType == REG_DWORD)
         *pValue = dwValue;
 
@@ -131,7 +131,7 @@ ChooseGinaUI(VOID)
         KEY_QUERY_VALUE,
         &ControlKey);
 
-    rc = ReadRegSzKey(ControlKey, L"SystemStartOptions", &SystemStartOptions);
+    rc = ReadRegSzValue(ControlKey, L"SystemStartOptions", &SystemStartOptions);
     if (rc != ERROR_SUCCESS)
         goto cleanup;
 
@@ -186,9 +186,9 @@ GetRegistrySettings(PGINA_CONTEXT pgContext)
         return FALSE;
     }
 
-    rc = ReadRegSzKey(hKey,
-                      L"AutoAdminLogon",
-                      &lpAutoAdminLogon);
+    rc = ReadRegSzValue(hKey,
+                        L"AutoAdminLogon",
+                        &lpAutoAdminLogon);
     if (rc == ERROR_SUCCESS)
     {
         if (wcscmp(lpAutoAdminLogon, L"1") == 0)
@@ -197,9 +197,9 @@ GetRegistrySettings(PGINA_CONTEXT pgContext)
 
     TRACE("bAutoAdminLogon: %s\n", pgContext->bAutoAdminLogon ? "TRUE" : "FALSE");
 
-    rc = ReadRegDwordKey(hKey,
-                         L"DisableCAD",
-                         &dwDisableCAD);
+    rc = ReadRegDwordValue(hKey,
+                           L"DisableCAD",
+                           &dwDisableCAD);
     if (rc == ERROR_SUCCESS)
     {
         if (dwDisableCAD != 0)
@@ -209,18 +209,18 @@ GetRegistrySettings(PGINA_CONTEXT pgContext)
     TRACE("bDisableCAD: %s\n", pgContext->bDisableCAD ? "TRUE" : "FALSE");
 
     pgContext->bShutdownWithoutLogon = TRUE;
-    rc = ReadRegSzKey(hKey,
-                      L"ShutdownWithoutLogon",
-                      &lpShutdownWithoutLogon);
+    rc = ReadRegSzValue(hKey,
+                        L"ShutdownWithoutLogon",
+                        &lpShutdownWithoutLogon);
     if (rc == ERROR_SUCCESS)
     {
         if (wcscmp(lpShutdownWithoutLogon, L"0") == 0)
             pgContext->bShutdownWithoutLogon = FALSE;
     }
 
-    rc = ReadRegSzKey(hKey,
-                      L"DontDisplayLastUserName",
-                      &lpDontDisplayLastUserName);
+    rc = ReadRegSzValue(hKey,
+                        L"DontDisplayLastUserName",
+                        &lpDontDisplayLastUserName);
     if (rc == ERROR_SUCCESS)
     {
         if (wcscmp(lpDontDisplayLastUserName, L"1") == 0)
@@ -856,19 +856,19 @@ DoAutoLogon(
         /* Set it by default to disabled, we might reenable it again later */
         pgContext->AutoLogonState = AUTOLOGON_DISABLED;
 
-        rc = ReadRegSzKey(WinLogonKey, L"AutoAdminLogon", &AutoLogon);
+        rc = ReadRegSzValue(WinLogonKey, L"AutoAdminLogon", &AutoLogon);
         if (rc != ERROR_SUCCESS)
             goto cleanup;
         if (wcscmp(AutoLogon, L"1") != 0)
             goto cleanup;
 
-        rc = ReadRegSzKey(WinLogonKey, L"AutoLogonCount", &AutoCount);
+        rc = ReadRegSzValue(WinLogonKey, L"AutoLogonCount", &AutoCount);
         if (rc == ERROR_SUCCESS && wcscmp(AutoCount, L"0") == 0)
             goto cleanup;
         else if (rc != ERROR_FILE_NOT_FOUND)
             goto cleanup;
 
-        rc = ReadRegSzKey(WinLogonKey, L"IgnoreShiftOverride", &UserName);
+        rc = ReadRegSzValue(WinLogonKey, L"IgnoreShiftOverride", &UserName);
         if (rc == ERROR_SUCCESS)
         {
             if (wcscmp(AutoLogon, L"1") != 0 && GetKeyState(VK_SHIFT) < 0)
@@ -887,13 +887,13 @@ DoAutoLogon(
     {
         pgContext->AutoLogonState = AUTOLOGON_DISABLED;
 
-        rc = ReadRegSzKey(WinLogonKey, L"DefaultUserName", &UserName);
+        rc = ReadRegSzValue(WinLogonKey, L"DefaultUserName", &UserName);
         if (rc != ERROR_SUCCESS)
             goto cleanup;
-        rc = ReadRegSzKey(WinLogonKey, L"DefaultDomain", &Domain);
+        rc = ReadRegSzValue(WinLogonKey, L"DefaultDomain", &Domain);
         if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND)
             goto cleanup;
-        rc = ReadRegSzKey(WinLogonKey, L"DefaultPassword", &Password);
+        rc = ReadRegSzValue(WinLogonKey, L"DefaultPassword", &Password);
         if (rc != ERROR_SUCCESS)
             goto cleanup;
 
diff --git a/dll/win32/msgina/msgina.h b/dll/win32/msgina/msgina.h
index eaaf68d0c43..97deda195c0 100644
--- a/dll/win32/msgina/msgina.h
+++ b/dll/win32/msgina/msgina.h
@@ -97,6 +97,12 @@ MyLogonUser(
 
 /* msgina.c */
 
+LONG
+ReadRegSzValue(
+    IN HKEY hKey,
+    IN LPCWSTR pszValue,
+    OUT LPWSTR *pValue);
+
 BOOL
 DoAdminUnlock(
     IN PGINA_CONTEXT pgContext,
diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h
index cee14bea090..8ac76355743 100644
--- a/dll/win32/msgina/resource.h
+++ b/dll/win32/msgina/resource.h
@@ -34,6 +34,10 @@
 
 #define IDD_LOGOFF_DLG         107
 
+#define IDD_LEGALNOTICE_DLG      1018
+#define IDC_LEGALNOTICE_TEXT     1019
+
+
 #define IDI_ROSLOGO         20000
 #define IDI_SHELL_SHUTDOWN  20001
 
diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc
index a398e3c1024..cce0c8165f1 100644
--- a/dll/win32/newdev/lang/ro-RO.rc
+++ b/dll/win32/newdev/lang/ro-RO.rc
@@ -1,10 +1,17 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: New device installer (newdev.dll)
+ * FILE:    dll/win32/newdev/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for new device installer
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Bun venit!", IDC_WELCOMETITLE, 120, 8, 195, 24
@@ -18,7 +25,7 @@ END
 
 IDD_NODRIVER DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Instalarea a eșuat", IDC_FINISHTITLE, 120, 8, 195, 24
@@ -29,7 +36,7 @@ END
 
 IDD_INSTALLFAILED DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Instalarea a eșuat", IDC_FINISHTITLE, 120, 8, 195, 24
@@ -39,7 +46,7 @@ END
 
 IDD_CHSOURCE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Specific locații de căutare", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 13
@@ -52,7 +59,7 @@ END
 
 IDD_SEARCHDRV DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 51, 20, 169, 16
@@ -60,7 +67,7 @@ END
 
 IDD_INSTALLDRV DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 51, 20, 169, 16
@@ -68,7 +75,7 @@ END
 
 IDD_NEEDREBOOT DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Instalare completă", IDC_FINISHTITLE, 120, 8, 195, 11
@@ -79,11 +86,11 @@ END
 
 IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare dispozitiv"
+CAPTION "Asistent de instalare dispozitiv"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Instalare completă", IDC_FINISHTITLE, 120, 8, 195, 11
     LTEXT "Asistentul a încheiat instalarea dispozitivului:", IDC_STATIC, 120, 32, 195, 19
-    LTEXT "Apăsați „Sfârșit” pentru a închide asistentul.", IDC_STATIC, 120, 174, 179, 11
+    LTEXT "Apăsați „Sfârșit” pentru a încheia instalarea.", IDC_STATIC, 120, 174, 179, 11
     LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 148, 53, 147, 12
 END
diff --git a/dll/win32/ole32/ole32.spec b/dll/win32/ole32/ole32.spec
index ce554435edb..bd1fa48e50d 100644
--- a/dll/win32/ole32/ole32.spec
+++ b/dll/win32/ole32/ole32.spec
@@ -57,7 +57,7 @@
 # CoGetProcessIdentifier
 @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr)
 @ stdcall CoGetState(ptr)
-# CoGetStdMarshalEx
+@ stdcall -stub CoGetStdMarshalEx(ptr long ptr)
 # CoGetSystemSecurityPermissions
 @ stdcall CoGetTreatAsClass(ptr ptr)
 @ stdcall CoImpersonateClient()
diff --git a/dll/win32/rasdlg/lang/ro-RO.rc b/dll/win32/rasdlg/lang/ro-RO.rc
index f5e403cdfde..34ae1203f3e 100644
--- a/dll/win32/rasdlg/lang/ro-RO.rc
+++ b/dll/win32/rasdlg/lang/ro-RO.rc
@@ -1081,7 +1081,7 @@ END
 
 547 DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Asistentul pentru interfeța de apelare la cerere"
+CAPTION "Asistent pentru interfeța de apelare la cerere"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Bun venit la asistentul pentru interfața de apelare la cerere.", 1530, 122, 8, 192, 32
diff --git a/dll/win32/samlib/precomp.h b/dll/win32/samlib/precomp.h
index 7cab05c68e2..9a6affd56e1 100644
--- a/dll/win32/samlib/precomp.h
+++ b/dll/win32/samlib/precomp.h
@@ -9,5 +9,6 @@
 
 #include <windef.h>
 #include <winbase.h>
+#include <winnls.h>
 
 #endif /* _SAMLIB_PCH_ */
diff --git a/dll/win32/samlib/samlib.c b/dll/win32/samlib/samlib.c
index 16d3d01a1b0..167c57c5d59 100644
--- a/dll/win32/samlib/samlib.c
+++ b/dll/win32/samlib/samlib.c
@@ -128,8 +128,11 @@ SampCheckPassword(IN SAMPR_HANDLE UserHandle,
                   IN PUNICODE_STRING Password)
 {
     USER_DOMAIN_PASSWORD_INFORMATION DomainPasswordInformation;
+    LPWORD CharTypeBuffer = NULL;
     ULONG PasswordLength;
-    NTSTATUS Status;
+    ULONG i;
+    ULONG Upper = 0, Lower = 0, Digit = 0, Punct = 0, Alpha = 0;
+    NTSTATUS Status = STATUS_SUCCESS;
 
     TRACE("(%p %p)\n", UserHandle, Password);
 
@@ -152,10 +155,57 @@ SampCheckPassword(IN SAMPR_HANDLE UserHandle,
     /* Check the password complexity */
     if (DomainPasswordInformation.PasswordProperties & DOMAIN_PASSWORD_COMPLEX)
     {
-        /* FIXME */
+        CharTypeBuffer = midl_user_allocate(PasswordLength * sizeof(WORD));
+        if (CharTypeBuffer == NULL)
+            return STATUS_INSUFFICIENT_RESOURCES;
+
+        GetStringTypeW(CT_CTYPE1,
+                       Password->Buffer,
+                       PasswordLength,
+                       CharTypeBuffer);
+
+        for (i = 0; i < PasswordLength; i++)
+        {
+            TRACE("%lu: %C %s %s %s %s\n", i, Password->Buffer[i],
+                  (CharTypeBuffer[i] & C1_UPPER) ? "C1_UPPER" : "        ",
+                  (CharTypeBuffer[i] & C1_LOWER) ? "C1_LOWER" : "        ",
+                  (CharTypeBuffer[i] & C1_DIGIT) ? "C1_DIGIT" : "        ",
+                  (CharTypeBuffer[i] & C1_PUNCT) ? "C1_PUNCT" : "        ",
+                  (CharTypeBuffer[i] & C1_ALPHA) ? "C1_ALPHA" : "        ");
+
+            if (CharTypeBuffer[i] & C1_UPPER)
+                Upper = 1;
+
+            if (CharTypeBuffer[i] & C1_LOWER)
+                Lower = 1;
+
+            if (CharTypeBuffer[i] & C1_DIGIT)
+                Digit = 1;
+
+            if (CharTypeBuffer[i] & C1_PUNCT)
+                Punct = 1;
+
+            if ((CharTypeBuffer[i] & C1_ALPHA) &&
+                !(CharTypeBuffer[i] & C1_UPPER) &&
+                !(CharTypeBuffer[i] & C1_LOWER))
+                Alpha = 1;
+        }
+
+        TRACE("Upper: %lu\n", Upper);
+        TRACE("Lower: %lu\n", Lower);
+        TRACE("Digit: %lu\n", Digit);
+        TRACE("Punct: %lu\n", Punct);
+        TRACE("Alpha: %lu\n", Alpha);
+
+        TRACE("Total: %lu\n", Upper + Lower + Digit + Punct + Alpha);
+        if (Upper + Lower + Digit + Punct + Alpha < 3)
+            Status = STATUS_PASSWORD_RESTRICTION;
     }
 
-    return STATUS_SUCCESS;
+    if (CharTypeBuffer != NULL)
+        midl_user_free(CharTypeBuffer);
+
+    return Status;
 }
 
 
diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc
index 6c8bf00b9a4..b5884cec666 100644
--- a/dll/win32/syssetup/lang/ro-RO.rc
+++ b/dll/win32/syssetup/lang/ro-RO.rc
@@ -1,10 +1,17 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/*
+ * PROJECT: ReactOS system setup
+ * FILE:    dll/win32/syssetup/lang/ro-RO.rc
+ * PURPOSE: Romanian Language File for system setup
+ * TRANSLATORS:
+ *          Petre Dumitriu
+ *          Ștefan Fulea (stefan dot fulea at mail dot md)
+ */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Bun venit la etapa secundă de instalare ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24
@@ -14,7 +21,7 @@ END
 
 IDD_ACKPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT "Echipa ReactOS aduce mulțumiri următoarelor proiecte FOSS ce au fost utilizate la crearea ReactOS:", IDC_STATIC, 15, 7, 286, 19
@@ -26,30 +33,30 @@ END
 
 IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Scrieți-vă numele complet și compania sau organizația din care faceți parte.", IDC_STATIC, 54, 7, 242, 21
-    LTEXT "N&ume complet:", IDC_STATIC, 54, 37, 70, 8
+    LTEXT "N&umele complet:", IDC_STATIC, 54, 37, 70, 8
     EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
-    LTEXT "&Organizație:", IDC_STATIC, 54, 57, 44, 8
+    LTEXT "O&rganizația:", IDC_STATIC, 54, 57, 44, 8
     EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL
 END
 
 IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20
     LTEXT "Scrieți un nume pentru calculator de maxim 15 de caractere. Dacă sunteți într-o rețea, numele calculatorului trebuie să fie unic în acea rețea.", IDC_STATIC, 54, 7, 250, 24
-    LTEXT "N&ume calculator:", IDC_STATIC, 54, 38, 75, 8
+    LTEXT "N&umele calculatorului:", IDC_STATIC, 54, 38, 75, 8
     EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE
     ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20
     LTEXT "Asistentul va crea un cont de utilizator cu numele Administrator. Îl puteți folosi când veți avea nevoie de control complet asupra calculatorului.", IDC_STATIC, 54, 57, 250, 25
     LTEXT "Introduceți o parolă pentru Administrator de maxim 127 caractere.", IDC_STATIC, 54, 87, 250, 8
-    LTEXT "&Parolă administrator:", IDC_STATIC, 54, 104, 105, 8
+    LTEXT "&Parola de administrator:", IDC_STATIC, 54, 104, 105, 8
     EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
     LTEXT "&Confirmarea parolei:", IDC_STATIC, 54, 123, 105, 8
     EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD
@@ -57,7 +64,7 @@ END
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20
@@ -73,21 +80,21 @@ END
 
 IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20
-    LTEXT "Dată și oră:", IDC_STATIC, 53, 7, 253, 8
+    LTEXT "Data și ora:", IDC_STATIC, 53, 7, 253, 8
     CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14
     CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14
-    LTEXT "Fus orar:", IDC_STATIC, 53, 42, 253, 8
+    LTEXT "Fusul orar:", IDC_STATIC, 53, 42, 253, 8
     COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL
     AUTOCHECKBOX "Aj&ustează ora automat la schimbarea fusului orar", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20
@@ -97,7 +104,7 @@ END
 
 IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Asistentul de instalare ReactOS"
+CAPTION "Asistent de instalare ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "Sfârșit de instalare ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24
@@ -141,7 +148,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_REACTOS_SETUP "Asistentul de instalare ReactOS"
+    IDS_REACTOS_SETUP "Asistent de instalare ReactOS"
     IDS_UNKNOWN_ERROR "Eroare necunoscută"
     IDS_REGISTERING_COMPONENTS "Se înregistrează componentele…"
     IDS_LOADLIBRARY_FAILED "LoadLibrary a eșuat: "
diff --git a/drivers/ksfilter/ks/precomp.h b/drivers/ksfilter/ks/precomp.h
index 09f35165d5b..738176cf53c 100644
--- a/drivers/ksfilter/ks/precomp.h
+++ b/drivers/ksfilter/ks/precomp.h
@@ -7,6 +7,7 @@
 #include <portcls.h>
 #include <kcom.h>
 #include <pseh/pseh2.h>
+#include <ntstrsafe.h>
 
 #include "ksiface.h"
 #include "kstypes.h"
diff --git a/drivers/ksfilter/ks/swenum.c b/drivers/ksfilter/ks/swenum.c
index 93dbb41274f..119d13d94c8 100644
--- a/drivers/ksfilter/ks/swenum.c
+++ b/drivers/ksfilter/ks/swenum.c
@@ -757,12 +757,13 @@ KspStartBusDevice(
     NTSTATUS Status;
     ULONG ResultLength;
     LPWSTR Name;
+    ULONG NameLength;
     PBUS_DEVICE_ENTRY DeviceEntry;
 
     /* FIXME handle pending remove */
 
     /* get full device name */
-    Status = IoGetDeviceProperty(DeviceObject, DevicePropertyPhysicalDeviceObjectName, sizeof(PDOName), (PVOID)PDOName, &ResultLength);
+    Status = IoGetDeviceProperty(DeviceObject, DevicePropertyPhysicalDeviceObjectName, sizeof(PDOName), PDOName, &ResultLength);
 
     if (!NT_SUCCESS(Status))
     {
@@ -771,7 +772,8 @@ KspStartBusDevice(
     }
 
     /* allocate device name buffer */
-    Name = AllocateItem(NonPagedPool, (ResultLength + 1) * sizeof(WCHAR));
+    NameLength = ResultLength + sizeof(UNICODE_NULL);
+    Name = AllocateItem(NonPagedPool, NameLength);
     if (!Name)
     {
         /* no memory */
@@ -779,7 +781,7 @@ KspStartBusDevice(
     }
 
     /* copy name */
-    wcscpy(Name, PDOName);
+    NT_VERIFY(NT_SUCCESS(RtlStringCbCopyW(Name, NameLength, PDOName)));
 
     /* TODO: time stamp creation time */
 
diff --git a/include/ndk/amd64/mmtypes.h b/include/ndk/amd64/mmtypes.h
index 3efe0a375d7..eb28217910a 100644
--- a/include/ndk/amd64/mmtypes.h
+++ b/include/ndk/amd64/mmtypes.h
@@ -35,6 +35,7 @@ extern "C" {
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L
+#define MM_PAGE_FRAME_NUMBER_SIZE         52
 
 //
 // Address of the shared user page
diff --git a/include/ndk/arm/mmtypes.h b/include/ndk/arm/mmtypes.h
index 7cc90094696..56fac23c556 100644
--- a/include/ndk/arm/mmtypes.h
+++ b/include/ndk/arm/mmtypes.h
@@ -36,6 +36,7 @@ extern "C" {
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L
+#define MM_PAGE_FRAME_NUMBER_SIZE         20
 
 //
 // Sanity checks for Paging Macros
diff --git a/include/ndk/i386/mmtypes.h b/include/ndk/i386/mmtypes.h
index 4ce7c4e9a74..cd8185c1cd8 100644
--- a/include/ndk/i386/mmtypes.h
+++ b/include/ndk/i386/mmtypes.h
@@ -34,6 +34,7 @@ extern "C" {
 #define PAGE_SHIFT                        12L
 #define MM_ALLOCATION_GRANULARITY         0x10000
 #define MM_ALLOCATION_GRANULARITY_SHIFT   16L
+#define MM_PAGE_FRAME_NUMBER_SIZE         20
 
 //
 // Address of the shared user page
diff --git a/include/ndk/mmtypes.h b/include/ndk/mmtypes.h
index 4c27911eda7..25dfabccdd8 100644
--- a/include/ndk/mmtypes.h
+++ b/include/ndk/mmtypes.h
@@ -842,14 +842,14 @@ typedef struct _SECTION
 //
 typedef struct _MMWSLENTRY
 {
-    ULONG Valid:1;
-    ULONG LockedInWs:1;
-    ULONG LockedInMemory:1;
-    ULONG Protection:5;
-    ULONG Hashed:1;
-    ULONG Direct:1;
-    ULONG Age:2;
-    ULONG VirtualPageNumber:20;
+    ULONG_PTR Valid:1;
+    ULONG_PTR LockedInWs:1;
+    ULONG_PTR LockedInMemory:1;
+    ULONG_PTR Protection:5;
+    ULONG_PTR Hashed:1;
+    ULONG_PTR Direct:1;
+    ULONG_PTR Age:2;
+    ULONG_PTR VirtualPageNumber: MM_PAGE_FRAME_NUMBER_SIZE;
 } MMWSLENTRY, *PMMWSLENTRY;
 
 typedef struct _MMWSLE
@@ -857,7 +857,7 @@ typedef struct _MMWSLE
     union
     {
         PVOID VirtualAddress;
-        ULONG Long;
+        ULONG_PTR Long;
         MMWSLENTRY e1;
     } u1;
 } MMWSLE, *PMMWSLE;
diff --git a/include/reactos/wine/strmbase.h b/include/reactos/wine/strmbase.h
index 9727fb419e2..1370198d386 100644
--- a/include/reactos/wine/strmbase.h
+++ b/include/reactos/wine/strmbase.h
@@ -194,6 +194,7 @@ LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter* This);
 VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This);
 
 HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable);
+HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This);
 
 /* Enums */
 HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);
diff --git a/lib/3rdparty/strmbase/filter.c b/lib/3rdparty/strmbase/filter.c
index 10d946034ba..09d3b5bd3d3 100644
--- a/lib/3rdparty/strmbase/filter.c
+++ b/lib/3rdparty/strmbase/filter.c
@@ -60,14 +60,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface)
     TRACE("(%p)->() Release from %d\n", This, refCount + 1);
 
     if (!refCount)
-    {
-        if (This->pClock)
-            IReferenceClock_Release(This->pClock);
-
-        This->IBaseFilter_iface.lpVtbl = NULL;
-        This->csFilter.DebugInfo->Spare[0] = 0;
-        DeleteCriticalSection(&This->csFilter);
-    }
+        BaseFilter_Destroy(This);
 
     return refCount;
 }
@@ -209,3 +202,15 @@ HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, c
 
     return S_OK;
 }
+
+HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This)
+{
+    if (This->pClock)
+        IReferenceClock_Release(This->pClock);
+
+    This->IBaseFilter_iface.lpVtbl = NULL;
+    This->csFilter.DebugInfo->Spare[0] = 0;
+    DeleteCriticalSection(&This->csFilter);
+
+    return S_OK;
+}
diff --git a/lib/3rdparty/strmbase/renderer.c b/lib/3rdparty/strmbase/renderer.c
index 433bcba730f..cf2f318244f 100644
--- a/lib/3rdparty/strmbase/renderer.c
+++ b/lib/3rdparty/strmbase/renderer.c
@@ -284,7 +284,7 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid,
 ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface)
 {
     BaseRenderer *This = impl_from_IBaseFilter(iface);
-    ULONG refCount = BaseFilterImpl_Release(iface);
+    ULONG refCount = InterlockedDecrement(&This->filter.refCount);
 
     if (!refCount)
     {
@@ -309,6 +309,7 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface)
         CloseHandle(This->ThreadSignal);
         CloseHandle(This->RenderEvent);
         QualityControlImpl_Destroy(This->qcimpl);
+        BaseFilter_Destroy(&This->filter);
     }
     return refCount;
 }
diff --git a/lib/3rdparty/strmbase/transform.c b/lib/3rdparty/strmbase/transform.c
index 8f5815a2bfd..dc59bb9f725 100644
--- a/lib/3rdparty/strmbase/transform.c
+++ b/lib/3rdparty/strmbase/transform.c
@@ -295,7 +295,7 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri
 ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface)
 {
     TransformFilter *This = impl_from_IBaseFilter(iface);
-    ULONG refCount = BaseFilterImpl_Release(iface);
+    ULONG refCount = InterlockedDecrement(&This->filter.refCount);
 
     TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1);
 
@@ -325,6 +325,7 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface)
         FreeMediaType(&This->pmt);
         QualityControlImpl_Destroy(This->qcimpl);
         IUnknown_Release(This->seekthru_unk);
+        BaseFilter_Destroy(&This->filter);
         CoTaskMemFree(This);
 
         return 0;
diff --git a/lib/drivers/libusb/hub_controller.cpp b/lib/drivers/libusb/hub_controller.cpp
index 32b3f7efd4f..0a1be71ef78 100644
--- a/lib/drivers/libusb/hub_controller.cpp
+++ b/lib/drivers/libusb/hub_controller.cpp
@@ -848,7 +848,9 @@ CHubController::HandleBulkOrInterruptTransfer(
         ASSERT(m_PendingSCEIrp == NULL);
         if (QueryStatusChangeEndpoint(Irp))
         {
-            StatusChangeEndpointCallBack(this);
+            //
+            // We've seen a change already, so return immediately
+            //
             return STATUS_SUCCESS;
         }
 
diff --git a/lib/rtl/sd.c b/lib/rtl/sd.c
index 010c4e25a92..ea7e3bb44f5 100644
--- a/lib/rtl/sd.c
+++ b/lib/rtl/sd.c
@@ -1070,7 +1070,7 @@ RtlValidSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor)
 
         /* Group SID must be valid if present */
         Group = SepGetGroupFromDescriptor(Sd);
-        if ((Owner) && (!RtlValidSid(Group))) _SEH2_YIELD(return FALSE);
+        if ((Group) && (!RtlValidSid(Group))) _SEH2_YIELD(return FALSE);
 
         /* DACL must be valid if present */
         Dacl = SepGetDaclFromDescriptor(Sd);
diff --git a/lib/sdk/crt/printf/swprintf_s.c b/lib/sdk/crt/printf/swprintf_s.c
index a77136c6849..de6c7ab2bf6 100644
--- a/lib/sdk/crt/printf/swprintf_s.c
+++ b/lib/sdk/crt/printf/swprintf_s.c
@@ -9,6 +9,7 @@
 #define _sxprintf swprintf_s
 #define USE_COUNT 0
 #define USE_VARARGS 0
+#define _UNICODE
 #define IS_SECAPI 1
 
 #include "_sxprintf.c"
diff --git a/lib/sdk/crt/printf/wvsnprintfW.c b/lib/sdk/crt/printf/wvsnprintfW.c
index cd042b1aaba..14e52809937 100644
--- a/lib/sdk/crt/printf/wvsnprintfW.c
+++ b/lib/sdk/crt/printf/wvsnprintfW.c
@@ -9,6 +9,7 @@
 #define _sxprintf wvsnprintfW
 #define USE_COUNT 1
 #define USE_VARARGS 1
+#define _UNICODE
 #define USER32_WSPRINTF
 
 #include "_sxprintf.c"
diff --git a/lib/sdk/crt/printf/wvsprintfW.c b/lib/sdk/crt/printf/wvsprintfW.c
index bf9ced2a480..22d3b19bd8a 100644
--- a/lib/sdk/crt/printf/wvsprintfW.c
+++ b/lib/sdk/crt/printf/wvsprintfW.c
@@ -9,6 +9,7 @@
 #define _sxprintf wvsprintfW
 #define USE_COUNT 0
 #define USE_VARARGS 1
+#define _UNICODE
 #define USER32_WSPRINTF
 
 #include "_sxprintf.c"
diff --git a/ntoskrnl/config/cmse.c b/ntoskrnl/config/cmse.c
index 019a14c8868..f92eba2cbd9 100644
--- a/ntoskrnl/config/cmse.c
+++ b/ntoskrnl/config/cmse.c
@@ -137,6 +137,104 @@ CmpHiveRootSecurityDescriptor(VOID)
     return SecurityDescriptor;
 }
 
+NTSTATUS
+CmpQuerySecurityDescriptor(IN PCM_KEY_BODY KeyBody,
+                           IN SECURITY_INFORMATION SecurityInformation,
+                           OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
+                           IN OUT PULONG BufferLength)
+{
+    PISECURITY_DESCRIPTOR_RELATIVE RelSd;
+    ULONG SidSize;
+    ULONG AclSize;
+    ULONG SdSize;
+    NTSTATUS Status;
+    SECURITY_DESCRIPTOR_CONTROL Control = 0;
+    ULONG Owner = 0;
+    ULONG Group = 0;
+    ULONG Dacl = 0;
+
+    DBG_UNREFERENCED_PARAMETER(KeyBody);
+
+    if (SecurityInformation == 0)
+    {
+        return STATUS_ACCESS_DENIED;
+    }
+
+    SidSize = RtlLengthSid(SeWorldSid);
+    RelSd = SecurityDescriptor;
+    SdSize = sizeof(*RelSd);
+
+    if (SecurityInformation & OWNER_SECURITY_INFORMATION)
+    {
+        Owner = SdSize;
+        SdSize += SidSize;
+    }
+
+    if (SecurityInformation & GROUP_SECURITY_INFORMATION)
+    {
+        Group = SdSize;
+        SdSize += SidSize;
+    }
+
+    if (SecurityInformation & DACL_SECURITY_INFORMATION)
+    {
+        Control |= SE_DACL_PRESENT;
+        Dacl = SdSize;
+        AclSize = sizeof(ACL) + sizeof(ACE) + SidSize;
+        SdSize += AclSize;
+    }
+
+    if (SecurityInformation & SACL_SECURITY_INFORMATION)
+    {
+        Control |= SE_SACL_PRESENT;
+    }
+
+    if (*BufferLength < SdSize)
+    {
+        *BufferLength = SdSize;
+        return STATUS_BUFFER_TOO_SMALL;
+    }
+
+    *BufferLength = SdSize;
+
+    Status = RtlCreateSecurityDescriptorRelative(RelSd,
+                                                 SECURITY_DESCRIPTOR_REVISION);
+    if (!NT_SUCCESS(Status))
+        return Status;
+
+    RelSd->Control |= Control;
+    RelSd->Owner = Owner;
+    RelSd->Group = Group;
+    RelSd->Dacl = Dacl;
+
+    if (Owner)
+        RtlCopyMemory((PUCHAR)RelSd + Owner,
+                      SeWorldSid,
+                      SidSize);
+
+    if (Group)
+        RtlCopyMemory((PUCHAR)RelSd + Group,
+                      SeWorldSid,
+                      SidSize);
+
+    if (Dacl)
+    {
+        Status = RtlCreateAcl((PACL)((PUCHAR)RelSd + Dacl),
+                              AclSize,
+                              ACL_REVISION);
+        if (NT_SUCCESS(Status))
+        {
+            Status = RtlAddAccessAllowedAce((PACL)((PUCHAR)RelSd + Dacl),
+                                            ACL_REVISION,
+                                            GENERIC_ALL,
+                                            SeWorldSid);
+        }
+    }
+
+    ASSERT(Status == STATUS_SUCCESS);
+    return Status;
+}
+
 NTSTATUS
 NTAPI
 CmpSecurityMethod(IN PVOID ObjectBody,
@@ -148,6 +246,38 @@ CmpSecurityMethod(IN PVOID ObjectBody,
                   IN POOL_TYPE PoolType,
                   IN PGENERIC_MAPPING GenericMapping)
 {
+    DBG_UNREFERENCED_PARAMETER(OldSecurityDescriptor);
+    DBG_UNREFERENCED_PARAMETER(GenericMapping);
+
+    switch (OperationCode)
+    {
+        case SetSecurityDescriptor:
+            DPRINT("Set security descriptor\n");
+            ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool));
+            /* HACK */
+            break;
+
+        case QuerySecurityDescriptor:
+            DPRINT("Query security descriptor\n");
+            return CmpQuerySecurityDescriptor(ObjectBody,
+                                              *SecurityInformation,
+                                              SecurityDescriptor,
+                                              BufferLength);
+
+        case DeleteSecurityDescriptor:
+            DPRINT("Delete security descriptor\n");
+            /* HACK */
+            break;
+
+        case AssignSecurityDescriptor:
+            DPRINT("Assign security descriptor\n");
+            /* HACK */
+            break;
+
+        default:
+            KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0);
+    }
+
     /* HACK */
     return STATUS_SUCCESS;
 }
diff --git a/subsystems/ntvdm/lang/ro-RO.rc b/subsystems/ntvdm/lang/ro-RO.rc
new file mode 100644
index 00000000000..80da090cd21
--- /dev/null
+++ b/subsystems/ntvdm/lang/ro-RO.rc
@@ -0,0 +1,13 @@
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_HIDE_MOUSE, "Asc&unde indicatorul șoricelului"
+    IDS_SHOW_MOUSE, "Afișea&ză indicatorul șoricelului"
+    IDS_VDM_MENU  , "ReactOS &VDM"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_VDM_QUIT,   "I&eșire din ReactOS VDM"
+END
diff --git a/subsystems/ntvdm/ntvdm.rc b/subsystems/ntvdm/ntvdm.rc
index bb78cedd6a3..8ad2905909a 100644
--- a/subsystems/ntvdm/ntvdm.rc
+++ b/subsystems/ntvdm/ntvdm.rc
@@ -37,3 +37,6 @@ IDI_APPICON ICON "res/ntvdm.ico"
 #ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
 #endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
diff --git a/win32ss/gdi/eng/driverobj.c b/win32ss/gdi/eng/driverobj.c
index fff1ddad1b9..5f1b96bfba2 100644
--- a/win32ss/gdi/eng/driverobj.c
+++ b/win32ss/gdi/eng/driverobj.c
@@ -29,7 +29,7 @@ DRIVEROBJ_vCleanup(PVOID pObject)
     pFreeProc = pedo->drvobj.pFreeProc;
     if (pFreeProc)
     {
-        NT_VERIFY(pFreeProc(pedo->drvobj.pvObj));
+        NT_VERIFY(pFreeProc(&pedo->drvobj));
     }
 }
 
@@ -88,7 +88,7 @@ EngDeleteDriverObj(
     /* Manually call cleanup callback */
     if (bCallBack)
     {
-        if (!pedo->drvobj.pFreeProc(pedo->drvobj.pvObj))
+        if (!pedo->drvobj.pFreeProc(&pedo->drvobj))
         {
             /* Callback failed */
             DRIVEROBJ_UnlockObject(pedo);
diff --git a/win32ss/gdi/eng/engwindow.c b/win32ss/gdi/eng/engwindow.c
index 86560c9770d..b3eecd2abc9 100644
--- a/win32ss/gdi/eng/engwindow.c
+++ b/win32ss/gdi/eng/engwindow.c
@@ -96,6 +96,7 @@ IntEngWndUpdateClipObj(
 
     /* Update the WNDOBJ */
     Clip->WndObj.rclClient = Window->rcClient;
+    Clip->WndObj.coClient.iUniq++;
 
     return TRUE;
 }
@@ -111,12 +112,6 @@ IntEngWindowChanged(
 {
     XCLIPOBJ *Clip;
 
-    /*
-     * This function is broken because AtomWndObj conflicts with
-     * properties set from user mode using SetPropW
-     */
-    return;
-
     ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL);
 
     Clip = UserGetProp(Window, AtomWndObj);
@@ -126,7 +121,7 @@ IntEngWindowChanged(
     }
 
     ASSERT(Clip->Hwnd == Window->head.h);
-    if (Clip->WndObj.pvConsumer != NULL)
+    // if (Clip->WndObj.pvConsumer != NULL)
     {
         /* Update the WNDOBJ */
         switch (flChanged)
@@ -173,6 +168,11 @@ EngCreateWnd(
     TRACE("EngCreateWnd: pso = 0x%p, hwnd = 0x%p, pfn = 0x%p, fl = 0x%lx, pixfmt = %d\n",
             pso, hWnd, pfn, fl, iPixelFormat);
 
+    if (fl & (WO_RGN_WINDOW | WO_RGN_DESKTOP_COORD | WO_RGN_UPDATE_ALL))
+    {
+        FIXME("Unsupported flags: 0x%lx\n", fl & ~(WO_RGN_CLIENT_DELTA | WO_RGN_CLIENT | WO_RGN_SURFACE_DELTA | WO_RGN_SURFACE));
+    }
+
     calledFromUser = UserIsEntered();
     if (!calledFromUser) {
         UserEnterShared();
@@ -209,7 +209,12 @@ EngCreateWnd(
     /* Fill internal object */
     Clip->Hwnd = hWnd;
     Clip->ChangeProc = pfn;
-    Clip->Flags = fl;
+    /* Keep track of relevant flags */
+    Clip->Flags = fl & (WO_RGN_CLIENT_DELTA | WO_RGN_CLIENT | WO_RGN_SURFACE_DELTA | WO_RGN_SURFACE | WO_DRAW_NOTIFY);
+    if (fl & WO_SPRITE_NOTIFY)
+        Clip->Flags |= WOC_SPRITE_OVERLAP | WOC_SPRITE_NO_OVERLAP;
+    /* Those should always be sent */
+    Clip->Flags |= WOC_CHANGED | WOC_DELETE;
     Clip->PixelFormat = iPixelFormat;
 
     /* associate object with window */
@@ -259,8 +264,8 @@ EngDeleteWnd(
     {
         /* Remove object from window */
         IntRemoveProp(Window, AtomWndObj);
-        --gcountPWO;
     }
+    --gcountPWO;
 
     if (!calledFromUser) {
         UserLeave();
diff --git a/win32ss/gdi/ntgdi/dclife.c b/win32ss/gdi/ntgdi/dclife.c
index 67ce491a2ab..9dce67611e2 100644
--- a/win32ss/gdi/ntgdi/dclife.c
+++ b/win32ss/gdi/ntgdi/dclife.c
@@ -318,7 +318,7 @@ DC_vInitDc(
     /* Other stuff */
     pdc->hdcNext = NULL;
     pdc->hdcPrev = NULL;
-    pdc->ipfdDevMax = 0x0000ffff;
+    pdc->ipfdDevMax = 0;
     pdc->ulCopyCount = -1;
     pdc->ptlDoBanding.x = 0;
     pdc->ptlDoBanding.y = 0;
diff --git a/win32ss/gdi/ntgdi/wingl.c b/win32ss/gdi/ntgdi/wingl.c
index 7225b5d71c2..39dabbce8c4 100644
--- a/win32ss/gdi/ntgdi/wingl.c
+++ b/win32ss/gdi/ntgdi/wingl.c
@@ -62,7 +62,19 @@ NtGdiDescribePixelFormat(
     }
 
     if (!pdc->ipfdDevMax)
-        IntGetipfdDevMax(pdc);
+    {
+        if (!IntGetipfdDevMax(pdc))
+        {
+            /* EngSetLastError ? */
+            goto Exit;
+        }
+    }
+
+    if (!ppfd)
+    {
+        Ret = pdc->ipfdDevMax;
+        goto Exit;
+    }
 
     if ((ipfd < 1) || (ipfd > pdc->ipfdDevMax))
     {
diff --git a/win32ss/user/ntuser/ntuser.c b/win32ss/user/ntuser/ntuser.c
index f496e420a15..7b3a4bc5666 100644
--- a/win32ss/user/ntuser/ntuser.c
+++ b/win32ss/user/ntuser/ntuser.c
@@ -49,7 +49,12 @@ InitUserAtoms(VOID)
 
   gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE);
 
-  AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE);
+  /*
+   * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use
+   * the win32k atom table for this ones. What is the right thing to do ?
+   */
+  // AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE);
+  NtAddAtom(L"SysWNDO", 14, &AtomWndObj);
   AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE);
   AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE);
 
diff --git a/win32ss/user/ntuser/windc.c b/win32ss/user/ntuser/windc.c
index 5ff495c9950..0e712672731 100644
--- a/win32ss/user/ntuser/windc.c
+++ b/win32ss/user/ntuser/windc.c
@@ -276,11 +276,9 @@ noparent:
 
    Dce->DCXFlags &= ~DCX_DCEDIRTY;
    GdiSelectVisRgn(Dce->hDC, RgnVisible);
-
-   if (VerifyWnd(Window)) // Window maybe dead by this time before finishing the DCE release.
-   {
-      IntEngWindowChanged(Window, WOC_RGN_CLIENT);
-   }
+   /* Tell GDI driver */
+   if (Window)
+       IntEngWindowChanged(Window, WOC_RGN_CLIENT);
 
    if (RgnVisible != NULL)
    {
@@ -935,12 +933,6 @@ DceResetActiveDCEs(PWND Window)
 
          DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags);
          IntGdiSetHookFlags(pDCE->hDC, DCHF_VALIDATEVISRGN);
-
-         if (Window->head.h != pDCE->hwndCurrent)
-         {
-//            IntEngWindowChanged(CurrentWindow, WOC_RGN_CLIENT);
-//            UserDerefObject(CurrentWindow);
-         }
       }
       pLE = pDCE->List.Flink;
       pDCE = CONTAINING_RECORD(pLE, DCE, List);
diff --git a/win32ss/user/user32/lang/ro-RO.rc b/win32ss/user/user32/lang/ro-RO.rc
index 6f3645cf3bb..1d82c63d4df 100644
--- a/win32ss/user/user32/lang/ro-RO.rc
+++ b/win32ss/user/user32/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-/* 2011.12.17 - Fulea Ștefan: minor changes */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -52,7 +52,7 @@ BEGIN
     MENUITEM SEPARATOR
     MENUITEM "Închid&e\tCtrl+F4", SC_CLOSE
     MENUITEM SEPARATOR
-    MENUITEM "Înain&te\tCtrl+F6", SC_NEXTWINDOW
+    MENUITEM "&Următoare\tCtrl+F6", SC_NEXTWINDOW
 END
 
 /* Strings */
diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
index 2de14516e74..01eb400053f 100644
--- a/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
+++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
@@ -1,5 +1,4 @@
-/* Romanian translation by Fulea Ștefan */
-
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -27,6 +26,6 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_MARK_TITLE "Mark"
-    IDS_SELECT_TITLE "Select"
+    IDS_MARK_TITLE "Marchează"
+    IDS_SELECT_TITLE "Selectează"
 END
diff --git a/win32ss/user/winsrv/consrv/lang/ro-RO.rc b/win32ss/user/winsrv/consrv/lang/ro-RO.rc
index 1973da9e645..a075c452acc 100644
--- a/win32ss/user/winsrv/consrv/lang/ro-RO.rc
+++ b/win32ss/user/winsrv/consrv/lang/ro-RO.rc
@@ -1,6 +1,8 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_CONSOLE_TITLE "ReactOS Console"
+    IDS_CONSOLE_TITLE "Consola ReactOS"
 END
diff --git a/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc b/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc
index 9f92234d6d5..75c9d6f5c9b 100644
--- a/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc
+++ b/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc
@@ -1,4 +1,4 @@
-/* Romanian translation by Fulea Ștefan */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
@@ -22,5 +22,5 @@ BEGIN
     IDS_SCROLLUP "Derulează în sus"
     IDS_SCROLLDOWN "Derulează în jos"
 */
-    IDS_TERMINAL_TITLE "ReactOS Console"
+    IDS_TERMINAL_TITLE "Consola ReactOS"
 END
diff --git a/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc b/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc
index 1973da9e645..a075c452acc 100644
--- a/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc
+++ b/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc
@@ -1,6 +1,8 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_CONSOLE_TITLE "ReactOS Console"
+    IDS_CONSOLE_TITLE "Consola ReactOS"
 END