[ros-diffs] [tkreuzer] 46377: Merge trunk HEAD (r46369) (part 3/x)

Author: tkreuzer
Date: Wed Mar 24 00:57:55 2010
New Revision: 46377

URL: http://svn.reactos.org/svn/reactos?rev=46377&view=rev
Log:
Merge trunk HEAD (r46369)
(part 3/x)

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.c
    branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.h
    branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Da.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_De.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_En.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Fr.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ko.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Lt.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Nl.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_No.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pl.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pt.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ro.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ru.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Si.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Sv.rc
    branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Zh.rc

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.c [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -503,7 +503,6 @@
 {
     addportui_t data;
     HANDLE  hXcv;
-    LPWSTR  ptr = NULL;
     DWORD   needed;
     DWORD   dummy;
     DWORD   status;
@@ -529,14 +528,11 @@
                             (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 */
-                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)) {

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.h [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -21,6 +21,8 @@
 #ifndef __WINE_LOCALUI__
 #define __WINE_LOCALUI__

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

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

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/localui.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -39,17 +39,19 @@

#include "ui_Da.rc"
-#include "ui_De.rc"
 #include "ui_En.rc"
-#include "ui_Fr.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_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_Sv.rc"
 #include "ui_Zh.rc"

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Da.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_De.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -18,14 +18,18 @@
  * 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
-CAPTION "Lokalen Anschluss hinzufügen"
+CAPTION "Lokalen Anschluss hinzufügen"
 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
@@ -37,8 +41,8 @@
 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
@@ -48,7 +52,7 @@
 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"
 }

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_En.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Fr.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -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
  */
+
+#include "localui.h"
+
 #pragma code_page(65001)

LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -53,5 +56,3 @@
     IDS_PORTEXISTS "Le port %s existe déjà "
     IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration"
 }
-
-#pragma code_page(default)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ko.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -18,6 +18,8 @@
  * 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"

LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Lt.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Lt.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -53,8 +53,7 @@
 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"
 }
-#pragma code_page(default)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Nl.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_No.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pl.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -18,6 +18,8 @@
  * 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"

LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pt.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ro.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -16,6 +16,8 @@
  * 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"

LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

@@ -53,5 +55,3 @@
     IDS_PORTEXISTS "Portul %s existsă deja"
     IDS_NOTHINGTOCONFIG "Acest port nu are opțiuni de configurat"
 }
-
-#pragma code_page(default)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ru.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -18,37 +18,42 @@
  * 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
-CAPTION "Äîáàâèòü ëîêàëüíûé ïîðò"
+CAPTION "Добавить локальный порт"
 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
-    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
-CAPTION "Óñòàíîâêè ïàðàëëåëüíîãî ïîðòà"
+CAPTION "Установки параллельного порта"
 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
-    PUSHBUTTON "Îòìåíà", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+    PUSHBUTTON "Отмена", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
 END

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

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Si.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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)

@@ -54,5 +56,3 @@
     IDS_PORTEXISTS "Vrata z imenom %s že obstajajo"
     IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve"
 }
-
-#pragma code_page(default)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Sv.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

Modified: branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Zh.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi...
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] Wed Mar 24 00:57:55 2010
@@ -17,6 +17,8 @@
  * 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"

/* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
@@ -90,5 +92,3 @@
     IDS_PORTEXISTS "端口 %s 已經存在"
     IDS_NOTHINGTOCONFIG "é€™å€‹ç«¯å£æ²’æœ‰å¯è¨­å®šé¸é …"
 }
-
-#pragma code_page(default)