- Update Russian translation

- Added some functionality

svn path=/trunk/; revision=31681

diff --git a/reactos/dll/cpl/input/add.c b/reactos/dll/cpl/input/add.c
index e6ceb23..ec2386f 100644 (file)
--- a/reactos/dll/cpl/input/add.c
+++ b/reactos/dll/cpl/input/add.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/advanced.c b/reactos/dll/cpl/input/advanced.c
index 7ecfc4e..ebfb19d 100644 (file)
--- a/reactos/dll/cpl/input/advanced.c
+++ b/reactos/dll/cpl/input/advanced.c
@@ -26,19 +26,64 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 
+static VOID
+InitControls(HWND hWnd)
+{
+    HKEY hKey;
+    DWORD dwValue, dwType, dwSize;
+
+    if (SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+    {
+        EnableWindow(GetDlgItem(hWnd, IDC_SUPPORT_ADV_SERV_CHECKBOX),FALSE);
+        EnableWindow(GetDlgItem(hWnd, IDC_SUPPORT_ADV_SERV_TEXT),FALSE);
+    }
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+    {
+        dwType = REG_DWORD;
+        dwSize = sizeof(DWORD);
+        if (RegQueryValueEx(hKey,
+                            L"Disable Thread Input Manager",
+                            NULL,
+                            &dwType,
+                            (LPBYTE)&dwValue,
+                            &dwSize) == ERROR_SUCCESS)
+        {
+            if (dwValue == 0x0)
+                SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_SETCHECK, 0, 0);
+            if (dwValue == 0x1)
+                SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_SETCHECK, 1, 1);
+        }
+    }
+    RegCloseKey(hKey);
+}
+
+static VOID
+SaveSettings(HWND hWnd)
+{
+    HKEY hKey;
+    DWORD dwValue, dwType, dwSize;
+
+    if (RegOpenKey(HKEY_CURRENT_USER, L"Software\\Microsoft\\CTF",&hKey) == ERROR_SUCCESS)
+    {
+        dwType = REG_DWORD;
+        dwSize = sizeof(DWORD);
+        if (SendDlgItemMessage(hWnd, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+            dwValue = 0x1;
+        else
+            dwValue = 0x0;
+               RegSetValueEx(hKey,
+                      L"Disable Thread Input Manager",
+                      0,
+                      REG_DWORD,
+                      (LPBYTE)&dwValue,
+                      sizeof(DWORD));
+    }
+    RegCloseKey(hKey);
+}
+
 /* Property page dialog callback */
 INT_PTR CALLBACK
 AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -50,14 +95,37 @@ AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     switch (uMsg)
     {
         case WM_INITDIALOG:
+        {
+            InitControls(hwndDlg);
+        }
+            break;
+        case WM_NOTIFY:
+        {
+            LPNMHDR lpnm = (LPNMHDR)lParam;
+            if (lpnm->code == (UINT)PSN_APPLY)
+            {
+                SaveSettings(hwndDlg);
+            }
+        }
             break;
-
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {
                 case IDC_SUPPORT_ADV_SERV_CHECKBOX:
                 case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX:
+                {
+                    if (SendDlgItemMessage(hwndDlg, IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, BM_GETCHECK, 0, 0) == BST_CHECKED)
+                    {
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_CHECKBOX),FALSE);
+                                               EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),FALSE);
+                    }
+                    else
+                    {
+                        EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_CHECKBOX),TRUE);
+                                               EnableWindow(GetDlgItem(hwndDlg, IDC_SUPPORT_ADV_SERV_TEXT),TRUE);
+                    }
                     PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                }
                     break;
             }
             break;

diff --git a/reactos/dll/cpl/input/changekeyseq.c b/reactos/dll/cpl/input/changekeyseq.c
index e466e62..422204f 100644 (file)
--- a/reactos/dll/cpl/input/changekeyseq.c
+++ b/reactos/dll/cpl/input/changekeyseq.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/input.c b/reactos/dll/cpl/input/input.c
index 0502878..093333f 100644 (file)
--- a/reactos/dll/cpl/input/input.c
+++ b/reactos/dll/cpl/input/input.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/input.h b/reactos/dll/cpl/input/input.h
index f86ab9c..306f351 100644 (file)
--- a/reactos/dll/cpl/input/input.h
+++ b/reactos/dll/cpl/input/input.h
@@ -1,6 +1,16 @@
 #ifndef __CPL_INPUT_H
 #define __CPL_INPUT_H
 
+#include <windows.h>
+#include <commctrl.h>
+#include <cpl.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <tchar.h>
+#include <process.h>
+
 typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID);
 
 typedef struct

diff --git a/reactos/dll/cpl/input/inputlangprop.c b/reactos/dll/cpl/input/inputlangprop.c
index b30c894..6ca6e92 100644 (file)
--- a/reactos/dll/cpl/input/inputlangprop.c
+++ b/reactos/dll/cpl/input/inputlangprop.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/keysettings.c b/reactos/dll/cpl/input/keysettings.c
index 11c87d1..5e39c32 100644 (file)
--- a/reactos/dll/cpl/input/keysettings.c
+++ b/reactos/dll/cpl/input/keysettings.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/lang/bg-BG.rc b/reactos/dll/cpl/input/lang/bg-BG.rc
index 720c7e8..4a71eec 100644 (file)
--- a/reactos/dll/cpl/input/lang/bg-BG.rc
+++ b/reactos/dll/cpl/input/lang/bg-BG.rc
@@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
        GROUPBOX "Íàñòðîéêà çà ñúâìåñòèìîñò", -1, 7,7,231,60
        AUTOCHECKBOX "Èç&ïîëçâàíå íà ïîääðúæêàòà íà ðàøèðåíèòå ñëîâåñíè óñëóãè âúâ âñè÷êè ïðèëîæåíèÿ", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP
-       LTEXT "Îòìåòíåòå òàçè êóòèéêà, çà äà âêëþ÷èòå ðàçøèðåíàòà ñëîâåñíà ïîääðúæêà çà áåëåæíèêà è çà äðóãè ïðèëîæåíèÿ, êîèòî îáèêíîâåíî íå ïîääúðæàò ðúêîïèñíî ðàçïîçíàâàíå èëè äðóãè ðàçøèðåíè óñëóãè çà âúâåæäàíå.",-1,14,33,220,25
+       LTEXT "Îòìåòíåòå òàçè êóòèéêà, çà äà âêëþ÷èòå ðàçøèðåíàòà ñëîâåñíà ïîääðúæêà çà áåëåæíèêà è çà äðóãè ïðèëîæåíèÿ, êîèòî îáèêíîâåíî íå ïîääúðæàò ðúêîïèñíî ðàçïîçíàâàíå èëè äðóãè ðàçøèðåíè óñëóãè çà âúâåæäàíå.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25
        GROUPBOX "Íàñòðîéêà íà óðåäáàòà", -1, 7,74,231,60
        AUTOCHECKBOX "&Èçêëþ÷âàíå íà ðàçøèðåíèòå ñëîâåñíè óñëóãè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP
        LTEXT "Îòìåòíåòå òàçè êóòèéêà, çà äà âêëþ÷èòå ðàçøèðåíàòà ñëîâåñíà ïîääðúæêà çà âñè÷êè ïðîãðàìè. Íå ñå ïðåïîðú÷âà çà èçòî÷íîàçèàòñêè ïîòðåáèòåëè, çàùîòî ùå çàòâîðè åçèêîâàòà ëåíòà.",-1,14,100,220,25

diff --git a/reactos/dll/cpl/input/lang/de-DE.rc b/reactos/dll/cpl/input/lang/de-DE.rc
index 2af8e8f..4c92a75 100644 (file)
--- a/reactos/dll/cpl/input/lang/de-DE.rc
+++ b/reactos/dll/cpl/input/lang/de-DE.rc
@@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
        GROUPBOX "Kompatibilitäts-Konfiguration", -1, 7,7,231,60
        AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP
-       LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25
+       LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25
        GROUPBOX "Systemkonfiguration", -1, 7,74,231,60
        AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP
        LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25

diff --git a/reactos/dll/cpl/input/lang/en-US.rc b/reactos/dll/cpl/input/lang/en-US.rc
index ae80e0f..f80813d 100644 (file)
--- a/reactos/dll/cpl/input/lang/en-US.rc
+++ b/reactos/dll/cpl/input/lang/en-US.rc
@@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
        GROUPBOX "Compatibility Configuration", -1, 7,7,231,60
        AUTOCHECKBOX "&Extend support of advanced text services to all programs", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP
-       LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25
+       LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25
        GROUPBOX "System Configuration", -1, 7,74,231,60
        AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP
        LTEXT "Select this check box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25

diff --git a/reactos/dll/cpl/input/lang/fr-FR.rc b/reactos/dll/cpl/input/lang/fr-FR.rc
index 69d5b01..2d22a8d 100644 (file)
--- a/reactos/dll/cpl/input/lang/fr-FR.rc
+++ b/reactos/dll/cpl/input/lang/fr-FR.rc
@@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN\r
        GROUPBOX "Configuration de la compatibilité", -1, 7,7,231,60\r
        AUTOCHECKBOX "&Étendre le support des services avancés de à tous les programmes", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP\r
-       LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",-1,14,33,220,25\r
+       LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25\r
        GROUPBOX "Configuration du système", -1, 7,74,231,60\r
        AUTOCHECKBOX "Désac&tiver les services avancés de texte", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP\r
        LTEXT "Déselectionnez cette case à cocher pour désactiver les services avancés de texte dans tous les programmes. Non recommandé pour les utilisateurs de l'Est de l'Asie car cela ferme la barre de langue.",-1,14,100,220,25\r

diff --git a/reactos/dll/cpl/input/lang/pl-PL.rc b/reactos/dll/cpl/input/lang/pl-PL.rc
index 7597a3d..243cc06 100644 (file)
--- a/reactos/dll/cpl/input/lang/pl-PL.rc
+++ b/reactos/dll/cpl/input/lang/pl-PL.rc
@@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
        GROUPBOX "Kompatybilno\9cæ", -1, 7,7,231,60
        AUTOCHECKBOX "&Rozszerz wspieranie zaawansowanych us³ug tekstowych na wszystkie programy", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP
-       LTEXT "Zaznacz t¹ opcjê by uruchomiæ zaawansowane us³ugi tekstowe w Notatniku i innych programach, które normalnie nie obs³uguj¹ rozpoznawania mowy i pisma odrêcznego czy innych zaawansowanych us³ug wprowadzania.",-1,14,33,220,25
+       LTEXT "Zaznacz t¹ opcjê by uruchomiæ zaawansowane us³ugi tekstowe w Notatniku i innych programach, które normalnie nie obs³uguj¹ rozpoznawania mowy i pisma odrêcznego czy innych zaawansowanych us³ug wprowadzania.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25
        GROUPBOX "Konfiguracja systemu", -1, 7,74,231,60
        AUTOCHECKBOX "&Wy³¹cz zaawansowane us³ugi tekstowe", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP
        LTEXT "Zaznacz t¹ opcjê by wy³¹czyæ zaawansowane us³ugi tekstowe we wszystkich programach. Nie zalecane dla u¿ytkowników jêzyków Dalekiego Wschodu, jako ¿e zamyka to Pasek Jêzyków.",-1,14,100,220,25

diff --git a/reactos/dll/cpl/input/lang/ru-RU.rc b/reactos/dll/cpl/input/lang/ru-RU.rc
index 48fe560..8ca48be 100644 (file)
--- a/reactos/dll/cpl/input/lang/ru-RU.rc
+++ b/reactos/dll/cpl/input/lang/ru-RU.rc
@@ -4,22 +4,22 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Óñòàíîâêè"
+CAPTION "Ïàðàìåòðû"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Îñíîâíîé ÿçûê ââîäà", -1, 7,7,237,53
-    LTEXT "Âûáåðèòå îäèí îñíîâíîé ÿçûê ââîäà ïðè âêëþ÷åíèè êîìïüþòåðà.",-1,14,18,220,17
+    GROUPBOX "&ßçûê ââîäà ïî óìîë÷àíèþ", -1, 7,7,231,53
+    LTEXT "Âûáåðèòå îäèí èç óñòàíîâëåííûõ ÿçûêîâ ââîäà, êîòîðûé áóäåò èñïîëüçîâàòüñÿ ïðè çàãðóçêå êîìïüþòåðà.",-1,14,18,220,17
     COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
-    GROUPBOX "Óñ&òàíîâëåííûå ñåðâèñû", -1, 7,65,237,115
-    LTEXT "Âûáåðèòå ñåðâèñ êîòîðûé âû õîòèòå äëÿ êàæäîãî ÿçûêà îòîáðàæîííîãî â ëèñòå.\nÈñïîëüçóÿ êëàâèøè äîáàâëåíèå è èñêëþ÷åíèå äëÿ èçìåíåíèÿ ëèñòà.",-1,14,75,220,17
+    GROUPBOX "Óñ&òàíîâëåííûå ñëóæáû", -1, 7,65,231,115
+    LTEXT "Âûáåðèòå íóæíûå ñëóæáû äëÿ êàæäîãî ÿçûêà ââîäà èç ñïèñêà. Äëÿ èçìåíåíèÿ ñïèñêà ñëóæàò êíîïêè ""Äîáàâèòü"" è ""Óäàëèòü"".",-1,14,75,220,17
     CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
-    PUSHBUTTON "&Óñòàíîâèòü ïî óìîë÷àíèþ", IDC_SET_DEFAULT, 179, 106, 59, 14
-    PUSHBUTTON "&Äîáàâèòü...", IDC_ADD_BUTTON, 179, 124, 59, 14
-    PUSHBUTTON "&Èñêëþ÷èòü...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
-    PUSHBUTTON "&Ñâîéñòâà...", IDC_PROP_BUTTON, 179, 160, 59, 14
-    GROUPBOX "Ñâîéñòâà", -1, 7,185,237,36
-    PUSHBUTTON "ßçûêîâàÿ ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
-    PUSHBUTTON "Óñòàíîâêè êëàâèø...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
+    PUSHBUTTON "Óìîë&÷àíèå", IDC_SET_DEFAULT, 179, 106, 53, 14
+    PUSHBUTTON "&Äîáàâèòü...", IDC_ADD_BUTTON, 179, 124, 53, 14
+    PUSHBUTTON "&Óäàëèòü...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
+    PUSHBUTTON "&Ñâîéñòâà...", IDC_PROP_BUTTON, 179, 160, 53, 14
+    GROUPBOX "Íàñòðîéêà", -1, 7,185,231,36
+    PUSHBUTTON "ß&çûêîâàÿ ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 87, 14
+    PUSHBUTTON "&Ïàðàìåòðû êëàâèàòóðû...", IDC_KEY_SETTINGS_BUTTON, 105, 198, 110, 14
 END
 
 IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -27,208 +27,208 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Äîïîëíèòåëüíî"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    GROUPBOX "Êîíôèãóðàöèÿ ñîâìåñòèìîñòè", -1, 7,7,231,60
-    AUTOCHECKBOX "&Ðàñøèðåííàÿ ïîääåðæêà äîïîëíèòåëüíûõ òåêñòîâûõ ñåðâèñîâ äëÿ âñåõ ïðîãðàìì", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP
-    LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü ïðè íåîáõîäèìîñòè âêëþ÷åíèÿ äîïîëíèòåëüíûõ ñåðâèñîâ äëÿ ïðîãðàìì êîòîðûå íåìîãóò ïîääåðæèâàòü ãîëîñîâîå ñîïðîâîæäåíèå, èëè ðàñïîçíàâàíèå, è äðóãèõ äîïîëíèòåëüíûõ ñåðâèñîâ ââîäà.",-1,14,33,220,25
-    GROUPBOX "Êîíôèãóðàöèÿ ñèñòåìû", -1, 7,74,231,60
-    AUTOCHECKBOX "&Îòêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñåðâèñû", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP
-    LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü äëÿ îòêëþ÷åíèÿ äîïîëíèòåëüíûõ òåêñòîâûõ ñåðâèñîâ âî âñåõ ïðîãðàììàõ. Íåðåêîìåíäîâàíî äëÿ ïîëüçîâàòåëåé Âîñòî÷íîé Àçèè äàííîå äåéñòâèå ïîëíîñòüþ îòêëþ÷èò äîñòóï ê ÿçûêîâîé ïàíåëè.",-1,14,100,220,25
+    GROUPBOX "Ïàðàìåòðû ñîâìåñòèìîñòè", -1, 7,7,231,68
+    AUTOCHECKBOX "&Ðàñøèðåííàÿ ïîääåðæêà äîïîëíèòåëüíûõ òåêñòîâûõ ñëóæá äëÿ âñåõ ïðîãðàìì", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 221, 15, WS_GROUP | BS_MULTILINE
+    LTEXT "Îòìåòüòå ãàëî÷êîé çäåñü ïðè íåîáõîäèìîñòè âêëþ÷åíèÿ äîïîëíèòåëüíûõ ñëóæá äëÿ ïðîãðàìì, êîòîðûå íåìîãóò ïîääåðæèâàòü ãîëîñîâîå ñîïðîâîæäåíèå èëè ðàñïîçíàâàíèå, è äðóãèõ äîïîëíèòåëüíûõ ñëóæá ââîäà.",IDC_SUPPORT_ADV_SERV_TEXT,14,37,220,34
+    GROUPBOX "Ïàðàìåòðû ñèñòåìû", -1, 7,80,231,66
+    AUTOCHECKBOX "Â&ûêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñëóæáû", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 92, 210, 10, WS_GROUP | BS_MULTILINE
+    LTEXT "Óñòàíîâèòå ýòîò ôëàæîê äëÿ âûêëþ÷åíèÿ ïîääåðæêè äîïîëíèòåëüíûõ òåêñòîâûõ ñëóæá äëÿ âñåõ ïðîãðàìì. Íå ðåêîìåíäóåòñÿ äëÿ ÿçûêîâ âîñòî÷íîé Àçèè, ïîñêîëüêó ÿçûêîâàÿ ïàíåëü áóäåò çàêðûòà.",-1,14,106,220,35
 END
 
 IDD_LANGBAR DIALOG 20, 20, 240, 120
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Óñòàíîâêà ÿçûêîâîé ïàíåëè"
+CAPTION "Ïàðàìåòðû ÿçûêîâîé ïàíåëè"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX "", -1, 7, 7, 226, 85
-    AUTOCHECKBOX "Îòîáðàæàòü ÿçûêîâóþ ïàíåëü íà ýêðàíå", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP
-    AUTOCHECKBOX "&Ïðîçðà÷íîñü ÿçûêîâîé ïàíåëè", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10
-    AUTOCHECKBOX "&Äîïîëíèòåëüíûå èêîíêè ÿçûêîâîé ïàíåëè â îáëàñòè óâåäîìëåíèé", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10
-    AUTOCHECKBOX "Ïîêàçûâàòü ïîäïèñè ê ÿðëûêàì â ïàíåëè ÿçûêîâ", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10
-    AUTOCHECKBOX "&Îòêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñåðâèñû", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10
+    AUTOCHECKBOX "&Îòîáðàæàòü ÿçûêîâóþ ïàíåëü íà ðàáî÷åì ñòîëå", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP
+    AUTOCHECKBOX "&ßçûêîâàÿ ïàíåëü ïðîçðà÷íà, êîãäà íå àêòèâíà", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10
+    AUTOCHECKBOX "Äîïîëíèòåëüíûé &çíà÷îê ïàíåëè â îáëàñòè óâåäîìëåíèé", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10
+    AUTOCHECKBOX "Î&òîáðàæàòü òåêñòîâûå ìåòêè íà ÿçûêîâîé ïàíåëè", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10
+    AUTOCHECKBOX "Â&ûêëþ÷èòü äîïîëíèòåëüíûå òåêñòîâûå ñëóæáû", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10
     DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 182, 99, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 182, 99, 50, 14
 END
 
 IDD_KEYSETTINGS DIALOG 0, 0, 272, 163
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Äîïîëíèòåëüíûõ óñòàíîâêè"
+CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû êëàâèàòóðû"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "Äëÿ îòêëþ÷åíèÿ Caps Lock", -1, 7, 7, 258, 26
-    AUTORADIOBUTTON "Íàæìèòå êëàâèøó CAPS &LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP
-    AUTORADIOBUTTON "Íàæìèòå êëàâèøó SHI&FT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP
-    GROUPBOX "Ãîðÿ÷èå êëàâèøè ÿçûêîâ", -1, 7, 37, 258, 95
+    GROUPBOX "Îòêëþ÷åíèå ðåæèìà Caps Lock", -1, 7, 7, 258, 26
+    AUTORADIOBUTTON "&Êëàâèøåé CAPS LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP
+    AUTORADIOBUTTON "Ê&ëàâèøåé SHIFT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP
+    GROUPBOX "Ñî÷åòàíèÿ êëàâèø äëÿ ÿçûêîâ ââîäà", -1, 7, 37, 258, 95
     LTEXT "Äåéñòâèå", -1, 14, 47, 60, 9
-    RTEXT "Ñî&÷åòàíèå êëàâèø", -1, 177, 47, 79, 9
+    RTEXT "&Ñî÷åòàíèå êëàâèø", -1, 177, 47, 79, 9
     LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON "&Èçìåíèòü ñî÷åòàíèå êëàâèø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP
+    PUSHBUTTON "Ñì&åíà ñî÷åòàíèÿ êëàâèø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP
     DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 146, 140, 70, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 146, 140, 70, 14
 END
 
 IDD_ADD DIALOG 20, 20, 227, 90
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Äîáàâèòü ÿçûê ââîäà"
+CAPTION "Äîáàâëåíèå ÿçûêà ââîäà"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10
     COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    LTEXT "&Ðàñêëàäêà êëàâèàòóðû/IME:", -1, 7, 36, 110, 10
+    LTEXT "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", -1, 7, 36, 170, 10
     COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 169, 68, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 169, 68, 50, 14
 END
 
 IDD_ADD2 DIALOG 20, 20, 257, 176
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Äîáàâèòü ÿçûê ââîäà"
+CAPTION "Äîáàâëåíèå ÿçûêà ââîäà"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10
     COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10
+    AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 180, 10
     COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "Ðàñïî&çíàâàíèå ðó÷íîãî ââîäà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10
+    AUTOCHECKBOX "Ð&àñïîçíàâàíèå ðóêîïèñíîãî òåêñòà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 144, 10
     COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "&Ãîëîñ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+    AUTOCHECKBOX "Ð&å÷ü:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
     COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "&Ñåðâèñû òåêñòîâ:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10
+    AUTOCHECKBOX "Äðóã&èå òåêñòîâûå ñëóæáû:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123, 110, 10
     COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 155, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 199, 155, 50, 14
 END
 
 IDD_ADD3 DIALOG 20, 20, 257, 147
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Äîáàâèòü ÿçûê ââîäà"
+CAPTION "Äîáàâëåíèå ÿçûêà ââîäà"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "&ßçûê ââîäà:", -1, 7, 7, 61, 10
     COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10
+    AUTOCHECKBOX "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 180, 10
     COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "Ðàñïî&çíàâàíèå ðó÷íîãî ââîäà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 110, 10
+    AUTOCHECKBOX "Ð&àñïîçíàâàíèå ðóêîïèñíîãî òåêñòà:", IDC_HANDWRITING_REC_CHECKBOX, 37, 65, 150, 10
     COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    AUTOCHECKBOX "&Ãîëîñ:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+    AUTOCHECKBOX "Ð&å÷ü", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
     COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 126, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 199, 126, 50, 14
 END
 
 IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø"
+CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "", -1, 16, 5, 250, 10
-    GROUPBOX "", -1, 12, 17, 184, 48
-    AUTOCHECKBOX "&Âêëþ÷èòü ñî÷åòàíèå êëàâèø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8
+    GROUPBOX "", -1, 12, 17, 195, 48
+    AUTOCHECKBOX "&Èñïîëüçîâàòü ñî÷åòàíèå êëàâèø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 133, 8
     CTEXT "SHIFT", -1, 68, 37, 27, 12
     CTEXT "+", -1, 57, 37, 8, 9
     CTEXT "+", -1, 98, 37, 8, 10
     CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP
     CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP
-    LTEXT "&Êëàâèøà:", -1, 110, 37, 14, 10
-    COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
+    LTEXT "&Êëàâèøà:", -1, 110, 37, 40, 10
+    COMBOBOX IDC_CKEY_COMBOBOX, 151, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 212, 47, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 212, 47, 50, 14
 END
 
-IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74
+IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 335, 71
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø"
+CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "", -1, 9, 5, 209, 60
-    AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
-    LTEXT "SHIFT", -1, 73, 37, 27, 12
-    CTEXT "+", -1, 62, 37, 8, 9
-    AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP
-    AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP
-    AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 121, 15, 90, 12
-    LTEXT "SHIFT", -1, 179, 37, 27, 12
-    CTEXT "+", -1, 168, 37, 8, 9
-    AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11, WS_GROUP
-    AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 227, 44, 50, 14
+       GROUPBOX "", -1, 7, 4, 263, 60
+       AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 107, 12
+       LTEXT "SHIFT", -1, 73, 37, 27, 10
+       CTEXT "+", -1, 62, 37, 8, 9
+       AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 33, 11, WS_GROUP
+       AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 52, 12, NOT WS_TABSTOP
+       AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 125, 15, 143, 12
+       LTEXT "SHIFT", -1, 179, 37, 27, 10
+       CTEXT "+", -1, 168, 37, 8, 9
+       AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 33, 11, WS_GROUP
+       AUTORADIOBUTTON "Alt ñë&åâà", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 51, 12, NOT WS_TABSTOP
+       DEFPUSHBUTTON "OK", 1, 278, 16, 50, 14
+       PUSHBUTTON "Îòìåíà", 2, 278, 41, 50, 14
 END
 
-IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125
+IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 274, 122
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø"
+CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "", -1, 9, 5, 174, 110
-    AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
+    GROUPBOX "", -1, 6, 4, 206, 110
+    AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 110, 12
     LTEXT "SHIFT", -1, 73, 37, 27, 12
     CTEXT "+", -1, 62, 37, 8, 9
     AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, WS_GROUP
-    AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP
-    AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12
+    AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 50, 12, NOT WS_TABSTOP
+    AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 144, 12
     LTEXT "SHIFT", -1, 73, 87, 27, 12
     CTEXT "+", -1, 62, 87, 8, 9
     CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33
-    AUTORADIOBUTTON "Âñòàâèòü &óäàðåíèå ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 69, 10, WS_GROUP
+    AUTORADIOBUTTON "&¨ èëè çíàê óäàðåíèÿ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87, 100, 10, WS_GROUP
     AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT WS_TABSTOP
-    AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 192, 47, 50, 14
+    AUTORADIOBUTTON "Alt ñë&åâà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 50, 12, NOT WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDOK, 218, 8, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 218, 27, 50, 14
 END
 
-IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125
+IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 277, 119
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø"
+CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "", -1, 9, 5, 174, 110
-    AUTOCHECKBOX "Ïåð&åêëþ÷àòü ÿçûê ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
-    LTEXT "SHIFT", -1, 73, 37, 27, 12
-    CTEXT "+", -1, 62, 37, 8, 9
-    CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33
-    AUTORADIOBUTTON "Âñòàâèòü &óäàðåíèå ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 69, 10, WS_GROUP
-    AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT WS_TABSTOP
-    AUTORADIOBUTTON "Ëåâûé &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12, NOT WS_TABSTOP
-    AUTOCHECKBOX "Ïåðå&êëþ÷åíèå ðàñêëàäîê êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 90, 12
-    LTEXT "SHIFT", -1, 73, 87, 27, 12
-    CTEXT "+", -1, 62, 87, 8, 9
-    AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, WS_GROUP
-    AUTORADIOBUTTON "Ëåâûé A&LT", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP
-    DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 192, 47, 50, 14
+       GROUPBOX "", -1, 5, 3, 209, 110
+       AUTOCHECKBOX "Ïåðåêëþ÷àòü &ÿçûêè ââîäà", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 114, 12
+       LTEXT "SHIFT", -1, 73, 37, 27, 10
+       CTEXT "+", -1, 62, 37, 8, 9
+       CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33
+       AUTORADIOBUTTON "&¨ èëè çíàê óäàðåíèÿ ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37, 101, 10, WS_GROUP
+       AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 32, 11, NOT WS_TABSTOP
+       AUTORADIOBUTTON "Alt ñ&ëåâà", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 50, 12, NOT WS_TABSTOP
+       AUTOCHECKBOX "Ïåðåêëþ÷àòü ðàñêëàäêè &êëàâèàòóðû", IDC_SWITCH_KEYBOARD_LO_CHECKBOX, 15, 65, 148, 12
+       LTEXT "SHIFT", -1, 73, 87, 27, 10
+       CTEXT "+", -1, 62, 87, 8, 9
+       AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 32, 11, WS_GROUP
+       AUTORADIOBUTTON "Alt ñë&åâà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 50, 12, NOT WS_TABSTOP
+       DEFPUSHBUTTON "OK", 1, 220, 7, 50, 14
+       PUSHBUTTON "Îòìåíà", 2, 220, 24, 50, 14
 END
 
 IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Èçìåíåíèå ñî÷åòàíèÿ êëàâèø"
+CAPTION "Ñìåíà ñî÷åòàíèÿ êëàâèø"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "", 1240, 16, 5, 250, 10
-    GROUPBOX "", -1, 12, 17, 184, 48
-    AUTOCHECKBOX "&Âêëþ÷èòü ñî÷åòàíèå êëàâèø", 1249, 17, 17, 85, 8
+    GROUPBOX "", -1, 12, 17, 195, 48
+    AUTOCHECKBOX "&Èñïîëüçîâàòü ñî÷åòàíèå êëàâèø", 1249, 17, 17, 135, 8
     CTEXT "SHIFT", -1, 68, 37, 27, 12
     CTEXT "+", -1, 57, 37, 8, 9
     CTEXT "+", -1, 98, 37, 8, 10
     AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP
-    AUTORADIOBUTTON "Ëåâûé &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP
-    LTEXT "&Êëàâèøà:", -1, 110, 37, 14, 10
-    COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
+    AUTORADIOBUTTON "Alt ñ&ëåâà", -1, 24, 45, 50, 12, NOT WS_TABSTOP
+    LTEXT "&Êëàâèøà:", -1, 110, 37, 40, 10
+    COMBOBOX 1236, 151, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
     DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 212, 47, 50, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 212, 47, 50, 14
 END
 
 IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75
 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
-CAPTION "Ïàðàìåòðû ââîäà"
+CAPTION "Ñâîéñòâà ÿçûêà ââîäà"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT "ßçûê ââîäà:", -1, 7, 7, 61, 8
     LTEXT "", -1, 73, 7, 129, 8
-    LTEXT "&Ðàñêëàäêà êëàâèàòóðû/IME:", -1, 7, 21, 110, 10
+    LTEXT "&Ðàñêëàäêà êëàâèàòóðû èëè ìåòîä ââîäà (IME):", -1, 7, 21, 170, 10
     COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
-    DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14
-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 169, 53, 52, 14
+    DEFPUSHBUTTON "OK", IDOK, 114, 53, 52, 14
+    PUSHBUTTON "Îòìåíà", IDCANCEL, 169, 53, 52, 14
 END
 
 STRINGTABLE
@@ -236,148 +236,148 @@ BEGIN
     IDS_CPLSYSTEMNAME "Òåêñòîâûå ñåðâèñû è ââîä ÿçûêîâ"
     IDS_CPLSYSTEMDESCRIPTION "Äîïîëíèòåëüíûå ïàðàìåòðû òåêñòîâîãî ââîäà ÿçûêîâ."
        IDS_KEYBOARD "Êëàâèàòóðà"
-       IDS_ADV_TEXT_SRV "Advanced Text Services"
-       IDS_NONE "(None)"
-       IDS_UNKNOWN "(Unknown)"
-       IDS_RESTART "Do you want to restart your computer now?"
-       IDS_SPEECH "Speech"
+       IDS_ADV_TEXT_SRV "Äîïîëíèòåëüíûå òåêñòîâûå ñëóæáû"
+       IDS_NONE "(Íåò)"
+       IDS_UNKNOWN "(Íåò äàííûõ)"
+       IDS_RESTART "Âûïîëíèòü ïåðåçàãðóçêó ñåé÷àñ?"
+       IDS_SPEECH "Ðå÷ü"
        IDS_HRD_REC "Handwriting Recognition"
-       IDS_OFF_ADV_TXT_SRV "Do you want to turn off advanced text services?"
-       IDS_WHATS_THIS "What's This?"
+       IDS_OFF_ADV_TXT_SRV "Ïîäòâåðæäàåòå îòêëþ÷åíèå äîïîëíèòåëüíûõ òåêñòîâûõ ñëóæá?"
+       IDS_WHATS_THIS "×òî ýòî?"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_US_LAYOUT,                                  "US"
-    IDS_BELGIAN_LAYOUT,                             "Belgian (Period)"
-    IDS_BELGIAN_FRENCH_LAYOUT,                      "Belgian French"
-    IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT,           "Portuguese (Brazilian ABNT)"
-    IDS_CANADIAN_FRENCH_LAYOUT,                     "Canadian French"
-    IDS_CANADIAN_FRENCH_LEGACY_LAYOUT,              "Canadian French (Legacy)"
-    IDS_DANISH_LAYOUT,                              "Danish"
-    IDS_DUTCH_LAYOUT,                               "Dutch"
-    IDS_FINNISH_LAYOUT,                             "Finnish"
-    IDS_FRENCH_LAYOUT,                              "French"
-    IDS_GERMAN_LAYOUT,                              "German"
-    IDS_GERMAN_IBM_LAYOUT,                          "German (IBM)"
-    IDS_ICELANDIC_LAYOUT,                           "Icelandic"
-    IDS_IRISH_LAYOUT,                               "Irish"
-    IDS_ITALIAN_LAYOUT,                             "Italian"
-    IDS_ITALIAN_142_LAYOUT,                         "Italian (142)"
-    IDS_LATIN_AMERICAN_LAYOUT,                      "Latin American"
-    IDS_NORWEGIAN_LAYOUT,                           "Norwegian"
-    IDS_PORTUGUESE_LAYOUT,                          "Portuguese"
-    IDS_SPANISH_LAYOUT,                             "Spanish"
-    IDS_SPANISH_VARIANTION_LAYOUT,                  "Spanish Variation"
-    IDS_SWEDISH_LAYOUT,                             "Swedish"
-    IDS_SWISS_FRENCH_LAYOUT,                        "Swiss French"
-    IDS_SWISS_GERMAN_LAYOUT,                        "Swiss German"
-    IDS_UNITED_KINGDOM_LAYOUT,                      "United Kingdom"
-    IDS_UNITED_STATES_INTERNATIONAL_LAYOUT,         "United States-International"
-    IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT,  "United States-Dvorak for left hand"
-    IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand"
-    IDS_ALBANIAN_LAYOUT,                            "Albanian"
-    IDS_CROATIAN_LAYOUT,                            "Croatian"
-    IDS_CZECH_LAYOUT,                               "Czech"
-    IDS_CZECH_QWERTY_LAYOUT,                        "Czech (QWERTY)"
-    IDS_HUNGARIAN_LAYOUT,                           "Hungarian"
-    IDS_HUNGARIAN_101_KEY_LAYOUT,                   "Hungarian 101-key"
-    IDS_POLISH_LAYOUT,                              "Polish (Programmers)"
-    IDS_POLISH_214_LAYOUT,                          "Polish (214)"
-    IDS_ROMANIAN_LAYOUT,                            "Romanian"
-    IDS_SERBIAN_LATIN_LAYOUT,                       "Serbian (Latin)"
-    IDS_SLOVAK_LAYOUT,                              "Slovak"
-    IDS_SLOVAK_QWERTY_LAYOUT,                       "Slovak (QWERTY)"
-    IDS_SLOVENIAN_LAYOUT,                           "Slovenian"
-    IDS_ESTONIAN_LAYOUT,                            "Estonian"
-    IDS_LATVIAN_LAYOUT,                             "Latvian"
-    IDS_LATVIAN_QWERTY_LAYOUT,                      "Latvian (QWERTY)"
-    IDS_LITHUANIAN_IBM_LAYOUT,                      "Lithuanian IBM"
-    IDS_GREEK_LAYOUT,                               "Greek"
-    IDS_GREEK_LATIN_LAYOUT,                         "Greek Latin"
-    IDS_GREEK_220_LAYOUT,                           "Greek (220)"
-    IDS_GREEK_319_LAYOUT,                           "Greek (319)"
-    IDS_GREEK_220_LATIN_LAYOUT,                     "Greek (220) Latin"
-    IDS_GREEK_319_LATIN_LAYOUT,                     "Greek (319) Latin"
-    IDS_BELARUSIAN_LAYOUT,                          "Belarusian"
-    IDS_BULGARIAN_LAYOUT,                           "Bulgarian"
-    IDS_BULGARIAN_LATIN_LAYOUT,                     "Bulgarian (Latin)"
-    IDS_RUSSIAN_LAYOUT,                             "Russian"
-    IDS_RUSSIAN_TYPEWRITER_LAYOUT,                  "Russian (Typewriter)"
-    IDS_SERBIAN_CYRILLIC_LAYOUT,                    "Serbian (Cyrillic)"
-    IDS_UKRAINIAN_LAYOUT,                           "Ukrainian"
-    IDS_TURKISH_F_LAYOUT,                           "Turkish F"
-    IDS_TURKISH_Q_LAYOUT,                           "Turkish Q"
-    IDS_JAPANESE_LAYOUT,                            "Japanese"
-    IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT,     "Japanese Input System (MS-IME2002)"
-    IDS_KOREAN_LAYOUT,                              "Korean"
-    IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT,       "Korean Input System (MS-IME2002)"
-    IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT,      "Chinese (Traditional) - US Keyboard"
-    IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT,        "Chinese (Traditional) - Phonetic"
-    IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT,        "Chinese (Traditional) - ChangJie"
-    IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT,        "Chinese (Traditional) - Big5 Code"
-    IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT,            "Chinese (Traditional) - DaYi"
-    IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT,         "Chinese (Traditional) - Unicode"
-    IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT,    "Chinese (Traditional) - Alphanumeric"
-    IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT,       "Chinese (Simplified) - US Keyboard"
-    IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT,          "Chinese (Simplified) - QuanPin"
-    IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT,        "Chinese (Simplified) - ShuangPin"
-    IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT,          "Chinese (Simplified) - ZhengMa"
-    IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT,            "Chinese (Simplified) - NeiMa"
-    IDS_THAI_KEDMANEE_LAYOUT,                       "Thai Kedmanee"
-    IDS_THAI_PATTACHOTE_LAYOUT,                     "Thai Pattachote"
-    IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT,          "Thai Kedmanee (non-ShiftLock)"
-    IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT,        "Thai Pattachote (non-ShiftLock)"
-    IDS_HEBREW_LAYOUT,                              "Hebrew"
-    IDS_ARABIC_101_LAYOUT,                          "Arabic (101)"
-    IDS_ARABIC_102_LAYOUT,                          "Arabic (102)"
-    IDS_ARABIC_102_AZERTY_LAYOUT,                   "Arabic (102) AZERTY"
-    IDS_CZECH_PROGRAMMERS_LAYOUT,                   "Czech Programmers"
-    IDS_LITHUANIAN_LAYOUT,                          "Lithuanian"
-    IDS_BELGIAN_COMMA_LAYOUT,                       "Belgian (Comma)"
-    IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT,     "Chinese (Traditional) - New Phonetic"
-    IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT,    "Chinese (Simplified) - Microsoft Pinyin IME 3.0"
-    IDS_UNITED_STATES_DVIRAK_LAYOUT,                "United States-Dvorak"
-    IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT,     "Chinese (Traditional) - New ChangJie"
-    IDS_ASSAMESE_LAYOUT,                            "Assamese"
-    IDS_BENGALI_LAYOUT,                             "Bengali"
-    IDS_DEVANAGARI_INSCRIPT_LAYOUT,                 "Devanagari - INSCRIPT"
-    IDS_GUJARATI_LAYOUT,                            "Gujarati"
-    IDS_KANNADA_LAYOUT,                             "Kannada"
-    IDS_MALAYALAM_LAYOUT,                           "Malayalam"
-    IDS_ORIYA_LAYOUT,                               "Oriya"
-    IDS_PUNJABI_LAYOUT,                             "Punjabi"
-    IDS_TAMIL_LAYOUT,                               "Tamil"
-    IDS_TELUGU_LAYOUT,                              "Telugu"
-    IDS_MARATHI_LAYOUT,                             "Marathi"
-    IDS_HINDI_TRADITIONAL_LAYOUT,                   "Hindi Traditional"
-    IDS_CANTONESE_PHONETIC_LAYOUT,                  "Cantonese Phonetic"
-    IDS_FAEROESE_LAYOUT,                            "Faeroese"
-    IDS_FYRO_MACEDONIAN_LAYOUT,                     "FYRO Macedonian"
-    IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT,           "Canadian Multilingual Standard"
-    IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT,           "Chinese (Traditional) - Quick"
-    IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT,           "Chinese (Traditional) - Array"
-    IDS_KAZAKH_LAYOUT,                              "Kazakh"
-    IDS_UZBEK_CYRILLIC_LAYOUT,                      "Uzbek Cyrillic"
-    IDS_AZERI_CYRILLIC_LAYOUT,                      "Azeri Cyrillic"
-    IDS_TATAR_LAYOUT,                               "Tatar"
-    IDS_AZERI_LATIN_LAYOUT,                         "Azeri Latin"
-    IDS_VIETNAMESE_LAYOUT,                          "Vietnamese"
-    IDS_GEORGIAN_LAYOUT,                            "Georgian"
-    IDS_ARMENIAN_EASTERN_LAYOUT,                    "Armenian Eastern"
-    IDS_ARMENIAN_WESTERN_LAYOUT,                    "Armenian Western"
-    IDS_GREEK_POLYTONIC_LAYOUT,                     "Greek Polytonic"
-    IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT,          "US English Table for IBM Arabic 238_L"
-    IDS_FARSI_LAYOUT,                               "Farsi"
-    IDS_GAELIC_LAYOUT,                              "Gaelic"
-    IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT,             "Portuguese (Brazilian ABNT2)"
-    IDS_MONGOLIAN_CYRILLIC_LAYOUT,                  "Mongolian Cyrillic"
-    IDS_KYRGYZ_CYRILLIC_LAYOUT,                     "Kyrgyz Cyrillic"
-    IDS_URDU_LAYOUT,                                "Urdu"
-    IDS_SYRIAC_LAYOUT,                              "Syriac"
-    IDS_SYRIAC_PHONETIC_LAYOUT,                     "Syriac Phonetic"
-    IDS_DIVEHI_PHONETIC_LAYOUT,                     "Divehi Phonetic"
-    IDS_DIVEHI_TYPEWRITER_LAYOUT,                   "Divehi Typewriter"
-       IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT,          "Bulgarian Phonetic (Classic)"
-       IDS_BULGARIAN_PHONETIC_BDS_LAYOUT,              "Bulgarian Phonetic (BDS)"
+    IDS_US_LAYOUT,                                  "ÑØÀ"
+    IDS_BELGIAN_LAYOUT,                             "Áåëüãèéñêàÿ (ñ òî÷êîé)"
+    IDS_BELGIAN_FRENCH_LAYOUT,                      "Áåëüãèéñêàÿ (ôðàíöóçñêàÿ)"
+    IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT,           "Ïîðòóãàëüñêàÿ (Áðàçèëüñêàÿ ABNT)"
+    IDS_CANADIAN_FRENCH_LAYOUT,                     "Êàíàäñêàÿ (ôðàíöóçñêàÿ)"
+    IDS_CANADIAN_FRENCH_LEGACY_LAYOUT,              "Êàíàäñêàÿ (ôðàíöóçñêàÿ òðàäèöèîííàÿ)"
+    IDS_DANISH_LAYOUT,                              "Äàòñêàÿ"
+    IDS_DUTCH_LAYOUT,                               "Ãîëëàíäñêàÿ"
+    IDS_FINNISH_LAYOUT,                             "Ôèíñêàÿ"
+    IDS_FRENCH_LAYOUT,                              "Ôðàíöóçñêàÿ"
+    IDS_GERMAN_LAYOUT,                              "Íåìåöêàÿ"
+    IDS_GERMAN_IBM_LAYOUT,                          "Íåìåöêàÿ (IBM)"
+    IDS_ICELANDIC_LAYOUT,                           "Èñëàíäñêàÿ"
+    IDS_IRISH_LAYOUT,                               "Èðëàíäñêàÿ"
+    IDS_ITALIAN_LAYOUT,                             "Èòàëüÿíñêàÿ"
+    IDS_ITALIAN_142_LAYOUT,                         "Èòàëüÿíñêàÿ (142)"
+    IDS_LATIN_AMERICAN_LAYOUT,                      "Ëàòèíîàìåðèêàíñêàÿ"
+    IDS_NORWEGIAN_LAYOUT,                           "Íîðâåæñêàÿ"
+    IDS_PORTUGUESE_LAYOUT,                          "Ïîðòóãàëüñêàÿ"
+    IDS_SPANISH_LAYOUT,                             "Èñïàíñêàÿ"
+    IDS_SPANISH_VARIANTION_LAYOUT,                  "Èñïàíñêàÿ 2"
+    IDS_SWEDISH_LAYOUT,                             "Øâåäñêàÿ"
+    IDS_SWISS_FRENCH_LAYOUT,                        "Øâåéöàðñêàÿ ôðàíöóçñêàÿ"
+    IDS_SWISS_GERMAN_LAYOUT,                        "Øâåéöàðñêàÿ íåìåöêàÿ"
+    IDS_UNITED_KINGDOM_LAYOUT,                      "Áðèòàíñêàÿ"
+    IDS_UNITED_STATES_INTERNATIONAL_LAYOUT,         "ÑØÀ - ìåæäóíàðîäíàÿ"
+    IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT,  "ÑØÀ - ïî Äâîðàêó äëÿ ëåâîé ðóêè"
+    IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "ÑØÀ - ïî Äâîðàêó äëÿ ïðàâîé ðóêè"
+    IDS_ALBANIAN_LAYOUT,                            "Àëáàíñêàÿ"
+    IDS_CROATIAN_LAYOUT,                            "Õîðâàòñêàÿ"
+    IDS_CZECH_LAYOUT,                               "×åøñêàÿ"
+    IDS_CZECH_QWERTY_LAYOUT,                        "×åøñêàÿ (QWERTY)"
+    IDS_HUNGARIAN_LAYOUT,                           "Âåíãåðñêàÿ"
+    IDS_HUNGARIAN_101_KEY_LAYOUT,                   "Âåíãåðñêàÿ (101 êëàâèøà)"
+    IDS_POLISH_LAYOUT,                              "Ïîëüñêàÿ (ïðîãðàììèñòñêàÿ)"
+    IDS_POLISH_214_LAYOUT,                          "Ïîëüñêàÿ (214)"
+    IDS_ROMANIAN_LAYOUT,                            "Ðóìûíñêàÿ"
+    IDS_SERBIAN_LATIN_LAYOUT,                       "Ñåðáñêàÿ (ëàòèíèöà)"
+    IDS_SLOVAK_LAYOUT,                              "Ñëîâàöêàÿ"
+    IDS_SLOVAK_QWERTY_LAYOUT,                       "Ñëîâàöêàÿ (QWERTY)"
+    IDS_SLOVENIAN_LAYOUT,                           "Ñëîâåíñêàÿ"
+    IDS_ESTONIAN_LAYOUT,                            "Ýñòîíñêàÿ"
+    IDS_LATVIAN_LAYOUT,                             "Ëàòûøñêàÿ"
+    IDS_LATVIAN_QWERTY_LAYOUT,                      "Ëàòâèéñêàÿ (QWERTY)"
+    IDS_LITHUANIAN_IBM_LAYOUT,                      "Ëèòîâñêàÿ IBM"
+    IDS_GREEK_LAYOUT,                               "Ãðå÷åñêàÿ"
+    IDS_GREEK_LATIN_LAYOUT,                         "Ãðå÷åñêàÿ ëàòèíèöà"
+    IDS_GREEK_220_LAYOUT,                           "Ãðå÷åñêàÿ (220)"
+    IDS_GREEK_319_LAYOUT,                           "Ãðå÷åñêàÿ (319)"
+    IDS_GREEK_220_LATIN_LAYOUT,                     "Ãðå÷åñêàÿ (220) ëàòèíèöà"
+    IDS_GREEK_319_LATIN_LAYOUT,                     "Ãðå÷åñêàÿ (319) ëàòèíèöà"
+    IDS_BELARUSIAN_LAYOUT,                          "Áåëîðóññêàÿ"
+    IDS_BULGARIAN_LAYOUT,                           "Áîëãàðñêàÿ"
+    IDS_BULGARIAN_LATIN_LAYOUT,                     "Áîëãàðñêàÿ (ëàòèíèöà)"
+    IDS_RUSSIAN_LAYOUT,                             "Ðóññêàÿ"
+    IDS_RUSSIAN_TYPEWRITER_LAYOUT,                  "Ðóññêàÿ (ìàøèíîïèñü)"
+    IDS_SERBIAN_CYRILLIC_LAYOUT,                    "Ñåðáñêàÿ (êèðèëëèöà)"
+    IDS_UKRAINIAN_LAYOUT,                           "Óêðàèíñêàÿ"
+    IDS_TURKISH_F_LAYOUT,                           "Òóðåöêàÿ F"
+    IDS_TURKISH_Q_LAYOUT,                           "Òóðåöêàÿ Q"
+    IDS_JAPANESE_LAYOUT,                            "ßïîíñêàÿ"
+    IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT,     "ßïîíñêàÿ ñèñòåìà ââîäà (MS-IME2002)"
+    IDS_KOREAN_LAYOUT,                              "Êîðåéñêèé"
+    IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT,       "Êîðåéñêàÿ ñèñòåìà ââîäà (MS-IME98)"
+    IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT,      "Êèòàéñêàÿ (òðàäèöèîííàÿ) - ÑØÀ"
+    IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT,        "Êèòàéñêàÿ (òðàäèöèîííàÿ) - ôîíåòè÷åñêàÿ"
+    IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT,        "Êèòàéñêàÿ (òðàäèöèîííàÿ) - ChangJie"
+    IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT,        "Êèòàéñêàÿ (òðàäèöèîííàÿ) - Big5 Code"
+    IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT,            "Êèòàéñêàÿ (òðàäèöèîííàÿ) - DaYi"
+    IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT,         "Êèòàéñêàÿ (òðàäèöèîííàÿ) - Þíèêîä"
+    IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT,    "Êèòàéñêàÿ (òðàäèöèîííàÿ) - àëôàâèòíî-öèôðîâàÿ"
+    IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT,       "Êèòàéñêàÿ (óïðîùåííàÿ) - ÑØÀ"
+    IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT,          "Êèòàéñêàÿ (óïðîùåííàÿ) - QuanPin"
+    IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT,        "Êèòàéñêàÿ (óïðîùåííàÿ) - ShuangPin"
+    IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT,          "Êèòàéñêàÿ (óïðîùåííàÿ) - ZhengMa"
+    IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT,            "Êèòàéñêàÿ (óïðîùåííàÿ) - NeiMa"
+    IDS_THAI_KEDMANEE_LAYOUT,                       "Òàéñêàÿ Êåäìàíè"
+    IDS_THAI_PATTACHOTE_LAYOUT,                     "Òàéñêàÿ Ïàòàøîò"
+    IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT,          "Òàéñêàÿ Êåäìàíè (áåç ShiftLock)"
+    IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT,        "Òàéñêàÿ Ïàòàøîò (áåç ShiftLock)"
+    IDS_HEBREW_LAYOUT,                              "Èâðèò"
+    IDS_ARABIC_101_LAYOUT,                          "Àðàáñêàÿ (101)"
+    IDS_ARABIC_102_LAYOUT,                          "Àðàáñêàÿ (102)"
+    IDS_ARABIC_102_AZERTY_LAYOUT,                   "Àðàáñêàÿ (102) AZERTY"
+    IDS_CZECH_PROGRAMMERS_LAYOUT,                   "×åøñêàÿ (ïðîãðàììèñòñêàÿ)"
+    IDS_LITHUANIAN_LAYOUT,                          "Ëèòîâñêàÿ"
+    IDS_BELGIAN_COMMA_LAYOUT,                       "Áåëüãèéñêàÿ (ñ çàïÿòîé)"
+    IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT,     "Êèòàéñêàÿ (òðàäèöèîííàÿ) - íîâàÿ ôîíåòè÷åñêàÿ"
+    IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT,    "Êèòàéñêàÿ (óïðîùåííàÿ) - Microsoft Pinyin IME 3.0"
+    IDS_UNITED_STATES_DVIRAK_LAYOUT,                "ÑØÀ - ïî Äâîðàêó"
+    IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT,     "Êèòàéñêàÿ (òðàäèöèîííàÿ) - íîâàÿ ChangJie"
+    IDS_ASSAMESE_LAYOUT,                            "Àññàìñêàÿ"
+    IDS_BENGALI_LAYOUT,                             "Áåíãàëüñêàÿ"
+    IDS_DEVANAGARI_INSCRIPT_LAYOUT,                 "Äåâàíàãàðè - èíñêðèïò"
+    IDS_GUJARATI_LAYOUT,                            "Ãóäæàðàòè"
+    IDS_KANNADA_LAYOUT,                             "Êàííàäà"
+    IDS_MALAYALAM_LAYOUT,                           "Ìàëàÿëàì"
+    IDS_ORIYA_LAYOUT,                               "Îðèÿ"
+    IDS_PUNJABI_LAYOUT,                             "Ïåíäæàáñêàÿ"
+    IDS_TAMIL_LAYOUT,                               "Òàìèëüñêàÿ"
+    IDS_TELUGU_LAYOUT,                              "Òåëóãó"
+    IDS_MARATHI_LAYOUT,                             "Ìàðàòõè"
+    IDS_HINDI_TRADITIONAL_LAYOUT,                   "Õèíäè òðàäèöèîííàÿ"
+    IDS_CANTONESE_PHONETIC_LAYOUT,                  "Êàíòîíñêàÿ ôîíåòè÷åñêàÿ"
+    IDS_FAEROESE_LAYOUT,                            "Ôàðåðñêàÿ"
+    IDS_FYRO_MACEDONIAN_LAYOUT,                     "Ìàêåäîíñêèé (FYROM)"
+    IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT,           "Êàíàäñêàÿ ñòàíäàðòíàÿ (ìíîãîÿçû÷íàÿ)"
+    IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT,           "Êèòàéñêàÿ (òðàäèöèîííàÿ) - áûñòðàÿ"
+    IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT,           "Êèòàéñêàÿ (òðàäèöèîííàÿ) - òàáëèöåé"
+    IDS_KAZAKH_LAYOUT,                              "Êàçàõñêàÿ"
+    IDS_UZBEK_CYRILLIC_LAYOUT,                      "Óçáåêñêàÿ êèðèëëèöà"
+    IDS_AZERI_CYRILLIC_LAYOUT,                      "Àçåðáàéäæàíñêàÿ (êèð)"
+    IDS_TATAR_LAYOUT,                               "Òàòàðñêàÿ"
+    IDS_AZERI_LATIN_LAYOUT,                         "Àçåðáàéäæàíñêàÿ (ëàò)"
+    IDS_VIETNAMESE_LAYOUT,                          "Âüåòíàìñêàÿ"
+    IDS_GEORGIAN_LAYOUT,                            "Ãðóçèíñêàÿ"
+    IDS_ARMENIAN_EASTERN_LAYOUT,                    "Àðìÿíñêàÿ âîñòî÷íàÿ"
+    IDS_ARMENIAN_WESTERN_LAYOUT,                    "Àðìÿíñêàÿ çàïàäíàÿ"
+    IDS_GREEK_POLYTONIC_LAYOUT,                     "Ãðå÷åñêàÿ ïîëèòîíè÷åñêàÿ"
+    IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT,          "ÑØÀ àíãëèéñêàÿ òàáëè÷íàÿ äëÿ IBM àðàáñêîãî 238_L"
+    IDS_FARSI_LAYOUT,                               "Ôàðñè"
+    IDS_GAELIC_LAYOUT,                              "Ãýëüñêàÿ"
+    IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT,             "Ïîðòóãàëüñêàÿ (Áðàçèëèÿ)"
+    IDS_MONGOLIAN_CYRILLIC_LAYOUT,                  "Ìîíãîëüñêàÿ (êèðèëëèöà)"
+    IDS_KYRGYZ_CYRILLIC_LAYOUT,                     "Êèðãèçñêàÿ (êèðèëëèöà)"
+    IDS_URDU_LAYOUT,                                "Óðäó"
+    IDS_SYRIAC_LAYOUT,                              "Ñèðèéñêàÿ"
+    IDS_SYRIAC_PHONETIC_LAYOUT,                     "Ñèðèéñêàÿ ôîíåòè÷åñêàÿ"
+    IDS_DIVEHI_PHONETIC_LAYOUT,                     "Äèâèõàé ôîíåòè÷åñêàÿ"
+    IDS_DIVEHI_TYPEWRITER_LAYOUT,                   "Äèâèõàé ìàøèíîïèñü"
+       IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT,          "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (êëàññè÷åñêàÿ)"
+       IDS_BULGARIAN_PHONETIC_BDS_LAYOUT,              "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (BDS)"
 END

diff --git a/reactos/dll/cpl/input/lang/uk-UA.rc b/reactos/dll/cpl/input/lang/uk-UA.rc
index 8992bd2..6d39c14 100644 (file)
--- a/reactos/dll/cpl/input/lang/uk-UA.rc
+++ b/reactos/dll/cpl/input/lang/uk-UA.rc
@@ -35,7 +35,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
        GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60
        AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP
-       LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25
+       LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",IDC_SUPPORT_ADV_SERV_TEXT,14,33,220,25
        GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60
        AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP
        LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ À糿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25

diff --git a/reactos/dll/cpl/input/langbar.c b/reactos/dll/cpl/input/langbar.c
index 97f16dd..d50c900 100644 (file)
--- a/reactos/dll/cpl/input/langbar.c
+++ b/reactos/dll/cpl/input/langbar.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/misc.c b/reactos/dll/cpl/input/misc.c
index 634f153..8618ec4 100644 (file)
--- a/reactos/dll/cpl/input/misc.c
+++ b/reactos/dll/cpl/input/misc.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 

diff --git a/reactos/dll/cpl/input/resource.h b/reactos/dll/cpl/input/resource.h
index 0688784..794cca3 100644 (file)
--- a/reactos/dll/cpl/input/resource.h
+++ b/reactos/dll/cpl/input/resource.h
@@ -75,6 +75,7 @@
 #define IDC_MORE_TEXT_SERV_COMBO                    190
 #define IDC_CKS_BUTTON                              191
 #define IDC_GRAVE_ACCENT_RADIOBTN                   192
+#define IDC_SUPPORT_ADV_SERV_TEXT                   193
 
 /* IDS */
 #define IDS_CPLSYSTEMNAME           1

diff --git a/reactos/dll/cpl/input/settings.c b/reactos/dll/cpl/input/settings.c
index 0900105..9f3262e 100644 (file)
--- a/reactos/dll/cpl/input/settings.c
+++ b/reactos/dll/cpl/input/settings.c
@@ -26,16 +26,6 @@
  *      06-09-2007  Created
  */
 
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
-#include <process.h>
-
 #include "resource.h"
 #include "input.h"
 
@@ -121,7 +111,7 @@ GetRootHandle(HWND hWnd, TCHAR * Name)
 }
 
 static BOOL
-InitDefaultLangList(HWND hWnd)
+InitLangList(HWND hWnd)
 {
     HKEY hKey, hSubKey;
     TCHAR szPreload[BUFSIZE], szCount[BUFSIZE], szSub[BUFSIZE];
@@ -270,9 +260,32 @@ SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
     switch (uMsg)
     {
         case WM_INITDIALOG:
-            InitDefaultLangList(hwndDlg);
+        {
+            InitLangList(hwndDlg);
+                       EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE);
+                       EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE);
+        }
             break;
-
+        case WM_NOTIFY:
+        {
+            switch (LOWORD(wParam))
+            {
+                case IDC_KEYLAYOUT_TREE:
+                {
+                    LPNMHDR lpnm = (LPNMHDR)lParam;
+                    switch (lpnm->code)
+                    {
+                        case NM_CLICK:
+                        {
+                            
+                        }
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+                   break;
         case WM_COMMAND:
             switch (LOWORD(wParam))
             {