Commit one part from big patch from Pablo Borobia (pborobia at gmail dot com) he...

1. implement detail show for network.

Magnus Olsen (me) aka GreatLord
I did review ncpa changes, he did only forget free the memory when detail propers was exit. I set erly style on file
that was not set. I also update most .rc so they contain the english res text. please translators translate this.

svn path=/trunk/; revision=23756

diff --git a/reactos/dll/cpl/ncpa/Ja.rc b/reactos/dll/cpl/ncpa/Ja.rc
index 14873e2..90b67d0 100644 (file)
--- a/reactos/dll/cpl/ncpa/Ja.rc
+++ b/reactos/dll/cpl/ncpa/Ja.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "\96³\8cø\82É\82·\82é(&D)", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "\91S\94Ê"

diff --git a/reactos/dll/cpl/ncpa/cz.rc b/reactos/dll/cpl/ncpa/cz.rc
index e069832..33f163a 100644 (file)
--- a/reactos/dll/cpl/ncpa/cz.rc
+++ b/reactos/dll/cpl/ncpa/cz.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Obecné nastavení"

diff --git a/reactos/dll/cpl/ncpa/de.rc b/reactos/dll/cpl/ncpa/de.rc
index 781e7a3..6ba7ecc 100644 (file)
--- a/reactos/dll/cpl/ncpa/de.rc
+++ b/reactos/dll/cpl/ncpa/de.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"

diff --git a/reactos/dll/cpl/ncpa/dk.rc b/reactos/dll/cpl/ncpa/dk.rc
index 202322e..dda53e8 100644 (file)
--- a/reactos/dll/cpl/ncpa/dk.rc
+++ b/reactos/dll/cpl/ncpa/dk.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "&Deaktiver", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"

diff --git a/reactos/dll/cpl/ncpa/en.rc b/reactos/dll/cpl/ncpa/en.rc
index bf81271..78cd134 100644 (file)
--- a/reactos/dll/cpl/ncpa/en.rc
+++ b/reactos/dll/cpl/ncpa/en.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"

diff --git a/reactos/dll/cpl/ncpa/es.rc b/reactos/dll/cpl/ncpa/es.rc
index aa0b821..7653d3a 100644 (file)
--- a/reactos/dll/cpl/ncpa/es.rc
+++ b/reactos/dll/cpl/ncpa/es.rc
@@ -3,7 +3,6 @@
  *ReactOs (c) 2005 Samuel Serapión Vega
  */
 
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_PROPPAGENETWORK DIALOG DISCARDABLE  0, 0, 246, 228
@@ -11,10 +10,10 @@ STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Propiedades de la Red"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Adaptadores de la red",-1,9,9,217,8
+    LTEXT           "Adaptadores de red",-1,9,9,217,8
     LISTBOX         IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&Añadir",IDC_ADD,9,100,60,14
-    PUSHBUTTON      "&Remover",IDC_REMOVE,72,100,60,14
+    PUSHBUTTON      "&Instalar",IDC_ADD,9,100,60,14
+    PUSHBUTTON      "&Desinstalar",IDC_REMOVE,72,100,60,14
     PUSHBUTTON      "&Propiedades",IDC_PROPERTIES,179,100,60,14
 END
 
@@ -23,27 +22,26 @@ STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
- LTEXT "Connectarse Usando:", -1, 9,9,217,8
+ LTEXT "Conectarse Usando:", -1, 9,9,217,8
  EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP
  PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14
- LTEXT "Los componentes marcados son utilizados por esta conección:", -1, 9, 59, 217, 8
+ LTEXT "Los componentes marcados son utilizados por esta conexión:", -1, 9, 59, 217, 8
  LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT
  PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP
  PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP
  PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14
  GROUPBOX "Descripción", -1, 9, 153, 230, 46, BS_GROUPBOX
  LTEXT "La Descripción del componente va aqui...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP
- CHECKBOX "Enseñar icono de estatus cuando conectado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP
+ CHECKBOX "Mostrar icono de estado cuando esté conectado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP
 END
 
-
 IDD_CARDPROPERTIES DIALOG DISCARDABLE  0, 0, 200,180
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
- GROUPBOX "Coneción", -1, 9, 8, 182, 58, BS_GROUPBOX
- LTEXT "Estatus:", -1, 19, 20, 60, 8
+ GROUPBOX "Conexión", -1, 9, 8, 182, 58, BS_GROUPBOX
+ LTEXT "Estado:", -1, 19, 20, 60, 8
  LTEXT "Duración:", -1, 19, 34, 60, 8
  LTEXT "Velocidad:", -1, 19, 48, 60, 8
  GROUPBOX "Actividad", -1, 9, 74, 182, 70, BS_GROUPBOX
@@ -52,20 +50,40 @@ BEGIN
  ICON IDI_NETSTAT, -1, 110, 85, 18, 20
  ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
  LTEXT "Recibido", -1, 149, 90, 37, 8
- LTEXT "Paquetes:", -1, 17, 115, 32, 8
- RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
+ LTEXT "Bytes:", -1, 17, 115, 32, 8
+ RTEXT "00.000.000", IDC_SEND, 63, 115, 44, 8
  ICON IDI_VERTICAL, -1, 110, 108, 18, 20
- RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
+ RTEXT "00.000.000", IDC_RECEIVED, 139, 115, 44, 8
  PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 10, 150, 50, 14
  PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Soporte"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Estado de la Conexión", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Tipo de dirección:", -1, 22, 20, 80, 8
+ LTEXT "Dirección IP:", -1, 22, 34, 80, 8
+ LTEXT "Máscara de subred:", -1, 22, 48, 80, 8
+ LTEXT "Puerta de enlace pred:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14
+END
+
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg"
 BEGIN
- LTEXT "Se pueden asignar las propiedades de IP automaticamente si su red apoya esta capacidad. Si no, debe contactar su administrador de red para los ajustes necesarios.", -1, 9, 9, 228, 27
+ LTEXT "Se pueden asignar las propiedades de IP automaticamente si su red soporta esta capacidad. Si no, debe contactar a su administrador de red para los ajustes necesarios.", -1, 9, 9, 228, 27
  CONTROL "Obtener dirección IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
  GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
  CONTROL "&Usar la siguiente Dirección IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12
@@ -88,6 +106,6 @@ BEGIN
 
 STRINGTABLE 
 BEGIN
-  IDS_CPLSYSTEMNAME "Propiedades de la Red"
+  IDS_CPLSYSTEMNAME "Propiedades de Red"
   IDS_CPLSYSTEMDESCRIPTION "Cambia las opciones de la red."
 END

diff --git a/reactos/dll/cpl/ncpa/fr.rc b/reactos/dll/cpl/ncpa/fr.rc
index 77e417e..6aa4455 100644 (file)
--- a/reactos/dll/cpl/ncpa/fr.rc
+++ b/reactos/dll/cpl/ncpa/fr.rc
@@ -1,98 +1,117 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL\r
-\r
-IDD_PROPPAGENETWORK DIALOG DISCARDABLE  0, 0, 246, 228\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Propriétés réseau"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
-    LTEXT           "Cartes réseau",-1,9,9,217,8\r
-    LISTBOX         IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "&Ajouter",IDC_ADD,9,100,60,14\r
-    PUSHBUTTON      "&Enlever",IDC_REMOVE,72,100,60,14\r
-    PUSHBUTTON      "&Propriétés",IDC_PROPERTIES,179,100,60,14\r
-END\r
-\r
-IDD_NETPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Général"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
- LTEXT "Se connecter en utilisant:", -1, 9,9,217,8\r
- EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP\r
- PUSHBUTTON "&Configurer", IDC_CONFIGURE, 189, 38, 50, 14\r
- LTEXT "Les composants cochés sont utilisés par cette connection:", -1, 9, 59, 217, 8\r
- LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT\r
- PUSHBUTTON "&Installer", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP\r
- PUSHBUTTON "&Désinstaller", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP\r
- PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14\r
- GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX\r
- LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP\r
- CHECKBOX "Afficher l'icone dans la barre des taches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP\r
-END\r
-\r
-\r
-IDD_CARDPROPERTIES DIALOG DISCARDABLE  0, 0, 200,180\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Général"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
- GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX\r
- LTEXT "Etat:", -1, 19, 20, 60, 8\r
- LTEXT "Durée:", -1, 19, 34, 60, 8\r
- LTEXT "Vitesse:", -1, 19, 48, 60, 8\r
- GROUPBOX "Activité", -1, 9, 74, 182, 70, BS_GROUPBOX\r
- RTEXT "Envoyés", -1, 26, 90, 60, 8\r
- ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20\r
- ICON IDI_NETSTAT, -1, 110, 85, 18, 20\r
- ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20\r
- LTEXT "Reçus", -1, 149, 90, 37, 8\r
- LTEXT "Paquets:", -1, 17, 115, 32, 8\r
- RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8\r
- ICON IDI_VERTICAL, -1, 110, 108, 18, 20\r
- RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8\r
- PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 10, 150, 50, 14\r
- PUSHBUTTON "&Désactiver", IDC_ENDISABLE, 66, 150, 50, 14\r
-END\r
-\r
-IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Général"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
- LTEXT "Vous pouvez automatiquement régler les paramètres si votre réseau supporte cette possibilité. Sinon, vous devez demander les réglages IP nécessaires à votre administrateur réseau.", -1, 9, 9, 228, 27\r
- CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12\r
- GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX\r
- CONTROL "&Utiliser l'adresse IP suivante:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12\r
- LTEXT "Adresse IP :", -1, 14, 75, 135, 8\r
- CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12\r
- LTEXT "Masque de sous réseau:", -1, 14, 90, 135, 8\r
- CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12\r
- LTEXT "Passerelle par défaut:", -1, 14, 105, 135, 8\r
- CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12\r
- CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12\r
- GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX\r
- CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12\r
- LTEXT "Serveur DNS primaire:", -1, 14, 171, 135, 8\r
- CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12\r
- LTEXT "Serveur DNS secondaire:", -1, 14, 186, 135, 8\r
- CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12\r
- PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP\r
-END\r
-\r
-\r
-STRINGTABLE \r
-BEGIN\r
-  IDS_CPLSYSTEMNAME "Propriétés réseau"\r
-  IDS_CPLSYSTEMDESCRIPTION "Modifie les paramètres réseau."\r
-END\r
-\r
-STRINGTABLE \r
-BEGIN\r
-  IDS_ERROR "Erreur"\r
-  IDS_ENTER_VALID_IPADDRESS "Vous devez entrer une adresse IP valide"\r
-  IDS_ENTER_VALID_SUBNET "Vous devez entrer un masque de sous réseau valide"\r
-  IDS_CANNOT_LOAD_CONFIG "Impossible de charger les données de configuration"\r
-  IDS_CANNOT_CREATE_PROPSHEET "Impossible de créer la page de propriétés"\r
-  IDS_OUT_OF_MEMORY "Plus de mémoire"\r
-  IDS_CANNOT_SAVE_CHANGES "Impossible de sauvegarder les changements"\r
-END\r
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_PROPPAGENETWORK DIALOG DISCARDABLE  0, 0, 246, 228
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Propriétés réseau"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Cartes réseau",-1,9,9,217,8
+    LISTBOX         IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Ajouter",IDC_ADD,9,100,60,14
+    PUSHBUTTON      "&Enlever",IDC_REMOVE,72,100,60,14
+    PUSHBUTTON      "&Propriétés",IDC_PROPERTIES,179,100,60,14
+END
+
+IDD_NETPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Général"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Se connecter en utilisant:", -1, 9,9,217,8
+ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP
+ PUSHBUTTON "&Configurer", IDC_CONFIGURE, 189, 38, 50, 14
+ LTEXT "Les composants cochés sont utilisés par cette connection:", -1, 9, 59, 217, 8
+ LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT
+ PUSHBUTTON "&Installer", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP
+ PUSHBUTTON "&Désinstaller", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP
+ PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14
+ GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX
+ LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP
+ CHECKBOX "Afficher l'icone dans la barre des taches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_CARDPROPERTIES DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Général"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX
+ LTEXT "Etat:", -1, 19, 20, 60, 8
+ LTEXT "Durée:", -1, 19, 34, 60, 8
+ LTEXT "Vitesse:", -1, 19, 48, 60, 8
+ GROUPBOX "Activité", -1, 9, 74, 182, 70, BS_GROUPBOX
+ RTEXT "Envoyés", -1, 26, 90, 60, 8
+ ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20
+ ICON IDI_NETSTAT, -1, 110, 85, 18, 20
+ ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
+ LTEXT "Reçus", -1, 149, 90, 37, 8
+ LTEXT "Paquets:", -1, 17, 115, 32, 8
+ RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
+ ICON IDI_VERTICAL, -1, 110, 108, 18, 20
+ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
+ PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 10, 150, 50, 14
+ PUSHBUTTON "&Désactiver", IDC_ENDISABLE, 66, 150, 50, 14
+END
+
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
+IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Général"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Vous pouvez automatiquement régler les paramètres si votre réseau supporte cette possibilité. Sinon, vous devez demander les réglages IP nécessaires à votre administrateur réseau.", -1, 9, 9, 228, 27
+ CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
+ GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+ CONTROL "&Utiliser l'adresse IP suivante:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12
+ LTEXT "Adresse IP :", -1, 14, 75, 135, 8
+ CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12
+ LTEXT "Masque de sous réseau:", -1, 14, 90, 135, 8
+ CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12
+ LTEXT "Passerelle par défaut:", -1, 14, 105, 135, 8
+ CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12
+ CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
+ GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
+ CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12
+ LTEXT "Serveur DNS primaire:", -1, 14, 171, 135, 8
+ CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12
+ LTEXT "Serveur DNS secondaire:", -1, 14, 186, 135, 8
+ CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12
+ PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP
+END
+
+
+STRINGTABLE 
+BEGIN
+  IDS_CPLSYSTEMNAME "Propriétés réseau"
+  IDS_CPLSYSTEMDESCRIPTION "Modifie les paramètres réseau."
+END
+
+STRINGTABLE 
+BEGIN
+  IDS_ERROR "Erreur"
+  IDS_ENTER_VALID_IPADDRESS "Vous devez entrer une adresse IP valide"
+  IDS_ENTER_VALID_SUBNET "Vous devez entrer un masque de sous réseau valide"
+  IDS_CANNOT_LOAD_CONFIG "Impossible de charger les données de configuration"
+  IDS_CANNOT_CREATE_PROPSHEET "Impossible de créer la page de propriétés"
+  IDS_OUT_OF_MEMORY "Plus de mémoire"
+  IDS_CANNOT_SAVE_CHANGES "Impossible de sauvegarder les changements"
+END

diff --git a/reactos/dll/cpl/ncpa/hu.rc b/reactos/dll/cpl/ncpa/hu.rc
index 9fea166..c7672a8 100644 (file)
--- a/reactos/dll/cpl/ncpa/hu.rc
+++ b/reactos/dll/cpl/ncpa/hu.rc
@@ -1,88 +1,107 @@
-// Hungarian resource file by Peter Lukacs\r
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL\r
-\r
-IDD_PROPPAGENETWORK DIALOG DISCARDABLE  0, 0, 246, 228\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Hálózati beállítások"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
-    LTEXT           "Hálózati kártyák",-1,9,9,217,8\r
-    LISTBOX         IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP\r
-    PUSHBUTTON      "&Hozzáadás",IDC_ADD,9,100,60,14\r
-    PUSHBUTTON      "&Eltávolítás",IDC_REMOVE,72,100,60,14\r
-    PUSHBUTTON      "&Tulajdonságok",IDC_PROPERTIES,179,100,60,14\r
-END\r
-\r
-IDD_NETPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Általános"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
- LTEXT "Kapcsolódás mivel:", -1, 9,9,217,8\r
- EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP\r
- PUSHBUTTON "&Beállítás", IDC_CONFIGURE, 189, 38, 50, 14\r
- LTEXT "A megjelölt alkotóelemek vannak használatban ennél a kapcsolatnál:", -1, 9, 59, 217, 8\r
- LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT\r
- PUSHBUTTON "&Telepítés", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP\r
- PUSHBUTTON "&Eltávolítás", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP\r
- PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 174, 130, 65, 14\r
- GROUPBOX "Leírás", -1, 9, 153, 230, 46, BS_GROUPBOX\r
- LTEXT "Alkotóelem leírása ide kerül...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP\r
- CHECKBOX "Ikon megjelenítése a tálcán a kapcsolat ideje alatt", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP\r
-END\r
-\r
-\r
-IDD_CARDPROPERTIES DIALOG DISCARDABLE  0, 0, 200,180\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Általános"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
- GROUPBOX "Kapcsolat", -1, 9, 8, 182, 58, BS_GROUPBOX\r
- LTEXT "Állapot:", -1, 19, 20, 60, 8\r
- LTEXT "Idõtartam:", -1, 19, 34, 60, 8\r
- LTEXT "Sebesség:", -1, 19, 48, 60, 8\r
- GROUPBOX "Tevékenység", -1, 9, 74, 182, 70, BS_GROUPBOX\r
- RTEXT "Elküldött", -1, 26, 90, 60, 8\r
- ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20\r
- ICON IDI_NETSTAT, -1, 110, 85, 18, 20\r
- ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20\r
- LTEXT "Beérkezett", -1, 149, 90, 37, 8\r
- LTEXT "Csomagok:", -1, 17, 115, 32, 8\r
- RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8\r
- ICON IDI_VERTICAL, -1, 110, 108, 18, 20\r
- RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8\r
- PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 10, 150, 50, 14\r
- PUSHBUTTON "&Letiltás", IDC_ENDISABLE, 66, 150, 50, 14\r
-END\r
-\r
-IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228\r
-STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Általános"\r
-FONT 8, "MS Shell Dlg"\r
-BEGIN\r
- LTEXT "Az IP-beállításokat automatikusan is megkaphatja, ha hálózata támogatja ezt a képességet. Eltérõ esetben keresse meg hálózati rendszergazdáját a helyes IP-beállításokért.", -1, 9, 9, 228, 27\r
- CONTROL "IP-cím automatikus lekérése", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12\r
- GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX\r
- CONTROL "A &következõ IP-cím használata:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12\r
- LTEXT "IP cím:", -1, 14, 75, 135, 8\r
- CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12\r
- LTEXT "Alhálózati maszk:", -1, 14, 90, 135, 8\r
- CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12\r
- LTEXT "Alapértelmezett átjáró:", -1, 14, 105, 135, 8\r
- CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12\r
- CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12\r
- GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX\r
- CONTROL "A kö&vetkezõ DNS-kiszolgálók használata", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12\r
- LTEXT "Elsõdleges DNS-kiszolgáló:", -1, 14, 171, 135, 8\r
- CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12\r
- LTEXT "Másodlagos DNS-kiszolgáló:", -1, 14, 186, 135, 8\r
- CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12\r
- PUSHBUTTON "&Haladóknak", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP\r
-}\r
-\r
-\r
-STRINGTABLE \r
-BEGIN\r
-  IDS_CPLSYSTEMNAME "Hálózati beállítások"\r
-  IDS_CPLSYSTEMDESCRIPTION "A hálózati kapcsolatok beállításai."\r
-END\r
+// Hungarian resource file by Peter Lukacs
+LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGENETWORK DIALOG DISCARDABLE  0, 0, 246, 228
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Hálózati beállítások"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT           "Hálózati kártyák",-1,9,9,217,8
+    LISTBOX         IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Hozzáadás",IDC_ADD,9,100,60,14
+    PUSHBUTTON      "&Eltávolítás",IDC_REMOVE,72,100,60,14
+    PUSHBUTTON      "&Tulajdonságok",IDC_PROPERTIES,179,100,60,14
+END
+
+IDD_NETPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Általános"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Kapcsolódás mivel:", -1, 9,9,217,8
+ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP
+ PUSHBUTTON "&Beállítás", IDC_CONFIGURE, 189, 38, 50, 14
+ LTEXT "A megjelölt alkotóelemek vannak használatban ennél a kapcsolatnál:", -1, 9, 59, 217, 8
+ LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT
+ PUSHBUTTON "&Telepítés", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP
+ PUSHBUTTON "&Eltávolítás", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP
+ PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 174, 130, 65, 14
+ GROUPBOX "Leírás", -1, 9, 153, 230, 46, BS_GROUPBOX
+ LTEXT "Alkotóelem leírása ide kerül...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP
+ CHECKBOX "Ikon megjelenítése a tálcán a kapcsolat ideje alatt", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_CARDPROPERTIES DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Általános"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Kapcsolat", -1, 9, 8, 182, 58, BS_GROUPBOX
+ LTEXT "Állapot:", -1, 19, 20, 60, 8
+ LTEXT "Idõtartam:", -1, 19, 34, 60, 8
+ LTEXT "Sebesség:", -1, 19, 48, 60, 8
+ GROUPBOX "Tevékenység", -1, 9, 74, 182, 70, BS_GROUPBOX
+ RTEXT "Elküldött", -1, 26, 90, 60, 8
+ ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20
+ ICON IDI_NETSTAT, -1, 110, 85, 18, 20
+ ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20
+ LTEXT "Beérkezett", -1, 149, 90, 37, 8
+ LTEXT "Csomagok:", -1, 17, 115, 32, 8
+ RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8
+ ICON IDI_VERTICAL, -1, 110, 108, 18, 20
+ RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8
+ PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 10, 150, 50, 14
+ PUSHBUTTON "&Letiltás", IDC_ENDISABLE, 66, 150, 50, 14
+END
+
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
+IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Általános"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ LTEXT "Az IP-beállításokat automatikusan is megkaphatja, ha hálózata támogatja ezt a képességet. Eltérõ esetben keresse meg hálózati rendszergazdáját a helyes IP-beállításokért.", -1, 9, 9, 228, 27
+ CONTROL "IP-cím automatikus lekérése", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12
+ GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
+ CONTROL "A &következõ IP-cím használata:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12
+ LTEXT "IP cím:", -1, 14, 75, 135, 8
+ CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12
+ LTEXT "Alhálózati maszk:", -1, 14, 90, 135, 8
+ CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12
+ LTEXT "Alapértelmezett átjáró:", -1, 14, 105, 135, 8
+ CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12
+ CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12
+ GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
+ CONTROL "A kö&vetkezõ DNS-kiszolgálók használata", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12
+ LTEXT "Elsõdleges DNS-kiszolgáló:", -1, 14, 171, 135, 8
+ CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12
+ LTEXT "Másodlagos DNS-kiszolgáló:", -1, 14, 186, 135, 8
+ CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12
+ PUSHBUTTON "&Haladóknak", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP
+}
+
+
+STRINGTABLE 
+BEGIN
+  IDS_CPLSYSTEMNAME "Hálózati beállítások"
+  IDS_CPLSYSTEMDESCRIPTION "A hálózati kapcsolatok beállításai."
+END

diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c
index 855ddb0..2c5b911 100644 (file)
--- a/reactos/dll/cpl/ncpa/ncpa.c
+++ b/reactos/dll/cpl/ncpa/ncpa.c
@@ -58,9 +58,16 @@
 #include "resource.h"
 #include "ncpa.h"
 
-
-#define NCF_HIDDEN 0x08
-#define NCF_HAS_UI 0x80
+#define NCF_VIRTUAL                     0x1
+#define NCF_SOFTWARE_ENUMERATED         0x2
+#define NCF_PHYSICAL                    0x4
+#define NCF_HIDDEN                      0x8
+#define NCF_NO_SERVICE                  0x10
+#define NCF_NOT_USER_REMOVABLE          0x20
+#define NCF_MULTIPORT_INSTANCED_ADAPTER 0x40
+#define NCF_HAS_UI                      0x80
+#define NCF_FILTER                      0x400
+#define NCF_NDIS_PROTOCOL               0x4000
 
 typedef void (ENUMREGKEYCALLBACK)(void *pCookie,HKEY hBaseKey,TCHAR *pszSubKey);
 
@@ -77,7 +84,6 @@ static APPLET Applets[] =
 };
 
 
-
 /* useful utilities */
 static VOID
 EnumRegKeys(ENUMREGKEYCALLBACK *pCallback,PVOID pCookie,HKEY hBaseKey,TCHAR *tpszRegPath)
@@ -410,8 +416,6 @@ DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID)
        return;
 }
 
-
-
 static INT_PTR CALLBACK
 NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -440,10 +444,79 @@ NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
        return FALSE;
 }
 
+static INT_PTR CALLBACK
+NICSupportPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+       
+       switch(uMsg)
+       {
+       case WM_INITDIALOG:
+               {
+                       TCHAR Buffer[64];
+
+                       PIP_ADAPTER_INFO pAdapterInfo = NULL;                   
+                       ULONG    adaptOutBufLen;
+                       
+                       DWORD ErrRet = 0;
+               
+               pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) );
+               adaptOutBufLen = sizeof(IP_ADAPTER_INFO);               
+               
+                   if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) 
+                       {
+                      free(pAdapterInfo);
+                      pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen);
+                   }
+               
+                   if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR)
+                       {
+                               MessageBox(hwndDlg, _T("error adapterinfo") ,_T("ncpa.cpl"),MB_ICONSTOP);
+
+                               if (pAdapterInfo) free(pAdapterInfo);
+                               return FALSE;
+                       }               
+                       
+                       if (pAdapterInfo)
+                       {
+                               /*FIXME: select the correct adapter info!!*/
+                               _stprintf(Buffer, _T("%S"), pAdapterInfo->IpAddressList.IpAddress.String);
+                               SendDlgItemMessage(hwndDlg, IDC_DETAILSIP, WM_SETTEXT, 0, (LPARAM)Buffer);
+                               _stprintf(Buffer, _T("%S"), pAdapterInfo->IpAddressList.IpMask.String);
+                               SendDlgItemMessage(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)Buffer);
+                               _stprintf(Buffer, _T("%S"), pAdapterInfo->GatewayList.IpAddress.String);
+                               SendDlgItemMessage(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)Buffer);
+                               
+                               free(pAdapterInfo);
+                       }
+                       
+
+                       
+               }
+               break;
+       case WM_COMMAND:
+               switch(LOWORD(wParam))
+               {
+               case IDC_PROPERTIES:
+                       {
+                       }
+                       break;
+               case IDC_DETAILS:
+                       {
+                               MessageBox(hwndDlg,_T("not implemented: show detail window"),_T("ncpa.cpl"),MB_ICONSTOP);
+                       }
+                       break;
+                       
+               }
+               break;
+       }
+       return FALSE;
+}
+
+
 static VOID
 DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID)
 {
-       PROPSHEETPAGE psp[1];
+       PROPSHEETPAGE psp[2];
        PROPSHEETHEADER psh;
        TCHAR tpszSubKey[MAX_PATH];
        HKEY hKey;
@@ -476,8 +549,9 @@ DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID)
        psh.ppsp = psp;
        psh.pfnCallback = NULL;
        
-
-       InitPropSheetPage(&psp[0], IDD_CARDPROPERTIES, NICStatusPageProc,(LPARAM)tpszCfgInstanceID);
+       InitPropSheetPage(&psp[0], IDD_CARDPROPERTIES, NICStatusPageProc, (LPARAM)tpszCfgInstanceID);
+       InitPropSheetPage(&psp[1], IDD_CARDSUPPORT, NICSupportPageProc, (LPARAM)tpszCfgInstanceID);
+        
        PropertySheet(&psh);
        return;
 }
@@ -529,6 +603,7 @@ NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
        DWORD dwCharacteristics;
 
        DPRINT("NetAdapterCallback: %S\n", tpszSubKey);
+
        if(RegOpenKeyEx(hBaseKey,tpszSubKey,0,KEY_QUERY_VALUE,&hKey)!=ERROR_SUCCESS)
                return;
 
@@ -538,12 +613,12 @@ NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey)
        if(RegQueryValueEx(hKey,_T("Characteristics"),NULL,&dwType,(BYTE*)&dwCharacteristics,&dwSize)!=ERROR_SUCCESS)
                dwCharacteristics = 0;
 
-
        if (dwCharacteristics & NCF_HIDDEN)
                return;
-//     if (!(dwCharacteristics & NCF_HAS_UI))
-//             return;
-
+               
+       if (!(dwCharacteristics & NCF_VIRTUAL) && !(dwCharacteristics & NCF_PHYSICAL))
+               return;
+               
        DPRINT("NetAdapterCallback: Reading DriverDesc\n");
        dwType = REG_SZ;
        dwSize = sizeof(tpszDisplayName);

diff --git a/reactos/dll/cpl/ncpa/ncpa.rc b/reactos/dll/cpl/ncpa/ncpa.rc
index 6e6e724..752f13f 100644 (file)
--- a/reactos/dll/cpl/ncpa/ncpa.rc
+++ b/reactos/dll/cpl/ncpa/ncpa.rc
@@ -7,11 +7,7 @@
 #define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Network Control Panel\0"
 #define REACTOS_STR_INTERNAL_NAME      "ncpa\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "ncpa.cpl\0"
-#ifdef _MSC_VER
-#include <../../../include/reactos/version.rc>
-#else
-#include <reactos/version.rc>
-#endif
+
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 IDI_HORIZONTAL ICON "resources/HORIZ.ICO"

diff --git a/reactos/dll/cpl/ncpa/nl.rc b/reactos/dll/cpl/ncpa/nl.rc
index 31cef37..43ff68f 100644 (file)
--- a/reactos/dll/cpl/ncpa/nl.rc
+++ b/reactos/dll/cpl/ncpa/nl.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "&Uitschakelen", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Algemeen"

diff --git a/reactos/dll/cpl/ncpa/resource.h b/reactos/dll/cpl/ncpa/resource.h
index 186ec89..3118b31 100644 (file)
--- a/reactos/dll/cpl/ncpa/resource.h
+++ b/reactos/dll/cpl/ncpa/resource.h
@@ -22,6 +22,7 @@
 #define IDD_CARDPROPERTIES  101
 #define IDD_NETPROPERTIES      102
 #define IDD_TCPIPPROPERTIES 103
+#define IDD_CARDSUPPORT     104
 
 #define IDS_CPLSYSTEMNAME      1001
 #define IDS_CPLSYSTEMDESCRIPTION       2001
@@ -61,6 +62,11 @@
 #define IDC_DEFGATEWAY         122
 #define IDC_DNS1                       123
 #define IDC_DNS2                       124
+#define IDC_DETAILS         125
+#define IDC_DETAILSIP       126
+#define IDC_DETAILSTYPE     127
+#define IDC_DETAILSSUBNET   128
+#define IDC_DETAILSGATEWAY  129
 #endif /* __CPL_RESOURCE_H */
 
 /* EOF */

diff --git a/reactos/dll/cpl/ncpa/ru.rc b/reactos/dll/cpl/ncpa/ru.rc
index 395f9d0..bcdcde9 100644 (file)
--- a/reactos/dll/cpl/ncpa/ru.rc
+++ b/reactos/dll/cpl/ncpa/ru.rc
@@ -54,6 +54,25 @@ BEGIN
  PUSHBUTTON "&Îòêëþ÷èòü", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Îñíîâíûå"

diff --git a/reactos/dll/cpl/ncpa/sv.rc b/reactos/dll/cpl/ncpa/sv.rc
index 59945d9..53e6532 100644 (file)
--- a/reactos/dll/cpl/ncpa/sv.rc
+++ b/reactos/dll/cpl/ncpa/sv.rc
@@ -56,6 +56,25 @@ BEGIN
  PUSHBUTTON "&Inaktivera", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allmänt"

diff --git a/reactos/dll/cpl/ncpa/uk.rc b/reactos/dll/cpl/ncpa/uk.rc
index a904743..fb2d661 100644 (file)
--- a/reactos/dll/cpl/ncpa/uk.rc
+++ b/reactos/dll/cpl/ncpa/uk.rc
@@ -62,6 +62,25 @@ BEGIN
  PUSHBUTTON "Â&³äêëþ÷èòè", IDC_ENDISABLE, 66, 150, 50, 14
 END
 
+IDD_CARDSUPPORT DIALOG DISCARDABLE  0, 0, 200,180
+STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Support"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Conection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
+ LTEXT "Address yype:", -1, 22, 20, 80, 8
+ LTEXT "IP address:", -1, 22, 34, 80, 8
+ LTEXT "SubNet mask:", -1, 22, 48, 80, 8
+ LTEXT "Ddefault gateway:", -1, 22, 62, 80, 8
+ 
+ RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
+ RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ 
+ PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
+END
+
 IDD_TCPIPPROPERTIES DIALOG DISCARDABLE  0, 0, 246, 228
 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Çàãàëüí³"