Sync with trunk head

svn path=/branches/header-work/; revision=46021
2025-08-07 05:43:08 +00:00 · 2010-03-09 00:19:55 +00:00 · 2010-03-09 00:19:55 +00:00 · a00acb2a1b
commit a00acb2a1b
parent 68ea0b876e 61fef12a72
1006 changed files with 161728 additions and 16722 deletions
--- a/base/applications/applications.rbuild
+++ b/base/applications/applications.rbuild
@ -22,6 +22,9 @@
 	<directory name="dxdiag">
 		<xi:include href="dxdiag/dxdiag.rbuild" />
 	</directory>
+	<directory name="extrac32">
+		<xi:include href="extrac32/extrac32.rbuild" />
+	</directory>
 	<directory name="fontview">
 		<xi:include href="fontview/fontview.rbuild" />
 	</directory>
--- a/base/applications/charmap/precomp.h
+++ b/base/applications/charmap/precomp.h
@ -1,4 +1,5 @@
-#pragma once
+#ifndef __CHARMAP_PRECOMP_H
+#define __CHARMAP_PRECOMP_H

 #include <stdio.h>
 #include <stdlib.h>
@ -52,3 +53,5 @@ VOID ShowAboutDlg(HWND hWndParent);

 BOOL RegisterMapClasses(HINSTANCE hInstance);
 VOID UnregisterMapClasses(HINSTANCE hInstance);
+
+#endif /* __CHARMAP_PRECOMP_H */
--- a/base/applications/cmdutils/reg/De.rc
+++ b/base/applications/cmdutils/reg/De.rc
@ -35,6 +35,6 @@ STRINGTABLE
    STRING_SUCCESS, "Der Vorgang wurde erfolgreich abgeschlossen\n"
    STRING_INVALID_KEY, "Fehler: Ungültiger Schlüssel\n"
    STRING_INVALID_CMDLINE, "Fehler: Ungültige Befehlszeilenargumente\n"
-    STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum entfernten Rechner hinzufügen\n"
+    STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n"
    STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n"
 }
--- a/base/applications/cmdutils/reg/It.rc
+++ b/base/applications/cmdutils/reg/It.rc
@ -0,0 +1,40 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ * Italian language support
+ *
+ * Copyright 2010 Luca Bennati
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+/*UTF-8*/
+#pragma code_page(65001)
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_USAGE, "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n"
+    STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n"
+    STRING_SUCCESS, "Operazione completata con successo\n"
+    STRING_INVALID_KEY, "Errore: nome della chiave non valido\n"
+    STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n"
+    STRING_NO_REMOTE, "Errore: Impossibile aggiungere chiavi alla macchina remota\n"
+    STRING_CANNOT_FIND, "Errore: Il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n"
+}
--- a/base/applications/cmdutils/reg/Uk.rc
+++ b/base/applications/cmdutils/reg/Uk.rc
@ -0,0 +1,43 @@
+/*
+ * REG.EXE - Wine-compatible reg program.
+ *
+ * Copyright 2008 Andrew Riedi
+ *
+ * Ukrainian language support
+ *
+ * Copyright 2010 Igor Paliychuk
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n"
+    STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n"
+    STRING_SUCCESS, "Операція успішно завершена\n"
+    STRING_INVALID_KEY, "Помилка: неправильне ім'я ключа\n"
+    STRING_INVALID_CMDLINE, "Помилка: неправильні параметри командного рядка\n"
+    STRING_NO_REMOTE, "Помилка: неможливо додати ключі на віддаленій машині\n"
+    STRING_CANNOT_FIND, "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n"
+}
--- a/base/applications/cmdutils/reg/reg.c
+++ b/base/applications/cmdutils/reg/reg.c
@ -124,6 +124,21 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r
            lstrcpyW((LPWSTR)out_data,data);
            break;
        }
+        case REG_DWORD:
+        {
+            LPWSTR rest;
+            DWORD val;
+            val = strtolW(data, &rest, 0);
+            if (rest == data) {
+                static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0};
+                reg_printfW(nonnumber);
+                break;
+            }
+            *reg_count = sizeof(DWORD);
+            out_data = HeapAlloc(GetProcessHeap(),0,*reg_count);
+            ((LPDWORD)out_data)[0] = val;
+            break;
+        }
        default:
        {
            static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0};
--- a/base/applications/cmdutils/reg/rsrc.rc
+++ b/base/applications/cmdutils/reg/rsrc.rc
@ -1,13 +1,17 @@
 #include "Da.rc"
-#include "De.rc"
 #include "En.rc"
-#include "Fr.rc"
-#include "Ja.rc"
-//#include "Ko.rc"
-#include "Lt.rc"
+#include "Ko.rc"
 #include "Nl.rc"
+#include "Pl.rc"
+
+/* UTF-8 */
+#include "De.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Lt.rc"
 #include "No.rc"
-//#include "Pl.rc"
 #include "Pt.rc"
 #include "Ru.rc"
 #include "Si.rc"
+#include "Uk.rc"
--- a/base/applications/cmdutils/xcopy/De.rc
+++ b/base/applications/cmdutils/xcopy/De.rc
@ -80,4 +80,3 @@ Mit:\n\
 \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Fr.rc
+++ b/base/applications/cmdutils/xcopy/Fr.rc
@ -81,4 +81,3 @@ où :\n\
 \t\tque le fichier source\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/It.rc
+++ b/base/applications/cmdutils/xcopy/It.rc
@ -81,4 +81,3 @@ Dove:\n\
 \t\tdella sorgente\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Ja.rc
+++ b/base/applications/cmdutils/xcopy/Ja.rc
@ -81,4 +81,3 @@ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t\tコピー先がコピー元より古いファイルだけコピーします。\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Lt.rc
+++ b/base/applications/cmdutils/xcopy/Lt.rc
@ -81,4 +81,3 @@ Kur:\n\
 \t\tsenesnis už šaltinio failą\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Nl.rc
+++ b/base/applications/cmdutils/xcopy/Nl.rc
@ -79,4 +79,3 @@ Parameters:\n\
 \t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Ru.rc
+++ b/base/applications/cmdutils/xcopy/Ru.rc
@ -84,4 +84,3 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
                после указанной даты. Если дата не указана, копирует только\n\
                те файлы, которые новее в исходной папке.\n"
 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Si.rc
+++ b/base/applications/cmdutils/xcopy/Si.rc
@ -80,4 +80,3 @@ Where:\n\
 \t\tod izvora\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/Uk.rc
+++ b/base/applications/cmdutils/xcopy/Uk.rc
@ -82,4 +82,3 @@ Where:\n\
 \t\tthan source\n\n"

 }
-#pragma code_page(default)
--- a/base/applications/cmdutils/xcopy/rsrc.rc
+++ b/base/applications/cmdutils/xcopy/rsrc.rc
@ -27,17 +27,19 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include <reactos/version.rc>

 #include "Da.rc"
-#include "De.rc"
 #include "En.rc"
-#include "Fr.rc"
-#include "It.rc"
-#include "Ja.rc"
 #include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
 #include "No.rc"
 #include "Pl.rc"
 #include "Pt.rc"
+
+/* UTF-8 */
+#include "De.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Lt.rc"
+#include "Nl.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Uk.rc"
--- a/base/applications/extrac32/extrac32.c
+++ b/base/applications/extrac32/extrac32.c
@ -0,0 +1,179 @@
+/*
+ * Extract - Wine-compatible program for extract *.cab files.
+ *
+ * Copyright 2007 Etersoft (Lyutin Anatoly)
+ * Copyright 2009 Ilya Shpigor
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#include <shellapi.h>
+#include <setupapi.h>
+#include <shlwapi.h>
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(extrac32);
+
+static BOOL force_mode;
+
+static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2)
+{
+    FILE_IN_CABINET_INFO_W *pInfo;
+    FILEPATHS_W *pFilePaths;
+
+    switch(Notification)
+    {
+        case SPFILENOTIFY_FILEINCABINET:
+            pInfo = (FILE_IN_CABINET_INFO_W*)Param1;
+            lstrcpyW(pInfo->FullTargetName, (LPCWSTR)Context);
+            lstrcatW(pInfo->FullTargetName, pInfo->NameInCabinet);
+            return FILEOP_DOIT;
+        case SPFILENOTIFY_FILEEXTRACTED:
+            pFilePaths = (FILEPATHS_W*)Param1;
+            WINE_TRACE("Extracted %s\n", wine_dbgstr_w(pFilePaths->Target));
+            return NO_ERROR;
+    }
+    return NO_ERROR;
+}
+
+static void extract(LPCWSTR cabfile, LPWSTR destdir)
+{
+    if (!SetupIterateCabinetW(cabfile, 0, ExtCabCallback, destdir))
+        WINE_ERR("Could not extract cab file %s\n", wine_dbgstr_w(cabfile));
+}
+
+static void copy_file(LPCWSTR source, LPCWSTR destination)
+{
+    WCHAR destfile[MAX_PATH];
+
+    /* append source filename if destination is a directory */
+    if (PathIsDirectoryW(destination))
+    {
+        PathCombineW(destfile, destination, PathFindFileNameW(source));
+        destination = destfile;
+    }
+
+    if (PathFileExistsW(destination) && !force_mode)
+    {
+        static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0};
+        static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0};
+        WCHAR msg[MAX_PATH+100];
+        snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination);
+        if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES)
+            return;
+    }
+
+    WINE_TRACE("copying %s to %s\n", wine_dbgstr_w(source), wine_dbgstr_w(destination));
+    CopyFileW(source, destination, FALSE);
+}
+
+int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show)
+{
+    LPWSTR *argv;
+    int argc;
+    int i;
+    WCHAR check, cmd = 0;
+    WCHAR path[MAX_PATH];
+    WCHAR backslash[] = {'\\',0};
+    LPCWSTR cabfile = NULL;
+
+    path[0] = 0;
+    argv = CommandLineToArgvW(cmdline, &argc);
+
+    if(!argv)
+    {
+        WINE_ERR("Bad command line arguments\n");
+        return 0;
+    }
+
+    /* Parse arguments */
+    for(i = 0; i < argc; i++)
+    {
+        /* Get cabfile */
+        if (argv[i][0] != '/')
+        {
+            if (!cabfile)
+            {
+                cabfile = argv[i];
+                continue;
+            } else
+                break;
+        }
+        /* Get parameters for commands */
+        check = toupperW( argv[i][1] );
+        switch(check)
+        {
+            case 'A':
+                WINE_FIXME("/A not implemented\n");
+                break;
+            case 'Y':
+                force_mode = TRUE;
+                break;
+            case 'L':
+                if ((i + 1) >= argc) return 0;
+                if (!GetFullPathNameW(argv[++i], MAX_PATH, path, NULL))
+                    return 0;
+                break;
+            case 'C':
+                if (cmd) return 0;
+                cmd = check;
+                break;
+            case 'E':
+            case 'D':
+                if (cmd) return 0;
+                cmd = check;
+                break;
+            default:
+                return 0;
+        }
+    }
+
+    if (!cabfile)
+        return 0;
+
+    if (cmd == 'C')
+    {
+        if ((i + 1) != argc) return 0;
+        if (!GetFullPathNameW(argv[i], MAX_PATH, path, NULL))
+            return 0;
+    }
+
+    if (!path[0])
+        GetCurrentDirectoryW(MAX_PATH, path);
+
+    lstrcatW(path, backslash);
+
+    /* Execute the specified command */
+    switch(cmd)
+    {
+        case 'C':
+            /* Copy file */
+            copy_file(cabfile, path);
+            break;
+        case 'E':
+            /* Extract CAB archive */
+            extract(cabfile, path);
+            break;
+        case 0:
+        case 'D':
+            /* Display CAB archive */
+            WINE_FIXME("/D not implemented\n");
+            break;
+    }
+    return 0;
+}
--- a/base/applications/extrac32/extrac32.rbuild
+++ b/base/applications/extrac32/extrac32.rbuild
@ -0,0 +1,9 @@
+<module name="extrac32" type="win32gui" installbase="system32" installname="extrac32.exe" unicode="yes">
+	<include base="extrac32">.</include>
+	<library>wine</library>
+	<library>shell32</library>
+	<library>setupapi</library>
+	<library>shlwapi</library>
+	<library>user32</library>
+	<file>extrac32.c</file>
+</module>
--- a/base/applications/mscutils/devmgmt/precomp.h
+++ b/base/applications/mscutils/devmgmt/precomp.h
@ -1,4 +1,5 @@
-#pragma once
+#ifndef __DEVMGMT_PRECOMP_H
+#define __DEVMGMT_PRECOMP_H

 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@ -92,3 +93,5 @@ HIMAGELIST InitImageList(UINT NumButtons,

 VOID GetError(VOID);
 VOID DisplayString(LPTSTR);
+
+#endif /* __DEVMGMT_PRECOMP_H */
--- a/base/applications/mscutils/servman/precomp.h
+++ b/base/applications/mscutils/servman/precomp.h
@ -1,4 +1,5 @@
-#pragma once
+#ifndef __SERVMAN_PRECOMP_H
+#define __SERVMAN_PRECOMP_H

 //#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@ -184,3 +185,5 @@ HIMAGELIST InitImageList(UINT StartResource,
                         UINT Width,
                         UINT Height,
                         ULONG type);
+
+#endif /* __SERVMAN_PRECOMP_H */
--- a/base/applications/paint/lang/pl-PL.rc
+++ b/base/applications/paint/lang/pl-PL.rc
@ -49,7 +49,7 @@ BEGIN
        MENUITEM SEPARATOR
        POPUP "Powiększenie"
        BEGIN
-            POPUP "User defined"
+            POPUP "Zdefiniowane przez użytkownika"
            BEGIN
                MENUITEM "12,5%", IDM_VIEWZOOM125
                MENUITEM "25%", IDM_VIEWZOOM25
@ -60,8 +60,8 @@ BEGIN
                MENUITEM "800%", IDM_VIEWZOOM800
            END
            MENUITEM SEPARATOR
-            MENUITEM "Show grid", IDM_VIEWSHOWGRID
-            MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
+            MENUITEM "Pokaż siatkę", IDM_VIEWSHOWGRID
+            MENUITEM "Pokaż miniaturę", IDM_VIEWSHOWMINIATURE
        END
        MENUITEM "Pełny ekran\tCtrl+F", IDM_VIEWFULLSCREEN
    END
@ -181,7 +181,7 @@ BEGIN
    IDS_INFOTEXT, "Paint dla ReactOS jest dostępny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)"
    IDS_SAVEPROMPTTEXT, "Czy chcesz zapisać zmiany do %s?"
    IDS_DEFAULTFILENAME, "Nienazwany.bmp"
-    IDS_MINIATURETITLE, "Miniature"
+    IDS_MINIATURETITLE, "Miniatura"
    IDS_TOOLTIP1, "Zaznaczenie dowolne"
    IDS_TOOLTIP2, "Zaznaczenie"
    IDS_TOOLTIP3, "Gumka"
@ -190,16 +190,16 @@ BEGIN
    IDS_TOOLTIP6, "Przybliżenie"
    IDS_TOOLTIP7, "Ołówek"
    IDS_TOOLTIP8, "Pędzel"
-    IDS_TOOLTIP9, "Spray"
+    IDS_TOOLTIP9, "Aerograf"
    IDS_TOOLTIP10, "Tekst"
    IDS_TOOLTIP11, "Linia"
    IDS_TOOLTIP12, "Krzywa Beziera"
    IDS_TOOLTIP13, "Prostokšt"
-    IDS_TOOLTIP14, "Polygon"
+    IDS_TOOLTIP14, "Wielokšt"
    IDS_TOOLTIP15, "Elipsa"
    IDS_TOOLTIP16, "Zaokršglony Prostokšt"
    IDS_OPENFILTER, "Pliki Bitmapy (*.bmp;*.dib)\1*.bmp;*.dib\1Wszystkie pliki (*.*)\1*.*\1"
    IDS_SAVEFILTER, "Bitmapa 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1"
-    IDS_FILESIZE, "%d bytes"
-    IDS_PRINTRES, "%d x %d pixels per meter"
+    IDS_FILESIZE, "%d bajtów"
+    IDS_PRINTRES, "%d x %d pikseli na metr"
 END
--- a/base/applications/rapps/lang/pl-PL.rc
+++ b/base/applications/rapps/lang/pl-PL.rc
@ -16,7 +16,7 @@ BEGIN
 		MENUITEM "&Odinstaluj",ID_UNINSTALL
 		MENUITEM "&Modyfikuj",   ID_MODIFY
 		MENUITEM SEPARATOR
-		MENUITEM "&Remove from Registry", ID_REGREMOVE
+		MENUITEM "&Usuń z rejestru", ID_REGREMOVE
 		MENUITEM SEPARATOR
 		MENUITEM "O&dœwie¿",  ID_REFRESH
 	END
@ -44,7 +44,7 @@ BEGIN
 		MENUITEM "&odinstaluj", ID_UNINSTALL
 		MENUITEM "&Modyfikuj",    ID_MODIFY
 		MENUITEM SEPARATOR
-		MENUITEM "&Remove from Registry", ID_REGREMOVE
+		MENUITEM "&Usuń z rejestru", ID_REGREMOVE
 		MENUITEM SEPARATOR
 		MENUITEM "&Odœwie¿",   ID_REFRESH
 	END
@ -52,37 +52,37 @@ END

 IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Settings"
+CAPTION "Ustawienia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	GROUPBOX "General", -1, 4, 2, 240, 61
-	AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
-	AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
-	AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+	GROUPBOX "Ogólne", -1, 4, 2, 240, 61
+	AUTOCHECKBOX "&Zapisz pozycję okna", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+	AUTOCHECKBOX "&Aktualizuj listę dostępnych programów przy każdym uruchomieniu", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+	AUTOCHECKBOX "Zap&isuj dziennik instalacji i usuwania programów", IDC_LOG_ENABLED, 15, 46, 219, 12

-	GROUPBOX "Downloading", -1, 4, 65, 240, 51
-	LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+	GROUPBOX "Pobieranie", -1, 4, 65, 240, 51
+	LTEXT "Katalog dla pobranych plików:", -1, 16, 75, 100, 9
 	EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
-	PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
-	AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+	PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14
+	AUTOCHECKBOX "&Usuń instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12

-	PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+	PUSHBUTTON "Domyślne", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
 	PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
+	PUSHBUTTON "Anuluj", IDCANCEL, 181, 124, 60, 14
 END

 IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Program installation"
+CAPTION "Instalacja programu"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35

-	AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
-	AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+	AUTORADIOBUTTON "&Zainstaluj z dysku (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+	AUTORADIOBUTTON "&Pobierz i zainstaluj", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP

 	PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
-	PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
+	PUSHBUTTON "Anuluj", IDCANCEL, 150, 78, 60, 14
 END

 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@ -101,7 +101,7 @@ CAPTION "O programie"
 FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
-	PUSHBUTTON "Close", IDOK, 133, 46, 50, 14
+	PUSHBUTTON "Zamknij", IDOK, 133, 46, 50, 14
 	ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
 END

@ -139,7 +139,7 @@ BEGIN
 	IDS_INFO_INSTLOCATION "\nScie¿ka instalacji: "
 	IDS_INFO_INSTALLSRC "\n<>ród³o instalacji: "
 	IDS_INFO_UNINSTALLSTR "\nKomenda deinstalacji: "
-	IDS_INFO_MODIFYPATH "\nModify Path: "
+	IDS_INFO_MODIFYPATH "\nModyfikacja ścieżki instalacji: "
 	IDS_INFO_INSTALLDATE "\nData instalacji: "
 END

@ -186,10 +186,10 @@ BEGIN
 	IDS_AVAILABLEFORINST "Dostêpne"
 	IDS_UPDATES "Uaktualnienia"
 	IDS_APPLICATIONS "Aplikacje"
-	IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
-	IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
-	IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
-	IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?"
-	IDS_INFORMATION "Information"
-	IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"
+	IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym będa zapisywane pobrane programy:"
+	IDS_CHOOSE_FOLDER_ERROR "Wybrałeś nieistniejący katalog!"
+	IDS_USER_NOT_ADMIN "Musisz mieć uprawnienia administratora aby uruchomić ""ReactOS Applications Manager""!"
+	IDS_APP_REG_REMOVE "Czy na pewno chcesz usunąć wpis tego programu z rejestru?"
+	IDS_INFORMATION "Informacja"
+	IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!"
 END
--- a/base/applications/rapps/rapps.h
+++ b/base/applications/rapps/rapps.h
@ -11,7 +11,7 @@

 #include "resource.h"

-#define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab"
+#define APPLICATION_DATEBASE_URL L"http://svn.reactos.org/packages/rappmgr.cab"

 #define SPLIT_WIDTH 4
 #define MAX_STR_LEN 256
--- a/base/applications/taskmgr/precomp.h
+++ b/base/applications/taskmgr/precomp.h
@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PRECOMP_H
+#define __PRECOMP_H

 #ifndef UNICODE
 #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled!
@ -35,3 +36,5 @@
 #include "priority.h"
 #include "run.h"
 #include "trayicon.h"
+
+#endif /* __PRECOMP_H */
--- a/base/applications/winhlp32/De.rc
+++ b/base/applications/winhlp32/De.rc
@ -128,4 +128,3 @@ END
 MENUITEM "Systemfarben verwenden",   MNID_CTXT_SYSTEM_COLORS
 END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Fr.rc
+++ b/base/applications/winhlp32/Fr.rc
@ -131,4 +131,3 @@ BEGIN
 		MENUITEM "Utiliser les couleurs système", MNID_CTXT_SYSTEM_COLORS
 	END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/It.rc
+++ b/base/applications/winhlp32/It.rc
@ -89,4 +89,3 @@ STID_FILE_NOT_FOUND_s	"Non è stato possibile trovare '%s'. Vuoi cercare questo
 STID_NO_RICHEDIT	"Non è stato possibile trovare un'implementazione richedit... Annullando"
 STID_PSH_INDEX,		"Argomenti di aiuto: "
 }
-#pragma code_page(default)
--- a/base/applications/winhlp32/Ja.rc
+++ b/base/applications/winhlp32/Ja.rc
@ -128,4 +128,3 @@ BEGIN
 		MENUITEM "システム カラーを使う",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Lt.rc
+++ b/base/applications/winhlp32/Lt.rc
@ -129,4 +129,3 @@ BEGIN
    MENUITEM "Naudoti sistemos spalvas", MNID_CTXT_SYSTEM_COLORS
  END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Nl.rc
+++ b/base/applications/winhlp32/Nl.rc
@ -127,4 +127,3 @@ BEGIN
 		MENUITEM "Gebruik systeem kleuren",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Pt.rc
+++ b/base/applications/winhlp32/Pt.rc
@ -204,4 +204,3 @@ BEGIN
 		MENUITEM "Usar cores do sistema",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Rm.rc
+++ b/base/applications/winhlp32/Rm.rc
@ -92,4 +92,3 @@ STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yoursel
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
 STID_PSH_INDEX,		"Help topics: "
 }
-#pragma code_page(default)
--- a/base/applications/winhlp32/Ro.rc
+++ b/base/applications/winhlp32/Ro.rc
@ -130,4 +130,3 @@ BEGIN
    MENUITEM "Utilizează culorile sistemului", MNID_CTXT_SYSTEM_COLORS
  END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Ru.rc
+++ b/base/applications/winhlp32/Ru.rc
@ -121,4 +121,3 @@ BEGIN
 		MENUITEM "Использовать системные цвета",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Si.rc
+++ b/base/applications/winhlp32/Si.rc
@ -126,4 +126,3 @@ BEGIN
 		MENUITEM "Uporabi sistemske barve",   MNID_CTXT_SYSTEM_COLORS
 	END
 END
-#pragma code_page(default)
--- a/base/applications/winhlp32/Zh.rc
+++ b/base/applications/winhlp32/Zh.rc
@ -160,4 +160,3 @@ STID_FILE_NOT_FOUND_s	"不能開啟檔案 '%s'. 你想要自己找這個檔案
 STID_NO_RICHEDIT	"找不到 richedit... 終止"
 STID_PSH_INDEX,		"幫助內容: "
 }
-#pragma code_page(default)
--- a/base/applications/winhlp32/rsrc.rc
+++ b/base/applications/winhlp32/rsrc.rc
@ -27,25 +27,27 @@ IDI_WINHELP ICON DISCARDABLE winhelp.ico
 #include "Bg.rc"
 #include "Cs.rc"
 #include "Da.rc"
-#include "De.rc"
 #include "En.rc"
 #include "Es.rc"
 #include "Fi.rc"
-#include "Fr.rc"
 #include "Hu.rc"
-#include "It.rc"
-#include "Ja.rc"
 #include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
 #include "No.rc"
 #include "Pl.rc"
+#include "Sk.rc"
+#include "Sv.rc"
+#include "Tr.rc"
+
+/* UTF-8 */
+#include "De.rc"
+#include "Fr.rc"
+#include "It.rc"
+#include "Ja.rc"
+#include "Lt.rc"
+#include "Nl.rc"
 #include "Pt.rc"
 #include "Rm.rc"
 #include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
-#include "Sk.rc"
-#include "Sv.rc"
-#include "Tr.rc"
 #include "Zh.rc"
--- a/base/applications/wordpad/Da.rc
+++ b/base/applications/wordpad/Da.rc
@ -106,6 +106,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Sort",      ID_COLOR_BLACK
+        MENUITEM "Mørkerød",  ID_COLOR_MAROON
+        MENUITEM "Grøn",      ID_COLOR_GREEN
+        MENUITEM "Oliven"     ID_COLOR_OLIVE
+        MENUITEM "Navy"       ID_COLOR_NAVY
+        MENUITEM "Lilla"      ID_COLOR_PURPLE
+        MENUITEM "Teal"       ID_COLOR_TEAL
+        MENUITEM "Grå"        ID_COLOR_GRAY
+        MENUITEM "Sølv"       ID_COLOR_SILVER
+        MENUITEM "Rød"        ID_COLOR_RED
+        MENUITEM "Lime"       ID_COLOR_LIME
+        MENUITEM "Gul"        ID_COLOR_YELLOW
+        MENUITEM "Blå"        ID_COLOR_BLUE
+        MENUITEM "Violet"     ID_COLOR_FUCHSIA
+        MENUITEM "Cyan"       ID_COLOR_AQUA
+        MENUITEM "Hvid"       ID_COLOR_WHITE
+        MENUITEM "Automatic"  ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Dato og tid"
@ -221,6 +245,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Luk"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
--- a/base/applications/wordpad/De.rc
+++ b/base/applications/wordpad/De.rc
@ -108,6 +108,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Schwarz"        ID_COLOR_BLACK
+        MENUITEM "Kastanienbraun" ID_COLOR_MAROON
+        MENUITEM "Grün"           ID_COLOR_GREEN
+        MENUITEM "Olivgrün"       ID_COLOR_OLIVE
+        MENUITEM "Dunkelblau"     ID_COLOR_NAVY
+        MENUITEM "Lila"           ID_COLOR_PURPLE
+        MENUITEM "Blaugrün"       ID_COLOR_TEAL
+        MENUITEM "Grau"           ID_COLOR_GRAY
+        MENUITEM "Silber"         ID_COLOR_SILVER
+        MENUITEM "Rot"            ID_COLOR_RED
+        MENUITEM "Hellgrün"       ID_COLOR_LIME
+        MENUITEM "Gelb"           ID_COLOR_YELLOW
+        MENUITEM "Blau"           ID_COLOR_BLUE
+        MENUITEM "Pink"           ID_COLOR_FUCHSIA
+        MENUITEM "Aquamarin"      ID_COLOR_AQUA
+        MENUITEM "Weiß"           ID_COLOR_WHITE
+        MENUITEM "Automatic"      ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Datum und Uhrzeit"
@ -218,9 +242,13 @@ BEGIN
    STRING_PREVIEW_PRINT,            "&Drucken"
    STRING_PREVIEW_NEXTPAGE,         "&Nächste"
    STRING_PREVIEW_PREVPAGE,         "&Vorherige"
-    STRING_PREVIEW_TWOPAGES,         "Zwei Seiten"
-    STRING_PREVIEW_ONEPAGE,          "Eine Seite"
+    STRING_PREVIEW_TWOPAGES,         "&Zwei Seiten"
+    STRING_PREVIEW_ONEPAGE,          "&Eine Seite"
+    STRING_PREVIEW_ZOOMIN,           "Ver&größern"
+    STRING_PREVIEW_ZOOMOUT,          "Ver&kleinern"
    STRING_PREVIEW_CLOSE,            "&Schließen"
+    STRING_PREVIEW_PAGE,             "Seite"
+    STRING_PREVIEW_PAGES,            "Seiten"
 END

 STRINGTABLE DISCARDABLE
@ -246,4 +274,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED, "Drucken ist nicht implementiert"
    STRING_MAX_TAB_STOPS,            "Es können nur maximal 32 Tabstopps definiert werden."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/En.rc
+++ b/base/applications/wordpad/En.rc
@ -106,6 +106,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Black",      ID_COLOR_BLACK
+        MENUITEM "Maroon",     ID_COLOR_MAROON
+        MENUITEM "Green",      ID_COLOR_GREEN
+        MENUITEM "Olive"       ID_COLOR_OLIVE
+        MENUITEM "Navy"        ID_COLOR_NAVY
+        MENUITEM "Purple"      ID_COLOR_PURPLE
+        MENUITEM "Teal"        ID_COLOR_TEAL
+        MENUITEM "Gray"        ID_COLOR_GRAY
+        MENUITEM "Silver"      ID_COLOR_SILVER
+        MENUITEM "Red"         ID_COLOR_RED
+        MENUITEM "Lime"        ID_COLOR_LIME
+        MENUITEM "Yellow"      ID_COLOR_YELLOW
+        MENUITEM "Blue"        ID_COLOR_BLUE
+        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
+        MENUITEM "Aqua"        ID_COLOR_AQUA
+        MENUITEM "White"       ID_COLOR_WHITE
+        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Date and time"
@ -213,6 +237,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Close"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
    STRING_UNITS_CM,                 "cm"
 END

--- a/base/applications/wordpad/Fr.rc
+++ b/base/applications/wordpad/Fr.rc
@ -109,6 +109,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Noir"        ID_COLOR_BLACK
+        MENUITEM "Marron"      ID_COLOR_MAROON
+        MENUITEM "Vert"        ID_COLOR_GREEN
+        MENUITEM "Olive"       ID_COLOR_OLIVE
+        MENUITEM "Bleu marine" ID_COLOR_NAVY
+        MENUITEM "Pourpre"     ID_COLOR_PURPLE
+        MENUITEM "Sarcelle"    ID_COLOR_TEAL
+        MENUITEM "Gris"        ID_COLOR_GRAY
+        MENUITEM "Argent"      ID_COLOR_SILVER
+        MENUITEM "Rouge"       ID_COLOR_RED
+        MENUITEM "Citron vert" ID_COLOR_LIME
+        MENUITEM "Jaune"       ID_COLOR_YELLOW
+        MENUITEM "Bleu"        ID_COLOR_BLUE
+        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
+        MENUITEM "Eau"         ID_COLOR_AQUA
+        MENUITEM "Blanc"       ID_COLOR_WHITE
+        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Date et heure"
@ -224,6 +248,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom avant"
    STRING_PREVIEW_ZOOMOUT,          "Zoom arrière"
    STRING_PREVIEW_CLOSE,            "Fermer"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED, "L'impression n'est pas implémentée"
    STRING_MAX_TAB_STOPS,             "Impossible d'ajouter plus de 32 taquets de tabulation."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Hu.rc
+++ b/base/applications/wordpad/Hu.rc
@ -106,6 +106,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Black",      ID_COLOR_BLACK
+        MENUITEM "Maroon",     ID_COLOR_MAROON
+        MENUITEM "Green",      ID_COLOR_GREEN
+        MENUITEM "Olive"       ID_COLOR_OLIVE
+        MENUITEM "Navy"        ID_COLOR_NAVY
+        MENUITEM "Purple"      ID_COLOR_PURPLE
+        MENUITEM "Teal"        ID_COLOR_TEAL
+        MENUITEM "Gray"        ID_COLOR_GRAY
+        MENUITEM "Silver"      ID_COLOR_SILVER
+        MENUITEM "Red"         ID_COLOR_RED
+        MENUITEM "Lime"        ID_COLOR_LIME
+        MENUITEM "Yellow"      ID_COLOR_YELLOW
+        MENUITEM "Blue"        ID_COLOR_BLUE
+        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
+        MENUITEM "Aqua"        ID_COLOR_AQUA
+        MENUITEM "White"       ID_COLOR_WHITE
+        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Date and time"
@ -221,6 +245,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Close"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
--- a/base/applications/wordpad/It.rc
+++ b/base/applications/wordpad/It.rc
@ -110,6 +110,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Nero"              ID_COLOR_BLACK
+        MENUITEM "Marrone rossiccio" ID_COLOR_MAROON
+        MENUITEM "Verde"             ID_COLOR_GREEN
+        MENUITEM "Verde oliva"       ID_COLOR_OLIVE
+        MENUITEM "Blu oltremare"     ID_COLOR_NAVY
+        MENUITEM "Propora"           ID_COLOR_PURPLE
+        MENUITEM "Teal"              ID_COLOR_TEAL
+        MENUITEM "Grigio"            ID_COLOR_GRAY
+        MENUITEM "Argento"           ID_COLOR_SILVER
+        MENUITEM "Rosso"             ID_COLOR_RED
+        MENUITEM "Verde cedro"       ID_COLOR_LIME
+        MENUITEM "Giallo"            ID_COLOR_YELLOW
+        MENUITEM "Blu"               ID_COLOR_BLUE
+        MENUITEM "Fucsia"            ID_COLOR_FUCHSIA
+        MENUITEM "Aqua"              ID_COLOR_AQUA
+        MENUITEM "Bianco"            ID_COLOR_WHITE
+        MENUITEM "Automatic"         ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Data e ora"
@ -217,6 +241,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Ingrandisci"
    STRING_PREVIEW_ZOOMOUT,          "Rimpicciolisci"
    STRING_PREVIEW_CLOSE,            "Chiudi"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
    STRING_UNITS_CM,                 "cm"
 END

@ -238,4 +264,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED,  "Stampa non  implementata"
    STRING_MAX_TAB_STOPS,             "Non si possono aggiungere più di 32 punti di fermata delle tabulazioni."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Ja.rc
+++ b/base/applications/wordpad/Ja.rc
@ -109,6 +109,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "黒"       ID_COLOR_BLACK
+        MENUITEM "茶色"     ID_COLOR_MAROON
+        MENUITEM "緑"       ID_COLOR_GREEN
+        MENUITEM "オリーブ" ID_COLOR_OLIVE
+        MENUITEM "紺"       ID_COLOR_NAVY
+        MENUITEM "紫"       ID_COLOR_PURPLE
+        MENUITEM "青緑"     ID_COLOR_TEAL
+        MENUITEM "灰色"     ID_COLOR_GRAY
+        MENUITEM "銀色"     ID_COLOR_SILVER
+        MENUITEM "赤"       ID_COLOR_RED
+        MENUITEM "黄緑"     ID_COLOR_LIME
+        MENUITEM "黄"       ID_COLOR_YELLOW
+        MENUITEM "青"       ID_COLOR_BLUE
+        MENUITEM "赤紫"     ID_COLOR_FUCHSIA
+        MENUITEM "水色"     ID_COLOR_AQUA
+        MENUITEM "白"       ID_COLOR_WHITE
+        MENUITEM "Automatic" ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "日付と時刻"
@ -224,6 +248,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "閉じる"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED,  "プリントが実装されていません。"
    STRING_MAX_TAB_STOPS,             "32以上なタブを追加できません。"
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Ko.rc
+++ b/base/applications/wordpad/Ko.rc
@ -107,6 +107,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "검정"          ID_COLOR_BLACK
+        MENUITEM "밤색"          ID_COLOR_MAROON
+        MENUITEM "녹색"          ID_COLOR_GREEN
+        MENUITEM "올리브색"      ID_COLOR_OLIVE
+        MENUITEM "짙은 남색"     ID_COLOR_NAVY
+        MENUITEM "심홍색"        ID_COLOR_PURPLE
+        MENUITEM "검은 물오리색" ID_COLOR_TEAL
+        MENUITEM "회색"          ID_COLOR_GRAY
+        MENUITEM "은색"          ID_COLOR_SILVER
+        MENUITEM "빨강"          ID_COLOR_RED
+        MENUITEM "라임색"        ID_COLOR_LIME
+        MENUITEM "노랑"          ID_COLOR_YELLOW
+        MENUITEM "파랑"          ID_COLOR_BLUE
+        MENUITEM "자홍색"        ID_COLOR_FUCHSIA
+        MENUITEM "물색"          ID_COLOR_AQUA
+        MENUITEM "하양"          ID_COLOR_WHITE
+        MENUITEM "자동"     ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "날짜와 시간"
@ -212,10 +236,12 @@ BEGIN
    STRING_PREVIEW_PREVPAGE,         "이전 페이지"
    STRING_PREVIEW_TWOPAGES,         "두 페이지"
    STRING_PREVIEW_ONEPAGE,          "한 페이지"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMIN,           "확대"
+    STRING_PREVIEW_ZOOMOUT,          "축소"
    STRING_PREVIEW_CLOSE,            "닫기"
-    STRING_UNITS_CM,             "cm"
+    STRING_PREVIEW_PAGE,             "페이지"
+    STRING_PREVIEW_PAGES,            "페이지들"
+    STRING_UNITS_CM,                 "cm"
 END

 STRINGTABLE DISCARDABLE
--- a/base/applications/wordpad/Lt.rc
+++ b/base/applications/wordpad/Lt.rc
@ -109,6 +109,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Juoda"          ID_COLOR_BLACK
+        MENUITEM "Kaštoninė"      ID_COLOR_MAROON
+        MENUITEM "Žalia"          ID_COLOR_GREEN
+        MENUITEM "Alyvinė"        ID_COLOR_OLIVE
+        MENUITEM "Ultramarinas"   ID_COLOR_NAVY
+        MENUITEM "Purpurinė"      ID_COLOR_PURPLE
+        MENUITEM "Neutrali ciano" ID_COLOR_TEAL
+        MENUITEM "Pilka"          ID_COLOR_GRAY
+        MENUITEM "Sidabrinė"      ID_COLOR_SILVER
+        MENUITEM "Raudona"        ID_COLOR_RED
+        MENUITEM "Gelsvai žalsva" ID_COLOR_LIME
+        MENUITEM "Geltona"        ID_COLOR_YELLOW
+        MENUITEM "Mėlyna"         ID_COLOR_BLUE
+        MENUITEM "Fuksija"        ID_COLOR_FUCHSIA
+        MENUITEM "Žydra"          ID_COLOR_AQUA
+        MENUITEM "Balta"          ID_COLOR_WHITE
+        MENUITEM "Automatic"      ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Data ir laikas"
@ -224,6 +248,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Didinti"
    STRING_PREVIEW_ZOOMOUT,          "Mažinti"
    STRING_PREVIEW_CLOSE,            "Užverti"
+    STRING_PREVIEW_PAGE,             "Puslapis"
+    STRING_PREVIEW_PAGES,            "Puslapiai"
 END

 STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED,  "Spausdinimas nerealizuotas"
    STRING_MAX_TAB_STOPS,             "Negalima pridėti daugiau negu 32-jų tabuliavimo pozicijų."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Nl.rc
+++ b/base/applications/wordpad/Nl.rc
@ -107,6 +107,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Zwart"         ID_COLOR_BLACK
+        MENUITEM "Kastanjebruin" ID_COLOR_MAROON
+        MENUITEM "Groen"         ID_COLOR_GREEN
+        MENUITEM "Olijfgroen"    ID_COLOR_OLIVE
+        MENUITEM "Marineblauw"   ID_COLOR_NAVY
+        MENUITEM "Paars"         ID_COLOR_PURPLE
+        MENUITEM "Groenblauw"    ID_COLOR_TEAL
+        MENUITEM "Grijs"         ID_COLOR_GRAY
+        MENUITEM "Zilver"        ID_COLOR_SILVER
+        MENUITEM "Rood"          ID_COLOR_RED
+        MENUITEM "Lichtgroen"    ID_COLOR_LIME
+        MENUITEM "Geel"          ID_COLOR_YELLOW
+        MENUITEM "Blauw"         ID_COLOR_BLUE
+        MENUITEM "Fuchsiapaars"  ID_COLOR_FUCHSIA
+        MENUITEM "Zeeblauw"      ID_COLOR_AQUA
+        MENUITEM "Wit"           ID_COLOR_WHITE
+        MENUITEM "Automatic"     ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Datum en tijd"
@ -214,6 +238,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Sluiten"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
--- a/base/applications/wordpad/No.rc
+++ b/base/applications/wordpad/No.rc
@ -108,6 +108,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Svart"      ID_COLOR_BLACK
+        MENUITEM "Rødbrun"    ID_COLOR_MAROON
+        MENUITEM "Grønn"      ID_COLOR_GREEN
+        MENUITEM "Oliven"     ID_COLOR_OLIVE
+        MENUITEM "Marineblå"  ID_COLOR_NAVY
+        MENUITEM "Purpur"     ID_COLOR_PURPLE
+        MENUITEM "Teal"       ID_COLOR_TEAL
+        MENUITEM "Grå"        ID_COLOR_GRAY
+        MENUITEM "Sølv"       ID_COLOR_SILVER
+        MENUITEM "Rød"        ID_COLOR_RED
+        MENUITEM "Lime-grønn" ID_COLOR_LIME
+        MENUITEM "Gul"        ID_COLOR_YELLOW
+        MENUITEM "Blå"        ID_COLOR_BLUE
+        MENUITEM "Fuchsia"    ID_COLOR_FUCHSIA
+        MENUITEM "Aqua"       ID_COLOR_AQUA
+        MENUITEM "Hvit"       ID_COLOR_WHITE
+        MENUITEM "Automatic"  ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Dato og klokkeslett"
@ -223,6 +247,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Lukk"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -248,4 +274,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED,  "Utskriftfunksjonen er ikke laget ennå."
    STRING_MAX_TAB_STOPS,             "Kan ikke legge til mer enn 32 tabulatorstopp."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Pl.rc
+++ b/base/applications/wordpad/Pl.rc
@ -107,6 +107,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Czarny"       ID_COLOR_BLACK
+        MENUITEM "Kasztanowy"   ID_COLOR_MAROON
+        MENUITEM "Zielony"      ID_COLOR_GREEN
+        MENUITEM "Oliwkowy"     ID_COLOR_OLIVE
+        MENUITEM "Granatowy"    ID_COLOR_NAVY
+        MENUITEM "Purpurowy"    ID_COLOR_PURPLE
+        MENUITEM "Zielonomodry" ID_COLOR_TEAL
+        MENUITEM "Szary"        ID_COLOR_GRAY
+        MENUITEM "Srebrny"      ID_COLOR_SILVER
+        MENUITEM "Czerwony"     ID_COLOR_RED
+        MENUITEM "Limonowy"     ID_COLOR_LIME
+        MENUITEM "¯ó³ty"        ID_COLOR_YELLOW
+        MENUITEM "Niebieski"    ID_COLOR_BLUE
+        MENUITEM "Fuksja"       ID_COLOR_FUCHSIA
+        MENUITEM "Akwamaryna"   ID_COLOR_AQUA
+        MENUITEM "Bia³y"        ID_COLOR_WHITE
+        MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Data i godzina"
@ -222,6 +246,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Zamknij"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
--- a/base/applications/wordpad/Pt.rc
+++ b/base/applications/wordpad/Pt.rc
@ -110,6 +110,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Preto"         ID_COLOR_BLACK
+        MENUITEM "Castanho"      ID_COLOR_MAROON
+        MENUITEM "Verde"         ID_COLOR_GREEN
+        MENUITEM "Verde-oliva"   ID_COLOR_OLIVE
+        MENUITEM "Azul-marinho"  ID_COLOR_NAVY
+        MENUITEM "Roxo"          ID_COLOR_PURPLE
+        MENUITEM "Azul-petróleo" ID_COLOR_TEAL
+        MENUITEM "Cinza"         ID_COLOR_GRAY
+        MENUITEM "Prateado"      ID_COLOR_SILVER
+        MENUITEM "Vermelho"      ID_COLOR_RED
+        MENUITEM "Verde-limão"   ID_COLOR_LIME
+        MENUITEM "Amarelo"       ID_COLOR_YELLOW
+        MENUITEM "Azul"          ID_COLOR_BLUE
+        MENUITEM "Fúcsia"        ID_COLOR_FUCHSIA
+        MENUITEM "Azul-piscina"  ID_COLOR_AQUA
+        MENUITEM "Branco"        ID_COLOR_WHITE
+        MENUITEM "Automatic"     ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Data e hora"
@ -225,6 +249,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Fechar"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -250,4 +276,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED, "Impressão não implementada"
    STRING_MAX_TAB_STOPS,             "Não pode adicionar mais de 32 tabs."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Ru.rc
+++ b/base/applications/wordpad/Ru.rc
@ -109,6 +109,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Чёрный"         ID_COLOR_BLACK
+        MENUITEM "Тёмно-бордовый" ID_COLOR_MAROON
+        MENUITEM "Зелёный"        ID_COLOR_GREEN
+        MENUITEM "Оливковый"      ID_COLOR_OLIVE
+        MENUITEM "Тёмно-синий"    ID_COLOR_NAVY
+        MENUITEM "Пурпурный"      ID_COLOR_PURPLE
+        MENUITEM "Морской волны"  ID_COLOR_TEAL
+        MENUITEM "Серый"          ID_COLOR_GRAY
+        MENUITEM "Серебряный"     ID_COLOR_SILVER
+        MENUITEM "Красный"        ID_COLOR_RED
+        MENUITEM "Лимонный"       ID_COLOR_LIME
+        MENUITEM "Жёлтый"         ID_COLOR_YELLOW
+        MENUITEM "Синий"          ID_COLOR_BLUE
+        MENUITEM "Ярко-розовый"   ID_COLOR_FUCHSIA
+        MENUITEM "Голубой"        ID_COLOR_AQUA
+        MENUITEM "Белый"          ID_COLOR_WHITE
+        MENUITEM "Automatic"      ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Дата и время"
@ -221,9 +245,11 @@ BEGIN
    STRING_PREVIEW_PREVPAGE,         "Предыдущая страница"
    STRING_PREVIEW_TWOPAGES,         "Две страницы"
    STRING_PREVIEW_ONEPAGE,          "Одна страница"
-    STRING_PREVIEW_ZOOMIN,           "Zoom in"
-    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
+    STRING_PREVIEW_ZOOMIN,           "Приблизить"
+    STRING_PREVIEW_ZOOMOUT,          "Отдалить"
    STRING_PREVIEW_CLOSE,            "Закрыть"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED, "Печать не поддерживается"
    STRING_MAX_TAB_STOPS,             "Нельзя добавить более 32 позиций табуляции."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Si.rc
+++ b/base/applications/wordpad/Si.rc
@ -108,6 +108,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Črna"        ID_COLOR_BLACK
+        MENUITEM "Kostanjeva"  ID_COLOR_MAROON
+        MENUITEM "Zelena"      ID_COLOR_GREEN
+        MENUITEM "Olivna"      ID_COLOR_OLIVE
+        MENUITEM "Mornariška"  ID_COLOR_NAVY
+        MENUITEM "Vijolična"   ID_COLOR_PURPLE
+        MENUITEM "Zelenomodra" ID_COLOR_TEAL
+        MENUITEM "Siva"        ID_COLOR_GRAY
+        MENUITEM "Srebrna"     ID_COLOR_SILVER
+        MENUITEM "Rdeča"       ID_COLOR_RED
+        MENUITEM "Citronska"   ID_COLOR_LIME
+        MENUITEM "Rumena"      ID_COLOR_YELLOW
+        MENUITEM "Modra"       ID_COLOR_BLUE
+        MENUITEM "Roza"        ID_COLOR_FUCHSIA
+        MENUITEM "Akvamarin"   ID_COLOR_AQUA
+        MENUITEM "Bela"        ID_COLOR_WHITE
+        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Datum in čas"
@ -223,6 +247,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Zapri"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -249,4 +275,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED,  "Tiskanje (še) ni na voljo"
    STRING_MAX_TAB_STOPS,             "Ne morem vstaviti več kot 32 položajev tabulatorja."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Sv.rc
+++ b/base/applications/wordpad/Sv.rc
@ -108,6 +108,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Svart"     ID_COLOR_BLACK
+        MENUITEM "Rödbrun"   ID_COLOR_MAROON
+        MENUITEM "Grön"      ID_COLOR_GREEN
+        MENUITEM "Oliv"      ID_COLOR_OLIVE
+        MENUITEM "Navy"      ID_COLOR_NAVY
+        MENUITEM "Lila"      ID_COLOR_PURPLE
+        MENUITEM "Teal"      ID_COLOR_TEAL
+        MENUITEM "Grå"       ID_COLOR_GRAY
+        MENUITEM "Silver"    ID_COLOR_SILVER
+        MENUITEM "Röd"       ID_COLOR_RED
+        MENUITEM "Lime"      ID_COLOR_LIME
+        MENUITEM "Gul"       ID_COLOR_YELLOW
+        MENUITEM "Blå"       ID_COLOR_BLUE
+        MENUITEM "Fuchsia"   ID_COLOR_FUCHSIA
+        MENUITEM "Aqua"      ID_COLOR_AQUA
+        MENUITEM "Vit"       ID_COLOR_WHITE
+        MENUITEM "Automatic" ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Datum och tid"
@ -223,6 +247,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zooma in"
    STRING_PREVIEW_ZOOMOUT,          "Zooma ut"
    STRING_PREVIEW_CLOSE,            "Stäng"
+    STRING_PREVIEW_PAGE,             "Sida"
+    STRING_PREVIEW_PAGES,            "Sidor"
 END

 STRINGTABLE DISCARDABLE
@ -248,4 +274,3 @@ BEGIN
    STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat."
    STRING_MAX_TAB_STOPS,            "Kan ej lägga till mer än 32 tabbstopp."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Tr.rc
+++ b/base/applications/wordpad/Tr.rc
@ -108,6 +108,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Siyah"        ID_COLOR_BLACK
+        MENUITEM "Koyu Kýrmýzý" ID_COLOR_MAROON
+        MENUITEM "Yeþil"        ID_COLOR_GREEN
+        MENUITEM "Koyu Sarý"    ID_COLOR_OLIVE
+        MENUITEM "Koyu Mavi"    ID_COLOR_NAVY
+        MENUITEM "Mor"          ID_COLOR_PURPLE
+        MENUITEM "Deniz Mavisi" ID_COLOR_TEAL
+        MENUITEM "Gri"          ID_COLOR_GRAY
+        MENUITEM "Gümüþ"        ID_COLOR_SILVER
+        MENUITEM "Kýrmýzý"      ID_COLOR_RED
+        MENUITEM "Parlak Yeþil" ID_COLOR_LIME
+        MENUITEM "Sarý"         ID_COLOR_YELLOW
+        MENUITEM "Mavi"         ID_COLOR_BLUE
+        MENUITEM "Pembe"        ID_COLOR_FUCHSIA
+        MENUITEM "Turkuaz"      ID_COLOR_AQUA
+        MENUITEM "Beyaz"        ID_COLOR_WHITE
+        MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Date and time"
@ -223,6 +247,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "Close"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
--- a/base/applications/wordpad/Uk.rc
+++ b/base/applications/wordpad/Uk.rc
@ -113,6 +113,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "×îðíèé"       ID_COLOR_BLACK
+        MENUITEM "Áðóíàòíèé"    ID_COLOR_MAROON
+        MENUITEM "Çåëåíèé"      ID_COLOR_GREEN
+        MENUITEM "Îëèâêîâèé"    ID_COLOR_OLIVE
+        MENUITEM "Ñèí³é"        ID_COLOR_NAVY
+        MENUITEM "Ïóðïóðíèé"    ID_COLOR_PURPLE
+        MENUITEM "Çåëåíî-ñèí³é" ID_COLOR_TEAL
+        MENUITEM "Ñ³ðèé"        ID_COLOR_GRAY
+        MENUITEM "Ñð³áíèé"      ID_COLOR_SILVER
+        MENUITEM "×åðâîíèé"     ID_COLOR_RED
+        MENUITEM "Ñàëàòîâèé"    ID_COLOR_LIME
+        MENUITEM "Æîâòèé"       ID_COLOR_YELLOW
+        MENUITEM "Ãîëóáèé"      ID_COLOR_BLUE
+        MENUITEM "Ô³îëåòîâèé"   ID_COLOR_FUCHSIA
+        MENUITEM "Àêâàìàðèí"    ID_COLOR_AQUA
+        MENUITEM "Á³ëèé"        ID_COLOR_WHITE
+        MENUITEM "Automatic"    ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "Дата та час"
@ -220,6 +244,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Збільшити"
    STRING_PREVIEW_ZOOMOUT,          "Зменшити"
    STRING_PREVIEW_CLOSE,            "Закрити"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
    STRING_UNITS_CM,                 "cm"
 END

@ -250,4 +276,3 @@ BEGIN
    STRING_ALIGN_RIGHT,           "По правому Краю"
    STRING_ALIGN_CENTER,          "По Центру"
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/Zh.rc
+++ b/base/applications/wordpad/Zh.rc
@ -111,6 +111,30 @@ BEGIN
    END
 END

+IDM_COLOR_POPUP MENU DISCARDABLE
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Black",      ID_COLOR_BLACK
+        MENUITEM "Maroon",     ID_COLOR_MAROON
+        MENUITEM "Green",      ID_COLOR_GREEN
+        MENUITEM "Olive"       ID_COLOR_OLIVE
+        MENUITEM "Navy"        ID_COLOR_NAVY
+        MENUITEM "Purple"      ID_COLOR_PURPLE
+        MENUITEM "Teal"        ID_COLOR_TEAL
+        MENUITEM "Gray"        ID_COLOR_GRAY
+        MENUITEM "Silver"      ID_COLOR_SILVER
+        MENUITEM "Red"         ID_COLOR_RED
+        MENUITEM "Lime"        ID_COLOR_LIME
+        MENUITEM "Yellow"      ID_COLOR_YELLOW
+        MENUITEM "Blue"        ID_COLOR_BLUE
+        MENUITEM "Fuchsia"     ID_COLOR_FUCHSIA
+        MENUITEM "Aqua"        ID_COLOR_AQUA
+        MENUITEM "White"       ID_COLOR_WHITE
+        MENUITEM "Automatic"   ID_COLOR_AUTOMATIC
+    END
+END
+
 IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "日期和时间"
@ -226,6 +250,8 @@ BEGIN
    STRING_PREVIEW_ZOOMIN,           "Zoom in"
    STRING_PREVIEW_ZOOMOUT,          "Zoom out"
    STRING_PREVIEW_CLOSE,            "关闭"
+    STRING_PREVIEW_PAGE,             "Page"
+    STRING_PREVIEW_PAGES,            "Pages"
 END

 STRINGTABLE DISCARDABLE
@ -473,4 +499,3 @@ BEGIN
    STRING_OPEN_FAILED,               "不能開啟檔案."
    STRING_OPEN_ACCESS_DENIED,        "你沒有開啟檔案的權力."
 END
-#pragma code_page(default)
--- a/base/applications/wordpad/formatbar.bmp
+++ b/base/applications/wordpad/formatbar.bmp
--- a/base/applications/wordpad/print.c
+++ b/base/applications/wordpad/print.c
--- a/base/applications/wordpad/registry.c
+++ b/base/applications/wordpad/registry.c
@ -27,6 +27,7 @@
 static const WCHAR key_recentfiles[] = {'R','e','c','e','n','t',' ','f','i','l','e',
                                        ' ','l','i','s','t',0};
 static const WCHAR key_options[] = {'O','p','t','i','o','n','s',0};
+static const WCHAR key_settings[] = {'S','e','t','t','i','n','g','s',0};
 static const WCHAR key_rtf[] = {'R','T','F',0};
 static const WCHAR key_text[] = {'T','e','x','t',0};

@ -94,9 +95,14 @@ void registry_set_options(HWND hMainWnd)
        RegSetValueExW(hKey, var_maximized, 0, REG_DWORD, (LPBYTE)&isMaximized, sizeof(DWORD));

        registry_set_pagemargins(hKey);
+        RegCloseKey(hKey);
    }

-    RegCloseKey(hKey);
+    if(registry_get_handle(&hKey, &action, key_settings) == ERROR_SUCCESS)
+    {
+        registry_set_previewpages(hKey);
+        RegCloseKey(hKey);
+    }
 }

 void registry_read_winrect(RECT* rc)
@ -339,6 +345,13 @@ void registry_read_options(void)
        registry_read_pagemargins(hKey);
        RegCloseKey(hKey);
    }
+
+    if(registry_get_handle(&hKey, 0, key_settings) != ERROR_SUCCESS) {
+        registry_read_previewpages(NULL);
+    } else {
+        registry_read_previewpages(hKey);
+        RegCloseKey(hKey);
+    }
 }

 static void registry_read_formatopts(int index, LPCWSTR key, DWORD barState[], DWORD wordWrap[])
--- a/base/applications/wordpad/rsrc.rc
+++ b/base/applications/wordpad/rsrc.rc
@ -1,4 +1,4 @@
-/*
+/*
 * Copyright 2004 by Krzysztof Foltman
 * Copyright 2007 by Alexander N. Sørnes <alex@thehandofagony.com>
 *
@ -61,22 +61,28 @@ IDI_WRI ICON "wri.ico"
 /* @makedep: txt.ico */
 IDI_TXT ICON "txt.ico"

+/* @makedep: zoom.cur */
+IDC_ZOOM CURSOR "zoom.cur"
+
+
 #include "Da.rc"
-#include "De.rc"
 #include "En.rc"
-#include "Fr.rc"
 #include "Hu.rc"
+#include "Ko.rc"
+#include "Nl.rc"
+#include "Pl.rc"
+#include "Tr.rc"
+
+/* UTF-8 */
+#include "De.rc"
+#include "Fr.rc"
 #include "It.rc"
 #include "Ja.rc"
-#include "Ko.rc"
 #include "Lt.rc"
-#include "Nl.rc"
 #include "No.rc"
-#include "Pl.rc"
 #include "Pt.rc"
 #include "Ru.rc"
 #include "Si.rc"
 #include "Sv.rc"
-#include "Tr.rc"
 #include "Uk.rc"
 #include "Zh.rc"
--- a/base/applications/wordpad/wordpad.c
+++ b/base/applications/wordpad/wordpad.c
@ -63,6 +63,7 @@ static HWND hMainWnd;
 static HWND hEditorWnd;
 static HWND hFindWnd;
 static HMENU hPopupMenu;
+static HMENU hColorPopupMenu;

 static UINT ID_FINDMSGSTRING;

@ -1836,17 +1837,18 @@ static LRESULT OnCreate( HWND hWnd )

    hFormatBarWnd = CreateToolbarEx(hReBarWnd,
         CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON,
-         IDC_FORMATBAR, 7, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON));
+         IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON));

    AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD);
    AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC);
    AddButton(hFormatBarWnd, 2, ID_FORMAT_UNDERLINE);
+    AddButton(hFormatBarWnd, 3, ID_FORMAT_COLOR);
    AddSeparator(hFormatBarWnd);
-    AddButton(hFormatBarWnd, 3, ID_ALIGN_LEFT);
-    AddButton(hFormatBarWnd, 4, ID_ALIGN_CENTER);
-    AddButton(hFormatBarWnd, 5, ID_ALIGN_RIGHT);
+    AddButton(hFormatBarWnd, 4, ID_ALIGN_LEFT);
+    AddButton(hFormatBarWnd, 5, ID_ALIGN_CENTER);
+    AddButton(hFormatBarWnd, 6, ID_ALIGN_RIGHT);
    AddSeparator(hFormatBarWnd);
-    AddButton(hFormatBarWnd, 6, ID_BULLET);
+    AddButton(hFormatBarWnd, 7, ID_BULLET);

    SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0);

@ -2001,6 +2003,15 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
    return 0;
 }

+/* Copied from dlls/comdlg32/fontdlg.c */
+static const COLORREF textcolors[]=
+{
+    0x00000000L,0x00000080L,0x00008000L,0x00008080L,
+    0x00800000L,0x00800080L,0x00808000L,0x00808080L,
+    0x00c0c0c0L,0x000000ffL,0x0000ff00L,0x0000ffffL,
+    0x00ff0000L,0x00ff00ffL,0x00ffff00L,0x00FFFFFFL
+};
+
 static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
    HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR);
@ -2098,7 +2109,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
        break;

    case ID_PRINT_QUICK:
-        print_quick(wszFileName);
+        print_quick(hMainWnd, wszFileName);
        target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);
        break;

@ -2106,7 +2117,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
        {
            int index = reg_formatindex(fileFormat);
            DWORD tmp = barState[index];
-            barState[index] = 0;
+            barState[index] = 1 << BANDID_STATUSBAR;
            set_bar_states();
            barState[index] = tmp;
            ShowWindow(hEditorWnd, FALSE);
@ -2152,6 +2163,46 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
        break;
        }

+    case ID_FORMAT_COLOR:
+    {
+        HWND hReBarWnd = GetDlgItem(hWnd, IDC_REBAR);
+        HWND hFormatBarWnd = GetDlgItem(hReBarWnd, IDC_FORMATBAR);
+        HMENU hPop;
+        RECT itemrc;
+        POINT pt;
+        int mid;
+        int itemidx = SendMessage(hFormatBarWnd, TB_COMMANDTOINDEX, ID_FORMAT_COLOR, 0);
+
+        SendMessage(hFormatBarWnd, TB_GETITEMRECT, itemidx, (LPARAM)&itemrc);
+        pt.x = itemrc.left;
+        pt.y = itemrc.bottom;
+        ClientToScreen(hFormatBarWnd, &pt);
+        hPop = GetSubMenu(hColorPopupMenu, 0);
+        mid = TrackPopupMenu(hPop, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON |
+                                   TPM_RETURNCMD | TPM_NONOTIFY,
+                             pt.x, pt.y, 0, hWnd, 0);
+        if (mid >= ID_COLOR_FIRST && mid <= ID_COLOR_AUTOMATIC)
+        {
+            CHARFORMAT2W fmt;
+
+            ZeroMemory(&fmt, sizeof(fmt));
+            fmt.cbSize = sizeof(fmt);
+            SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
+
+            fmt.dwMask = CFM_COLOR;
+
+            if (mid < ID_COLOR_AUTOMATIC) {
+                fmt.crTextColor = textcolors[mid - ID_COLOR_FIRST];
+                fmt.dwEffects &= ~CFE_AUTOCOLOR;
+            } else {
+                fmt.dwEffects |= CFE_AUTOCOLOR;
+            }
+
+            SendMessageW(hwndEditor, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
+        }
+        break;
+    }
+
    case ID_EDIT_CUT:
        PostMessageW(hwndEditor, WM_CUT, 0, 0);
        break;
@ -2618,6 +2669,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar
    set_bar_states();
    set_fileformat(SF_RTF);
    hPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_POPUP));
+    hColorPopupMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_COLOR_POPUP));
    get_default_printer_opts();
    target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]);

--- a/base/applications/wordpad/wordpad.h
+++ b/base/applications/wordpad/wordpad.h
@ -80,6 +80,7 @@
 #define ID_FORMAT_BOLD 1400
 #define ID_FORMAT_ITALIC 1401
 #define ID_FORMAT_UNDERLINE 1402
+#define ID_FORMAT_COLOR 1403

 #define ID_TOGGLE_TOOLBAR 1500
 #define ID_TOGGLE_FORMATBAR 1501
@ -133,6 +134,25 @@
 #define ID_ABOUT 1603
 #define ID_VIEWPROPERTIES 1604

+#define ID_COLOR_FIRST 1800
+#define ID_COLOR_BLACK 1800
+#define ID_COLOR_MAROON 1801
+#define ID_COLOR_GREEN 1802
+#define ID_COLOR_OLIVE 1803
+#define ID_COLOR_NAVY 1804
+#define ID_COLOR_PURPLE 1805
+#define ID_COLOR_TEAL 1806
+#define ID_COLOR_GRAY 1807
+#define ID_COLOR_SILVER 1808
+#define ID_COLOR_RED 1809
+#define ID_COLOR_LIME 1810
+#define ID_COLOR_YELLOW 1811
+#define ID_COLOR_BLUE 1812
+#define ID_COLOR_FUCHSIA 1813
+#define ID_COLOR_AQUA 1814
+#define ID_COLOR_WHITE 1815
+#define ID_COLOR_AUTOMATIC 1816
+
 #define IDC_STATUSBAR 2000
 #define IDC_EDITOR 2001
 #define IDC_TOOLBAR 2002
@ -159,6 +179,7 @@

 #define IDM_MAINMENU 2200
 #define IDM_POPUP 2201
+#define IDM_COLOR_POPUP 2202

 #define IDB_TOOLBAR 100
 #define IDB_FORMATBAR 101
@ -168,6 +189,8 @@
 #define IDI_WRI 104
 #define IDI_TXT 105

+#define IDC_ZOOM 106
+
 #define STRING_ALL_FILES 1400
 #define STRING_TEXT_FILES_TXT 1401
 #define STRING_TEXT_FILES_UNICODE_TXT 1402
@ -195,8 +218,10 @@
 #define STRING_PREVIEW_ZOOMIN 1453
 #define STRING_PREVIEW_ZOOMOUT 1454
 #define STRING_PREVIEW_CLOSE 1455
+#define STRING_PREVIEW_PAGE 1456
+#define STRING_PREVIEW_PAGES 1457

-#define STRING_UNITS_CM 1456
+#define STRING_UNITS_CM 1458

 #define STRING_DEFAULT_FILENAME 1700
 #define STRING_PROMPT_SAVE_CHANGES 1701
@ -217,7 +242,7 @@ LPWSTR file_basename(LPWSTR);
 void dialog_printsetup(HWND);
 void dialog_print(HWND, LPWSTR);
 void target_device(HWND, DWORD);
-void print_quick(LPWSTR);
+void print_quick(HWND, LPWSTR);
 LRESULT preview_command(HWND, WPARAM);
 void init_preview(HWND, LPWSTR);
 void close_preview(HWND);
@ -226,6 +251,8 @@ LRESULT print_preview(HWND);
 void get_default_printer_opts(void);
 void registry_set_pagemargins(HKEY);
 void registry_read_pagemargins(HKEY);
+void registry_set_previewpages(HKEY hKey);
+void registry_read_previewpages(HKEY hKey);
 LRESULT CALLBACK ruler_proc(HWND, UINT, WPARAM, LPARAM);
 void redraw_ruler(HWND);

--- a/base/applications/wordpad/zoom.cur
+++ b/base/applications/wordpad/zoom.cur
--- a/base/applications/write/De.rc
+++ b/base/applications/write/De.rc
@ -27,4 +27,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Der Start von Wordpad ist fehlgeschlagen"
 }
-#pragma code_page(default)
--- a/base/applications/write/Fr.rc
+++ b/base/applications/write/Fr.rc
@ -28,4 +28,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Wordpad n'a pas pu être démarré"
 }
-#pragma code_page(default)
--- a/base/applications/write/It.rc
+++ b/base/applications/write/It.rc
@ -29,4 +29,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Impossibile avviare WordPad"
 }
-#pragma code_page(default)
--- a/base/applications/write/Ja.rc
+++ b/base/applications/write/Ja.rc
@ -29,4 +29,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Wordpad の起動に失敗しました"
 }
-#pragma code_page(default)
--- a/base/applications/write/Lt.rc
+++ b/base/applications/write/Lt.rc
@ -29,4 +29,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Nepavyko paleisti Wordpad"
 }
-#pragma code_page(default)
--- a/base/applications/write/Ro.rc
+++ b/base/applications/write/Ro.rc
@ -27,4 +27,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Execuția Wordpad a eșuat"
 }
-#pragma code_page(default)
--- a/base/applications/write/Ru.rc
+++ b/base/applications/write/Ru.rc
@ -29,4 +29,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Не удалось запустить Wordpad"
 }
-#pragma code_page(default)
--- a/base/applications/write/Si.rc
+++ b/base/applications/write/Si.rc
@ -28,4 +28,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Zagon programa Wordpad ni uspel"
 }
-#pragma code_page(default)
--- a/base/applications/write/Uk.rc
+++ b/base/applications/write/Uk.rc
@ -31,4 +31,3 @@ STRINGTABLE
 {
    IDS_FAILED, "Не вдалось запустити Wordpad"
 }
-#pragma code_page(default)
--- a/base/applications/write/rsrc.rc
+++ b/base/applications/write/rsrc.rc
@ -20,17 +20,21 @@

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#include "De.rc"
 #include "En.rc"
+#include "Ko.rc"
+#include "Nl.rc"
+#include "No.rc"
+#include "Pl.rc"
+#include "Pt.rc"
+#include "Sv.rc"
+
+/* UTF-8 */
+#include "De.rc"
 #include "Fr.rc"
 #include "It.rc"
 #include "Ja.rc"
-#include "Ko.rc"
 #include "Lt.rc"
-#include "Nl.rc"
-#include "Pt.rc"
 #include "Ro.rc"
 #include "Ru.rc"
 #include "Si.rc"
-#include "Sv.rc"
 #include "Uk.rc"