Release 2.1.2

2002-11-02  Jody Goldberg <jody@gnome.org>

	* Release 2.1.2

1 files changed, 379 insertions, 203 deletions

diff --git a/po/no.po b/po/no.po
index eb1a21277..7a4f55a18 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center 1.5.8\n"
-"POT-Creation-Date: 2002-10-21 12:31-0400\n"
+"POT-Creation-Date: 2002-11-02 13:45-0500\n"
 "PO-Revision-Date: 2002-10-21 12:18+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,19 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:229
-#: capplets/keyboard/gnome-keyboard-properties.c:160
-#, c-format
-msgid "There was an error launching the keyboard capplet : %s"
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:237
+#, fuzzy, c-format
+msgid "There was an error launching the mouse preferences dialog: %s"
 msgstr "Det oppsto en feil under oppstart av tastaturdialogen : %s"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:321
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:379
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:331
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:389
 #, c-format
 msgid "Unable to import AccessX settings from file '%s'"
 msgstr "Kan ikke importere innstillinger for AccessX fra fil «%s»"
 
-#: capplets/accessibility/keyboard/accessibility-keyboard.c:452
+#: capplets/accessibility/keyboard/accessibility-keyboard.c:462
 msgid "Select CDE AccessX file"
 msgstr "Velg AccessX-fil for CDE"
 
@@ -48,51 +47,89 @@ msgstr ""
 "tastaturtilgjengelighet vil ikke virke."
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:1
-msgid "Beep when an LED is turned on and two beeps when one is turned off."
-msgstr "Pip en gang når en LED slås på og to ganger når en slås av."
+#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
+#: capplets/file-types/file-types-properties.glade.h:1
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
+#: capplets/network/gnome-network-preferences.glade.h:2
+#: capplets/theme-switcher/theme-install.glade.h:1
+msgid "*"
+msgstr "*"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:2
-msgid "Beep when enabling/disabling _keyboard accessibility features"
-msgstr "_Pip ved aktivering/deaktivering av tilgjengelighet for tastatur"
+msgid "Basic"
+msgstr ""
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:3
-msgid "Beep when key is re_jected"
+#, fuzzy
+msgid "Beep if key is re_jected"
 msgstr "Pip når tast er a_vvist"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:4
-msgid "Beep when:"
-msgstr "Pip når:"
+#, fuzzy
+msgid "Beep when _modifier is pressed"
+msgstr "_Pip når endringstast trykkes ned"
 
 #: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:5
+msgid "Beep when a _feature is turned on or off"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+msgid "Beep when an LED is turned on and two beeps when one is turned off."
+msgstr "Pip en gang når en LED slås på og to ganger når en slås av."
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#, fuzzy
+msgid "Beep when key is:"
+msgstr "Pip når tast er a_vvist"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#, fuzzy
+msgid "Del_ay:"
+msgstr "_Pause:"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+msgid "Delay between keypress and pointer mo_vement:"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
+msgid "Disa_ble if two keys pressed together"
+msgstr ""
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
 msgid "E_nable Toggle Keys"
 msgstr "Aktiver _BryterTaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:6
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
 msgid "Enable Bo_unce Keys"
 msgstr "Aktiver B_ounce Keys"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:7
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
 msgid "Enable Slo_w Keys"
 msgstr "Aktiver tre_ge taster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:8
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
 msgid "Enable _Mouse Keys"
 msgstr "Aktiver _mustaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:9
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
 msgid "Enable _Sticky Keys"
 msgstr "Aktiver _klebrige taster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:10
-#: capplets/sound/sound-properties.glade.h:2
-msgid "General"
-msgstr "Generelt"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+msgid "Features"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:11
-msgid "I_gnore keypresses within:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
+#, fuzzy
+msgid "Filters"
+msgstr "_Fil"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
+#, fuzzy
+msgid "I_gnore duplicate keypresses within:"
 msgstr "I_gnorer tastaturtrykk innen:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:12
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
 msgid ""
 "Ignore all subsequent presses of the SAME key if they happen within a user "
 "selectable period of time."
@@ -100,15 +137,25 @@ msgstr ""
 "Ignorer alle etterfølgende trykk på SAMME tast hvis de skjer innenfor en "
 "tidsramme som kan bestemmes av brukeren."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:13
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
 msgid "Keyboard Accessibility Preferences (AccessX)"
 msgstr "Brukervalg for tastaturtilgjengelighet (AccessX)"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:14
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
 msgid "Ma_ximum pointer speed:"
 msgstr "Ma_ksimal pekerhastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:15
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/mouse/mouse.desktop.in.h:1
+msgid "Mouse"
+msgstr "Mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
+#, fuzzy
+msgid "Mouse _Preferences..."
+msgstr "Brukervalg for mus"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
 msgid ""
 "Only accept keys after they have been pressed and held for a user adjustable "
 "amount of time."
@@ -116,86 +163,90 @@ msgstr ""
 "Aksepterer bare taster etter at de trykkes og holdes nede i et "
 "brukerjusterbart intervall."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:16
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
 msgid ""
 "Perform multiple simultaneous key press operations by pressing modifier keys "
 "in sequence."
 msgstr ""
 "Utfør flere samtidige tastetrykk ved å holde nede endringstaster i sekvens."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:17
-msgid "Repeat Key Pre_ferences..."
-msgstr "Bruker_valg for tasterepetering..."
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:18
-msgid "Start mo_ving this long after keypress:"
-msgstr "Tid før be_vegelse starter etter tastetrykk:"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:19
-msgid "Testing Area"
-msgstr "Testområde"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
+#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
+msgid "S_peed:"
+msgstr "_Hastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:20
-msgid "Time to acce_lerate to max speed:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
+#, fuzzy
+msgid "Time to acce_lerate to maximum speed:"
 msgstr "Tid før akse_llerasjon til maks hastighet:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:21
-msgid "Toggle and Repeat Keys"
-msgstr "Slå av/på repetering av tastetrykk"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
+#, fuzzy
+msgid "Toggle Keys"
+msgstr "Aktiver _BryterTaster"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:22
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:29
 msgid "Turn the numeric keypad into a mouse control pad."
 msgstr "Endre det numeriske tastaturet til å kontrollere musen."
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:23
-msgid "_Beep when modifier is pressed"
-msgstr "_Pip når endringstast trykkes ned"
-
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:24
-msgid "_Disable if unused for "
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
+#, fuzzy
+msgid "_Disable if unused for:"
 msgstr "_Deaktiver hvis ubrukt i "
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:25
-msgid "_Enable keyboard accessibility"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
+#, fuzzy
+msgid "_Enable keyboard accessibility features"
 msgstr "Aktiv_er tilgjengelighet for tastatur"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:26
-msgid "_Import CDE AccessX file..."
-msgstr "_Importer AccessX-fil fra CDE..."
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
+msgid "_Import Feature Settings..."
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:27
-msgid "_Only accept keypress after:"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
+#, fuzzy
+msgid "_Only accept keys held for:"
 msgstr "_Kun aksepter tastetrykk etter:"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:28
-msgid ""
-"_Turn off Sticky Keys when\n"
-"two keys pressed simultaneously"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
+#, fuzzy
+msgid "_Repeat Keys"
+msgstr "Repeteringstaster"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+msgid "_Type to test settings:"
 msgstr ""
-"Slå av klebrige taster når\n"
-"to taster trykkes samtidig"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:30
-msgid "key is _accepted"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:36
+#, fuzzy
+msgid "_accepted"
 msgstr "tast er _akseptert"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:31
-msgid "key is _pressed"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:37
+#, fuzzy
+msgid "_pressed"
 msgstr "tast er _nedtrykt"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:32
-msgid "key is _rejected"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:38
+#, fuzzy
+msgid "_rejected"
 msgstr "tast er _avvist"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:33
-msgid "msecs"
-msgstr "millisekunder"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:39
+msgid "characters/second"
+msgstr ""
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:34
-msgid "pixels/sec"
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:40
+#, fuzzy
+msgid "milliseconds"
+msgstr "sekunder"
+
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:41
+#, fuzzy
+msgid "pixels/second"
 msgstr "piksler/sek"
 
-#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:35
+#: capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade.h:42
 msgid "seconds"
 msgstr "sekunder"
 
@@ -250,7 +301,7 @@ msgstr "Velg _bilde:"
 #: capplets/common/capplet-util.c:243
 #: capplets/default-applications/gnome-default-applications-properties.c:712
 #: capplets/keyboard/gnome-keyboard-properties.c:294
-#: capplets/mouse/gnome-mouse-properties.c:752
+#: capplets/mouse/gnome-mouse-properties.c:751
 #: capplets/sound/sound-properties-capplet.c:149
 msgid "Retrieve and store legacy settings"
 msgstr "Hent og lagre gamle innstillinger"
@@ -546,14 +597,6 @@ msgid "Please specify a name and a command for this editor."
 msgstr ""
 "Vennligst spesifiser et navn og en kommando for dette redigeringsprogrammet."
 
-#: capplets/default-applications/gnome-default-applications-properties.glade.h:1
-#: capplets/file-types/file-types-properties.glade.h:1
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:1
-#: capplets/network/gnome-network-preferences.glade.h:1
-#: capplets/theme-switcher/theme-install.glade.h:1
-msgid "*"
-msgstr "*"
-
 #: capplets/default-applications/gnome-default-applications-properties.glade.h:2
 msgid "Acce_pts URLs"
 msgstr "Go_dtar URLer"
@@ -761,6 +804,7 @@ msgid "Minimizing and Maximizing"
 msgstr "Minimering og maksimering"
 
 #: capplets/desktop-links/Sawfish/meta-properties.desktop.in.h:1
+#: capplets/windows/gnome-window-properties.c:600
 msgid "Meta"
 msgstr "Meta"
 
@@ -1291,12 +1335,17 @@ msgstr "Skrivebord"
 msgid "Window Management"
 msgstr "Vindushåndtering"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:568
+#: capplets/keybindings/gnome-keybinding-properties.c:593
+#, c-format
+msgid "That accelerator key is already in use by: %s\n"
+msgstr ""
+
+#: capplets/keybindings/gnome-keybinding-properties.c:620
 #, c-format
 msgid "Error setting new accelerator in configuration database: %s\n"
 msgstr "Feil under setting av ny snarvei i konfigurasjonsdatabasen: %s\n"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:719
+#: capplets/keybindings/gnome-keybinding-properties.c:771
 msgid ""
 "Unable to find any keyboard themes.  This means your GTK+ installation has "
 "been incompletely installed."
@@ -1304,11 +1353,11 @@ msgstr ""
 "Kan ikke finne tastaturtema. Dette betyr at din GTK+-installasjon ikke er "
 "komplett."
 
-#: capplets/keybindings/gnome-keybinding-properties.c:741
+#: capplets/keybindings/gnome-keybinding-properties.c:793
 msgid "Action"
 msgstr "Handling"
 
-#: capplets/keybindings/gnome-keybinding-properties.c:759
+#: capplets/keybindings/gnome-keybinding-properties.c:811
 msgid "Shortcut"
 msgstr "Snarvei"
 
@@ -1333,6 +1382,11 @@ msgstr "_Snarveier for redigering av tekst:"
 msgid "Assign shortcut keys to commands"
 msgstr "Tilegn snarveitaster til kommandoer"
 
+#: capplets/keyboard/gnome-keyboard-properties.c:160
+#, c-format
+msgid "There was an error launching the keyboard capplet : %s"
+msgstr "Det oppsto en feil under oppstart av tastaturdialogen : %s"
+
 #: capplets/keyboard/gnome-keyboard-properties.c:273
 msgid "_Accessibility"
 msgstr "_Tilgjengelighet"
@@ -1399,10 +1453,6 @@ msgstr "Klikk ved tastetrykk"
 msgid "Repeat Keys"
 msgstr "Repeteringstaster"
 
-#: capplets/keyboard/gnome-keyboard-properties.glade.h:16
-msgid "S_peed:"
-msgstr "_Hastighet:"
-
 #: capplets/keyboard/gnome-keyboard-properties.glade.h:18
 msgid "_Accessibility..."
 msgstr "_Tilgjengelighet..."
@@ -1439,7 +1489,7 @@ msgstr "stille"
 msgid "Set your keyboard preferences"
 msgstr "Sett dine brukervalg for tastatur"
 
-#: capplets/mouse/gnome-mouse-properties.c:477
+#: capplets/mouse/gnome-mouse-properties.c:476
 #, c-format
 msgid ""
 "<b>Unknown Cursor</b>\n"
@@ -1448,7 +1498,7 @@ msgstr ""
 "<b>Ukjent markør</b>\n"
 "%s"
 
-#: capplets/mouse/gnome-mouse-properties.c:578
+#: capplets/mouse/gnome-mouse-properties.c:577
 msgid ""
 "<b>Default Cursor - Current</b>\n"
 "The default cursor that ships with X"
@@ -1456,7 +1506,7 @@ msgstr ""
 "<b>Forvalgt markør - Aktiv</b>\n"
 "Standardmarkør som følger med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:581
+#: capplets/mouse/gnome-mouse-properties.c:580
 msgid ""
 "<b>Default Cursor</b>\n"
 "The default cursor that ships with X"
@@ -1464,7 +1514,7 @@ msgstr ""
 "<b>Forvalgt markør</b>\n"
 "Standardmarkør som følger med X"
 
-#: capplets/mouse/gnome-mouse-properties.c:599
+#: capplets/mouse/gnome-mouse-properties.c:598
 msgid ""
 "<b>White Cursor - Current</b>\n"
 "The default cursor inverted"
@@ -1472,7 +1522,7 @@ msgstr ""
 "<b>Hvit markør - Aktiv</b>\n"
 "Omvendt versjon av standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:602
+#: capplets/mouse/gnome-mouse-properties.c:601
 msgid ""
 "<b>White Cursor</b>\n"
 "The default cursor inverted"
@@ -1480,7 +1530,7 @@ msgstr ""
 "<b>Hvit markør</b>\n"
 "Omvendt standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:620
+#: capplets/mouse/gnome-mouse-properties.c:619
 msgid ""
 "<b>Large Cursor - Current</b>\n"
 "Large version of normal cursor"
@@ -1488,7 +1538,7 @@ msgstr ""
 "<b>Stor markør - Aktiv</b>\n"
 "Stor versjon av standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:623
+#: capplets/mouse/gnome-mouse-properties.c:622
 msgid ""
 "<b>Large Cursor</b>\n"
 "Large version of normal cursor"
@@ -1496,7 +1546,7 @@ msgstr ""
 "<b>Stor markør</b>\n"
 "Stor versjon av standardmarkør"
 
-#: capplets/mouse/gnome-mouse-properties.c:641
+#: capplets/mouse/gnome-mouse-properties.c:640
 msgid ""
 "<b>Large White Cursor - Current</b>\n"
 "Large version of white cursor"
@@ -1504,7 +1554,7 @@ msgstr ""
 "<b>Stor hvit markør - Aktiv</b>\n"
 "Stor versjon av hvit markør"
 
-#: capplets/mouse/gnome-mouse-properties.c:644
+#: capplets/mouse/gnome-mouse-properties.c:643
 msgid ""
 "<b>Large White Cursor</b>\n"
 "Large version of white cursor"
@@ -1637,10 +1687,6 @@ msgstr "Vi_s markørposisjonen når Ctrl-tasten trykkes ned"
 msgid "_Threshold:"
 msgstr "_Terskel:"
 
-#: capplets/mouse/mouse.desktop.in.h:1
-msgid "Mouse"
-msgstr "Mus"
-
 #: capplets/mouse/mouse.desktop.in.h:2
 msgid "Set your mouse preferences"
 msgstr "Sett dine brukervalg for mus"
@@ -1653,38 +1699,80 @@ msgstr "Nettverksproxy"
 msgid "Network proxy preferences"
 msgstr "Brukervalg for nettverksproxy"
 
-#: capplets/network/gnome-network-preferences.glade.h:2
-msgid "Network Preferences"
-msgstr "Brukervalg for nettverk"
+#: capplets/network/gnome-network-preferences.glade.h:1
+msgid "      "
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:3
-msgid "Network Proxy Preferences"
-msgstr "Brukervalg for nettverksproxy"
+msgid "<b>_Automatic proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:4
-msgid "P_ort:"
-msgstr "P_ort:"
+msgid "<b>_Direct internet connection</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:5
-msgid "Pass_word:"
-msgstr "Pass_ord:"
+msgid "<b>_Manual proxy configuration</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:6
-msgid "Pro_xy requires username and password"
-msgstr "Pro_xy krever brukernavn og passord"
+msgid "<b>_Use authentication</b>"
+msgstr ""
 
 #: capplets/network/gnome-network-preferences.glade.h:7
-msgid "User_name:"
-msgstr "Bruker_navn:"
+#, fuzzy
+msgid "Autoconfiguration _URL:"
+msgstr "Konfigurasjonskommando:"
 
 #: capplets/network/gnome-network-preferences.glade.h:8
-msgid "_Location:"
-msgstr "P_lassering"
+#, fuzzy
+msgid "HTTP Proxy Details"
+msgstr "Innstillinger for HTTP-proxy"
 
 #: capplets/network/gnome-network-preferences.glade.h:9
-msgid "_Use HTTP proxy"
+#, fuzzy
+msgid "Network Proxy Configuration"
+msgstr "Brukervalg for nettverksproxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:10
+#, fuzzy
+msgid "Port:"
+msgstr "P_ort:"
+
+#: capplets/network/gnome-network-preferences.glade.h:11
+msgid "S_ocks host:"
+msgstr ""
+
+#: capplets/network/gnome-network-preferences.glade.h:12
+#, fuzzy
+msgid "_Details"
+msgstr "De_taljer..."
+
+#: capplets/network/gnome-network-preferences.glade.h:13
+#, fuzzy
+msgid "_FTP proxy:"
+msgstr "Br_uk HTTP-proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:14
+#, fuzzy
+msgid "_HTTP proxy:"
+msgstr "Br_uk HTTP-proxy"
+
+#: capplets/network/gnome-network-preferences.glade.h:15
+#, fuzzy
+msgid "_Password:"
+msgstr "Pass_ord:"
+
+#: capplets/network/gnome-network-preferences.glade.h:16
+#, fuzzy
+msgid "_Secure HTTP proxy:"
 msgstr "Br_uk HTTP-proxy"
 
+#: capplets/network/gnome-network-preferences.glade.h:17
+#, fuzzy
+msgid "_Username:"
+msgstr "Bruker_navn:"
+
 #: capplets/sound/sound-properties-capplet.c:180
 msgid "Sound preferences"
 msgstr "Brukervalg for lyd"
@@ -1693,6 +1781,10 @@ msgstr "Brukervalg for lyd"
 msgid "E_nable sound server startup"
 msgstr "Slå på oppstart av lydtje_ner"
 
+#: capplets/sound/sound-properties.glade.h:2
+msgid "General"
+msgstr "Generelt"
+
 #: capplets/sound/sound-properties.glade.h:3
 msgid "Sound Events"
 msgstr "Lydhendelser"
@@ -1763,30 +1855,48 @@ msgid "Select themes for various parts of the desktop"
 msgstr "Velg tema for forskjellige deler av skrivebordet"
 
 #: capplets/theme-switcher/gtk-theme-selector.desktop.in.h:2
+#: capplets/theme-switcher/theme-properties.glade.h:6
 msgid "Theme"
 msgstr "Tema"
 
 #: capplets/theme-switcher/theme-properties.glade.h:1
-msgid "New themes can also be installed by dragging them into the window."
-msgstr "Nye tema kan også installeres ved å dra dem inn i vinduet."
+#, fuzzy
+msgid "Apply _Background"
+msgstr "Bakgrunn"
 
 #: capplets/theme-switcher/theme-properties.glade.h:2
-msgid "Theme Preferences"
-msgstr "Brukervalg for tema"
+#, fuzzy
+msgid "Apply _Font"
+msgstr "Aktiver nå"
 
 #: capplets/theme-switcher/theme-properties.glade.h:3
-msgid "Widget Theme"
-msgstr "Tema for widget"
+#, fuzzy
+msgid "Controls"
+msgstr "UI-kontroll"
 
 #: capplets/theme-switcher/theme-properties.glade.h:4
-msgid "Window Border Theme"
-msgstr "Tema for vinduskant"
+#, fuzzy
+msgid "Icons"
+msgstr "Kun ikoner"
 
 #: capplets/theme-switcher/theme-properties.glade.h:5
+msgid "New themes can also be installed by dragging them into the window."
+msgstr "Nye tema kan også installeres ved å dra dem inn i vinduet."
+
+#: capplets/theme-switcher/theme-properties.glade.h:7
+msgid "Theme Preferences"
+msgstr "Brukervalg for tema"
+
+#: capplets/theme-switcher/theme-properties.glade.h:8
+#, fuzzy
+msgid "Window Border"
+msgstr "Tema for vinduskant"
+
+#: capplets/theme-switcher/theme-properties.glade.h:9
 msgid "_Go to theme folder"
 msgstr "_Gå til temamappen"
 
-#: capplets/theme-switcher/theme-properties.glade.h:6
+#: capplets/theme-switcher/theme-properties.glade.h:10
 msgid "_Install New Theme..."
 msgstr "_Installer nytt tema..."
 
@@ -1932,30 +2042,58 @@ msgstr "A_vslutt"
 msgid "_Save"
 msgstr "_Lagre"
 
-#: capplets/windows/gnome-window-properties.c:282
-#: capplets/windows/gnome-window-properties.glade.h:6
-msgid "Window Preferences"
-msgstr "Brukervalg for vinduer"
+#: capplets/windows/gnome-window-properties.c:352
+#, c-format
+msgid ""
+"<b>Cannot start the preferences application for your window manager</b>\n"
+"\n"
+"%s"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:575
+#, fuzzy
+msgid "Control"
+msgstr "UI-kontroll"
+
+#: capplets/windows/gnome-window-properties.c:580
+msgid "Alt"
+msgstr ""
+
+#: capplets/windows/gnome-window-properties.c:586
+#, fuzzy
+msgid "Hyper"
+msgstr "Type"
+
+#: capplets/windows/gnome-window-properties.c:593
+#, fuzzy
+msgid "Super"
+msgstr "Hastighet"
 
 #: capplets/windows/gnome-window-properties.glade.h:1
-msgid "Apply Now"
-msgstr "Aktiver nå"
+msgid "To _move windows, click while holding down:"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:2
-msgid "Select windows when the mouse moves over them"
-msgstr "Velg vinduer når musen beveger seg over dem"
+msgid "Window Preferences"
+msgstr "Brukervalg for vinduer"
 
 #: capplets/windows/gnome-window-properties.glade.h:3
-msgid "Titlebar Font"
-msgstr "Skrift for tittellinjen"
+#, fuzzy
+msgid "_Double-click window titles to:"
+msgstr "Skrift for _vindutittel:"
 
 #: capplets/windows/gnome-window-properties.glade.h:4
-msgid "Window Border Appearance"
-msgstr "Utseende for vinduskant"
+msgid "_Raise selected windows after a short time"
+msgstr ""
 
 #: capplets/windows/gnome-window-properties.glade.h:5
-msgid "Window Manager:"
-msgstr "Vindushåndterer:"
+#, fuzzy
+msgid "_Select windows when the mouse moves over them"
+msgstr "Velg vinduer når musen beveger seg over dem"
+
+#: capplets/windows/gnome-window-properties.glade.h:6
+msgid "_Tenths of a second before raising the window:"
+msgstr ""
 
 #: capplets/windows/window-properties.desktop.in.h:1
 msgid "Window Properties"
@@ -2102,7 +2240,7 @@ msgstr "_Ikke vis denne meldingen igjen"
 msgid "Couldn't load sound file %s as sample %s"
 msgstr "Kunne ikke laste lydfil %s som sample %s"
 
-#: gnome-settings-daemon/gnome-settings-xsettings.c:170
+#: gnome-settings-daemon/gnome-settings-xsettings.c:172
 #, c-format
 msgid "GConf key %s set to type %s but its expected type was %s\n"
 msgstr "GConf-nøkkel %s satt til type %s men forventet type var %s\n"
@@ -2181,60 +2319,107 @@ msgstr "S_pill"
 msgid "Select sound file"
 msgstr "Velg lydfil"
 
-#: libwindow-settings/gnome-wm-manager.c:171
+#: libwindow-settings/gnome-wm-manager.c:320
 #, c-format
-msgid ""
-"Starting %s\n"
-"(%d seconds left before operation times out)"
+msgid "Window manager \"%s\" has not registered a configuration tool\n"
 msgstr ""
-"Starter %s\n"
-"(%d sekunder gjenstår før tidsavbrudd for operasjonen)"
 
-#: libwindow-settings/gnome-wm-manager.c:325
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\tAnother window manager is already running and could not be killed\n"
-msgstr ""
-"wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
-"\tEn annen vindushåndterer kjørere allerede og kunne ikke termineres\n"
+#~ msgid "Beep when enabling/disabling _keyboard accessibility features"
+#~ msgstr "_Pip ved aktivering/deaktivering av tilgjengelighet for tastatur"
 
-#: libwindow-settings/gnome-wm-manager.c:329
-#, c-format
-msgid ""
-"wm-properties-capplet: Unable to initialize window manager.\n"
-"\t'%s' didn't start\n"
-msgstr ""
-"wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
-"\t«%s» startet ikke\n"
+#~ msgid "Beep when:"
+#~ msgstr "Pip når:"
 
-#: libwindow-settings/gnome-wm-manager.c:378
-msgid "Previous window manager did not die\n"
-msgstr "Tidligere vindushåndterer terminerte ikke\n"
+#~ msgid "Repeat Key Pre_ferences..."
+#~ msgstr "Bruker_valg for tasterepetering..."
 
-#: libwindow-settings/gnome-wm-manager.c:411
-#, c-format
-msgid ""
-"Could not start '%s'.\n"
-"Falling back to previous window manager '%s'\n"
-msgstr ""
-"Kunne ikke starte «%s».\n"
-"Faller tilbake til tidligere vindushåndterer «%s»\n"
+#~ msgid "Start mo_ving this long after keypress:"
+#~ msgstr "Tid før be_vegelse starter etter tastetrykk:"
 
-#: libwindow-settings/gnome-wm-manager.c:442
-msgid ""
-"Could not start fallback window manager.\n"
-"Please run a window manager manually. You can\n"
-"do this by selecting \"Run Program\" in the\n"
-"foot menu\n"
-msgstr ""
-"Kunne ikke starte gammel vindushåndterer.\n"
-"Vennligst start en vindushåndterer manuelt. Du kan\n"
-"gjøre dette ved å velge «Kjør program» fra menyen\n"
-"«Handlinger»\n"
+#~ msgid "Testing Area"
+#~ msgstr "Testområde"
 
-#: libwindow-settings/gnome-wm-manager.c:467
-msgid "OK"
-msgstr "OK"
+#~ msgid "Toggle and Repeat Keys"
+#~ msgstr "Slå av/på repetering av tastetrykk"
+
+#~ msgid "_Import CDE AccessX file..."
+#~ msgstr "_Importer AccessX-fil fra CDE..."
+
+#~ msgid ""
+#~ "_Turn off Sticky Keys when\n"
+#~ "two keys pressed simultaneously"
+#~ msgstr ""
+#~ "Slå av klebrige taster når\n"
+#~ "to taster trykkes samtidig"
+
+#~ msgid "msecs"
+#~ msgstr "millisekunder"
+
+#~ msgid "Network Preferences"
+#~ msgstr "Brukervalg for nettverk"
+
+#~ msgid "Pro_xy requires username and password"
+#~ msgstr "Pro_xy krever brukernavn og passord"
+
+#~ msgid "_Location:"
+#~ msgstr "P_lassering"
+
+#~ msgid "Widget Theme"
+#~ msgstr "Tema for widget"
+
+#~ msgid "Titlebar Font"
+#~ msgstr "Skrift for tittellinjen"
+
+#~ msgid "Window Border Appearance"
+#~ msgstr "Utseende for vinduskant"
+
+#~ msgid "Window Manager:"
+#~ msgstr "Vindushåndterer:"
+
+#~ msgid ""
+#~ "Starting %s\n"
+#~ "(%d seconds left before operation times out)"
+#~ msgstr ""
+#~ "Starter %s\n"
+#~ "(%d sekunder gjenstår før tidsavbrudd for operasjonen)"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\tAnother window manager is already running and could not be killed\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
+#~ "\tEn annen vindushåndterer kjørere allerede og kunne ikke termineres\n"
+
+#~ msgid ""
+#~ "wm-properties-capplet: Unable to initialize window manager.\n"
+#~ "\t'%s' didn't start\n"
+#~ msgstr ""
+#~ "wm-properties-capplet: Kan ikke initiere vindushåndterer.\n"
+#~ "\t«%s» startet ikke\n"
+
+#~ msgid "Previous window manager did not die\n"
+#~ msgstr "Tidligere vindushåndterer terminerte ikke\n"
+
+#~ msgid ""
+#~ "Could not start '%s'.\n"
+#~ "Falling back to previous window manager '%s'\n"
+#~ msgstr ""
+#~ "Kunne ikke starte «%s».\n"
+#~ "Faller tilbake til tidligere vindushåndterer «%s»\n"
+
+#~ msgid ""
+#~ "Could not start fallback window manager.\n"
+#~ "Please run a window manager manually. You can\n"
+#~ "do this by selecting \"Run Program\" in the\n"
+#~ "foot menu\n"
+#~ msgstr ""
+#~ "Kunne ikke starte gammel vindushåndterer.\n"
+#~ "Vennligst start en vindushåndterer manuelt. Du kan\n"
+#~ "gjøre dette ved å velge «Kjør program» fra menyen\n"
+#~ "«Handlinger»\n"
+
+#~ msgid "OK"
+#~ msgstr "OK"
 
 #~ msgid "_General"
 #~ msgstr "_Generelt"
@@ -2515,9 +2700,6 @@ msgstr "OK"
 #~ msgid "Mouse Properties"
 #~ msgstr "Egenskaper for mus"
 
-#~ msgid "HTTP Proxy Settings"
-#~ msgstr "Innstillinger for HTTP-proxy"
-
 #~ msgid "Configure GNOME's use of sound"
 #~ msgstr "Konfigurér bruk av lyd i GNOME."
 
@@ -2805,9 +2987,6 @@ msgstr "OK"
 #~ msgid "Command:"
 #~ msgstr "Kommando:"
 
-#~ msgid "Configuration Command:"
-#~ msgstr "Konfigurasjonskommando:"
-
 #~ msgid "Window manager is session managed"
 #~ msgstr "Vindushåndtereren er sesjonshåndtert"
 
@@ -2847,9 +3026,6 @@ msgstr "OK"
 #~ msgid "Icons and Text"
 #~ msgstr "Ikoner og tekst"
 
-#~ msgid "Only Icons"
-#~ msgstr "Kun ikoner"
-
 #~ msgid "Only Text"
 #~ msgstr "Kun tekst"