diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
index e5ad47801d0..58a2ef3f53c 100644
--- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
@@ -1,5 +1,5 @@
 /*
- *         translated by TestamenT
+ *         translated by TestamenT & xrogers
  *      testament@users.sourceforge.net
  * https://sourceforge.net/projects/reactospl
  */
@@ -13,16 +13,16 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Options"
+CAPTION "Opcje"
 FONT 8, "MS Shell Dlg"
 EXSTYLE DS_SHELLFONT
 BEGIN
-    GROUPBOX        "Cards", -1, 7, 7, 65, 40
-    AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
+    GROUPBOX        "Karty", -1, 7, 7, 65, 40
+    AUTORADIOBUTTON "Rozdaj &jedn¹", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
-    AUTOCHECKBOX    "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
-    AUTOCHECKBOX    "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX    "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
+    AUTOCHECKBOX    "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "Anuluj", IDCANCEL, 101, 97, 50, 14
@@ -33,9 +33,9 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_SOL_NAME    "Solitaire"
+    IDS_SOL_NAME    "Pasjans"
     IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
-    IDS_SOL_QUIT    "Quit the current game?"
+    IDS_SOL_QUIT    "Zakoñczyæ aktualn¹ grê?"
 END
 
 
diff --git a/reactos/base/applications/games/winemine/winemine.rbuild b/reactos/base/applications/games/winemine/winemine.rbuild
index 18893df9270..d6bb012f011 100644
--- a/reactos/base/applications/games/winemine/winemine.rbuild
+++ b/reactos/base/applications/games/winemine/winemine.rbuild
@@ -11,5 +11,5 @@
 	<library>advapi32</library>
 	<file>main.c</file>
 	<file>dialog.c</file>
-	<file>winemine.rc</file>
+	<file>rsrc.rc</file>
 </module>
diff --git a/reactos/base/applications/games/winemine/winemine.rc b/reactos/base/applications/games/winemine/winemine.rc
deleted file mode 100644
index 58357dee695..00000000000
--- a/reactos/base/applications/games/winemine/winemine.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * WineMine (rsrc.rc)
- *
- * Copyright 2000 Joshua Thielen <jt85296@ltu.edu>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <windows.h>
-#include "resource.h"
-
-#include "rsrc.rc"
diff --git a/reactos/base/applications/screensavers/matrix/lang/en-US.rc b/reactos/base/applications/screensavers/matrix/lang/en-US.rc
new file mode 100644
index 00000000000..da72aa8b494
--- /dev/null
+++ b/reactos/base/applications/screensavers/matrix/lang/en-US.rc
@@ -0,0 +1,167 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Matrix ScreenSaver Configuration"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "Decode &Speed",IDC_STATIC,7,7,128,36
+    LTEXT           "Slower",IDC_STATIC,13,24,22,8
+    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,17,62,22
+    LTEXT           "Faster",IDC_STATIC,104,24,20,8
+    GROUPBOX        "Cypher &Density",IDC_STATIC,7,50,128,36
+    LTEXT           "Less",IDC_STATIC,13,67,19,8
+    CONTROL         "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,60,62,22
+    LTEXT           "More",IDC_STATIC,104,67,23,8
+    GROUPBOX        "&Message Display Speed",IDC_MSGSPEEDGRP,7,93,127,36
+    LTEXT           "Slower",IDC_STATIC,13,110,22,8
+    CONTROL         "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,103,62,22
+    LTEXT           "Faster",IDC_STATIC,104,110,22,8
+    GROUPBOX        "&Font Size",IDC_STATIC,7,137,127,36
+    LTEXT           "Smaller",IDC_STATIC,13,153,24,8
+    CONTROL         "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,146,62,22
+    LTEXT           "Bigger",IDC_STATIC,104,153,25,8
+    GROUPBOX        "Coded Messages",IDC_STATIC,145,7,188,142
+    COMBOBOX        IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | 
+                    WS_TABSTOP
+    CONTROL         "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | 
+                    SS_CENTERIMAGE | WS_GROUP,154,39,116,72
+    PUSHBUTTON      "&Add",IDC_ADD,280,41,44,18
+    PUSHBUTTON      "&Remove",IDC_REMOVE,280,66,44,18
+    CONTROL         "Randomize Messages",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,151,134,85,10
+    DEFPUSHBUTTON   "OK",IDOK,222,162,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,283,162,50,14
+    COMBOBOX        IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    LTEXT           "&Font Name:",IDC_STATIC,151,118,38,8
+    CONTROL         "&Bold Font",IDC_BOLD,"Button",BS_AUTOCHECKBOX | 
+                    BS_MULTILINE | WS_TABSTOP,247,134,46,10
+    CTEXT           "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140,
+                    158,75,18
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_DESCRIPTION         "Matrix ScreenSaver"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc b/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc
new file mode 100644
index 00000000000..1b96c984243
--- /dev/null
+++ b/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc
@@ -0,0 +1,167 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuration de l'écran de veille Matrix"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX        "Vite&sse de décodage",IDC_STATIC,7,7,128,36
+    LTEXT           "Plus lent",IDC_STATIC,13,24,22,8
+    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,17,62,22
+    LTEXT           "Plus rapide",IDC_STATIC,104,24,20,8
+    GROUPBOX        "&Densité de caractères",IDC_STATIC,7,50,128,36
+    LTEXT           "Moins",IDC_STATIC,13,67,19,8
+    CONTROL         "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,60,62,22
+    LTEXT           "Plus",IDC_STATIC,104,67,23,8
+    GROUPBOX        "Vitesse d'affichage du message",IDC_MSGSPEEDGRP,7,93,127,36
+    LTEXT           "Plus lent",IDC_STATIC,13,110,22,8
+    CONTROL         "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,103,62,22
+    LTEXT           "Plus rapide",IDC_STATIC,104,110,22,8
+    GROUPBOX        "Taille de la police",IDC_STATIC,7,137,127,36
+    LTEXT           "Plus petite",IDC_STATIC,13,153,24,8
+    CONTROL         "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | 
+                    TBS_BOTH | WS_TABSTOP,38,146,62,22
+    LTEXT           "Plus grande",IDC_STATIC,104,153,25,8
+    GROUPBOX        "Messages codés",IDC_STATIC,145,7,188,142
+    COMBOBOX        IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | 
+                    WS_TABSTOP
+    CONTROL         "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | 
+                    SS_CENTERIMAGE | WS_GROUP,154,39,116,72
+    PUSHBUTTON      "&Ajouter",IDC_ADD,280,41,44,18
+    PUSHBUTTON      "Supp&rimer",IDC_REMOVE,280,66,44,18
+    CONTROL         "Messages aléatoires",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,151,134,85,10
+    DEFPUSHBUTTON   "OK",IDOK,222,162,50,14
+    PUSHBUTTON      "Annuler",IDCANCEL,283,162,50,14
+    COMBOBOX        IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Nom de la police:",IDC_STATIC,151,118,38,8
+    CONTROL         "Gras",IDC_BOLD,"Button",BS_AUTOCHECKBOX | 
+                    BS_MULTILINE | WS_TABSTOP,247,134,46,10
+    CTEXT           "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140,
+                    158,75,18
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_DESCRIPTION         "Matrix ScreenSaver"
+END
+
+#endif    // French resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/reactos/base/applications/screensavers/matrix/matrix.dsp b/reactos/base/applications/screensavers/matrix/matrix.dsp
index 78af313cd31..658f8187d13 100644
--- a/reactos/base/applications/screensavers/matrix/matrix.dsp
+++ b/reactos/base/applications/screensavers/matrix/matrix.dsp
@@ -99,7 +99,7 @@ SOURCE=.\matrix.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\matrix.rc
+SOURCE=.\rsrc.rc
 # End Source File
 # Begin Source File
 
diff --git a/reactos/base/applications/screensavers/matrix/matrix.rbuild b/reactos/base/applications/screensavers/matrix/matrix.rbuild
index e061c9b18fb..f11ac78c41f 100644
--- a/reactos/base/applications/screensavers/matrix/matrix.rbuild
+++ b/reactos/base/applications/screensavers/matrix/matrix.rbuild
@@ -26,5 +26,5 @@
 	<file>password.c</file>
 	<file>screensave.c</file>
 	<file>settings.c</file>
-	<file>matrix.rc</file>
+	<file>rsrc.rc</file>
 </module>
diff --git a/reactos/base/applications/screensavers/matrix/rsrc.rc b/reactos/base/applications/screensavers/matrix/rsrc.rc
index 238c5d62da6..bc4530da9db 100644
--- a/reactos/base/applications/screensavers/matrix/rsrc.rc
+++ b/reactos/base/applications/screensavers/matrix/rsrc.rc
@@ -3,5 +3,7 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
 #include "lang/th-TH.rc"