Sync with trunk r43123
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Wed, 23 Sep 2009 21:01:57 +0000 (21:01 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Wed, 23 Sep 2009 21:01:57 +0000 (21:01 +0000)
svn path=/branches/ros-amd64-bringup/; revision=43125

414 files changed:
reactos/base/applications/cacls/cacls.c
reactos/base/applications/calc/lang/sk-SK.rc
reactos/base/applications/games/solitaire/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/games/solitaire/rsrc.rc
reactos/base/applications/kbswitch/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/kbswitch/rsrc.rc
reactos/base/applications/mplay32/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/mplay32/rsrc.rc
reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/mscutils/devmgmt/rsrc.rc
reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/mscutils/eventvwr/rsrc.rc
reactos/base/applications/mscutils/servman/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/mscutils/servman/rsrc.rc
reactos/base/applications/notepad/dialog.c
reactos/base/applications/paint/lang/en-GB.rc
reactos/base/applications/paint/lang/es-ES.rc
reactos/base/applications/paint/lang/eu-ES.rc [new file with mode: 0644]
reactos/base/applications/paint/rsrc.rc
reactos/base/applications/rapps/available.c
reactos/base/applications/rapps/installed.c
reactos/base/applications/rapps/lang/bg-BG.rc
reactos/base/applications/rapps/lang/de-DE.rc
reactos/base/applications/rapps/lang/en-US.rc
reactos/base/applications/rapps/lang/es-ES.rc [new file with mode: 0644]
reactos/base/applications/rapps/lang/ja-JP.rc
reactos/base/applications/rapps/lang/no-NO.rc
reactos/base/applications/rapps/lang/pl-PL.rc
reactos/base/applications/rapps/lang/ru-RU.rc
reactos/base/applications/rapps/lang/sk-SK.rc
reactos/base/applications/rapps/lang/uk-UA.rc
reactos/base/applications/rapps/loaddlg.c
reactos/base/applications/rapps/misc.c
reactos/base/applications/rapps/rapps.h
reactos/base/applications/rapps/rapps.rbuild
reactos/base/applications/rapps/rapps.rc
reactos/base/applications/rapps/rappsmsg.mc [new file with mode: 0644]
reactos/base/applications/rapps/resource.h
reactos/base/applications/rapps/rsrc.rc
reactos/base/applications/rapps/settingsdlg.c
reactos/base/applications/rapps/toolbar.c
reactos/base/applications/rapps/winmain.c
reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/screensavers/3dtext/rsrc.rc
reactos/base/applications/screensavers/logon/lang/ja-JP.rc [new file with mode: 0644]
reactos/base/applications/screensavers/logon/logon.rc
reactos/base/applications/taskmgr/lang/ja-JP.rc
reactos/base/applications/taskmgr/lang/ko-KR.rc
reactos/base/applications/taskmgr/procpage.c
reactos/base/applications/taskmgr/rsrc.rc
reactos/base/services/dhcp/adapter.c
reactos/base/services/dhcp/dhclient.c
reactos/base/services/dhcp/dispatch.c
reactos/base/services/dhcp/include/dhcpd.h
reactos/base/services/dhcp/include/rosdhcp.h
reactos/base/services/dhcp/options.c
reactos/base/services/eventlog/file.c
reactos/base/setup/usetup/lang/en-US.h
reactos/base/setup/usetup/lang/es-ES.h
reactos/base/shell/cmd/cmd.rc
reactos/base/shell/cmd/lang/de-DE.rc
reactos/base/shell/cmd/lang/el-GR.rc
reactos/base/shell/cmd/lang/en-US.rc
reactos/base/shell/cmd/lang/es-ES.rc
reactos/base/shell/cmd/lang/fr-FR.rc
reactos/base/shell/cmd/lang/hu-HU.rc
reactos/base/shell/cmd/lang/id-ID.rc
reactos/base/shell/cmd/lang/it-IT.rc
reactos/base/shell/cmd/lang/ja-JP.rc
reactos/base/shell/cmd/lang/no-NO.rc
reactos/base/shell/cmd/lang/pl-PL.rc
reactos/base/shell/cmd/lang/ru-RU.rc
reactos/base/shell/cmd/lang/sk-SK.rc
reactos/base/shell/cmd/lang/uk-UA.rc
reactos/base/shell/cmd/rsrc.rc [new file with mode: 0644]
reactos/base/shell/explorer-new/lang/bg-BG.rc
reactos/base/shell/explorer-new/lang/de-DE.rc
reactos/base/shell/explorer-new/lang/es-ES.rc
reactos/base/shell/explorer-new/lang/fr-FR.rc
reactos/base/shell/explorer-new/lang/it-IT.rc
reactos/base/shell/explorer-new/lang/ko-KR.rc
reactos/base/shell/explorer-new/lang/lt-LT.rc
reactos/base/shell/explorer-new/lang/nl-NL.rc
reactos/base/shell/explorer-new/lang/no-NO.rc
reactos/base/shell/explorer-new/lang/pl-PL.rc
reactos/base/shell/explorer-new/lang/ro-RO.rc
reactos/base/shell/explorer-new/lang/ru-RU.rc
reactos/base/shell/explorer-new/lang/sk-SK.rc
reactos/base/shell/explorer-new/lang/uk-UA.rc
reactos/boot/freeldr/freeldr/arch/amd64/loader.c
reactos/boot/freeldr/freeldr/arch/arm/macharm.c
reactos/boot/freeldr/freeldr/arch/i386/hardware.c
reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
reactos/boot/freeldr/freeldr/arch/i386/loader.c
reactos/boot/freeldr/freeldr/arch/i386/machpc.c
reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c
reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c
reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
reactos/boot/freeldr/freeldr/disk/ramdisk.c
reactos/boot/freeldr/freeldr/fs/ext2.c
reactos/boot/freeldr/freeldr/fs/fat.c
reactos/boot/freeldr/freeldr/fs/fs.c
reactos/boot/freeldr/freeldr/fs/ntfs.c
reactos/boot/freeldr/freeldr/include/debug.h
reactos/boot/freeldr/freeldr/include/freeldr.h
reactos/boot/freeldr/freeldr/include/fs.h
reactos/boot/freeldr/freeldr/include/fs/ntfs.h
reactos/boot/freeldr/freeldr/include/machine.h
reactos/boot/freeldr/freeldr/linuxboot.c
reactos/boot/freeldr/freeldr/machine.c
reactos/boot/freeldr/freeldr/miscboot.c
reactos/boot/freeldr/freeldr/reactos/reactos.c
reactos/boot/freeldr/freeldr/windows/wlmemory.c
reactos/dll/3rdparty/libjpeg/libjpeg.rbuild
reactos/dll/cpl/appwiz/createlink.c
reactos/dll/cpl/desk/lang/ja-JP.rc
reactos/dll/cpl/intl/numbers.c
reactos/dll/cpl/main/lang/en-US.rc
reactos/dll/cpl/main/lang/es-ES.rc
reactos/dll/cpl/mmsys/lang/es-ES.rc
reactos/dll/cpl/mmsys/sounds.c
reactos/dll/cpl/powercfg/lang/ja-JP.rc [new file with mode: 0644]
reactos/dll/cpl/powercfg/rsrc.rc
reactos/dll/cpl/sysdm/hardprof.c
reactos/dll/cpl/telephon/lang/ja-JP.rc [new file with mode: 0644]
reactos/dll/cpl/telephon/rsrc.rc
reactos/dll/cpl/timedate/lang/eu-ES.rc [new file with mode: 0644]
reactos/dll/cpl/timedate/lang/ja-JP.rc
reactos/dll/cpl/timedate/rsrc.rc
reactos/dll/ntdll/def/ntdll_i386.def
reactos/dll/ntdll/ldr/startup.c
reactos/dll/ntdll/rtl/libsupp.c
reactos/dll/win32/advapi32/sec/misc.c
reactos/dll/win32/iphlpapi/ifenum.h
reactos/dll/win32/iphlpapi/ifenum_reactos.c
reactos/dll/win32/iphlpapi/ipstats_reactos.c
reactos/dll/win32/kernel32/misc/icustubs.cpp
reactos/dll/win32/msgina/lang/ja-JP.rc [new file with mode: 0644]
reactos/dll/win32/msgina/msgina.rc
reactos/dll/win32/netid/lang/bg-BG.rc
reactos/dll/win32/netid/lang/cs-CZ.rc
reactos/dll/win32/netid/lang/de-DE.rc
reactos/dll/win32/netid/lang/el-GR.rc
reactos/dll/win32/netid/lang/en-US.rc
reactos/dll/win32/netid/lang/es-ES.rc
reactos/dll/win32/netid/lang/fr-FR.rc
reactos/dll/win32/netid/lang/id-ID.rc
reactos/dll/win32/netid/lang/it-IT.rc
reactos/dll/win32/netid/lang/ja-JP.rc [new file with mode: 0644]
reactos/dll/win32/netid/lang/nl-NL.rc
reactos/dll/win32/netid/lang/no-NO.rc
reactos/dll/win32/netid/lang/pl-PL.rc
reactos/dll/win32/netid/lang/ru-RU.rc
reactos/dll/win32/netid/lang/sk-SK.rc
reactos/dll/win32/netid/lang/uk-UA.rc
reactos/dll/win32/netid/netid.c
reactos/dll/win32/netid/rsrc.rc
reactos/dll/win32/netshell/lang/es-ES.rc
reactos/dll/win32/netshell/shfldr_netconnect.c
reactos/dll/win32/newdev/lang/ja-JP.rc [new file with mode: 0644]
reactos/dll/win32/newdev/rsrc.rc
reactos/dll/win32/shell32/control.c
reactos/dll/win32/shell32/lang/bg-BG.rc
reactos/dll/win32/shell32/lang/ca-ES.rc
reactos/dll/win32/shell32/lang/cs-CZ.rc
reactos/dll/win32/shell32/lang/da-DK.rc
reactos/dll/win32/shell32/lang/de-DE.rc
reactos/dll/win32/shell32/lang/el-GR.rc
reactos/dll/win32/shell32/lang/en-GB.rc
reactos/dll/win32/shell32/lang/en-US.rc
reactos/dll/win32/shell32/lang/es-ES.rc
reactos/dll/win32/shell32/lang/fi-FI.rc
reactos/dll/win32/shell32/lang/fr-FR.rc
reactos/dll/win32/shell32/lang/hu-HU.rc
reactos/dll/win32/shell32/lang/it-IT.rc
reactos/dll/win32/shell32/lang/ja-JP.rc
reactos/dll/win32/shell32/lang/ko-KR.rc
reactos/dll/win32/shell32/lang/nl-NL.rc
reactos/dll/win32/shell32/lang/no-NO.rc
reactos/dll/win32/shell32/lang/pl-PL.rc
reactos/dll/win32/shell32/lang/pt-BR.rc
reactos/dll/win32/shell32/lang/pt-PT.rc
reactos/dll/win32/shell32/lang/ru-RU.rc
reactos/dll/win32/shell32/lang/sk-SK.rc
reactos/dll/win32/shell32/lang/sl-SI.rc
reactos/dll/win32/shell32/lang/sv-SE.rc
reactos/dll/win32/shell32/lang/tr-TR.rc
reactos/dll/win32/shell32/lang/uk-UA.rc
reactos/dll/win32/shell32/lang/zh-CN.rc
reactos/dll/win32/shell32/lang/zh-TW.rc
reactos/dll/win32/shell32/pidl.c
reactos/dll/win32/shell32/pidl.h
reactos/dll/win32/shell32/precomp.h
reactos/dll/win32/shell32/regsvr.c
reactos/dll/win32/shell32/shell32_main.h
reactos/dll/win32/shell32/shellole.c
reactos/dll/win32/shell32/shfldr_cpanel.c
reactos/dll/win32/shell32/shfldr_desktop.c
reactos/dll/win32/shell32/shfldr_fs.c
reactos/dll/win32/shell32/shfldr_printers.c
reactos/dll/win32/shell32/shresdef.h
reactos/dll/win32/shell32/shv_def_cmenu.c
reactos/dll/win32/shell32/startmenu.c
reactos/dll/win32/shell32/undocshell.h
reactos/dll/win32/syssetup/lang/es-ES.rc
reactos/dll/win32/syssetup/lang/ja-JP.rc
reactos/dll/win32/user32/controls/edit.c
reactos/dll/win32/user32/controls/regcontrol.c
reactos/dll/win32/user32/controls/scrollbar.c
reactos/dll/win32/user32/include/ntwrapper.h
reactos/dll/win32/user32/include/regcontrol.h
reactos/dll/win32/user32/include/user32.h
reactos/dll/win32/user32/include/user32p.h
reactos/dll/win32/user32/include/window.h
reactos/dll/win32/user32/misc/desktop.c
reactos/dll/win32/user32/misc/dllmain.c
reactos/dll/win32/user32/misc/stubs.c
reactos/dll/win32/user32/misc/usrapihk.c [new file with mode: 0644]
reactos/dll/win32/user32/misc/winsta.c
reactos/dll/win32/user32/user32.pspec
reactos/dll/win32/user32/user32.rbuild
reactos/dll/win32/user32/windows/class.c
reactos/dll/win32/user32/windows/defwnd.c
reactos/dll/win32/user32/windows/draw.c
reactos/dll/win32/user32/windows/menu.c
reactos/dll/win32/user32/windows/message.c
reactos/dll/win32/user32/windows/nonclient.c
reactos/dll/win32/user32/windows/paint.c
reactos/dll/win32/user32/windows/window.c
reactos/dll/win32/userenv/lang/es-ES.rc
reactos/dll/win32/userenv/setup.c
reactos/dll/win32/ws2_32/misc/dllmain.c
reactos/dll/win32/ws2_32/misc/stubs.c
reactos/dll/win32/ws2_32/ws2_32.spec
reactos/dll/win32/ws2_32_new/inc/ws2_32p.h
reactos/dll/win32/ws2_32_new/src/dllmain.c
reactos/dll/win32/ws2_32_new/src/dthread.c
reactos/dll/win32/ws2_32_new/src/select.c
reactos/dll/win32/ws2_32_new/src/wsautil.c
reactos/drivers/ksfilter/ks/allocators.c
reactos/drivers/ksfilter/ks/api.c
reactos/drivers/ksfilter/ks/connectivity.c
reactos/drivers/ksfilter/ks/device.c
reactos/drivers/ksfilter/ks/event.c
reactos/drivers/ksfilter/ks/filter.c
reactos/drivers/ksfilter/ks/irp.c
reactos/drivers/ksfilter/ks/misc.c
reactos/drivers/ksfilter/ks/pin.c
reactos/drivers/ksfilter/ks/property.c
reactos/drivers/ksfilter/ks/topology.c
reactos/drivers/ksfilter/ks/worker.c
reactos/drivers/network/afd/afd/tdi.c
reactos/drivers/network/ndis/include/miniport.h
reactos/drivers/network/ndis/ndis/config.c
reactos/drivers/network/tcpip/datalink/lan.c
reactos/drivers/network/tcpip/include/dispatch.h
reactos/drivers/network/tcpip/include/neighbor.h
reactos/drivers/network/tcpip/include/receive.h
reactos/drivers/network/tcpip/tcpip/dispatch.c
reactos/drivers/storage/ide/uniata/id_probe.cpp
reactos/drivers/usb/nt4compat/usbdriver/ehci.c
reactos/drivers/wdm/audio/backpln/portcls/ResourceList.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/adapter.c with 63% similarity]
reactos/drivers/wdm/audio/backpln/portcls/api.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/api.c with 89% similarity]
reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/connection.c with 65% similarity]
reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/dispatcher.c with 56% similarity]
reactos/drivers/wdm/audio/backpln/portcls/dll.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/dll.c with 66% similarity]
reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/drm.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/drm.c with 75% similarity]
reactos/drivers/wdm/audio/backpln/portcls/drm_port.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/guids.c with 90% similarity]
reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/irp.c with 75% similarity]
reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/miniport.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/miniport.c with 64% similarity]
reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c with 91% similarity]
reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/pool.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/pool.c with 86% similarity]
reactos/drivers/wdm/audio/backpln/portcls/port.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/port.c with 70% similarity]
reactos/drivers/wdm/audio/backpln/portcls/port.hpp [moved from reactos/drivers/wdm/audio/backpln/portcls/port.h with 100% similarity]
reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/port_factory.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/port_factory.c with 100% similarity]
reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/port_wavert.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.c with 53% similarity]
reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
reactos/drivers/wdm/audio/backpln/portcls/power.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/power.c with 87% similarity]
reactos/drivers/wdm/audio/backpln/portcls/private.hpp [moved from reactos/drivers/wdm/audio/backpln/portcls/private.h with 90% similarity]
reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c with 87% similarity]
reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/registry.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/resource.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/service_group.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/undoc.c with 80% similarity]
reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [moved from reactos/drivers/wdm/audio/backpln/portcls/unregister.c with 51% similarity]
reactos/drivers/wdm/audio/backpln/portcls/version.c [deleted file]
reactos/drivers/wdm/audio/backpln/portcls/version.cpp [new file with mode: 0644]
reactos/drivers/wdm/audio/backpln/stdunk/stdunk.c [deleted file]
reactos/drivers/wdm/audio/backpln/stdunk/stdunk.cpp [deleted file]
reactos/drivers/wdm/audio/legacy/wdmaud/control.c
reactos/drivers/wdm/audio/sysaudio/control.c
reactos/drivers/wdm/audio/sysaudio/pin.c
reactos/drivers/wdm/audio/sysaudio/sysaudio.h
reactos/hal/halx86/generic/bios.c
reactos/hal/halx86/generic/timer.c
reactos/hal/halx86/mp/apic.c
reactos/hal/halx86/mp/mpsirql.c
reactos/include/crt/_mingw.h
reactos/include/crt/float.h
reactos/include/crt/setjmp.h
reactos/include/ddk/dmusicks.h
reactos/include/ddk/kcom.h
reactos/include/ddk/portcls.h
reactos/include/ndk/rtlfuncs.h
reactos/include/psdk/ks.h
reactos/include/reactos/chew/chew.h
reactos/include/reactos/mingw-w64/sect_attribs.h
reactos/include/reactos/win32k/ntuser.h
reactos/lib/3rdparty/mingw/crtexe.c
reactos/lib/drivers/chew/workqueue.c
reactos/lib/drivers/ip/network/arp.c
reactos/lib/drivers/ip/network/ip.c
reactos/lib/drivers/ip/network/neighbor.c
reactos/lib/drivers/ip/network/receive.c
reactos/lib/drivers/ip/network/router.c
reactos/lib/drivers/ip/transport/tcp/tcp.c
reactos/lib/inflib/infcore.c
reactos/lib/inflib/infget.c
reactos/lib/inflib/infpriv.h
reactos/lib/inflib/infput.c
reactos/media/doc/README.WINE
reactos/ntoskrnl/config/i386/cmhardwr.c
reactos/ntoskrnl/include/internal/i386/intrin_i.h
reactos/ntoskrnl/include/internal/kd.h
reactos/ntoskrnl/include/internal/ke.h
reactos/ntoskrnl/kd/kdmain.c
reactos/ntoskrnl/kd/wrappers/gdbstub.c
reactos/ntoskrnl/kd64/kdlock.c
reactos/ntoskrnl/kdbg/i386/kdb_help.S
reactos/ntoskrnl/kdbg/kdb.c
reactos/ntoskrnl/kdbg/kdb.h
reactos/ntoskrnl/kdbg/kdb_cli.c
reactos/ntoskrnl/kdbg/kdb_expr.c
reactos/ntoskrnl/kdbg/kdb_keyboard.c
reactos/ntoskrnl/kdbg/kdb_serial.c
reactos/ntoskrnl/kdbg/kdb_symbols.c
reactos/ntoskrnl/ke/freeldr.c
reactos/ntoskrnl/ke/i386/cpu.c
reactos/ntoskrnl/ke/i386/irqobj.c
reactos/ntoskrnl/ke/i386/kiinit.c
reactos/ntoskrnl/mm/anonmem.c
reactos/ntoskrnl/ob/obname.c
reactos/subsystems/win32/csrss/win32csr/dllmain.c
reactos/subsystems/win32/win32k/include/class.h
reactos/subsystems/win32/win32k/include/win32.h
reactos/subsystems/win32/win32k/include/window.h
reactos/subsystems/win32/win32k/main/dllmain.c
reactos/subsystems/win32/win32k/ntuser/callback.c
reactos/subsystems/win32/win32k/ntuser/callproc.c
reactos/subsystems/win32/win32k/ntuser/class.c
reactos/subsystems/win32/win32k/ntuser/clipboard.c
reactos/subsystems/win32/win32k/ntuser/desktop.c
reactos/subsystems/win32/win32k/ntuser/hook.c
reactos/subsystems/win32/win32k/ntuser/message.c
reactos/subsystems/win32/win32k/ntuser/monitor.c
reactos/subsystems/win32/win32k/ntuser/msgqueue.c
reactos/subsystems/win32/win32k/ntuser/ntstubs.c
reactos/subsystems/win32/win32k/ntuser/painting.c
reactos/subsystems/win32/win32k/ntuser/scrollbar.c
reactos/subsystems/win32/win32k/ntuser/simplecall.c
reactos/subsystems/win32/win32k/ntuser/window.c
reactos/subsystems/win32/win32k/ntuser/winsta.c
reactos/subsystems/win32/win32k/objects/text.c
reactos/subsystems/win32/win32k/w32ksvc.db
reactos/tools/pefixup.c
reactos/tools/rbuild/backend/mingw/mingw.cpp
reactos/tools/rsym/log2lines.c

index 0327f7c..bc874ec 100644 (file)
@@ -529,7 +529,6 @@ _tmain(int argc, const TCHAR *argv[])
         WIN32_FIND_DATA FindData;
         HANDLE hFind;
         DWORD LastError;
-        BOOL ContinueAccessDenied = FALSE;
 
         if (argc > 2)
         {
@@ -572,8 +571,7 @@ _tmain(int argc, const TCHAR *argv[])
                         {
                             LastError = GetLastError();
 
-                            if (LastError == ERROR_ACCESS_DENIED &&
-                                ContinueAccessDenied)
+                            if (LastError == ERROR_ACCESS_DENIED)
                             {
                                 PrintErrorMessage(LastError);
                             }
index 78da4f1..8834ae7 100644 (file)
@@ -1,6 +1,6 @@
 /* TRANSLATOR :  Mário Kaèmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.:  30-01-2008
- * LAST CHANGE:  29-08-2009
+ * LAST CHANGE:  04-09-2009
  * ---------------------------------------
  * TODO:
  * 1. treba usporiada\9d jednotky pod¾a abecedy
@@ -445,30 +445,30 @@ BEGIN
     IDS_QUICKHELP           "Rýchla pomoc"
 END
 
-// types of conversion
+// Types of conversion
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CONV_TIME           "Èas"
-    IDS_CONV_LENGTH         "Då\9eka"
-    IDS_CONV_ENERGY         "Energia"
-    IDS_CONV_WEIGHT         "Hmotnos\9d"
-    IDS_CONV_CURRENCY       "Mena"
-    IDS_CONV_VOLUME         "Objem"
+    IDS_CONV_ANGLE          "Uhol"
     IDS_CONV_AREA           "Plocha"
-    IDS_CONV_VELOCITY       "Rýchlos\9d"
     IDS_CONV_CONSUMPTION    "Spotreba motorov" //Spotreba (motory)
-    IDS_CONV_TEMPERATURE    "Teplota"
-    IDS_CONV_PRESSURE       "Tlak"
-    IDS_CONV_ANGLE          "Uhol"
+    IDS_CONV_CURRENCY       "Mena"
+    IDS_CONV_ENERGY         "Energia"
+    IDS_CONV_LENGTH         "Då\9eka"
     IDS_CONV_POWER          "Výkon"
+    IDS_CONV_PRESSURE       "Tlak"
+    IDS_CONV_TEMPERATURE    "Teplota"
+    IDS_CONV_TIME           "Èas"
+    IDS_CONV_VELOCITY       "Rýchlos\9d"
+    IDS_CONV_VOLUME         "Objem"
+    IDS_CONV_WEIGHT         "Hmotnos\9d"
 END
 
 // TYPES OF ANGLES
 STRINGTABLE DISCARDABLE
 BEGIN
+    IDS_ANGLE_DEGREES  "Stupne"
     IDS_ANGLE_GRADIANS "Grady"
     IDS_ANGLE_RADIANS  "Radiány"
-    IDS_ANGLE_DEGREES  "Stupne"
 END
 
 // TYPES OF AREAS
@@ -522,21 +522,21 @@ END
 // TYPES OF CURRENCIES
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúzsky \9ailing"
+    IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúsky \9ailing"
     IDS_CURRENCY_BELGIAN_FRANC      "Belgický frank"
     IDS_CURRENCY_CYPRIOT_POUND      "Cyperská libra"
     IDS_CURRENCY_CZECH_KORUNA       "Èeská koruna"
     IDS_CURRENCY_DEUTSCHE_MARK      "Nemecká marka"
     IDS_CURRENCY_DUTCH_GUILDER      "Holandský gulden"
     IDS_CURRENCY_EURO               "Euro"
-    IDS_CURRENCY_FINNISH_MARKKA     "Finská marka"
+    IDS_CURRENCY_FINNISH_MARKKA     "Fínska marka"
     IDS_CURRENCY_FRENCH_FRANC       "Francúzsky frank"
     IDS_CURRENCY_GREEK_DRACHMA      "Grécka drachma"
-    IDS_CURRENCY_IRISH_POUND        "Irish pound"
-    IDS_CURRENCY_ITALIAN_LIRA       "Italian lira"
-    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxembourg franc"
-    IDS_CURRENCY_MALTESE_LIRA       "Maltese lira"
-    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portoguese escudo"
+    IDS_CURRENCY_IRISH_POUND        "Írska libra"
+    IDS_CURRENCY_ITALIAN_LIRA       "Talianská líra"
+    IDS_CURRENCY_LUXEMBOURG_FRANC   "Luxemburský frank"
+    IDS_CURRENCY_MALTESE_LIRA       "Maltská líra"
+    IDS_CURRENCY_PORTOGUESE_ESCUDO  "Portugalské escudo"
     IDS_CURRENCY_SLOVAK_KORUNA      "Slovenská koruna"
     IDS_CURRENCY_SLOVENIAN_TOLAR    "Slovinský toliar"
     IDS_CURRENCY_SPANISH_PESETA     "\8apanielska peseta"
@@ -652,8 +652,8 @@ BEGIN
     IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Minúty"
     IDS_TIME_SECONDS      "Sekundy"
-    IDS_TIME_YEARS        "Roky"
     IDS_TIME_WEEKS        "Tý\9edne"
+    IDS_TIME_YEARS        "Roky"
 END
 
 // TYPES OF VELOCITIES
diff --git a/reactos/base/applications/games/solitaire/lang/ja-JP.rc b/reactos/base/applications/games/solitaire/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..cc7abe8
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * PROJECT:     Solitaire
+ * LICENSE:     Freeware, permission to use under Public Domain
+ * FILE:        base/applications/games/solitaire/lang/en-US.rc
+ * PURPOSE:     Japanese Language File for Solitaire
+ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
+ */
+#include "resource.h"
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+
+/* Dialogs */
+
+IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+CAPTION "\83I\83v\83V\83\87\83\93"
+FONT 9, "MS UI Gothic"
+BEGIN
+    GROUPBOX        "\83J\81[\83h", -1, 7, 7, 65, 40
+    AUTORADIOBUTTON "1 \96\87\82¸\82Â\8eæ\82é(&O)", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "3 \96\87\82¸\82Â\8eæ\82é(&T)", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
+
+    AUTOCHECKBOX    "\8e\9e\8aÔ\82ð\95\\\8e¦\82·\82é(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "\83X\83e\81[\83^\83X\83o\81[\82ð\95\\\8e¦\82·\82é(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+
+    DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
+    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 101, 97, 50, 14
+END
+
+
+IDD_CARDBACK DIALOGEX 6, 6, 221, 96
+CAPTION "\83J\81[\83h\82Ì\94w\8ci\82ð\91I\91ð"
+FONT 9, "MS UI Gothic"
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
+BEGIN
+    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
+    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
+    DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
+    PUSHBUTTON    "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 162, 77, 54, 13
+END
+
+
+/* Strings */
+
+STRINGTABLE
+BEGIN
+    IDS_SOL_NAME    "\83\\\83\8a\83e\83B\83A"
+    IDS_SOL_ABOUT   "J Brown \82É\82æ\82é\83\\\83\8a\83e\83B\83A\n\nCardLib \83o\81[\83W\83\87\83\93 1.0\81B"
+    IDS_SOL_QUIT    "\8c»\8dÝ\82Ì\83Q\81[\83\80\82ð\8fI\97¹\82µ\82Ü\82·\82©?"
+    IDS_SOL_WIN     "\82¨\82ß\82Å\82Æ\82¤\81A\82 \82È\82½\82Ì\8f\9f\82¿\82Å\82·!"
+    IDS_SOL_DEAL    "\82à\82¤\88ê\93x\83J\81[\83h\82ð\94z\82è\82Ü\82·\82©?"
+END
+
+
+/* Menus */
+
+IDR_MENU1 MENU DISCARDABLE
+BEGIN
+    POPUP "\83Q\81[\83\80(&G)"
+    BEGIN
+        MENUITEM "\83J\81[\83h\82ð\94z\82é(&D)\tF2",        IDM_GAME_NEW
+        MENUITEM SEPARATOR
+        MENUITEM "\83J\81[\83h\82Ì\91\95\8fü(&C)...",         IDM_GAME_DECK
+        MENUITEM "\83I\83v\83V\83\87\83\93(&O)...",           IDM_GAME_OPTIONS
+        MENUITEM SEPARATOR
+        MENUITEM "\8fI\97¹(&E)",                    IDM_GAME_EXIT
+    END
+    POPUP "\83w\83\8b\83v(&H)"
+    BEGIN
+        MENUITEM "\96Ú\8e\9f(&C)\tF1",                IDM_HELP_CONTENTS
+        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&A)",          IDM_HELP_ABOUT
+    END
+END
+
+
+
+/* Accelerator */
+
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
+BEGIN
+    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
+    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
+END
index 1f525a1..a9447d0 100644 (file)
@@ -16,6 +16,7 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
diff --git a/reactos/base/applications/kbswitch/lang/ja-JP.rc b/reactos/base/applications/kbswitch/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..9ea7e4f
--- /dev/null
@@ -0,0 +1,11 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDR_POPUP MENU
+BEGIN
+    POPUP "popup"
+    BEGIN
+        MENUITEM "\90Ý\92è(&P)...",     ID_PREFERENCES
+        MENUITEM SEPARATOR
+        MENUITEM "\8fI\97¹(&E)",        ID_EXIT
+    END
+END
index c8ead28..8261fcc 100644 (file)
@@ -5,6 +5,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
diff --git a/reactos/base/applications/mplay32/lang/ja-JP.rc b/reactos/base/applications/mplay32/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..94f4a1d
--- /dev/null
@@ -0,0 +1,29 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDR_MAINMENU MENU
+BEGIN
+       POPUP "\83t\83@\83C\83\8b(&F)"
+       BEGIN
+               MENUITEM "\8aJ\82­(&O)...", IDM_OPEN_FILE
+               MENUITEM "\95Â\82\82é(&C)", IDM_CLOSE_FILE
+               MENUITEM SEPARATOR
+               MENUITEM "\8fI\97¹(&E)", IDM_EXIT
+       END
+       POPUP "\83w\83\8b\83v(&H)"
+       BEGIN
+               MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&A)...", IDM_ABOUT
+       END
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_ALL_TYPES_FILTER "\82·\82×\82Ä\82Ì\83T\83|\81[\83g\82³\82ê\82½\83t\83@\83C\83\8b (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
+       IDS_TOOLTIP_PLAY "\8dÄ\90¶"
+       IDS_TOOLTIP_STOP "\92â\8e~"
+       IDS_TOOLTIP_EJECT "\8eæ\82è\8fo\82µ"
+       IDS_TOOLTIP_BACKWARD "\8cã\82ë\82Ö\83X\83L\83b\83v"
+       IDS_TOOLTIP_SEEKBACK "\8cã\82ë\82Ö\83V\81[\83N"
+       IDS_TOOLTIP_SEEKFORW "\91O\82Ö\83V\81[\83N"
+       IDS_TOOLTIP_FORWARD "\91O\82Ö\83X\83L\83b\83v"
+       IDS_APPTITLE "ReactOS \83}\83\8b\83`\83\81\83f\83B\83\83v\83\8c\81[\83\84\81["
+END
index db2966d..3ca9862 100644 (file)
@@ -8,6 +8,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
diff --git a/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc b/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..cd4fd23
--- /dev/null
@@ -0,0 +1,82 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDR_MAINMENU MENU
+BEGIN
+  POPUP "\83t\83@\83C\83\8b(&F)"
+  BEGIN
+    MENUITEM "\8fI\97¹(&X)",                IDC_EXIT
+  END
+  POPUP "\91\80\8dì"
+  BEGIN
+    MENUITEM "\88ó\8dü",                    IDC_PRINT, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\83v\83\8d\83p\83e\83B",              IDC_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\83w\83\8b\83v",                  IDC_PROGHELP, GRAYED
+  END
+  POPUP "\95\\\8e¦"
+  BEGIN
+    MENUITEM "\83f\83o\83C\83X (\8eí\97Þ\95Ê)",       IDC_DEVBYTYPE, CHECKED
+    MENUITEM "\83f\83o\83C\83X (\90Ú\91±\95Ê)",       IDC_STATIC, GRAYED
+    MENUITEM "\83\8a\83\\\81[\83X (\8eí\97Þ\95Ê)",      IDC_STATIC, GRAYED
+    MENUITEM "\83\8a\83\\\81[\83X (\90Ú\91±\95Ê)",      IDC_STATIC, GRAYED
+  END
+  POPUP "\83w\83\8b\83v"
+  BEGIN
+    MENUITEM "\83w\83\8b\83v",                  IDC_PROGHELP
+    MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ",          IDC_ABOUT
+  END
+END
+
+IDR_POPUP MENU
+BEGIN
+  POPUP "popup"
+  BEGIN
+    MENUITEM "\83v\83\8d\83p\83e\83B",              IDC_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\83w\83\8b\83v",                  IDC_PROGHELP
+  END
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
+CAPTION "\83f\83o\83C\83\83}\83l\81[\83W\83\83\82É\82Â\82¢\82Ä"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT "\83f\83o\83C\83\83}\83l\81[\83W\83\83 v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
+  PUSHBUTTON "\95Â\82\82é", IDOK, 75, 162, 44, 15
+  ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_LICENSE "\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Í\83t\83\8a\81[\83\\\83t\83g\83E\83F\83A\82Å\82·\81B\82 \82È\82½\82Í\82±\82ê\82ð\81A\83t\83\8a\81[\83\\\83t\83g\83E\83F\83A\8dà\92c\82É\82æ\82Á\82Ä\94­\8ds\82³\82ê\82½ GNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91(\83o\81[\83W\83\87\83\932\82©\81A\8aó\96]\82É\82æ\82Á\82Ä\82Í\82»\82ê\88È\8d~\82Ì\83o\81[\83W\83\87\83\93\82Ì\82¤\82¿\82Ç\82ê\82©)\82Ì\92è\82ß\82é\8fð\8c\8f\82Ì\89º\82Å\8dÄ\94Ð\95z\82Ü\82½\82Í\89ü\95Ï\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82·\81B\r\n\r\n\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Í\97L\97p\82Å\82 \82é\82±\82Æ\82ð\8aè\82Á\82Ä\94z\95z\82³\82ê\82Ü\82·\82ª\81A*\91S\82­\82Ì\96³\95Û\8fØ* \82Å\82·\81B*\8f¤\8bÆ\89Â\94\\\90«\82Ì\95Û\8fØ*\82â*\93Á\92è\82Ì\96Ú\93I\82Ö\82Ì\93K\8d\87\90«*\82Í\81A\8c¾\8aO\82É\8e¦\82³\82ê\82½\82à\82Ì\82à\8aÜ\82ß\91S\82­\91\8dÝ\82µ\82Ü\82¹\82ñ\81B\8fÚ\82µ\82­\82ÍGNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91\82ð\82²\97\97\82­\82¾\82³\82¢\81B\r\n\r\n\82 \82È\82½\82Í\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Æ\8b¤\82É\81AGNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91\82Ì\95¡\90»\82ð\88ê\95\94\8eó\82¯\8eæ\82Á\82½\82Í\82¸\82Å\82·\81B\82à\82µ\8eó\82¯\8eæ\82Á\82Ä\82¢\82È\82¯\82ê\82Î\81A\83t\83\8a\81[\83\\\83t\83g\83E\83F\83A\8dà\92c\82Ü\82Å\90¿\8b\81\82µ\82Ä\82­\82¾\82³\82¢(\88\90æ\82Í the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)\81B"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_TOOLTIP_PROP      "\83v\83\8d\83p\83e\83B"
+  IDS_TOOLTIP_REFRESH   "\8dX\90V"
+  IDS_TOOLTIP_HELP      "\83w\83\8b\83v"
+  IDS_TOOLTIP_EXIT      "\8fI\97¹"
+END
+
+/* Hints */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_APPNAME "ReactOS \83f\83o\83C\83\83}\83l\81[\83W\83\83"
+  IDS_HINT_BLANK        " "
+  IDS_HINT_EXIT         " \82±\82Ì\83v\83\8d\83O\83\89\83\80\82ð\8fI\97¹\82µ\82Ü\82·\81B"
+  IDS_HINT_REFRESH      " \83T\81[\83r\83X\82Ì\83\8a\83X\83g\82ð\8dX\90V\82µ\82Ü\82·\81B"
+  IDS_HINT_PROP         " \8c»\8dÝ\91I\91ð\82³\82ê\82Ä\82¢\82é\83V\81[\83g\82Ì\83v\83\8d\83p\83e\83B\82ð\8aJ\82«\82Ü\82·\81B"
+  IDS_HINT_HELP         " \83w\83\8b\83\83E\83B\83\93\83h\83E\82ð\95\\\8e¦\82µ\82Ü\82·\81B"
+  IDS_HINT_ABOUT        " ReactOS \83f\83o\83C\83\83}\83l\81[\83W\83\83\82É\82Â\82¢\82Ä\95\\\8e¦\82µ\82Ü\82·\81B"
+
+  IDS_HINT_SYS_RESTORE  " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\92Ê\8fí\82Ì\91å\82«\82³\82É\95\9c\8c³\82µ\82Ü\82·\81B"
+  IDS_HINT_SYS_MOVE     " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\88Ú\93®\82µ\82Ü\82·\81B"
+  IDS_HINT_SYS_SIZE     " \82±\82Ì\83E\83B\83\93\83h\83E\82Ì\91å\82«\82³\82ð\95Ï\8dX\82µ\82Ü\82·\81B"
+  IDS_HINT_SYS_MINIMIZE " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\83A\83C\83R\83\93\82É\90Ü\82è\82½\82½\82Ý\82Ü\82·\81B"
+  IDS_HINT_SYS_MAXIMIZE " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\89æ\96Ê\82¢\82Á\82Ï\82¢\82É\8aJ\82«\82Ü\82·\81B"
+  IDS_HINT_SYS_CLOSE    " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\95Â\82\82Ü\82·\81B"
+END
index 5df66f9..83a50d1 100644 (file)
@@ -20,6 +20,7 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
index eb6d83a..3264949 100644 (file)
@@ -22,7 +22,7 @@ BEGIN
        BEGIN
                MENUITEM "&Refresh",                  IDM_REFRESH
        END
-       MENUITEM "&Options",                    ID_OPTIONS
+       MENUITEM "&Options",                          ID_OPTIONS
        POPUP "&Help"
        BEGIN
                MENUITEM "H&elp",                     IDM_HELP
diff --git a/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc b/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..7835f19
--- /dev/null
@@ -0,0 +1,104 @@
+/*
+ * PROJECT:     ReactOS Event Viewer
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/mscutils/eventvwr/lang/ja-JP.rc
+ * PURPOSE:     Japanese Language File for ReactOS Event Viewer
+ * TRANSLATORS: Tomoya Kitagawa
+ */
+
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDC_EVENTVWR MENU
+BEGIN
+       POPUP "\83\8d\83O(&L)"
+       BEGIN
+               MENUITEM "\83A\83v\83\8a\83P\81[\83V\83\87\83\93(&A)",      ID_LOG_APPLICATION
+               MENUITEM "\83Z\83L\83\85\83\8a\83e\83B(&S)",          ID_LOG_SECURITY
+               MENUITEM "\83V\83X\83e\83\80(&S)",              ID_LOG_SYSTEM
+               MENUITEM SEPARATOR
+               MENUITEM "\8fI\97¹(&X)",                  IDM_EXIT
+       END
+       POPUP "\95\\\8e¦(&V)"
+       BEGIN
+               MENUITEM "\8dX\90V(&R)",                  IDM_REFRESH
+       END
+       MENUITEM "\83I\83v\83V\83\87\83\93(&O)",                    ID_OPTIONS
+       POPUP "\83w\83\8b\83v(&H)"
+       BEGIN
+               MENUITEM "\83w\83\8b\83v(&E)",                IDM_HELP
+               MENUITEM SEPARATOR
+               MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&A)...",     IDM_ABOUT
+       END
+END
+
+IDC_EVENTVWR ACCELERATORS
+BEGIN
+       "?",            IDM_ABOUT,              ASCII,  ALT
+       "/",            IDM_ABOUT,              ASCII,  ALT
+END
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
+CAPTION "\83o\81[\83W\83\87\83\93\8fî\95ñ"
+FONT 9, "MS UI Gothic", 0, 0, 0x0
+BEGIN
+       ICON            IDI_EVENTVWR,IDC_MYICON,14,9,21,20
+       LTEXT           "ReactOS \83C\83x\83\93\83\83r\83\85\81[\83A Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+       LTEXT           "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,49,20,119,22
+       DEFPUSHBUTTON   "OK",IDOK,90,48,42,16,WS_GROUP
+END
+
+IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER
+CAPTION "\82¨\91Ò\82¿\82­\82¾\82³\82¢.."
+FONT 9, "MS UI Gothic", 0, 0, 0x0
+BEGIN
+       CTEXT           "\83C\83x\83\93\83\83\8d\83O\82ð\93Ç\82Ý\8d\9e\82ñ\82Å\82¢\82Ü\82·\81\82¨\91Ò\82¿\82­\82¾\82³\82¢ ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
+END
+
+IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTEXTHELP
+CAPTION "\83C\83x\83\93\83g\82Ì\8fÚ\8d×\8fî\95ñ"
+FONT 9, "MS UI Gothic", 400, 0, 0x1
+BEGIN
+       DEFPUSHBUTTON   "\95Â\82\82é(&C)",IDOK,12,258,50,14
+       PUSHBUTTON      "\91O\82Ö(&P)",IDPREVIOUS,78,258,50,14
+       PUSHBUTTON      "\8e\9f\82Ö(&N)",IDNEXT,144,258,50,14
+       PUSHBUTTON      "\83w\83\8b\83v(&H)",IDHELP,210,258,50,14
+       EDITTEXT        IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY
+       LTEXT           "\90à\96¾(&D):",IDC_STATIC,15,70,39,8
+       LTEXT           "\93ú\95t:",IDC_STATIC,14,14,36,8
+       LTEXT           "Static",IDC_EVENTDATESTATIC,56,14,72,8
+       LTEXT           "\8e\9e\8d\8f:",IDC_STATIC,14,27,36,8
+       LTEXT           "Static",IDC_EVENTTIMESTATIC,56,27,72,8
+       LTEXT           "\83\86\81[\83U\81[(&U):",IDC_STATIC,14,41,36,8
+       LTEXT           "Static",IDC_EVENTUSERSTATIC,56,41,72,8
+       LTEXT           "\83R\83\93\83s\83\85\81[\83^(&C):",IDC_STATIC,14,54,36,8
+       LTEXT           "Static",IDC_EVENTCOMPUTERSTATIC,56,54,72,8
+       LTEXT           "\83C\83x\83\93\83gID:",IDC_STATIC,133,15,36,8
+       LTEXT           "Static",IDC_EVENTIDSTATIC,175,15,87,8
+       LTEXT           "\83\\\81[\83X:",IDC_STATIC,133,28,36,8
+       LTEXT           "Static",IDC_EVENTSOURCESTATIC,175,28,87,8
+       LTEXT           "\8eí\97Þ:",IDC_STATIC,133,42,36,8
+       LTEXT           "Static",IDC_EVENTTYPESTATIC,175,42,87,8
+       LTEXT           "\95ª\97Þ:",IDC_STATIC,133,55,36,8
+       LTEXT           "Static",IDC_EVENTCATEGORYSTATIC,175,55,87,8
+       EDITTEXT        IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY
+       LTEXT           "\83f\81[\83^(&A)",IDC_STATIC,14,194,20,8
+       CONTROL         "\83o\83C\83g(&B)",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10
+       CONTROL         "\83\8f\81[\83h(&W)",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10
+END
+
+STRINGTABLE
+BEGIN
+       IDS_APP_TITLE                  "\83C\83x\83\93\83\83r\83\85\81[\83A"
+       IDC_EVENTSTRINGIDNOTFOUND      "\83C\83x\83\93\83g ID (%lu) (\83\\\81[\83X %s \93à) \82É\8aÖ\82·\82é\90à\96¾\82ª\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½\81\83\8a\83\82\81[\83\83R\83\93\83s\83\85\81[\83^\82©\82ç\83\81\83b\83Z\81[\83W\82ð\95\\\8e¦\82·\82é\82½\82ß\82É\95K\97v\82È\83\8c\83W\83X\83g\83\8a\8fî\95ñ\82Ü\82½\82Í\83\81\83b\83Z\81[\83W DLL \83t\83@\83C\83\8b\82ª\83\8d\81[\83J\83\8b \83R\83\93\83s\83\85\81[\83^\82É\82È\82¢\89Â\94\\\90«\82ª\82 \82è\82Ü\82·\81B"
+       IDC_EVENTLOG_ERROR_TYPE        "\83G\83\89\81["
+       IDC_EVENTLOG_WARNING_TYPE      "\8cx\8d\90"
+       IDC_EVENTLOG_INFORMATION_TYPE  "\8fî\95ñ"
+       IDC_EVENTLOG_AUDIT_SUCCESS     "\90¬\8c÷\82Ì\8aÄ\8d¸"
+       IDC_EVENTLOG_AUDIT_FAILURE     "\8e¸\94s\82Ì\8aÄ\8d¸"
+       IDC_EVENTLOG_SUCCESS           "\90¬\8c÷"
+       IDC_EVENTLOG_UNKNOWN_TYPE      "\95s\96¾\82È\83C\83x\83\93\83g"
+END
index 638f77e..0563d91 100644 (file)
@@ -16,6 +16,7 @@ IDI_ERRORICON           ICON  "res/error.ico"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
diff --git a/reactos/base/applications/mscutils/servman/lang/ja-JP.rc b/reactos/base/applications/mscutils/servman/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..90e9415
--- /dev/null
@@ -0,0 +1,282 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDR_MAINMENU MENU
+BEGIN
+  POPUP "\83t\83@\83C\83\8b(&F)"
+  BEGIN
+    MENUITEM "\83G\83N\83X\83|\81[\83g...", ID_EXPORT
+    MENUITEM SEPARATOR
+    MENUITEM "\8fI\97¹(&X)",        ID_EXIT
+  END
+  POPUP "\91\80\8dì"
+  BEGIN
+    MENUITEM "\95Ê\82Ì\83R\83\93\83s\83\85\81[\83^\82Ö\90Ú\91±...", ID_CONNECT, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\8aJ\8en",            ID_START, GRAYED
+    MENUITEM "\92â\8e~",            ID_STOP, GRAYED
+    MENUITEM "\88ê\8e\9e\92â\8e~",        ID_PAUSE, GRAYED
+    MENUITEM "\8dÄ\8aJ",            ID_RESUME, GRAYED
+    MENUITEM "\8dÄ\8bN\93®",          ID_RESTART, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\8dX\90V",            ID_REFRESH
+    MENUITEM SEPARATOR
+    MENUITEM "\95Ò\8fW...",         ID_EDIT, GRAYED
+    MENUITEM "\8dì\90¬...",         ID_CREATE, GRAYED
+    MENUITEM "\8dí\8f\9c...",         ID_DELETE, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\83v\83\8d\83p\83e\83B...",   ID_PROP, GRAYED
+  END
+  POPUP "\95\\\8e¦"
+  BEGIN
+    MENUITEM "\91å\82«\82¢\83A\83C\83R\83\93",  ID_VIEW_LARGE
+    MENUITEM "\8f¬\82³\82¢\83A\83C\83R\83\93",  ID_VIEW_SMALL
+    MENUITEM "\88ê\97\97",            ID_VIEW_LIST
+    MENUITEM "\8fÚ\8d×",            ID_VIEW_DETAILS
+    MENUITEM SEPARATOR
+    MENUITEM "\83J\83X\83^\83}\83C\83Y...", ID_VIEW_CUST, GRAYED
+  END
+  POPUP "\83w\83\8b\83v"
+  BEGIN
+    MENUITEM "\83w\83\8b\83v",          ID_HELP
+    MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ",  ID_ABOUT
+  END
+END
+
+IDR_POPUP MENU
+BEGIN
+  POPUP "popup"
+  BEGIN
+    MENUITEM "\8aJ\8en",            ID_START, GRAYED
+    MENUITEM "\92â\8e~",            ID_STOP, GRAYED
+    MENUITEM "\88ê\8e\9e\92â\8e~",        ID_PAUSE, GRAYED
+    MENUITEM "\8dÄ\8aJ",            ID_RESUME, GRAYED
+    MENUITEM "\8dÄ\8bN\93®",          ID_RESTART, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\8dX\90V",            ID_REFRESH
+    MENUITEM SEPARATOR
+    MENUITEM "\95Ò\8fW...",         ID_EDIT, GRAYED
+    MENUITEM "\8dí\8f\9c...",         ID_DELETE, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\83v\83\8d\83p\83e\83B...",   ID_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "\83w\83\8b\83v...",       ID_HELP
+  END
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
+CAPTION "\83T\81[\83r\83\83}\83l\81[\83W\83\83\82É\82Â\82¢\82Ä"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT "\83T\81[\83r\83\83}\83l\81[\83W\83\83 v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 135, 30
+  PUSHBUTTON "\95Â\82\82é", IDOK, 75, 162, 44, 15
+  ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
+  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
+CAPTION "\91S\94Ê"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
+BEGIN
+  LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY
+  EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY
+  COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
+  PUSHBUTTON "\8aJ\8en", IDC_START, 6, 155, 54, 15, WS_DISABLED
+  PUSHBUTTON "\92â\8e~", IDC_STOP, 68, 155, 54, 15, WS_DISABLED
+  PUSHBUTTON "\88ê\8e\9e\92â\8e~", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED
+  PUSHBUTTON "\8dÄ\8aJ", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED
+  LTEXT "\83T\81[\83r\83X\96¼:", IDC_STATIC, 4, 11, 53, 11
+  LTEXT "\95\\\8e¦\96¼:", IDC_STATIC, 4, 29, 53, 11
+  LTEXT "\90à\96¾:", IDC_STATIC, 4, 51, 53, 11
+  LTEXT "\8eÀ\8ds\83t\83@\83C\83\8b\82Ì\83p\83X:", IDC_STATIC, 6, 73, 82, 9
+  LTEXT "\83X\83^\81[\83g\83A\83b\83v\82Ì\8eí\97Þ:", IDC_STATIC, 6, 108, 53, 11
+  LTEXT "\83T\81[\83r\83X\82Ì\8fó\91Ô:", IDC_STATIC, 4, 138, 53, 11
+  LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE
+  LTEXT "\82±\82±\82Å\83T\81[\83r\83X\82ð\8aJ\8en\82·\82é\82Æ\82«\82É\93K\97p\82·\82é\8aJ\8en\83p\83\89\83\81\81[\83^\82ð\8ew\92è\82Å\82«\82Ü\82·\81B",IDC_STATIC, 6,177,240,15
+  LTEXT "\8aJ\8en\83p\83\89\83\81\81[\83^:", IDC_STATIC, 6, 200, 58, 11
+  EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  PUSHBUTTON "\95Ò\8fW", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
+END
+
+IDD_DLG_DEPEND DIALOGEX 6,6,253,225
+CAPTION "\88Ë\91\8aÖ\8cW"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
+BEGIN
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
+  LTEXT "\91¼\82Ì\83T\81[\83r\83X\81A\83V\83X\83e\83\80 \83h\83\89\83C\83o\81A\93Ç\82Ý\8d\9e\82Ý\8f\87\83O\83\8b\81[\83v\82È\82Ç\82É\88Ë\91\82µ\82Ä\82¢\82é\83T\81[\83r\83X\82ª\82 \82è\82Ü\82·\81B\83V\83X\83e\83\80 \83R\83\93\83|\81[\83l\83\93\83g\82ª\92â\8e~\82·\82é\82©\81A\82Ü\82½\82Í\90³\8fí\82É\8eÀ\8ds\82³\82ê\82È\82¢\8fê\8d\87\81A\88Ë\91\82·\82é\83T\81[\83r\83X\82ª\89e\8b¿\82³\82ê\82Ä\82¢\82é\8fê\8d\87\82ª\82 \82è\82Ü\82·\81B", IDC_STATIC,8, 7, 238, 26
+  LTEXT "\82±\82Ì\83T\81[\83r\83X\82ª\88Ë\91\82·\82é\83R\83\93\83|\81[\83l\83\93\83g", IDC_STATIC, 8, 57, 236, 9
+  LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
+END
+
+IDD_DLG_CREATE DIALOGEX 6,6,225,209
+CAPTION "\83T\81[\83r\83X\82Ì\8dì\90¬"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
+BEGIN
+  EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE
+  EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE
+  EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE
+  LTEXT "*\83T\81[\83r\83X\96¼ :", IDC_STATIC, 12, 12, 54, 9
+  LTEXT "*\95\\\8e¦\96¼ :", IDC_STATIC, 12, 33, 54, 9
+  LTEXT "*\8eÀ\8ds\83t\83@\83C\83\8b\82Ì\83p\83X :", IDC_STATIC, 10, 51, 68, 9
+  LTEXT "\90à\96¾ :", IDC_STATIC, 12, 86, 44, 9
+  PUSHBUTTON "OK", IDOK, 126, 192, 44, 13
+  PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 176, 192, 46, 13
+  LTEXT "\92Ç\89Á\83I\83v\83V\83\87\83\93 (\8fÚ\8d×\82Í\83w\83\8b\83v\82ð\83N\83\8a\83b\83N)", IDC_STATIC, 10, 151, 134, 9
+  PUSHBUTTON "\83w\83\8b\83v", ID_CREATE_HELP, 10, 192, 44, 13
+END
+
+IDD_DLG_DELETE DIALOGEX 6,6,185,148
+CAPTION "\83T\81[\83r\83X\82Ì\8dí\8f\9c"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
+BEGIN
+  ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
+  LTEXT "\8e\9f\82Ì\83T\81[\83r\83X\82ð\8dí\8f\9c\82µ\82Ü\82·\82©? \82±\82Ì\91\80\8dì\82Í\8eæ\82è\8fÁ\82¹\82Ü\82¹\82ñ!", IDC_STATIC, 50, 6, 125, 25
+  LTEXT "\83T\81[\83r\83X\96¼:",IDC_STATIC, 6, 40, 80, 9
+  LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
+  EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
+  PUSHBUTTON "\82Í\82¢", IDOK, 26, 129, 54, 13
+  DEFPUSHBUTTON "\82¢\82¢\82¦", IDCANCEL, 102, 129, 54, 13
+END
+
+IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148
+CAPTION "\91¼\82Ì\83T\81[\83r\83X\82Ì\92â\8e~"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
+BEGIN
+  ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
+  LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25
+  LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL
+  LTEXT "\82±\82ê\82ç\82Ì\83T\81[\83r\83X\82ð\92â\8e~\82µ\82Ü\82·\82©?",IDC_STATIC, 15, 110, 150, 10
+  DEFPUSHBUTTON "\82Í\82¢", IDOK, 60, 129, 54, 14
+  PUSHBUTTON "\82¢\82¢\82¦", IDCANCEL, 120, 129, 54, 14
+END
+
+IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
+CAPTION "\83I\83v\83V\83\87\83\93"
+FONT 9, "MS UI Gothic",0,0
+STYLE 0x10CF0000
+BEGIN
+  LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150
+  PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13
+END
+
+IDD_DLG_PROGRESS DIALOGEX 6,6,255,89
+CAPTION "\83T\81[\83r\83\83R\83\93\83g\83\8d\81[\83\8b"
+FONT 9, "MS UI Gothic",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME
+EXSTYLE WS_EX_TOOLWINDOW
+BEGIN
+  CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13
+  LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11
+  LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11
+  PUSHBUTTON "\95Â\82\82é(&C)", IDOK, 100, 70, 54, 13
+END
+
+
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_FIRSTCOLUMN       "\96¼\91O"
+  IDS_SECONDCOLUMN      "\90à\96¾"
+  IDS_THIRDCOLUMN       "\8fó\91Ô"
+  IDS_FOURTHCOLUMN      "\83X\83^\81[\83g\83A\83b\83v\82Ì\8eí\97Þ"
+  IDS_FITHCOLUMN        "\83\8d\83O\83I\83\93"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_SERVICES_STARTED  "\8aJ\8en"
+  IDS_SERVICES_STOPPED  "\92â\8e~"
+  IDS_SERVICES_AUTO     "\8e©\93®"
+  IDS_SERVICES_MAN      "\8eè\93®"
+  IDS_SERVICES_DIS      "\96³\8cø"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_NUM_SERVICES      "\83T\81[\83r\83X\82Ì\90\94: %d"
+  IDS_STOP_DEPENDS      "%s \82ð\92â\8e~\82·\82é\8fê\8d\87\81A\82±\82ê\82ç\82Ì\83T\81[\83r\83X\82à\92â\8e~\82µ\82Ü\82·"
+  IDS_NO_DEPENDS        "<\88Ë\91\8aÖ\8cW\82È\82µ>"
+  IDS_LICENSE           "\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Í\83t\83\8a\81[\83\\\83t\83g\83E\83F\83A\82Å\82·\81B\82 \82È\82½\82Í\82±\82ê\82ð\81A\83t\83\8a\81[\83\\\83t\83g\83E\83F\83A\8dà\92c\82É\82æ\82Á\82Ä\94­\8ds\82³\82ê\82½ GNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91(\83o\81[\83W\83\87\83\932\82©\81A\8aó\96]\82É\82æ\82Á\82Ä\82Í\82»\82ê\88È\8d~\82Ì\83o\81[\83W\83\87\83\93\82Ì\82¤\82¿\82Ç\82ê\82©)\82Ì\92è\82ß\82é\8fð\8c\8f\82Ì\89º\82Å\8dÄ\94Ð\95z\82Ü\82½\82Í\89ü\95Ï\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82·\81B\r\n\r\n\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Í\97L\97p\82Å\82 \82é\82±\82Æ\82ð\8aè\82Á\82Ä\94z\95z\82³\82ê\82Ü\82·\82ª\81A*\91S\82­\82Ì\96³\95Û\8fØ* \82Å\82·\81B*\8f¤\8bÆ\89Â\94\\\90«\82Ì\95Û\8fØ*\82â*\93Á\92è\82Ì\96Ú\93I\82Ö\82Ì\93K\8d\87\90«*\82Í\81A\8c¾\8aO\82É\8e¦\82³\82ê\82½\82à\82Ì\82à\8aÜ\82ß\91S\82­\91\8dÝ\82µ\82Ü\82¹\82ñ\81B\8fÚ\82µ\82­\82ÍGNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91\82ð\82²\97\97\82­\82¾\82³\82¢\81B\r\n\r\n\82 \82È\82½\82Í\82±\82Ì\83v\83\8d\83O\83\89\83\80\82Æ\8b¤\82É\81AGNU\88ê\94Ê\8cö\8fO\97\98\97p\8b\96\91ø\8c_\96ñ\8f\91\82Ì\95¡\90»\82ð\88ê\95\94\8eó\82¯\8eæ\82Á\82½\82Í\82¸\82Å\82·\81B\82à\82µ\8eó\82¯\8eæ\82Á\82Ä\82¢\82È\82¯\82ê\82Î\81A\83t\83\8a\81[\83\\\83t\83g\83E\83F\83A\8dà\92c\82Ü\82Å\90¿\8b\81\82µ\82Ä\82­\82¾\82³\82¢(\88\90æ\82Í the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)\81B"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_TOOLTIP_PROP      "\83v\83\8d\83p\83e\83B"
+  IDS_TOOLTIP_REFRESH   "\8dX\90V"
+  IDS_TOOLTIP_EXPORT    "\88ê\97\97\82ð\83G\83N\83X\83|\81[\83g"
+  IDS_TOOLTIP_CREATE    "\90V\82µ\82¢\83T\81[\83r\83X\82Ì\8dì\90¬"
+  IDS_TOOLTIP_DELETE    "\8aù\91\82Ì\83T\81[\83r\83X\82Ì\8dí\8f\9c"
+  IDS_TOOLTIP_START     "\83T\81[\83r\83X\82Ì\8aJ\8en"
+  IDS_TOOLTIP_STOP      "\83T\81[\83r\83X\82Ì\92â\8e~"
+  IDS_TOOLTIP_PAUSE     "\83T\81[\83r\83X\82Ì\88ê\8e\9e\92â\8e~"
+  IDS_TOOLTIP_RESTART   "\83T\81[\83r\83X\82Ì\8dÄ\8bN\93®"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_PROGRESS_INFO_START   "ReactOS \82Í\8e\9f\82Ì\83T\81[\83r\83X\82ð\8aJ\8en\82µ\82æ\82¤\82Æ\82µ\82Ä\82¢\82Ü\82·"
+  IDS_PROGRESS_INFO_STOP    "ReactOS \82Í\8e\9f\82Ì\83T\81[\83r\83X\82ð\92â\8e~\82µ\82æ\82¤\82Æ\82µ\82Ä\82¢\82Ü\82·"
+  IDS_PROGRESS_INFO_PAUSE   "ReactOS \82Í\8e\9f\82Ì\83T\81[\83r\83X\82ð\88ê\8e\9e\92â\8e~\82µ\82æ\82¤\82Æ\82µ\82Ä\82¢\82Ü\82·"
+  IDS_PROGRESS_INFO_RESUME  "ReactOS \82Í\8e\9f\82Ì\83T\81[\83r\83X\82ð\8dÄ\8aJ\82µ\82æ\82¤\82Æ\82µ\82Ä\82¢\82Ü\82·"
+  IDS_CREATE_SUCCESS        "\83T\81[\83r\83X\82Ì\8dì\90¬\82É\90¬\8c÷\82µ\82Ü\82µ\82½"
+  IDS_DELETE_SUCCESS        "\83T\81[\83r\83X\82Ì\8dí\8f\9c\82É\90¬\8c÷\82µ\82Ü\82µ\82½"
+  IDS_CREATE_REQ            "\83A\83X\83^\83\8a\83X\83N\82Ì\82Â\82¢\82Ä\n\82¢\82é\8d\80\96Ú\82Í\95K\90{\82Å\82·"
+  IDS_DELETE_STOP           "\83T\81[\83r\83X\82ð\8dí\8f\9c\82·\82é\91O\82É\8eè\93®\82Å\92â\8e~\82µ\82Ä\82­\82¾\82³\82¢!"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_HELP_OPTIONS "\8dì\90¬\83I\83v\83V\83\87\83\93:\r\n\92\8d\88Ó: \83I\83v\83V\83\87\83\93\96¼\82Í\83C\83R\81[\83\8b\8bL\8d\86\82ð\8aÜ\82ñ\82Å\82¢\82Ü\82·\81B\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (\8aù\92è\92l = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (\8aù\92è\92l = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (\8aù\92è\92l = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (\8aù\92è\92l = LocalSystem)\r\n password= <password>\r\n"
+END
+
+/* Hints */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_HINT_BLANK        " "
+  IDS_HINT_EXPORT       " \8c»\8dÝ\82Ì\83\8a\83X\83g\82ð\83t\83@\83C\83\8b\82É\83G\83N\83X\83|\81[\83g\82µ\82Ü\82·\81B"
+  IDS_HINT_EXIT         " \82±\82Ì\83v\83\8d\83O\83\89\83\80\82ð\8fI\97¹\82µ\82Ü\82·\81B"
+
+  IDS_HINT_CONNECT      " \91¼\82Ì\83R\83\93\83s\83\85\81[\83^\82ð\8aÇ\97\9d\82µ\82Ü\82·\81B"
+  IDS_HINT_START        " \91I\91ð\82µ\82½\83T\81[\83r\83X\82ð\8aJ\8en\82µ\82Ü\82·\81B"
+  IDS_HINT_STOP         " \91I\91ð\82µ\82½\83T\81[\83r\83X\82ð\92â\8e~\82µ\82Ü\82·\81B"
+  IDS_HINT_PAUSE        " \91I\91ð\82µ\82½\83T\81[\83r\83X\82ð\88ê\8e\9e\92â\8e~\82µ\82Ü\82·\81B"
+  IDS_HINT_RESUME       " \91I\91ð\82µ\82½\83T\81[\83r\83X\82ð\8dÄ\8aJ\82µ\82Ü\82·\81B"
+  IDS_HINT_RESTART      " \91I\91ð\82µ\82½\83T\81[\83r\83X\82ð\92â\8e~\82µ\81A\8aJ\8en\82µ\82Ü\82·\81B"
+  IDS_HINT_REFRESH      " \83T\81[\83r\83X\82Ì\88ê\97\97\82ð\8dX\90V\82µ\82Ü\82·\81B"
+  IDS_HINT_EDIT         " \91I\91ð\82µ\82½\83T\81[\83r\83X\82Ì\83v\83\8d\83p\83e\83B\82ð\95Ò\8fW\82µ\82Ü\82·\81B"
+  IDS_HINT_CREATE       " \90V\82µ\82¢\83T\81[\83r\83X\82ð\8dì\90¬\82µ\82Ü\82·\81B"
+  IDS_HINT_DELETE       " \91I\91ð\82µ\82½\83T\81[\83r\83X\82ð\8dí\8f\9c\82µ\82Ü\82·\81B"
+  IDS_HINT_PROP         " \8c»\8dÝ\91I\91ð\82³\82ê\82Ä\82¢\82é\8d\80\96Ú\82Ì\83v\83\8d\83p\83e\83\83V\81[\83g\82ð\8aJ\82«\82Ü\82·\81B"
+
+  IDS_HINT_LARGE        " \83A\83C\83e\83\80\82ð\91å\82«\82¢\83A\83C\83R\83\93\82Å\95\\\8e¦\82µ\82Ü\82·\81B"
+  IDS_HINT_SMALL        " \83A\83C\83e\83\80\82ð\8f¬\82³\82¢\83A\83C\83R\83\93\82Å\95\\\8e¦\82µ\82Ü\82·\81B"
+  IDS_HINT_LIST         " \83A\83C\83e\83\80\82ð\88ê\97\97\82Å\95\\\8e¦\82µ\82Ü\82·\81B"
+  IDS_HINT_DETAILS      " \8ae\83A\83C\83e\83\80\82Ì\8fî\95ñ\82ð\83E\83B\83\93\83h\83E\82É\95\\\8e¦\82µ\82Ü\82·\81B"
+  IDS_HINT_CUST         " \95\\\8e¦\82ð\83J\83X\83^\83}\83C\83Y\82µ\82Ü\82·\81B"
+
+  IDS_HINT_HELP         " \83w\83\8b\83\83E\83B\83\93\83h\83E\82ð\95\\\8e¦\82µ\82Ü\82·\81B"
+  IDS_HINT_ABOUT        " ReactOS \83T\81[\83r\83\83}\83l\81[\83W\83\83\82É\82Â\82¢\82Ä\95\\\8e¦\82µ\82Ü\82·\81B"
+
+  IDS_HINT_SYS_RESTORE  " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\92Ê\8fí\82Ì\91å\82«\82³\82É\95\9c\8c³\82µ\82Ü\82·\81B"
+  IDS_HINT_SYS_MOVE     " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\88Ú\93®\82µ\82Ü\82·\81B"
+  IDS_HINT_SYS_SIZE     " \82±\82Ì\83E\83B\83\93\83h\83E\82Ì\91å\82«\82³\82ð\95Ï\8dX\82µ\82Ü\82·\81B"
+  IDS_HINT_SYS_MINIMIZE " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\83A\83C\83R\83\93\82É\90Ü\82è\82½\82½\82Ý\82Ü\82·\81B"
+  IDS_HINT_SYS_MAXIMIZE " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\89æ\96Ê\82¢\82Á\82Ï\82¢\82É\8aJ\82«\82Ü\82·\81B"
+  IDS_HINT_SYS_CLOSE    " \82±\82Ì\83E\83B\83\93\83h\83E\82ð\95Â\82\82Ü\82·\81B"
+END
+
+/* Application title */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_APPNAME "ReactOS \83T\81[\83r\83\83}\83l\81[\83W\83\83"
+END
index ca0b789..1b03b7b 100644 (file)
@@ -28,6 +28,7 @@ IDI_DRIVER      ICON "res/driver.ico"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
index 9319ac8..bf561f1 100644 (file)
@@ -22,6 +22,8 @@
 
 #include <notepad.h>
 
+LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
+
 static const TCHAR helpfile[]     = _T("notepad.hlp");
 static const TCHAR empty_str[]    = _T("");
 static const TCHAR szDefaultExt[] = _T("txt");
@@ -695,6 +697,7 @@ VOID DIALOG_EditWrap(VOID)
     RECT rc, rcstatus;
     DWORD size;
     LPTSTR pTemp;
+    TCHAR buff[MAX_PATH];
 
     Globals.bWrapLongLines = !Globals.bWrapLongLines;
 
@@ -725,10 +728,13 @@ VOID DIALOG_EditWrap(VOID)
     Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, edit, NULL, dwStyle,
                          0, 0, rc.right, rc.bottom, Globals.hMainWnd,
                          NULL, Globals.hInstance, NULL);
-    SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE);
+    SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE);
     SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0);
     SetWindowText(Globals.hEdit, pTemp);
     SetFocus(Globals.hEdit);
+    Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc);
+    _stprintf(buff, Globals.szStatusBarLineCol, 1, 1);
+    SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff);
     HeapFree(GetProcessHeap(), 0, pTemp);
     DrawMenuBar(Globals.hMainWnd);
 }
@@ -879,7 +885,7 @@ VOID DIALOG_StatusBarUpdateCaretPos(VOID)
     col  = dwStart - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, 0);
 
     _stprintf(buff, Globals.szStatusBarLineCol, line+1, col+1);
-    SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff);
+    SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff);
 }
 
 VOID DIALOG_ViewStatusBar(VOID)
index f9acae4..575c26b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * British English Language resource file
+ * British English language resource file
  * Translated by: Benedikt Freisen
  */
 
@@ -9,16 +9,16 @@ ID_MENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "New\tCtrl+N", IDM_FILENEW
-        MENUITEM "Open...\tCtrl+O", IDM_FILEOPEN
-        MENUITEM "Save\tCtrl+S", IDM_FILESAVE
-        MENUITEM "Save as...", IDM_FILESAVEAS
+        MENUITEM "&New\tCtrl+N", IDM_FILENEW
+        MENUITEM "&Open...\tCtrl+O", IDM_FILEOPEN
+        MENUITEM "&Save\tCtrl+S", IDM_FILESAVE
+        MENUITEM "Save &as...", IDM_FILESAVEAS
         MENUITEM SEPARATOR
         MENUITEM "Set as wallpaper (tiled)", IDM_FILEASWALLPAPERPLANE
         MENUITEM "Set as wallpaper (centered)", IDM_FILEASWALLPAPERCENTERED
         MENUITEM "Set as wallpaper (stretched)", IDM_FILEASWALLPAPERSTRETCHED
         MENUITEM SEPARATOR
-        MENUITEM "Quit\tAlt+F4", IDM_FILEEXIT
+        MENUITEM "&Quit\tAlt+F4", IDM_FILEEXIT
     END
 
     POPUP "&Edit"
@@ -70,7 +70,7 @@ BEGIN
         MENUITEM "Crop", IDM_IMAGECROP
         MENUITEM "Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS
         MENUITEM "Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES
-        MENUITEM "Delete image", IDM_IMAGEDELETEIMAGE
+        MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE
         MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE
     END
     
index 8263e44..206f242 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Spanish Language resource file
- * Traducido por: gabriel ilardi febrero 2009
+ * Traducido por: Gabriel Ilardi febrero 2009
  */
  
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -33,11 +33,11 @@ BEGIN
         MENUITEM "Invertir selección", IDM_EDITINVERTSELECTION
         MENUITEM "Seleccionar todo\tCtrl+A", IDM_EDITSELECTALL
         MENUITEM SEPARATOR
-        MENUITEM "Copiar en...", IDM_EDITCOPYTO
+        MENUITEM "Copiar a...", IDM_EDITCOPYTO
         MENUITEM "Pegar desde...", IDM_EDITPASTEFROM
     END
 
-    POPUP "&Vista"
+    POPUP "&Ver"
     BEGIN
         MENUITEM "Caja de herramientas\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
         MENUITEM "Paleta de colores\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
@@ -46,7 +46,7 @@ BEGIN
         MENUITEM SEPARATOR
         POPUP "Zoom"
         BEGIN
-            POPUP "User defined"
+            POPUP "Definido por el usuario"
             BEGIN
                 MENUITEM "12,5%", IDM_VIEWZOOM125
                 MENUITEM "25%", IDM_VIEWZOOM25
@@ -57,8 +57,8 @@ BEGIN
                 MENUITEM "800%", IDM_VIEWZOOM800
             END
             MENUITEM SEPARATOR
-            MENUITEM "Show grid", IDM_VIEWSHOWGRID
-            MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
+            MENUITEM "Mostrar cuadrícula\tCtrl+G", IDM_VIEWSHOWGRID
+            MENUITEM "Mostrar miniatura", IDM_VIEWSHOWMINIATURE
         END
         MENUITEM "Ver en pantalla completa\tCtrl+F", IDM_VIEWFULLSCREEN
     END
@@ -71,7 +71,7 @@ BEGIN
         MENUITEM "Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS
         MENUITEM "Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES
         MENUITEM "Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE
-        MENUITEM "Opaco", IDM_IMAGEDRAWOPAQUE
+        MENUITEM "Dibujar figuras opacas", IDM_IMAGEDRAWOPAQUE
     END
     
     POPUP "&Colores"
@@ -79,11 +79,11 @@ BEGIN
         MENUITEM "Editar paleta...", IDM_COLORSEDITPALETTE
     END
     
-    POPUP "&?"
+    POPUP "Ay&uda"
     BEGIN
         MENUITEM "Ayuda", IDM_HELPHELPTOPICS
         MENUITEM SEPARATOR
-        MENUITEM "Acerca", IDM_HELPINFO
+        MENUITEM "Acerca de", IDM_HELPINFO
     END
 END
 
@@ -101,6 +101,7 @@ BEGIN
     "^A", IDM_EDITSELECTALL
     "^T", IDM_VIEWTOOLBOX
     "^L", IDM_VIEWCOLORPALETTE
+    "^G", IDM_VIEWSHOWGRID
     "^F", IDM_VIEWFULLSCREEN
     "^R", IDM_IMAGEROTATEMIRROR
     "^W", IDM_IMAGECHANGESIZE
@@ -114,7 +115,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Rotar e invertir"
 BEGIN
-    GROUPBOX "Rotar e invertir", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86
+    GROUPBOX "Rotar e invertir ", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86
     AUTORADIOBUTTON "Invertir horizontalmente", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP
     AUTORADIOBUTTON "Invertir verticalmente", IDD_MIRRORROTATERB2, 12, 30, 100, 10
     AUTORADIOBUTTON "Rotar", IDD_MIRRORROTATERB3, 12, 42, 100, 10
@@ -132,19 +133,19 @@ CAPTION "Atributos"
 BEGIN
     EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12
     EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12
-    LTEXT "Ancho:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10
-    LTEXT "Altura:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10
-    LTEXT "Fecha modificación:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
+    LTEXT "Ancho:", IDD_ATTRIBUTESTEXT1, 10, 42, 30, 10
+    LTEXT "Alto:", IDD_ATTRIBUTESTEXT2, 85, 42, 23, 10
+    LTEXT "Fecha modificación:", IDD_ATTRIBUTESTEXT3, 10, 5, 80, 10
     LTEXT "Espacio en disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
     LTEXT "Resolución:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
-    LTEXT "No disponible", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10
-    LTEXT "No disponible", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10
-    LTEXT "No disponible", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10
-    GROUPBOX "Unidades", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27
+    LTEXT "No disponible", IDD_ATTRIBUTESTEXT6, 73, 5, 60, 10
+    LTEXT "No disponible", IDD_ATTRIBUTESTEXT7, 73, 15, 60, 10
+    LTEXT "No disponible", IDD_ATTRIBUTESTEXT8, 73, 25, 60, 10
+    GROUPBOX "Unidades ", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27
     AUTORADIOBUTTON "Pulgadas", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP
-    AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10
-    AUTORADIOBUTTON "Pixels", IDD_ATTRIBUTESRB3, 92, 69, 35, 10
-    GROUPBOX "Colores", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27
+    AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 60, 69, 35, 10
+    AUTORADIOBUTTON "Píxeles", IDD_ATTRIBUTESRB3, 92, 69, 35, 10
+    GROUPBOX "Colores ", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27
     AUTORADIOBUTTON "Blanco y negro", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
     AUTORADIOBUTTON "Colores", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
     DEFPUSHBUTTON "Aceptar", IDOK, 155, 8, 48, 14
@@ -157,13 +158,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "Redimensionar"
 BEGIN
-    GROUPBOX "Redimensionar", IDD_CHANGESIZEGROUP, 6, 6, 142, 66
+    GROUPBOX "Redimensionar ", IDD_CHANGESIZEGROUP, 6, 6, 142, 66
     ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32
-    LTEXT "Horizontalmente:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10
+    LTEXT "Horizontal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10
     EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12
     LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10
     ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32
-    LTEXT "Verticalmente:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10
+    LTEXT "Vertical:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10
     EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12
     LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10
     DEFPUSHBUTTON "Aceptar", IDOK, 155, 8, 48, 14
@@ -174,27 +175,27 @@ STRINGTABLE
 BEGIN
     IDS_PROGRAMNAME, "Paint"
     IDS_WINDOWTITLE, "%s - Paint"
-    IDS_INFOTITLE, "Paint for ReactOS"
-    IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)"
-    IDS_SAVEPROMPTTEXT, "Do you want to save the changes to %s?"
-    IDS_DEFAULTFILENAME, "Unnamed.bmp"
-    IDS_MINIATURETITLE, "Miniature"
-    IDS_TOOLTIP1, "Free selection"
-    IDS_TOOLTIP2, "Selection"
-    IDS_TOOLTIP3, "Rubber"
-    IDS_TOOLTIP4, "Fill with color"
-    IDS_TOOLTIP5, "Select color"
-    IDS_TOOLTIP6, "Zoom"
-    IDS_TOOLTIP7, "Pencil"
-    IDS_TOOLTIP8, "Brush"
-    IDS_TOOLTIP9, "Airbrush"
-    IDS_TOOLTIP10, "Text"
-    IDS_TOOLTIP11, "Line"
-    IDS_TOOLTIP12, "Bezier curve"
-    IDS_TOOLTIP13, "Rectangle"
-    IDS_TOOLTIP14, "Polygon"
-    IDS_TOOLTIP15, "Ellipse"
-    IDS_TOOLTIP16, "Rounded rectangle"
-    IDS_OPENFILTER, "Bitmap files (*.bmp;*.dib)\1*.bmp;*.dib\1All files (*.*)\1*.*\1"
-    IDS_SAVEFILTER, "24 bit bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1"
+    IDS_INFOTITLE, "Paint para ReactOS"
+    IDS_INFOTEXT, "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (ver www.gnu.org)"
+    IDS_SAVEPROMPTTEXT, "¿Guardar cambios cambios a %s?"
+    IDS_DEFAULTFILENAME, "Sin titulo.bmp"
+    IDS_MINIATURETITLE, "Miniatura"
+    IDS_TOOLTIP1, "Selección de forma libre"
+    IDS_TOOLTIP2, "Selección"
+    IDS_TOOLTIP3, "Borrador"
+    IDS_TOOLTIP4, "Relleno de color"
+    IDS_TOOLTIP5, "Seleccionar color"
+    IDS_TOOLTIP6, "Ampliación"
+    IDS_TOOLTIP7, "Lápiz"
+    IDS_TOOLTIP8, "Brocha"
+    IDS_TOOLTIP9, "Aerógrafo"
+    IDS_TOOLTIP10, "Texto"
+    IDS_TOOLTIP11, "Línea"
+    IDS_TOOLTIP12, "Curva"
+    IDS_TOOLTIP13, "Rectángulo"
+    IDS_TOOLTIP14, "Polígono"
+    IDS_TOOLTIP15, "Elipse"
+    IDS_TOOLTIP16, "Rectángulo redondeado"
+    IDS_OPENFILTER, "Archivos de mapa de bits (*.bmp;*.dib)\1*.bmp;*.dib\1Todos los archivos (*.*)\1*.*\1"
+    IDS_SAVEFILTER, "Mapa de bits de 24 bits (*.bmp;*.dib)\1*.bmp;*.dib\1"
 END
diff --git a/reactos/base/applications/paint/lang/eu-ES.rc b/reactos/base/applications/paint/lang/eu-ES.rc
new file mode 100644 (file)
index 0000000..730b970
--- /dev/null
@@ -0,0 +1,198 @@
+/* Basque language resource file */
+
+LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
+
+ID_MENU MENU
+BEGIN
+    POPUP "&Fitxategia"
+    BEGIN
+        MENUITEM "Berria\tCtrl+N", IDM_FILENEW
+        MENUITEM "Ireki...\tCtrl+O", IDM_FILEOPEN
+        MENUITEM "Gorde\tCtrl+S", IDM_FILESAVE
+        MENUITEM "Gorde honela...", IDM_FILESAVEAS
+        MENUITEM SEPARATOR
+        MENUITEM "Ezarri azteko plano gisa (Lauza moduan)", IDM_FILEASWALLPAPERPLANE
+        MENUITEM "Ezarri azteko plano gisa (erdian)", IDM_FILEASWALLPAPERCENTERED
+        MENUITEM "Ezarri azteko plano gisa (tiratuta)", IDM_FILEASWALLPAPERSTRETCHED
+        MENUITEM SEPARATOR
+        MENUITEM "Irten\tAlt+F4", IDM_FILEEXIT
+    END
+
+    POPUP "&Editatu"
+    BEGIN
+        MENUITEM "Desegin\tCtrl+Z", IDM_EDITUNDO
+        MENUITEM "Errepikatu\tCtrl+Y", IDM_EDITREDO
+        MENUITEM SEPARATOR
+        MENUITEM "Ebaki\tCtrl+X", IDM_EDITCUT
+        MENUITEM "Kopiatu\tCtrl+C", IDM_EDITCOPY
+        MENUITEM "Itsasti\tCtrl+V", IDM_EDITPASTE
+        MENUITEM "Borrar selección\tDel", IDM_EDITDELETESELECTION
+        MENUITEM "Invertir selección", IDM_EDITINVERTSELECTION
+        MENUITEM "Huatatu dena\tCtrl+A", IDM_EDITSELECTALL
+        MENUITEM SEPARATOR
+        MENUITEM "Kopiatu hona...", IDM_EDITCOPYTO
+        MENUITEM "Itsasti hemendik...", IDM_EDITPASTEFROM
+    END
+
+    POPUP "&Ikusi"
+    BEGIN
+        MENUITEM "Tresna-koadroa\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED
+        MENUITEM "Kolore-koadroa\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED
+        MENUITEM "Egoera Barra", IDM_VIEWSTATUSBAR, CHECKED
+        MENUITEM "Testuaren tresna-barra", IDM_FORMATICONBAR, CHECKED, GRAYED
+        MENUITEM SEPARATOR
+        POPUP "Zoom"
+        BEGIN
+            POPUP "Definido por el usuario"
+            BEGIN
+                MENUITEM "12,5%", IDM_VIEWZOOM125
+                MENUITEM "25%", IDM_VIEWZOOM25
+                MENUITEM "50%", IDM_VIEWZOOM50
+                MENUITEM "100%", IDM_VIEWZOOM100
+                MENUITEM "200%", IDM_VIEWZOOM200
+                MENUITEM "400%", IDM_VIEWZOOM400
+                MENUITEM "800%", IDM_VIEWZOOM800
+            END
+            MENUITEM SEPARATOR
+            MENUITEM "Erakutsi sareta\tCtrl+G", IDM_VIEWSHOWGRID
+            MENUITEM "Erakutsi koadro txikia", IDM_VIEWSHOWMINIATURE
+        END
+        MENUITEM "Ver en pantalla completa\tCtrl+F", IDM_VIEWFULLSCREEN
+    END
+    
+    POPUP "I&rudia"
+    BEGIN
+        MENUITEM "Irauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR
+        MENUITEM "Tiratu...\tCtrl+W", IDM_IMAGECHANGESIZE
+        MENUITEM "Recortar", IDM_IMAGECROP
+        MENUITEM "Alderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS
+        MENUITEM "Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES
+        MENUITEM "Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE
+        MENUITEM "Marraztu opako", IDM_IMAGEDRAWOPAQUE
+    END
+    
+    POPUP "&Koloreak"
+    BEGIN
+        MENUITEM "Editatu koloreak...", IDM_COLORSEDITPALETTE
+    END
+    
+    POPUP "&Laguntza"
+    BEGIN
+        MENUITEM "Laguntza-gaiak", IDM_HELPHELPTOPICS
+        MENUITEM SEPARATOR
+        MENUITEM "Paint-i buruz", IDM_HELPINFO
+    END
+END
+
+ID_ACCELERATORS ACCELERATORS
+BEGIN
+    "^N", IDM_FILENEW
+    "^O", IDM_FILEOPEN
+    "^S", IDM_FILESAVE
+    "^Z", IDM_EDITUNDO
+    "^Y", IDM_EDITREDO
+    "^X", IDM_EDITCUT
+    "^C", IDM_EDITCOPY
+    "^V", IDM_EDITPASTE
+    VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY
+    "^A", IDM_EDITSELECTALL
+    "^T", IDM_VIEWTOOLBOX
+    "^L", IDM_VIEWCOLORPALETTE
+    "^G", IDM_VIEWSHOWGRID
+    "^F", IDM_VIEWFULLSCREEN
+    "^R", IDM_IMAGEROTATEMIRROR
+    "^W", IDM_IMAGECHANGESIZE
+    "^I", IDM_IMAGEINVERTCOLORS
+    "^E", IDM_IMAGEATTRIBUTES
+    "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY
+END
+
+IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Irauli eta biratu"
+BEGIN
+    GROUPBOX "Irauli edo biratu ", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86
+    AUTORADIOBUTTON "Irauli horizontalki", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP
+    AUTORADIOBUTTON "Irauli bertikalki", IDD_MIRRORROTATERB2, 12, 30, 100, 10
+    AUTORADIOBUTTON "Biratu angelu bidez", IDD_MIRRORROTATERB3, 12, 42, 100, 10
+    AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED
+    AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED
+    AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED
+    DEFPUSHBUTTON "Ados", IDOK, 125, 8, 48, 14
+    PUSHBUTTON "Utzi", IDCANCEL, 125, 24, 48, 14
+END
+
+IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Atributuak"
+BEGIN
+    EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12
+    EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12
+    LTEXT "Zabalera:", IDD_ATTRIBUTESTEXT1, 10, 42, 30, 10
+    LTEXT "Altuera:", IDD_ATTRIBUTESTEXT2, 82, 42, 23, 10
+    LTEXT "Azken gordetze-data:", IDD_ATTRIBUTESTEXT3, 10, 5, 80, 10
+    LTEXT "Diskoko tamaina:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
+    LTEXT "Bereizmena:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
+    LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT6, 80, 5, 60, 10
+    LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT7, 80, 15, 60, 10
+    LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT8, 80, 25, 60, 10
+    GROUPBOX "Unitateak ", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27
+    AUTORADIOBUTTON "Hazbetea", IDD_ATTRIBUTESRB1, 12, 69, 42, 10, WS_GROUP
+    AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 60, 69, 30, 10
+    AUTORADIOBUTTON "Pixela", IDD_ATTRIBUTESRB3, 92, 69, 35, 10
+    GROUPBOX "Koloreak ", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27
+    AUTORADIOBUTTON "Zuri-beltzean", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP
+    AUTORADIOBUTTON "Koloretean", IDD_ATTRIBUTESRB5, 92, 100, 50, 10
+    DEFPUSHBUTTON "Ados", IDOK, 155, 8, 48, 14
+    PUSHBUTTON "Utzi", IDCANCEL, 155, 24, 48, 14
+    PUSHBUTTON "Lehenetsia", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14
+END
+
+IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Tiratu"
+BEGIN
+    GROUPBOX "Tiratu ", IDD_CHANGESIZEGROUP, 6, 6, 142, 66
+    ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32
+    LTEXT "Horizontalki:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10
+    EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12
+    LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10
+    ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32
+    LTEXT "Bertikalki:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10
+    EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12
+    LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10
+    DEFPUSHBUTTON "Ados", IDOK, 155, 8, 48, 14
+    PUSHBUTTON "Utzi", IDCANCEL, 155, 24, 48, 14
+END
+
+STRINGTABLE
+BEGIN
+    IDS_PROGRAMNAME, "Paint"
+    IDS_WINDOWTITLE, "%s - Paint"
+    IDS_INFOTITLE, "Paint para ReactOS"
+    IDS_INFOTEXT, "Paint para ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (ver www.gnu.org)"
+    IDS_SAVEPROMPTTEXT, "¿Guardar cambios cambios a %s?"
+    IDS_DEFAULTFILENAME, "Izegabea.bmp"
+    IDS_MINIATURETITLE, "Miniatura"
+    IDS_TOOLTIP1, "Hautatu forma librea"
+    IDS_TOOLTIP2, "Hautatu"
+    IDS_TOOLTIP3, "Borratzailea/kolore-borratzailea"
+    IDS_TOOLTIP4, "Bete kolorearekin"
+    IDS_TOOLTIP5, "Hartu kolorea"
+    IDS_TOOLTIP6, "Lupa"
+    IDS_TOOLTIP7, "Arkatza"
+    IDS_TOOLTIP8, "Brotxa"
+    IDS_TOOLTIP9, "Aerografoa"
+    IDS_TOOLTIP10, "Testua"
+    IDS_TOOLTIP11, "Marra"
+    IDS_TOOLTIP12, "Kurba"
+    IDS_TOOLTIP13, "Laukizuzena"
+    IDS_TOOLTIP14, "Poligonoa"
+    IDS_TOOLTIP15, "Elipsea"
+    IDS_TOOLTIP16, "Laukizuzen biribildua"
+    IDS_OPENFILTER, "Bit-mapa fitxategiak(*.bmp;*.dib)\1*.bmp;*.dib\1Fitxategi gustiak (*.*)\1*.*\1"
+    IDS_SAVEFILTER, "24 Biteko bit-mapa (*.bmp;*.dib)\1*.bmp;*.dib\1"
+END
index da528b3..285aaad 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     PAINT for ReactOS
  * LICENSE:     LGPL
- * FILE:        main.c
+ * FILE:        rsrc.rc
  * PURPOSE:     Managing the resources
  * PROGRAMMERS: Benedikt Freisen
  */
@@ -18,6 +18,7 @@
 #include "lang/en-GB.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
+#include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/ja-JP.rc"
index b48e58d..016e580 100644 (file)
@@ -38,6 +38,76 @@ ShowAvailableAppInfo(INT Index)
     return TRUE;
 }
 
+static BOOL
+DeleteCurrentAppsDB(VOID)
+{
+    HANDLE hFind = INVALID_HANDLE_VALUE;
+    WIN32_FIND_DATAW FindFileData;
+    WCHAR szCabPath[MAX_PATH];
+    WCHAR szSearchPath[MAX_PATH];
+    WCHAR szPath[MAX_PATH];
+    WCHAR szTmp[MAX_PATH];
+
+    if (!GetCurrentDirectoryW(MAX_PATH, szPath))
+        return FALSE;
+
+    swprintf(szCabPath, L"%s\\rappmgr.cab", szPath);
+
+    if (GetFileAttributesW(szCabPath) != INVALID_FILE_ATTRIBUTES)
+    {
+        if (!DeleteFileW(szCabPath))
+            return FALSE;
+    }
+
+    wcscat(szPath, L"\\rapps\\");
+    swprintf(szSearchPath, L"%s*.txt", szPath);
+
+    hFind = FindFirstFileW(szSearchPath, &FindFileData);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return TRUE;
+
+    do
+    {
+        swprintf(szTmp, L"%s%s", szPath, FindFileData.cFileName);
+        if (!DeleteFileW(szTmp))
+        {
+            FindClose(hFind);
+            return FALSE;
+        }
+    }
+    while (FindNextFileW(hFind, &FindFileData) != 0);
+
+    FindClose(hFind);
+
+    return TRUE;
+}
+
+
+BOOL
+UpdateAppsDB(VOID)
+{
+    WCHAR szPath[MAX_PATH];
+    WCHAR szAppsPath[MAX_PATH];
+    WCHAR szCabPath[MAX_PATH];
+
+    if (!DeleteCurrentAppsDB())
+        return FALSE;
+
+    DownloadApplicationsDB(APPLICATION_DATEBASE_URL);
+
+    if (!GetCurrentDirectoryW(MAX_PATH, szPath))
+        return FALSE;
+
+    swprintf(szCabPath, L"%s\\rappmgr.cab", szPath);
+
+    wcscat(szPath, L"\\rapps\\");
+    wcscpy(szAppsPath, szPath);
+
+    ExtractFilesFromCab(szCabPath, szAppsPath);
+
+    return TRUE;
+}
+
 
 BOOL
 EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc)
@@ -75,10 +145,10 @@ EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc)
     hFind = FindFirstFileW(szPath, &FindFileData);
     if (hFind == INVALID_HANDLE_VALUE)
     {
-               if (GetFileAttributesW(szCabPath) == 0xFFFFFFFF)
-                       DownloadApplicationsDB(APPLICATION_DATEBASE_URL);
+        if (GetFileAttributesW(szCabPath) == INVALID_FILE_ATTRIBUTES)
+            DownloadApplicationsDB(APPLICATION_DATEBASE_URL);
 
-               ExtractFilesFromCab(szCabPath, szAppsPath);
+        ExtractFilesFromCab(szCabPath, szAppsPath);
         hFind = FindFirstFileW(szPath, &FindFileData);
         if (hFind == INVALID_HANDLE_VALUE)
             return FALSE;
index 5659e2d..a9b9aa1 100644 (file)
@@ -84,6 +84,7 @@ UninstallApplication(INT Index, BOOL bModify)
     WCHAR szModify[] = L"ModifyPath";
     WCHAR szUninstall[] = L"UninstallString";
     WCHAR szPath[MAX_PATH];
+    WCHAR szAppName[MAX_STR_LEN];
     DWORD dwType, dwSize;
     INT ItemIndex;
     LVITEM Item;
@@ -103,6 +104,9 @@ UninstallApplication(INT Index, BOOL bModify)
         ItemIndex = Index;
     }
 
+    ListView_GetItemText(hListView, ItemIndex, 0, szAppName, sizeof(szAppName) / sizeof(WCHAR));
+    WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_REMOVE, szAppName);
+
     ZeroMemory(&Item, sizeof(LVITEM));
 
     Item.mask = LVIF_PARAM;
index 57525eb..a104bc7 100644 (file)
@@ -4,7 +4,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Ôàéë"
        BEGIN
-               MENUITEM "Íà&ñòðîéêè", ID_SETTINGS, GRAYED
+               MENUITEM "Íà&ñòðîéêè", ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "Èç&õîä",     ID_EXIT
        END
@@ -44,22 +44,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Íàñòðîéêè"
+CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "Äîáðå", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Îòêàç", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ñâàëÿíå è ñëàãàíå"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "Äîáðå", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Îòêàç", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -163,5 +180,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Íàëè÷íî çà ñëàãàíå"
        IDS_UPDATES "Îáíîâëåíèÿ"
        IDS_APPLICATIONS "Ïðèëîæåíèÿ"
-       IDS_DOWNLOAD_FOLDER "Ñâàëÿíèÿ"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
index a962ae3..21c4df7 100644 (file)
@@ -4,7 +4,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Datei"
        BEGIN
-               MENUITEM "&Einstellungen", ID_SETTINGS, GRAYED
+               MENUITEM "&Einstellungen", ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "&Beenden",     ID_EXIT
        END
@@ -44,22 +44,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Einstellungen"
+CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Abbrechen", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Herunterladen und installieren"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Abbrechen", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -163,5 +180,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Zur Installation verfügbar"
        IDS_UPDATES "Updates"
        IDS_APPLICATIONS "Anwendungen"
-       IDS_DOWNLOAD_FOLDER "Downloads"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
index 6a51e19..dde66e0 100644 (file)
@@ -4,7 +4,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&File"
        BEGIN
-               MENUITEM "&Settings", ID_SETTINGS, GRAYED
+               MENUITEM "&Settings", ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "E&xit",     ID_EXIT
        END
@@ -44,22 +44,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Cancel", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Download and Install"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Cancel", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -156,12 +173,14 @@ BEGIN
        IDS_UNINSTALL "Uninstall"
        IDS_MODIFY "Modify"
        IDS_APPS_COUNT "Applications count: %d"
-       IDS_WELCOME_TITLE "Welcome to ReactOS Application Manager!\n\n"
+       IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n"
        IDS_WELCOME_TEXT "Choose a category on the left, then choose a application for install or uninstall.\nReactOS Web Site: "
        IDS_WELCOME_URL "http://www.reactos.org"
        IDS_INSTALLED "Installed"
        IDS_AVAILABLEFORINST "Available for installation"
        IDS_UPDATES "Updates"
        IDS_APPLICATIONS "Applications"
-       IDS_DOWNLOAD_FOLDER "Downloads"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
diff --git a/reactos/base/applications/rapps/lang/es-ES.rc b/reactos/base/applications/rapps/lang/es-ES.rc
new file mode 100644 (file)
index 0000000..72ab621
--- /dev/null
@@ -0,0 +1,186 @@
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+IDR_MAINMENU MENU
+BEGIN
+       POPUP "&Archivo"
+       BEGIN
+               MENUITEM "&Ajustes", ID_SETTINGS
+               MENUITEM SEPARATOR
+               MENUITEM "Sa&lir",     ID_EXIT
+       END
+       POPUP "&Programas"
+       BEGIN
+               MENUITEM "&Instalar",  ID_INSTALL
+               MENUITEM "&Desinstalar",ID_UNINSTALL
+               MENUITEM "&Modificar",   ID_MODIFY
+               MENUITEM SEPARATOR
+               MENUITEM "&Refrescar",  ID_REFRESH
+       END
+       POPUP "Ayuda"
+       BEGIN
+               MENUITEM "Ayuda",      ID_HELP, GRAYED
+               MENUITEM "Acerca de",     ID_ABOUT
+       END
+END
+
+IDR_LINKMENU MENU
+BEGIN
+       POPUP "popup"
+       BEGIN
+               MENUITEM "&Abrir enlace en el navegador", ID_OPEN_LINK
+               MENUITEM "&Copiar enlace al portapapeles", ID_COPY_LINK
+       END
+END
+
+IDR_APPLICATIONMENU MENU
+BEGIN
+       POPUP "popup"
+       BEGIN
+               MENUITEM "&Instalar",   ID_INSTALL
+               MENUITEM "&Desinstalar", ID_UNINSTALL
+               MENUITEM "&Modificar",    ID_MODIFY
+               MENUITEM SEPARATOR
+               MENUITEM "&Refrescar",   ID_REFRESH
+       END
+END
+
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Settings"
+FONT 8, "MS Shell Dlg"
+BEGIN
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
+END
+
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Program installation"
+FONT 8, "MS Shell Dlg"
+BEGIN
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
+END
+
+IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
+STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
+CAPTION "Descargar..."
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
+    LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER
+    PUSHBUTTON "Cancelar", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
+END
+
+IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+CAPTION "Acerca de"
+FONT 8, "MS Shell Dlg"
+BEGIN
+       LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry@reactos.org)", IDC_STATIC, 48, 7, 130, 39
+       PUSHBUTTON "Cerrar", IDOK, 133, 46, 50, 14
+       ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_TOOLTIP_INSTALL "Instalar"
+       IDS_TOOLTIP_UNINSTALL "Desinstalar"
+       IDS_TOOLTIP_MODIFY "Modificar"
+       IDS_TOOLTIP_SETTINGS "Ajustes"
+       IDS_TOOLTIP_REFRESH "Refrescar"
+       IDS_TOOLTIP_EXIT "Salir"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_APP_NAME "Nombre"
+       IDS_APP_INST_VERSION "Versión"
+       IDS_APP_DESCRIPTION "Descripción"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_INFO_VERSION "\nVersión: "
+       IDS_INFO_DESCRIPTION "\nDescripción: "
+       IDS_INFO_PUBLISHER "\nAutor: "
+       IDS_INFO_HELPLINK "\nEnlace de ayuda: "
+       IDS_INFO_HELPPHONE "\nTeléfono de ayuda: "
+       IDS_INFO_README "\nLeeme: "
+       IDS_INFO_REGOWNER "\nUsuario registrador: "
+       IDS_INFO_PRODUCTID "\nID Producto: "
+       IDS_INFO_CONTACT "\nContacto: "
+       IDS_INFO_UPDATEINFO "\nInformación actualización: "
+       IDS_INFO_INFOABOUT "\nInformación Acerca de: "
+       IDS_INFO_COMMENTS "\nComentarios: "
+       IDS_INFO_INSTLOCATION "\nLocalización de instalación: "
+       IDS_INFO_INSTALLSRC "\nOrigen de instalación: "
+       IDS_INFO_UNINSTALLSTR "\nComando de desinstalación: "
+       IDS_INFO_MODIFYPATH "\nRuta modificada: "
+       IDS_INFO_INSTALLDATE "\nFecha instalación: "
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_AINFO_VERSION "\nVersión: "
+       IDS_AINFO_DESCRIPTION "\nDescripción: "
+       IDS_AINFO_SIZE "\nTamaño: "
+       IDS_AINFO_URLSITE "\nPágina Web: "
+       IDS_AINFO_LICENCE "\nLicencia: "
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_CAT_AUDIO "Audio"
+       IDS_CAT_DEVEL "Desarrollo"
+       IDS_CAT_DRIVERS "Drivers"
+       IDS_CAT_EDU "Educación"
+       IDS_CAT_ENGINEER "Ingeniería"
+       IDS_CAT_FINANCE "Finanzas"
+       IDS_CAT_GAMES "Juegos y Entretenimiento"
+       IDS_CAT_GRAPHICS "Gráficos"
+       IDS_CAT_INTERNET "Internet & Redes"
+       IDS_CAT_LIBS "Librarias"
+       IDS_CAT_OFFICE "Oficina"
+       IDS_CAT_OTHER "Otros"
+       IDS_CAT_SCIENCE "Ciencia"
+       IDS_CAT_TOOLS "Herramientas"
+       IDS_CAT_VIDEO "Video"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+       IDS_APPTITLE "ReactOS Applications Manager"
+       IDS_SEARCH_TEXT "Buscar..."
+       IDS_INSTALL "Instalar"
+       IDS_UNINSTALL "Desinstalar"
+       IDS_MODIFY "Modificar"
+       IDS_APPS_COUNT "Cantidad de aplicaciones: %d"
+       IDS_WELCOME_TITLE "Bienvenido a ReactOS Applications Manager!\n\n"
+       IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, posteriormente seleccione la aplicación a instalar o desinstalar.\nReactOS Web: "
+       IDS_WELCOME_URL "http://www.reactos.org"
+       IDS_INSTALLED "Instaladas"
+       IDS_AVAILABLEFORINST "Disponible para instalación"
+       IDS_UPDATES "Actualizaciones"
+       IDS_APPLICATIONS "Aplicaciones"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
+END
index e80c1e5..4dc6cf5 100644 (file)
@@ -4,7 +4,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "\83t\83@\83C\83\8b(&F)"
        BEGIN
-               MENUITEM "\90Ý\92è(&S)",            ID_SETTINGS, GRAYED
+               MENUITEM "\90Ý\92è(&S)",            ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "\8fI\97¹(&X)",            ID_EXIT
        END
@@ -44,22 +44,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "\90Ý\92è"
 FONT 9, "MS UI Gothic"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "\91S\94Ê", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "\83E\83B\83\93\83h\83E\82Ì\8fê\8f\8a\82ð\95Û\91\82·\82é(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "\8bN\93®\8e\9e\82É\97\98\97p\82Å\82«\82é\83v\83\8d\83O\83\89\83\80\82Ì\83\8a\83X\83g\82ð\8dX\90V\82·\82é(&U)", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "\83v\83\8d\83O\83\89\83\80\82Ì\83C\83\93\83X\83g\81[\83\8b\82Æ\8dí\8f\9c\82ð\8bL\98^\82·\82é(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "\83_\83E\83\93\83\8d\81[\83h\8f\88\97\9d", -1, 4, 65, 240, 51
+       LTEXT "\83_\83E\83\93\83\8d\81[\83h\82·\82é\83t\83H\83\8b\83_:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "\91I\91ð(&C)", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "\83C\83\93\83X\83g\81[\83\8b\8cã\82É\83v\83\8d\83O\83\89\83\80\82Ì\83C\83\93\83X\83g\81[\83\89\82ð\8dí\8f\9c\82·\82é(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "\83f\83t\83H\83\8b\83g", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "\83_\83E\83\93\83\8d\81[\83h\82Æ\83C\83\93\83X\83g\81[\83\8b"
+CAPTION "\83v\83\8d\83O\83\89\83\80\82Ì\83C\83\93\83X\83g\81[\83\8b"
 FONT 9, "MS UI Gothic"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "\83f\83B\83X\83N\82©\82ç\83C\83\93\83X\83g\81[\83\8b (CD \82â DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "\83_\83E\83\93\83\8d\81[\83h\82µ\82Ä\83C\83\93\83X\83g\81[\83\8b(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -84,84 +101,86 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_TOOLTIP_INSTALL "\83C\83\93\83X\83g\81[\83\8b"
-       IDS_TOOLTIP_UNINSTALL "\83A\83\93\83C\83\93\83X\83g\81[\83\8b"
-       IDS_TOOLTIP_MODIFY "\95Ï\8dX"
-       IDS_TOOLTIP_SETTINGS "\90Ý\92è"
-       IDS_TOOLTIP_REFRESH "\8dX\90V"
-       IDS_TOOLTIP_EXIT "\8fI\97¹"
+       IDS_TOOLTIP_INSTALL     "\83C\83\93\83X\83g\81[\83\8b"
+       IDS_TOOLTIP_UNINSTALL   "\83A\83\93\83C\83\93\83X\83g\81[\83\8b"
+       IDS_TOOLTIP_MODIFY      "\95Ï\8dX"
+       IDS_TOOLTIP_SETTINGS    "\90Ý\92è"
+       IDS_TOOLTIP_REFRESH     "\8dX\90V"
+       IDS_TOOLTIP_EXIT        "\8fI\97¹"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_APP_NAME "\96¼\91O"
-       IDS_APP_INST_VERSION "\83o\81[\83W\83\87\83\93"
-       IDS_APP_DESCRIPTION "\8aT\97v"
+       IDS_APP_NAME            "\96¼\91O"
+       IDS_APP_INST_VERSION    "\83o\81[\83W\83\87\83\93"
+       IDS_APP_DESCRIPTION     "\8aT\97v"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_INFO_VERSION "\n\83o\81[\83W\83\87\83\93: "
-       IDS_INFO_DESCRIPTION "\n\8aT\97v: "
-       IDS_INFO_PUBLISHER "\n\94­\8ds\8c³: "
-       IDS_INFO_HELPLINK "\n\83w\83\8b\83v\82Ö\82Ì\83\8a\83\93\83N: "
-       IDS_INFO_HELPPHONE "\n\83w\83\8b\83v\82Ì\93d\98b\94Ô\8d\86: "
-       IDS_INFO_README "\nReadme\82Ì\88Ê\92u: "
-       IDS_INFO_REGOWNER "\n\93o\98^\82³\82ê\82½\8f\8a\97L\8eÒ: "
-       IDS_INFO_PRODUCTID "\n\83v\83\8d\83_\83N\83gID: "
-       IDS_INFO_CONTACT "\n\98A\97\8d\90æ: "
-       IDS_INFO_UPDATEINFO "\n\83A\83b\83v\83f\81[\83g\8fî\95ñ: "
-       IDS_INFO_INFOABOUT "\n\82±\82ê\82É\8aÖ\82·\82é\8fî\95ñ: "
-       IDS_INFO_COMMENTS "\n\83R\83\81\83\93\83g: "
-       IDS_INFO_INSTLOCATION "\n\83C\83\93\83X\83g\81[\83\8b\8fê\8f\8a: "
-       IDS_INFO_INSTALLSRC "\n\83C\83\93\83X\83g\81[\83\8b\8c³: "
-       IDS_INFO_UNINSTALLSTR "\n\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82É\8eg\97p\82·\82é\95\8e\9a\97ñ: "
-       IDS_INFO_MODIFYPATH "\n\95Ï\8dX\82É\8eg\97p\82·\82é\83p\83X: "
-       IDS_INFO_INSTALLDATE "\n\83C\83\93\83X\83g\81[\83\8b\82µ\82½\93ú\95t: "
+       IDS_INFO_VERSION        "\n\83o\81[\83W\83\87\83\93: "
+       IDS_INFO_DESCRIPTION    "\n\8aT\97v: "
+       IDS_INFO_PUBLISHER      "\n\94­\8ds\8c³: "
+       IDS_INFO_HELPLINK       "\n\83w\83\8b\83v\82Ö\82Ì\83\8a\83\93\83N: "
+       IDS_INFO_HELPPHONE      "\n\83w\83\8b\83v\82Ì\93d\98b\94Ô\8d\86: "
+       IDS_INFO_README         "\nReadme\82Ì\88Ê\92u: "
+       IDS_INFO_REGOWNER       "\n\93o\98^\82³\82ê\82½\8f\8a\97L\8eÒ: "
+       IDS_INFO_PRODUCTID      "\n\83v\83\8d\83_\83N\83gID: "
+       IDS_INFO_CONTACT        "\n\98A\97\8d\90æ: "
+       IDS_INFO_UPDATEINFO     "\n\83A\83b\83v\83f\81[\83g\8fî\95ñ: "
+       IDS_INFO_INFOABOUT      "\n\82±\82ê\82É\8aÖ\82·\82é\8fî\95ñ: "
+       IDS_INFO_COMMENTS       "\n\83R\83\81\83\93\83g: "
+       IDS_INFO_INSTLOCATION   "\n\83C\83\93\83X\83g\81[\83\8b\8fê\8f\8a: "
+       IDS_INFO_INSTALLSRC     "\n\83C\83\93\83X\83g\81[\83\8b\8c³: "
+       IDS_INFO_UNINSTALLSTR   "\n\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82É\8eg\97p\82·\82é\95\8e\9a\97ñ: "
+       IDS_INFO_MODIFYPATH     "\n\95Ï\8dX\82É\8eg\97p\82·\82é\83p\83X: "
+       IDS_INFO_INSTALLDATE    "\n\83C\83\93\83X\83g\81[\83\8b\82µ\82½\93ú\95t: "
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_AINFO_VERSION "\n\83o\81[\83W\83\87\83\93: "
-       IDS_AINFO_DESCRIPTION "\n\8aT\97v: "
-       IDS_AINFO_SIZE "\n\83T\83C\83Y: "
-       IDS_AINFO_URLSITE "\n\83z\81[\83\80\83y\81[\83W: "
-       IDS_AINFO_LICENCE "\n\83\89\83C\83Z\83\93\83X: "
+       IDS_AINFO_VERSION       "\n\83o\81[\83W\83\87\83\93: "
+       IDS_AINFO_DESCRIPTION   "\n\8aT\97v: "
+       IDS_AINFO_SIZE          "\n\83T\83C\83Y: "
+       IDS_AINFO_URLSITE       "\n\83z\81[\83\80\83y\81[\83W: "
+       IDS_AINFO_LICENCE       "\n\83\89\83C\83Z\83\93\83X: "
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_CAT_AUDIO "\83I\81[\83f\83B\83I"
-       IDS_CAT_DEVEL "\8aJ\94­"
-       IDS_CAT_DRIVERS "\83h\83\89\83C\83o"
-       IDS_CAT_EDU "\8b³\88ç"
-       IDS_CAT_ENGINEER "\8dH\8aw"
-       IDS_CAT_FINANCE "\8co\89c"
-       IDS_CAT_GAMES "\83Q\81[\83\80\82Æ\82¨\8ay\82µ\82Ý"
-       IDS_CAT_GRAPHICS "\83O\83\89\83t\83B\83b\83N\83X"
-       IDS_CAT_INTERNET "\83C\83\93\83^\81[\83l\83b\83g\82Æ\83l\83b\83g\83\8f\81[\83N"
-       IDS_CAT_LIBS "\83\89\83C\83u\83\89\83\8a"
-       IDS_CAT_OFFICE "\83I\83t\83B\83X"
-       IDS_CAT_OTHER "\82»\82Ì\91¼"
-       IDS_CAT_SCIENCE "\89È\8aw"
-       IDS_CAT_TOOLS "\83c\81[\83\8b"
-       IDS_CAT_VIDEO "\83r\83f\83I"
+       IDS_CAT_AUDIO           "\83I\81[\83f\83B\83I"
+       IDS_CAT_DEVEL           "\8aJ\94­"
+       IDS_CAT_DRIVERS         "\83h\83\89\83C\83o"
+       IDS_CAT_EDU             "\8b³\88ç"
+       IDS_CAT_ENGINEER        "\8dH\8aw"
+       IDS_CAT_FINANCE         "\8co\89c"
+       IDS_CAT_GAMES           "\83Q\81[\83\80\82Æ\82¨\8ay\82µ\82Ý"
+       IDS_CAT_GRAPHICS        "\83O\83\89\83t\83B\83b\83N\83X"
+       IDS_CAT_INTERNET        "\83C\83\93\83^\81[\83l\83b\83g\82Æ\83l\83b\83g\83\8f\81[\83N"
+       IDS_CAT_LIBS            "\83\89\83C\83u\83\89\83\8a"
+       IDS_CAT_OFFICE          "\83I\83t\83B\83X"
+       IDS_CAT_OTHER           "\82»\82Ì\91¼"
+       IDS_CAT_SCIENCE         "\89È\8aw"
+       IDS_CAT_TOOLS           "\83c\81[\83\8b"
+       IDS_CAT_VIDEO           "\83r\83f\83I"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-       IDS_APPTITLE "ReactOS \83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83}\83l\81[\83W\83\83\81["
-       IDS_SEARCH_TEXT "\8c\9f\8dõ..."
-       IDS_INSTALL "\83C\83\93\83X\83g\81[\83\8b"
-       IDS_UNINSTALL "\83A\83\93\83C\83\93\83X\83g\81[\83\8b"
-       IDS_MODIFY "\95Ï\8dX"
-       IDS_APPS_COUNT "\83A\83v\83\8a\83P\81[\83V\83\87\83\93\90\94: %d"
-       IDS_WELCOME_TITLE "ReactOS \83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83}\83l\81[\83W\83\83\81[\82Ö\82æ\82¤\82±\82»!\n\n"
-       IDS_WELCOME_TEXT "\8d\91¤\82©\82ç\83J\83e\83S\83\8a\82ð\91I\91ð\82µ\81A\83C\83\93\83X\83g\81[\83\8b\96\94\82Í\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82·\82é\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82ð\91I\82ñ\82Å\82­\82¾\82³\82¢\81B\nReactOS \83E\83F\83\83T\83C\83g: "
-       IDS_WELCOME_URL "http://www.reactos.org"
-       IDS_INSTALLED "\83C\83\93\83X\83g\81[\83\8b\8dÏ\82Ý"
-       IDS_AVAILABLEFORINST "\83C\83\93\83X\83g\81[\83\8b\89Â\94\\"
-       IDS_UPDATES "\83A\83b\83v\83f\81[\83g"
-       IDS_APPLICATIONS "\83A\83v\83\8a\83P\81[\83V\83\87\83\93"
-       IDS_DOWNLOAD_FOLDER "\83_\83E\83\93\83\8d\81[\83h"
+       IDS_APPTITLE            "ReactOS \83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83}\83l\81[\83W\83\83\81["
+       IDS_SEARCH_TEXT         "\8c\9f\8dõ..."
+       IDS_INSTALL             "\83C\83\93\83X\83g\81[\83\8b"
+       IDS_UNINSTALL           "\83A\83\93\83C\83\93\83X\83g\81[\83\8b"
+       IDS_MODIFY              "\95Ï\8dX"
+       IDS_APPS_COUNT          "\83A\83v\83\8a\83P\81[\83V\83\87\83\93\90\94: %d"
+       IDS_WELCOME_TITLE       "ReactOS \83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83}\83l\81[\83W\83\83\81[\82Ö\82æ\82¤\82±\82»!\n\n"
+       IDS_WELCOME_TEXT        "\8d\91¤\82©\82ç\83J\83e\83S\83\8a\82ð\91I\91ð\82µ\81A\83C\83\93\83X\83g\81[\83\8b\96\94\82Í\83A\83\93\83C\83\93\83X\83g\81[\83\8b\82·\82é\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82ð\91I\82ñ\82Å\82­\82¾\82³\82¢\81B\nReactOS \83E\83F\83\83T\83C\83g: "
+       IDS_WELCOME_URL         "http://www.reactos.org"
+       IDS_INSTALLED           "\83C\83\93\83X\83g\81[\83\8b\8dÏ\82Ý"
+       IDS_AVAILABLEFORINST    "\83C\83\93\83X\83g\81[\83\8b\89Â\94\\"
+       IDS_UPDATES             "\83A\83b\83v\83f\81[\83g"
+       IDS_APPLICATIONS        "\83A\83v\83\8a\83P\81[\83V\83\87\83\93"
+       IDS_CHOOSE_FOLDER_TEXT  "\83v\83\8d\83O\83\89\83\80\82Ì\83_\83E\83\93\83\8d\81[\83h\82É\8eg\97p\82·\82é\83t\83H\83\8b\83_\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢:"
+       IDS_CHOOSE_FOLDER_ERROR "\8ew\92è\82³\82ê\82½\83t\83H\83\8b\83_\82Í\91\8dÝ\82µ\82Ü\82¹\82ñ!"
+       IDS_USER_NOT_ADMIN      """ReactOS \83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83}\83l\81[\83W\83\83\81["" \82ð\8bN\93®\82·\82é\82É\82Í\8aÇ\97\9d\8eÒ\8c \8cÀ\82Å\82 \82é\95K\97v\82ª\82 \82è\82Ü\82·!"
 END
index 8b15e14..fd2cb9a 100644 (file)
@@ -4,7 +4,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Fil"
        BEGIN
-               MENUITEM "&Innstillinger", ID_SETTINGS, GRAYED
+               MENUITEM "&Innstillinger", ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "A&vslutt",     ID_EXIT
        END
@@ -44,22 +44,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Innstillinger"
+CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Avbryt", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Last ned og installere"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Avbryt", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -163,5 +180,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Tilgjengelig for installasjon"
        IDS_UPDATES "Oppdateringer"
        IDS_APPLICATIONS "Programmer"
-       IDS_DOWNLOAD_FOLDER "Nedlastinger"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
index 686ba41..c7a6261 100644 (file)
@@ -6,7 +6,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Plik"
        BEGIN
-               MENUITEM "&Ustawienia", ID_SETTINGS, GRAYED
+               MENUITEM "&Ustawienia", ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "&Wyj\9ccie",     ID_EXIT
        END
@@ -46,22 +46,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ustawienia"
+CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Anuluj", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "\8cci¹gnij i zainstaluj"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Anuluj", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -165,5 +182,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Dostêpne"
        IDS_UPDATES "Uaktualnienia"
        IDS_APPLICATIONS "Aplikacje"
-       IDS_DOWNLOAD_FOLDER "\8cci¹gniête"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
index 0ae8c93..e55dee4 100644 (file)
@@ -4,7 +4,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Ôàéë"
        BEGIN
-               MENUITEM "&Ïàðàìåòðû",   ID_SETTINGS, GRAYED
+               MENUITEM "&Ïàðàìåòðû",   ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "&Âûõîä",       ID_EXIT
        END
@@ -44,22 +44,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ïàðàìåòðû"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Îòìåíà", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "Îáùèå", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Ñîõðàíÿòü ïîëîæåíèå îêíà", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Îáíîâëÿòü ñïèñîê äîñòóïíûõ ïðîãðàìì ïðè çàïóñêå", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Âåñòè ëîã óñòàíîâêè/óäàëåíèÿ ïðîãðàìì", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Çàãðóçêà", -1, 4, 65, 240, 51
+       LTEXT "Ïàïêà äëÿ çàãðóçîê:", -1, 16, 75, 77, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "Â&ûáðàòü", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Óäàëÿòü èíñòàëëÿòîðû ïðîãðàìì ïîñëå óñòàíîâêè", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Ïî óìîë÷àíèþ", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Îòìåíà", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Ñêà÷àòü è óñòàíîâèòü"
+CAPTION "Óñòàíîâêà ïðîãðàììû"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Îòìåíà", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Óñòàíîâèòü ñ äèñêà", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Ñêà÷àòü è óñòàíîâèòü", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Îòìåíà", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -113,7 +130,7 @@ BEGIN
        IDS_INFO_UPDATEINFO "\nÈíôîðìàöèÿ îá îáíîâëåíèÿõ: "
        IDS_INFO_INFOABOUT "\nÈíôîðìàöèÿ î ïðîãðàììå: "
        IDS_INFO_COMMENTS "\nÊîììåíòàðèè: "
-       IDS_INFO_INSTLOCATION "\nÓñòàíîâëåíî èç: "
+       IDS_INFO_INSTLOCATION "\nÓñòàíîâëåíî â: "
        IDS_INFO_INSTALLSRC "\nÈñòî÷íèê óñòàíîâêè: "
        IDS_INFO_UNINSTALLSTR "\nÑòðîêà äëÿ óäàëåíèÿ: "
        IDS_INFO_MODIFYPATH "\nÑòðîêà äëÿ èçìåíåíèÿ: "
@@ -163,5 +180,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Äîñòóïíî äëÿ óñòàíîâêè"
        IDS_UPDATES "Îáíîâëåíèÿ"
        IDS_APPLICATIONS "Ïðèëîæåíèÿ"
-       IDS_DOWNLOAD_FOLDER "Downloads"
+       IDS_CHOOSE_FOLDER_TEXT "Âûáåðèòå ïàïêó, êîòîðàÿ áóäåò èñïîëüçîâàòüñÿ äëÿ çàãðóçêè ïðîãðàìì:"
+       IDS_CHOOSE_FOLDER_ERROR "Âû óêàçàëè íåñóùåñòâóþùóþ ïàïêó!"
+       IDS_USER_NOT_ADMIN "Âû äîëæíû áûòü àäìèíèñòðàòîðîì äëÿ çàïóñêà ""Ìåíåäæåðà ïðèëîæåíèé ReactOS""!"
 END
index 57633af..11fa8bf 100644 (file)
@@ -9,7 +9,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Súbor"
        BEGIN
-               MENUITEM "&Nastavenia",   ID_SETTINGS, GRAYED
+               MENUITEM "&Nastavenia",   ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "S&konèi\9d",      ID_EXIT
        END
@@ -49,22 +49,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Nastavenia"
+CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Zru\9ai\9d", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Stiahnu\9d a nain\9atalova\9d"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "OK", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "Zru\9ai\9d", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -168,5 +185,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Dostupné pre nain\9atalovanie"
        IDS_UPDATES "Aktualizácie"
        IDS_APPLICATIONS "Aplikácie"
-       IDS_DOWNLOAD_FOLDER "S\9dahovania" // Downloads
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
index 3dfee07..b6a44c3 100644 (file)
@@ -12,7 +12,7 @@ IDR_MAINMENU MENU
 BEGIN
        POPUP "&Ôàéë"
        BEGIN
-               MENUITEM "&Íàëàøòóâàííÿ", ID_SETTINGS, GRAYED
+               MENUITEM "&Íàëàøòóâàííÿ", ID_SETTINGS
                MENUITEM SEPARATOR
                MENUITEM "Â&èõ³ä",     ID_EXIT
        END
@@ -52,22 +52,39 @@ BEGIN
        END
 END
 
-IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE  0, 0, 250, 144
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Íàëàøòóâàííÿ"
+CAPTION "Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "Òàê", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "ͳ", IDCANCEL, 320, 212, 60, 14
+       GROUPBOX "General", -1, 4, 2, 240, 61
+       AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
+       AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12
+       AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12
+
+       GROUPBOX "Downloading", -1, 4, 65, 240, 51
+       LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9
+       EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
+       PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
+       AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
+
+       PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
+       PUSHBUTTON "OK", IDOK, 116, 124, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14
 END
 
-IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 386, 231
+IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE  0, 0, 216, 97
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Çàâàíòàæèòè ³ âñòàíîâèòè"
+CAPTION "Program installation"
 FONT 8, "MS Shell Dlg"
 BEGIN
-       PUSHBUTTON "Òàê", IDOK, 255, 212, 60, 14
-       PUSHBUTTON "ͳ", IDCANCEL, 320, 212, 60, 14
+       LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35
+
+       AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP
+       AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP
+
+       PUSHBUTTON "OK", IDOK, 86, 78, 60, 14
+       PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14
 END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
@@ -171,5 +188,7 @@ BEGIN
        IDS_AVAILABLEFORINST "Äîñòóïí³ äëÿ âñòàíîâëåííÿ"
        IDS_UPDATES "Îíîâëåííÿ"
        IDS_APPLICATIONS "Äîäàòêè"
-       IDS_DOWNLOAD_FOLDER "Çàâàíòàæåííÿ"
+       IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:"
+       IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!"
+       IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!"
 END
index e4170ac..eed4154 100644 (file)
@@ -37,6 +37,7 @@
 #include <urlmon.h>
 
 static PAPPLICATION_INFO AppInfo;
+static HICON hIcon = NULL;
 
 typedef struct _IBindStatusCallbackImpl
 {
@@ -220,32 +221,12 @@ ThreadFunc(LPVOID Context)
     DWORD r;
     BOOL bCancelled = FALSE;
     BOOL bTempfile = FALSE;
-    HKEY hKey = NULL;
-    DWORD dwSize = MAX_PATH;
+    BOOL bCab = FALSE;
 
     /* built the path for the download */
     p = wcsrchr(AppInfo->szUrlDownload, L'/');
     if (!p) goto end;
 
-    /* Create default download path */
-    if (GetWindowsDirectoryW(path, sizeof(path) / sizeof(WCHAR)))
-    {
-        WCHAR DPath[MAX_PATH];
-        int i;
-        for (i = 0; i < 4; i++)
-        {
-            if (i == 3)
-            {
-                DPath[i] = '\0';
-                break;
-            }
-            DPath[i] = path[i];
-        }
-        LoadStringW(hInst, IDS_DOWNLOAD_FOLDER, path, sizeof(path) / sizeof(WCHAR));
-        wcscat(DPath, path);
-        wcscpy(path, DPath);
-    }
-
     if (wcslen(AppInfo->szUrlDownload) > 4)
     {
         if (AppInfo->szUrlDownload[wcslen(AppInfo->szUrlDownload) - 4] == '.' &&
@@ -253,32 +234,18 @@ ThreadFunc(LPVOID Context)
             AppInfo->szUrlDownload[wcslen(AppInfo->szUrlDownload) - 2] == 'a' &&
             AppInfo->szUrlDownload[wcslen(AppInfo->szUrlDownload) - 1] == 'b')
         {
+            bCab = TRUE;
             if (!GetCurrentDirectoryW(MAX_PATH, path))
                 goto end;
         }
         else
         {
-            if (RegOpenKeyW(HKEY_LOCAL_MACHINE,
-                            L"Software\\ReactOS\\rappmgr",
-                            &hKey) == ERROR_SUCCESS)
-            {
-                if ((RegQueryValueExW(hKey,
-                                      L"DownloadFolder",
-                                      NULL,
-                                      NULL,
-                                      (LPBYTE)&path,
-                                      &dwSize) != ERROR_SUCCESS) && (path[0] == 0))
-                {
-                    RegCloseKey(hKey);
-                    goto end;
-                }
-                RegCloseKey(hKey);
-            }
+            wcscpy(path, SettingsInfo.szDownloadDir);
         }
     }
     else goto end;
 
-    if (GetFileAttributesW(path) == 0xFFFFFFFF)
+    if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES)
     {
         if (!CreateDirectoryW(path, NULL))
             goto end;
@@ -292,36 +259,30 @@ ThreadFunc(LPVOID Context)
     dl = CreateDl(Context, &bCancelled);
     r = URLDownloadToFileW(NULL, AppInfo->szUrlDownload, path, 0, dl);
     if (dl) IBindStatusCallback_Release(dl);
-    if (S_OK != r)
-    {
-        MessageBoxW(0, L"Download error!", NULL, 0);
-        goto end;
-    }
-    else if (bCancelled)
-    {
-        goto end;
-    }
+    if (S_OK != r) goto end;
+    else if (bCancelled) goto end;
+
     ShowWindow(Dlg, SW_HIDE);
 
     /* run it */
     memset(&si, 0, sizeof(si));
     si.cb = sizeof(si);
     r = CreateProcessW(path, NULL, NULL, NULL, 0, 0, NULL, NULL, &si, &pi);
-    if (0 == r)
-    {
-        goto end;
-    }
+    if (0 == r) goto end;
+
     CloseHandle(pi.hThread);
     WaitForSingleObject(pi.hProcess, INFINITE);
     CloseHandle(pi.hProcess);
 
-    end:
-        if (bTempfile)
-        {
-            if (bCancelled)
-                DeleteFileW(path);
-        }
+end:
+    if (bTempfile)
+    {
+        if (bCancelled || (SettingsInfo.bDelInstaller && !bCab))
+            DeleteFileW(path);
+    }
+
     EndDialog(Dlg, 0);
+
     return 0;
 }
 
@@ -337,6 +298,13 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
     {
         case WM_INITDIALOG:
 
+            hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
+            if (hIcon)
+            {
+                SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIcon);
+                SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIcon);
+            }
+
             SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0);
             Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS);
             if (Item)
@@ -359,6 +327,7 @@ DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam)
             return FALSE;
 
         case WM_CLOSE:
+            if (hIcon) DestroyIcon(hIcon);
             EndDialog(Dlg, 0);
             return TRUE;
 
@@ -376,6 +345,8 @@ DownloadApplication(INT Index)
     AppInfo = (PAPPLICATION_INFO) ListViewGetlParam(Index);
     if (!AppInfo) return FALSE;
 
+    WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, AppInfo->szName);
+
     DialogBoxW(hInst,
                MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG),
                hMainWnd,
index 342c4ad..b0c01e9 100644 (file)
@@ -13,6 +13,8 @@
 #define EXTRACT_FILLFILELIST  0x00000001
 #define EXTRACT_EXTRACTFILES  0x00000002
 
+static HANDLE hLog = NULL;
+
 typedef struct
 {
     int erfOper;
@@ -244,3 +246,106 @@ ExtractFilesFromCab(LPWSTR lpCabName, LPWSTR lpOutputPath)
 
     return FALSE;
 }
+
+VOID
+InitLogs(VOID)
+{
+    WCHAR szBuf[MAX_PATH] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\ReactOS Application Manager\\ReactOS Application Manager";
+    WCHAR szPath[MAX_PATH];
+    DWORD dwCategoryNum = 1;
+    DWORD dwDisp, dwData;
+    HKEY hKey;
+
+    if (!SettingsInfo.bLogEnabled) return;
+
+    if (RegCreateKeyExW(HKEY_LOCAL_MACHINE,
+                        szBuf, 0, NULL,
+                        REG_OPTION_NON_VOLATILE,
+                        KEY_WRITE, NULL, &hKey, &dwDisp) != ERROR_SUCCESS) 
+    {
+        return;
+    }
+
+    if (!GetCurrentDirectoryW(MAX_PATH, szPath)) return;
+    wcscat(szPath, L"\\rapps.exe");
+
+    if (RegSetValueExW(hKey,
+                       L"EventMessageFile",
+                       0,
+                       REG_EXPAND_SZ,
+                       (LPBYTE)szPath,
+                       (DWORD)(wcslen(szPath) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey); 
+        return;
+    }
+
+    dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | 
+             EVENTLOG_INFORMATION_TYPE; 
+    if (RegSetValueExW(hKey,
+                       L"TypesSupported",
+                       0,
+                       REG_DWORD,
+                       (LPBYTE)&dwData,
+                       sizeof(DWORD)) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey); 
+        return;
+    }
+
+    if (RegSetValueExW(hKey,
+                       L"CategoryMessageFile",
+                       0,
+                       REG_EXPAND_SZ,
+                       (LPBYTE)szPath,
+                       (DWORD)(wcslen(szPath) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey); 
+        return;
+    }
+
+    if (RegSetValueExW(hKey,
+                       L"CategoryCount",
+                       0,
+                       REG_DWORD,
+                       (LPBYTE)&dwCategoryNum,
+                       sizeof(DWORD)) != ERROR_SUCCESS)
+    {
+        RegCloseKey(hKey); 
+        return;
+    }
+
+    RegCloseKey(hKey);
+
+    hLog = RegisterEventSourceW(NULL, L"ReactOS Application Manager");
+}
+
+
+VOID
+FreeLogs(VOID)
+{
+    if (hLog) DeregisterEventSource(hLog);
+}
+
+
+BOOL
+WriteLogMessage(WORD wType, DWORD dwEventID, LPWSTR lpMsg)
+{
+    if (!SettingsInfo.bLogEnabled) return TRUE;
+
+    if (!ReportEventW(hLog,
+                      wType,
+                      0,
+                      dwEventID,
+                      NULL,
+                      1,
+                      0,
+                      (LPCWSTR*)&lpMsg,
+                      NULL))
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
index bd98229..c6e5d17 100644 (file)
@@ -5,8 +5,11 @@
 #include <commctrl.h>
 #include <richedit.h>
 #include <shlwapi.h>
+#include <shlobj.h>
 #include <wchar.h>
 
+#include <rappsmsg.h>
+
 #include "resource.h"
 
 #define APPLICATION_DATEBASE_URL L"http://opendn.org/rappmgr.cab"
@@ -55,9 +58,9 @@ typedef struct
 {
     INT Category;
     WCHAR szName[MAX_PATH];
-       WCHAR szRegName[MAX_PATH];
+    WCHAR szRegName[MAX_PATH];
     WCHAR szVersion[MAX_PATH];
-       WCHAR szLicence[MAX_PATH];
+    WCHAR szLicence[MAX_PATH];
     WCHAR szDesc[MAX_PATH];
     WCHAR szSize[MAX_PATH];
     WCHAR szUrlSite[MAX_PATH];
@@ -66,10 +69,27 @@ typedef struct
 
 } APPLICATION_INFO, *PAPPLICATION_INFO;
 
+typedef struct
+{
+    BOOL bSaveWndPos;
+    BOOL bUpdateAtStart;
+    BOOL bLogEnabled;
+    WCHAR szDownloadDir[MAX_PATH];
+    BOOL bDelInstaller;
+    /* Window Pos */
+    BOOL Maximized;
+    INT Left;
+    INT Top;
+    INT Right;
+    INT Bottom;
+
+} SETTINGS_INFO, *PSETTINGS_INFO;
+
 /* available.c */
 typedef BOOL (CALLBACK *AVAILENUMPROC)(APPLICATION_INFO Info);
 BOOL EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc);
 BOOL ShowAvailableAppInfo(INT Index);
+BOOL UpdateAppsDB(VOID);
 
 /* installdlg.c */
 BOOL InstallApplication(INT Index);
@@ -86,6 +106,9 @@ BOOL IsInstalledApplication(LPWSTR lpRegName, BOOL IsUserKey);
 extern HWND hMainWnd;
 extern HINSTANCE hInst;
 extern INT SelectedEnumType;
+extern SETTINGS_INFO SettingsInfo;
+VOID SaveSettings(HWND hwnd);
+VOID FillDafaultSettings(PSETTINGS_INFO pSettingsInfo);
 
 /* listview.c */
 extern HWND hListView;
@@ -111,6 +134,9 @@ VOID SetWelcomeText(VOID);
 VOID ShowPopupMenu(HWND hwnd, UINT MenuID);
 BOOL StartProcess(LPWSTR lpPath, BOOL Wait);
 BOOL ExtractFilesFromCab(LPWSTR lpCabName, LPWSTR lpOutputPath);
+VOID InitLogs(VOID);
+VOID FreeLogs(VOID);
+BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPWSTR lpMsg);
 
 /* parser.c */
 INT ParserGetString(LPCWSTR section, LPCWSTR entry, LPWSTR buffer, UINT len, LPCWSTR filename);
index 57dcb2d..e74c31f 100644 (file)
@@ -1,4 +1,7 @@
+<group>
 <module name="rapps" type="win32gui" installbase="system32" installname="rapps.exe" unicode="yes">
+       <include base="ReactOS">include/reactos</include>
+       <include base="rapps" root="intermediate">.</include>
        <include base="rapps">.</include>
 
        <library>advapi32</library>
@@ -12,6 +15,8 @@
        <library>shlwapi</library>
        <library>ntdll</library>
 
+       <dependency>rappsmsg</dependency>
+
        <file>aboutdlg.c</file>
        <file>available.c</file>
        <file>installdlg.c</file>
@@ -29,3 +34,7 @@
        <file>winmain.c</file>
        <file>rapps.rc</file>
 </module>
+<module name="rappsmsg" type="messageheader">
+       <file>rappsmsg.mc</file>
+</module>
+</group>
index e4fc8cd..7c0aeb5 100644 (file)
@@ -37,4 +37,6 @@ IDI_CAT_VIDEO ICON DISCARDABLE "res/cats/video.ico"
 
 1 24 DISCARDABLE "manifest.xml"
 
+#include <rappsmsg.rc>
+
 #include "rsrc.rc"
diff --git a/reactos/base/applications/rapps/rappsmsg.mc b/reactos/base/applications/rapps/rappsmsg.mc
new file mode 100644 (file)
index 0000000..2fdf041
--- /dev/null
@@ -0,0 +1,28 @@
+MessageIdTypedef=ULONG
+
+SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS
+Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
+Warning=0x2:STATUS_SEVERITY_WARNING
+Error=0x3:STATUS_SEVERITY_ERROR)
+
+FacilityNames=(System=0x0:FACILITY_SYSTEM Application=0xFFF)
+
+LanguageNames=(English=0x409:MSG00409)
+
+MessageId=1
+Severity=Success
+Facility=Application
+SymbolicName=MSG_SUCCESS_INSTALL
+Language=English
+Installation of the program "%1" is called.
+.
+
+MessageId=2
+Severity=Success
+Facility=Application
+SymbolicName=MSG_SUCCESS_REMOVE
+Language=English
+Removal of the program "%1" is called.
+.
+
+; EOF
index d532990..8e9bf5b 100644 (file)
 #define IDC_STATUSBAR            1000
 #define IDC_DOWNLOAD_PROGRESS    1001
 #define IDC_DOWNLOAD_STATUS      1002
+#define IDC_SAVE_WINDOW_POS      1003
+#define IDC_UPDATE_AVLIST        1004
+#define IDC_DOWNLOAD_DIR_EDIT    1005
+#define IDC_DEL_AFTER_INSTALL    1006
+#define IDC_LOG_ENABLED          1007
+#define IDC_CHOOSE               1008
+#define IDC_DEFAULT_SETTINGS     1009
+#define IDC_INSTALL_TEXT         1010
+#define IDC_CD_INSTALL           1011
+#define IDC_DOWNLOAD_INSTALL     1012
 
 /* Dialogs */
 #define IDD_SETTINGS_DIALOG      300
@@ -74,7 +84,9 @@
 #define IDS_AVAILABLEFORINST     110
 #define IDS_UPDATES              111
 #define IDS_APPLICATIONS         112
-#define IDS_DOWNLOAD_FOLDER      113
+#define IDS_CHOOSE_FOLDER_TEXT   113
+#define IDS_CHOOSE_FOLDER_ERROR  114
+#define IDS_USER_NOT_ADMIN       115
 
 /* Tooltips */
 #define IDS_TOOLTIP_INSTALL      200
index b15e51c..b060279 100644 (file)
@@ -1,6 +1,7 @@
 #include "lang/bg-BG.rc"
-#include "lang/en-US.rc"
 #include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
 #include "lang/ja-JP.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
index 8c7908f..3764f01 100644 (file)
@@ -8,6 +8,48 @@
 
 #include "rapps.h"
 
+SETTINGS_INFO NewSettingsInfo;
+
+#define IS_CHECKED(a, b) \
+    a = (SendDlgItemMessage(hDlg, b, BM_GETCHECK, 0, 0) == BST_CHECKED) ? TRUE : FALSE
+
+BOOL
+ChooseFolder(HWND hwnd)
+{
+    BROWSEINFO fi;
+    LPCITEMIDLIST lpItemList;
+    WCHAR szPath[MAX_PATH], szBuf[MAX_STR_LEN];
+
+    LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT, szBuf, sizeof(szBuf) / sizeof(TCHAR));
+
+    ZeroMemory(&fi, sizeof(BROWSEINFO));
+    fi.hwndOwner = hwnd;
+    fi.lpszTitle = szBuf;
+    fi.ulFlags = BIF_DONTGOBELOWDOMAIN | BIF_RETURNONLYFSDIRS | BIF_BROWSEFORCOMPUTER | BIF_NEWDIALOGSTYLE;
+    fi.lpfn = NULL;
+    fi.lParam = -1;
+    fi.iImage = 0;
+
+    if (!(lpItemList = SHBrowseForFolder(&fi))) return FALSE;
+    SHGetPathFromIDList(lpItemList, szPath);
+
+    if (wcslen(szPath) == 0) return FALSE;
+    SetDlgItemTextW(hwnd, IDC_DOWNLOAD_DIR_EDIT, szPath);
+
+    return TRUE;
+}
+
+static VOID
+InitSettingsControls(HWND hDlg, SETTINGS_INFO Info)
+{
+    SendDlgItemMessage(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info.bSaveWndPos, 0);
+    SendDlgItemMessage(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK, Info.bUpdateAtStart, 0);
+    SendDlgItemMessage(hDlg, IDC_LOG_ENABLED, BM_SETCHECK, Info.bLogEnabled, 0);
+    SendDlgItemMessage(hDlg, IDC_DEL_AFTER_INSTALL, BM_SETCHECK, Info.bDelInstaller, 0);
+
+    SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
+                   Info.szDownloadDir);
+}
 
 static
 INT_PTR CALLBACK
@@ -17,7 +59,8 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
     {
         case WM_INITDIALOG:
         {
-
+            NewSettingsInfo = SettingsInfo;
+            InitSettingsControls(hDlg, SettingsInfo);
         }
         break;
 
@@ -25,10 +68,67 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
         {
             switch (LOWORD(wParam))
             {
+                case IDC_CHOOSE:
+                    ChooseFolder(hDlg);
+                    break;
+
+                case IDC_SAVE_WINDOW_POS:
+                    IS_CHECKED(NewSettingsInfo.bSaveWndPos, IDC_SAVE_WINDOW_POS);
+                    break;
+
+                case IDC_UPDATE_AVLIST:
+                    IS_CHECKED(NewSettingsInfo.bUpdateAtStart, IDC_UPDATE_AVLIST);
+                    break;
+
+                case IDC_LOG_ENABLED:
+                    IS_CHECKED(NewSettingsInfo.bLogEnabled, IDC_LOG_ENABLED);
+                    break;
+
+                case IDC_DEL_AFTER_INSTALL:
+                    IS_CHECKED(NewSettingsInfo.bDelInstaller, IDC_DEL_AFTER_INSTALL);
+                    break;
+
+                case IDC_DEFAULT_SETTINGS:
+                    FillDafaultSettings(&NewSettingsInfo);
+                    InitSettingsControls(hDlg, NewSettingsInfo);
+                    break;
+
                 case IDOK:
-                case IDCANCEL:
+                {
+                    WCHAR szDir[MAX_PATH];
+                    DWORD dwAttr;
+
+                    GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
+                                   szDir, MAX_PATH);
+
+                    dwAttr = GetFileAttributesW(szDir);
+                    if (dwAttr != INVALID_FILE_ATTRIBUTES &&
+                        (dwAttr & FILE_ATTRIBUTE_DIRECTORY))
+                    {
+                        wcscpy(NewSettingsInfo.szDownloadDir, szDir);
+                    }
+                    else
+                    {
+                        WCHAR szMsgText[MAX_STR_LEN];
+
+                        LoadStringW(hInst,
+                                    IDS_CHOOSE_FOLDER_ERROR,
+                                    szMsgText, sizeof(szMsgText) / sizeof(WCHAR));
+
+                        MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
+                        SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
+                        break;
+                    }
+
+                    SettingsInfo = NewSettingsInfo;
+                    SaveSettings(GetParent(hDlg));
                     EndDialog(hDlg, LOWORD(wParam));
+                }
                 break;
+
+                case IDCANCEL:
+                    EndDialog(hDlg, LOWORD(wParam));
+                    break;
             }
         }
         break;
index c6776c1..d7e88a7 100644 (file)
@@ -26,7 +26,7 @@ static const TBBUTTON Buttons[] =
     { 5, 0,            TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},
     { 3, ID_REFRESH,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0},
     { 5, 0,            TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},
-    { 4, ID_SETTINGS,  TBSTATE_INDETERMINATE, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0},
+    { 4, ID_SETTINGS,  TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0},
     { 5, ID_EXIT,      TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}
 };
 
index f90411b..5940ab4 100644 (file)
@@ -13,7 +13,70 @@ HINSTANCE hInst;
 HIMAGELIST hImageListView = NULL;
 HIMAGELIST hImageTreeView = NULL;
 INT SelectedEnumType = ENUM_ALL_COMPONENTS;
+SETTINGS_INFO SettingsInfo;
 
+VOID
+FillDafaultSettings(PSETTINGS_INFO pSettingsInfo)
+{
+    pSettingsInfo->bSaveWndPos = TRUE;
+    pSettingsInfo->bUpdateAtStart = FALSE;
+    pSettingsInfo->bLogEnabled = TRUE;
+    wcscpy(pSettingsInfo->szDownloadDir, L"C:\\Downloads");
+    pSettingsInfo->bDelInstaller = FALSE;
+
+    pSettingsInfo->Maximized = FALSE;
+    pSettingsInfo->Left = 0;
+    pSettingsInfo->Top = 0;
+    pSettingsInfo->Right = 680;
+    pSettingsInfo->Bottom = 450;
+}
+
+static BOOL
+LoadSettings(VOID)
+{
+    HKEY hKey;
+    DWORD dwSize;
+
+    if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+    {
+        dwSize = sizeof(SETTINGS_INFO);
+        if (RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE)&SettingsInfo, &dwSize) == ERROR_SUCCESS)
+        {
+            RegCloseKey(hKey);
+            return TRUE;
+        }
+
+        RegCloseKey(hKey);
+    }
+
+    return FALSE;
+}
+
+VOID
+SaveSettings(HWND hwnd)
+{
+    WINDOWPLACEMENT wp;
+    HKEY hKey;
+
+    if (SettingsInfo.bSaveWndPos)
+    {
+        wp.length = sizeof(WINDOWPLACEMENT);
+        GetWindowPlacement(hwnd, &wp);
+
+        SettingsInfo.Left = wp.rcNormalPosition.left;
+        SettingsInfo.Top  = wp.rcNormalPosition.top;
+        SettingsInfo.Right  = wp.rcNormalPosition.right;
+        SettingsInfo.Bottom = wp.rcNormalPosition.bottom;
+        SettingsInfo.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED));
+    }
+
+    if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL,
+        REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS)
+    {
+        RegSetValueEx(hKey, L"Settings", 0, REG_BINARY, (LPBYTE)&SettingsInfo, sizeof(SETTINGS_INFO));
+        RegCloseKey(hKey);
+    }
+}
 
 VOID
 FreeInstalledAppList(VOID)
@@ -226,6 +289,15 @@ InitCategoriesList(VOID)
 BOOL
 InitControls(HWND hwnd)
 {
+    if (SettingsInfo.bSaveWndPos)
+    {
+        MoveWindow(hwnd, SettingsInfo.Left, SettingsInfo.Top,
+                   SettingsInfo.Right - SettingsInfo.Left,
+                   SettingsInfo.Bottom - SettingsInfo.Top, TRUE);
+
+        if (SettingsInfo.Maximized) ShowWindow(hwnd, SW_MAXIMIZE);
+    }
+
     if (CreateStatusBar(hwnd) &&
         CreateToolBar(hwnd) &&
         CreateListView(hwnd) &&
@@ -347,7 +419,7 @@ MainWndOnSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
     HDWP hdwp = BeginDeferWindowPos(5);
     INT SearchBarWidth = GetWindowWidth(hSearchBar);
     INT RichPos = GetWindowHeight(hRichEdit);
-    INT NewPos = GetClientWindowHeight(hMainWnd) - (RichPos + SPLIT_WIDTH + GetWindowHeight(hStatusBar));
+    INT NewPos = HIWORD(lParam) - (RichPos + SPLIT_WIDTH + GetWindowHeight(hStatusBar));
     INT VSplitterPos;
 
     /* Size status bar */
@@ -387,7 +459,7 @@ MainWndOnSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
     while (NewPos < SPLIT_WIDTH + GetWindowHeight(hToolBar))
     {
         RichPos--;
-        NewPos = GetClientWindowHeight(hMainWnd) - (RichPos +
+        NewPos = HIWORD(lParam) - (RichPos +
                  SPLIT_WIDTH + GetWindowHeight(hStatusBar));
     }
     SetHSplitterPos(NewPos);
@@ -408,7 +480,7 @@ MainWndOnSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
                    0,
                    VSplitterPos + SPLIT_WIDTH,
                    GetHSplitterPos() + SPLIT_WIDTH,
-                   GetClientWindowWidth(hMainWnd) - (VSplitterPos + SPLIT_WIDTH),
+                   LOWORD(lParam) - (VSplitterPos + SPLIT_WIDTH),
                    RichPos,
                    SWP_NOZORDER|SWP_NOACTIVATE);
 
@@ -418,7 +490,7 @@ MainWndOnSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
                    0,
                    VSplitterPos + SPLIT_WIDTH,
                    GetHSplitterPos(),
-                   GetClientWindowWidth(hMainWnd) - (VSplitterPos + SPLIT_WIDTH),
+                   LOWORD(lParam) - (VSplitterPos + SPLIT_WIDTH),
                    SPLIT_WIDTH,
                    SWP_NOZORDER|SWP_NOACTIVATE);
 
@@ -433,6 +505,9 @@ MainWindowProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam)
         case WM_CREATE:
             if (!InitControls(hwnd))
                 PostMessage(hwnd, WM_CLOSE, 0, 0);
+
+            if (SettingsInfo.bUpdateAtStart)
+                UpdateAppsDB();
             break;
 
         case WM_COMMAND:
@@ -624,12 +699,18 @@ MainWindowProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 
         case WM_DESTROY:
         {
+            ShowWindow(hwnd, SW_HIDE);
+            SaveSettings(hwnd);
+
+            FreeLogs();
+
             if (IS_AVAILABLE_ENUM(SelectedEnumType))
                 FreeAvailableAppList();
             if (IS_INSTALLED_ENUM(SelectedEnumType))
                 FreeInstalledAppList();
             if (hImageListView) ImageList_Destroy(hImageListView);
             if (hImageTreeView) ImageList_Destroy(hImageTreeView);
+
             PostQuitMessage(0);
             return 0;
         }
@@ -645,9 +726,19 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
     WNDCLASSEXW WndClass = {0};
     WCHAR szWindowClass[] = L"ROSAPPMGR";
     WCHAR szWindowName[MAX_STR_LEN];
+    WCHAR szErrorText[MAX_STR_LEN];
     HANDLE hMutex = NULL;
     MSG Msg;
 
+    hInst = hInstance;
+
+    if (!IsUserAnAdmin())
+    {
+        LoadStringW(hInst, IDS_USER_NOT_ADMIN, szErrorText, sizeof(szErrorText) / sizeof(WCHAR));
+        MessageBox(0, szErrorText, NULL, MB_OK | MB_ICONWARNING);
+        return 1;
+    }
+
     hMutex = CreateMutexW(NULL, FALSE, szWindowClass);
     if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS))
     {
@@ -660,7 +751,12 @@ wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nSh
         return 1;
     }
 
-    hInst = hInstance;
+    if (!LoadSettings())
+    {
+        FillDafaultSettings(&SettingsInfo);
+    }
+
+    InitLogs();
 
     InitCommonControls();
 
diff --git a/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc b/reactos/base/applications/screensavers/3dtext/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..962c0c3
--- /dev/null
@@ -0,0 +1,17 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "3D \83e\83L\83X\83\83X\83N\83\8a\81[\83\93\83Z\81[\83o\81[\82Ì\90Ý\92è"
+FONT 9, "MS UI Gothic", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,216,7,50,14
+    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b",IDCANCEL,216,24,50,14
+    EDITTEXT        IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL
+    LTEXT           "\83J\83X\83^\83\80 \83e\83L\83X\83g",IDC_STATIC,18,17,65,8
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION "3D \83e\83L\83X\83\83X\83N\83\8a\81[\83\93\83Z\81[\83o\81["
+END
index 902f6e4..5f555e2 100644 (file)
@@ -18,6 +18,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
diff --git a/reactos/base/applications/screensavers/logon/lang/ja-JP.rc b/reactos/base/applications/screensavers/logon/lang/ja-JP.rc
new file mode 100644 (file)
index 0000000..a63d75a
--- /dev/null
@@ -0,0 +1,7 @@
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION "\83\8d\83O\83I\83\93 \83X\83N\83\8a\81[\83\93\83Z\81[\83o\81["
+    IDS_TEXT        "\90Ý\92è\82ª\95K\97v\82È\83I\83v\83V\83\87\83\93\82Í\82 \82è\82Ü\82¹\82ñ\81B"
+END
index 19b2926..e7ccf62 100644 (file)
@@ -20,6 +20,7 @@ IDB_SERVER    BITMAP DISCARDABLE      "res/1.bmp"
 #include "lang/es-ES.rc"
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
index 3804a59..3cb440a 100644 (file)
@@ -16,83 +16,83 @@ IDR_TASKMANAGER MENU DISCARDABLE
 BEGIN
     POPUP "\83t\83@\83C\83\8b(&F)"
     BEGIN
-        MENUITEM "\90V\82µ\82¢\83^\83X\83N\82Ì\8eÀ\8ds(&N)",       ID_FILE_NEW
+        MENUITEM "\90V\82µ\82¢\83^\83X\83N\82Ì\8eÀ\8ds(&N)",      ID_FILE_NEW
         MENUITEM SEPARATOR
-        MENUITEM "\83^\83X\83\83}\83l\81[\83W\83\83\82Ì\8fI\97¹(&X)",  ID_FILE_EXIT
+        MENUITEM "\83^\83X\83\83}\83l\81[\83W\83\83\82Ì\8fI\97¹(&X)", ID_FILE_EXIT
     END
     POPUP "\83I\83v\83V\83\87\83\93(&O)"
     BEGIN
-        MENUITEM "\8fí\82É\8eè\91O\82É\95\\\8e¦(&A)",           ID_OPTIONS_ALWAYSONTOP
+        MENUITEM "\8fí\82É\8eè\91O\82É\95\\\8e¦(&A)",         ID_OPTIONS_ALWAYSONTOP
         , CHECKED
-        MENUITEM "\96¢\8eg\97p\8e\9e\82É\8dÅ\8f¬\89»(&M)",         ID_OPTIONS_MINIMIZEONUSE
+        MENUITEM "\96¢\8eg\97p\8e\9e\82É\8dÅ\8f¬\89»(&M)",        ID_OPTIONS_MINIMIZEONUSE
         , CHECKED
-        MENUITEM "\8dÅ\8f¬\89»\8e\9e\82É\89B\82·(&H)",           ID_OPTIONS_HIDEWHENMINIMIZED
+        MENUITEM "\8dÅ\8f¬\89»\8e\9e\82É\89B\82·(&H)",          ID_OPTIONS_HIDEWHENMINIMIZED
         , CHECKED
-        MENUITEM "16 \83r\83b\83\83^\83X\83N\82Ì\95\\\8e¦(&S)",   ID_OPTIONS_SHOW16BITTASKS
+        MENUITEM "16 \83r\83b\83\83^\83X\83N\82Ì\95\\\8e¦(&S)", ID_OPTIONS_SHOW16BITTASKS
         , CHECKED
     END
     POPUP "\95\\\8e¦(&V)"
     BEGIN
-        MENUITEM "\8dÅ\90V\82Ì\8fî\95ñ\82É\8dX\90V(&R)",         ID_VIEW_REFRESH
+        MENUITEM "\8dÅ\90V\82Ì\8fó\91Ô\82É\8dX\90V(&R)",        ID_VIEW_REFRESH
         POPUP "\8dX\90V\82Ì\95p\93x(&U)"
         BEGIN
-            MENUITEM "\8d\82(&H)",                   ID_VIEW_UPDATESPEED_HIGH
-            MENUITEM "\92Ê\8fí(&N)",                 ID_VIEW_UPDATESPEED_NORMAL
+            MENUITEM "\8d\82(&H)",                      ID_VIEW_UPDATESPEED_HIGH
+            MENUITEM "\92Ê\8fí(&N)",                    ID_VIEW_UPDATESPEED_NORMAL
             , CHECKED
-            MENUITEM "\92á(&L)",                   ID_VIEW_UPDATESPEED_LOW
-            MENUITEM "\88ê\8e\9e\92â\8e~(&P)",             ID_VIEW_UPDATESPEED_PAUSED
+            MENUITEM "\92á(&L)",                      ID_VIEW_UPDATESPEED_LOW
+            MENUITEM "\88ê\8e\9e\92â\8e~(&P)",                ID_VIEW_UPDATESPEED_PAUSED
 
         END
         MENUITEM SEPARATOR
-        MENUITEM "\91å\82«\82¢\83A\83C\83R\83\93(&G)",           ID_VIEW_LARGE
-        MENUITEM "\8f¬\82³\82¢\83A\83C\83R\83\93(&M)",           ID_VIEW_SMALL
-        MENUITEM "\8fÚ\8d×(&D)",                     ID_VIEW_DETAILS, CHECKED
-        MENUITEM "\95\\\8e¦\82·\82é\97ñ\82Ì\91I\91ð(&S)...",      ID_VIEW_SELECTCOLUMNS
+        MENUITEM "\91å\82«\82¢\83A\83C\83R\83\93(&G)",          ID_VIEW_LARGE
+        MENUITEM "\8f¬\82³\82¢\83A\83C\83R\83\93(&M)",          ID_VIEW_SMALL
+        MENUITEM "\8fÚ\8d×(&D)",                    ID_VIEW_DETAILS, CHECKED
+        MENUITEM "\97ñ\82Ì\91I\91ð(&S)...",             ID_VIEW_SELECTCOLUMNS
         POPUP "CPU \82Ì\97\9a\97ð(&C)"
         BEGIN
-            MENUITEM "\91S\82Ä\82Ì CPU \82Å 1 \83O\83\89\83t(&O)", ID_VIEW_CPUHISTORY_ONEGRAPHALL
+            MENUITEM "\82·\82×\82Ä\82Ì CPU \82Å 1 \83O\83\89\83t(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL
 
-            MENUITEM "CPU \82²\82Æ\82É 1 \83O\83\89\83t(&P)",  ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU
+            MENUITEM "CPU \82²\82Æ\82É 1 \83O\83\89\83t(&P)",     ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU
             , CHECKED
         END
-        MENUITEM "\83J\81[\83l\83\8b\8e\9e\8aÔ\82ð\95\\\8e¦\82·\82é(&S)",   ID_VIEW_SHOWKERNELTIMES
+        MENUITEM "\83J\81[\83l\83\8b\8e\9e\8aÔ\82ð\95\\\8e¦\82·\82é(&S)",  ID_VIEW_SHOWKERNELTIMES
     END
     POPUP "\83E\83B\83\93\83h\83E(&W)"
     BEGIN
-        MENUITEM "\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦(&H)",         ID_WINDOWS_TILEHORIZONTALLY
-        MENUITEM "\8d\89E\82É\95À\82×\82Ä\95\\\8e¦(&V)",         ID_WINDOWS_TILEVERTICALLY
-        MENUITEM "\8dÅ\8f¬\89»(&M)",                   ID_WINDOWS_MINIMIZE
-        MENUITEM "\8dÅ\91å\89»(&X)",                   ID_WINDOWS_MAXIMIZE
-        MENUITEM "\8fd\82Ë\82Ä\95\\\8e¦(&C)",               ID_WINDOWS_CASCADE
-        MENUITEM "\8eè\91O\82É\95\\\8e¦(&B)",               ID_WINDOWS_BRINGTOFRONT
+        MENUITEM "\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦(&H)",       ID_WINDOWS_TILEHORIZONTALLY
+        MENUITEM "\8d\89E\82É\95À\82×\82Ä\95\\\8e¦(&V)",       ID_WINDOWS_TILEVERTICALLY
+        MENUITEM "\8dÅ\8f¬\89»(&M)",                  ID_WINDOWS_MINIMIZE
+        MENUITEM "\8dÅ\91å\89»(&X)",                  ID_WINDOWS_MAXIMIZE
+        MENUITEM "\8fd\82Ë\82Ä\95\\\8e¦(&C)",             ID_WINDOWS_CASCADE
+        MENUITEM "\8eè\91O\82É\95\\\8e¦(&B)",             ID_WINDOWS_BRINGTOFRONT
     END
     POPUP "\83w\83\8b\83v(&H)"
     BEGIN
-        MENUITEM "\83g\83s\83b\83N\82Ì\8c\9f\8dõ(&H)",           ID_HELP_TOPICS
+        MENUITEM "\83g\83s\83b\83N\82Ì\8c\9f\8dõ(&H)",          ID_HELP_TOPICS
         MENUITEM SEPARATOR
-        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&A)",           ID_HELP_ABOUT
+        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&A)",          ID_HELP_ABOUT
     END
 END
 
 IDR_WINDOWSMENU MENU DISCARDABLE
 BEGIN
-    MENUITEM "\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦(&H)",             ID_WINDOWS_TILEHORIZONTALLY
-    MENUITEM "\8d\89E\82É\95À\82×\82Ä\95\\\8e¦(&V)",             ID_WINDOWS_TILEVERTICALLY
-    MENUITEM "\8dÅ\8f¬\89»(&M)",                       ID_WINDOWS_MINIMIZE
-    MENUITEM "\8dÅ\91å\89»(&X)",                       ID_WINDOWS_MAXIMIZE
-    MENUITEM "\8fd\82Ë\82Ä\95\\\8e¦(&C)",                   ID_WINDOWS_CASCADE
-    MENUITEM "\8eè\91O\82É\95\\\8e¦(&B)",                   ID_WINDOWS_BRINGTOFRONT
+    MENUITEM "\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦(&H)",       ID_WINDOWS_TILEHORIZONTALLY
+    MENUITEM "\8d\89E\82É\95À\82×\82Ä\95\\\8e¦(&V)",       ID_WINDOWS_TILEVERTICALLY
+    MENUITEM "\8dÅ\8f¬\89»(&M)",                  ID_WINDOWS_MINIMIZE
+    MENUITEM "\8dÅ\91å\89»(&X)",                  ID_WINDOWS_MAXIMIZE
+    MENUITEM "\8fd\82Ë\82Ä\95\\\8e¦(&C)",             ID_WINDOWS_CASCADE
+    MENUITEM "\8eè\91O\82É\95\\\8e¦(&B)",             ID_WINDOWS_BRINGTOFRONT
 END
 
 IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE
 BEGIN
     POPUP "DUMMY"
     BEGIN
-        MENUITEM "\90V\82µ\82¢\83^\83X\83N\82Ì\8eÀ\8ds(&N)",       ID_FILE_NEW
+        MENUITEM "\90V\82µ\82¢\83^\83X\83N\82Ì\8eÀ\8ds(&N)",      ID_FILE_NEW
         MENUITEM SEPARATOR
-        MENUITEM "\91å\82«\82¢\83A\83C\83R\83\93(&G)",           ID_VIEW_LARGE
-        MENUITEM "\8f¬\82³\82¢\83A\83C\83R\83\93(&M)",           ID_VIEW_SMALL
-        MENUITEM "\8fÚ\8d×(&D)",                     ID_VIEW_DETAILS, CHECKED
+        MENUITEM "\91å\82«\82¢\83A\83C\83R\83\93(&G)",          ID_VIEW_LARGE
+        MENUITEM "\8f¬\82³\82¢\83A\83C\83R\83\93(&M)",          ID_VIEW_SMALL
+        MENUITEM "\8fÚ\8d×(&D)",                    ID_VIEW_DETAILS, CHECKED
     END
 END
 
@@ -100,17 +100,17 @@ IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE
 BEGIN
     POPUP "DUMMY"
     BEGIN
-        MENUITEM "\90Ø\82è\91Ö\82¦(&S)",                 ID_APPLICATION_PAGE_SWITCHTO
-        MENUITEM "\8eè\91O\82É\95\\\8e¦(&B)",               ID_WINDOWS_BRINGTOFRONT
+        MENUITEM "\90Ø\82è\91Ö\82¦(&S)",                ID_APPLICATION_PAGE_SWITCHTO
+        MENUITEM "\8eè\91O\82É\95\\\8e¦(&B)",             ID_WINDOWS_BRINGTOFRONT
         MENUITEM SEPARATOR
-        MENUITEM "\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦(&H)",         ID_WINDOWS_TILEHORIZONTALLY
-        MENUITEM "\8d\89E\82É\95À\82×\82Ä\95\\\8e¦(&V)",         ID_WINDOWS_TILEVERTICALLY
-        MENUITEM "\8dÅ\8f¬\89»(&M)",                   ID_WINDOWS_MINIMIZE
-        MENUITEM "\8dÅ\91å\89»(&X)",                   ID_WINDOWS_MAXIMIZE
-        MENUITEM "\8fd\82Ë\82Ä\95\\\8e¦(&C)",               ID_WINDOWS_CASCADE
+        MENUITEM "\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦(&H)",       ID_WINDOWS_TILEHORIZONTALLY
+        MENUITEM "\8d\89E\82É\95À\82×\82Ä\95\\\8e¦(&V)",       ID_WINDOWS_TILEVERTICALLY
+        MENUITEM "\8dÅ\8f¬\89»(&M)",                  ID_WINDOWS_MINIMIZE
+        MENUITEM "\8dÅ\91å\89»(&X)",                  ID_WINDOWS_MAXIMIZE
+        MENUITEM "\8fd\82Ë\82Ä\95\\\8e¦(&C)",             ID_WINDOWS_CASCADE
         MENUITEM SEPARATOR
-        MENUITEM "\83^\83X\83N\82Ì\8fI\97¹(&E)",             ID_APPLICATION_PAGE_ENDTASK
-        MENUITEM "\83v\83\8d\83Z\83X\82Ì\95\\\8e¦(&G)",           ID_APPLICATION_PAGE_GOTOPROCESS
+        MENUITEM "\83^\83X\83N\82Ì\8fI\97¹(&E)",            ID_APPLICATION_PAGE_ENDTASK
+        MENUITEM "\83v\83\8d\83Z\83X\82Ì\95\\\8e¦(&G)",         ID_APPLICATION_PAGE_GOTOPROCESS
 
     END
 END
@@ -119,10 +119,10 @@ IDR_TRAY_POPUP MENU DISCARDABLE
 BEGIN
     POPUP "DUMMY"
     BEGIN
-        MENUITEM "\8c³\82Ì\83T\83C\83Y\82É\96ß\82·(&R)",         ID_RESTORE
-        MENUITEM "\95Â\82\82é(&C)",                   ID_FILE_EXIT
+        MENUITEM "\8c³\82Ì\83T\83C\83Y\82É\96ß\82·(&R)",        ID_RESTORE
+        MENUITEM "\95Â\82\82é(&C)",                  ID_FILE_EXIT
         MENUITEM SEPARATOR
-        MENUITEM "\8fí\82É\8eè\91O\82É\95\\\8e¦(&A)",           ID_OPTIONS_ALWAYSONTOP
+        MENUITEM "\8fí\82É\8eè\91O\82É\95\\\8e¦(&A)",         ID_OPTIONS_ALWAYSONTOP
     END
 END
 
@@ -130,28 +130,28 @@ IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE
 BEGIN
     POPUP "DUMMY"
     BEGIN
-        MENUITEM "\83v\83\8d\83Z\83X\82Ì\8fI\97¹(&E)",           ID_PROCESS_PAGE_ENDPROCESS
-        MENUITEM "\83v\83\8d\83Z\83\83c\83\8a\81[\82Ì\8fI\97¹(&T)",    ID_PROCESS_PAGE_ENDPROCESSTREE
+        MENUITEM "\83v\83\8d\83Z\83X\82Ì\8fI\97¹(&E)",          ID_PROCESS_PAGE_ENDPROCESS
+        MENUITEM "\83v\83\8d\83Z\83\83c\83\8a\81[\82Ì\8fI\97¹(&T)",   ID_PROCESS_PAGE_ENDPROCESSTREE
 
-        MENUITEM "\83f\83o\83b\83O(&D)",                 ID_PROCESS_PAGE_DEBUG
+        MENUITEM "\83f\83o\83b\83O(&D)",                ID_PROCESS_PAGE_DEBUG
         MENUITEM SEPARATOR
         POPUP "\97D\90æ\93x\82Ì\90Ý\92è(&P)"
         BEGIN
-            MENUITEM "\83\8a\83A\83\8b\83^\83C\83\80(&R)",         ID_PROCESS_PAGE_SETPRIORITY_REALTIME
+            MENUITEM "\83\8a\83A\83\8b\83^\83C\83\80(&R)",            ID_PROCESS_PAGE_SETPRIORITY_REALTIME
 
-            MENUITEM "\8d\82(&H)",                   ID_PROCESS_PAGE_SETPRIORITY_HIGH
+            MENUITEM "\8d\82(&H)",                      ID_PROCESS_PAGE_SETPRIORITY_HIGH
 
-            MENUITEM "\92Ê\8fí\88È\8fã(&A)",             ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL
+            MENUITEM "\92Ê\8fí\88È\8fã(&A)",                ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL
 
-            MENUITEM "\92Ê\8fí(&N)",                 ID_PROCESS_PAGE_SETPRIORITY_NORMAL
+            MENUITEM "\92Ê\8fí(&N)",                    ID_PROCESS_PAGE_SETPRIORITY_NORMAL
 
-            MENUITEM "\92Ê\8fí\88È\89º(&B)",             ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
+            MENUITEM "\92Ê\8fí\88È\89º(&B)",                ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
 
-            MENUITEM "\92á(&L)",                   ID_PROCESS_PAGE_SETPRIORITY_LOW
+            MENUITEM "\92á(&L)",                      ID_PROCESS_PAGE_SETPRIORITY_LOW
 
         END
-        MENUITEM "\8aÖ\8cW\82Ì\90Ý\92è(&A)...",             ID_PROCESS_PAGE_SETAFFINITY
-       MENUITEM "\83f\83o\83b\83\83`\83\83\83\93\83l\83\8b\82Ì\95Ï\8dX(&C)...",          ID_PROCESS_PAGE_DEBUGCHANNELS
+        MENUITEM "\8aÖ\8cW\82Ì\90Ý\92è(&A)...",           ID_PROCESS_PAGE_SETAFFINITY
+       MENUITEM "\83f\83o\83b\83\83`\83\83\83\93\83l\83\8b\82Ì\95Ï\8dX(&C)...",    ID_PROCESS_PAGE_DEBUGCHANNELS
     END
 END
 
@@ -165,7 +165,7 @@ IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE  0, 0, 264, 246
 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
-CAPTION "\83^\83X\83\83}\83l\81[\83W\83\83"
+CAPTION "ReactOS \83^\83X\83\83}\83l\81[\83W\83\83"
 MENU IDR_TASKMANAGER
 FONT 9, "MS UI Gothic"
 BEGIN
@@ -200,11 +200,11 @@ IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE  0, 0, 247, 210
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 9, "MS UI Gothic"
 BEGIN
-    GROUPBOX        "CPU \8eg\97p\97Ê",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT
-    GROUPBOX        "\83\81\83\82\83\8a\8eg\97p\97Ê",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT
+    GROUPBOX        "CPU \8eg\97p\97¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT
+    GROUPBOX        "\83\81\83\82\83\8a\8eg\97p\97Ê",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT
     GROUPBOX        "\8d\87\8cv",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "\83R\83~\83b\83\83`\83\83\81[\83W (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT
-    GROUPBOX        "\95¨\97\9d \83\81\83\82\83\8a (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT
+    GROUPBOX        "\95¨\97\9d\83\81\83\82\83\8a (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "\83J\81[\83l\83\8b \83\81\83\82\83\8a (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT
     LTEXT           "\83n\83\93\83h\83\8b",IDS_TOTALS_HANDLE_COUNT,12,131,27,8
     LTEXT           "\83X\83\8c\83b\83h",IDS_TOTALS_THREAD_COUNT,12,140,27,8
@@ -244,10 +244,8 @@ BEGIN
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP
     GROUPBOX        "CPU \8eg\97p\97¦\82Ì\97\9a\97ð",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT
     GROUPBOX        "\83\81\83\82\83\8a\8eg\97p\97Ê\82Ì\97\9a\97ð",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT
-    PUSHBUTTON      "CPU \8eg\97p\97¦\82Ì\95\\\8e¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,
-                   WS_EX_CLIENTEDGE
-    PUSHBUTTON      "\83\81\83\82\83\8a\8eg\97p\97¦\82Ì\95\\\8e¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,
-                    WS_EX_CLIENTEDGE
+    PUSHBUTTON      "CPU \8eg\97p\97¦\82Ì\95\\\8e¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
+    PUSHBUTTON      "\83\81\83\82\83\8a\8eg\97p\97Ê\82Ì\95\\\8e¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
     PUSHBUTTON      "CPU \8eg\97p\97¦\82Ì\97\9a\97ð",IDC_CPU_USAGE_HISTORY_GRAPH,81,17,
                     153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE
     PUSHBUTTON      "\83\81\83\82\83\8a\8eg\97p\97Ê\82Ì\97\9a\97ð",IDC_MEM_USAGE_HISTORY_GRAPH,81,75,
@@ -389,7 +387,7 @@ BEGIN
                     WS_TABSTOP,107,83,59,10
     CONTROL         "\83X\83\8c\83b\83h\82Ì\90\94(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,94,59,10
-    CONTROL         "GDI \83I\83u\83W\83F\83N\83g(&J)",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX |
+    CONTROL         "GDI \83I\83u\83W\83F\83N\83g",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,105,55,10
     CONTROL         "I/O \8f\91\82«\8d\9e\82Ý",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,116,49,10
@@ -529,65 +527,65 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_FILE_NEW             "\90V\82µ\82¢\83v\83\8d\83O\83\89\83\80\82ð\8eÀ\8ds\82µ\82Ü\82·\81B"
-    ID_OPTIONS_ALWAYSONTOP  "\8dÅ\8f¬\89»\82³\82ê\82È\82¢\8cÀ\82è\81A\8fí\82É\83^\83X\83N\83}\83l\81[\83W\83\83\82ª\82Ù\82©\82Ì\82·\82×\82Ä\82Ì\83E\83B\83\93\83h\83E\82æ\82è\82à\8eè\91O\82É\95\\\8e¦\82³\82ê\82Ü\82·\81B"
+    ID_FILE_NEW             "\90V\82µ\82¢\83v\83\8d\83O\83\89\83\80\82ð\8eÀ\8ds\82µ\82Ü\82·"
+    ID_OPTIONS_ALWAYSONTOP  "\8dÅ\8f¬\89»\82³\82ê\82È\82¢\8cÀ\82è\81A\8fí\82É\83^\83X\83N \83}\83l\81[\83W\83\83\82ª\82Ù\82©\82Ì\82·\82×\82Ä\82Ì\83E\83B\83\93\83h\83E\82æ\82è\82à\8eè\91O\82É\95\\\8e¦\82³\82ê\82Ü\82·"
     ID_OPTIONS_MINIMIZEONUSE
-                            "[\90Ø\82è\91Ö\82¦] \91\80\8dì\82ð\8eÀ\8ds\82·\82é\82Æ\81A\83^\83X\83\83}\83l\81[\83W\83\83\82ª\8dÅ\8f¬\89»\82³\82ê\82Ü\82·\81B"
-    ID_OPTIONS_HIDEWHENMINIMIZED "\8dÅ\8f¬\89»\82³\82ê\82½\82Æ\82«\82É\81A\83^\83X\83\83}\83l\81[\83W\83\83\82ð\89B\82µ\82Ü\82·\81B"
-    ID_VIEW_REFRESH         "[\8dX\90V\82Ì\95p\93x] \82Ì\90Ý\92è\82É\82©\82©\82í\82ç\82¸\81A\8d¡\82·\82®\83^\83X\83\83}\83l\81[\83W\83\83\82ð\8dX\90V\82µ\82Ü\82·\81B"
-    ID_VIEW_LARGE           "\91å\82«\82¢\83A\83C\83R\83\93\82ð\8eg\82Á\82Ä\83^\83X\83N\82ð\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_VIEW_SMALL           "\8f¬\82³\82¢\83A\83C\83R\83\93\82ð\8eg\82Á\82Ä\83^\83X\83N\82ð\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_VIEW_DETAILS         "\8ae\83^\83X\83N\82Ì\8fî\95ñ\82ð\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_VIEW_UPDATESPEED_HIGH "\96\88\95b 2 \89ñ\95\\\8e¦\82ð\8dX\90V\82µ\82Ü\82·\81B"
-    ID_VIEW_UPDATESPEED_NORMAL "2 \95b\82É 1 \89ñ\95\\\8e¦\82ð\8dX\90V\82µ\82Ü\82·\81B"
-    ID_VIEW_UPDATESPEED_LOW "4 \95b\82É 1 \89ñ\95\\\8e¦\82ð\8dX\90V\82µ\82Ü\82·\81B"
+                            "[\90Ø\82è\91Ö\82¦] \91\80\8dì\82ð\8eÀ\8ds\82·\82é\82Æ\81A\83^\83X\83\83}\83l\81[\83W\83\83\82ª\8dÅ\8f¬\89»\82³\82ê\82Ü\82·"
+    ID_OPTIONS_HIDEWHENMINIMIZED "\8dÅ\8f¬\89»\82³\82ê\82½\82Æ\82«\82É\81A\83^\83X\83\83}\83l\81[\83W\83\83\82ð\89B\82µ\82Ü\82·"
+    ID_VIEW_REFRESH         "[\8dX\90V\82Ì\95p\93x] \82Ì\90Ý\92è\82É\82©\82©\82í\82ç\82¸\81A\8d¡\82·\82®\83^\83X\83\83}\83l\81[\83W\83\83\82ð\8dX\90V\82µ\82Ü\82·"
+    ID_VIEW_LARGE           "\91å\82«\82¢\83A\83C\83R\83\93\82ð\8eg\82Á\82Ä\83^\83X\83N\82ð\95\\\8e¦\82µ\82Ü\82·"
+    ID_VIEW_SMALL           "\8f¬\82³\82¢\83A\83C\83R\83\93\82ð\8eg\82Á\82Ä\83^\83X\83N\82ð\95\\\8e¦\82µ\82Ü\82·"
+    ID_VIEW_DETAILS         "\8ae\83^\83X\83N\82Ì\8fî\95ñ\82ð\95\\\8e¦\82µ\82Ü\82·"
+    ID_VIEW_UPDATESPEED_HIGH "\96\88\95b 2 \89ñ\95\\\8e¦\82ð\8dX\90V\82µ\82Ü\82·"
+    ID_VIEW_UPDATESPEED_NORMAL "2 \95b\82É 1 \89ñ\95\\\8e¦\82ð\8dX\90V\82µ\82Ü\82·"
+    ID_VIEW_UPDATESPEED_LOW "4 \95b\82É 1 \89ñ\95\\\8e¦\82ð\8dX\90V\82µ\82Ü\82·"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_VIEW_UPDATESPEED_PAUSED "\95\\\8e¦\82ð\8e©\93®\93I\82É\8dX\90V\82µ\82Ü\82¹\82ñ\81B"
+    ID_VIEW_UPDATESPEED_PAUSED "\95\\\8e¦\82ð\8e©\93®\93I\82É\8dX\90V\82µ\82Ü\82¹\82ñ"
     ID_WINDOWS_TILEHORIZONTALLY
-                            "\83f\83X\83N\83g\83b\83v\8fã\82Å\83E\83B\83\93\83h\83E\82ð\8fd\82È\82ç\82È\82¢\82æ\82¤\82É\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_WINDOWS_TILEVERTICALLY "\83f\83X\83N\83g\83b\83v\8fã\82Å\83E\83B\83\93\83h\83E\82ð\8fd\82È\82ç\82È\82¢\82æ\82¤\82É\8d\89E\82É\95À\82×\82Ä\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_WINDOWS_MINIMIZE     "\83E\83B\83\93\83h\83E\82ð\8dÅ\8f¬\89»\82µ\82Ü\82·\81B"
-    ID_WINDOWS_MAXIMIZE     "\83E\83B\83\93\83h\83E\82ð\8dÅ\91å\89»\82µ\82Ü\82·\81B"
-    ID_WINDOWS_CASCADE      "\83f\83X\83N\83g\83b\83v\8fã\82Å\83E\83B\83\93\83h\83E\82ð\8fd\82Ë\82Ä\95\\\8e¦\82µ\82Ü\82·\81B"
+                            "\83f\83X\83N\83g\83b\83v\8fã\82Å\83E\83B\83\93\83h\83E\82ð\8fd\82È\82ç\82È\82¢\82æ\82¤\82É\8fã\89º\82É\95À\82×\82Ä\95\\\8e¦\82µ\82Ü\82·"
+    ID_WINDOWS_TILEVERTICALLY "\83f\83X\83N\83g\83b\83v\8fã\82Å\83E\83B\83\93\83h\83E\82ð\8fd\82È\82ç\82È\82¢\82æ\82¤\82É\8d\89E\82É\95À\82×\82Ä\95\\\8e¦\82µ\82Ü\82·"
+    ID_WINDOWS_MINIMIZE     "\83E\83B\83\93\83h\83E\82ð\8dÅ\8f¬\89»\82µ\82Ü\82·"
+    ID_WINDOWS_MAXIMIZE     "\83E\83B\83\93\83h\83E\82ð\8dÅ\91å\89»\82µ\82Ü\82·"
+    ID_WINDOWS_CASCADE      "\83f\83X\83N\83g\83b\83v\8fã\82Å\83E\83B\83\93\83h\83E\82ð\8fd\82Ë\82Ä\95\\\8e¦\82µ\82Ü\82·"
     ID_WINDOWS_BRINGTOFRONT "\83E\83B\83\93\83h\83E\82ð\8eè\91O\82É\95\\\8e¦\82µ\82Ü\82·\82ª\81A\90Ø\82è\91Ö\82¦\82Ü\82¹\82ñ\81B"
-    ID_HELP_TOPICS          "\83^\83X\83\83}\83l\81[\83W\83\83\82Ì\83w\83\8b\83\83g\83s\83b\83N\82ð\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_HELP_ABOUT           "\83v\83\8d\83O\83\89\83\80\8fî\95ñ\81A\83o\81[\83W\83\87\83\93\94Ô\8d\86\81A\92\98\8dì\8c \82ð\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_FILE_EXIT            "\83^\83X\83\83}\83l\81[\83W\83\83 \83A\83v\83\8a\83P\81[\83V\83\87\83\93\82ð\8fI\97¹\82µ\82Ü\82·\81B"
+    ID_HELP_TOPICS          "\83^\83X\83\83}\83l\81[\83W\83\83\82Ì\83w\83\8b\83\83g\83s\83b\83N\82ð\95\\\8e¦\82µ\82Ü\82·"
+    ID_HELP_ABOUT           "\83v\83\8d\83O\83\89\83\80\8fî\95ñ\81A\83o\81[\83W\83\87\83\93\94Ô\8d\86\81A\92\98\8dì\8c \82ð\95\\\8e¦\82µ\82Ü\82·"
+    ID_FILE_EXIT            "\83^\83X\83\83}\83l\81[\83W\83\83 \83A\83v\83\8a\83P\81[\83V\83\87\83\93\82ð\8fI\97¹\82µ\82Ü\82·"
     ID_OPTIONS_SHOW16BITTASKS
-                            "16 \83r\83b\83\83^\83X\83N\82ð\81A\8aÖ\98A\95t\82¯\82ç\82ê\82½ ntvdm.exe \82Ì\89º\82É\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_VIEW_SELECTCOLUMNS   "[\83v\83\8d\83Z\83X] \83y\81[\83W\82É\95\\\8e¦\82·\82é\97ñ\82ð\91I\91ð\82µ\82Ü\82·\81B"
-    ID_VIEW_SHOWKERNELTIMES "\83J\81[\83l\83\8b\8e\9e\8aÔ\82ð\83p\83t\83H\81[\83}\83\93\83\83O\83\89\83t\8fã\82É\95\\\8e¦\82µ\82Ü\82·\81B"
+                            "16 \83r\83b\83\83^\83X\83N\82ð\81A\8aÖ\98A\95t\82¯\82ç\82ê\82½ ntvdm.exe \82Ì\89º\82É\95\\\8e¦\82µ\82Ü\82·"
+    ID_VIEW_SELECTCOLUMNS   "[\83v\83\8d\83Z\83X] \83y\81[\83W\82É\95\\\8e¦\82·\82é\97ñ\82ð\91I\91ð\82µ\82Ü\82·"
+    ID_VIEW_SHOWKERNELTIMES "\83J\81[\83l\83\8b\8e\9e\8aÔ\82ð\83p\83t\83H\81[\83}\83\93\83\83O\83\89\83t\8fã\82É\95\\\8e¦\82µ\82Ü\82·"
     ID_VIEW_CPUHISTORY_ONEGRAPHALL
-                            "\82·\82×\82Ä\82Ì CPU \82Ì\8eg\97p\97¦\82Ì\91\8d\8cv\82ð 1 \82Â\82Ì\83O\83\89\83t\82Å\95\\\8e¦\82µ\82Ü\82·\81B"
-    ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU \8eg\97p\97¦\82Ì\97\9a\97ð\82ð CPU \82²\82Æ\82É\83O\83\89\83t\82Å\95\\\8e¦\82µ\82Ü\82·\81B"
+                            "\82Â\82Ì\97\9a\97ð\83O\83\89\83t\82Å CPU \8eg\97p\97¦\82Ì\8d\87\8cv\82ð\95\\\8e¦\82µ\82Ü\82·"
+    ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU \8eg\97p\97¦\82Ì\97\9a\97ð\82ð CPU \82²\82Æ\82É\83O\83\89\83t\82Å\95\\\8e¦\82µ\82Ü\82·"
     ID_APPLICATION_PAGE_SWITCHTO
-                            "\83^\83X\83N\82ð\8eè\91O\82É\88Ú\93®\82³\82¹\81A\90Ø\82è\91Ö\82¦\82Ü\82·\81B"
+                            "\83^\83X\83N\82ð\8eè\91O\82É\95\\\8e¦\82µ\81A\83t\83H\81[\83J\83X\82ð\90Ø\82è\91Ö\82¦\82Ü\82·"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_ENDTASK              "\91I\91ð\82³\82ê\82Ä\82¢\82é\83^\83X\83N\82É\8fI\97¹\82·\82é\82æ\82¤\93`\82¦\82Ü\82·\81B"
-    ID_GOTOPROCESS          "\91I\91ð\82³\82ê\82Ä\82¢\82é\83^\83X\83N\82É\90Ø\82è\91Ö\82¦\82Ü\82·\81B"
-    ID_RESTORE              "\83^\83X\83\83}\83l\81[\83W\83\83\82ð\89B\82ê\82½\8fó\91Ô\82©\82ç\8c³\82Ì\83T\83C\83Y\82É\96ß\82µ\82Ü\82·\81B"
-    ID_PROCESS_PAGE_ENDPROCESS "\83v\83\8d\83Z\83X\82ð\83V\83X\83e\83\80\82©\82ç\8dí\8f\9c\82µ\82Ü\82·\81B"
+    ID_ENDTASK              "\91I\91ð\82³\82ê\82Ä\82¢\82é\83^\83X\83N\82É\8fI\97¹\82·\82é\82æ\82¤\8ew\8e¦\82µ\82Ü\82·"
+    ID_GOTOPROCESS          "\91I\91ð\82³\82ê\82Ä\82¢\82é\83^\83X\83N\82Ì\83v\83\8d\83Z\83X\82É\83t\83H\81[\83J\83X\82ð\90Ø\82è\91Ö\82¦\82Ü\82·"
+    ID_RESTORE              "\89B\82ê\82Ä\82¢\82½\83^\83X\83\83}\83l\81[\83W\83\83\82ð\8c³\82É\96ß\82µ\82Ü\82·"
+    ID_PROCESS_PAGE_ENDPROCESS "\83V\83X\83e\83\80\82©\82ç\83v\83\8d\83Z\83X\82ð\8dí\8f\9c\82µ\82Ü\82·"
     ID_PROCESS_PAGE_ENDPROCESSTREE
-                            "\82±\82Ì\83v\83\8d\83Z\83X\82Æ\82·\82×\82Ä\82Ì\8eq\83v\83\8d\83Z\83X\82ð\83V\83X\83e\83\80\82©\82ç\8dí\8f\9c\82µ\82Ü\82·\81B"
-    ID_PROCESS_PAGE_DEBUG   "\83f\83o\83b\83K\82ð\82±\82Ì\83v\83\8d\83Z\83X\82É\90Ú\91±\82µ\82Ü\82·\81B"
+                            "\82±\82Ì\83v\83\8d\83Z\83X\82Æ\8eq\83v\83\8d\83Z\83X\82ð\82·\82×\82Ä\8dí\8f\9c\82µ\82Ü\82·"
+    ID_PROCESS_PAGE_DEBUG   "\82±\82Ì\83v\83\8d\83Z\83X\82É\83f\83o\83b\83K\82ð\93Y\95t\82µ\82Ü\82·"
     ID_PROCESS_PAGE_SETAFFINITY
-