<html>
<head>
<style>
<!--
body { background-color:#ffffff }
.file { border:1px solid #eeeeee; margin-top:1em; margin-bottom:1em }
.pathname { font-family:monospace; float:right }
.fileheader { margin-bottom:.5em }
.diff { margin:0 }
.tasklist { padding:4px; border:1px dashed #000000; margin-top:1em }
.tasklist ul { margin-top:0; margin-bottom:0 }
tr.alt { background-color:#eeeeee }
#added { background-color:#ddffdd }
#addedchars { background-color:#99ff99; font-weight:bolder }
tr.alt #added { background-color:#ccf7cc }
#removed { background-color:#ffdddd }
#removedchars { background-color:#ff9999; font-weight:bolder }
tr.alt #removed { background-color:#f7cccc }
#info { color:#888888 }
#context { background-color:#eeeeee }
td {padding-left:.3em; padding-right:.3em }
tr.head { border-bottom-width:1px; border-bottom-style:solid }
tr.head td { padding:0; padding-top:.2em }
.task { background-color:#ffff00 }
.comment { padding:4px; border:1px dashed #000000; background-color:#ffffdd }
.error { color:red }
hr { border-width:0px; height:2px; background:black }
-->
</style>
</head>
<body>
<pre class="comment">Sync to Wine-20050211
Juan Lang <juan_lang@yahoo.com>
- Make netspi.h private, as some of its declarations conflict with
npapi.h. Spotted by Paul Vriens.
Jonathan Ernst <Jonathan@ErnstFamily.ch>
- Updated French resources.
Henning Gerhardt <henning.gerhardt@web.de>
- Update German resources.</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mpr/mpr.rc
Modified: trunk/reactos/lib/mpr/mpr_De.rc
</pre><pre class="diff" id="added">Added: trunk/reactos/lib/mpr/mpr_Fr.rc
Added: trunk/reactos/lib/mpr/netspi.h
</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/mpr/nps.c
</pre><hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mpr/mpr.rc</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> #include "mpr_Cs.rc"
#include "mpr_De.rc"
#include "mpr_En.rc"
</pre><pre class="diff" id="removed">-#include "mpr_Nl.rc"
</pre><pre class="diff" id="context"> #include "mpr_Es.rc"
</pre><pre class="diff" id="added">+#include "mpr_Fr.rc"
</pre><pre class="diff" id="context"> #include "mpr_It.rc"
#include "mpr_Ja.rc"
</pre><pre class="diff" id="added">+#include "mpr_Nl.rc"
</pre><pre class="diff" id="context"> #include "mpr_Pt.rc"
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mpr/mpr_De.rc</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> {
IDS_ENTIRENETWORK "Gesamtes Netzwerk"
}
</pre><pre class="diff" id="added">+
+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
+}
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Copied: trunk/reactos/lib/mpr/mpr_Fr.rc</b> (from rev 13515, vendor/wine/dlls/mpr/current/mpr_Fr.rc)</big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="added">+/*
+ * 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
+}
</pre><pre class="diff" id="context">Property changes on: trunk/reactos/lib/mpr/mpr_Fr.rc
___________________________________________________________________
Name: svn:eol-style
+ native
</pre></div>
<hr /><div class="file">
<div class="fileheader"><big><b>Copied: trunk/reactos/lib/mpr/netspi.h</b> (from rev 13515, vendor/wine/dlls/mpr/current/netspi.h)</big></div>
</div>
Property changes on: trunk/reactos/lib/mpr/netspi.h
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
</div>
<hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/mpr/nps.c</b></big></div>
<pre class="diff"><small id="info">--- 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 @@
</small></pre><pre class="diff" id="context"> #include "windef.h"
#include "winbase.h"
#include "winuser.h"
</pre><pre class="diff" id="removed">-#include "winnetwk.h"
</pre><pre class="diff" id="context"> #include "netspi.h"
#include "wine/debug.h"
#include "winerror.h"
@@ -212,4 +211,3 @@
</pre><pre class="diff" id="context"> FIXME( "(%p): stub\n", pfNotifyCallBack );
return NULL;
}
</pre><pre class="diff" id="removed">-
</pre>
</div>
</body>
</html>