Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[ekohl] 36575: Ooops, forgot to disable these [handle] attributes.
by ekohl＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: ekohl Date: Sun Sep 28 08:49:47 2008 New Revision: 36575 URL: http://svn.reactos.org/svn/reactos?rev=36575&view=rev Log: Ooops, forgot to disable these [handle] attributes. Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun Sep 28 08:49:47 2008 @@ -19,8 +19,8 @@ typedef /*[context_handle]*/ unsigned long IELF_HANDLE; typedef IELF_HANDLE *PIELF_HANDLE; -typedef [handle, unique] LPWSTR EVENTLOG_HANDLE_W; -typedef [handle, unique] LPSTR EVENTLOG_HANDLE_A; +typedef /*[handle, unique]*/ LPWSTR EVENTLOG_HANDLE_W; +typedef /*[handle, unique]*/ LPSTR EVENTLOG_HANDLE_A; typedef struct _RPC_CLIENT_ID { DWORD UniqueProcess;

1 0

[ekohl] 36574: Cast returned handle values correctly.
by ekohl＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: ekohl Date: Sun Sep 28 08:48:31 2008 New Revision: 36574 URL: http://svn.reactos.org/svn/reactos?rev=36574&view=rev Log: Cast returned handle values correctly. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Sep 28 08:48:31 2008 @@ -129,7 +129,7 @@ IELF_HANDLE *LogHandle) { UNIMPLEMENTED; - *LogHandle = 1; + *LogHandle = (IELF_HANDLE)1; return STATUS_SUCCESS; } @@ -145,7 +145,7 @@ IELF_HANDLE *LogHandle) { UNIMPLEMENTED; - *LogHandle = 1; + *LogHandle = (IELF_HANDLE)1; return STATUS_SUCCESS; }

1 0

[fireball] 36573: - Fix uninitialized variable usage. Fixes Coverity CID: 1293.
by fireball＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: fireball Date: Sun Sep 28 06:16:41 2008 New Revision: 36573 URL: http://svn.reactos.org/svn/reactos?rev=36573&view=rev Log: - Fix uninitialized variable usage. Fixes Coverity CID: 1293. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Sun Sep 28 06:16:41 2008 @@ -2348,7 +2348,7 @@ PUHCI_TD ptd; LIST_ENTRY td_list, *pthis, *pnext; int i; - BOOLEAN toggle, ret; + BOOLEAN toggle = FALSE, ret; if (uhci == NULL || urb == NULL) return STATUS_INVALID_PARAMETER;

1 0

[fireball] 36572: - Ports are counted starting from 1, with 0 being an invalid port index. Remove memory corruption by actually allocating MAX_ROOT_PORTS + 1 sized array. Fixes Coverity CID: 601.
by fireball＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: fireball Date: Sun Sep 28 06:05:18 2008 New Revision: 36572 URL: http://svn.reactos.org/svn/reactos?rev=36572&view=rev Log: - Ports are counted starting from 1, with 0 being an invalid port index. Remove memory corruption by actually allocating MAX_ROOT_PORTS + 1 sized array. Fixes Coverity CID: 601. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h [iso-8859-1] Sun Sep 28 06:05:18 2008 @@ -208,7 +208,7 @@ USB_HUB_STATUS hub_status; USB_PORT_STATUS port_status; //working data buf for get port feature - USB_PORT_STATUS rh_port_status[ EHCI_MAX_ROOT_PORTS ]; //working buf for get rh ports feature + USB_PORT_STATUS rh_port_status[ EHCI_MAX_ROOT_PORTS + 1 ]; //working buf for get rh ports feature UCHAR multiple_tt; // boolean ULONG tt_status_map[ 4 ]; // bit map to indicate the indexed tt's periodic buffer busy or not

1 0

[fireball] 36571: - It's meaningless to try to complete the IRP if irp == NULL. Fixes Coverity CID: 398
by fireball＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: fireball Date: Sun Sep 28 05:57:59 2008 New Revision: 36571 URL: http://svn.reactos.org/svn/reactos?rev=36571&view=rev Log: - It's meaningless to try to complete the IRP if irp == NULL. Fixes Coverity CID: 398 Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c [iso-8859-1] Sun Sep 28 05:57:59 2008 @@ -144,7 +144,8 @@ ULONG ctrl_code; USE_NON_PENDING_IRQL; - if (dev_mgr == NULL || irp == NULL) + ASSERT(irp); + if (dev_mgr == NULL) { EXIT_DISPATCH(STATUS_INVALID_PARAMETER, irp); }

1 0

[tkreuzer] 36570: remove duplicate definitions
by tkreuzer＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: tkreuzer Date: Sun Sep 28 05:56:06 2008 New Revision: 36570 URL: http://svn.reactos.org/svn/reactos?rev=36570&view=rev Log: remove duplicate definitions Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] Sun Sep 28 05:56:06 2008 @@ -119,30 +119,6 @@ #define APIC_TDCR_128 0x0A #define APIC_TDCR_1 0x0B -#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ -#define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ - -#define APIC_LVT3_DM (0x7 << 8) -#define APIC_LVT3_IIPP (0x1 << 13) -#define APIC_LVT3_TM (0x1 << 15) -#define APIC_LVT3_MASKED (0x1 << 16) -#define APIC_LVT3_OS (0x1 << 17) - -#define APIC_TDCR_TMBASE (0x1 << 2) -#define APIC_TDCR_MASK 0x0F -#define APIC_TDCR_2 0x00 -#define APIC_TDCR_4 0x01 -#define APIC_TDCR_8 0x02 -#define APIC_TDCR_16 0x03 -#define APIC_TDCR_32 0x08 -#define APIC_TDCR_64 0x09 -#define APIC_TDCR_128 0x0A -#define APIC_TDCR_1 0x0B - #define APIC_TARGET_SELF 0x100 #define APIC_TARGET_ALL 0x200 #define APIC_TARGET_ALL_BUT_SELF 0x300

1 0

[fireball] 36569: - Remove redundant NULL-check. Fixes Coverity CID: 761.
by fireball＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: fireball Date: Sun Sep 28 05:54:22 2008 New Revision: 36569 URL: http://svn.reactos.org/svn/reactos?rev=36569&view=rev Log: - Remove redundant NULL-check. Fixes Coverity CID: 761. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c [iso-8859-1] Sun Sep 28 05:54:22 2008 @@ -180,8 +180,7 @@ umss_bulkonly_transfer_data(pdev_ext); } - if (purb) - usb_free_mem(purb); + usb_free_mem(purb); purb = NULL; return;

1 0

[janderwald] 36568: - Query Name, Icon Attributes for each call of INetConnection_GetProperties - Update Taskbar Notifications Icons on a network adapter change - Sync remaining resources
by janderwald＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: janderwald Date: Sun Sep 28 05:50:10 2008 New Revision: 36568 URL: http://svn.reactos.org/svn/reactos?rev=36568&view=rev Log: - Query Name, Icon Attributes for each call of INetConnection_GetProperties - Update Taskbar Notifications Icons on a network adapter change - Sync remaining resources Added: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/netshell/lang/da-DK.rc (with props) trunk/reactos/dll/win32/netshell/lang/el-GR.rc (with props) trunk/reactos/dll/win32/netshell/lang/fr-FR.rc (with props) trunk/reactos/dll/win32/netshell/lang/hu-HU.rc (with props) trunk/reactos/dll/win32/netshell/lang/id-ID.rc (with props) trunk/reactos/dll/win32/netshell/lang/ja-JP.rc (with props) trunk/reactos/dll/win32/netshell/lang/nl-NL.rc (with props) trunk/reactos/dll/win32/netshell/lang/sv-SE.rc (with props) trunk/reactos/dll/win32/netshell/lang/uk-UA.rc (with props) trunk/reactos/dll/win32/netshell/lang/zh-CN.rc (with props) Modified: trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/lang/bg-BG.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lanstatusui.c trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/netshell/resource.h Modified: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -215,7 +215,12 @@ NETCON_PROPERTIES **ppProps) { MIB_IFROW IfEntry; + HKEY hKey; + LPOLESTR pStr; + WCHAR szName[140]; + DWORD dwShowIcon, dwType, dwSize; NETCON_PROPERTIES * pProperties; + HRESULT hr; INetConnectionImpl * This = (INetConnectionImpl*)iface; @@ -226,13 +231,10 @@ if (!pProperties) return E_OUTOFMEMORY; + CopyMemory(pProperties, &This->Props, sizeof(NETCON_PROPERTIES)); - if (This->Props.pszwName) - { - pProperties->pszwName = CoTaskMemAlloc((wcslen(This->Props.pszwName)+1)*sizeof(WCHAR)); - if (pProperties->pszwName) - wcscpy(pProperties->pszwName, This->Props.pszwName); - } + pProperties->pszwName = NULL; + if (This->Props.pszwDeviceName) { pProperties->pszwDeviceName = CoTaskMemAlloc((wcslen(This->Props.pszwDeviceName)+1)*sizeof(WCHAR)); @@ -250,6 +252,47 @@ NormalizeOperStatus(&IfEntry, pProperties); + + hr = StringFromCLSID(&This->Props.guidId, &pStr); + if (SUCCEEDED(hr)) + { + wcscpy(szName, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"); + wcscat(szName, pStr); + wcscat(szName, L"\\Connection"); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(dwShowIcon); + if (RegQueryValueExW(hKey, L"ShowIcon", NULL, &dwType, (LPBYTE)&dwShowIcon, &dwSize) == ERROR_SUCCESS && dwType == REG_DWORD) + { + if (dwShowIcon) + pProperties->dwCharacter |= NCCF_SHOW_ICON; + else + pProperties->dwCharacter &= ~NCCF_SHOW_ICON; + } + dwSize = sizeof(szName); + if (RegQueryValueExW(hKey, L"Name", NULL, &dwType, (LPBYTE)szName, &dwSize) == ERROR_SUCCESS) + { + /* use updated name */ + dwSize = wcslen(szName) + 1; + pProperties->pszwName = CoTaskMemAlloc(dwSize * sizeof(WCHAR)); + if (pProperties->pszwName) + CopyMemory(pProperties->pszwName, szName, dwSize * sizeof(WCHAR)); + } + else + { + /* use cached name */ + if (This->Props.pszwName) + { + pProperties->pszwName = CoTaskMemAlloc((wcslen(This->Props.pszwName)+1)*sizeof(WCHAR)); + if (pProperties->pszwName) + wcscpy(pProperties->pszwName, This->Props.pszwName); + } + } + RegCloseKey(hKey); + } + CoTaskMemFree(pStr); + } return NOERROR; Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,4 +1,72 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñâúðçâàíå ÷ðåç:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "Íà&ñòðîéêà", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Îòìåòíàòèòå ñúñòàâêè ñå èçïîëçâàò îò òîâà ñâúðçâàíå:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Ñëàãàíå", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Ïðåìàõâàíå&", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Îïèñàíèå", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Îïèñàíèåòî íà ñúñòàâêàòà å òóê...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Ïîêàçâàíå íà çíà÷å â óâåäîìèòåëíàòà îáëàñò ïðè ñâúðçàíîñò", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñâúðçâàíå", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Ñúñòîÿíèå:", -1, 19, 20, 60, 8 + LTEXT "Ïðîäúëæèòåëíîñò:", -1, 19, 34, 60, 8 + LTEXT "Ñêîðîñò:", -1, 19, 48, 60, 8 + GROUPBOX "Äåéíîñò", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Èçïðàòåíî", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Ïîëó÷åíî", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Èçêëþ÷âàíå", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ïîääðúæêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñúñòîÿíèå íà ñâúðçâàíåòî", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Âèä àäðåñ:", -1, 22, 20, 80, 8 + LTEXT "IP àäðåñ:", -1, 22, 34, 80, 8 + LTEXT "Ìðåæîâà ìàñêà:", -1, 22, 48, 80, 8 + LTEXT "Ðàçïðåäåëèòåë (gateway):", -1, 22, 62, 80, 8 + + RTEXT "Íåíàëè÷íî", 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 "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN @@ -16,5 +84,20 @@ IDS_STATUS_CONNECTING "Ïîëó÷àâàíå íà ìðåæîâ àäðåñ" IDS_STATUS_CONNECTED "Ñâúðçàí" IDS_STATUS_OPERATIONAL "Ñâúðçàí" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" END Added: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,102 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Obecné nastavení" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Pøipojit prostøednictvím:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Popis", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Tak tady bude popis komponenty...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Po pøipojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Obecné nastavení" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Spojení", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Stav:", -1, 19, 20, 60, 8 + LTEXT "Doba pøipojení:", -1, 19, 34, 60, 8 + LTEXT "Rychlost:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivita", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Odesláno", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Pøijato", -1, 149, 90, 37, 8 + LTEXT "Bytù:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Podpora" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Stav pøipojení", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Typ adresy:", -1, 22, 20, 80, 8 + LTEXT "IP adresa:", -1, 22, 34, 80, 8 + LTEXT "Maska podsítì:", -1, 22, 48, 80, 8 + LTEXT "Výchozí brána:", -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 "&Detaily...", IDC_DETAILS, 22, 76, 62, 14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END + Propchange: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/da-DK.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,103 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generelt" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Forbind til Netværket/Internettet med:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigure", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Komponeter mærkeret med et flueben er brugt af den forbindelse:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Installere", IDC_INSTALL, 9, 133, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Afinstallere", IDC_UNINSTALL, 90, 133, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14 + GROUPBOX "Beskrivelse", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Komponent Beskrivelse Her...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Vis Ikon i System Tray ved forbindelse.", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generelt" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Aktiv Forbindelse", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Tids Periode:", -1, 19, 34, 60, 8 + LTEXT "Hastighed:", -1, 19, 48, 60, 8 + GROUPBOX "Netværks Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Sendt", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT " Modtaget", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 73, 115, 44, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 134, 115, 44, 8 + PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deaktiver", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | 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 "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 + + 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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END + + Propchange: trunk/reactos/dll/win32/netshell/lang/da-DK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -37,7 +37,7 @@ LTEXT "Übertragungsrate:", -1, 19, 48, 60, 8 GROUPBOX "Aktivität", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Gesendet", -1, 26, 90, 60, 8 - ICON "", IDC_NETSTAT, 110, 85, 18, 20 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Empfangen", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 @@ -49,13 +49,32 @@ RTEXT "",IDC_SPEED,83,48,98,8 END +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Netzwerkunterstützung" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Verbindungsstatus", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Adresstyp:", -1, 22, 20, 80, 8 + LTEXT "IP-Adresse:", -1, 22, 34, 80, 8 + LTEXT "Subnetzmaske:", -1, 22, 48, 80, 8 + LTEXT "Standardgateway:", -1, 22, 62, 80, 8 + + RTEXT "Nicht verfügbar", 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 + STRINGTABLE DISCARDABLE BEGIN IDS_NETWORKCONNECTION "Netzwerkverbindungen" IDS_SHV_COLUMN_NAME "Name" IDS_SHV_COLUMN_TYPE "Typ" - IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_STATE "Status" IDS_SHV_COLUMN_DEVNAME "Gerätename" IDS_SHV_COLUMN_PHONE "Rufnummer oder Hostaddresse" IDS_SHV_COLUMN_OWNER "Besitzer" Added: trunk/reactos/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/el-GR.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,102 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óýíäåóç ìå ÷ñÞóç:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Äéáìüñöùóç", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Ôá óôïé÷åßá ðïõ åßíáé åðéëåãìÝíá, ÷ñçóéìïðïéïýíôáé áðü áõôÞ ôç óýíäåóç:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&ÅãêáôÜóôáóç", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&ÁðåãêáôÜóôáóç", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "ÐåñéãñáöÞ", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "ÅìöÜíéóç åéêïíéäßïõ óôçí taskbar üôáí åßíáé óõíäåäåìÝíï", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óýíäåóç", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "ÊáôÜóôáóç:", -1, 19, 20, 60, 8 + LTEXT "ÄéÜñêåéá:", -1, 19, 34, 60, 8 + LTEXT "Ôá÷ýôçôá:", -1, 19, 48, 60, 8 + GROUPBOX "Åíåñãçôéêüôçôá", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "ÁðåóôÜëëçóáí", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "ÅëÞöèçóáí", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Áðåíåñãïðïßçóç", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÕðïóôÞñéîç" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÊáôÜóôáóç Óýíäåóçò", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Ôýðïò Äéåýèõíóçò:", -1, 22, 20, 80, 8 + LTEXT "Äéåýèõíóç IP:", -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 + 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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END + Propchange: trunk/reactos/dll/win32/netshell/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -19,7 +19,14 @@ CHECKBOX "Notify me when this connection has limited or no connectivity", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" @@ -30,19 +37,35 @@ 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 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 LTEXT "Received", -1, 149, 90, 37, 8 LTEXT "Bytes:", -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_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Disable", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | 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 "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 + + 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 @@ -70,5 +93,12 @@ IDS_NET_CREATELINK "Create Shortcut" IDS_NET_DELETE "Delete" IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -19,7 +19,7 @@ CHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" @@ -30,19 +30,36 @@ LTEXT "Velocidad:", -1, 19, 48, 60, 8 GROUPBOX "Actividad ", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Enviados", -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 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 LTEXT "Recibidos", -1, 149, 90, 37, 8 LTEXT "Paquetes:", -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 "&Propiedades", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Deshabilitar", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 RTEXT "",IDC_SPEED,83,48,98,8 +END + + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Soporte" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Estado de la Conexión ", -1, 9, 8, 191, 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, 110, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 110, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 110, 48, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 110, 62, 80, 8 + + PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14 END @@ -70,5 +87,12 @@ IDS_NET_CREATELINK "Crear acceso directo" IDS_NET_DELETE "Borrar" IDS_NET_PROPERTIES "Propiedades" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" END Added: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,101 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | 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 connexion :", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | 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'icône dans la barre des tâches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Connexion", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "État :", -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_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Reçus", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + 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 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Support" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Status de la connexion", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Type d'adresse :", -1, 22, 20, 80, 8 + LTEXT "Adresse IP :", -1, 22, 34, 80, 8 + LTEXT "Masque sous-réseau :", -1, 22, 48, 80, 8 + LTEXT "Passerelle par défaut :", -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 "&Détails...", IDC_DETAILS, 22, 76, 62, 14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/hu-HU.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,102 @@ +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | 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_NOTIFY | WS_VSCROLL | WS_BORDER | 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_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | 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_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Beérkezett", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -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 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | 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 "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 + + 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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/id-ID.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,101 @@ +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Umum" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sambung Menggunakan:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigurasi", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Komponen yang dicentang digunakan oleh sambungan ini:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Instalasi", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Deinstalasi", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Properti", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Deskripsi", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Deskripsi Komponen di sini...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Tampilkan Ikon di taskbar saat tersambung", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Umum" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Sambungan", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Durasi:", -1, 19, 34, 60, 8 + LTEXT "Kecepatan:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivitas", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Dikirim", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Diterima", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Properti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Dimatikan", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dukungan" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Status Sambungan", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Tipe Alamat:", -1, 22, 20, 80, 8 + LTEXT "Alamat IP:", -1, 22, 34, 80, 8 + LTEXT "SubNet mask:", -1, 22, 48, 80, 8 + LTEXT "Gateway standar:", -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 "&Detil...", IDC_DETAILS, 22, 76, 62, 14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/id-ID.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -19,7 +19,15 @@ CHECKBOX "Notificare quando la connessione è limitata o non attiva", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg" @@ -43,6 +51,25 @@ RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Supporto" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Stato della connessione", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Tipo di indirizzo:", -1, 22, 20, 80, 8 + LTEXT "Indirizzo IP:", -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 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + + PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14 END @@ -70,5 +97,12 @@ IDS_NET_CREATELINK "Crea collegamento" IDS_NET_DELETE "Cancella" IDS_NET_PROPERTIES "Proprietà" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" END Added: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,101 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "SÊ" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Ú±Ìû@:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "Ýè(&C)", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "±ÌÚ±Í`FbN }[NªIÉÈÁÄ¢éR|[lgðgpµÄ¢Ü·:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "CXg[(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "í(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "à¾", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "±±ÉR|[lgÌà¾ª\\¦³êÜ·...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Ú±É^XN o[ÉACRð\\¦·é", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "SÊ" +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "Ú±", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "óÔ:", -1, 19, 20, 60, 8 + LTEXT "p±Ô:", -1, 19, 34, 60, 8 + LTEXT "¬x:", -1, 19, 48, 60, 8 + GROUPBOX "®ìóµ", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "M", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "óM", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "³øÉ·é(&D)", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Support" +FONT 9, "MS UI Gothic" +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 + + 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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,103 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Algemeen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verbinden met:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Configureren", 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_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Eigenschappen", 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_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Algemeen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Verbinding", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Duur:", -1, 19, 34, 60, 8 + LTEXT "Snelheid:", -1, 19, 48, 60, 8 + GROUPBOX "Activiteit", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Verzonden", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Ontvangen", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Uitschakelen", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | 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 "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 + + 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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END + + Propchange: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -19,7 +19,14 @@ CHECKBOX "Gi beskjed hvis denne tilkoblingen har begrenset eller ingen tilkobling", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Generielt" FONT 8, "MS Shell Dlg" @@ -43,6 +50,25 @@ RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hjelp" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tilkoblingsstatus", -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 "Standard Gateway:", -1, 22, 62, 80, 8 + + RTEXT "Ikke tilgjengelig", 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 @@ -70,5 +96,12 @@ IDS_NET_CREATELINK "Opprett snarvei" IDS_NET_DELETE "Slett" IDS_NET_PROPERTIES "Egenskaper" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -19,7 +19,14 @@ CHECKBOX "Powiadom mnie, gdy to po³¹czenie ma ograniczon¹ ³¹cznoæ lub brak ³¹cznoci", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg" @@ -30,13 +37,10 @@ LTEXT "Szybkoæ:", -1, 19, 48, 60, 8 GROUPBOX "Aktywnoæ", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Wys³ano", -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 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 LTEXT "Odebrano", -1, 149, 90, 37, 8 LTEXT "bajtów:", -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 "&W³aciwoci", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "W&y³¹cz", IDC_ENDISABLE, 66, 150, 50, 14 @@ -45,6 +49,24 @@ RTEXT "",IDC_SPEED,83,48,98,8 END +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Szczegó³y" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Status po³¹czenia", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Typ adresu:", -1, 22, 20, 80, 8 + LTEXT "Adres IP:", -1, 22, 34, 80, 8 + LTEXT "Maska podsieci:", -1, 22, 48, 80, 8 + LTEXT "Domylna brama:", -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 "&Szczegó³y...", IDC_DETAILS, 22, 76, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN @@ -70,5 +92,12 @@ IDS_NET_CREATELINK "Utwórz skrót" IDS_NET_DELETE "Usuñ" IDS_NET_PROPERTIES "W³aciwoci" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" END Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -19,7 +19,14 @@ CHECKBOX "Îïîâåùàòü â ñëó÷àå ðàçðûâà ñîåäèíåíèÿ", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END -IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 216, 180 +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 216, 180 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" @@ -30,13 +37,10 @@ LTEXT "Ñêîðîñòü:", -1, 19, 48, 60, 8 GROUPBOX "Àêòèâíîñòü", -1, 9, 74, 198, 70, BS_GROUPBOX RTEXT "Îòïðàâëåíî", -1, 20, 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 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 LTEXT "Ïðèíÿòî", -1, 158, 90, 37, 8 LTEXT "Áàéò:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 54, 115, 44, 8 - ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 46, 8 PUSHBUTTON "&Ñâîéñòâà", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Îòêëþ÷èòü", IDC_ENDISABLE, 66, 150, 50, 14 @@ -45,6 +49,24 @@ RTEXT "", IDC_SPEED, 100, 48, 98, 8 END +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ïîääåæêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñòàòóñ ïîäêëþ÷åíèÿ", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Òèï àäðåñà:", -1, 22, 20, 80, 8 + LTEXT "IP àäðåñ:", -1, 22, 34, 80, 8 + LTEXT "Ìàñêà ïîäñåòè:", -1, 22, 48, 80, 8 + LTEXT "Øëþç ïî óìîë÷àíèþ:", -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 "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN @@ -70,4 +92,11 @@ IDS_NET_CREATELINK "Ñîçäàòü ÿðëûê" IDS_NET_DELETE "Óäàëèòü" IDS_NET_PROPERTIES "Ñâîéñòâà" + + IDS_FORMAT_BIT "%u Áàéò/s" + IDS_FORMAT_KBIT "%u ÊÁàéò/s" + IDS_FORMAT_MBIT "%u ÌÁàéò/s" + IDS_FORMAT_GBIT "%u ÃÁàéò/s" + IDS_DURATION_DAY "%d Äåíü %s" + IDS_DURATION_DAYS "%d Äíåé %s" END Modified: trunk/reactos/dll/win32/netshell/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sk-SK.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -54,6 +54,24 @@ RTEXT "",IDC_SPEED,83,48,98,8 END +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Podpora" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Stav pripojenia", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Typ adresy:", -1, 22, 20, 80, 8 + LTEXT "Adresa IP:", -1, 22, 34, 80, 8 + LTEXT "Maska podsiete:", -1, 22, 48, 80, 8 + LTEXT "Predvolená brána:", -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 "Po&drobnosti...", IDC_DETAILS, 22, 76, 62, 14 +END STRINGTABLE DISCARDABLE BEGIN Added: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sv-SE.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,102 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmänt" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Anslut med:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Konfigurera", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Markerade komponenter används av denna anslutning:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Installera", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Avinstallera", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Beskrivning", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Komponentens beskrivning visas här...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Visa ikon i meddelandefältet när jag är ansluten", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allmänt" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Anslutning", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Varaktighet:", -1, 19, 34, 60, 8 + LTEXT "Hastighet:", -1, 19, 48, 60, 8 + GROUPBOX "Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Skickat", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "Mottaget", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Inaktivera", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | 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 "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 + + 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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,104 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ï³äêëþ÷åííÿ ÷åðåç:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Íàëàøòóâàòè", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Â³äì³÷åí³ êîìïîíåíòè âèêîðèñòîâóþòüñÿ öèì ï³äêëþ÷åííÿì:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "Âñò&àíîâèòè", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Â&èäàëèòè", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Âëàñòèâîñò³", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Îïèñ", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Îïèñ êîìïîíåíò³â...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Âèâåñòè çíà÷îê ï³äêëþ÷åííÿ íà ïàíåëü çàâäàíü", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ï³äêëþ÷åííÿ", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Ñòàí:", -1, 19, 20, 60, 8 + LTEXT "Òðèâàë³ñòü:", -1, 19, 34, 60, 8 + LTEXT "Øâèäê³ñòü:", -1, 19, 48, 60, 8 + GROUPBOX "Àêòèâí³ñòü", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Íàä³ñëàíî", -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 "Îòðèìàíî", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "Âëàñ&òèâîñò³", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "Âè&ìêíóòè", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ï³äòðèìêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñòàí ï³äêëþ÷åííÿ", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Òèï àäðåñè:", -1, 22, 20, 80, 8 + LTEXT "IP-àäðåñà:", -1, 22, 34, 80, 8 + LTEXT "Ìàñêà ï³äìåðåæ³:", -1, 22, 48, 80, 8 + LTEXT "Îñíîâíèé øëþç:", -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 "&Ñêëàä...", IDC_DETAILS, 22, 76, 62, 14 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/zh-CN.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -1,0 +1,101 @@ +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "³£¹æ" +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "Á¬½ÓÊ±Ê¹ÓÃ:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "ÅäÖÃ(&C)", 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_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "°²×°(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Ð¶ÔØ(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "ÊôÐÔ(&P)", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "ÃèÊö", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Á¬½ÓºóÔÚÍ¨ÖªÇøÓòÏÔÊ¾Í¼±ê", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + +IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "³£¹æ" +FONT 9, "MS Shell Dlg" +BEGIN + GROUPBOX "Á¬½Ó", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "×´Ì¬:", -1, 19, 20, 60, 8 + LTEXT "Duration:", -1, 19, 34, 60, 8 + LTEXT "ËÙ¶È:", -1, 19, 48, 60, 8 + GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "·¢ËÍ", -1, 26, 90, 60, 8 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + LTEXT "½ÓÊÕ", -1, 149, 90, 37, 8 + LTEXT "Bytes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + 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 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Support" +FONT 9, "MS Shell Dlg" +BEGIN + GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Address type:", -1, 22, 20, 80, 8 + LTEXT "IP µØÖ·:", -1, 22, 34, 80, 8 + LTEXT "×ÓÍøÑÚÂë:", -1, 22, 48, 80, 8 + LTEXT "Ä¬ÈÏÍø¹Ø:", -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 + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Network Connection" + IDS_SHV_COLUMN_NAME "Name" + IDS_SHV_COLUMN_TYPE "Type" + IDS_SHV_COLUMN_STATE "Status" + IDS_SHV_COLUMN_DEVNAME "Device Name" + IDS_SHV_COLUMN_PHONE "Phone # or Host Address" + IDS_SHV_COLUMN_OWNER "Owner" + IDS_TYPE_ETHERNET "LAN or High-Speed Internet" + IDS_STATUS_NON_OPERATIONAL "Disabled" + IDS_STATUS_UNREACHABLE "Not Connected" + IDS_STATUS_DISCONNECTED "Network cable unplugged" + IDS_STATUS_CONNECTING "Acquiring network address" + IDS_STATUS_CONNECTED "Connected" + IDS_STATUS_OPERATIONAL "Connected" + + IDS_NET_ACTIVATE "Enable" + IDS_NET_DEACTIVATE "Disable" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Repair" + IDS_NET_CREATELINK "Create Shortcut" + IDS_NET_DELETE "Delete" + IDS_NET_PROPERTIES "Properties" + + IDS_FORMAT_BIT "%u Bytes/s" + IDS_FORMAT_KBIT "%u KBytes/s" + IDS_FORMAT_MBIT "%u MBytes/s" + IDS_FORMAT_GBIT "%u GBytes/s" + IDS_DURATION_DAY "%d Day %s" + IDS_DURATION_DAYS "%d Days %s" +END Propchange: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -12,6 +12,7 @@ CLSID guidItem; UINT uID; HWND hwndDlg; + INetConnection *pNet; }NOTIFICATION_ITEM; typedef struct @@ -36,18 +37,18 @@ }LANSTATUSUI_CONTEXT; VOID -UpdateLanStatusUIDlg(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) +UpdateLanStatusUiDlg( + HWND hwndDlg, + MIB_IFROW * IfEntry, + LANSTATUSUI_CONTEXT * pContext) { WCHAR szFormat[MAX_PATH] = {0}; WCHAR szBuffer[MAX_PATH] = {0}; - MIB_IFROW IfEntry; SYSTEMTIME TimeConnected; DWORD DurationSeconds; WCHAR Buffer[100]; WCHAR DayBuffer[30]; WCHAR LocBuffer[50]; - HICON hIcon, hOldIcon; - NOTIFYICONDATAW nid; #if 0 ULONGLONG Ticks; @@ -55,34 +56,27 @@ DWORD Ticks; #endif - ZeroMemory(&IfEntry, sizeof(IfEntry)); - IfEntry.dwIndex = pContext->dwAdapterIndex; - if(GetIfEntry(&IfEntry) != NO_ERROR) - { - return; - } - - if (IfEntry.dwSpeed < 1000) + if (IfEntry->dwSpeed < 1000) { if (LoadStringW(netshell_hInstance, IDS_FORMAT_BIT, szFormat, sizeof(szFormat)/sizeof(WCHAR))) { - swprintf(szBuffer, szFormat, IfEntry.dwSpeed); + swprintf(szBuffer, szFormat, IfEntry->dwSpeed); SendDlgItemMessageW(hwndDlg, IDC_SPEED, WM_SETTEXT, 0, (LPARAM)szBuffer); } } - else if (IfEntry.dwSpeed < 1000000) + else if (IfEntry->dwSpeed < 1000000) { if (LoadStringW(netshell_hInstance, IDS_FORMAT_KBIT, szFormat, sizeof(szFormat)/sizeof(WCHAR))) { - swprintf(szBuffer, szFormat, IfEntry.dwSpeed/1000); + swprintf(szBuffer, szFormat, IfEntry->dwSpeed/1000); SendDlgItemMessageW(hwndDlg, IDC_SPEED, WM_SETTEXT, 0, (LPARAM)szBuffer); } } - else if (IfEntry.dwSpeed < 1000000000) + else if (IfEntry->dwSpeed < 1000000000) { if (LoadStringW(netshell_hInstance, IDS_FORMAT_MBIT, szFormat, sizeof(szFormat)/sizeof(WCHAR))) { - swprintf(szBuffer, szFormat, IfEntry.dwSpeed/1000000); + swprintf(szBuffer, szFormat, IfEntry->dwSpeed/1000000); SendDlgItemMessageW(hwndDlg, IDC_SPEED, WM_SETTEXT, 0, (LPARAM)szBuffer); } } @@ -90,17 +84,17 @@ { if (LoadStringW(netshell_hInstance, IDS_FORMAT_KBIT, szFormat, sizeof(szFormat)/sizeof(WCHAR))) { - swprintf(szBuffer, szFormat, IfEntry.dwSpeed/1000000000); + swprintf(szBuffer, szFormat, IfEntry->dwSpeed/1000000000); SendDlgItemMessageW(hwndDlg, IDC_SPEED, WM_SETTEXT, 0, (LPARAM)szBuffer); } } - if (StrFormatByteSizeW(IfEntry.dwInOctets, szBuffer, sizeof(szFormat)/sizeof(WCHAR))) + if (StrFormatByteSizeW(IfEntry->dwInOctets, szBuffer, sizeof(szFormat)/sizeof(WCHAR))) { SendDlgItemMessageW(hwndDlg, IDC_RECEIVED, WM_SETTEXT, 0, (LPARAM)szBuffer); } - if (StrFormatByteSizeW(IfEntry.dwOutOctets, szBuffer, sizeof(szFormat)/sizeof(WCHAR))) + if (StrFormatByteSizeW(IfEntry->dwOutOctets, szBuffer, sizeof(szFormat)/sizeof(WCHAR))) { SendDlgItemMessageW(hwndDlg, IDC_SEND, WM_SETTEXT, 0, (LPARAM)szBuffer); } @@ -140,12 +134,29 @@ SendDlgItemMessageW(hwndDlg, IDC_DURATION, WM_SETTEXT, 0, (LPARAM)Buffer); } +} + +VOID +UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext) +{ + MIB_IFROW IfEntry; + HICON hIcon, hOldIcon = NULL; + NOTIFYICONDATAW nid; + NETCON_PROPERTIES * pProperties = NULL; + + ZeroMemory(&IfEntry, sizeof(IfEntry)); + IfEntry.dwIndex = pContext->dwAdapterIndex; + if(GetIfEntry(&IfEntry) != NO_ERROR) + { + return; + } + hIcon = NULL; if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED || IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) { if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pContext->Status = 0; } else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1) @@ -155,12 +166,12 @@ } else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pContext->Status = 2; } else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3) { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pContext->Status = 3; } } @@ -168,7 +179,7 @@ { if (pContext->Status != 4) { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pContext->Status = 4; } } @@ -176,29 +187,72 @@ { if (pContext->Status != 5) { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pContext->Status = 5; } } - if (hIcon) + if (hwndDlg) { hOldIcon = (HICON)SendDlgItemMessageW(hwndDlg, IDC_NETSTAT, STM_SETICON, (WPARAM)hIcon, 0); - - ZeroMemory(&nid, sizeof(nid)); - nid.cbSize = sizeof(nid); - nid.uID = pContext->uID; - nid.hWnd = pContext->hwndStatusDlg; - nid.uFlags = NIF_ICON; - nid.u.uVersion = 3; - nid.hIcon = CopyImage(hIcon, IMAGE_ICON, 0, 0, 0); - - Shell_NotifyIconW(NIM_MODIFY, &nid); if (hOldIcon) DestroyIcon(hOldIcon); } + + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uID = pContext->uID; + nid.hWnd = pContext->hwndStatusDlg; + nid.u.uVersion = 3; + + if (INetConnection_GetProperties(pContext->pNet, &pProperties) == NOERROR) + { + if (pProperties->dwCharacter & NCCF_SHOW_ICON) + { + if (hwndDlg) + nid.hIcon = CopyImage(hIcon, IMAGE_ICON, 16, 16, 0); + else + nid.hIcon = hIcon; + + if (nid.hIcon) + nid.uFlags |= NIF_ICON; + + nid.uFlags |= NIF_STATE; + nid.dwState = 0; + nid.dwStateMask = NIS_HIDDEN; + + if (pProperties->pszwName) + { + if (wcslen(pProperties->pszwName) * sizeof(WCHAR) < sizeof(nid.szTip)) + { + nid.uFlags |= NIF_TIP; + wcscpy(nid.szTip, pProperties->pszwName); + } + else + { + CopyMemory(nid.szTip, pProperties->pszwName, sizeof(nid.szTip) - sizeof(WCHAR)); + nid.szTip[(sizeof(nid.szTip)/sizeof(WCHAR))-1] = L'\0'; + nid.uFlags |= NIF_TIP; + } + } + } + else + { + nid.uFlags |= NIF_STATE; + nid.dwState = NIS_HIDDEN; + nid.dwStateMask = NIS_HIDDEN; + + } + NcFreeNetconProperties(pProperties); + } + + Shell_NotifyIconW(NIM_MODIFY, &nid); + pContext->dwInOctets = IfEntry.dwInOctets; pContext->dwOutOctets = IfEntry.dwOutOctets; + + if (hwndDlg) + UpdateLanStatusUiDlg(hwndDlg, &IfEntry, pContext); } @@ -269,8 +323,33 @@ /* update adapter info */ pContext->Status = -1; - UpdateLanStatusUIDlg(hwndDlg, pContext); + UpdateLanStatus(hwndDlg, pContext); CoTaskMemFree(pAdapterInfo); +} + +INT_PTR +CALLBACK +LANStatusUiAdvancedDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + PROPSHEETPAGE *page; + LANSTATUSUI_CONTEXT * pContext; + + switch(uMsg) + { + case WM_INITDIALOG: + page = (PROPSHEETPAGE*)lParam; + pContext = (LANSTATUSUI_CONTEXT*)page->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); + return TRUE; + default: + break; + } + return FALSE; } INT_PTR @@ -356,6 +435,10 @@ if (hppages[0]) pinfo.nPages++; + hppages[pinfo.nPages] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_LAN_NETSTATUSADVANCED), LANStatusUiAdvancedDlg, (LPARAM)pContext, NULL); + if (hppages[pinfo.nPages]) + pinfo.nPages++; + if (pinfo.nPages) { PropertySheetW(&pinfo); @@ -392,7 +475,7 @@ pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); if (wParam == (WPARAM)pContext->nIDEvent) { - UpdateLanStatusUIDlg(pContext->hwndDlg, pContext); + UpdateLanStatus(pContext->hwndDlg, pContext); } break; case WM_SHOWSTATUSDLG: @@ -435,8 +518,31 @@ LANSTATUSUI_CONTEXT * pContext; if (This->pHead) + { + pItem = This->pHead; + while(pItem) + { + hr = INetConnection_GetProperties(INetCon, &pProps); + if (SUCCEEDED(hr)) + { + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uID = pItem->uID; + nid.hWnd = pItem->hwndDlg; + nid.uFlags = NIF_STATE; + if (pProps->dwCharacter & NCCF_SHOW_ICON) + nid.dwState = 0; + else + nid.dwState = NIS_HIDDEN; + + nid.dwStateMask = NIS_HIDDEN; + Shell_NotifyIconW(NIM_MODIFY, &nid); + NcFreeNetconProperties(pProps); + } + pItem = pItem->pNext; + } return S_OK; - + } /* get an instance to of IConnectionManager */ //hr = CoCreateInstance(&CLSID_ConnectionManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetConnectionManager, (LPVOID*)&INetConMan); @@ -469,11 +575,13 @@ break; } - pItem->pNext = NULL; + ZeroMemory(pContext, sizeof(LANSTATUSUI_CONTEXT)); pContext->uID = Index; pContext->pNet = INetCon; - + pItem->uID = Index; + pItem->pNext = NULL; + pItem->pNet = INetCon; hwndDlg = CreateDialogParamW(netshell_hInstance, MAKEINTRESOURCEW(IDD_STATUS), NULL, LANStatusDlg, (LPARAM)pContext); if (hwndDlg) { @@ -492,6 +600,8 @@ if (!(pProps->dwCharacter & NCCF_SHOW_ICON)) { nid.dwState = NIS_HIDDEN; + nid.dwStateMask = NIS_HIDDEN; + nid.uFlags |= NIF_STATE; } if (pProps->Status == NCS_MEDIA_DISCONNECTED || pProps->Status == NCS_DISCONNECTED || pProps->Status == NCS_HARDWARE_DISABLED) nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF)); Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -24,11 +24,22 @@ IDI_NET_TRANSREC ICON "res/nettrrec.ico" #include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" Modified: trunk/reactos/dll/win32/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc… ============================================================================== --- trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Sun Sep 28 05:50:10 2008 @@ -16,6 +16,7 @@ #define IDD_NETPROPERTIES 400 #define IDD_LAN_NETSTATUS 401 #define IDD_STATUS 402 +#define IDD_LAN_NETSTATUSADVANCED 403 /* dialog controls */ @@ -37,6 +38,12 @@ #define IDC_DURATION 1105 #define IDC_SPEED 1106 #define IDC_NETSTAT 1107 + +#define IDC_DETAILSTYPE 1200 +#define IDC_DETAILSIP 1201 +#define IDC_DETAILSSUBNET 1202 +#define IDC_DETAILSGATEWAY 1203 +#define IDC_DETAILS 1204 /* resource constants */

1 0

[cfinck] 36567: Fix the fix
by cfinck＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cfinck Date: Sun Sep 28 05:36:42 2008 New Revision: 36567 URL: http://svn.reactos.org/svn/reactos?rev=36567&view=rev Log: Fix the fix Modified: trunk/web/reactos.org/htdocs/support/rsdb_setting.php Modified: trunk/web/reactos.org/htdocs/support/rsdb_setting.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/support/rsd… ============================================================================== --- trunk/web/reactos.org/htdocs/support/rsdb_setting.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/support/rsdb_setting.php [iso-8859-1] Sun Sep 28 05:36:42 2008 @@ -40,7 +40,7 @@ // Config: (please sync this with the database) $RSDB_intern_version = "RSDB 0.1 - http://www.reactos.org/"; // RSDB version info - $RSDB_intern_path_server = "http://localhost/reactos.org/"; // complete server path + $RSDB_intern_path_server = "http://www.reactos.org/"; // complete server path $RSDB_intern_path = "support/"; // the dirs after http://www.reactos.org // script file fix (for Safari browser) @@ -63,7 +63,7 @@ if($RSDB_intern_user_id != 0) { $query_roscms_user = mysql_query("SELECT * - FROM `roscms.users` + FROM roscms.users WHERE `user_id` = '".mysql_escape_string($RSDB_intern_user_id)."' LIMIT 1;") ; $result_roscms_user = mysql_fetch_array($query_roscms_user);

1 0

[cfinck] 36566: Fix the Support Database for the new Logon system
by cfinck＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cfinck Date: Sun Sep 28 05:14:44 2008 New Revision: 36566 URL: http://svn.reactos.org/svn/reactos?rev=36566&view=rev Log: Fix the Support Database for the new Logon system Modified: trunk/web/reactos.org/htdocs/support/rsdb_setting.php Modified: trunk/web/reactos.org/htdocs/support/rsdb_setting.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/support/rsd… ============================================================================== --- trunk/web/reactos.org/htdocs/support/rsdb_setting.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/support/rsdb_setting.php [iso-8859-1] Sun Sep 28 05:14:44 2008 @@ -53,18 +53,13 @@ // Items per Page $RSDB_intern_items_per_page = 25; - + @define("ROSCMS_PATH", "../roscms/"); + require_once(ROSCMS_PATH . "logon/subsys_login.php"); // User ID - //$RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); - $RSDB_intern_user_id = 2; + $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); require_once('inc/user_settings.php'); - - // search for a valid RSDB user setting db entry - if (check_user_settings($RSDB_intern_user_id) == false) { - $RSDB_intern_user_id = 0; - } if($RSDB_intern_user_id != 0) { $query_roscms_user = mysql_query("SELECT * @@ -86,6 +81,4 @@ else { $RSDB_USER_name = "Anonymous"; } - $RSDB_intern_user_id = 2; - $RSDB_USER_name="TEST"; ?>

1 0

← Newer
1
2
3
4
5
6
7
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008