[ros-diffs] [dreimer] 34401: Bug 3492 - Bug 3497: Norwegian Translations for dxdiag sndvol32 kbswitch devmgmt eventvwr servman by Lars Martin. Synched Winhlp32 with Wine HEAD.

dreimer at svn.reactos.org dreimer at svn.reactos.org
Thu Jul 10 08:51:18 CEST 2008


Author: dreimer
Date: Thu Jul 10 01:51:18 2008
New Revision: 34401

URL: http://svn.reactos.org/svn/reactos?rev=34401&view=rev
Log:
Bug 3492 - Bug 3497: Norwegian Translations for dxdiag sndvol32 kbswitch devmgmt eventvwr servman by Lars Martin.
Synched Winhlp32 with Wine HEAD.

Added:
    trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc   (with props)
    trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc   (with props)
    trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc   (with props)
    trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc   (with props)
    trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc   (with props)
    trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc   (with props)
Modified:
    trunk/reactos/base/applications/dxdiag/rsrc.rc
    trunk/reactos/base/applications/kbswitch/rsrc.rc
    trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc
    trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc
    trunk/reactos/base/applications/mscutils/servman/rsrc.rc
    trunk/reactos/base/applications/sndvol32/rsrc.rc
    trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc
    trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc
    trunk/reactos/base/applications/winhlp32/lang/da-DK.rc
    trunk/reactos/base/applications/winhlp32/lang/de-DE.rc
    trunk/reactos/base/applications/winhlp32/lang/en-US.rc
    trunk/reactos/base/applications/winhlp32/lang/es-ES.rc
    trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc
    trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc
    trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc
    trunk/reactos/base/applications/winhlp32/lang/it-IT.rc
    trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc
    trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc
    trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc
    trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc
    trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc
    trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc
    trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc
    trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc
    trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc
    trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc
    trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc
    trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc
    trunk/reactos/base/applications/winhlp32/lex.yy.c
    trunk/reactos/base/applications/winhlp32/macro.c
    trunk/reactos/base/applications/winhlp32/macro.lex.l
    trunk/reactos/base/applications/winhlp32/rsrc.rc
    trunk/reactos/base/applications/winhlp32/winhelp.c
    trunk/reactos/base/applications/winhlp32/winhelp.h
    trunk/reactos/base/applications/winhlp32/winhelp_res.h
    trunk/reactos/base/applications/winhlp32/winhlp32.rbuild

Added: trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc?rev=34401&view=auto
==============================================================================
--- trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc (added)
+++ trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -1,0 +1,224 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDD_MAIN_DIALOG DIALOGEX DISCARDABLE  0, 0, 478, 280
+STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
+    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
+    WS_THICKFRAME
+CAPTION "ReactX-Diagnostic program"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
+    PUSHBUTTON "&Hjelp", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "&Neste side", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Lagre Alt Informasjon...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    PUSHBUTTON "&Avslutt", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Dette verktøyet rapporterer detaljert informasjon om ReactX komponenter og enheter som er installert på ditt system.", -1, 10, 10, 443, 17
+    LTEXT "Hvis du vet hvilket område som skaper problemer, velger du den aktuelle kategorien ovenfor. Hvis ikke, kan du bruke knappen ""Neste side"" nedenfor for å besøke alle sidene sekvensielt.", -1, 10, 30, 443, 25
+    GROUPBOX "System Informasjon", -1, 10, 55, 443, 130, SS_RIGHT
+    LTEXT "Nåværende Dato/Tid:", -1, 70, 70, 80, 10, SS_RIGHT
+    LTEXT "Datamaskin Navn:", -1, 70, 80, 80, 10, SS_RIGHT
+    LTEXT "Operativsystem:", -1, 70, 90, 80, 10, SS_RIGHT
+    LTEXT "Språk:", -1, 70, 100, 80, 10, SS_RIGHT
+    LTEXT "System fabrikant:", -1, 70, 110, 80, 10, SS_RIGHT
+    LTEXT "System modell:", -1, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
+    LTEXT "Prosessor:", -1, 70, 140, 80, 10, SS_RIGHT
+    LTEXT "Minne:", -1, 70, 150, 80, 10, SS_RIGHT
+    LTEXT "Sideveksel fil:", -1, 70, 160, 80, 10, SS_RIGHT
+    LTEXT "ReactX-Versjon:", -1, 70, 170, 80, 10, SS_RIGHT
+    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
+    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
+END
+
+IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Enhet", -1, 10, 10, 250, 100
+    RTEXT "Navn:", -1, 20, 25, 70, 10
+    RTEXT "Fabrikant:", -1, 20, 35, 70, 10
+    RTEXT "Brikketype:", -1, 20, 45, 70, 10
+    RTEXT "DAC type:", -1, 20, 55, 70, 10
+    RTEXT "Cirka total minne:", -1, 20, 65, 70, 10
+    RTEXT "Gjeldende skjermmodus:", -1, 20, 75, 70, 10
+    RTEXT "Skjerm:", -1, 20, 85, 70, 10
+    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
+    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
+    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
+    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
+    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
+    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
+    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
+
+    GROUPBOX "Driver", -1, 270, 10, 190, 100
+    RTEXT "Hoved driver:", -1, 275, 25, 55, 10
+    RTEXT "Versjon:", -1, 275, 35, 55, 10
+    RTEXT "Dato:", -1, 275, 45, 55, 10
+    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
+    RTEXT "Mini-VDD:", -1, 275, 65, 55, 10
+    RTEXT " vvdddVDD:", -1, 275, 75, 55, 10
+    RTEXT "DDI Versjon:", -1, 275, 85, 55, 10
+    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
+
+    GROUPBOX "ReactX-Funksjoner", -1, 10, 115, 450, 60
+    RTEXT "DirectDraw akselerasjon:", -1, 15, 130, 110, 12
+    RTEXT "Direct3D akselerasjon:", -1, 15, 145, 110, 12
+    RTEXT "AGP tekstur akselerasjon:", -1, 15, 160, 110, 12
+    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
+    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
+    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
+    PUSHBUTTON "Aktivert", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktivert", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
+    PUSHBUTTON "Aktivert", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
+    PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
+    PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14, WS_DISABLED
+
+    GROUPBOX "Merknader", -1, 10, 180, 450, 40
+    EDITTEXT  IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+
+IDD_SOUND_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Enheter", -1, 10, 10, 250, 100
+    RTEXT "Navn:", -1, 20, 25, 70, 10
+    RTEXT "Enhet ID:", -1, 20, 35, 70, 10
+    RTEXT "Fabrikant ID:", -1, 20, 45, 70, 10
+    RTEXT "Produkt ID:", -1, 20, 55, 70, 10
+    RTEXT "Type:", -1, 20, 65, 70, 10
+    RTEXT "Standard enhet:", -1, 20, 75, 70, 10
+    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
+    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
+    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
+    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
+    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
+    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
+    GROUPBOX "Driver", -1, 270, 10, 190, 100
+    RTEXT "Navn:", -1, 275, 25, 55, 10
+    RTEXT "Versjon:", -1, 275, 35, 55, 10
+    RTEXT "Dato:", -1, 275, 45, 55, 10
+    RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10
+    RTEXT "Andre filer:", -1, 275, 65, 55, 10
+    RTEXT "Provider:", -1, 275, 75, 55, 10
+    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
+    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
+    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
+    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
+    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
+    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
+    GROUPBOX "ReactX-Funksjoner", -1, 10, 115, 450, 60
+    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
+    RTEXT "Maskinvare lyd\nAcceleration Level:", -1, 20, 135, 90, 20
+    PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
+    GROUPBOX "Merknader", -1, 10, 180, 450, 40
+    EDITTEXT  IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
+END
+
+IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+
+IDD_INPUT_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "DirectInput Enheter", -1, 10, 10, 452, 80
+    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+    GROUPBOX "Input Enheter", -1, 10, 100, 452, 60
+    CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
+    GROUPBOX "Informasjon", -1, 10, 170, 452, 50
+    EDITTEXT  IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
+END
+
+IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+    GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80
+    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
+END
+
+IDD_HELP_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
+FONT 8, "MS Shell Dlg"
+BEGIN
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_MAIN_DIALOG "ReactX diagnoseverktøy"
+	IDS_SYSTEM_DIALOG "System"
+	IDS_DISPLAY_DIALOG "Skjerm"
+	IDS_SOUND_DIALOG "Lyd"
+	IDS_MUSIC_DIALOG "Musikk"
+	IDS_INPUT_DIALOG "Input"
+	IDS_NETWORK_DIALOG "Nettverk"
+	IDS_HELP_DIALOG "Hjelp"
+	IDS_FORMAT_MB "%I64uMB RAM"
+	IDS_FORMAT_SWAP "%I64u MB brukt, %I64u MB tilgjengelig"
+	IDS_FORMAT_UNIPROC "%s (%u CPU)"
+	IDS_FORMAT_MPPROC  "%s (%u CPUs)"
+	IDS_VERSION_UNKNOWN "Ukjent versjon"
+	IDS_DEVICE_STATUS_ATTACHED "Koblet til"
+	IDS_DEVICE_STATUS_MISSING "Koblet fra"
+	IDS_DEVICE_STATUS_UNKNOWN "Ukjent"
+	IDS_DEVICE_NAME "Enhetsnavn"
+	IDS_DEVICE_STATUS "Status"
+	IDS_DEVICE_CONTROLLER "Kontroller ID"
+	IDS_DEVICE_MANUFACTURER "Fabrikant ID"
+	IDS_DEVICE_PRODUCT "Produkt ID"
+	IDS_DEVICE_FORCEFEEDBACK "Force Feedback-driver"
+	IDS_NOT_APPLICABLE "Ikke gjeldende"
+	IDS_OPTION_YES "Ja"
+	IDS_DIRECTPLAY_COL_NAME1 "Navn"
+	IDS_DIRECTPLAY_COL_NAME2 "Register"
+	IDS_DIRECTPLAY_COL_NAME3 "Fil"
+	IDS_DIRECTPLAY_COL_NAME4 "Versjon"
+	IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider"
+	IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider"
+	IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider"
+	IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider"
+	IDS_DIRECTPLAY_TCPCONN "Internett TCP/IP tilkobling for DirectPlay"
+	IDS_DIRECTPLAY_IPXCONN "IPX tilkobling for DirectPlay"
+	IDS_DIRECTPLAY_MODEMCONN "Modem tilkobling for DirectPlay"
+	IDS_DIRECTPLAY_SERIALCONN "Serial tilkoblig for DirectPlay"
+	IDS_REG_SUCCESS "OK"
+	IDS_REG_FAIL "Feil"
+	IDS_DDTEST_ERROR "Testen mislykkes!"
+	IDS_DDTEST_DESCRIPTION "Dette vil starte DirecDraw grenseflate test. Fortsette?"
+	IDS_DDPRIMARY_DESCRIPTION "Denne testen vil bruke DirectDraw to draw on primary surface. Svart og hvit rektangulær skulle bli drawn. Fortsette?"
+	IDS_DDPRIMARY_RESULT "Så du svarte og hvite rektangeler?"
+	IDS_DDOFFSCREEN_DESCRIPTION "Denne testen vil bruke DirectDraw til å draw i en offscreen buffer. Bevegende hvite rektangler skulle bli drawn. Fortsette?"
+	IDS_DDOFFSCREEN_RESULT "Så du de hvite bevegende rektangeler?"
+	IDS_DDFULLSCREEN_DESCRIPTION "Denne testen vil bruke DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Fortsette?"
+	IDS_DDFULLSCREEN_RESULT "Så du de hvite bevegende rektangeler i fullskjermmodus?"
+	IDS_FORMAT_ADAPTER_MEM "%u MB"
+	IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
+	IDS_OPTION_NO "Nei"
+END

Propchange: trunk/reactos/base/applications/dxdiag/lang/nb-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/dxdiag/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -9,6 +9,7 @@
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
+#include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

Added: trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc?rev=34401&view=auto
==============================================================================
--- trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc (added)
+++ trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -1,0 +1,11 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDR_POPUP MENU
+BEGIN
+    POPUP "popup"
+    BEGIN
+        MENUITEM "&Innstillinger...",  ID_PREFERENCES
+        MENUITEM SEPARATOR
+        MENUITEM "&Avslutt",            ID_EXIT
+    END
+END

Propchange: trunk/reactos/base/applications/kbswitch/lang/nb-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -5,6 +5,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/lt-LT.rc"
+#include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc?rev=34401&view=auto
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc (added)
+++ trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -1,0 +1,82 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDR_MAINMENU MENU
+BEGIN
+  POPUP "&Fil"
+  BEGIN
+    MENUITEM "A&vslutt",                   IDC_EXIT
+  END
+  POPUP "Handling"
+  BEGIN
+    MENUITEM "Skriv ut",                   IDC_PRINT, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Egenskaper",              IDC_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Hjelp",                    IDC_PROGHELP, GRAYED
+  END
+  POPUP "Vis"
+  BEGIN
+    MENUITEM "Enheter etter type",         IDC_DEVBYTYPE, CHECKED
+    MENUITEM "Enheter etter tilkobling",   IDC_STATIC, GRAYED
+    MENUITEM "Ressurser etter type",       IDC_STATIC, GRAYED
+    MENUITEM "Ressurser etter tilkobling", IDC_STATIC, GRAYED
+  END
+  POPUP "Hjelp"
+  BEGIN
+    MENUITEM "Hjelp",                    IDC_PROGHELP
+    MENUITEM "Om",                   IDC_ABOUT
+  END
+END
+
+IDR_POPUP MENU
+BEGIN
+  POPUP "popup"
+  BEGIN
+    MENUITEM "Egenskaper",              IDC_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Hjelp",                    IDC_PROGHELP
+  END
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
+CAPTION "Om Enhetsbehandler"
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT "Enhetsbehandler v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy at gmail.com)", IDC_STATIC, 48, 7, 130, 30
+  PUSHBUTTON "Lukk", 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 "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_TOOLTIP_PROP      "Egenskaper"
+  IDS_TOOLTIP_REFRESH   "Oppdater"
+  IDS_TOOLTIP_HELP      "Hjelp"
+  IDS_TOOLTIP_EXIT      "Avslutt"
+END
+
+/* Hints */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_APPNAME "ReactOS Enhetsbehandler"
+  IDS_HINT_BLANK        " "
+  IDS_HINT_EXIT         " Avslutt programmet."
+  IDS_HINT_REFRESH      " Oppdater tjeneste listen."
+  IDS_HINT_PROP         " Open property sheet for the current selection."
+  IDS_HINT_HELP         " Vis hjelp vinduet."
+  IDS_HINT_ABOUT        " Om ReactOS Enhetsbehandler."
+
+  IDS_HINT_SYS_RESTORE  " Gjenopprett dette vinduet til vanlig størrelse."
+  IDS_HINT_SYS_MOVE     " Flytt dette vinduet."
+  IDS_HINT_SYS_SIZE     " Endre størrelse på dette vinduet."
+  IDS_HINT_SYS_MINIMIZE " Gjør om dette vinduet til en ikon."
+  IDS_HINT_SYS_MAXIMIZE " Gjør om dette vinduet til å fylle hele skjermen."
+  IDS_HINT_SYS_CLOSE    " Lukk dette vinduet."
+END

Propchange: trunk/reactos/base/applications/mscutils/devmgmt/lang/nb-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -21,6 +21,7 @@
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/ko-KR.rc"
+#include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc?rev=34401&view=auto
==============================================================================
--- trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc (added)
+++ trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -1,0 +1,104 @@
+/*
+ * PROJECT:     ReactOS Event Viewer
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/mscutils/eventvwr/lang/en-US.rc
+ * PURPOSE:     Norwegian Language File for ReactOS Event Viewer
+ * TRANSLATORS: Marc Piulachs
+ */
+
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDC_EVENTVWR MENU
+BEGIN
+	POPUP "&Logg"
+	BEGIN
+		MENUITEM "&Applikasjon",              ID_LOG_APPLICATION, CHECKED
+		MENUITEM "&Sikkerhet",                 ID_LOG_SECURITY
+		MENUITEM "&System",                   ID_LOG_SYSTEM
+		MENUITEM SEPARATOR
+		MENUITEM "A&vslutt",                     IDM_EXIT
+	END
+	POPUP "&Vis"
+	BEGIN
+		MENUITEM "&Oppdater",                  IDM_REFRESH
+	END
+	MENUITEM "&Handling",                    ID_OPTIONS
+	POPUP "&Hjelp"
+	BEGIN
+		MENUITEM "Hj&elp",                     IDM_HELP
+		MENUITEM SEPARATOR
+		MENUITEM "&Om...",                 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 "Om"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+	ICON            IDI_EVENTVWR,IDC_MYICON,14,9,21,20
+	LTEXT           "ReactOS Hendelseliste Versjon 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+	LTEXT           "Copyright (C) 2007 Marc Piulachs (marc.piulachs at 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 "Vent.."
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+	CTEXT           "Laster Hendelseliste. Venligst vent ...",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 "Hendelse detaljer"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+	DEFPUSHBUTTON   "&Lukk",IDOK,12,258,50,14
+	PUSHBUTTON      "&Forrige",IDPREVIOUS,78,258,50,14
+	PUSHBUTTON      "&Neste",IDNEXT,144,258,50,14
+	PUSHBUTTON      "&Hjelp",IDHELP,210,258,50,14
+	EDITTEXT        IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY
+	LTEXT           "&Beskrivelse:",IDC_STATIC,15,70,39,8
+	LTEXT           "Dato:",IDC_STATIC,14,14,36,8
+	LTEXT           "Statisk",IDC_EVENTDATESTATIC,56,14,72,8
+	LTEXT           "Tid:",IDC_STATIC,14,27,36,8
+	LTEXT           "Statisk",IDC_EVENTTIMESTATIC,56,27,72,8
+	LTEXT           "&Bruker:",IDC_STATIC,14,41,36,8
+	LTEXT           "Statisk",IDC_EVENTUSERSTATIC,56,41,72,8
+	LTEXT           "&Datamaskin:",IDC_STATIC,14,54,36,8
+	LTEXT           "Statisk",IDC_EVENTCOMPUTERSTATIC,56,54,72,8
+	LTEXT           "Hendelse ID:",IDC_STATIC,133,15,36,8
+	LTEXT           "Statisk",IDC_EVENTIDSTATIC,175,15,87,8
+	LTEXT           "Kilde:",IDC_STATIC,133,28,36,8
+	LTEXT           "Statisk",IDC_EVENTSOURCESTATIC,175,28,87,8
+	LTEXT           "Type:",IDC_STATIC,133,42,36,8
+	LTEXT           "Statisk",IDC_EVENTTYPESTATIC,175,42,87,8
+	LTEXT           "Kategori:",IDC_STATIC,133,55,36,8
+	LTEXT           "Statisk",IDC_EVENTCATEGORYSTATIC,175,55,87,8
+	EDITTEXT        IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY
+	LTEXT           "D&ata",IDC_STATIC,14,194,20,8
+	CONTROL         "&Tegn",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10
+	CONTROL         "&Ord",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10
+END
+
+STRINGTABLE
+BEGIN
+	IDS_APP_TITLE                  "Hendelseliste"
+	IDC_EVENTSTRINGIDNOTFOUND      "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin."
+	IDC_EVENTLOG_ERROR_TYPE        "Feil"
+	IDC_EVENTLOG_WARNING_TYPE      "Advarseler"
+	IDC_EVENTLOG_INFORMATION_TYPE  "Informasjon"
+	IDC_EVENTLOG_AUDIT_SUCCESS     "Revisjon suksess"
+	IDC_EVENTLOG_AUDIT_FAILURE     "Revisjon misslykkes"
+	IDC_EVENTLOG_SUCCESS           "Suksess"
+	IDC_EVENTLOG_UNKNOWN_TYPE      "Ukjent hendelse"
+END

Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/nb-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -17,6 +17,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/ko-KR.rc"
+#include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

Added: trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc?rev=34401&view=auto
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc (added)
+++ trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -1,0 +1,267 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDR_MAINMENU MENU
+BEGIN
+  POPUP "&Fil"
+  BEGIN
+    MENUITEM "Eksportere...",   ID_EXPORT
+    MENUITEM SEPARATOR
+    MENUITEM "A&vslutt",       ID_EXIT
+  END
+  POPUP "Handling"
+  BEGIN
+    MENUITEM "Koble til...", ID_CONNECT, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Start",       ID_START, GRAYED
+    MENUITEM "Stopp",        ID_STOP, GRAYED
+    MENUITEM "Pause",       ID_PAUSE, GRAYED
+    MENUITEM "Fortsett",      ID_RESUME, GRAYED
+    MENUITEM "Restart",     ID_RESTART, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Oppdater",     ID_REFRESH
+    MENUITEM SEPARATOR
+    MENUITEM "Rediger...",     ID_EDIT, GRAYED
+    MENUITEM "Opprett...",   ID_CREATE, GRAYED
+    MENUITEM "Slett...",   ID_DELETE, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Egenskaper...", ID_PROP, GRAYED
+  END
+  POPUP "Vis"
+  BEGIN
+    MENUITEM "Store ikoner", ID_VIEW_LARGE
+    MENUITEM "Små ikoner", ID_VIEW_SMALL
+    MENUITEM "Liste",        ID_VIEW_LIST
+    MENUITEM "Detaljer",     ID_VIEW_DETAILS
+    MENUITEM SEPARATOR
+    MENUITEM "Tilpasning...",ID_VIEW_CUST, GRAYED
+  END
+  POPUP "Hjelp"
+  BEGIN
+    MENUITEM "Hjelp",        ID_HELP
+    MENUITEM "Om",       ID_ABOUT
+  END
+END
+
+IDR_POPUP MENU
+BEGIN
+  POPUP "popup"
+  BEGIN
+    MENUITEM "Start",       ID_START, GRAYED
+    MENUITEM "Stopp",        ID_STOP, GRAYED
+    MENUITEM "Pause",       ID_PAUSE, GRAYED
+    MENUITEM "Fortsett",      ID_RESUME, GRAYED
+    MENUITEM "Restart",     ID_RESTART, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Oppdater",     ID_REFRESH
+    MENUITEM SEPARATOR
+    MENUITEM "Rediger...",     ID_EDIT, GRAYED
+    MENUITEM "Slett...",   ID_DELETE, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Egenskaper...", ID_PROP, GRAYED
+    MENUITEM SEPARATOR
+    MENUITEM "Hjelp...",     ID_HELP
+  END
+END
+
+IDD_ABOUTBOX DIALOGEX 22,16,190,182
+CAPTION "Om Tjenestebehandler"
+FONT 8, "MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+  LTEXT "Tjenestebehandler v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy at reactos.org)", IDC_STATIC, 48, 7, 135, 30
+  PUSHBUTTON "Lukk", 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 "Generielt"
+FONT 8, "MS Shell Dlg",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 "Start", IDC_START, 6, 155, 54, 15, WS_DISABLED
+  PUSHBUTTON "Stopp", IDC_STOP, 68, 155, 54, 15, WS_DISABLED
+  PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED
+  PUSHBUTTON "Fortsett", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED
+  LTEXT "Tjenestenavn:", IDC_STATIC, 4, 11, 53, 11
+  LTEXT "Visningnavn:", IDC_STATIC, 4, 29, 53, 11
+  LTEXT "Beskrivelse:", IDC_STATIC, 4, 51, 53, 11
+  LTEXT "Bane til kjørbar fil:", IDC_STATIC, 6, 73, 82, 9
+  LTEXT "Oppstart type:", IDC_STATIC, 6, 108, 53, 11
+  LTEXT "Tjenestestatus:", IDC_STATIC, 4, 138, 53, 11
+  LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE
+  LTEXT "Du kan angi startparameteret som gjelder når du starter tjenesten herfra.",IDC_STATIC, 6,177,240,15
+  LTEXT "startparameteret:", IDC_STATIC, 6, 200, 58, 11
+  EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  PUSHBUTTON "Rediger", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
+END
+
+IDD_DLG_DEPEND DIALOGEX 6,6,253,225
+CAPTION "Dependencies"
+FONT 8, "MS Shell Dlg",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 "Noen tjenester depend på andre tjenester, system drivere og laster system grupper. Hvis system komponenten er stoppet eller ikke kjøre riktig, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26
+  LTEXT "Denne tjenesten depends på følgende komponenter", IDC_STATIC, 8, 57, 236, 9
+  LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
+END
+
+IDD_DLG_CREATE DIALOGEX 6,6,225,209
+CAPTION "Opprett en tjeneste"
+FONT 8, "MS Shell Dlg",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 "*Tjenestenavn:", IDC_STATIC, 12, 12, 54, 9
+  LTEXT "*Visningsnavn:", IDC_STATIC, 12, 33, 54, 9
+  LTEXT "*Bane til kjørbar fil:", IDC_STATIC, 10, 51, 68, 9
+  LTEXT "Beskrivelse:", IDC_STATIC, 12, 86, 44, 9
+  PUSHBUTTON "OK", IDOK, 126, 192, 44, 13
+  PUSHBUTTON "Avbryt", IDCANCEL, 176, 192, 46, 13
+  LTEXT "'Ytterligere valg (klikk hjelp for detaljer)", IDC_STATIC, 10, 151, 134, 9
+  PUSHBUTTON "Hjelp", ID_CREATE_HELP, 10, 192, 44, 13
+END
+
+IDD_DLG_DELETE DIALOGEX 6,6,185,148
+CAPTION "Slett en tjenste"
+FONT 8, "MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
+BEGIN
+  ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
+  LTEXT "Er du sikker på at du vil slette denne tjenesten? Den kan ikke bli åpnet hvis den blir fjernet!", IDC_STATIC, 50, 6, 125, 25
+  LTEXT "Tjenestenavn:",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 "Ja", IDOK, 26, 129, 54, 13
+  DEFPUSHBUTTON "Nei", IDCANCEL, 102, 129, 54, 13
+END
+
+IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
+CAPTION "Valg"
+FONT 8, "MS Shell Dlg",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 "Tjeneste kontroll"
+FONT 8, "MS Shell Dlg",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 "&Lukk", IDOK, 100, 70, 54, 13
+END
+
+
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_FIRSTCOLUMN "Navn"
+  IDS_SECONDCOLUMN "Beskrivelse"
+  IDS_THIRDCOLUMN "Status"
+  IDS_FOURTHCOLUMN "Oppstart type"
+  IDS_FITHCOLUMN "Logg på som"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_SERVICES_STARTED "Startet"
+  IDS_SERVICES_STOPPED "Stoppet"
+  IDS_SERVICES_AUTO "Automatisk"
+  IDS_SERVICES_MAN "Manuell"
+  IDS_SERVICES_DIS "Deaktivert"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_NUM_SERVICES "Num tjeneste: %d"
+  IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_TOOLTIP_PROP "Properties"
+  IDS_TOOLTIP_REFRESH "Oppdater"
+  IDS_TOOLTIP_EXPORT "Export list"
+  IDS_TOOLTIP_CREATE "Create a new service"
+  IDS_TOOLTIP_DELETE "Deletes an existing service"
+  IDS_TOOLTIP_START "Start tjeneste"
+  IDS_TOOLTIP_STOP "Stopp tjeneste"
+  IDS_TOOLTIP_PAUSE "Pause tjeneste"
+  IDS_TOOLTIP_RESTART "Restart tjeneste"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_PROGRESS_INFO_START  "ReactOS forsøker å starte følgende tjeneste"
+  IDS_PROGRESS_INFO_STOP   "ReactOS forsøker å stoppe følgende tjeneste"
+  IDS_PROGRESS_INFO_PAUSE  "ReactOS forsøker å pause følgende tjeneste"
+  IDS_PROGRESS_INFO_RESUME "ReactOS forsøker å fortsette følgende tjeneste"
+  IDS_CREATE_SUCCESS "Tjenesten ble opprettet"
+  IDS_DELETE_SUCCESS "Tjenesten ble slettet"
+  IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory"
+  IDS_DELETE_STOP "Du må manuelt stoppe tjenesten før den kan slettes!"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = 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       (default = LocalSystem)\r\n password= <password>\r\n"
+END
+
+/* Hints */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_HINT_BLANK        " "
+  IDS_HINT_EXPORT       " Eksporter nåværende liste til en fil."
+  IDS_HINT_EXIT         " Avslutt programmet."
+
+  IDS_HINT_CONNECT      " Behandle en annen datamaskin."
+  IDS_HINT_START        " Start valgte tjeneste."
+  IDS_HINT_STOP         " Stopp valgte tjeneste."
+  IDS_HINT_PAUSE        " Pause valgte tjeneste."
+  IDS_HINT_RESUME       " Fortsett valgte tjeneste."
+  IDS_HINT_RESTART      " Stopp og start valgte tjeneste."
+  IDS_HINT_REFRESH      " Oppdater tjeneste listen."
+  IDS_HINT_EDIT         " Edit the properties of the selected service."
+  IDS_HINT_CREATE       " Opprett en ny tjeneste."
+  IDS_HINT_DELETE       " Slett valgte tjeneste."
+  IDS_HINT_PROP         " Åpne egenskap ark for nåværende utvalg."
+
+  IDS_HINT_LARGE        " Vis elementer med å bruke store ikoner."
+  IDS_HINT_SMALL        " Vis elementer med å bruke mindre ikoner."
+  IDS_HINT_LIST         " Vis elementer i en liste."
+  IDS_HINT_DETAILS      " Vis informasjon om hver element i et vindu."
+  IDS_HINT_CUST         " Tilpass bildet."
+
+  IDS_HINT_HELP         " Vis hjelp vinduet."
+  IDS_HINT_ABOUT        " Om ReactOS Tjenestebehandler."
+
+  IDS_HINT_SYS_RESTORE  " Gjenopprett vinduet til normal størrelse."
+  IDS_HINT_SYS_MOVE     " Flytt dette vinduet."
+  IDS_HINT_SYS_SIZE     " Endre størrelsen på dette vinduet."
+  IDS_HINT_SYS_MINIMIZE " Endre størrelsen på dette vinduet til en ikon."
+  IDS_HINT_SYS_MAXIMIZE " Endre størrelsen på dette vinduet til fullskjerm."
+  IDS_HINT_SYS_CLOSE    " Lukk dette vinduet."
+END
+
+/* Application title */
+STRINGTABLE DISCARDABLE
+BEGIN
+  IDS_APPNAME "ReactOS Tjenestebehandler"
+END

Propchange: trunk/reactos/base/applications/mscutils/servman/lang/nb-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/mscutils/servman/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/servman/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -25,6 +25,7 @@
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/ko-KR.rc"
+#include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/th-TH.rc"

Added: trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc?rev=34401&view=auto
==============================================================================
--- trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc (added)
+++ trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -1,0 +1,43 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+    POPUP "I&nnstillinger"
+    BEGIN
+        MENUITEM "E&genskaper", IDC_PROPERTIES
+        MENUITEM "&Avansert Kontroller", IDC_ADVANCED_CONTROLS
+        MENUITEM SEPARATOR
+        MENUITEM "A&vslutt", IDC_EXIT
+    END
+    POPUP "&Hjelp"
+    BEGIN
+        MENUITEM "&Emner i hjelp", IDC_HELP_TOPICS
+        MENUITEM SEPARATOR
+        MENUITEM "&Om Volumkontroll", IDC_ABOUT
+    END
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_SNDVOL32       "Volumkontroll"
+    IDS_NOMIXERDEVICES "Det er ingen aktive mikser enheter tilgjengelig! Programmet vil nå avsluttes."
+END
+
+IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Egenskaper"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "&Mikser enhet:", -1, 7,8,48,9
+  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
+  GROUPBOX "Still volumet for:", -1, 7,25,211,77
+  PUSHBUTTON "&Avspilling", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON
+  PUSHBUTTON "&Innspilling", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON
+  PUSHBUTTON "&Andre:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED
+  COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
+  LTEXT "Vis følgende volumkontroller:", IDC_LABELCONTROLS, 7, 109, 162, 8
+  CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96
+
+  PUSHBUTTON "OK", IDOK, 114,226,50,14
+  PUSHBUTTON "Avbryt", IDCANCEL, 168,226,50,14
+END

Propchange: trunk/reactos/base/applications/sndvol32/lang/nb-NO.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -18,6 +18,7 @@
 #include "lang/ja-JP.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
+#include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"
 #include "lang/ru-RU.rc"

Modified: trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -74,12 +74,12 @@
 STID_INFO,  		"Èíôîðìàöèÿ"
 STID_NOT_IMPLEMENTED, 	"Íå å ðåàëèçèðàíî"
 STID_HLPFILE_ERROR_s, 	"Ãðåøêà ïðè ÷åòåíå íà ïîìîùíèÿ ôàéë `%s'"
-STID_CONTENTS, 		"&Ñúäúðæàíèå"
-STID_SEARCH, 		"&Òúðñè"
+STID_INDEX, 		"&Ñúäúðæàíèå"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Íàçàä"
-STID_TOPICS,		"&Òåìè"
 STID_ALL_FILES, 	"Âñè÷êè ôàéëîâå (*.*)"
 STID_HELP_FILES_HLP, 	"Ïîìîùíè ôàéëîâå (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -79,12 +79,12 @@
 STID_INFO,  		"Informace"
 STID_NOT_IMPLEMENTED, 	"Není implementováno"
 STID_HLPFILE_ERROR_s, 	"Nelze pøeèíst soubor nápovìdy `%s'"
-STID_CONTENTS, 		"&Obsah"
-STID_SEARCH, 		"&Hledat"
+STID_INDEX, 		"&Obsah"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Zpìt"
-STID_TOPICS,		"&Témata"
 STID_ALL_FILES, 	"Všechny soubory (*.*)"
 STID_HELP_FILES_HLP, 	"Soubory nápovìdy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/da-DK.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -86,12 +86,12 @@
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Ikke implementeret"
 STID_HLPFILE_ERROR_s, 	"Fejl ved indlæsning af filen `%s'"
-STID_CONTENTS, 		"&Indhold"
-STID_SEARCH, 		"&Søg"
+STID_INDEX, 		"&Indhold"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Tilbage"
-STID_TOPICS, 		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjælpe filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan ikke finde '%s'. Vil du selv finde filen?"
 STID_NO_RICHEDIT	"Kan ikke finde en 'richedit' implementering... Afbryder"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/de-DE.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -86,14 +86,14 @@
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Nicht implementiert"
 STID_HLPFILE_ERROR_s, 	"Fehler beim Lesen der Hilfe-Datei `%s'"
-STID_CONTENTS, 		"&Inhalt"
-STID_SEARCH, 		"&Suchen"
+STID_INDEX, 		"&Inhalt"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Zurück"
-STID_TOPICS, 		"&Themen"
 STID_ALL_FILES, 	"Alle Dateien (*.*)"
 STID_HELP_FILES_HLP, 	"Hilfe-Dateien (*.hlp)"
 STID_FILE_NOT_FOUND_s	"'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?"
 STID_NO_RICHEDIT	"Die Richedit Implementation konnte nicht gefunden werden... Breche ab."
+STID_PSH_INDEX,		"Help topics: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

Modified: trunk/reactos/base/applications/winhlp32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/en-US.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -76,6 +76,14 @@
     PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Search"
+{
+    LTEXT  "Not implemented yet", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 {
@@ -85,14 +93,14 @@
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Not implemented"
 STID_HLPFILE_ERROR_s, 	"Error while reading the help file `%s'"
-STID_CONTENTS, 		"&Contents"
-STID_SEARCH, 		"&Search"
+STID_INDEX, 		"&Index"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Back"
-STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"All files (*.*)"
 STID_HELP_FILES_HLP, 	"Help files (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

Modified: trunk/reactos/base/applications/winhlp32/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/es-ES.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -76,12 +76,12 @@
 STID_INFO,  		"Información"
 STID_NOT_IMPLEMENTED, 	"Aún no implementado"
 STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
-STID_CONTENTS, 		"&Índice"
-STID_SEARCH, 		"&Buscar"
+STID_INDEX, 		"&Índice"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Anterior"
-STID_TOPICS,		"&Temas"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -77,12 +77,12 @@
 STID_INFO,  		"Tietoja"
 STID_NOT_IMPLEMENTED, 	"Ei käytettävissä"
 STID_HLPFILE_ERROR_s, 	"Virhe luettaessa ohjetiedostoa `%s'"
-STID_CONTENTS, 		"&Sisällys"
-STID_SEARCH, 		"&Etsi"
+STID_INDEX, 		"&Sisällys"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Takaisin"
-STID_TOPICS,		"T&opics"
 STID_ALL_FILES, 	"Kaikki tiedostot (*.*)"
 STID_HELP_FILES_HLP, 	"Ohjetiedostot (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -88,14 +88,14 @@
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Non implémenté"
 STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide « %s »"
-STID_CONTENTS, 		"&Index"
-STID_SEARCH, 		"&Rechercher"
+STID_INDEX, 		"&Index"
+STID_CONTENTS,		"Sommaire"
 STID_BACK, 		"&Précédent"
-STID_TOPICS,		"&Sujets"
 STID_ALL_FILES, 	"Tous fichiers (*.*)"
 STID_HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Impossible de trouver « %s ». Souhaitez-vous rechercher ce fichier vous-même ?"
 STID_NO_RICHEDIT	"La bibliothèque RichEdit n'a pu être localisée... Abandon"
+STID_PSH_INDEX,		"Rubriques d'aide : "
 }
 
 CONTEXT_MENU MENU

Modified: trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -77,12 +77,12 @@
 STID_INFO,  		"Információ"
 STID_NOT_IMPLEMENTED, 	"Nincs implementálva"
 STID_HLPFILE_ERROR_s, 	"Hiba a `%s' file olvasásakor"
-STID_CONTENTS, 		"&Tartalom"
-STID_SEARCH, 		"&Keresés"
+STID_INDEX, 		"&Tartalom"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Vissza"
-STID_TOPICS,		"&Témakörök"
 STID_ALL_FILES, 	"Minden fájl (*.*)"
 STID_HELP_FILES_HLP, 	"Súgó fájlok (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/it-IT.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -76,12 +76,12 @@
 STID_INFO,  		"Informazione"
 STID_NOT_IMPLEMENTED, 	"Non ancora implementato"
 STID_HLPFILE_ERROR_s, 	"Errore di lettura del file della Guida `%s'"
-STID_CONTENTS, 		"&Sommario"
-STID_SEARCH, 		"&Trova"
+STID_INDEX, 		"Index"
+STID_CONTENTS,		"&Sommario"
 STID_BACK, 		"&Precedente"
-STID_TOPICS,		"&Argomenti"
 STID_ALL_FILES, 	"Tutti i file (*.*)"
 STID_HELP_FILES_HLP, 	"File della Guida (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -88,14 +88,14 @@
 STID_INFO,  		"Á¤º¸"
 STID_NOT_IMPLEMENTED, 	"±¸ÇöµÇÁö ¾Ê¾ÒÀ½"
 STID_HLPFILE_ERROR_s, 	"µµ¿ò¸» ÆÄÀÏ `%s'¸¦ Àд µµÁß ¿À·ù ¹ß»ý"
-STID_CONTENTS, 		"¸ñÂ÷(&C)"
-STID_SEARCH, 		"ã±â(&S)"
+STID_INDEX, 		"¸ñÂ÷(&C)"
+STID_CONTENTS,		"¿ä¾à"
 STID_BACK, 		"µÚ·Î(&B)"
-STID_TOPICS,		"¸ñÂ÷(&T)"
 STID_ALL_FILES, 	"¸ðµç ÆÄÀÏ (*.*)"
 STID_HELP_FILES_HLP, 	"µµ¿ò¸» ÆÄÀÏ (*.hlp)"
 STID_FILE_NOT_FOUND_s	"%sÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù'. ÀÌ ÆÄÀÏÀ» Á÷Á¢ ã°Ú½À´Ï±î?"
 STID_NO_RICHEDIT	"richedit  ±¸ÇöÀ» ãÀ»¼ö ¾÷½À´Ï´Ù.. Ãë¼ÒÁß"
+STID_PSH_INDEX,		"µµ¿ò¸» ¸ñÂ÷: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL

Modified: trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -26,41 +26,41 @@
   MENUITEM "&Åpne", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Skriv &ut", MNID_FILE_PRINT
-  MENUITEM "Opp&sett av skriveren...", MNID_FILE_SETUP
+  MENUITEM "Opp&sett av skriveren ...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Avslutt", MNID_FILE_EXIT
  }
  POPUP "R&ediger" {
-   MENUITEM "&Kopier...", MNID_EDIT_COPYDLG
+   MENUITEM "&Kopier ...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "K&ommenter...", MNID_EDIT_ANNOTATE
+   MENUITEM "K&ommenter ...", MNID_EDIT_ANNOTATE
  }
  POPUP "&Bokmerke" {
-   MENUITEM "&Definer...", MNID_BKMK_DEFINE
+   MENUITEM "&Definer ...", MNID_BKMK_DEFINE
  }
- POPUP "&Options" {
-   POPUP	"Help always visible"
+ POPUP "&Innstillinger" {
+   POPUP	"Synlighet"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Standard",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Synlig",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Ikke synlig",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Historikk",		MNID_OPTS_HISTORY
+  POPUP    "Skriftstørrelse"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Liten",		MNID_OPTS_FONTS_SMALL
     MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Stor",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Bruk systemfarger",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "&Hjelp" {
    MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON
    MENUITEM "All&tid øverst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Informasjon...", MNID_HELP_ABOUT
+   MENUITEM "&Informasjon ...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Om WINE", MNID_HELP_WINE
+   MENUITEM "&Om Wine", MNID_HELP_WINE
 #endif
  }
 }
@@ -83,13 +83,36 @@
 STID_WARNING,  		"ADVARSEL"
 STID_INFO,  		"Informasjon"
 STID_NOT_IMPLEMENTED, 	"Ikke implementert"
-STID_HLPFILE_ERROR_s, 	"Feil ved lesing av hjelpefilen '%s'"
-STID_CONTENTS, 		"&Innhold"
-STID_SEARCH, 		"&Søk"
+STID_HLPFILE_ERROR_s, 	"Klarte ikke lese hjelpefilen «%s»"
+STID_INDEX, 		"&Innhold"
+STID_CONTENTS, 		"&Oppsummering"
 STID_BACK, 		"Til&bake"
-STID_TOPICS,		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjelp-filer (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_FILE_NOT_FOUND_s	"Klarte ikke finne «%s». Vil du finne filen selv?"
+STID_NO_RICHEDIT	"Klarte ikke finne richedit; avbryter"
+STID_PSH_INDEX,		"Emner i Hjelp: "
 }
+
+CONTEXT_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
+BEGIN
+    POPUP ""
+    BEGIN
+        MENUITEM "Kommentar ...",       MNID_CTXT_ANNOTATE
+        MENUITEM "Kopier",                MNID_CTXT_COPY
+        MENUITEM "Skriv ut ...",            MNID_CTXT_PRINT
+        POPUP    "Skriftstørrelse"
+        BEGIN
+            MENUITEM "Liten",       MNID_CTXT_FONTS_SMALL
+            MENUITEM "Normal",      MNID_CTXT_FONTS_NORMAL
+            MENUITEM "Stor",       MNID_CTXT_FONTS_LARGE
+        END
+        POPUP   "Synlighet"
+        BEGIN
+            MENUITEM "Standard",     MNID_CTXT_HELP_DEFAULT
+            MENUITEM "Synlig",     MNID_CTXT_HELP_VISIBLE
+            MENUITEM "Ikke synlig", MNID_CTXT_HELP_NONVISIBLE
+        END
+        MENUITEM "Bruk systemfarger",   MNID_CTXT_SYSTEM_COLORS
+    END
+END

Modified: trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -85,14 +85,14 @@
 STID_INFO,  		"Informatie"
 STID_NOT_IMPLEMENTED, 	"Niet geïmplementeerd"
 STID_HLPFILE_ERROR_s, 	"Fout bij het lezen van het helpbestand `%s'"
-STID_CONTENTS, 		"&Inhoud"
-STID_SEARCH, 		"&Zoeken"
+STID_INDEX, 		"&Inhoud"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Terug"
-STID_TOPICS,		"&Onderwerpen"
 STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL

Modified: trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -86,14 +86,14 @@
 STID_INFO,  		"Informacja"
 STID_NOT_IMPLEMENTED, 	"Nie zaimplementowane"
 STID_HLPFILE_ERROR_s, 	"B³¹d w trakcie odczytu pliku pomocy `%s'"
-STID_CONTENTS, 		"&ZawartoϾ"
-STID_SEARCH, 		"&Szukaj"
+STID_INDEX, 		"&ZawartoϾ"
+STID_CONTENTS, 		"&Szukaj"
 STID_BACK, 		"&Wstecz"
-STID_TOPICS,		"&Tematy"
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego pliku samodzielnie?"
 STID_NO_RICHEDIT	"Nie uda³o siê znaleŸæ modu³u richedit... Wyœwietlenie pomocy nie jest mo¿liwe"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 

Modified: trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -131,14 +131,14 @@
 STID_INFO,  		"Informação"
 STID_NOT_IMPLEMENTED, 	"Não implementado"
 STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do arquivo de ajuda '%s'"
-STID_CONTENTS, 		"&Conteúdo"
-STID_SEARCH, 		"&Procurar"
+STID_INDEX, 		"&Conteúdo"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Voltar"
-STID_TOPICS,		"&Tópicos"
 STID_ALL_FILES, 	"Todos os arquivos (*.*)"
 STID_HELP_FILES_HLP, 	"Arquivos de ajuda (*.hlp)"
 STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
@@ -151,12 +151,12 @@
 STID_INFO,  		"Informação"
 STID_NOT_IMPLEMENTED, 	"Não implementado"
 STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do ficheiro de ajuda '%s'"
-STID_CONTENTS, 		"&Conteúdo"
-STID_SEARCH, 		"&Procurar"
+STID_INDEX, 		"&Conteúdo"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Voltar"
-STID_TOPICS,		"&Tópicos"
 STID_ALL_FILES, 	"Todos os ficheiros (*.*)"
 STID_HELP_FILES_HLP, 	"Ficheiros de ajuda (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/rm-CH.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -79,12 +79,12 @@
 STID_INFO,              "INFUORMAZIUN"
 STID_NOT_IMPLEMENTED,   "Na implementa"
 STID_HLPFILE_ERROR_s,   "Sbagl cun leger la datoteca d'ag�d `%s'"
-STID_CONTENTS,          "&Cuntgn�"
-STID_SEARCH,            "&Tscherchar"
+STID_INDEX,          	"&Cuntgn�"
+STID_CONTENTS,          "Summary"
 STID_BACK,              "&Inavo"
-STID_TOPICS,            "T&opics"
 STID_ALL_FILES,         "Tuot las datotecas (*.*)"
 STID_HELP_FILES_HLP,    "Datotecas d'ag�d (*.hlp)"
 STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -38,21 +38,21 @@
  POPUP "&Çàêëàäêà" {
    MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE
  }
- POPUP "&Options" {
-   POPUP	"Help always visible"
+ POPUP "&Íàñòðîéêè" {
+   POPUP	"Âèäèìîñòü îêíà ñïðàâêè"
    BEGIN
-     MENUITEM "Default",	MNID_OPTS_HELP_DEFAULT
-     MENUITEM "Visible",	MNID_OPTS_HELP_VISIBLE
-     MENUITEM "Non visible",	MNID_OPTS_HELP_NONVISIBLE
+     MENUITEM "Ïî óìîë÷àíèþ",	MNID_OPTS_HELP_DEFAULT
+     MENUITEM "Íàâåðõó",	MNID_OPTS_HELP_VISIBLE
+     MENUITEM "Íå íàâåðõó",	MNID_OPTS_HELP_NONVISIBLE
   END
-  MENUITEM "History",		MNID_OPTS_HISTORY
-  POPUP    "Fonts"
+  MENUITEM "Èñòîðèÿ",		MNID_OPTS_HISTORY
+  POPUP    "Øðèôò"
   BEGIN
-    MENUITEM "Small",		MNID_OPTS_FONTS_SMALL
-    MENUITEM "Normal",    	MNID_OPTS_FONTS_NORMAL
-    MENUITEM "Large",     	MNID_OPTS_FONTS_LARGE
+    MENUITEM "Ìåëêèé",		MNID_OPTS_FONTS_SMALL
+    MENUITEM "Îáû÷íûé",    	MNID_OPTS_FONTS_NORMAL
+    MENUITEM "Êðóïíûé",     	MNID_OPTS_FONTS_LARGE
   END
-  MENUITEM "Use system colors",	MNID_OPTS_SYSTEM_COLORS
+  MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà",	MNID_OPTS_SYSTEM_COLORS
  }
  POPUP "&Ñïðàâêà" {
    MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON
@@ -84,14 +84,14 @@
 STID_INFO,  		"Èíôîðìàöèÿ"
 STID_NOT_IMPLEMENTED, 	"Íå ðåàëèçîâàííî"
 STID_HLPFILE_ERROR_s, 	"Îøèáêà ïðè ÷òåíèè ôàéëà ïîìîùè `%s'"
-STID_CONTENTS, 		"&Ñîäåðæàíèå"
-STID_SEARCH, 		"&Íàéòè"
+STID_INDEX, 		"&Ñîäåðæàíèå"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Íàçàä"
-STID_TOPICS,		"&Óêàçàòåëü"
 STID_ALL_FILES, 	"Âñå ôàéëû (*.*)"
 STID_HELP_FILES_HLP, 	"Ôàéëû ñïðàâêè (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?"
 STID_NO_RICHEDIT	"Íå ìîãó íàéòè richedit"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

Modified: trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -72,12 +72,12 @@
 STID_INFO,                  "Informácie"
 STID_NOT_IMPLEMENTED,       "Neimplementované"
 STID_HLPFILE_ERROR_s,       "Chyba poèas èítania súboru `%s'"
-STID_CONTENTS,              "&Obsah"
-STID_SEARCH,                "&H¾ada"
+STID_INDEX,                 "&Obsah"
+STID_CONTENTS,		    "Summary"
 STID_BACK,                  "&Spä"
-STID_TOPICS,		    "&Topics"
 STID_ALL_FILES,             "Všetky súbory (*.*)"
 STID_HELP_FILES_HLP,        "Súbory pomoci (*.hlp)"
 STID_FILE_NOT_FOUND_s       "Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	    "Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -86,14 +86,14 @@
 STID_INFO,  		"Informacija"
 STID_NOT_IMPLEMENTED, 	"Ni (Å¡e) na voljo"
 STID_HLPFILE_ERROR_s, 	"Napaka pri branju datoteke s pomočjo `%s'"
-STID_CONTENTS, 		"&Teme pomoči"
-STID_SEARCH, 		"&Iskanje"
+STID_INDEX, 		"&Teme pomoči"
+STID_CONTENTS, 		"Summart"
 STID_BACK, 		"&Nazaj"
-STID_TOPICS,		"&Vsebina"
 STID_ALL_FILES, 	"Vse datoteke (*.*)"
 STID_HELP_FILES_HLP, 	"Datoteke s pomočjo (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Ne najdem datoteke '%s'. Ali jo želite poiskati sami?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }
 
 #pragma code_page(default)

Modified: trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -77,12 +77,12 @@
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Inte implementerat"
 STID_HLPFILE_ERROR_s, 	"Fel vid läsning av hjälpfilen `%s'"
-STID_CONTENTS, 		"&Innehåll"
-STID_SEARCH, 		"&Sök"
+STID_INDEX, 		"&Innehåll"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Bakåt"
-STID_TOPICS,		"&Ämnen"
 STID_ALL_FILES, 	"Alla filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjälpfiler (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan inte hitta '%s'. Vill du söka efter denna fil?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -74,12 +74,12 @@
 STID_INFO,  		"Bilgi"
 STID_NOT_IMPLEMENTED, 	"Henüz tamamlanmadý"
 STID_HLPFILE_ERROR_s, 	"'%s' yardým dosyasý açýlýrken hata"
-STID_CONTENTS, 		"&Ýçindekiler"
-STID_SEARCH, 		"&Ara"
+STID_INDEX, 		"&Ýçindekiler"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"&Geri"
-STID_TOPICS,		"&Konular"
 STID_ALL_FILES, 	"Tüm dosyalar (*.*)"
 STID_HELP_FILES_HLP, 	"Yardým dosyalarý (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -75,12 +75,12 @@
 STID_INFO,  		"ÐÅÏ¢"
 STID_NOT_IMPLEMENTED, 	"δʵÏÖ"
 STID_HLPFILE_ERROR_s, 	"¶ÁÈë°ïÖúÎļþ ¡®%s¡¯ ʱ·¢Éú´íÎó"
-STID_CONTENTS, 		"ÄÚÈÝ£¨&C£©"
-STID_SEARCH, 		"ËÑË÷£¨&S£©"
+STID_INDEX, 		"ÄÚÈÝ£¨&C£©"
+STID_CONTENTS,		"Summary"
 STID_BACK, 		"·µ»Ø£¨&B£©"
-STID_TOPICS,		"Ö÷Ì⣨&T£©"
 STID_ALL_FILES, 	"ËùÓÐÎļþ (*.*)"
 STID_HELP_FILES_HLP, 	"°ïÖúÎļþ (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
 STID_NO_RICHEDIT	"Cannot find a richedit implementation... Aborting"
+STID_PSH_INDEX,		"Help topics: "
 }

Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/lex.yy.c?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -403,6 +403,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#define YY_NO_INPUT 1
 #define YY_NO_UNPUT 1
 #define quote 1
 
@@ -429,7 +430,7 @@
 #define YY_INPUT(buf,result,max_size)\
   if ((result = *macroptr ? 1 : 0)) buf[0] = *macroptr++;
 
-#line 433 "lex.yy.c"
+#line 434 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -583,7 +584,7 @@
 #line 49 "macro.lex.l"
 
 
-#line 587 "lex.yy.c"
+#line 588 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -753,7 +754,7 @@
 #line 97 "macro.lex.l"
 ECHO;
 	YY_BREAK
-#line 757 "lex.yy.c"
+#line 758 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 

Modified: trunk/reactos/base/applications/winhlp32/macro.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/macro.c?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -517,7 +517,7 @@
 
 void CALLBACK MACRO_Finder(void)
 {
-    WINHELP_CreateIndexWindow();
+    WINHELP_CreateIndexWindow(FALSE);
 }
 
 void CALLBACK MACRO_FloatingMenu(void)
@@ -880,7 +880,7 @@
 
 void CALLBACK MACRO_Search(void)
 {
-    WINE_FIXME("()\n");
+    WINHELP_CreateIndexWindow(TRUE);
 }
 
 void CALLBACK MACRO_SetContents(LPCSTR str, LONG u)

Modified: trunk/reactos/base/applications/winhlp32/macro.lex.l
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/macro.lex.l?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 %}
-%option nounput interactive 8bit
+%option noinput nounput interactive 8bit
 %x quote
 %{
 #include "config.h"

Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/rsrc.rc?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/rsrc.rc [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -32,7 +32,7 @@
 #include "lang/cs-CZ.rc"
 #include "lang/da-DK.rc"
 #include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
+// #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fi-FI.rc"
@@ -40,16 +40,16 @@
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"
 #include "lang/ko-KR.rc"
-#include "lang/lt-LT.rc"
+// #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"
-//#include "lang/rm-CH.rc"
+// #include "lang/rm-CH.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sl-SI.rc"
 #include "lang/sk-SK.rc"
 #include "lang/sv-SE.rc"
 #include "lang/tr-TR.rc"
-#include "lang/uk-UA.rc"
+// #include "lang/uk-UA.rc"
 #include "lang/zh-CN.rc"

Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhelp.c?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -26,6 +26,9 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include "windef.h"
 #include "winbase.h"
@@ -36,6 +39,7 @@
 #include "winhelp_res.h"
 #include "shellapi.h"
 #include "richedit.h"
+#include "commctrl.h"
 
 #include "wine/debug.h"
 
@@ -623,13 +627,11 @@
 
         LoadString(Globals.hInstance, STID_CONTENTS, buffer, sizeof(buffer));
         MACRO_CreateButton("BTN_CONTENTS", buffer, "Contents()");
-        LoadString(Globals.hInstance, STID_SEARCH,buffer, sizeof(buffer));
-        MACRO_CreateButton("BTN_SEARCH", buffer, "Search()");
+        LoadString(Globals.hInstance, STID_INDEX, buffer, sizeof(buffer));
+        MACRO_CreateButton("BTN_INDEX", buffer, "Finder()");
         LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer));
         MACRO_CreateButton("BTN_BACK", buffer, "Back()");
         if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK");
-        LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
-        MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
     }
 
     if (!bReUsed)
@@ -860,7 +862,9 @@
 	case MNID_FILE_EXIT:	MACRO_Exit();           break;
 
             /* Menu EDIT */
-	case MNID_EDIT_COPYDLG: MACRO_CopyDialog();     break;
+	case MNID_EDIT_COPYDLG:
+            SendMessage(GetDlgItem(hWnd, CTL_ID_TEXT), WM_COPY, 0, 0);
+            break;
 	case MNID_EDIT_ANNOTATE:MACRO_Annotate();       break;
 
             /* Menu Bookmark */
@@ -931,6 +935,14 @@
 /* EPP         break; */
     case WM_COPYDATA:
         return WINHELP_HandleCommand((HWND)wParam, lParam);
+
+    case WM_CHAR:
+        if (wParam == 3)
+        {
+            SendMessage(GetDlgItem(hWnd, CTL_ID_TEXT), WM_COPY, 0, 0);
+            return 0;
+        }
+        break;
 
     case WM_KEYDOWN:
         keyDelta = 0;
@@ -1536,6 +1548,13 @@
     *next = (char*)p + strlen((char*)p) + 7;
 }
 
+struct index_data
+{
+    HLPFILE*    hlpfile;
+    BOOL        jump;
+    ULONG       offset;
+};
+
 /**************************************************************************
  * WINHELP_IndexDlgProc
  *
@@ -1546,23 +1565,24 @@
  *  >1: valid offset value +2.
  *  EndDialog itself can return 0 (error).
  */
-INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    static HLPFILE *file;
+INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    static struct index_data* id;
     int sel;
-    ULONG offset = 1;
 
     switch (msg)
     {
     case WM_INITDIALOG:
-        file = (HLPFILE *)lParam;
-        HLPFILE_BPTreeEnum(file->kwbtree, cb_KWBTree,
+        id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam;
+        HLPFILE_BPTreeEnum(id->hlpfile->kwbtree, cb_KWBTree,
                            GetDlgItem(hWnd, IDC_INDEXLIST));
+        id->jump = FALSE;
+        id->offset = 1;
         return TRUE;
-    case WM_COMMAND:
-        switch (LOWORD(wParam))
-        {
-        case IDOK:
+    case WM_NOTIFY:
+	switch (((NMHDR*)lParam)->code)
+	{
+	case PSN_APPLY:
             sel = SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETCURSEL, 0, 0);
             if (sel != LB_ERR)
             {
@@ -1575,24 +1595,54 @@
                 if (count > 1)
                 {
                     MessageBox(hWnd, "count > 1 not supported yet", "Error", MB_OK | MB_ICONSTOP);
+                    SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_INVALID);
                     return TRUE;
                 }
-                offset = *(ULONG*)((char *)p + strlen((char *)p) + 3);
-                offset = *(long*)(file->kwdata + offset + 9);
-                if (offset == 0xFFFFFFFF)
+                id->offset = *(ULONG*)((char *)p + strlen((char *)p) + 3);
+                id->offset = *(long*)(id->hlpfile->kwdata + id->offset + 9);
+                if (id->offset == 0xFFFFFFFF)
                 {
                     MessageBox(hWnd, "macro keywords not supported yet", "Error", MB_OK | MB_ICONSTOP);
+                    SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_INVALID);
                     return TRUE;
                 }
-                offset += 2;
+                id->jump = TRUE;
+                SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR);
             }
-            /* Fall through */
-        case IDCANCEL:
-            EndDialog(hWnd, offset);
             return TRUE;
         default:
-            break;
-        }
+            return FALSE;
+        }
+        break;
+    default:
+        break;
+    }
+    return FALSE;
+}
+
+/**************************************************************************
+ * WINHELP_SearchDlgProc
+ *
+ */
+INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    static struct index_data* id;
+
+    switch (msg)
+    {
+    case WM_INITDIALOG:
+        id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam;
+        return TRUE;
+    case WM_NOTIFY:
+	switch (((NMHDR*)lParam)->code)
+	{
+	case PSN_APPLY:
+            SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR);
+            return TRUE;
+        default:
+            return FALSE;
+        }
+        break;
     default:
         break;
     }
@@ -1605,30 +1655,61 @@
  * Displays a dialog with keywords of current help file.
  *
  */
-BOOL WINHELP_CreateIndexWindow(void)
-{
-    int ret;
-    HLPFILE *hlpfile;
+BOOL WINHELP_CreateIndexWindow(BOOL is_search)
+{
+    HPROPSHEETPAGE      psPage[3];
+    PROPSHEETPAGE       psp;
+    PROPSHEETHEADER     psHead;
+    struct index_data   id;
+    char                buf[256];
 
     if (Globals.active_win && Globals.active_win->page && Globals.active_win->page->file)
-        hlpfile = Globals.active_win->page->file;
+        id.hlpfile = Globals.active_win->page->file;
     else
         return FALSE;
 
-    if (hlpfile->kwbtree == NULL)
+    if (id.hlpfile->kwbtree == NULL)
     {
         WINE_TRACE("No index provided\n");
         return FALSE;
     }
 
-    ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_INDEX),
-                         Globals.active_win->hMainWnd, WINHELP_SearchDlgProc,
-                         (LPARAM)hlpfile);
-    if (ret > 1)
-    {
-        ret -= 2;
-        WINE_TRACE("got %d as an offset\n", ret);
-        WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, hlpfile, ret,
+    InitCommonControls();
+
+    id.jump = FALSE;
+    memset(&psp, 0, sizeof(psp));
+    psp.dwSize = sizeof(psp);
+    psp.dwFlags = 0;
+    psp.hInstance = Globals.hInstance;
+
+    psp.u.pszTemplate = MAKEINTRESOURCE(IDD_INDEX);
+    psp.lParam = (LPARAM)&id;
+    psp.pfnDlgProc = WINHELP_IndexDlgProc;
+    psPage[0] = CreatePropertySheetPage(&psp);
+
+    psp.u.pszTemplate = MAKEINTRESOURCE(IDD_SEARCH);
+    psp.lParam = (LPARAM)&id;
+    psp.pfnDlgProc = WINHELP_SearchDlgProc;
+    psPage[1] = CreatePropertySheetPage(&psp);
+
+    memset(&psHead, 0, sizeof(psHead));
+    psHead.dwSize = sizeof(psHead);
+
+    LoadString(Globals.hInstance, STID_PSH_INDEX, buf, sizeof(buf));
+    strcat(buf, Globals.active_win->info->caption);
+
+    psHead.pszCaption = buf;
+    psHead.nPages = 2;
+    psHead.u2.nStartPage = is_search ? 1 : 0;
+    psHead.hwndParent = Globals.active_win->hMainWnd;
+    psHead.u3.phpage = psPage;
+    psHead.dwFlags = PSH_NOAPPLYNOW;
+
+    PropertySheet(&psHead);
+    if (id.jump)
+    {
+        WINE_TRACE("got %d as an offset\n", id.offset);
+        WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, id.hlpfile, id.offset,
                                Globals.active_win->info, SW_NORMAL);
     }
     return TRUE;

Modified: trunk/reactos/base/applications/winhlp32/winhelp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhelp.h?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -146,7 +146,7 @@
 BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),
                             HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int);
 BOOL WINHELP_GetOpenFileName(LPSTR, int);
-BOOL WINHELP_CreateIndexWindow(void);
+BOOL WINHELP_CreateIndexWindow(BOOL);
 void WINHELP_DeleteBackSet(WINHELP_WINDOW*);
 INT  WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD);
 HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);

Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhelp_res.h?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -43,16 +43,17 @@
 #define STID_NOT_IMPLEMENTED 	0x124
 #define STID_HLPFILE_ERROR_s 	0x125
 #define STID_CONTENTS 		0x126
-#define STID_SEARCH	 	0x127
+#define STID_INDEX	 	0x127
 #define STID_BACK 		0x128
-#define STID_TOPICS 		0x12A
 #define STID_ALL_FILES 		0x12B
 #define STID_HELP_FILES_HLP	0x12C
 #define STID_DIALOG_TEST	0x12D
 #define STID_FILE_NOT_FOUND_s	0x12E
 #define STID_NO_RICHEDIT        0x12F
+#define STID_PSH_INDEX          0x130
 
 #define IDD_INDEX               0x150
 #define IDC_INDEXLIST           0x151
+#define IDD_SEARCH              0x152
 
 #define IDI_WINHELP             0xF00

Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhlp32.rbuild?rev=34401&r1=34400&r2=34401&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Thu Jul 10 01:51:18 2008
@@ -6,6 +6,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>
 	<library>comdlg32</library>
+	<library>comctl32</library>
 	<library>shell32</library>
 	<library>user32</library>
 	<library>gdi32</library>



More information about the Ros-diffs mailing list