Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 49109: [Win32k|User32] - Move to the new window structure. Window Object served us well.
by jimtabor＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: jimtabor Date: Mon Oct 11 03:41:41 2010 New Revision: 49109 URL: http://svn.reactos.org/svn/reactos?rev=49109&view=rev Log: [Win32k|User32] - Move to the new window structure. Window Object served us well. Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/include/caret.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/eng.h trunk/reactos/subsystems/win32/win32k/include/focus.h trunk/reactos/subsystems/win32/win32k/include/hotkey.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/prop.h trunk/reactos/subsystems/win32/win32k/include/scroll.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/include/vis.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/palette.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/focus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/hotkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/vis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

1 0

[dreimer] 49108: Merge r49107.
by dreimer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: dreimer Date: Sun Oct 10 23:30:05 2010 New Revision: 49108 URL: http://svn.reactos.org/svn/reactos?rev=49108&view=rev Log: Merge r49107. Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -12,7 +12,7 @@ GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Hide modes that this monitor can\'t display", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Hide modes that this monitor can't display", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -17,6 +17,6 @@ STRINGTABLE BEGIN - IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l\'hardware" + IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l'hardware" IDS_FREQFMT "%u Hertz" END Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -18,7 +18,7 @@ GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Czêstotliwoæi odwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Ukryj tryby których monitor n ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -75,7 +75,7 @@ IDS_DEV_FAILED_ADD "Toto zaøízení nepracuje správnì, protoe $1 nepracuje správnì." IDS_DEV_DISABLED_SERVICE "ReactOS nemùe nainstalovat ovladaèe tohoto zaøízení, protoe nemá pøístup na disk nebo síové umístìní, na kterém se nacházejí instalaèní soubory." IDS_DEV_TRANSLATION_FAILED "Toto zaøízení neodpovídá svému ovladaèi." - IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku \"Zdroje\" k vybrání nastavení." + IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku ""Zdroje"" k vybrání nastavení." IDS_DEV_BIOS_TABLE "Firmware tohoto poèítaèe nezahrnuje dost informací nutných pro správné nastavení a pouití tohoto zaøízení.\nAby bylo moné pouít toto zaøízení, kontaktujte výrobce poèítaèe k získání novìjí verze firmwaru nebo BIOSu." IDS_DEV_IRQ_TRANSLATION_FAILED "Toto zaøízení poaduje PCI pøeruení, ale je konfigurováno pro ISA pøeruení (èi naopak).\nProsím, nastavte správnì pøeruení pro toto zaøízení." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nemùe incializovat ovladaè zaøízení pro toto zaøízení." Modified: branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Ïé ïäçãïß ãéá áõôÞ ôç óõóêåõÞ ðñÝðåé íá åðáíåãêáôáóôáèïýí." IDS_DEV_DEVLOADER_NOT_FOUND "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï ReactOS äå ìðïñåß íá öïñôþóåé ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá ôç óõóêåõÞ." IDS_DEV_DEVLOADER_NOT_FOUND2 "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá áõôÞ ôç óõóêåõÞ åßíáé ëáíèáóìÝíï." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Il driver di questo dispositivo deve essere reinstallato." IDS_DEV_DEVLOADER_NOT_FOUND "Questo dispositivo non funziona regolarmente perchè ReactOS non può caricare il file $1 che carica i driver per questo dispositivo." IDS_DEV_DEVLOADER_NOT_FOUND2 "Questo dispositivo non funziona regolarmente perchè il file $1 che carica i driver per questo dispositivo è sbagliato." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell\'hardware." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell'hardware." IDS_DEV_INVALID_DATA "Questo dispositivo non funziona regolarmente perchè il BIOS del computer indica in modo errato le risorse per il dispositivo." IDS_DEV_INVALID_DATA2 "Questo dispositivo non funziona regolarmente perchè il BIOS del dispositivo indica in modo errato le risorse per il dispositivo. " IDS_DEV_FAILED_START "Il dispositivo può essere assente, malfunzionante o non ha tutti i driver necessari." @@ -68,22 +68,22 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS non può indicare le risorse per questo dispositivo." IDS_DEV_FAILED_INSTALL "I driver non sono installati." IDS_DEV_HARDWARE_DISABLED "Disabilitato perchè il BIOS del dispositivo non ha assegnato nessuna risorsa." - IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver \"real-mode\" che provoca il conflitto." + IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver ""real-mode"" che provoca il conflitto." IDS_DEV_FAILED_ADD "Non funziona regolarmente a causa di $1 ." IDS_DEV_DISABLED_SERVICE "ReactOS non può installare i driver del dispositivo perchè non è possibile accedere al disco o alla rete dove si trovano i file di setup." IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver." IDS_DEV_NO_SOFTCONFIG "ReactOS non può individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "E\' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l\'Interrupt." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS non può inizializzare il driver di questo hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS non puo' caricare il driver perchè si trova in memoria una attivazione precedente." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS non puo' caricare il driver, potrebbe essere corrotto o assente." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS non può accedere a questo hardware perchè le informazioni nel registry sono mancanti o memorizzate in modo errato." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l\'hardware." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l'hardware." IDS_DEV_DUPLICATE_DEVICE "ReactOS non puo' caricare il driver perchè si trova nel sistema un suo duplicato già attivo." IDS_DEV_FAILED_POST_START "ReactOS ha fermato il driver perchè sono stati rileveti dei problemi." IDS_DEV_HALTED "Una applicazione o un servizio ha disattivato il dispositivo hardware." - IDS_DEV_PHANTOM "Al momento l\'hardware non è collegato al computer." + IDS_DEV_PHANTOM "Al momento l'hardware non è collegato al computer." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS Non può accede a questo hardware perchè il sistema operativo si stà spegnendo." IDS_DEV_HELD_FOR_EJECT "ReactOS non può accedere al dispositivo perchè è stato predisposto per la rimozione ma non è ancora stato rimosso" IDS_DEV_DRIVER_BLOCKED "Il software per questo dispositivo non può essere avviato perchè è noto che ha problemi con ReactOS. Contate il venditore hardware per un aggiornamento del driver." Modified: branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs." IDS_DEV_MOVED "ReactOS starter prosessen for å setter opp denne enheten." IDS_DEV_TOO_EARLY "ReactOS er i prosessen for å setter opp denne enheten." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan\ ikke spesifisere ressursen for denne enheten." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan ikke spesifisere ressursen for denne enheten." IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert." IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser." IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten." IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi $1 vil ikke fungere som den skal." IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen." - IDS_DEV_TRANSLATION_FAILED "Denne enheten vil\ ikke svare på grunn av driveren." + IDS_DEV_TRANSLATION_FAILED "Denne enheten vil ikke svare på grunn av driveren." IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen." - IDS_DEV_BIOS_TABLE "Din datamaskin\ system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." - IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens\'s system installering program for å rekonfigurere interrupt for denne enheten." + IDS_DEV_BIOS_TABLE "Din datamaskin system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." + IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens's system installering program for å rekonfigurere interrupt for denne enheten." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kan ikke initialise enhetsdriveren for denne maskinvaren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi en forrige tilfelle av enhetsdriveren er fremdeles i minnet." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren. Driveren kan være korrupt eller mangler." Modified: branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -41,7 +41,7 @@ IDS_DEV_FAILED_FILTER "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -69,10 +69,10 @@ IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS íå ìîæåò èíèöèàëèçèðîâàòü äðàéâåð óñòðîéñòâà äëÿ äàííîãî îáîðóäîâàíèÿ." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -86,7 +86,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 23:30:05 2010 @@ -46,7 +46,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -68,16 +68,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -91,7 +91,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE

1 0

[dreimer] 49107: RC file fixes for inconsistences shown up by the recent dll work in r49105.
by dreimer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: dreimer Date: Sun Oct 10 23:29:32 2010 New Revision: 49107 URL: http://svn.reactos.org/svn/reactos?rev=49107&view=rev Log: RC file fixes for inconsistences shown up by the recent dll work in r49105. Modified: trunk/reactos/dll/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc Modified: trunk/reactos/dll/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -12,7 +12,7 @@ GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Hide modes that this monitor can\'t display", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Hide modes that this monitor can't display", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -17,6 +17,6 @@ STRINGTABLE BEGIN - IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l\'hardware" + IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l'hardware" IDS_FREQFMT "%u Hertz" END Modified: trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -18,7 +18,7 @@ GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 LTEXT "&Czêstotliwoæi odwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT - AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 + AUTOCHECKBOX "&Ukryj tryby których monitor n ie mo¿e wywietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10 END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -75,7 +75,7 @@ IDS_DEV_FAILED_ADD "Toto zaøízení nepracuje správnì, protoe $1 nepracuje správnì." IDS_DEV_DISABLED_SERVICE "ReactOS nemùe nainstalovat ovladaèe tohoto zaøízení, protoe nemá pøístup na disk nebo síové umístìní, na kterém se nacházejí instalaèní soubory." IDS_DEV_TRANSLATION_FAILED "Toto zaøízení neodpovídá svému ovladaèi." - IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku \"Zdroje\" k vybrání nastavení." + IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáe urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a pouijte záloku ""Zdroje"" k vybrání nastavení." IDS_DEV_BIOS_TABLE "Firmware tohoto poèítaèe nezahrnuje dost informací nutných pro správné nastavení a pouití tohoto zaøízení.\nAby bylo moné pouít toto zaøízení, kontaktujte výrobce poèítaèe k získání novìjí verze firmwaru nebo BIOSu." IDS_DEV_IRQ_TRANSLATION_FAILED "Toto zaøízení poaduje PCI pøeruení, ale je konfigurováno pro ISA pøeruení (èi naopak).\nProsím, nastavte správnì pøeruení pro toto zaøízení." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nemùe incializovat ovladaè zaøízení pro toto zaøízení." Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Ïé ïäçãïß ãéá áõôÞ ôç óõóêåõÞ ðñÝðåé íá åðáíåãêáôáóôáèïýí." IDS_DEV_DEVLOADER_NOT_FOUND "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï ReactOS äå ìðïñåß íá öïñôþóåé ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá ôç óõóêåõÞ." IDS_DEV_DEVLOADER_NOT_FOUND2 "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá áõôÞ ôç óõóêåõÞ åßíáé ëáíèáóìÝíï." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -88,7 +88,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -43,7 +43,7 @@ IDS_DEV_FAILED_FILTER "Il driver di questo dispositivo deve essere reinstallato." IDS_DEV_DEVLOADER_NOT_FOUND "Questo dispositivo non funziona regolarmente perchè ReactOS non può caricare il file $1 che carica i driver per questo dispositivo." IDS_DEV_DEVLOADER_NOT_FOUND2 "Questo dispositivo non funziona regolarmente perchè il file $1 che carica i driver per questo dispositivo è sbagliato." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell\'hardware." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell'hardware." IDS_DEV_INVALID_DATA "Questo dispositivo non funziona regolarmente perchè il BIOS del computer indica in modo errato le risorse per il dispositivo." IDS_DEV_INVALID_DATA2 "Questo dispositivo non funziona regolarmente perchè il BIOS del dispositivo indica in modo errato le risorse per il dispositivo. " IDS_DEV_FAILED_START "Il dispositivo può essere assente, malfunzionante o non ha tutti i driver necessari." @@ -68,22 +68,22 @@ IDS_DEV_NO_VALID_LOG_CONF "ReactOS non può indicare le risorse per questo dispositivo." IDS_DEV_FAILED_INSTALL "I driver non sono installati." IDS_DEV_HARDWARE_DISABLED "Disabilitato perchè il BIOS del dispositivo non ha assegnato nessuna risorsa." - IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver \"real-mode\" che provoca il conflitto." + IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver ""real-mode"" che provoca il conflitto." IDS_DEV_FAILED_ADD "Non funziona regolarmente a causa di $1 ." IDS_DEV_DISABLED_SERVICE "ReactOS non può installare i driver del dispositivo perchè non è possibile accedere al disco o alla rete dove si trovano i file di setup." IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver." IDS_DEV_NO_SOFTCONFIG "ReactOS non può individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "E\' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l\'Interrupt." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS non può inizializzare il driver di questo hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS non puo' caricare il driver perchè si trova in memoria una attivazione precedente." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS non puo' caricare il driver, potrebbe essere corrotto o assente." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS non può accedere a questo hardware perchè le informazioni nel registry sono mancanti o memorizzate in modo errato." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l\'hardware." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l'hardware." IDS_DEV_DUPLICATE_DEVICE "ReactOS non puo' caricare il driver perchè si trova nel sistema un suo duplicato già attivo." IDS_DEV_FAILED_POST_START "ReactOS ha fermato il driver perchè sono stati rileveti dei problemi." IDS_DEV_HALTED "Una applicazione o un servizio ha disattivato il dispositivo hardware." - IDS_DEV_PHANTOM "Al momento l\'hardware non è collegato al computer." + IDS_DEV_PHANTOM "Al momento l'hardware non è collegato al computer." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS Non può accede a questo hardware perchè il sistema operativo si stà spegnendo." IDS_DEV_HELD_FOR_EJECT "ReactOS non può accedere al dispositivo perchè è stato predisposto per la rimozione ma non è ancora stato rimosso" IDS_DEV_DRIVER_BLOCKED "Il software per questo dispositivo non può essere avviato perchè è noto che ha problemi con ReactOS. Contate il venditore hardware per un aggiornamento del driver." Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -65,16 +65,16 @@ IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs." IDS_DEV_MOVED "ReactOS starter prosessen for å setter opp denne enheten." IDS_DEV_TOO_EARLY "ReactOS er i prosessen for å setter opp denne enheten." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan\ ikke spesifisere ressursen for denne enheten." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan ikke spesifisere ressursen for denne enheten." IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert." IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser." IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten." IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi $1 vil ikke fungere som den skal." IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen." - IDS_DEV_TRANSLATION_FAILED "Denne enheten vil\ ikke svare på grunn av driveren." + IDS_DEV_TRANSLATION_FAILED "Denne enheten vil ikke svare på grunn av driveren." IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen." - IDS_DEV_BIOS_TABLE "Din datamaskin\ system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." - IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens\'s system installering program for å rekonfigurere interrupt for denne enheten." + IDS_DEV_BIOS_TABLE "Din datamaskin system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering." + IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens's system installering program for å rekonfigurere interrupt for denne enheten." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kan ikke initialise enhetsdriveren for denne maskinvaren." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi en forrige tilfelle av enhetsdriveren er fremdeles i minnet." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren. Driveren kan være korrupt eller mangler." Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -41,7 +41,7 @@ IDS_DEV_FAILED_FILTER "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -69,10 +69,10 @@ IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS íå ìîæåò èíèöèàëèçèðîâàòü äðàéâåð óñòðîéñòâà äëÿ äàííîãî îáîðóäîâàíèÿ." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -86,7 +86,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 23:29:32 2010 @@ -46,7 +46,7 @@ IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation." IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly." IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. " IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed." @@ -68,16 +68,16 @@ IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." IDS_DEV_MOVED "ReactOS is in the process of setting up this device." IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device." IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly." IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver." + IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." - IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." + IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." + IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." @@ -91,7 +91,7 @@ IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." END STRINGTABLE

1 0

[akhaldi] 49106: [CMAKE] - Fix cryptui build. This should be sent upstream.
by akhaldi＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: akhaldi Date: Sun Oct 10 22:59:37 2010 New Revision: 49106 URL: http://svn.reactos.org/svn/reactos?rev=49106&view=rev Log: [CMAKE] - Fix cryptui build. This should be sent upstream. Modified: branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc Modified: branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptui/cryptui_Fr.rc [iso-8859-1] Sun Oct 10 22:59:37 2010 @@ -428,7 +428,7 @@ IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Standard de syntaxe de message cryptographique - Messages PKCS #7 (.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON - CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible" + CHECKBOX "&Inclure tous les certificats dans le chemin de certification si possible", IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,230,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "Ãchange d'informations &Personnelles - PKCS #12 (.pfx)", IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED

1 0

[akhaldi] 49105: [CMAKE] - More work on the dlls. By Alexey Komarov.
by akhaldi＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: akhaldi Date: Sun Oct 10 22:58:42 2010 New Revision: 49105 URL: http://svn.reactos.org/svn/reactos?rev=49105&view=rev Log: [CMAKE] - More work on the dlls. By Alexey Komarov. Added: branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt (with props) branches/cmake-bringup/dll/nls/CMakeLists.txt (with props) branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt (with props) branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt (with props) branches/cmake-bringup/dll/shellext/CMakeLists.txt (with props) branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt (with props) branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt (with props) branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt (with props) branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt (with props) branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libsnmpapi.a (with props) branches/cmake-bringup/importlibs/libwindowscodecs.a (with props) Modified: branches/cmake-bringup/dll/CMakeLists.txt branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,4 +1,6 @@ add_subdirectory(directx) +add_subdirectory(nls) add_subdirectory(ntdll) +add_subdirectory(shellext) add_subdirectory(win32) Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,2 +1,24 @@ +add_subdirectory(amstream) +#add_subdirectory(bdaplgin) +#add_subdirectory(d3d8) +add_subdirectory(d3d8thk) +#add_subdirectory(d3d9) +#add_subdirectory(ddraw) +add_subdirectory(devenum) +add_subdirectory(dinput) +add_subdirectory(dinput8) +add_subdirectory(dmusic) +add_subdirectory(dplay) +#add_subdirectory(dplayx) +add_subdirectory(dsound) +#add_subdirectory(dsound_new) +add_subdirectory(dxdiagn) +#add_subdirectory(ksproxy)# undefined reference to `operator new(unsigned int)' add_subdirectory(ksuser) +add_subdirectory(msdmo) +#add_subdirectory(msdvbnp) +#add_subdirectory(msvidctl) +add_subdirectory(qedit) +#add_subdirectory(quartz) #idl +#add_subdirectory(wine) Added: branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/amstr… ============================================================================== --- branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,32 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(amstream ${CMAKE_CURRENT_SOURCE_DIR}/amstream.spec ${CMAKE_CURRENT_BINARY_DIR}/amstream.def) + +add_library(amstream SHARED + amstream.c + main.c + mediastream.c + mediastreamfilter.c + regsvr.c + amstream_i.c + version.rc) + +set_module_type(amstream win32dll) + +target_link_libraries(amstream + ${CMAKE_CURRENT_BINARY_DIR}/amstream.def + strmiids + uuid + wine) + +add_importlibs(amstream + ole32 + advapi32 + kernel32 + ntdll) + +add_dependencies(amstream amstream_def) Propchange: branches/cmake-bringup/dll/directx/amstream/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/d3d8t… ============================================================================== --- branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,12 @@ + +spec2def(d3d8thk ${CMAKE_CURRENT_SOURCE_DIR}/d3d8thk.spec ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) + +add_library(d3d8thk SHARED d3d8thk.rc) + +set_entrypoint(d3d8thk 0) + +target_link_libraries(d3d8thk ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) + +add_importlibs(d3d8thk gdi32) + +add_dependencies(d3d8thk d3d8thk_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/directx/d3d8thk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/deven… ============================================================================== --- branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,36 @@ + +set_unicode() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(devenum ${CMAKE_CURRENT_SOURCE_DIR}/devenum.spec ${CMAKE_CURRENT_BINARY_DIR}/devenum.def) + +add_library(devenum SHARED + createdevenum.c + devenum_main.c + factory.c + mediacatenum.c + parsedisplayname.c + devenum.rc) + +set_module_type(devenum win32dll) + +target_link_libraries(devenum + ${CMAKE_CURRENT_BINARY_DIR}/devenum.def + strmiids + uuid + wine) + +add_importlibs(devenum + advapi32 + ole32 + oleaut32 + winmm + user32 + avicap32 + kernel32 + ntdll) + +add_dependencies(devenum devenum_def) Propchange: branches/cmake-bringup/dll/directx/devenum/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu… ============================================================================== --- branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,38 @@ + +set_unicode() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dinput ${CMAKE_CURRENT_SOURCE_DIR}/dinput.spec ${CMAKE_CURRENT_BINARY_DIR}/dinput.def) + +add_library(dinput SHARED + data_formats.c + device.c + dinput_main.c + effect_linuxinput.c + joystick_linux.c + joystick_linuxinput.c + keyboard.c + mouse.c + regsvr.c + version.rc) + +set_module_type(dinput win32dll) + +target_link_libraries(dinput + ${CMAKE_CURRENT_BINARY_DIR}/dinput.def + dxguid + uuid + wine) + +add_importlibs(dinput + user32 + advapi32 + ole32 + winmm + kernel32 + ntdll) + +add_dependencies(dinput dinput_def) Propchange: branches/cmake-bringup/dll/directx/dinput/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dinpu… ============================================================================== --- branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,32 @@ + +set_unicode() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dinput8 ${CMAKE_CURRENT_SOURCE_DIR}/dinput8.spec ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def) + +add_library(dinput8 SHARED + dinput8_main.c + regsvr.c + version.rc) + +set_entrypoint(dinput8 0) + +target_link_libraries(dinput8 + ${CMAKE_CURRENT_BINARY_DIR}/dinput8.def + dxguid + uuid + wine) + +add_importlibs(dinput8 + user32 + advapi32 + ole32 + winmm + dinput + kernel32 + ntdll) + +add_dependencies(dinput8 dinput8_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/directx/dinput8/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dmusi… ============================================================================== --- branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,40 @@ + +set_unicode() + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dmusic ${CMAKE_CURRENT_SOURCE_DIR}/dmusic.spec ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def) + +add_library(dmusic SHARED + buffer.c + clock.c + collection.c + dmusic.c + dmusic_main.c + download.c + downloadedinstrument.c + instrument.c + port.c + regsvr.c + version.rc) + +set_entrypoint(dmusic 0) + +target_link_libraries(dmusic + ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def + dxguid + uuid + wine) + +add_importlibs(dmusic + user32 + advapi32 + ole32 + dsound + kernel32 + ntdll) + +add_dependencies(dmusic dmusic_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/directx/dmusic/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay… ============================================================================== --- branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,25 @@ + +set_unicode() + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dplay ${CMAKE_CURRENT_SOURCE_DIR}/dplay.spec ${CMAKE_CURRENT_BINARY_DIR}/dplay.def) + +add_library(dplay SHARED dplay_main.c version.rc) + +set_entrypoint(dplay 0) + +target_link_libraries(dplay + ${CMAKE_CURRENT_BINARY_DIR}/dplay.def + uuid + wine) + +add_importlibs(dplay + user32 + advapi32 + ole32 + winmm + dinput + ntdll) + +add_dependencies(dplay dplay_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dsoun… ============================================================================== --- branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,39 @@ + +add_definitions(-D_WINE) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dsound ${CMAKE_CURRENT_SOURCE_DIR}/dsound.spec ${CMAKE_CURRENT_BINARY_DIR}/dsound.def) + +add_library(dsound SHARED + buffer.c + capture.c + dsound.c + dsound_convert.c + dsound_main.c + duplex.c + mixer.c + primary.c + propset.c + regsvr.c + sound3d.c + version.rc) + +set_module_type(dsound win32dll) + +target_link_libraries(dsound + ${CMAKE_CURRENT_BINARY_DIR}/dsound.def + dxguid + uuid + wine) + +add_importlibs(dsound + msvcrt + user32 + advapi32 + ole32 + winmm + kernel32 + ntdll) + +add_dependencies(dsound dsound_def) Propchange: branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dxdia… ============================================================================== --- branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,29 @@ + +set_unicode() + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dxdiagn ${CMAKE_CURRENT_SOURCE_DIR}/dxdiagn.spec ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def) + +add_library(dxdiagn SHARED + container.c + dxdiag_main.c + provider.c + regsvr.c) + +set_module_type(dxdiagn win32dll) + +target_link_libraries(dxdiagn + ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def + uuid + wine) + +add_importlibs(dxdiagn + user32 + advapi32 + ole32 + oleaut32 + kernel32 + ntdll) + +add_dependencies(dxdiagn dxdiagn_def) Propchange: branches/cmake-bringup/dll/directx/dxdiagn/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,43 @@ + +spec2def(ksproxy ${CMAKE_CURRENT_SOURCE_DIR}/ksproxy.spec ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def) + +add_library(ksproxy SHARED + allocator.cpp + basicaudio.cpp + classfactory.cpp + clockforward.cpp + cvpconfig.cpp + cvpvbiconfig.cpp + datatype.cpp + enum_mediatypes.cpp + enumpins.cpp + input_pin.cpp + interface.cpp + ksproxy.cpp + ksproxy.rc + mediasample.cpp + node.cpp + output_pin.cpp + proxy.cpp + qualityforward.cpp) + +set_entrypoint(ksproxy 0) +set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") +if(MSVC) + set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "/GR-") +else() + set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif(MSVC) + + +target_link_libraries(ksproxy ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def strmiids) + +add_importlibs(ksproxy + advapi32 + ole32 + setupapi + msvcrt + ksuser + ntdll) + +add_dependencies(ksproxy ksproxy_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,28 @@ + +set_unicode() + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(msdmo ${CMAKE_CURRENT_SOURCE_DIR}/msdmo.spec ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) + +add_library(msdmo SHARED + dmoreg.c + dmort.c + rsrc.rc) + +set_entrypoint(msdmo 0) + +target_link_libraries(msdmo + ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def + uuid + wine) + +add_importlibs(msdmo + user32 + advapi32 + ole32 + kernel32 + ntdll) + +add_dependencies(msdmo msdmo_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/qedit… ============================================================================== --- branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,34 @@ + +set_unicode() + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(qedit ${CMAKE_CURRENT_SOURCE_DIR}/qedit.spec ${CMAKE_CURRENT_BINARY_DIR}/qedit.def) + +add_library(qedit SHARED + main.c + mediadet.c + regsvr.c + samplegrabber.c) + +set_module_type(qedit win32dll) + +target_link_libraries(qedit + ${CMAKE_CURRENT_BINARY_DIR}/qedit.def + strmiids + uuid + wine) + +add_importlibs(qedit + msvcrt + advapi32 + ole32 + oleaut32 + kernel32 + ntdll) + +add_dependencies(qedit qedit_def) Propchange: branches/cmake-bringup/dll/directx/qedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/CMakeList… ============================================================================== --- branches/cmake-bringup/dll/nls/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/nls/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,3 @@ + +#add_subdirectory(idndl)#FIXME: idndl.cpp:20: error: 'GetLocaleInfoEx' was not declared in this scope +add_subdirectory(normaliz) Propchange: branches/cmake-bringup/dll/nls/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/idndl/CMa… ============================================================================== --- branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,19 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(idndl ${CMAKE_CURRENT_SOURCE_DIR}/idndl.spec ${CMAKE_CURRENT_BINARY_DIR}/idndl.def) + +add_library(idndl SHARED idndl.cpp) + +set_entrypoint(idndl 0) + +target_link_libraries(idndl ${CMAKE_CURRENT_BINARY_DIR}/idndl.def) + +if(NOT MSVC) + set_target_properties(idndl PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif(NOT MSVC) + +add_importlibs(idndl kernel32) + +add_dependencies(idndl idndl_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/normaliz/… ============================================================================== --- branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,8 @@ + +add_library(normaliz SHARED dummy.c) + +set_entrypoint(normaliz 0) + +target_link_libraries(normaliz ${CMAKE_CURRENT_SOURCE_DIR}/normaliz.def) + +add_dependencies(normaliz psdk buildno_header) Propchange: branches/cmake-bringup/dll/nls/normaliz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/CMak… ============================================================================== --- branches/cmake-bringup/dll/shellext/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/shellext/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,6 @@ + +add_subdirectory(deskadp) +add_subdirectory(deskmon) +add_subdirectory(devcpux) +add_subdirectory(fontext) +add_subdirectory(slayer) Propchange: branches/cmake-bringup/dll/shellext/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,26 @@ + +set_unicode() + +spec2def(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/deskadp.spec ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def) + +list(APPEND SOURCE + deskadp.c + shxiface.c + deskadp.rc) + +add_library(deskadp SHARED ${CMAKE_CURRENT_BINARY_DIR}/deskadp_precomp.h.gch ${SOURCE}) + +set_module_type(deskadp win32dll) + +target_link_libraries(deskadp ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def uuid) + +add_importlibs(deskadp + user32 + gdi32 + comctl32 + ole32 + kernel32 + ntdll) + +add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(deskadp deskadp_def) Propchange: branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,26 @@ + +set_unicode() + +spec2def(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/deskmon.spec ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def) + +list(APPEND SOURCE + deskmon.c + shxiface.c + deskmon.rc) + +add_library(deskmon SHARED ${CMAKE_CURRENT_BINARY_DIR}/deskmon_precomp.h.gch ${SOURCE}) + +set_module_type(deskmon win32dll) + +target_link_libraries(deskmon ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def uuid) + +add_importlibs(deskmon + user32 + gdi32 + comctl32 + ole32 + kernel32 + ntdll) + +add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(deskmon deskmon_def) Propchange: branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/devc… ============================================================================== --- branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,19 @@ + +set_unicode() + +spec2def(devcpux ${CMAKE_CURRENT_SOURCE_DIR}/devcpux.spec ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def) + +add_library(devcpux SHARED processor.c processor.rc) + +set_module_type(devcpux win32dll) + +target_link_libraries(devcpux ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def) + +add_importlibs(devcpux + user32 + powrprof + comctl32 + kernel32 + ntdll) + +add_dependencies(devcpux devcpux_def) Propchange: branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/font… ============================================================================== --- branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,26 @@ + +set_unicode() + +spec2def(fontext ${CMAKE_CURRENT_SOURCE_DIR}/fontext.spec ${CMAKE_CURRENT_BINARY_DIR}/fontext.def) + +add_library(fontext SHARED + fontext.c + regsvr.c + fontext.rc) + +set_module_type(fontext win32dll) + +target_link_libraries(fontext ${CMAKE_CURRENT_BINARY_DIR}/fontext.def uuid) + +add_importlibs(fontext + user32 + gdi32 + ole32 + shlwapi + lz32 + advapi32 + setupapi + kernel32 + ntdll) + +add_dependencies(fontext fontext_def) Propchange: branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/slay… ============================================================================== --- branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,24 @@ + +set_unicode() + +spec2def(slayer ${CMAKE_CURRENT_SOURCE_DIR}/slayer.spec ${CMAKE_CURRENT_BINARY_DIR}/slayer.def) + +list(APPEND SOURCE slayer.c slayer.rc) + +add_library(slayer SHARED ${CMAKE_CURRENT_BINARY_DIR}/slayer_precomp.h.gch ${SOURCE}) + +set_module_type(slayer win32dll) + +target_link_libraries(slayer ${CMAKE_CURRENT_BINARY_DIR}/slayer.def uuid) + +add_importlibs(slayer + user32 + comctl32 + advapi32 + ole32 + shell32 + kernel32 + ntdll) + +add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(slayer slayer_def) Propchange: branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -8,29 +8,29 @@ #add_subdirectory(atl) add_subdirectory(authz) add_subdirectory(avicap32) -#add_subdirectory(avifil32) +add_subdirectory(avifil32) add_subdirectory(batt) -#add_subdirectory(bcrypt) +add_subdirectory(bcrypt) add_subdirectory(beepmidi) -#add_subdirectory(browseui) +#add_subdirectory(browseui)#FIXME: shellbrowser.cpp:152: error: expected constructor, destructor, or type conversion before 'SHAlloc' add_subdirectory(cabinet) add_subdirectory(cards) add_subdirectory(cfgmgr32) add_subdirectory(clusapi) -#add_subdirectory(comcat) -#add_subdirectory(comctl32) -#add_subdirectory(comdlg32) +add_subdirectory(comcat) +#add_subdirectory(comctl32)#FIXME: comctl32\dpa.c:531: error: conflicting types for 'DPA_GetPtr' +#add_subdirectory(comdlg32)#FIXME: comdlg32\\/cdlg_Es.rc:396: unrecognized escape sequence add_subdirectory(compstui) -add_subdirectory(credui) +#add_subdirectory(credui)#FIXME: \\cryptui\\/cryptui_Fr.rc:432: syntax error add_subdirectory(crtdll) add_subdirectory(crypt32) -#add_subdirectory(cryptdlg) +add_subdirectory(cryptdlg) add_subdirectory(cryptdll) -#add_subdirectory(cryptnet) -#add_subdirectory(cryptui) +add_subdirectory(cryptnet) +add_subdirectory(cryptui) add_subdirectory(dbghelp) add_subdirectory(dciman32) -#add_subdirectory(devmgr) +add_subdirectory(devmgr) add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) add_subdirectory(dwmapi) @@ -38,21 +38,21 @@ add_subdirectory(fmifs) add_subdirectory(fusion) add_subdirectory(gdi32) -#add_subdirectory(gdiplus) +add_subdirectory(gdiplus) add_subdirectory(getuname) -#add_subdirectory(glu32) +#add_subdirectory(glu32)# FIXME #add_subdirectory(hhctrl.ocx) add_subdirectory(hid) -#add_subdirectory(hlink) -#add_subdirectory(hnetcfg) +add_subdirectory(hlink) +add_subdirectory(hnetcfg) add_subdirectory(httpapi) add_subdirectory(iccvid) add_subdirectory(icmp) add_subdirectory(imaadp32.acm) add_subdirectory(imagehlp) add_subdirectory(imm32) -#add_subdirectory(inetcomm) -#add_subdirectory(inetmib1) +add_subdirectory(inetcomm) +add_subdirectory(inetmib1) add_subdirectory(initpki) add_subdirectory(inseng) add_subdirectory(iphlpapi) @@ -199,7 +199,7 @@ add_subdirectory(version) add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) -#add_subdirectory(winemp3.acm) +#add_subdirectory(winemp3.acm)# FIXME add_subdirectory(winfax) add_subdirectory(wing32) add_subdirectory(winhttp) Added: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,42 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(avifil32 ${CMAKE_CURRENT_SOURCE_DIR}/avifil32.spec ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) + +add_library(avifil32 SHARED + acmstream.c + api.c + avifile.c + editstream.c + extrachunk.c + factory.c + getframe.c + icmstream.c + regsvr.c + tmpfile.c + wavfile.c + rsrc.rc) + +set_module_type(avifil32 win32dll) + +target_link_libraries(avifil32 + ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def + uuid + wine) + +add_importlibs(avifil32 + msvcrt + msacm32 + msvfw32 + winmm + ole32 + user32 + advapi32 + kernel32 + ntdll) + +add_dependencies(avifil32 avifil32_def) Propchange: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/bcrypt/… ============================================================================== --- branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,19 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(bcrypt ${CMAKE_CURRENT_SOURCE_DIR}/bcrypt.spec ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def) + +add_library(bcrypt SHARED + bcrypt_main.c + version.rc) + +set_module_type(bcrypt win32dll) + +target_link_libraries(bcrypt + ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def + wine) + +add_importlibs(bcrypt kernel32 ntdll) + +add_dependencies(bcrypt bcrypt_def) Propchange: branches/cmake-bringup/dll/win32/bcrypt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,54 @@ + +set_unicode() + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/lib/atl) + +spec2def(browseui ${CMAKE_CURRENT_SOURCE_DIR}/browseui.spec ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) + +add_library(browseui SHARED + aclmulti.cpp + addressband.cpp + addresseditbox.cpp + bandproxy.cpp + bandsite.cpp + bandsitemenu.cpp + basebar.cpp + basebarsite.cpp + brandband.cpp + browseui.cpp + browseuiord.cpp + commonbrowser.cpp + globalfoldersettings.cpp + internettoolbar.cpp + regtreeoptions.cpp + shellbrowser.cpp + toolsband.cpp + travellog.cpp + utility.cpp + browseui.rc) + +set_module_type(browseui win32dll) + +target_link_libraries(browseui + ${CMAKE_CURRENT_BINARY_DIR}/browseui.def + atlnew + uuid + wine) + +add_importlibs(browseui + msvcrt + shlwapi + shell32 + comctl32 + gdi32 + ole32 + oleaut32 + user32 + advapi32 + ntdll) + +add_dependencies(browseui browseui_def) Propchange: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comcat/… ============================================================================== --- branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(comcat ${CMAKE_CURRENT_SOURCE_DIR}/comcat.spec ${CMAKE_CURRENT_BINARY_DIR}/comcat.def) + +add_library(comcat SHARED comcat_main.c version.rc) + +set_entrypoint(comcat 0) + +target_link_libraries(comcat + ${CMAKE_CURRENT_BINARY_DIR}/comcat.def + uuid + wine) + +add_importlibs(comcat + ole32 + user32 + advapi32 + ntdll) + +add_dependencies(comcat comcat_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,68 @@ + +set_unicode() + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) +add_definitions(-D_COMCTL32_) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(comctl32 ${CMAKE_CURRENT_SOURCE_DIR}/comctl32.spec ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) + +add_library(comctl32 SHARED + animate.c + comboex.c + comctl32undoc.c + commctrl.c + datetime.c + dpa.c + draglist.c + dsa.c + flatsb.c + header.c + hotkey.c + imagelist.c + ipaddress.c + listview.c + monthcal.c + nativefont.c + pager.c + progress.c + propsheet.c + rebar.c + smoothscroll.c + status.c + string.c + syslink.c + tab.c + theme_button.c + theme_combo.c + theme_dialog.c + theme_edit.c + theme_listbox.c + theming.c + toolbar.c + tooltips.c + trackbar.c + treeview.c + updown.c + rsrc.rc) + +set_module_type(comctl32 win32dll) + +target_link_libraries(comctl32 + ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def + uuid + wine) + +add_importlibs(comctl32 + user32 + gdi32 + advapi32 + winmm + uxtheme + ntdll) + +add_dependencies(comctl32 comctl32_def) Propchange: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg3… ============================================================================== --- branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,38 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(comdlg32 ${CMAKE_CURRENT_SOURCE_DIR}/comdlg32.spec ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) + +add_library(comdlg32 SHARED + cdlg32.c + colordlg.c + filedlg.c + filedlg31.c + filedlgbrowser.c + finddlg.c + fontdlg.c + printdlg.c + rsrc.rc) + +set_module_type(comdlg32 win32dll) + +target_link_libraries(comdlg32 + ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def + uuid + wine) + +add_importlibs(comdlg32 + shell32 + shlwapi + comctl32 + winspool + user32 + gdi32 + advapi32 + ole32 + ntdll) + +add_dependencies(comdlg32 comdlg32_def) Propchange: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,24 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(cryptdlg ${CMAKE_CURRENT_SOURCE_DIR}/cryptdlg.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def) + +add_library(cryptdlg SHARED main.c cryptdlg.rc) + +set_module_type(cryptdlg win32dll) + +target_link_libraries(cryptdlg + ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def + wine) + +add_importlibs(cryptdlg + advapi32 + user32 + crypt32 + cryptui + wintrust + kernel32 + ntdll) + +add_dependencies(cryptdlg cryptdlg_def) Propchange: branches/cmake-bringup/dll/win32/cryptdlg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptne… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,21 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(cryptnet ${CMAKE_CURRENT_SOURCE_DIR}/cryptnet.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def) + +add_library(cryptnet SHARED cryptnet_main.c) + +set_module_type(cryptnet win32dll) + +target_link_libraries(cryptnet + ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def + wine) + +add_importlibs(cryptnet + crypt32 + wininet + kernel32 + ntdll) + +add_dependencies(cryptnet cryptnet_def) Propchange: branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptui… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(cryptui ${CMAKE_CURRENT_SOURCE_DIR}/cryptui.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) + +add_library(cryptui SHARED main.c cryptui.rc) + +set_module_type(cryptui win32dll) + +target_link_libraries(cryptui + ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def + uuid + wine) + +add_importlibs(cryptui + user32 + ole32 + crypt32 + gdi32 + advapi32 + urlmon + wintrust + comctl32 + comdlg32 + kernel32 + ntdll) + +add_dependencies(cryptui cryptui_def) Propchange: branches/cmake-bringup/dll/win32/cryptui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,32 @@ + +set_unicode() + +spec2def(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/devmgr.spec ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def) + +list(APPEND SOURCE + devmgr.rc + advprop.c + devprblm.c + hwpage.c + misc.c + stubs.c) + +add_library(devmgr SHARED ${CMAKE_CURRENT_BINARY_DIR}/devmgr_precomp.h.gch ${SOURCE}) + +set_module_type(devmgr win32dll) + +target_link_libraries(devmgr + ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def + uuid + wine) + +add_importlibs(devmgr + setupapi + advapi32 + user32 + version + kernel32 + ntdll) + +add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(devmgr devmgr_def) Propchange: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdiplus… ============================================================================== --- branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,45 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(gdiplus ${CMAKE_CURRENT_SOURCE_DIR}/gdiplus.spec ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) + +add_library(gdiplus SHARED + brush.c + customlinecap.c + font.c + gdiplus.c + graphics.c + graphicspath.c + image.c + imageattributes.c + matrix.c + pathiterator.c + pen.c + region.c + stringformat.c) + +set_module_type(gdiplus win32dll) + +target_link_libraries(gdiplus + ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def + uuid + wine) + +add_importlibs(gdiplus + msvcrt + shlwapi + oleaut32 + ole32 + user32 + gdi32 + windowscodecs + kernel32 + ntdll) + +if(ARCH MATCHES amd64) +target_link_libraries(gdiplus crt) +endif(ARCH MATCHES amd64) + +add_dependencies(gdiplus gdiplus_def) Propchange: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,119 @@ + +add_definitions(-DRESOLVE_3D_TEXTURE_SUPPORT) +add_definitions(-DBUILD_GL32) +add_definitions(-DLIBRARYBUILD) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/internals) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/interface) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/nurbtess) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libtess) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libutil) + +spec2def(glu32 ${CMAKE_CURRENT_SOURCE_DIR}/glu32.spec ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) + +list(APPEND SOURCE + libnurbs/interface/bezierEval.cc + libnurbs/interface/bezierPatch.cc + libnurbs/interface/bezierPatchMesh.cc + libnurbs/interface/glcurveval.cc + libnurbs/interface/glinterface.cc + libnurbs/interface/glrenderer.cc + libnurbs/interface/glsurfeval.cc + libnurbs/interface/incurveeval.cc + libnurbs/interface/insurfeval.cc + libnurbs/internals/arc.cc + libnurbs/internals/arcsorter.cc + libnurbs/internals/arctess.cc + libnurbs/internals/backend.cc + libnurbs/internals/basiccrveval.cc + libnurbs/internals/basicsurfeval.cc + libnurbs/internals/bin.cc + libnurbs/internals/bufpool.cc + libnurbs/internals/cachingeval.cc + libnurbs/internals/ccw.cc + libnurbs/internals/coveandtiler.cc + libnurbs/internals/curve.cc + libnurbs/internals/curvelist.cc + libnurbs/internals/curvesub.cc + libnurbs/internals/dataTransform.cc + libnurbs/internals/displaylist.cc + libnurbs/internals/flist.cc + libnurbs/internals/flistsorter.cc + libnurbs/internals/hull.cc + libnurbs/internals/intersect.cc + libnurbs/internals/knotvector.cc + libnurbs/internals/mapdesc.cc + libnurbs/internals/mapdescv.cc + libnurbs/internals/maplist.cc + libnurbs/internals/mesher.cc + libnurbs/internals/monoTriangulationBackend.cc + libnurbs/internals/monotonizer.cc + libnurbs/internals/mycode.cc + libnurbs/internals/nurbsinterfac.cc + libnurbs/internals/nurbstess.cc + libnurbs/internals/patch.cc + libnurbs/internals/patchlist.cc + libnurbs/internals/quilt.cc + libnurbs/internals/reader.cc + libnurbs/internals/renderhints.cc + libnurbs/internals/slicer.cc + libnurbs/internals/sorter.cc + libnurbs/internals/splitarcs.cc + libnurbs/internals/subdivider.cc + libnurbs/internals/tobezier.cc + libnurbs/internals/trimline.cc + libnurbs/internals/trimregion.cc + libnurbs/internals/trimvertpool.cc + libnurbs/internals/uarray.cc + libnurbs/internals/varray.cc + libnurbs/nurbtess/directedLine.cc + libnurbs/nurbtess/gridWrap.cc + libnurbs/nurbtess/monoChain.cc + libnurbs/nurbtess/monoPolyPart.cc + libnurbs/nurbtess/monoTriangulation.cc + libnurbs/nurbtess/partitionX.cc + libnurbs/nurbtess/partitionY.cc + libnurbs/nurbtess/polyDBG.cc + libnurbs/nurbtess/polyUtil.cc + libnurbs/nurbtess/primitiveStream.cc + libnurbs/nurbtess/quicksort.cc + libnurbs/nurbtess/rectBlock.cc + libnurbs/nurbtess/sampleComp.cc + libnurbs/nurbtess/sampleCompBot.cc + libnurbs/nurbtess/sampleCompRight.cc + libnurbs/nurbtess/sampleCompTop.cc + libnurbs/nurbtess/sampleMonoPoly.cc + libnurbs/nurbtess/sampledLine.cc + libnurbs/nurbtess/searchTree.cc + libtess/dict.c + libtess/geom.c + libtess/memalloc.c + libtess/mesh.c + libtess/normal.c + libtess/priorityq.c + libtess/render.c + libtess/sweep.c + libtess/tess.c + libtess/tessmono.c + libutil/error.c + libutil/glue.c + libutil/mipmap.c + libutil/project.c + libutil/quad.c + libutil/registry.c) + +add_library(glu32 SHARED ${SOURCE}) + +set_entrypoint(glu32 0) + +target_link_libraries(glu32 ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) +add_importlibs(glu32 + gcc + msvcrt + opengl32 + gdi32 + kernel32 + ntdll) + +add_dependencies(glu32 glu32_def psdk buildno_header) Propchange: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hlink/C… ============================================================================== --- branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,28 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(hlink ${CMAKE_CURRENT_SOURCE_DIR}/hlink.spec ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) + +add_library(hlink SHARED + browse_ctx.c + extserv.c + hlink_main.c + link.c) + +set_module_type(hlink win32dll) + +target_link_libraries(hlink + ${CMAKE_CURRENT_BINARY_DIR}/hlink.def + uuid + wine) + +add_importlibs(hlink + shell32 + ole32 + advapi32 + urlmon + kernel32 + ntdll) + +add_dependencies(hlink hlink_def) Propchange: branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hnetcfg… ============================================================================== --- branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,31 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(hnetcfg ${CMAKE_CURRENT_SOURCE_DIR}/hnetcfg.spec ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def) + +add_library(hnetcfg SHARED + apps.c + hnetcfg.c + manager.c + policy.c + port.c + profile.c + regsvr.c + service.c) + +set_module_type(hnetcfg win32dll) + +target_link_libraries(hnetcfg + ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def + wine) + +add_importlibs(hnetcfg + ole32 + advapi32 + kernel32 + ntdll) + +add_dependencies(hnetcfg hnetcfg_def) Propchange: branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetcom… ============================================================================== --- branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,35 @@ + +add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(inetcomm ${CMAKE_CURRENT_SOURCE_DIR}/inetcomm.spec ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def) + +add_library(inetcomm SHARED + imaptransport.c + inetcomm_main.c + internettransport.c + mimeintl.c + mimeole.c + pop3transport.c + regsvr.c + smtptransport.c) + +set_module_type(inetcomm win32dll) + +target_link_libraries(inetcomm + ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def + uuid + wine) + +add_importlibs(inetcomm + ole32 + oleaut32 + ws2_32 + user32 + advapi32 + kernel32 + ntdll) + +add_dependencies(inetcomm inetcomm_def) Propchange: branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetmib… ============================================================================== --- branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt [iso-8859-1] Sun Oct 10 22:58:42 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(inetmib1 ${CMAKE_CURRENT_SOURCE_DIR}/inetmib1.spec ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def) + +add_library(inetmib1 SHARED main.c) + +set_module_type(inetmib1 win32dll) + +target_link_libraries(inetmib1 + ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def + wine) + +add_importlibs(inetmib1 + msvcrt + snmpapi + iphlpapi + kernel32 + ntdll) + +add_dependencies(inetmib1 inetmib1_def) Propchange: branches/cmake-bringup/dll/win32/inetmib1/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libsnmpapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsnm… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libsnmpapi.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libwindowscodecs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libwindowscodecs.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[dreimer] 49104: Merge r49103.
by dreimer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: dreimer Date: Sun Oct 10 22:37:09 2010 New Revision: 49104 URL: http://svn.reactos.org/svn/reactos?rev=49104&view=rev Log: Merge r49103. Modified: branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc branches/cmake-bringup/base/setup/vmwinst/lang/hu-HU.rc branches/cmake-bringup/base/setup/vmwinst/lang/it-IT.rc branches/cmake-bringup/base/system/format/lang/fr-FR.rc branches/cmake-bringup/base/system/format/lang/hu-HU.rc branches/cmake-bringup/base/system/format/lang/pl-PL.rc branches/cmake-bringup/base/system/regsvr32/lang/pl-PL.rc branches/cmake-bringup/dll/win32/modemui/lang/pl-PL.rc Modified: branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -23,7 +23,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SNDVOL32 "Control de Volumen" - IDS_NOMIXERDEVICES "¡No hay dispositivos mezcladores activos en este momento! \n\La aplicación se cerrará ahora." + IDS_NOMIXERDEVICES "¡No hay dispositivos mezcladores activos en este momento! \n\ +La aplicación se cerrará ahora." END IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 Modified: branches/cmake-bringup/base/setup/vmwinst/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/lang/hu-HU.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -15,7 +15,8 @@ CAPTION "Video meghajtó telepítése" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "A ReactOS telepítõ nem rendelkezik a VMware(r) SVGA meghajtóval.\n\A VMware(r) VM menüjében válaszd ki a 'Install VMware tools...' menüpontot\n\n\nKattints a 'Tovább' gombra a folytatáshoz, vagy a 'Mégse' gombra, hogy kilépj az SVGA meghajtó telepítésébõl.",-1,25,25,225,85 + LTEXT "A ReactOS telepítõ nem rendelkezik a VMware(r) SVGA meghajtóval.\n\ +A VMware(r) VM menüjében válaszd ki a 'Install VMware tools...' menüpontot\n\n\nKattints a 'Tovább' gombra a folytatáshoz, vagy a 'Mégse' gombra, hogy kilépj az SVGA meghajtó telepítésébõl.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: branches/cmake-bringup/base/setup/vmwinst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -83,7 +83,8 @@ CAPTION "Installazione Video Driver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Il setup di ReactOS sta per disinstallare il driver SVGA di VMware(r)!!!\n\n\Cliccate 'Fine' per disinstallare il driver o 'Annulla' per lasciarlo come è.",-1,25,25,225,85 + LTEXT "Il setup di ReactOS sta per disinstallare il driver SVGA di VMware(r)!!!\n\n\ +Cliccate 'Fine' per disinstallare il driver o 'Annulla' per lasciarlo come è.",-1,25,25,225,85 END STRINGTABLE Modified: branches/cmake-bringup/base/system/format/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/lang/fr-FR.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -49,7 +49,8 @@ STRING_ERROR_LABEL "Le nom pour le disque n'est pas correct.\n" -STRING_YN_FORMAT "\nATTENTION, TOUTES LES DONNÉES SUR LE DISQUE %C: SERONT\n\PERDUES !\nContinuer avec le formatage ? (O/N) ?" +STRING_YN_FORMAT "\nATTENTION, TOUTES LES DONNÉES SUR LE DISQUE %C: SERONT\n\ +PERDUES !\nContinuer avec le formatage ? (O/N) ?" STRING_YES_NO_FAQ "ON" Modified: branches/cmake-bringup/base/system/format/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/lang/hu-HU.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -39,7 +39,7 @@ STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát" -STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\Ha készen áll, nyomja meg az ENTER billenytût..." +STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\\ Ha készen áll, nyomja meg az ENTER billenytût..." STRING_NO_VOLUME "Nem sikerült megállapítani címkét" Modified: branches/cmake-bringup/base/system/format/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -50,7 +50,7 @@ STRING_ERROR_LABEL "Nieprawid³owa etykieta woluminu zosta³a wpisana dla tego dysku.\n" -STRING_YN_FORMAT "\OSTRZE¯ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ +STRING_YN_FORMAT "\\OSTRZE¯ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ W STACJI %C: ZOSTAN¥ UTRACONE!\nCzy kontynuowaæ formatowanie (T/N)? " STRING_YES_NO_FAQ "TN" Modified: branches/cmake-bringup/base/system/regsvr32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv… ============================================================================== --- branches/cmake-bringup/base/system/regsvr32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/regsvr32/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -9,7 +9,8 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_UsageMessage, "%s\n\Sposób u¿ycia: regsvr32 [/u] [/s] [/c] [/n] [/i[:wiersz_polecenia]] nazwa_pliku_dll\n\ +IDS_UsageMessage, "%s\n\ +Sposób u¿ycia: regsvr32 [/u] [/s] [/c] [/n] [/i[:wiersz_polecenia]] nazwa_pliku_dll\n\ /u - Wyrejestruj serwer\n\ /s - Tryb cichy; nie wywietlaj okien komunikatów\n\ /c - Wyjcie w konsoli\n\ Modified: branches/cmake-bringup/dll/win32/modemui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/modemui/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 22:37:09 2010 @@ -338,7 +338,7 @@ 558 "Belgijski Krajowy" 559 "Australijski Krajowy" 560 "Nieznany switch" - 570 "Konfiguracja ISDN dla tego Modemu\NIS nie zosta³a ukoñczona.\n\nProszê wype³niæ wszystkie pola w\nzak³adce ISDN przed prób¹ u¿ycia modemu." + 570 "Konfiguracja ISDN dla tego Modemu\\NIS nie zosta³a ukoñczona.\n\nProszê wype³niæ wszystkie pola w\nzak³adce ISDN przed prób¹ u¿ycia modemu." 600 "PPP (56K,GSM)" 601 "PPP (64K,GSM)" 602 "V.120 (64K,GSM)"

1 0

[dreimer] 49103: More resource fixes making warnings vanish when built with cmake.
by dreimer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: dreimer Date: Sun Oct 10 22:36:35 2010 New Revision: 49103 URL: http://svn.reactos.org/svn/reactos?rev=49103&view=rev Log: More resource fixes making warnings vanish when built with cmake. Modified: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc trunk/reactos/base/setup/vmwinst/lang/it-IT.rc trunk/reactos/base/system/format/lang/fr-FR.rc trunk/reactos/base/system/format/lang/hu-HU.rc trunk/reactos/base/system/format/lang/pl-PL.rc trunk/reactos/base/system/regsvr32/lang/pl-PL.rc trunk/reactos/dll/win32/modemui/lang/pl-PL.rc Modified: trunk/reactos/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/es-ES.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -23,7 +23,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SNDVOL32 "Control de Volumen" - IDS_NOMIXERDEVICES "¡No hay dispositivos mezcladores activos en este momento! \n\La aplicación se cerrará ahora." + IDS_NOMIXERDEVICES "¡No hay dispositivos mezcladores activos en este momento! \n\ +La aplicación se cerrará ahora." END IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 Modified: trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/hu… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -15,7 +15,8 @@ CAPTION "Video meghajtó telepítése" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "A ReactOS telepítõ nem rendelkezik a VMware(r) SVGA meghajtóval.\n\A VMware(r) VM menüjében válaszd ki a 'Install VMware tools...' menüpontot\n\n\nKattints a 'Tovább' gombra a folytatáshoz, vagy a 'Mégse' gombra, hogy kilépj az SVGA meghajtó telepítésébõl.",-1,25,25,225,85 + LTEXT "A ReactOS telepítõ nem rendelkezik a VMware(r) SVGA meghajtóval.\n\ +A VMware(r) VM menüjében válaszd ki a 'Install VMware tools...' menüpontot\n\n\nKattints a 'Tovább' gombra a folytatáshoz, vagy a 'Mégse' gombra, hogy kilépj az SVGA meghajtó telepítésébõl.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/base/setup/vmwinst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/it… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/it-IT.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -83,7 +83,8 @@ CAPTION "Installazione Video Driver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Il setup di ReactOS sta per disinstallare il driver SVGA di VMware(r)!!!\n\n\Cliccate 'Fine' per disinstallare il driver o 'Annulla' per lasciarlo come è.",-1,25,25,225,85 + LTEXT "Il setup di ReactOS sta per disinstallare il driver SVGA di VMware(r)!!!\n\n\ +Cliccate 'Fine' per disinstallare il driver o 'Annulla' per lasciarlo come è.",-1,25,25,225,85 END STRINGTABLE Modified: trunk/reactos/base/system/format/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/fr… ============================================================================== --- trunk/reactos/base/system/format/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/fr-FR.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -49,7 +49,8 @@ STRING_ERROR_LABEL "Le nom pour le disque n'est pas correct.\n" -STRING_YN_FORMAT "\nATTENTION, TOUTES LES DONNÉES SUR LE DISQUE %C: SERONT\n\PERDUES !\nContinuer avec le formatage ? (O/N) ?" +STRING_YN_FORMAT "\nATTENTION, TOUTES LES DONNÉES SUR LE DISQUE %C: SERONT\n\ +PERDUES !\nContinuer avec le formatage ? (O/N) ?" STRING_YES_NO_FAQ "ON" Modified: trunk/reactos/base/system/format/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/hu… ============================================================================== --- trunk/reactos/base/system/format/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/hu-HU.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -39,7 +39,7 @@ STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát" -STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\Ha készen áll, nyomja meg az ENTER billenytût..." +STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\\ Ha készen áll, nyomja meg az ENTER billenytût..." STRING_NO_VOLUME "Nem sikerült megállapítani címkét" Modified: trunk/reactos/base/system/format/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/pl… ============================================================================== --- trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -50,7 +50,7 @@ STRING_ERROR_LABEL "Nieprawid³owa etykieta woluminu zosta³a wpisana dla tego dysku.\n" -STRING_YN_FORMAT "\OSTRZE¯ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ +STRING_YN_FORMAT "\\OSTRZE¯ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ W STACJI %C: ZOSTAN¥ UTRACONE!\nCzy kontynuowaæ formatowanie (T/N)? " STRING_YES_NO_FAQ "TN" Modified: trunk/reactos/base/system/regsvr32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -9,7 +9,8 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_UsageMessage, "%s\n\Sposób u¿ycia: regsvr32 [/u] [/s] [/c] [/n] [/i[:wiersz_polecenia]] nazwa_pliku_dll\n\ +IDS_UsageMessage, "%s\n\ +Sposób u¿ycia: regsvr32 [/u] [/s] [/c] [/n] [/i[:wiersz_polecenia]] nazwa_pliku_dll\n\ /u - Wyrejestruj serwer\n\ /s - Tryb cichy; nie wywietlaj okien komunikatów\n\ /c - Wyjcie w konsoli\n\ Modified: trunk/reactos/dll/win32/modemui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 22:36:35 2010 @@ -338,7 +338,7 @@ 558 "Belgijski Krajowy" 559 "Australijski Krajowy" 560 "Nieznany switch" - 570 "Konfiguracja ISDN dla tego Modemu\NIS nie zosta³a ukoñczona.\n\nProszê wype³niæ wszystkie pola w\nzak³adce ISDN przed prób¹ u¿ycia modemu." + 570 "Konfiguracja ISDN dla tego Modemu\\NIS nie zosta³a ukoñczona.\n\nProszê wype³niæ wszystkie pola w\nzak³adce ISDN przed prób¹ u¿ycia modemu." 600 "PPP (56K,GSM)" 601 "PPP (64K,GSM)" 602 "V.120 (64K,GSM)"

1 0

[fireball] 49102: [HEAP] - Properly set HEAP_GROWABLE flag if dwMaximumSize is 0 in HeapCreate. Also check for dwMaximumSize validity. Fixes out-of-memory problems when running "heavy" applications...
by fireball＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: fireball Date: Sun Oct 10 21:52:48 2010 New Revision: 49102 URL: http://svn.reactos.org/svn/reactos?rev=49102&view=rev Log: [HEAP] - Properly set HEAP_GROWABLE flag if dwMaximumSize is 0 in HeapCreate. Also check for dwMaximumSize validity. Fixes out-of-memory problems when running "heavy" applications like Office 2003 setup with a new heap manager (which actually respects HEAP_GROWABLE flag). Modified: trunk/reactos/dll/win32/kernel32/mem/heap.c Modified: trunk/reactos/dll/win32/kernel32/mem/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/hea… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/heap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/heap.c [iso-8859-1] Sun Oct 10 21:52:48 2010 @@ -13,6 +13,10 @@ #define NDEBUG #include <debug.h> +/* TYPES *********************************************************************/ + +extern SYSTEM_BASIC_INFORMATION BaseCachedSysInfo; + /* FUNCTIONS ***************************************************************/ /* @@ -30,6 +34,17 @@ /* Remove non-Win32 flags and tag this allocation */ Flags = (flOptions & (HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE)) | HEAP_CLASS_1; + + /* Check if heap is growable and ensure max size is correct */ + if (dwMaximumSize == 0) + Flags |= HEAP_GROWABLE; + else if (dwMaximumSize < BaseCachedSysInfo.PageSize && + dwInitialSize > dwMaximumSize) + { + /* Max size is non-zero but less than page size which can't be correct. + Fix it up by bumping it to the initial size whatever it is. */ + dwMaximumSize = dwInitialSize; + } /* Call RTL Heap */ hRet = RtlCreateHeap(Flags,

1 0

[dreimer] 49101: Merge r49096 to cmake branch
by dreimer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: dreimer Date: Sun Oct 10 19:31:41 2010 New Revision: 49101 URL: http://svn.reactos.org/svn/reactos?rev=49101&view=rev Log: Merge r49096 to cmake branch Modified: branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc branches/cmake-bringup/dll/win32/modemui/lang/de-DE.rc branches/cmake-bringup/dll/win32/netid/lang/bg-BG.rc branches/cmake-bringup/dll/win32/netid/lang/cs-CZ.rc branches/cmake-bringup/dll/win32/netid/lang/de-DE.rc branches/cmake-bringup/dll/win32/netid/lang/el-GR.rc branches/cmake-bringup/dll/win32/netid/lang/en-US.rc branches/cmake-bringup/dll/win32/netid/lang/es-ES.rc branches/cmake-bringup/dll/win32/netid/lang/fr-FR.rc branches/cmake-bringup/dll/win32/netid/lang/id-ID.rc branches/cmake-bringup/dll/win32/netid/lang/it-IT.rc branches/cmake-bringup/dll/win32/netid/lang/ja-JP.rc branches/cmake-bringup/dll/win32/netid/lang/nl-NL.rc branches/cmake-bringup/dll/win32/netid/lang/no-NO.rc branches/cmake-bringup/dll/win32/netid/lang/pl-PL.rc branches/cmake-bringup/dll/win32/netid/lang/ru-RU.rc branches/cmake-bringup/dll/win32/netid/lang/sk-SK.rc branches/cmake-bringup/dll/win32/netid/lang/uk-UA.rc branches/cmake-bringup/dll/win32/rasdlg/lang/en-US.rc branches/cmake-bringup/dll/win32/rasdlg/lang/no-NO.rc branches/cmake-bringup/dll/win32/rasdlg/lang/pl-PL.rc branches/cmake-bringup/dll/win32/rasdlg/lang/uk-UA.rc branches/cmake-bringup/dll/win32/tapiui/lang/de-DE.rc branches/cmake-bringup/dll/win32/tapiui/lang/en-US.rc branches/cmake-bringup/dll/win32/tapiui/lang/no-NO.rc branches/cmake-bringup/dll/win32/tapiui/lang/pl-PL.rc branches/cmake-bringup/dll/win32/tapiui/lang/ru-RU.rc branches/cmake-bringup/dll/win32/tapiui/lang/uk-UA.rc Modified: branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -9,7 +9,7 @@ BEGIN LTEXT "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 LTEXT "Óñòàíîâêó ReactOS ìîæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! Ïîñëå ïåðåçàïóñêà êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Íàæìèòå êíîïêó \"Çàâåðøèòü\" äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Íàæìèòå êíîïêó ""ÇàâåðøèòüW"" äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -22,7 +22,7 @@ CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 CONTROL "Ðàñêëàäêà êëàâèàòóðû:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -33,7 +33,7 @@ CONTROL "Òèï óñòàíîâêè", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 CONTROL "Óñòàíîâêà ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 CONTROL "Âîññòàíîâèòü èëè èçìåíèòü óñòàíîâëåííûé ðàíåå ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -48,7 +48,7 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Êëàâèàòóðà:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -62,7 +62,7 @@ PUSHBUTTON "&Óäàëèòü", IDC_PARTDELETE, 76,155,50,15 PUSHBUTTON "Ä&ðàéâåð", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Äîïîëíèòåëüíûå ïàðàìåòðû...", IDC_PARTMOREOPTS, 176,155,122,15 - LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 @@ -103,7 +103,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå \"Äàëåå\".", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -126,9 +126,9 @@ CONTROL "Çàâåðøåíèå ïåðâîãî ýòàïà óñòàíîâêè ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Ïåðâûé ýòàï óñòàíîâêè ReactOS çàêîí÷åí.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Ïîñëå íàæàòèÿ êëàâèøè \"Çàâåðøèòü\" âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Ïîñëå íàæàòèÿ êëàâèøè ""Çàâåðøèòü"" âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà íàæìèòå êëàâèøó \"Çàâåðøèòü\".", IDC_STATIC, 10, 176, 297, 20 + LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà íàæìèòå êëàâèøó ""Çàâåðøèòü"".", IDC_STATIC, 10, 176, 297, 20 END STRINGTABLE Modified: branches/cmake-bringup/dll/win32/modemui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/modemui/lang/de-DE.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -282,7 +282,7 @@ 402 "Warnung" 460 "Es ist nicht genügend Arbeitsspeicher verfügbar, um das allgemeine Eigenschaftenfenster anzuzeigen.\nSchließen Sie einige Dateien, und wiederholen Sie den Vorgang." 461 "Es ist nicht genügend Arbeitsspeicher verfügbar, um das Eigenschaftenfenster für Modemeinstellungen anzuzeigen.\nSchließen Sie einige Dateien, und wiederholen Sie den Vorgang." - 463 "Jede Anrufadresse muss auf \"Automatisch\" gesetzt oder einem eindeutigen Rufsignal zugeordnet werden.\n\nÄndern Sie die doppelt vergebene Rufsignale in andere." + 463 "Jede Anrufadresse muss auf ""Automatisch"" gesetzt oder einem eindeutigen Rufsignal zugeordnet werden.\n\nÄndern Sie die doppelt vergebene Rufsignale in andere." 465 "Standard-EC" 466 "Erzwungenes EC" 467 "Mobil" @@ -331,7 +331,7 @@ 558 "Belgisch National (selten verwendet)" 559 "Australisch National (selten verwendet)" 560 "Unbekanntes Vermittlungsprotokoll" - 570 "Die ISDN-Konfiguration für dieses Modem ist\nnoch nicht vollständig.\n\nFüllen Sie die Informationen in der Registerkarte\n\"ISDN\" aus, bevor Sie das Modem verwenden." + 570 "Die ISDN-Konfiguration für dieses Modem ist\nnoch nicht vollständig.\n\nFüllen Sie die Informationen in der Registerkarte\n""ISDN"" aus, bevor Sie das Modem verwenden." 600 "PPP (56K,GSM)" 601 "PPP (64K,GSM)" 602 "V.120 (64K,GSM)" Modified: branches/cmake-bringup/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/bg-BG.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Çàáåëåæêà: Ñàìî óïðàâíèöèòå ìîãàò äà ïðîìåíÿò îïîçíàâàòåëèòå íà êîìïþòúðà." 1022 "Çàáåëåæêà: Îïîçíàâàòåëÿò íà êîìïþòúðà íå ìîæå äà áúäå ñìåíåí, çàùîòî:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Ïî&äðîáíîñòè >>" 3220 "<< &Ïî&äðîáíîñòè" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -75,7 +75,7 @@ 25 "Lze zmìnit název a èlenství tohoto poèítaèe. Zmìny mohou mít vliv na pøístup k síovým prostøedkùm." 1021 "Poznámka: Identifikaci tohoto poèítaèe mohou zmìnit pouze administrátoøi." 1022 "Poznámka: Identifikace poèítaèe nemùe být zmìnìna z následujících dùvodù:" - 1030 "Nový název poèítaèe ""%s"" obsahuje nepovolené znaky. Mezi nepovolené znaky patøí ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / ?" + 1030 "Nový název poèítaèe ""%s"" obsahuje nepovolené znaky. Mezi nepovolené znaky patøí ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ?" 3210 "&Detaily >>" 3220 "<< &Detaily" 4000 "Informace" Modified: branches/cmake-bringup/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -78,7 +78,7 @@ 25 "Sie können den Namen und die Zugehörigkeit dieses Computers ändern. Änderungen können sich auf den Zugriff auf Netzwerkressourcen auswirken." 1021 "Hinweis: Nur Administratoren können die Identifikation des Computers ändern." 1022 "Hinweis: Die Identifikation des Computers kann aus folgendem Grund nicht geändert werden:" - 1030 "Der Computername ""%s"" enthält unerlaubte Zeichen. Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / und ?" + 1030 "Der Computername ""%s"" enthält unerlaubte Zeichen. Unerlaubte Zeichen sind ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / und ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/el-GR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/el-GR.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/en-US.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/es-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/es-ES.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -75,7 +75,7 @@ 25 "Puede cambiar el nombre y la pertenencia de este grupo. Los cambios pueden afectar el acceso a los recursos de red." 1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo." 1022 "Nota: La identificación de este equipo no puede ser cambiada porque:" - 1030 "El nuevo nombre de equipo ""%s"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / y ?" + 1030 "El nuevo nombre de equipo ""%s"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / y ?" 3210 "&Detalles >>" 3220 "<< &Detalles" 4000 "Información" Modified: branches/cmake-bringup/dll/win32/netid/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/fr-FR.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur." 1022 "Note : L'identification de l'ordinateur ne peut pas être modifiée car :" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Détails >>" 3220 "<< &Détails" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/id-ID.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/id-ID.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/it-IT.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -71,7 +71,7 @@ 25 "Potete modificare il nome e il dominio di questo computer. Le modifiche potrebbero influenzare l'accesso alle risorse di rete." 1021 "Nota: Solo gli Amministratori possono cambiare l'identificazione di questo computer." 1022 "Nota: L'identificazione di questo computer non può essere cambiata perchè:" - 1030 "Il nuovo nome del computer ""%s"" contiene dei caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / " + 1030 "Il nuovo nome del computer ""%s"" contiene dei caratteri non permessi. I caratteri vietati sono `? ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / " 3210 "&Dettagli >>" 3220 "<< &Dettagli" 4000 "Informazioni" Modified: branches/cmake-bringup/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/ja-JP.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "±ÌRs[^Ì¼OÆoVbvðÏXÅ«Ü·BÏX·éÆlbg[N \\[XÖÌANZXÉe¿·éÂ\\«ª èÜ·B" 1021 "Ó: ±ÌRs[^Ì ID ðÏXÅ«éÌÍÇÒÌÝÅ·B" 1022 "Ó: ÌRÉæèA±ÌRs[^Ì ID ðÏXÅ«Ü¹ñ:" - 1030 "Vµ¢Rs[^¼ ""%s"" ÉÍAgpÅ«È¢È¶ªÜÜêÄ¢Ü·BgpÅ«È¢¶Í ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / ? Å·B" + 1030 "Vµ¢Rs[^¼ ""%s"" ÉÍAgpÅ«È¢È¶ªÜÜêÄ¢Ü·BgpÅ«È¢¶Í ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / ? Å·B" 3210 "Ú×(&D) >>" 3220 "<< Ú×(&D)" 4000 "îñ" Modified: branches/cmake-bringup/dll/win32/netid/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/nl-NL.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Let op: Alleen Administrators mogen de indentificatie van deze computer aanpassen." 1022 "Let op: De indentificatie van deze computer kan niet gewijzigd worden omdat:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/no-NO.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "OBS: Bare administratorer kan endre identifisering for denne datamaskinen." 1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Detaljer >>" 3220 "<< &Detaljer" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -78,7 +78,7 @@ 25 "Mo¿esz zmieniæ nazwê i cz³onkostwo tego komputera. Zmiany mog¹ mieæ wp³yw na dostêp do zasobów sieciowych." 1021 "Uwaga: Tylko Administratorzy mog¹ zmieniaæ identyfikator tego komputera." 1022 "Uwaga: Identyfikator tego komputera nie zosta³ zmieniony, powód:" - 1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone znaki. Do niedozwolonych znaków nale¿¹ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / oraz ?" + 1030 "Nowa nazwa komputera ""%s"" zawiera niedozwolone znaki. Do niedozwolonych znaków nale¿¹ ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / oraz ?" 3210 "&Szczegó³y >>" 3220 "<< &Szczegó³y" 4000 "Informacja" Modified: branches/cmake-bringup/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -70,7 +70,7 @@ 25 "Ìîæíî èçìåíèòü èìÿ è ïðèíàäëåæíîñòü ýòîãî êîìïüþòåðà. Èçìåíåíèÿ ìîãóò ïîâëèÿòü íà äîñòóï ê ñåòåâûì ðåñóðñàì." 1021 "Ïðèìå÷àíèå: òîëüêî àäìèíèñòðàòîðû ìîãóò èçìåíèòü èäåíòèôèêàöèþ ýòîãî êîìïüþòåðà." 1022 "Ïðèìå÷àíèå: èäåíòèôèêàöèÿ ýòîãî êîìïüþòåðà íå ìîæåò áûòü èçìåíåíà, ïîòîìó ÷òî:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Ïîäðîáíî >>" 3220 "<< &Ïîäðîáíî" 4000 "Èíôîðìàöèÿ" Modified: branches/cmake-bringup/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -77,7 +77,7 @@ 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Poznámka: Iba správcovia môu zmeni identifikáciu tohto poèítaèa." 1022 "Poznámka: Identifikácia poèítaèa nemôe by zmenená, lebo:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / and ?" 3210 "&Podrobnosti >>" 3220 "<< &Podrobnosti" 4000 "Information" Modified: branches/cmake-bringup/dll/win32/netid/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/l… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/lang/uk-UA.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -78,7 +78,7 @@ 25 "Ìîæíà çí³íèòè ³ì'ÿ ³ ÷ëåíñòâî öüîãî êîìï'þòåðà. Çì³íè ìîæóòü âïëèíóòè íà äîñòóï äî ìåðåæíèõ ðåñóðñ³â." 1021 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà ìîæóòü ëèøå àäì³í³ñòðàòîðè." 1022 "Ïðèì³òêà: çì³íèòè ³äåíòèô³êàö³þ öüîãî êîìï'þòåðà íåìîæëèâî, îñê³ëüêè:" - 1030 "Íîâå ³ì'ÿ êîìï'þòåðà ""%s"" ì³ñòèòü íåäîïóñòèì³ ñèìâîëè. Äî íåäîïóñòèìèõ ñèìâîë³â íàëåæàòü ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / òà ?" + 1030 "Íîâå ³ì'ÿ êîìï'þòåðà ""%s"" ì³ñòèòü íåäîïóñòèì³ ñèìâîëè. Äî íåäîïóñòèìèõ ñèìâîë³â íàëåæàòü ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / òà ?" 3210 "&Ïîäðîáèö³ >>" 3220 "<< &Ïîäðîáèö³" 4000 "²íôîðìàö³ÿ" Modified: branches/cmake-bringup/dll/win32/rasdlg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/lang/en-US.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -695,7 +695,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "C&onfigure...", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "&Virtual \"tunnel\" connection", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "&Virtual ""tunnel"" connection", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOGEX 0, 0, 317, 143 @@ -706,7 +706,7 @@ LTEXT "Type the phone number below. ", -1, 7, 4, 306, 14 LTEXT "&Phone number:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "You might need to include a \"1\" or the area code, or both. If you are not sure you need the extra numbers, dial the phone number on your telephone. If you hear a modem sound, the number dialed is correct.", -1, 20, 50, 291, 53 + LTEXT "You might need to include a ""1"" or the area code, or both. If you are not sure you need the extra numbers, dial the phone number on your telephone. If you hear a modem sound, the number dialed is correct.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -1843,7 +1843,7 @@ 200 "Comment\0" 201 "The custom authentication package configuration failed.\0" 202 "TCP/IP is not installed or is disabled for Routing and Remote Access. In Control Panel, start Network, go to the Services page, choose 'Routing and Remote Access Service' Properties, and press the Network button.\0" - 203 "IPX is not installed or is disabled for Routing and Remote Access. You can install/enable IPX by viewing the properties of any connection in \"Connections\" folder.\0" + 203 "IPX is not installed or is disabled for Routing and Remote Access. You can install/enable IPX by viewing the properties of any connection in ""Connections"" folder.\0" 204 "Remove the selected device(s) from the list?\0" 205 "Delete %1 from the phonebook?\0" 206 "Disconnect from %1?\0" @@ -2256,10 +2256,10 @@ 1666 "Data sent to this computer can be acknowledged with a confirmation message indicating the time that the data was received.\0" 1667 "This computer will listen for and respond to requests for more information about the public network to which it is attached.\0" 1668 "This computer will respond to requests for information about the routes it recognizes.\0" - 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a \"destination unreachable\" message explaining the failure.\0" + 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a ""destination unreachable"" message explaining the failure.\0" 1670 "When this computer's ability to process incoming data cannot keep up with the rate of a transmission, data will be dropped and the sender will be asked to slow down.\0" - 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a \"bad header\" error message.\0" - 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a \"time expired\" message.\0" + 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a ""bad header"" error message.\0" + 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0" 1673 "Data sent from this computer will be rerouted if the default path changes.\0" 1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0" 1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0" Modified: branches/cmake-bringup/dll/win32/rasdlg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/lang/no-NO.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -695,7 +695,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "K&onfigurer...", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "&Virtuelt \"tunnel\" tilkobling", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "&Virtuelt ""tunnel"" tilkobling", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOGEX 0, 0, 317, 143 @@ -706,7 +706,7 @@ LTEXT "Velg telefonummer under. ", -1, 7, 4, 306, 14 LTEXT "&Telefonnummer:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Du skulle kanskje trenge å inkludere en \"1\" eller område, eller begge. Hvis du ikke er sikker på om du trenger ekstra nummer, ring telefonnummer til din telefon. Hvis du hører en modem lyd, nummeret oppringt som er riktig.", -1, 20, 50, 291, 53 + LTEXT "Du skulle kanskje trenge å inkludere en ""1"" eller område, eller begge. Hvis du ikke er sikker på om du trenger ekstra nummer, ring telefonnummer til din telefon. Hvis du hører en modem lyd, nummeret oppringt som er riktig.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -1843,7 +1843,7 @@ 200 "Kommentarer\0" 201 "Tilpasset authentication pakke konfigurasjon mislykkes.\0" 202 "TCP/IP er ikke installert eller er deaktivert for Routing og fjern tilgang. I Kontrollpanel, start Nettverk, gå til tjeneste siden, velg 'Routing og fjern tilgang tjeneste' Egenskaper, og trykk på Nettverk knappen.\0" - 203 "IPX er ikke installert eller er deaktivert for Routing og fjern tilgang. Du kan installere/aktivere IPX ved å vise egenskapene for alle tilkoblinger i \"Tilkoblinger\" mappen.\0" + 203 "IPX er ikke installert eller er deaktivert for Routing og fjern tilgang. Du kan installere/aktivere IPX ved å vise egenskapene for alle tilkoblinger i ""Tilkoblinger"" mappen.\0" 204 "Fjern valgte enhet(er) fra listen?\0" 205 "Slett %1 fra telefonboken?\0" 206 "Koble fra %1?\0" @@ -2255,10 +2255,10 @@ 1666 "Data sent to this computer can be acknowledged with a confirmation message indicating the time that the data was received.\0" 1667 "This computer will listen for and respond to requests for more information about the public network to which it is attached.\0" 1668 "This computer will respond to requests for information about the routes it recognizes.\0" - 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a \"destination unreachable\" message explaining the failure.\0" + 1669 "Data sent over the Internet that fails to reach this computer due to an error will be discarded and acknowledged with a ""destination unreachable"" message explaining the failure.\0" 1670 "When this computer's ability to process incoming data cannot keep up with the rate of a transmission, data will be dropped and the sender will be asked to slow down.\0" - 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a \"bad header\" error message.\0" - 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a \"time expired\" message.\0" + 1671 "When this computer discards data it has received due to a problematic header, it will reply to the sender with a ""bad header"" error message.\0" + 1672 "When this computer discards an incomplete data transmission because the entire transmission required more time than allowed, it will reply to the sender with a ""time expired"" message.\0" 1673 "Data sent from this computer will be rerouted if the default path changes.\0" 1675 "The value entered for the log file size is not valid. Enter a value between 1 and 32767 k.\0" 1685 "Your user account does not have permission to use this connection. Usually, this is because you are logged in as Guest.\0" Modified: branches/cmake-bringup/dll/win32/rasdlg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -702,7 +702,7 @@ COMBOBOX 1551, 16, 169, 128, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "&Konfiguruj", 1293, 150, 168, 60, 14 PUSHBUTTON "&X.25", 1295, 7, 194, 50, 14 - PUSHBUTTON "P&o³¹czenie \"tunel\" wirtualne", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED + PUSHBUTTON "P&o³¹czenie ""tunel"" wirtualne", 1294, 62, 194, 120, 14, NOT WS_VISIBLE | WS_DISABLED END 168 DIALOGEX 0, 0, 317, 143 @@ -713,7 +713,7 @@ LTEXT "Wpisz numer telefoniczny poni¿ej. ", -1, 7, 4, 306, 14 LTEXT "&Numer telefoniczny:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Prawdopodobnie bêdzie trzeba u¿yæ cyfry \"1\", numeru kierunkowego, albo obydwu. Jeli nie jeste pewien, wypróbuj ¿¹dany numer na swoim telefonie. Jeli us³yszysz sygna³ modemu, numer jest poprawny.", -1, 20, 50, 291, 53 + LTEXT "Prawdopodobnie bêdzie trzeba u¿yæ cyfry ""1"", numeru kierunkowego, albo obydwu. Jeli nie jeste pewien, wypróbuj ¿¹dany numer na swoim telefonie. Jeli us³yszysz sygna³ modemu, numer jest poprawny.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -2263,10 +2263,10 @@ 1666 "Dane wys³ane do tego komputera mog¹ byæ potwierdzane w specjalnej wiadomoci, zawieraj¹cej czas dostarczenia tych danych.\0" 1667 "Ten komputer bêdzie nas³uchiwa³ i odpowiada³ na ¿¹dania informacji o sieci publicznej, do której jest pod³¹czony.\0" 1668 "Ten komputer bêdzie odpowiada³ na ¿¹dania informacji dotycz¹cych znanych mu tras.\0" - 1669 "Dane, wys³ane przez Internet, które nie dotr¹ do tego komputera z powodu b³êdów zostan¹ odrzucone z odes³aniem komunikatu \"destination unreachable\" o przyczynach b³êdów.\0" + 1669 "Dane, wys³ane przez Internet, które nie dotr¹ do tego komputera z powodu b³êdów zostan¹ odrzucone z odes³aniem komunikatu ""destination unreachable"" o przyczynach b³êdów.\0" 1670 "Kiedy zdolnoæ tego komputera do przetwarzania nap³ywaj¹cych danych nie bêdzie w stanie nad¹¿yæ za prêdkoci¹ transmisji, dane zostan¹ odrzucone a wysy³aj¹cy dostanie wiadomoæ z prob¹ o zmniejszenie prêdkoci.\0" - 1671 "Kiedy ten komputer odrzuca otrzymane dane z powodu b³êdnego nag³ówka, wyle on do nadawcy wiadomoæ o b³êdzie \"bad header\".\0" - 1672 "Kiedy ten komputer odrzuca niekompletne dane z po³¹czenia, jako, ¿e ca³a transmisja danych wymaga³a wiêcej czasu ni¿ by³o przeznaczone, wyle on do nadawcy wiadomoæ o b³êdzie \"time expired\".\0" + 1671 "Kiedy ten komputer odrzuca otrzymane dane z powodu b³êdnego nag³ówka, wyle on do nadawcy wiadomoæ o b³êdzie ""bad header"".\0" + 1672 "Kiedy ten komputer odrzuca niekompletne dane z po³¹czenia, jako, ¿e ca³a transmisja danych wymaga³a wiêcej czasu ni¿ by³o przeznaczone, wyle on do nadawcy wiadomoæ o b³êdzie ""time expired"".\0" 1673 "Dane wys³ane z tego komputera bêd¹ przekierowane, gdy zmieni siê domylna trasa.\0" 1675 "Wartoæ podana jako rozmiar pliku logów. Podaj wartoæ od 1 and 32767 k.\0" 1685 "Twoje konto u¿ytkownika nie ma dostatecznych uprawnieñ by u¿ywaæ tego po³¹czenia. Zwykle dzieje sie tak gdy jeste zalogowany jako Goæ.\0" Modified: branches/cmake-bringup/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/lang/uk-UA.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -714,7 +714,7 @@ LTEXT "Ââåä³òü íîìåð òåëåôîíó. ", -1, 7, 4, 306, 14 LTEXT "Íîìåð &òåëåôîíó:", 1308, 7, 19, 130, 8 EDITTEXT 1304, 7, 30, 304, 14, ES_AUTOHSCROLL - LTEXT "Ìîæëèâî, çíàäîáèòüñÿ äîäàòè \"1\", êîä ì³ñòà àáî îáèäâà çíà÷åííÿ. Ùîá âèçíà÷èòè, ÷è öå ïîòð³áíî, íàáåð³òü êîìá³íàö³þ íîìåðà é êîäó íà ñâîºìó òåëåôîí³. ßêùî ÷óòíî çâóê ìîäåìà, êîìá³íàö³þ âèáðàíî ïðàâèëüíî.", -1, 20, 50, 291, 53 + LTEXT "Ìîæëèâî, çíàäîáèòüñÿ äîäàòè ""1"", êîä ì³ñòà àáî îáèäâà çíà÷åííÿ. Ùîá âèçíà÷èòè, ÷è öå ïîòð³áíî, íàáåð³òü êîìá³íàö³þ íîìåðà é êîäó íà ñâîºìó òåëåôîí³. ßêùî ÷óòíî çâóê ìîäåìà, êîìá³íàö³þ âèáðàíî ïðàâèëüíî.", -1, 20, 50, 291, 53 END 169 DIALOGEX 6, 18, 235, 135 @@ -1851,7 +1851,7 @@ 200 "Ïðèì³òêà\0" 201 "Íå âäàëîñÿ íàëàøòóâàòè ïàêåò ñïåö³àëüíî¿ ïåðåâ³ðêè.\0" 202 "Ïðîòîêîë TCP/IP íå óñòàíîâëåíî àáî âèìêíóòî äëÿ ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó. Â³äêðèéòå íà ïàíåë³ êåðóâàííÿ çíà÷îê ""Ìåðåæà"", ïåðåéä³òü íà ñòîð³íêó ""Ñëóæáè"", âèáåð³òü âëàñòèâîñò³ ñëóæáè ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó é íàòèñí³òü êíîïêó ""Ìåðåæà"".\0" - 203 "Ïðîòîêîë IPX íå óñòàíîâëåíî àáî âèìêíóòî äëÿ ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó. Ùîá óñòàíîâèòè àáî ââ³ìêíóòè IPX, â³äêðèéòå ñòîð³íêó âëàñòèâîñòåé áóäü-ÿêîãî ï³äêëþ÷åííÿ â ïàïö³ \"Ï³äêëþ÷åííÿ\".\0" + 203 "Ïðîòîêîë IPX íå óñòàíîâëåíî àáî âèìêíóòî äëÿ ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó. Ùîá óñòàíîâèòè àáî ââ³ìêíóòè IPX, â³äêðèéòå ñòîð³íêó âëàñòèâîñòåé áóäü-ÿêîãî ï³äêëþ÷åííÿ â ïàïö³ ""Ï³äêëþ÷åííÿ"".\0" 204 "Âèäàëèòè âèáðàí³ ïðèñòðî¿ ç öüîãî ñïèñêó?\0" 205 "Âèäàëèòè %1 ³ç òåëåôîííî¿ êíèãè?\0" 206 "Â³äêëþ÷èòèñÿ â³ä %1?\0" @@ -2264,10 +2264,10 @@ 1666 "Îòðèìàííÿ äàíèõ, íàä³ñëàíèõ íà öåé êîìï'þòåð, ìîæå áóòè ï³äòâåðäæåíî ïîâ³äîìëåííÿì, â ÿêîìó áóäå âêàçàíî äàòó òà ÷àñ ïðèéîìó.\0" 1667 "Öåé êîìï'þòåð îòðèìóâàòèìå òà â³äïîâ³äàòèìå íà çàïèòè ïðî äîäàòêîâó ³íôîðìàö³þ ùîäî ìåðåæ³, äî ÿêî¿ éîãî ï³äêëþ÷åíî.\0" 1668 "Öåé êîìï'þòåð â³äïîâ³äàòèìå íà çàïèòè ïðî ³íôîðìàö³þ ùîäî ðîçï³çíàíèõ ìàðøðóòèçàòîð³â.\0" - 1669 "Äàí³, ÿê³ áóëè íàä³ñëàí³ ÷åðåç ²íòåðíåò ³ íå äîñÿãëè öüîãî êîìï'þòåðà ïîìèëêîâî, áóäóòü â³äêèíóò³ ç ïîâ³äîìëåííÿì \"ì³ñöå ïðèçíà÷åííÿ íåäîñòóïíå\".\0" + 1669 "Äàí³, ÿê³ áóëè íàä³ñëàí³ ÷åðåç ²íòåðíåò ³ íå äîñÿãëè öüîãî êîìï'þòåðà ïîìèëêîâî, áóäóòü â³äêèíóò³ ç ïîâ³äîìëåííÿì ""ì³ñöå ïðèçíà÷åííÿ íåäîñòóïíå"".\0" 1670 "Êîëè ³íòåíñèâí³ñòü âõ³äíîãî ïîòîêó ïåðåâèùèòü ìîæëèâîñò³ öüîãî êîìï'þòåðà ç îáðîáêè âõ³äíèõ äàíèõ, äàí³ áóäóòü ïðîïóùåí³, à â³äïðàâíèêà ïîïðîñÿòü çìåíøèòè òåìï ïåðåäà÷³.\0" - 1671 "Êîëè öåé êîìï'þòåð â³äêèíå äàí³, îòðèìàí³ ç ïîìèëêîâèì çàãîëîâêîì, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó \"íåïðàâèëüíèé çàãîëîâîê\".\0" - 1672 "Êîëè öåé êîìï'þòåð â³äêèíå íåçàê³í÷åíó ïåðåäà÷ó äàíèõ ÷åðåç ïåðåâèùåííÿ äîçâîëåíîãî ÷àñó ïåðåäà÷³, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó \"÷àñ ìèíóâ\".\0" + 1671 "Êîëè öåé êîìï'þòåð â³äêèíå äàí³, îòðèìàí³ ç ïîìèëêîâèì çàãîëîâêîì, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó ""íåïðàâèëüíèé çàãîëîâîê"".\0" + 1672 "Êîëè öåé êîìï'þòåð â³äêèíå íåçàê³í÷åíó ïåðåäà÷ó äàíèõ ÷åðåç ïåðåâèùåííÿ äîçâîëåíîãî ÷àñó ïåðåäà÷³, â³í â³äïîâ³ñòü â³äïðàâíèêîâ³ ïîâ³äîìëåííÿì ïðî ïîìèëêó ""÷àñ ìèíóâ"".\0" 1673 "Äàí³, íàä³ñëàí³ ç öüîãî êîìï'þòåðà, áóäóòü ïåðåñïðÿìîâàí³, ÿêùî ìàðøðóò çà çàìîâ÷óâàííÿì çì³íèòüñÿ.\0" 1675 "Ââåäåíå çíà÷åííÿ ðîçì³ðó ôàéëó æóðíàëó íåïðèïóñòèìå. Óêàæ³òü çíà÷åííÿ â³ä 1 äî 32767 ÊÁ.\0" 1685 "Âàø îáë³êîâèé çàïèñ íå ìàº äîçâîëó íà âèêîðèñòàííÿ öüîãî ï³äêëþ÷åííÿ. Çâè÷àéíî ïðè÷èíîþ öüîãî áóâàº âõ³ä ç îáë³êîâèì çàïèñîì ãîñòÿ.\0" Modified: branches/cmake-bringup/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -419,27 +419,27 @@ 1064 "Die Systemsteuerungsoption Telefon- und Modemoptionen konnte nicht geöffnet werden. Der Telefoniedienst konnte eventuell nicht gestartet werden." 1065 "Anbieter entfernen" 15800 "23" - 15801 "0,\"Keine (Direktwahl)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T-Direktwahl via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI-Direktwahl via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US-Sprint-Direktwahl via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Callingcard via 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" - 15815 "14,\"Mercury (Vereinigtes Königreich)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (Vereinigtes Königreich)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (Neuseeland)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom Neuseeland\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Global Card (Taiwan nach USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) via 1818 (Sprache)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) via 1818 (Fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""Keine (Direktwahl)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T-Direktwahl via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI-Direktwahl via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US-Sprint-Direktwahl via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Callingcard via 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (Vereinigtes Königreich)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (Vereinigtes Königreich)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (Neuseeland)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom Neuseeland"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Taiwan nach USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (Sprache)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (Fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: branches/cmake-bringup/dll/win32/tapiui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/lang/en-US.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -420,27 +420,27 @@ 1064 "Phone And Modem control panel can not be opened. You may have a problem starting telephony service." 1065 "Remove Provider" 15800 "23" - 15801 "0,\"None (Direct Dial)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T Direct Dial via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI Direct Dial via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US Sprint Direct Dial via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Calling Card via 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" - 15815 "14,\"Mercury (UK)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (UK)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (New Zealand)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom New Zealand\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Global Card (Taiwan to USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) via 1818 (voice)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) via 1818 (fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T Direct Dial via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI Direct Dial via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint Direct Dial via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Calling Card via 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (New Zealand)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Taiwan to USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: branches/cmake-bringup/dll/win32/tapiui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/lang/no-NO.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -420,27 +420,27 @@ 1064 "Telefon og Modem Kontrollpanel kan ikke bli åpnet. Du kan ha et problem med å starte telefoni tjeneste." 1065 "Fjern produsent" 15800 "23" - 15801 "0,\"None (Direct Dial)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T Direct Dial via 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T via 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T via 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI Direct Dial via 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI via 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI via 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI via 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI via 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US Sprint Direct Dial via 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint via 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint via 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Calling Card via 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" - 15815 "14,\"Mercury (UK)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (UK)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (New Zealand)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom New Zealand\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Global Card (Taiwan to USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) via 1818 (voice)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) via 1818 (fax)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) via 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) via 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T Direct Dial via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI Direct Dial via 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI via 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI via 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI via 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI via 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint Direct Dial via 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint via 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint via 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Calling Card via 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (New Zealand)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Taiwan to USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) via 1818 (voice)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) via 1818 (fax)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) via 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) via 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: branches/cmake-bringup/dll/win32/tapiui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -427,27 +427,27 @@ 1064 "Aplet Telefon i Modem w Panelu Sterowania nie mo¿e byæ otwarty. Mo¿esz mieæ problem z uruchomieniem us³ugi Telefon." 1065 "Usuñ Providera" 15800 "23" - 15801 "0,\"Brak (wybiernie bezporednie)\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"AT&T wybieranie bezporednie przez 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T przez 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T przez 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"MCI wybieranie bezporednie przez 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI przez 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI przez 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI przez 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI przez 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"US Sprint wybieranie bezporednie przez 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint przez 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint przez 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Karta Telefoniczna przez 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Karta France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" - 15815 "14,\"Mercury (UK)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (UK)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (New Zealand)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom New Zealand\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Karta Global (Taiwan do USA)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Australia) przez 1818 (g³os)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Australia) przez 1818 (faks)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Australia) przez 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Australia) przez 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""Brak (wybiernie bezporednie)"","""","""","""","""","""","""","""","""",1" + 15802 "1,""AT&T wybieranie bezporednie przez 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T przez 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T przez 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""MCI wybieranie bezporednie przez 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI przez 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI przez 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI przez 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI przez 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""US Sprint wybieranie bezporednie przez 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint przez 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint przez 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Karta Telefoniczna przez 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Karta France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (New Zealand)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Karta Global (Taiwan do USA)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Australia) przez 1818 (g³os)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Australia) przez 1818 (faks)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Australia) przez 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Australia) przez 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: branches/cmake-bringup/dll/win32/tapiui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -420,27 +420,27 @@ 1064 "Íå óäàëîñü îòêðûòü ïàíåëü óïðàâëåíèÿ òåëåôîíîì è ìîäåìîì. Âîçìîæíû ïðîáëåìû ñ çàïóñêîì ïðèëîæåíèÿ." 1065 "Óäàëåííûé ïîñòàâùèê" 15800 "23" - 15801 "0,\"Íå èñïîëüçóåòñÿ\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"Ïðÿìîé êàíàë AT&T ÷åðåç 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T ÷åðåç 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T ÷åðåç 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"Ïðÿìîé êàíàë MCI ÷åðåç 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI ÷åðåç 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI ÷åðåç 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI ÷åðåç 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI ÷åðåç 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"Ïðÿìîé êàíàë US Sprint ÷åðåç 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint ÷åðåç 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint ÷åðåç 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Òåëåôîííàÿ êàðòî÷êà ÷åðåç 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" - 15815 "14,\"Mercury (UK)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (UK)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (Íîâàÿ Çåëàíäèÿ)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom New Zealand\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Global Card (Òàéâàíü - ÑØÀ)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ãîëîñîì)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ôàêñ)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Àâñòðàëèÿ) ÷åðåç 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Àâñòðàëèÿ) ÷åðåç 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""Íå èñïîëüçóåòñÿ"","""","""","""","""","""","""","""","""",1" + 15802 "1,""Ïðÿìîé êàíàë AT&T ÷åðåç 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T ÷åðåç 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T ÷åðåç 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""Ïðÿìîé êàíàë MCI ÷åðåç 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI ÷åðåç 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI ÷åðåç 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI ÷åðåç 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI ÷åðåç 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""Ïðÿìîé êàíàë US Sprint ÷åðåç 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint ÷åðåç 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint ÷åðåç 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Òåëåôîííàÿ êàðòî÷êà ÷åðåç 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (UK)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (UK)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (Íîâàÿ Çåëàíäèÿ)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom New Zealand"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Òàéâàíü - ÑØÀ)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ãîëîñîì)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Àâñòðàëèÿ) ÷åðåç 1818 (ôàêñ)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Àâñòðàëèÿ) ÷åðåç 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Àâñòðàëèÿ) ÷åðåç 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END Modified: branches/cmake-bringup/dll/win32/tapiui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/lang/uk-UA.rc [iso-8859-1] Sun Oct 10 19:31:41 2010 @@ -428,27 +428,27 @@ 1064 "Íå âäàëîñÿ â³äêðèòè ïàíåëü êåðóâàííÿ òåëåôîíîì ³ ìîäåìîì. Ìîæëèâ³ íåïîëàäêè ï³ä ÷àñ çàïóñêó òåëåôîííî¿ ñëóæáè." 1065 "Âèäàëèòè ïîñòà÷àëüíèêà" 15800 "23" - 15801 "0,\"Íå âèêîðèñòîâóºòüñÿ\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",1" - 15802 "1,\"Ïðÿìèé êàíàë AT&T ÷åðåç 1010ATT1\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010288\",\"1010288\",1" - 15803 "2,\"AT&T ÷åðåç 1010ATT0\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010288\",\"1010288\",1" - 15804 "3,\"AT&T ÷åðåç 1-800-321-0288\",\"\",\"G\",\"J$TFG$TH\",\"J$T01EFG$TH\",\"\",\"\",\"18003210288\",\"18003210288\",1" - 15805 "4,\"Ïðÿìèé êàíàë MCI ÷åðåç 10102221\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010222\",\"1010222\",1" - 15806 "5,\"MCI ÷åðåç 10102220\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010222\",\"1010222\",1" - 15807 "6,\"MCI ÷åðåç 1-800-888-8000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18008888000\",\"18008888000\",1" - 15808 "7,\"MCI ÷åðåç 1-800-674-0700\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006740700\",\"18006740700\",1" - 15809 "8,\"MCI ÷åðåç 1-800-674-7000\",\"\",\"G\",\"J,,,,,,TH,,FG\",\"J,,,,,,TH,,011EFG\",\"\",\"\",\"18006747000\",\"18006747000\",1" - 15810 "9,\"Ïðÿìèé êàíàë US Sprint ÷åðåç 10103331\",\"\",\"G\",\"J1FG\",\"J011EFG\",\"\",\"\",\"1010333\",\"1010333\",1" - 15811 "10,\"US Sprint ÷åðåç 10103330\",\"\",\"G\",\"J0FG$TH\",\"J01EFG$TH\",\"\",\"\",\"1010333\",\"1010333\",1" - 15812 "11,\"US Sprint ÷åðåç 1-800-877-8000\",\"\",\"G\",\"J,,,T0FG,,H\",\"J,,,T01EFG#,H\",\"\",\"\",\"18008778000\",\"18008778000\",1" - 15813 "12,\"Òåëåôîííà êàðòêà ÷åðåç 0\",\"\",\"G\",\"0FG$TH\",\"01EFG$TH\",\"\",\"\",\"\",\"\",1" - 15814 "13,\"Carte France Telecom\",\"\",\"T3010,H,0FG#\",\"T3010,H,0FG#\",\"T3010,H,00EFG#\",\"\",\"\",\"\",\"\",1" - 15815 "14,\"Mercury (Âåëèêîáðèòàí³ÿ)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,0FG\",\"\",\"0500800800\",\"0500800800\",\"0500800800\",1" - 15816 "15,\"British Telecom (Âåëèêîáðèòàí³ÿ)\",\"\",\"J$H,0FG\",\"J$H,0FG\",\"J$H,00EFG\",\"\",\"144\",\"144\".\"144\",1" - 15817 "16,\"CLEAR Communications (Íîâà Çåëàíä³ÿ)\",\"\",\"J$TH,0FG\",\"J$TH,0FG\",\"J$TH,00EFG\",\"\",\"0502333\",\"0502333\",\"0502333\",1" - 15818 "17,\"Telecom (Íîâà Çåëàíä³ÿ)\",\"\",\"J,0FG?H\",\"J,0FG?H\",\"J,00EFG?H\",\"\",\"012\",\"012\",\"012\",1" - 15819 "18,\"Global Card (Òàéâàíü - ÑØÀ)\",\"\",\"G\",\"0FG\",\"J,102880$TFG$H\",\"\",\"\",\"\",\"0080\",1" - 15820 "19,\"Telstra (Àâñòðàë³ÿ) ÷åðåç 1818 (ãîëîñîì)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0011EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15821 "20,\"Telstra (Àâñòðàë³ÿ) ÷åðåç 1818 (ôàêñ)\",\"\",\"J$TH,FG#\",\"J$TH,FG#\",\"J$TH,0015EFG#\",\"\",\"1818\",\"1818\",\"1818\",1" - 15822 "21,\"Optus (Àâñòðàë³ÿ) ÷åðåç 1812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"1812\",1" - 15823 "22,\"Optus (Àâñòðàë³ÿ) ÷åðåç 008551812\",\"\",\"FG\",\"FG\",\"J@TH,0011EFG\",\"\",\"\",\"\",\"008551812\",1" -END + 15801 "0,""Íå âèêîðèñòîâóºòüñÿ"","""","""","""","""","""","""","""","""",1" + 15802 "1,""Ïðÿìèé êàíàë AT&T ÷åðåç 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" + 15803 "2,""AT&T ÷åðåç 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" + 15804 "3,""AT&T ÷åðåç 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1" + 15805 "4,""Ïðÿìèé êàíàë MCI ÷åðåç 10102221"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010222"",""1010222"",1" + 15806 "5,""MCI ÷åðåç 10102220"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010222"",""1010222"",1" + 15807 "6,""MCI ÷åðåç 1-800-888-8000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18008888000"",""18008888000"",1" + 15808 "7,""MCI ÷åðåç 1-800-674-0700"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006740700"",""18006740700"",1" + 15809 "8,""MCI ÷åðåç 1-800-674-7000"","""",""G"",""J,,,,,,TH,,FG"",""J,,,,,,TH,,011EFG"","""","""",""18006747000"",""18006747000"",1" + 15810 "9,""Ïðÿìèé êàíàë US Sprint ÷åðåç 10103331"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010333"",""1010333"",1" + 15811 "10,""US Sprint ÷åðåç 10103330"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010333"",""1010333"",1" + 15812 "11,""US Sprint ÷åðåç 1-800-877-8000"","""",""G"",""J,,,T0FG,,H"",""J,,,T01EFG#,H"","""","""",""18008778000"",""18008778000"",1" + 15813 "12,""Òåëåôîííà êàðòêà ÷åðåç 0"","""",""G"",""0FG$TH"",""01EFG$TH"","""","""","""","""",1" + 15814 "13,""Carte France Telecom"","""",""T3010,H,0FG#"",""T3010,H,0FG#"",""T3010,H,00EFG#"","""","""","""","""",1" + 15815 "14,""Mercury (Âåëèêîáðèòàí³ÿ)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,0FG"","""",""0500800800"",""0500800800"",""0500800800"",1" + 15816 "15,""British Telecom (Âåëèêîáðèòàí³ÿ)"","""",""J$H,0FG"",""J$H,0FG"",""J$H,00EFG"","""",""144"",""144"".""144"",1" + 15817 "16,""CLEAR Communications (Íîâà Çåëàíä³ÿ)"","""",""J$TH,0FG"",""J$TH,0FG"",""J$TH,00EFG"","""",""0502333"",""0502333"",""0502333"",1" + 15818 "17,""Telecom (Íîâà Çåëàíä³ÿ)"","""",""J,0FG?H"",""J,0FG?H"",""J,00EFG?H"","""",""012"",""012"",""012"",1" + 15819 "18,""Global Card (Òàéâàíü - ÑØÀ)"","""",""G"",""0FG"",""J,102880$TFG$H"","""","""","""",""0080"",1" + 15820 "19,""Telstra (Àâñòðàë³ÿ) ÷åðåç 1818 (ãîëîñîì)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0011EFG#"","""",""1818"",""1818"",""1818"",1" + 15821 "20,""Telstra (Àâñòðàë³ÿ) ÷åðåç 1818 (ôàêñ)"","""",""J$TH,FG#"",""J$TH,FG#"",""J$TH,0015EFG#"","""",""1818"",""1818"",""1818"",1" + 15822 "21,""Optus (Àâñòðàë³ÿ) ÷åðåç 1812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""1812"",1" + 15823 "22,""Optus (Àâñòðàë³ÿ) ÷åðåç 008551812"","""",""FG"",""FG"",""J@TH,0011EFG"","""","""","""",""008551812"",1" +END

1 0

[tkreuzer] 49100: [CMAKE] MSVC: Don't use the debug version of msvcrt
by tkreuzer＠svn.reactos.org 10 Oct '10

10 Oct '10

Author: tkreuzer Date: Sun Oct 10 16:27:01 2010 New Revision: 49100 URL: http://svn.reactos.org/svn/reactos?rev=49100&view=rev Log: [CMAKE] MSVC: Don't use the debug version of msvcrt Modified: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Modules/Pla… ============================================================================== --- branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Modules/Platform/Windows-cl.cmake [iso-8859-1] Sun Oct 10 16:27:01 2010 @@ -209,7 +209,7 @@ IF($ENV{DDKBUILDENV} OR (NOT CMAKE_CROSSCOMPILING)) SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") + SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MD /Zi /Ob0 /Od") ELSE() SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1") SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od /RTC1")

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs