[gvg] 13516: Sync to Wine-20050211

Sync to Wine-20050211
Juan Lang [e-mail]
- Make netspi.h private, as some of its declarations conflict with
  npapi.h.  Spotted by Paul Vriens.
Jonathan Ernst [e-mail]
- Updated French resources.
Henning Gerhardt [e-mail]
- Update German resources.
Modified: trunk/reactos/lib/mpr/mpr.rc
Modified: trunk/reactos/lib/mpr/mpr_De.rc
Added: trunk/reactos/lib/mpr/mpr_Fr.rc
Added: trunk/reactos/lib/mpr/netspi.h
Modified: trunk/reactos/lib/mpr/nps.c
  _____

Modified: trunk/reactos/lib/mpr/mpr.rc
--- trunk/reactos/lib/mpr/mpr.rc	2005-02-12 21:07:16 UTC (rev
13515)
+++ trunk/reactos/lib/mpr/mpr.rc	2005-02-12 21:26:15 UTC (rev
13516)
@@ -27,8 +27,9 @@

#include "mpr_Cs.rc"
 #include "mpr_De.rc"
 #include "mpr_En.rc"
-#include "mpr_Nl.rc"
 #include "mpr_Es.rc"
+#include "mpr_Fr.rc"
 #include "mpr_It.rc"
 #include "mpr_Ja.rc"
+#include "mpr_Nl.rc"
 #include "mpr_Pt.rc"
  _____

Modified: trunk/reactos/lib/mpr/mpr_De.rc
--- trunk/reactos/lib/mpr/mpr_De.rc	2005-02-12 21:07:16 UTC (rev
13515)
+++ trunk/reactos/lib/mpr/mpr_De.rc	2005-02-12 21:26:15 UTC (rev
13516)
@@ -24,3 +24,23 @@

{
     IDS_ENTIRENETWORK "Gesamtes Netzwerk"
 }
+
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Netzwerkkennung eingeben"
+FONT 8, "Helv"
+{
+ LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN,
40, 6, 150, 15
+ LTEXT "Proxy", -1, 40, 26, 50, 10
+/* LTEXT "Bereich", -1, 40, 46, 50, 10 */
+ LTEXT "Benutzername", -1, 40, 66, 50, 10
+ LTEXT "Kennwort", -1, 40, 86, 50, 10
+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER |
WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER |
WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD,
+          80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
+ PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP |
WS_TABSTOP
+}
  _____

Copied: trunk/reactos/lib/mpr/mpr_Fr.rc (from rev 13515,
vendor/wine/dlls/mpr/current/mpr_Fr.rc)
--- vendor/wine/dlls/mpr/current/mpr_Fr.rc	2005-02-12 21:07:16 UTC
(rev 13515)
+++ trunk/reactos/lib/mpr/mpr_Fr.rc	2005-02-12 21:26:15 UTC (rev
13516)
@@ -0,0 +1,47 @@

+/*
+ * MPR dll resources
+ * French language support
+ *
+ * Copyright (C) 2005 Jonathan Ernst
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
+ */
+
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ENTIRENETWORK "Le rÚseau entier"
+}
+
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Entrez le mot de passe rÚseau"
+FONT 8, "Helv"
+{
+ LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de
passe:", IDC_EXPLAIN, 40, 6, 150, 15
+ LTEXT "Proxy", -1, 40, 26, 50, 10
+/* LTEXT "Realm", -1, 40, 46, 50, 10 */
+ LTEXT "Utilisateur", -1, 40, 66, 50, 10
+ LTEXT "Mot de passe", -1, 40, 86, 50, 10
+ LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0
+ LTEXT "" IDC_REALM, 80, 46, 150, 14, 0
+ EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER |
WS_TABSTOP
+ EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER |
WS_TABSTOP | ES_PASSWORD
+ CHECKBOX "&Enregistrer ce mot de passe (risquÚ)", IDC_SAVEPASSWORD,
+           80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
+ PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP |
WS_TABSTOP
+}
Property changes on: trunk/reactos/lib/mpr/mpr_Fr.rc
___________________________________________________________________
Name: svn:eol-style
   + native
  _____

Copied: trunk/reactos/lib/mpr/netspi.h (from rev 13515,
vendor/wine/dlls/mpr/current/netspi.h)
Property changes on: trunk/reactos/lib/mpr/netspi.h
___________________________________________________________________
Name: svn:keywords   + Author Date Id Revision Name: svn:eol-style   +
native 
  _____

Modified: trunk/reactos/lib/mpr/nps.c
--- trunk/reactos/lib/mpr/nps.c	2005-02-12 21:07:16 UTC (rev 13515)
+++ trunk/reactos/lib/mpr/nps.c	2005-02-12 21:26:15 UTC (rev 13516)
@@ -26,7 +26,6 @@

#include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "winnetwk.h"
 #include "netspi.h"
 #include "wine/debug.h"
 #include "winerror.h"
@@ -212,4 +211,3 @@
     FIXME( "(%p): stub\n", pfNotifyCallBack );
     return NULL;
 }
-