25 Apr
2009
25 Apr
'09
12:11 p.m.
Author: cfinck
Date: Sat Apr 25 16:11:53 2009
New Revision: 40695
URL: http://svn.reactos.org/svn/reactos?rev=40695&view=rev
Log:
Merge r40688 on request of dgorbachev
Modified:
branches/ros-branch-0_3_9/reactos/dll/cpl/desk/lang/no-NO.rc
branches/ros-branch-0_3_9/reactos/dll/win32/syssetup/lang/no-NO.rc
branches/ros-branch-0_3_9/reactos/dll/win32/userenv/lang/no-NO.rc
Modified: branches/ros-branch-0_3_9/reactos/dll/cpl/desk/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/cp…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original)
+++ branches/ros-branch-0_3_9/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sat Apr 25
16:11:53 2009
@@ -55,7 +55,7 @@
WS_VISIBLE | WS_BORDER, 7, 7, 232, 120
LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9
COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST |
CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56,
15
+ PUSHBUTTON "&Effekter...", IDC_APPEARANCE_EFFECTS, 182, 150, 56,
15
PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15
END
@@ -100,24 +100,24 @@
IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
-CAPTION "Effects"
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "&Use the following transition effect for menus and
tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
+CAPTION "Effekter"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "&Bruk følgende overgang effekter for menyer og
verktøytips:",IDC_EFFAPPEARANCE_ANIMATION,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19
COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST |
CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP
- CONTROL "U&se the following method to smooth edges of screen
fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
+ CONTROL "B&ruk følgende metode for kantutjevning av skjerm
skifter:",IDC_EFFAPPEARANCE_SMOOTHING,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19
COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST |
CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED
- CONTROL "Us&e large
icons",IDC_EFFAPPEARANCE_LARGEICONS,"button",
+ CONTROL "Br&uk store
ikoner",IDC_EFFAPPEARANCE_LARGEICONS,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19
- CONTROL "Show sh&adows under
menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
+ CONTROL "Vis sk&ygger under
menyer",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19
- CONTROL "Show &window contents while
dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
+ CONTROL "Vis &vindu innholdet ved
flytting",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button",
BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19
- CONTROL "&Hide underlined letters for keyboard navigation until I
press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
+ CONTROL "&Skjul visning av understrekning for tastatur hurtigtast
til jeg trykker på Alt tasten",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button",
BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19
- PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14
+ PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14
DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14
END
@@ -134,7 +134,7 @@
CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",
TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17
LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP
- LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP
+ LTEXT "Større",1816,93,137,21,8,NOT WS_GROUP
LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP
| SS_CENTER
GROUPBOX "&Farger",1817,125,127,115,43
COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL |
@@ -171,7 +171,7 @@
POPUP ""
BEGIN
MENUITEM "&Attached", ID_MENU_ATTACHED
- MENUITEM "&Primary", ID_MENU_PRIMARY
+ MENUITEM "&Primær", ID_MENU_PRIMARY
MENUITEM SEPARATOR
MENUITEM "&Identify", ID_MENU_IDENTIFY
MENUITEM "E&genskaper", ID_MENU_PROPERTIES
@@ -180,14 +180,14 @@
STRINGTABLE DISCARDABLE
BEGIN
- IDS_SLIDEEFFECT "Slide effect"
- IDS_FADEEFFECT "Fade effect"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_STANDARDEFFECT "Standard"
- IDS_CLEARTYPEEFFECT "ClearType"
+ IDS_SLIDEEFFECT "Slide effekter"
+ IDS_FADEEFFECT "Fade effekter"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_STANDARDEFFECT "Vanlig"
+ IDS_CLEARTYPEEFFECT "Klartype"
END
STRINGTABLE
@@ -228,8 +228,8 @@
IDS_INACTWIN "Uaktiv vindu"
IDS_ACTWIN "Aktiv vindu"
IDS_WINTEXT "Vindu tekst"
- IDS_MESSBOX "Melding boks"
- IDS_MESSTEXT "Melding tekst"
+ IDS_MESSBOX "Meldingboks"
+ IDS_MESSTEXT "Meldingtekst"
IDS_BUTTEXT "OK"
END
@@ -244,18 +244,18 @@
IDS_ELEMENT_7 "Valgt enhet"
IDS_ELEMENT_8 "Vindu"
IDS_ELEMENT_9 "Scrollbars"
- IDS_ELEMENT_10 "3D objects"
+ IDS_ELEMENT_10 "3D objekter"
IDS_ELEMENT_11 "Palette title"
- IDS_ELEMENT_12 "Symbol title"
+ IDS_ELEMENT_12 "Tegn tittel"
IDS_ELEMENT_13 "Captionbar"
- IDS_ELEMENT_14 "Deactivated menu elements"
+ IDS_ELEMENT_14 "Deaktivert meny elementer"
IDS_ELEMENT_15 "Dialog"
IDS_ELEMENT_16 "Scrollbar controls"
- IDS_ELEMENT_17 "Application background"
+ IDS_ELEMENT_17 "Program bakgrunn"
IDS_ELEMENT_18 "Small captionbar"
- IDS_ELEMENT_19 "Symbol distance (horizontal)"
- IDS_ELEMENT_20 "Symbol distance (vertical)"
- IDS_ELEMENT_21 "Quickinfo"
+ IDS_ELEMENT_19 "Tegn avstand (horisontalt)"
+ IDS_ELEMENT_20 "Tegn avstand (vertikalt)"
+ IDS_ELEMENT_21 "Rask infomasjon"
IDS_ELEMENT_22 "Symbol"
END
Modified: branches/ros-branch-0_3_9/reactos/dll/win32/syssetup/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_9/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sat
Apr 25 16:11:53 2009
@@ -201,8 +201,8 @@
BEGIN
IDS_ACCESSORIES "Tilbehør"
IDS_CMT_CALC "Start Kalkulator"
- IDS_CMT_CMD "Åpne command prompt"
- IDS_CMT_EXPLORER "Start Explorer"
+ IDS_CMT_CMD "Åpne Kommandolinje"
+ IDS_CMT_EXPLORER "Start Utforsker"
IDS_CMT_NOTEPAD "Start Tekstredigering"
IDS_CMT_REGEDIT "Start Registerredigering"
IDS_CMT_WORDPAD "Start Dokument redigering"
@@ -210,48 +210,48 @@
IDS_CMT_DEVMGMT "Start Enhetsbehandler"
IDS_CMT_SERVMAN "Start Tjenestebehandler"
IDS_CMT_RDESKTOP "Start Ekstern skrivebord"
- IDS_CMT_EVENTVIEW "Launch Event Viewer"
- IDS_CMT_MSCONFIG "Launch System Configuration program"
-END
-
-STRINGTABLE
-BEGIN
- IDS_GAMES "Spill"
- IDS_CMT_SOLITAIRE "Kabal"
- IDS_CMT_WINEMINE "Minnesveiper"
-END
-
-STRINGTABLE
-BEGIN
- IDS_SYS_TOOLS "System verktøy"
- IDS_CMT_CHARMAP "Tegnkart"
- IDS_CMT_KBSWITCH "Endre tastatur valg"
- IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program"
-END
-
-STRINGTABLE
-BEGIN
- IDS_SYS_ACCESSIBILITY "Tilgjengelighet"
- IDS_CMT_MAGNIFY "Forstørrelse"
-END
-
-STRINGTABLE
-BEGIN
- IDS_SYS_ENTERTAINMENT "Entertainment"
- IDS_CMT_MPLAY32 "Launch Multimedia Player"
- IDS_CMT_SNDVOL32 "Launch Volume Control"
-END
-
-STRINGTABLE
-BEGIN
- IDS_REACTOS_SETUP "ReactOS installasjon"
+ IDS_CMT_EVENTVIEW "Start Hendelseliste"
+ IDS_CMT_MSCONFIG "Start Systemkonfigurasjon"
+END
+
+STRINGTABLE
+BEGIN
+ IDS_GAMES "Spill"
+ IDS_CMT_SOLITAIRE "Kabal"
+ IDS_CMT_WINEMINE "Minnesveiper"
+END
+
+STRINGTABLE
+BEGIN
+ IDS_SYS_TOOLS "Systemverktøy"
+ IDS_CMT_CHARMAP "Tegnkart"
+ IDS_CMT_KBSWITCH "Endre tastaturvalg"
+ IDS_CMT_DXDIAG "Kjør ReactX-Diagnose program"
+END
+
+STRINGTABLE
+BEGIN
+ IDS_SYS_ACCESSIBILITY "Tilgjengelighet"
+ IDS_CMT_MAGNIFY "Forstørrelse"
+END
+
+STRINGTABLE
+BEGIN
+ IDS_SYS_ENTERTAINMENT "Underholdning"
+ IDS_CMT_MPLAY32 "Start Multimedia avspiller"
+ IDS_CMT_SNDVOL32 "Start Volumkontroll"
+END
+
+STRINGTABLE
+BEGIN
+ IDS_REACTOS_SETUP "ReactOS installasjon"
IDS_UNKNOWN_ERROR "Ukjent feil"
IDS_REGISTERING_COMPONENTS "Registrerer komponenter..."
- IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: "
- IDS_GETPROCADDR_FAILED "GetProcAddr feilet: "
+ IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: "
+ IDS_GETPROCADDR_FAILED "GetProcAddr feilet: "
IDS_REGSVR_FAILED "DllRegisterServer feilet: "
- IDS_DLLINSTALL_FAILED "DllInstall feilet: "
- IDS_TIMEOUT "Tidsavbrudd under registrering"
+ IDS_DLLINSTALL_FAILED "DllInstall feilet: "
+ IDS_TIMEOUT "Tidsavbrudd under registrering"
IDS_REASON_UNKNOWN ""
END
@@ -282,13 +282,13 @@
STRINGTABLE
BEGIN
- IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn."
- IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette
datamaskinnavnet."
- IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette før du taster inn navn
for datamaskinen."
- IDS_WZD_PASSWORDEMPTY "Du må taste et passord!"
- IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn på
nytt."
- IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst
tast inn et annet."
- IDS_WZD_LOCALTIME "Installasjonen klarte ikke å sette lokal tid."
+ IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt
navn."
+ IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette
datamaskinnavnet."
+ IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette før du taster inn
navn for datamaskinen."
+ IDS_WZD_PASSWORDEMPTY "Du må taste et passord!"
+ IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn
på nytt."
+ IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst
tast inn et annet."
+ IDS_WZD_LOCALTIME "Installasjonen klarte ikke å sette lokal tid."
END
STRINGTABLE
Modified: branches/ros-branch-0_3_9/reactos/dll/win32/userenv/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_9/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_9/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Sat Apr
25 16:11:53 2009
@@ -23,7 +23,7 @@
STRINGTABLE
BEGIN
- IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings"
+ IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger"
IDS_APPDATA "Programdata"
IDS_DESKTOP "Skrivebord"
IDS_FAVORITES "Favoritter"
@@ -31,21 +31,21 @@
IDS_PROGRAMS "Start-Meny\\Programmer"
IDS_ADMINTOOLS "Start-Meny\\Programmer\\Administrative verktøy"
IDS_STARTUP "Start-Meny\\Programmer\\Oppstart"
- IDS_MYDOCUMENTS "Mine Dokumenter"
- IDS_MYPICTURES "Mine Dokumenter\\Mine Bilder"
- IDS_MYMUSIC "Mine Dokumenter\\Min Musikk"
- IDS_MYVIDEOS "Mine Dokumenter\\Mine Filmer"
+ IDS_MYDOCUMENTS "Mine dokumenter"
+ IDS_MYPICTURES "Mine dokumenter\\Mine bilder"
+ IDS_MYMUSIC "Mine dokumenter\\Min musikk"
+ IDS_MYVIDEOS "Mine dokumenter\\Mine filmer"
IDS_TEMPLATES "Templates"
IDS_RECENT "Siste"
- IDS_SENDTO "SendTo"
+ IDS_SENDTO "Send til"
IDS_PRINTHOOD "PrintHood"
IDS_NETHOOD "NetHood"
IDS_LOCALSETTINGS "Lokale innstillinger"
IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata"
- IDS_TEMP "Lokale innstillinger\\Temp"
- IDS_CACHE "Lokale innstillinger\\Temporary Internet Files"
+ IDS_TEMP "Lokale innstillinger\\Midlertidig"
+ IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer"
IDS_HISTORY "Lokale innstillinger\\Logg"
- IDS_COOKIES "Cookies"
+ IDS_COOKIES "Informasjonkapsel"
IDS_PROGRAMFILES "%SystemDrive%\\Programfiler"
IDS_COMMONFILES "Common Files"
END
5797
days inactive
5797
days old
0 comments
1 participants
participants (1)
-
cfinck＠svn.reactos.org