sync localui with wine 1.1.25

svn path=/trunk/; revision=41770

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__
 
+#include <windef.h>
+#include <winuser.h>
 
 /* ## Resource-ID ## */
 #define ADDPORT_DIALOG  100

diff --git a/reactos/dll/win32/localui/localui.rbuild b/reactos/dll/win32/localui/localui.rbuild
index 7ee4b14..7172c22 100644 (file)
--- a/reactos/dll/win32/localui/localui.rbuild
+++ b/reactos/dll/win32/localui/localui.rbuild
@@ -8,6 +8,21 @@
        <define name="__WINESRC__" />
        <file>localui.c</file>
        <file>localui.rc</file>
+       <file>ui_Da.rc</file>
+       <file>ui_De.rc</file>
+       <file>ui_En.rc</file>
+       <file>ui_Fr.rc</file>
+       <file>ui_Ko.rc</file>
+       <file>ui_Lt.rc</file>
+       <file>ui_Nl.rc</file>
+       <file>ui_No.rc</file>
+       <file>ui_Pl.rc</file>
+       <file>ui_Pt.rc</file>
+       <file>ui_Ro.rc</file>
+       <file>ui_Ru.rc</file>
+       <file>ui_Si.rc</file>
+       <file>ui_Sv.rc</file>
+       <file>ui_Zh.rc</file>
        <library>wine</library>
        <library>winspool</library>
        <library>user32</library>

diff --git a/reactos/dll/win32/localui/localui.rc b/reactos/dll/win32/localui/localui.rc
index 815cac0..cdf7bb4 100644 (file)
--- a/reactos/dll/win32/localui/localui.rc
+++ b/reactos/dll/win32/localui/localui.rc
@@ -19,10 +19,6 @@
  *
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winver.h"
 #include "localui.h"
 
 #define WINE_FILENAME_STR "localui.dll"
@@ -36,19 +32,3 @@
 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
 
 #include "wine/wine_common_ver.rc"
-
-
-#include "ui_Da.rc"
-#include "ui_De.rc"
-#include "ui_En.rc"
-#include "ui_Fr.rc"
-#include "ui_Ko.rc"
-#include "ui_Nl.rc"
-#include "ui_No.rc"
-#include "ui_Pl.rc"
-#include "ui_Pt.rc"
-#include "ui_Ro.rc"
-#include "ui_Ru.rc"
-#include "ui_Si.rc"
-#include "ui_Sv.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
  */
 
+#include "localui.h"
+
 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..5f65a80 100644 (file)
--- a/reactos/dll/win32/localui/ui_De.rc
+++ b/reactos/dll/win32/localui/ui_De.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "localui.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

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
  */
 
+#include "localui.h"
+
 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
  */
+
+#include "localui.h"
+
 #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"
 }
-
-#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
  */
 
+#include "localui.h"
+
 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
new file mode 100644 (file)
index 0000000..87997d0
--- /dev/null
+++ b/reactos/dll/win32/localui/ui_Lt.rc
@@ -0,0 +1,59 @@
+/*
+ * Lithuanian resources for localui
+ *
+ * Copyright 2009 Aurimas Fišeras <aurimas@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "localui.h"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+LANGUAGE LANG_LITHUANIAN, 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 "Pridėti vietinį prievadą"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "&Įveskite pridedamo prievado vardą:", -1, 7, 13, 194, 13, WS_VISIBLE
+    EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL
+    DEFPUSHBUTTON "Gerai", IDOK, 199, 10, 40, 14, WS_VISIBLE
+    PUSHBUTTON "Atsisakyti", 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 "Konfigūruoti LPT prievadą"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Laukimo laikas (sekundėmis)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX
+    LTEXT "&Perdavimo pakartojimas:", -1, 14, 22, 90, 13, WS_VISIBLE
+    EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER
+    DEFPUSHBUTTON "Gerai", IDOK, 164, 10, 50, 14, WS_VISIBLE
+    PUSHBUTTON "Atsisakyti", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE
+END
+
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_LOCALPORT "Vietinis prievadas"
+    IDS_INVALIDNAME "'%s' yra netinkamas prievado vardas"
+    IDS_PORTEXISTS "Prievadas %s jau egzistuoja"
+    IDS_NOTHINGTOCONFIG "Šis prievadas neturi parinkčių konfigūravimui"
+}

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
  */
 
+#include "localui.h"
+
 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
  */
 
+#include "localui.h"
+
 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
  */
 
+#include "localui.h"
+
 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
  */
 
+#include "localui.h"
+
 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
  */
 
+#include "localui.h"
+
 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"
 }
-
-#pragma code_page(default)

diff --git a/reactos/dll/win32/localui/ui_Ru.rc b/reactos/dll/win32/localui/ui_Ru.rc
index 96e78f1..3402f37 100644 (file)
--- a/reactos/dll/win32/localui/ui_Ru.rc
+++ b/reactos/dll/win32/localui/ui_Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "localui.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47

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
  */
 
+#include "localui.h"
+
 #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"
 }
-
-#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
  */
 
+#include "localui.h"
+
 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
  */
 
+#include "localui.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -90,5 +92,3 @@ STRINGTABLE DISCARDABLE
     IDS_PORTEXISTS "端口 %s 已經存在"
     IDS_NOTHINGTOCONFIG "這個端口沒有可設定選項"
 }
-
-#pragma code_page(default)