Merge trunk HEAD (r46369)

(part 3/x)

svn path=/branches/ros-amd64-bringup/; revision=46377

diff --git a/reactos/dll/win32/localui/localui.c b/reactos/dll/win32/localui/localui.c
index 2acfc7e..b9e4c4e 100644 (file)
--- a/reactos/dll/win32/localui/localui.c
+++ b/reactos/dll/win32/localui/localui.c
@@ -503,7 +503,6 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam
 {
     addportui_t data;
     HANDLE  hXcv;
 {
     addportui_t data;
     HANDLE  hXcv;

-    LPWSTR  ptr = NULL;

     DWORD   needed;
     DWORD   dummy;
     DWORD   status;
     DWORD   needed;
     DWORD   dummy;
     DWORD   status;


@@ -529,14 +528,11 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam
                             (PBYTE) &dummy, 0, &needed, &status);
 
             TRACE("got %u with status %u\n", res, status);
                             (PBYTE) &dummy, 0, &needed, &status);
 
             TRACE("got %u with status %u\n", res, status);

-            if (res && (status == ERROR_SUCCESS)) {
+            if (res && (status == ERROR_SUCCESS) && ppPortName) {

                 /* Native localui uses GlobalAlloc also.
                    The caller must GlobalFree the buffer */
                 /* Native localui uses GlobalAlloc also.
                    The caller must GlobalFree the buffer */

-                ptr = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR));
-                if (ptr) {
-                    lstrcpyW(ptr, data.portname);
-                    if (ppPortName) *ppPortName = ptr;
-                }
+                *ppPortName = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR));
+                if (*ppPortName) lstrcpyW(*ppPortName, data.portname);

             }
 
             if (res && (status == ERROR_ALREADY_EXISTS)) {
             }
 
             if (res && (status == ERROR_ALREADY_EXISTS)) {

diff --git a/reactos/dll/win32/localui/localui.h b/reactos/dll/win32/localui/localui.h
index aa244bd..25424da 100644 (file)
--- a/reactos/dll/win32/localui/localui.h
+++ b/reactos/dll/win32/localui/localui.h
@@ -21,6 +21,8 @@
 #ifndef __WINE_LOCALUI__
 #define __WINE_LOCALUI__
 
 #ifndef __WINE_LOCALUI__
 #define __WINE_LOCALUI__
 

+#include <windef.h>
+#include <winuser.h>

 
 /* ## Resource-ID ## */
 #define ADDPORT_DIALOG  100
 
 /* ## Resource-ID ## */
 #define ADDPORT_DIALOG  100

diff --git a/reactos/dll/win32/localui/localui.rc b/reactos/dll/win32/localui/localui.rc
index 9963acb..f229f72 100644 (file)
--- a/reactos/dll/win32/localui/localui.rc
+++ b/reactos/dll/win32/localui/localui.rc
@@ -39,17 +39,19 @@
 
 
 #include "ui_Da.rc"
 
 
 #include "ui_Da.rc"

-#include "ui_De.rc"

 #include "ui_En.rc"
 #include "ui_En.rc"

-#include "ui_Fr.rc"

 #include "ui_Ko.rc"
 #include "ui_Ko.rc"

-#include "ui_Lt.rc"

 #include "ui_Nl.rc"
 #include "ui_No.rc"
 #include "ui_Pl.rc"
 #include "ui_Pt.rc"
 #include "ui_Nl.rc"
 #include "ui_No.rc"
 #include "ui_Pl.rc"
 #include "ui_Pt.rc"

+#include "ui_Sv.rc"
+
+/* UTF-8 */
+#include "ui_De.rc"
+#include "ui_Fr.rc"
+#include "ui_Lt.rc"

 #include "ui_Ro.rc"
 #include "ui_Ru.rc"
 #include "ui_Si.rc"
 #include "ui_Ro.rc"
 #include "ui_Ru.rc"
 #include "ui_Si.rc"

-#include "ui_Sv.rc"

 #include "ui_Zh.rc"
 #include "ui_Zh.rc"

diff --git a/reactos/dll/win32/localui/ui_Da.rc b/reactos/dll/win32/localui/ui_Da.rc
index 9729926..861ba8f 100644 (file)
--- a/reactos/dll/win32/localui/ui_Da.rc
+++ b/reactos/dll/win32/localui/ui_Da.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_De.rc b/reactos/dll/win32/localui/ui_De.rc
index 2fe35fc..74148c3 100644 (file)
--- a/reactos/dll/win32/localui/ui_De.rc
+++ b/reactos/dll/win32/localui/ui_De.rc
@@ -18,14 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+
+#pragma code_page(65001)
+

 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION

-CAPTION "Lokalen Anschluss hinzufügen"
+CAPTION "Lokalen Anschluss hinzufügen"

 FONT 8, "MS Shell Dlg"
 BEGIN
 FONT 8, "MS Shell Dlg"
 BEGIN

-    LTEXT "&Lokaler Anschuss, der hinzugefügt werden soll:", -1, 7, 13, 194, 13, WS_VISIBLE
+    LTEXT "&Lokaler Anschuss, der hinzugefügt werden soll:", -1, 7, 13, 194, 13, WS_VISIBLE

     EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE
     PUSHBUTTON "Abbrechen", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE
     EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE
     PUSHBUTTON "Abbrechen", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE


@@ -37,8 +41,8 @@ STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPW
 CAPTION "LPT-Anschluss konfigurieren"
 FONT 8, "MS Shell Dlg"
 BEGIN
 CAPTION "LPT-Anschluss konfigurieren"
 FONT 8, "MS Shell Dlg"
 BEGIN

-    GROUPBOX "Zeitüberschreitung (Sekunden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
-    LTEXT "Ü&bertragung wiederholen:", -1, 14, 22, 90, 13, WS_VISIBLE
+    GROUPBOX "Zeitüberschreitung (Sekunden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "Ü&bertragung wiederholen:", -1, 14, 22, 90, 13, WS_VISIBLE

     EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
     DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
     PUSHBUTTON "Abbrechen", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
     EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
     DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
     PUSHBUTTON "Abbrechen", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE


@@ -48,7 +52,7 @@ END
 STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Lokaler Anschluss"
 STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Lokaler Anschluss"

-    IDS_INVALIDNAME "'%s' ist kein gültiger Anschlussname"
+    IDS_INVALIDNAME "'%s' ist kein gültiger Anschlussname"

     IDS_PORTEXISTS "Der Anschluss %s existiert bereits"
     IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren"
 }
     IDS_PORTEXISTS "Der Anschluss %s existiert bereits"
     IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren"
 }

diff --git a/reactos/dll/win32/localui/ui_En.rc b/reactos/dll/win32/localui/ui_En.rc
index c2de626..5a21868 100644 (file)
--- a/reactos/dll/win32/localui/ui_En.rc
+++ b/reactos/dll/win32/localui/ui_En.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_Fr.rc b/reactos/dll/win32/localui/ui_Fr.rc
index 261fa0b..70e4baf 100644 (file)
--- a/reactos/dll/win32/localui/ui_Fr.rc
+++ b/reactos/dll/win32/localui/ui_Fr.rc
@@ -17,6 +17,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
  * 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 "localui.h"
+

 #pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 #pragma code_page(65001)
 
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL


@@ -53,5 +56,3 @@ STRINGTABLE DISCARDABLE
     IDS_PORTEXISTS "Le port %s existe déjà"
     IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration"
 }
     IDS_PORTEXISTS "Le port %s existe déjà"
     IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration"
 }

-
-#pragma code_page(default)

diff --git a/reactos/dll/win32/localui/ui_Ko.rc b/reactos/dll/win32/localui/ui_Ko.rc
index 9a38030..d86b7ef 100644 (file)
--- a/reactos/dll/win32/localui/ui_Ko.rc
+++ b/reactos/dll/win32/localui/ui_Ko.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_Lt.rc b/reactos/dll/win32/localui/ui_Lt.rc
index 698918a..ff789e1 100644 (file)
--- a/reactos/dll/win32/localui/ui_Lt.rc
+++ b/reactos/dll/win32/localui/ui_Lt.rc
@@ -53,8 +53,7 @@ END
 STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Vietinis prievadas"
 STRINGTABLE DISCARDABLE
 {
     IDS_LOCALPORT "Vietinis prievadas"

-    IDS_INVALIDNAME "'%s' yra netinkamas prievado vardas"
+    IDS_INVALIDNAME "„%s“ yra netinkamas prievado vardas"

     IDS_PORTEXISTS "Prievadas %s jau egzistuoja"
     IDS_NOTHINGTOCONFIG "Šis prievadas neturi parinkčių konfigūravimui"
 }
     IDS_PORTEXISTS "Prievadas %s jau egzistuoja"
     IDS_NOTHINGTOCONFIG "Šis prievadas neturi parinkčių konfigūravimui"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/localui/ui_Nl.rc b/reactos/dll/win32/localui/ui_Nl.rc
index 59c58ff..21d7cc8 100644 (file)
--- a/reactos/dll/win32/localui/ui_Nl.rc
+++ b/reactos/dll/win32/localui/ui_Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_No.rc b/reactos/dll/win32/localui/ui_No.rc
index 3a46bc8..8ed9e00 100644 (file)
--- a/reactos/dll/win32/localui/ui_No.rc
+++ b/reactos/dll/win32/localui/ui_No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_Pl.rc b/reactos/dll/win32/localui/ui_Pl.rc
index 74a5015..822763d 100644 (file)
--- a/reactos/dll/win32/localui/ui_Pl.rc
+++ b/reactos/dll/win32/localui/ui_Pl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_Pt.rc b/reactos/dll/win32/localui/ui_Pt.rc
index 7bad521..7f16848 100644 (file)
--- a/reactos/dll/win32/localui/ui_Pt.rc
+++ b/reactos/dll/win32/localui/ui_Pt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_Ro.rc b/reactos/dll/win32/localui/ui_Ro.rc
index 43edfe6..a1b1c77 100644 (file)
--- a/reactos/dll/win32/localui/ui_Ro.rc
+++ b/reactos/dll/win32/localui/ui_Ro.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)


@@ -53,5 +55,3 @@ STRINGTABLE DISCARDABLE
     IDS_PORTEXISTS "Portul %s existsă deja"
     IDS_NOTHINGTOCONFIG "Acest port nu are opțiuni de configurat"
 }
     IDS_PORTEXISTS "Portul %s existsă deja"
     IDS_NOTHINGTOCONFIG "Acest port nu are opțiuni de configurat"
 }

-
-#pragma code_page(default)

diff --git a/reactos/dll/win32/localui/ui_Ru.rc b/reactos/dll/win32/localui/ui_Ru.rc
index 96e78f1..04f87b6 100644 (file)
--- a/reactos/dll/win32/localui/ui_Ru.rc
+++ b/reactos/dll/win32/localui/ui_Ru.rc
@@ -18,37 +18,42 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+

 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION

-CAPTION "Äîáàâèòü ëîêàëüíûé ïîðò"
+CAPTION "Добавить локальный порт"

 FONT 8, "MS Shell Dlg"
 BEGIN
 FONT 8, "MS Shell Dlg"
 BEGIN

-    LTEXT "Ââåäèòå &íàçâàíèå ëîêàëüíîãî ïîðòà:", -1, 7, 13, 194, 13, WS_VISIBLE
+    LTEXT "Введите &название локального порта:", -1, 7, 13, 194, 13, WS_VISIBLE

     EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE
     EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
     DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE

-    PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE
+    PUSHBUTTON "Отменить", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE

 END
 
 
 LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
 END
 
 
 LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47
 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION

-CAPTION "Óñòàíîâêè ïàðàëëåëüíîãî ïîðòà"
+CAPTION "Установки параллельного порта"

 FONT 8, "MS Shell Dlg"
 BEGIN
 FONT 8, "MS Shell Dlg"
 BEGIN

-    GROUPBOX "Òàéì-àóò (ñåêóíä)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
-    LTEXT "&Ïîïûòîê ïåðåñûëêè:", -1, 14, 22, 90, 13, WS_VISIBLE
+    GROUPBOX "Тайм-аут (секунд)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "&Попыток пересылки:", -1, 14, 22, 90, 13, WS_VISIBLE

     EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
     DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE
     EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
     DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE

-    PUSHBUTTON "Îòìåíà", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+    PUSHBUTTON "Отмена", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE

 END
 
 
 STRINGTABLE DISCARDABLE
 {
 END
 
 
 STRINGTABLE DISCARDABLE
 {

-    IDS_LOCALPORT "Ëîêàëüíûé ïîðò"
-    IDS_INVALIDNAME "Íå ïðàâèëüíîå íàçâàíèå ïîðòà '%s'"
-    IDS_PORTEXISTS "Ïîðò '%s' óæå ñóùåñòâóåò"
-    IDS_NOTHINGTOCONFIG "Ýòîò ïîðò íå èìååò íàñòðîåê"
+    IDS_LOCALPORT "Локальный порт"
+    IDS_INVALIDNAME "Не правильное название порта '%s'"
+    IDS_PORTEXISTS "Порт '%s' уже существует"
+    IDS_NOTHINGTOCONFIG "Этот порт не имеет настроек"

 }
 }

diff --git a/reactos/dll/win32/localui/ui_Si.rc b/reactos/dll/win32/localui/ui_Si.rc
index 961a2e0..6810c7c 100644 (file)
--- a/reactos/dll/win32/localui/ui_Si.rc
+++ b/reactos/dll/win32/localui/ui_Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT


@@ -54,5 +56,3 @@ STRINGTABLE DISCARDABLE
     IDS_PORTEXISTS "Vrata z imenom %s že obstajajo"
     IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve"
 }
     IDS_PORTEXISTS "Vrata z imenom %s že obstajajo"
     IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve"
 }

-
-#pragma code_page(default)

diff --git a/reactos/dll/win32/localui/ui_Sv.rc b/reactos/dll/win32/localui/ui_Sv.rc
index 3cd22fd..e137079 100644 (file)
--- a/reactos/dll/win32/localui/ui_Sv.rc
+++ b/reactos/dll/win32/localui/ui_Sv.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

diff --git a/reactos/dll/win32/localui/ui_Zh.rc b/reactos/dll/win32/localui/ui_Zh.rc
index 197ac1d..f43dde9 100644 (file)
--- a/reactos/dll/win32/localui/ui_Zh.rc
+++ b/reactos/dll/win32/localui/ui_Zh.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#include "localui.h"
+

 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 


@@ -90,5 +92,3 @@ STRINGTABLE DISCARDABLE
     IDS_PORTEXISTS "端口 %s 已經存在"
     IDS_NOTHINGTOCONFIG "這個端口沒有可設定選項"
 }
     IDS_PORTEXISTS "端口 %s 已經存在"
     IDS_NOTHINGTOCONFIG "這個端口沒有可設定選項"
 }

-
-#pragma code_page(default)