Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-21 19:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show whether the IP address was assigned by DHCP or manually configured. I also added the german translation strings for this.

Browse source 
Patch by Frode Lillerud (frode AT enkelt DOT no)
See issue #2570 for more details.

svn path=/trunk/; revision=28398
This commit is contained in:
Colin Finck 2007-08-18 14:32:03 +00:00
parent d7248a8454
commit f49af53def
19 changed files with 303 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/dll/cpl/ncpa/lang/cs-CZ.rc
View file

@ -104,3 +104,20 @@ BEGIN
IDS_CPLSYSTEMNAME "Síťová nastavení"
IDS_CPLSYSTEMDESCRIPTION "Konigurace síťových adaptérů a připojení"
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

17
reactos/dll/cpl/ncpa/lang/da-DK.rc
View file

@ -104,3 +104,20 @@ BEGIN
IDS_CPLSYSTEMNAME "Netværks Indstillinger"
IDS_CPLSYSTEMDESCRIPTION "Tilpas dine Netværks Indstillinger."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

6
reactos/dll/cpl/ncpa/lang/de-DE.rc
View file

@ -104,6 +104,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Netzwerkeinstellungen bearbeiten"
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Von DHCP zugewiesen"
IDS_ASSIGNED_MANUAL "Manuell konfiguriert"
END
STRINGTABLE
BEGIN
IDS_ERROR "Fehler"

13
reactos/dll/cpl/ncpa/lang/en-US.rc
View file

@ -61,9 +61,9 @@ FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
LTEXT "Address type:", -1, 22, 20, 80, 8
LTEXT "IP address:", -1, 22, 34, 80, 8
LTEXT "SubNet mask:", -1, 22, 48, 80, 8
LTEXT "Default gateway:", -1, 22, 62, 80, 8
LTEXT "IP Address:", -1, 22, 34, 80, 8
LTEXT "Subnet Mask:", -1, 22, 48, 80, 8
LTEXT "Default 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
@ -98,13 +98,18 @@ BEGIN
PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP
END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Network Properties"
IDS_CPLSYSTEMDESCRIPTION "Customizes network settings."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"

17
reactos/dll/cpl/ncpa/lang/es-ES.rc
View file

@ -109,3 +109,20 @@ BEGIN
IDS_CPLSYSTEMNAME "Propiedades de Red"
IDS_CPLSYSTEMDESCRIPTION "Cambia las opciones de la red."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

6
reactos/dll/cpl/ncpa/lang/fr-FR.rc
View file

@ -105,6 +105,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Modifie les paramètres réseau."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Erreur"

17
reactos/dll/cpl/ncpa/lang/hu-HU.rc
View file

@ -105,3 +105,20 @@ BEGIN
IDS_CPLSYSTEMNAME "Hálózati beállítások"
IDS_CPLSYSTEMDESCRIPTION "A hálózati kapcsolatok beállításai."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

6
reactos/dll/cpl/ncpa/lang/id-ID.rc
View file

@ -105,6 +105,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Mengkustomisasi setelan jaringan."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Salah"

6
reactos/dll/cpl/ncpa/lang/it-IT.rc
View file

@ -105,6 +105,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Personalizza le impostazioni di rete."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Errore"

17
reactos/dll/cpl/ncpa/lang/ja-JP.rc
View file

@ -104,3 +104,20 @@ BEGIN
IDS_CPLSYSTEMNAME "ネットワーク接続"
IDS_CPLSYSTEMDESCRIPTION "ネットワークの設定を変更します。"
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

122
reactos/dll/cpl/ncpa/lang/nb-NO.rc Normal file
View file

@ -0,0 +1,122 @@
LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228
STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Egenskaper for Nettverk"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Network Adapters",-1,9,9,217,8
LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Add",IDC_ADD,9,100,60,14
PUSHBUTTON "&Remove",IDC_REMOVE,72,100,60,14
PUSHBUTTON "&Properties",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 "General"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Connect Using:", -1, 9,9,217,8
EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP
PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14
LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8
LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT
PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP
PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP
PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14
GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX
LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP
CHECKBOX "Show Icon in taskbar when connected", 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 "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX
LTEXT "Status:", -1, 19, 20, 60, 8
LTEXT "Duration:", -1, 19, 34, 60, 8
LTEXT "Speed:", -1, 19, 48, 60, 8
GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX
RTEXT "Sent", -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 "Received", -1, 149, 90, 37, 8
LTEXT "Packets:", -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 "&Properties", IDC_PROPERTIES, 10, 150, 50, 14
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 "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX
LTEXT "Adressetype:", -1, 22, 20, 80, 8
LTEXT "IP adresse:", -1, 22, 34, 80, 8
LTEXT "Subnet maske:", -1, 22, 48, 80, 8
LTEXT "Default 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 "&Detaljer...", 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 "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 228, 27
CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12
GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX
CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12
LTEXT "IP address:", -1, 14, 75, 135, 8
CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12
LTEXT "Subnet mask:", -1, 14, 90, 135, 8
CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12
LTEXT "Default gateway:", -1, 14, 105, 135, 8
CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12
CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12
GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX
CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12
LTEXT "Preferred DNS server:", -1, 14, 171, 135, 8
CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12
LTEXT "Alternate DNS server:", -1, 14, 186, 135, 8
CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12
PUSHBUTTON "&Advanced", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP
END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Network Properties"
IDS_CPLSYSTEMDESCRIPTION "Customizes network settings."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Tilordnet av DHCP"
IDS_ASSIGNED_MANUAL "Manuelt konfigurert"
END
STRINGTABLE
BEGIN
IDS_ERROR "Feil"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

18
reactos/dll/cpl/ncpa/lang/nl-NL.rc
View file

@ -104,3 +104,21 @@ BEGIN
IDS_CPLSYSTEMNAME "Netwerk Eigenschappen"
IDS_CPLSYSTEMDESCRIPTION "Netwerk instellingen aanpassen."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

6
reactos/dll/cpl/ncpa/lang/pl-PL.rc
View file

@ -107,6 +107,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Zmiany ustawieñ sieci."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "B³¹d"

6
reactos/dll/cpl/ncpa/lang/ru-RU.rc
View file

@ -105,6 +105,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Óñòàíàâëèâàåò íàñòðîéêè ñåòè."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Îøèáêà"

17
reactos/dll/cpl/ncpa/lang/sv-SE.rc
View file

@ -106,3 +106,20 @@ BEGIN
IDS_CPLSYSTEMNAME "Nätverksanslutningar"
IDS_CPLSYSTEMDESCRIPTION "Konfigurerar nätverksinställningar."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Error"
IDS_ENTER_VALID_IPADDRESS "You must enter a valid IP address"
IDS_ENTER_VALID_SUBNET "You must enter a valid subnet mask"
IDS_CANNOT_LOAD_CONFIG "Unable to load current config data"
IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet"
IDS_OUT_OF_MEMORY "Out of memory"
IDS_CANNOT_SAVE_CHANGES "Unable to save the changes you made"
END

6
reactos/dll/cpl/ncpa/lang/uk-UA.rc
View file

@ -113,6 +113,12 @@ BEGIN
IDS_CPLSYSTEMDESCRIPTION "Âñòàíîâëþº íàñòðîéêè ìåðåæ³."
END
STRINGTABLE
BEGIN
IDS_ASSIGNED_DHCP "Assigned by DHCP"
IDS_ASSIGNED_MANUAL "Manually configured"
END
STRINGTABLE
BEGIN
IDS_ERROR "Ïîìèëêà"

8
reactos/dll/cpl/ncpa/ncpa.c
View file

@ -480,6 +480,13 @@ NICSupportPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (pAdapterInfo)
{
/*FIXME: select the correct adapter info!!*/
if (pAdapterInfo->DhcpEnabled)
LoadString(hApplet, IDS_ASSIGNED_DHCP, Buffer, sizeof(Buffer) / sizeof(TCHAR));
else
LoadString(hApplet, IDS_ASSIGNED_MANUAL, Buffer, sizeof(Buffer) / sizeof(TCHAR));
SendDlgItemMessage(hwndDlg, IDC_DETAILSTYPE, WM_SETTEXT, 0, (LPARAM)Buffer);
_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);
@ -513,7 +520,6 @@ NICSupportPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
return FALSE;
}
static VOID
DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID)
{

1
reactos/dll/cpl/ncpa/ncpa.rc
View file

@ -24,6 +24,7 @@ IDI_NETSTAT ICON "resources/NETCONN.ICO"
#include "lang/id-ID.rc"
#include "lang/it-IT.rc"
#include "lang/ja-JP.rc"
#include "lang/nb-NO.rc"
#include "lang/nl-NL.rc"
#include "lang/pl-PL.rc"
#include "lang/ru-RU.rc"

2
reactos/dll/cpl/ncpa/resource.h
View file

@ -26,6 +26,8 @@
#define IDS_CPLSYSTEMNAME 1001
#define IDS_CPLSYSTEMDESCRIPTION 2001
#define IDS_ASSIGNED_DHCP 2501
#define IDS_ASSIGNED_MANUAL 2502
#define IDS_ERROR 3001
#define IDS_ENTER_VALID_IPADDRESS 3002
#define IDS_ENTER_VALID_SUBNET 3003