diff --git a/po/no.po b/po/no.po
index 1396181a7..50667b800 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,193 +6,454 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core-0.13\n"
-"POT-Creation-Date: 1998-04-21 13:08+0200\n"
-"PO-Revision-Date: 1998-04-24 16:30+0100\n"
+"POT-Creation-Date: 1998-05-25 12:12+0200\n"
+"PO-Revision-Date: 1998-05-29 08:00+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@fib.hl.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: applets/batmon/batmon.c:96
+#. This format string is used, to display the actual day,
+#. when showing a vertical panel.  For an explanation of
+#. this format string type 'man strftime'.
+#: applets/gen_util/clock.c:98
+msgid ""
+"%a\n"
+"%b %d"
+msgstr ""
+"%a\n"
+"%b %d"
+
+#. This format string is used, to display the actual day,
+#. when showing a horizontal panel.
+#: applets/gen_util/clock.c:103
+msgid "%a %b %d"
+msgstr "%a %b %d"
+
+#: applets/gen_util/clock.c:110
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#: applets/gen_util/clock.c:113
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: applets/gen_util/clock.c:254 applets/gen_util/mailcheck.c:588
+#: applets/gen_util/printer.c:283
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: applets/gen_util/clock.c:307
+msgid "Clock properties"
+msgstr "Egenskaper for klokke"
+
+#: applets/gen_util/clock.c:359
+msgid "Clock"
+msgstr "Klokke"
+
+#: applets/gen_util/mailcheck.c:229
+msgid "You have new mail."
+msgstr "Du har ny post."
+
+#: applets/gen_util/mailcheck.c:231
+msgid "You have mail."
+msgstr "Du har post."
+
+#: applets/gen_util/mailcheck.c:233
+msgid "No mail."
+msgstr "Ingen post."
+
+#: applets/gen_util/mailcheck.c:447
+msgid "Notification"
+msgstr "Melding"
+
+#: applets/gen_util/mailcheck.c:464
+msgid "Select animation"
+msgstr "Velg animasjon"
+
+#: applets/gen_util/mailcheck.c:487
+msgid "Mail check properties"
+msgstr "Egenskaper for postsjekking"
+
+#: applets/gen_util/mailcheck.c:492
+msgid "Mail check"
+msgstr "Postsjekk"
+
+#: applets/gen_util/mailcheck.c:528
+msgid "Mail check Applet"
+msgstr "Postsjekk-applet"
+
+#: applets/bussign/bussign.c:226 applets/gen_util/mailcheck.c:529
+msgid "(c) 1998 the Free Software Foundation"
+msgstr "(c) 1998 the Free Software Foundation"
+
+#: applets/gen_util/mailcheck.c:531
+msgid "Mail check notifies you when new mail is on your mailbox"
+msgstr "Postsjekking gir deg beskjed når du har ny post i postkassen"
+
+#: applets/gen_util/mailcheck.c:577
+msgid "Text only"
+msgstr "Bare tekst"
+
+#: applets/bussign/bussign.c:86 applets/fish/fish.c:313
+#: applets/gen_util/mailcheck.c:594 applets/netload/netload.c:337
+#: panel/menu.c:585
+msgid "About..."
+msgstr "Om..."
+
+#: applets/gen_util/main.c:31
+msgid "Start in clock mode"
+msgstr "Start i klokkemodus"
+
+#: applets/gen_util/main.c:32
+msgid "Start in mailcheck mode"
+msgstr "Start i postsjekkingsmodus"
+
+#: applets/gen_util/main.c:33
+msgid "Start in printer mode"
+msgstr "Start i skrivermodus"
+
+#: applets/gen_util/printer.c:221
+msgid "Printer properties"
+msgstr "Egenskaper for skrivere"
+
+#: applets/gen_util/printer.c:229
+msgid "Printer name:"
+msgstr "Skrivernavn:"
+
+#: applets/gen_util/printer.c:233
+msgid "Print command:"
+msgstr "Skriverkommando:"
+
+#: applets/gen_util/printer.c:239
+msgid "Printer"
+msgstr "Skriver"
+
+#: applets/batmon/batmon.c:93
 msgid "Can't open /proc/apm; can't get data."
 msgstr "Kan ikke åpne /proc/apm; får ikke data."
 
-#: applets/batmon/batmon.c:102
+#: applets/batmon/batmon.c:99
 msgid "Something wrong with /proc/apm; can't get data."
 msgstr "Noe er galt med /proc/apm; får ikke data."
 
-#: applets/batmon/batmon.c:150
+#: applets/batmon/batmon.c:147
 msgid "There is no battery?!?"
 msgstr "Ikke noe batteri?!?"
 
-#: applets/batmon/batmon.c:153
+#: applets/batmon/batmon.c:150
 msgid "High and charging."
 msgstr "Høyt og under lading."
 
-#: applets/batmon/batmon.c:156
+#: applets/batmon/batmon.c:153
 msgid "High."
 msgstr "Høyt."
 
-#: applets/batmon/batmon.c:159
+#: applets/batmon/batmon.c:156
 msgid "Low and charging."
 msgstr "Lavt og under lading."
 
-#: applets/batmon/batmon.c:162
+#: applets/batmon/batmon.c:159
 msgid "Low."
 msgstr "Lavt."
 
-#: applets/batmon/batmon.c:165
+#: applets/batmon/batmon.c:162
 msgid "Critical and charging."
 msgstr "Kritisk og under lading."
 
-#: applets/batmon/batmon.c:168
+#: applets/batmon/batmon.c:165
 msgid "Critical!!"
 msgstr "Kritisk!!"
 
-#: applets/batmon/batmon.c:171
+#: applets/batmon/batmon.c:168
 msgid "Charging."
 msgstr "Under lading."
 
-#: applets/batmon/batmon.c:179
+#: applets/batmon/batmon.c:176
 #, c-format
 msgid "%d minutes of battery"
 msgstr "%d minutter batteritid"
 
 #. would have to be an error
-#: applets/batmon/batmon.c:181
+#: applets/batmon/batmon.c:178
 msgid "More than 100,000,000 minutes of battery life?!?"
 msgstr "Mer enn 100.000.000 minutter batteritid?!?"
 
-#: applets/batmon/batmon.c:253
+#: applets/batmon/batmon.c:255
 msgid "APM Stats"
 msgstr "APM-verdier"
 
-#: applets/batmon/batmon.c:269
+#: applets/batmon/batmon.c:271
 msgid "Linux APM Driver Version:"
 msgstr "Linux APM-driver versjon:"
 
-#: applets/batmon/batmon.c:281
+#: applets/batmon/batmon.c:283
 msgid "APM BIOS Version:"
 msgstr "APM BIOS versjon:"
 
-#: applets/batmon/batmon.c:298
+#: applets/batmon/batmon.c:300
 msgid "Battery Status:"
 msgstr "Batteristatus:"
 
-#. close button
-#: applets/batmon/batmon.c:322 applets/mailcheck/mailcheck.c:460
-#: help-browser/window.c:135 panel/launcher.c:329 panel/panel_config.c:254
-#: panel/panel_config_global.c:283
+#: applets/batmon/batmon.c:324 help-browser/window.c:140
 msgid "Close"
 msgstr "Lukk"
 
-#: applets/mailcheck/mailcheck.c:226
-msgid "You have new mail."
-msgstr "Du har ny post."
+#: applets/bussign/bussign.c:102
+msgid "Refresh Image"
+msgstr "Gjenoppfrisk bilde"
 
-#: applets/mailcheck/mailcheck.c:228
-msgid "You have mail."
-msgstr "Du har post."
+#: applets/bussign/bussign.c:225
+msgid "The Bus Sign Applet"
+msgstr "The Bus Sign Applet"
 
-#: applets/mailcheck/mailcheck.c:230
-msgid "No mail."
-msgstr "Ingen post."
+#: applets/bussign/bussign.c:228
+msgid ""
+"This applet is a total waste of time. Get back to work!\n"
+"\n"
+"To fill in the sign please see:\n"
+"\n"
+"http://people.netscape.com/mtoy/sign/index.html"
+msgstr ""
+"Dette programmet er fullstendig bortkastet tid. Gå tilbake til arbeidet!\n"
+"\n"
+"For å fylle ut skiltet se:\n"
+"\n"
+"http://people.netscape.com/mtoy/sign/index.html"
 
-#: applets/mailcheck/mailcheck.c:419
-msgid "Notification"
-msgstr "Melding"
+#: applets/fish/fish.c:65 applets/fish/fish.c:240
+#, c-format
+msgid "%s the Fish"
+msgstr "Fisken %"
 
-#: applets/mailcheck/mailcheck.c:436
-msgid "Select animation"
-msgstr "Velg animasjon"
+#: applets/fish/fish.c:66
+#, c-format
+msgid "%s the GNOME Fish Says:"
+msgstr "Gnome fisken %s sier:"
 
-#: applets/mailcheck/mailcheck.c:455
-msgid "Mail check properties"
-msgstr "Egenskaper for postsjekking"
+#: applets/fish/fish.c:106
+msgid "GNOME Fish Properties"
+msgstr "Egenskaper for fisk"
 
-#. apply button
-#: applets/mailcheck/mailcheck.c:459 panel/launcher.c:338
-#: panel/panel_config.c:262 panel/panel_config_global.c:291
-msgid "Apply"
-msgstr "Bruk"
+#: applets/fish/fish.c:111
+msgid "Your GNOME Fish's Name:"
+msgstr "Navnet på din Gnome fisk:"
 
-#: applets/mailcheck/mailcheck.c:570
-msgid "Properties"
-msgstr "Egenskaper"
+#: applets/fish/fish.c:124 panel/launcher.c:329
+msgid "Name"
+msgstr "Navn"
 
-#: panel/panel.c:399
+#: applets/fish/fish.c:243
+msgid "(with minor help from George)"
+msgstr "(med litt hjelp fra George)"
+
+#: applets/fish/fish.c:246
+msgid "The GNOME Fish Applet"
+msgstr "Gnome fisk"
+
+#: applets/fish/fish.c:249
+msgid ""
+"This applet has no use what-so-ever. It only takes up disk space and "
+"compilation time, and if loaded it also takes up precious panel space and "
+"memory. If anyone is found using this applet, he should be promptly sent for "
+"a psychiatric evaluation."
+msgstr ""
+"Dette programmet har ingen som helst nytte. Det tar bare opp diskplass og "
+"kompileringstid, og hvis lastet, også dyrebar plass på panelet og minne. "
+"Hvis noen blir tatt i bruk av dette programmet, bør vedkommende straks "
+"sendes til psykisk evaluering."
+
+#: applets/cpuload/cpuload.c:201 applets/fish/fish.c:297
+#: applets/netload/netload.c:320
+msgid "Can't create applet!\n"
+msgstr "Kan ikke opprette applet!\n"
+
+#: applets/cpuload/cpuload.c:218 applets/fish/fish.c:320
+#: applets/netload/netload.c:343 panel/main.c:413
+msgid "Properties..."
+msgstr "Egenskaper ..."
+
+#: applets/cpuload/properties.c:59 applets/netload/properties.c:61
+msgid "Can't allocate memory for color\n"
+msgstr "Kan ikke allokere minne for farge\n"
+
+#: applets/cpuload/properties.c:115
+msgid "User Load"
+msgstr "Brukerlast"
+
+#: applets/cpuload/properties.c:120
+msgid "System Load"
+msgstr "Systemlast"
+
+#: applets/cpuload/properties.c:125 applets/netload/properties.c:129
+msgid "Applet Height"
+msgstr "Applet-høyde"
+
+#: applets/cpuload/properties.c:131 applets/netload/properties.c:135
+msgid "Width"
+msgstr "Bredde"
+
+#: applets/cpuload/properties.c:146 applets/netload/properties.c:150
+msgid "Update Frequency"
+msgstr "Oppdateringsfrekvens"
+
+#: applets/cpuload/properties.c:197
+msgid "CPULoad Settings"
+msgstr "Innstillinger for prosessorlast"
+
+#: applets/cpuload/properties.c:200 applets/netload/properties.c:252
+msgid "General"
+msgstr "Generelt"
+
+#: applets/netload/netload.c:260
+msgid "Netload Error"
+msgstr "Feil i nettverkslast"
+
+#: applets/netload/netload.c:265
+msgid "An error occured in the Netload Applet:"
+msgstr "En feil oppstod i nettverkslastprogrammet:"
+
+#: applets/netload/netload.c:294
+msgid "The GNOME Network Load Applet"
+msgstr "Gnome nettverkslast applet"
+
+#: applets/netload/netload.c:297
+msgid ""
+"This applet is released under the terms and conditions of the GNU Public "
+"Licence.This applet shows the load on a network device. It requires the "
+"/proc/net/ip_acct interface to be present and set up correctly for the "
+"device."
+msgstr ""
+"Denne appleten slippes under betingelsene stilt i GNU Public Licence. "
+"Denne appleten viser belastningen på en nettverksenhet. "
+"/proc/net/ip_acct grensesnittet må være tilstede og riktig satt opp "
+"for at den skal virke."
+
+#: applets/netload/properties.c:119
+msgid "Network Traffic"
+msgstr "Nettverkstrafikk"
+
+#: applets/netload/properties.c:124
+msgid "Traffic bars"
+msgstr "Trafikkstolper"
+
+#: applets/netload/properties.c:193
+msgid "Device name (like ppp0 or eth0)"
+msgstr "Enhetsnavn (som ppp0 eller eth0)"
+
+#: applets/netload/properties.c:201
+msgid "Vertical spacing of bars (in kilobytes)"
+msgstr "Vertikal avstand mellom stolper (i kilobytes)"
+
+#: applets/netload/properties.c:243
+msgid "properties.c: gnome_property_box_new() failed.\n"
+msgstr "properties.c: gnome_property_box_new() feilet.\n"
+
+#: applets/netload/properties.c:249
+msgid "Network Load Settings"
+msgstr "Innstillinger for nettverkslast"
+
+#: applets/netload/properties.c:258
+msgid "Device"
+msgstr "Enhet"
+
+#: panel/panel.c:386
+msgid "Really log out?"
+msgstr "Virkelig logge ut?"
+
+#: panel/panel.c:394
+msgid "Ask next time"
+msgstr "Spør neste gang"
+
+#: panel/panel.c:534
 msgid "Remove from panel"
 msgstr "Fjern fra panelet"
 
-#: panel/panel.c:406
+#: panel/panel.c:542
 msgid "Move applet"
 msgstr "Flytt applet"
 
-#: panel/panel.c:743
+#: panel/panel.c:997
 msgid "This panel properties..."
 msgstr "Egenskaper for dette panelet..."
 
-#: panel/menu.c:426 panel/panel.c:750
+#: panel/menu.c:576 panel/panel.c:1004
 msgid "Global properties..."
 msgstr "Globale egenskaper..."
 
-#: panel/logout.c:47 panel/menu.c:468 panel/panel.c:768
+#: panel/panel.c:1011
+msgid "Add main menu applet"
+msgstr "Legg til hovedmenyapplet"
+
+#: panel/logout.c:24 panel/menu.c:630 panel/panel.c:1029
 msgid "Log out"
 msgstr "Logg ut"
 
-#: panel/menu.c:388
+#: panel/menu.c:465
+msgid "Create swallow applet"
+msgstr "Opprett slukt applikasjon"
+
+#: panel/menu.c:474
+msgid "Title of application to swallow"
+msgstr "Tittel på applikasjonen som skal slukes"
+
+#: panel/menu.c:527
 msgid "Add to panel"
 msgstr "Legg til på panelet"
 
-#: panel/menu.c:393
+#: panel/menu.c:532
 msgid "Add applet"
 msgstr "Legg til applet"
 
-#: panel/menu.c:401
+#: panel/menu.c:540
 msgid "Add main menu"
 msgstr "Legg til hovedmeny"
 
-#: panel/menu.c:409
+#: panel/menu.c:547
+msgid "Add log out button"
+msgstr "Legg til avloggingsknapp"
+
+#: panel/menu.c:555
 msgid "Add drawer"
 msgstr "Legg til skuff"
 
-#: panel/menu.c:416
+#: panel/menu.c:564
 msgid "Add swallowed app"
 msgstr "Legg til slukt applikasjon"
 
-#: panel/menu.c:456
+#: panel/menu.c:615
 msgid "Panel"
 msgstr "Panel"
 
-#: panel/menu.c:463
+#: panel/menu.c:622
 msgid "Lock screen"
 msgstr "Lås skjerm"
 
 #. Position frame
-#: panel/panel_config.c:100
+#: panel/panel_config.c:112
 msgid "Position"
 msgstr "Posisjon"
 
 #. Top Position
-#: panel/panel_config.c:112
+#: panel/panel_config.c:122
 msgid "Top"
 msgstr "Øverst"
 
-#: panel/panel_config.c:125
+#: panel/panel_config.c:133
 msgid "Bottom"
 msgstr "Nederst"
 
-#: panel/panel_config.c:138
+#: panel/panel_config.c:144
 msgid "Left"
 msgstr "Venstre"
 
-#: panel/panel_config.c:151
+#: panel/panel_config.c:155
 msgid "Right"
 msgstr "Høyre"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:162
+#: panel/panel_config.c:164
 msgid "Minimize Options"
 msgstr "Minimeringsalternativer"
 
@@ -201,346 +462,440 @@ msgstr "Minimeringsalternativer"
 msgid "Explicitly Hide"
 msgstr "Gjem eksplisitt"
 
-#: panel/panel_config.c:187
+#: panel/panel_config.c:185
 msgid "Auto Hide"
 msgstr "Gjem automatisk"
 
-#: panel/panel_config.c:227
+#: panel/panel_config.c:239
+msgid "Image file"
+msgstr "Bildefil"
+
+#: panel/panel_config.c:247
+msgid "Browse"
+msgstr "Se på..."
+
+#: panel/panel_config.c:257
+msgid "Enable Background Image"
+msgstr "Slå på bakgrunnsbilde"
+
+#: panel/panel_config.c:295
 msgid "Panel Configuration"
 msgstr "Konfigurasjon for panelet"
 
-#. label for Position notebook page
-#: panel/panel_config.c:241
+#: panel/panel_config.c:303
 msgid "Orientation"
 msgstr "Plassering"
 
+#: panel/panel_config.c:310
+msgid "Background image"
+msgstr "Bakgrunnsbilde"
+
+#. Animation disable
+#: panel/panel_config_global.c:127
+msgid "Disable animations"
+msgstr "Slå av animasjoner"
+
 #. AutoHide Animation step_size scale frame
-#: panel/panel_config_global.c:118
+#: panel/panel_config_global.c:135
 msgid "Auto-Hide Animation Speed"
 msgstr "Animasjonshastighet for automatisk gjemming"
 
 #. ExplicitHide Animation step_size scale frame
-#: panel/panel_config_global.c:126
+#: panel/panel_config_global.c:144
 msgid "Explicit-Hide Animation Speed"
 msgstr "Animasjonshastighet for eksplisitt gjemming"
 
+#. DrawerHide Animation step_size scale frame
+#: panel/panel_config_global.c:153
+msgid "Drawer Animation Speed"
+msgstr "Animasjonshastighet for skuff"
+
 #. Minimize Delay scale frame
-#: panel/panel_config_global.c:134
+#: panel/panel_config_global.c:162
 msgid "Auto-Hide Minimize Delay (ms)"
 msgstr "Minimeringsventetid for automatisk gjemming (ms)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:142
+#: panel/panel_config_global.c:169
 msgid "Auto-Hide Minimized Size (pixels)"
 msgstr "Minimert størrelse for automatisk gjemming (piksler)"
 
 #. Tooltips frame
-#: panel/panel_config_global.c:166
+#: panel/panel_config_global.c:211
 msgid "Icon Tooltips"
 msgstr "Verktøystips for ikoner"
 
 #. Tooltips enable
-#: panel/panel_config_global.c:179
+#: panel/panel_config_global.c:222
 msgid "Tooltips enabled"
 msgstr "Verktøystips på"
 
 #. Menu frame
-#: panel/panel_config_global.c:191
+#: panel/panel_config_global.c:232
 msgid "Menus"
 msgstr "Menyer"
 
 #. Small Icons
-#: panel/panel_config_global.c:204
+#: panel/panel_config_global.c:243
 msgid "Show small icons"
 msgstr "Vis små ikoner"
 
-#: panel/panel_config_global.c:248
+#. Movement frame
+#: panel/panel_config_global.c:253
+msgid "Movement"
+msgstr "Bevegelse"
+
+#. Switched
+#: panel/panel_config_global.c:264
+msgid "Switched movement"
+msgstr ""
+
+#: panel/panel_config_global.c:276
+msgid "Free movement (doesn't disturb other applets)"
+msgstr "Fri bevegelse (forstyrrer ikke andre applets)"
+
+#. Logout frame
+#: panel/panel_config_global.c:286
+msgid "Log Out"
+msgstr "Logg av"
+
+#. Prompt before log out
+#: panel/panel_config_global.c:297
+msgid "Prompt before logout"
+msgstr "Spør før avlogging"
+
+#: panel/panel_config_global.c:329
 msgid "Global Panel Configuration"
 msgstr "Global konfigurering av panel"
 
-#. label for Animation notebook page
-#: panel/panel_config_global.c:262
+#: panel/panel_config_global.c:335
 msgid "Animation settings"
 msgstr "Animasjonsverdier"
 
-#. label for Miscellaneous notebook page
 #: help-browser/toc-man.c:24 help-browser/toc2-man.c:27
-#: panel/panel_config_global.c:270
+#: panel/panel_config_global.c:340
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
-#: panel/launcher.c:253
+#: panel/launcher.c:268
 msgid "App"
 msgstr "Applikasjon"
 
-#: panel/launcher.c:301
+#: panel/launcher.c:320
 msgid "Launcher properties"
-msgstr "Egenskaper for launcher"
+msgstr "Egenskaper for oppstarter"
 
-#: panel/launcher.c:312
-msgid "Name"
-msgstr "Navn"
-
-#: panel/launcher.c:313
+#: panel/launcher.c:330
 msgid "Comment"
 msgstr "Kommentar"
 
-#: panel/launcher.c:314
+#: panel/launcher.c:332
 msgid "Execute"
 msgstr "Kjør"
 
-#: panel/launcher.c:315
+#: panel/launcher.c:334
 msgid "Icon"
 msgstr "Ikon"
 
-#: panel/launcher.c:316
+#: panel/launcher.c:335
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: panel/launcher.c:319
+#: panel/launcher.c:338
 msgid "Run inside terminal"
 msgstr "Kjør i en terminal"
 
-#: panel/launcher.c:486
-msgid "Properties ..."
-msgstr "Egenskaper ..."
-
-#: panel/main.c:76
+#: panel/main.c:102
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#: panel/main.c:76
+#: panel/main.c:102
 msgid "Discard session"
 msgstr "Avbryt sesjon"
 
-#: desktop-properties/property-background.c:417
+#: desktop-properties/property-background.c:494
 msgid "Color"
 msgstr "Farge"
 
-#: desktop-properties/property-background.c:441
+#: desktop-properties/property-background.c:518
 msgid "Flat"
 msgstr "Flat"
 
-#: desktop-properties/property-background.c:447
+#: desktop-properties/property-background.c:524
 msgid "Gradient"
 msgstr "Gradient"
 
-#: desktop-properties/property-background.c:462
+#: desktop-properties/property-background.c:539
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: desktop-properties/property-background.c:468
+#: desktop-properties/property-background.c:545
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: desktop-properties/property-background.c:603
+#: desktop-properties/property-background.c:690
 msgid "Wallpaper Selection"
 msgstr "Valg for bakgrunn"
 
-#: desktop-properties/property-background.c:642
+#: desktop-properties/property-background.c:729
 msgid "Wallpaper"
 msgstr "Bakgrunn"
 
-#: desktop-properties/property-background.c:645
+#: desktop-properties/property-background.c:732
 msgid " Browse... "
 msgstr " Se på... "
 
-#: desktop-properties/property-background.c:650
+#: desktop-properties/property-background.c:737
 msgid "none"
 msgstr "ingen"
 
-#: desktop-properties/property-background.c:694
+#: desktop-properties/property-background.c:781
+msgid "Scaled"
+msgstr "Skalert"
+
+#: desktop-properties/property-background.c:790
+msgid "Scaled (keep aspect)"
+msgstr "Skalert (behold høyde/bredde-forhold)"
+
+#: desktop-properties/property-background.c:801
 msgid "Centered"
 msgstr "Sentrert"
 
-#: desktop-properties/property-background.c:700
+#: desktop-properties/property-background.c:812
 msgid "Tiled"
 msgstr "Side-ved-side"
 
-#: desktop-properties/property-background.c:951
+#: desktop-properties/property-background.c:1006
 msgid " Background "
 msgstr " Bakgrunn "
 
-#: desktop-properties/property-screensaver.cc:143
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: desktop-properties/property-screensaver.cc:145
-msgid "Wait"
-msgstr "Vent"
-
-#: desktop-properties/property-screensaver.cc:146
-msgid "Min"
-msgstr ""
-
-#: desktop-properties/property-screensaver.cc:158
-msgid "Requires Password"
-msgstr "Trenger passord"
-
-#: desktop-properties/property-screensaver.cc:167
-msgid "Use DPMS"
-msgstr "Bruk DPMS"
-
-#: desktop-properties/property-screensaver.cc:176
-msgid "Priority"
-msgstr "Prioritet"
-
-#: desktop-properties/property-screensaver.cc:184
-msgid "Normal"
-msgstr "Normal"
-
-#: desktop-properties/property-screensaver.cc:185
-msgid "Low"
-msgstr "Lav"
-
-#: desktop-properties/property-screensaver.cc:231
-msgid "Screensavers"
-msgstr "Skjermsparere"
-
-#: desktop-properties/property-screensaver.cc:243
-msgid "Setup..."
-msgstr "Oppsett..."
-
-#: desktop-properties/property-screensaver.cc:247
-msgid "Test"
-msgstr "Test"
-
-#: desktop-properties/property-screensaver.cc:348
-msgid " Screensaver "
-msgstr " Skjermsparer "
-
-#: desktop-properties/xlockmore.cc:158
-msgid "XLockMore Properties"
-msgstr "Egenskaper for XLockMore"
-
-#: desktop-properties/xlockmore.cc:176
-msgid "  OK  "
-msgstr ""
-
-#: desktop-properties/xlockmore.cc:177
-msgid " Apply "
-msgstr " Bruk "
-
-#: desktop-properties/xlockmore.cc:178
-msgid " Cancel "
-msgstr " Avbryt "
-
-#: desktop-properties/xlockmore.cc:179
-msgid " Defaults "
-msgstr " Forhåndsvalg "
-
-#: desktop-properties/xlockmore.cc:180 help-browser/window.c:169
-#: help-browser/window.c:194
-msgid "Help"
-msgstr "Hjelp"
-
-#: desktop-properties/xlockmore.cc:185 desktop-properties/xlockmore.cc:197
-msgid " Mode "
-msgstr " Modus "
-
-#: desktop-properties/xlockmore.cc:186
-msgid " XLockMore "
-msgstr ""
-
-#: desktop-properties/xlockmore.cc:195
-msgid " Options "
-msgstr " Alternativer "
-
-#: desktop-properties/xlockmore.cc:196
-msgid " Preview "
-msgstr " Forhåndsvisning "
-
-#: desktop-properties/property-keyboard.c:153
-msgid "Speed"
-msgstr "Fart"
-
-#: desktop-properties/property-keyboard.c:159
-msgid "Auto repeat"
-msgstr "Auto repetering"
-
-#: desktop-properties/property-keyboard.c:171
-msgid "Repeat rate"
-msgstr "Repeteringsintervall"
-
-#: desktop-properties/property-keyboard.c:185
-msgid "Repeat delay"
-msgstr "Ventetid for repetering"
-
-#: desktop-properties/property-keyboard.c:210
-msgid "Click"
-msgstr "Klikk"
-
-#: desktop-properties/property-keyboard.c:216
-msgid "Click on keypress"
-msgstr "Klikk ved tastetrykk"
-
-#: desktop-properties/property-keyboard.c:226
-msgid "Click volume"
-msgstr "Klikkvolum"
-
-#: desktop-properties/property-keyboard.c:254
-msgid " Keyboard "
-msgstr " Tastatur "
-
-#. Frame for choosing button mapping.
-#: desktop-properties/property-mouse.c:184
-msgid "Buttons"
-msgstr "Knapper"
-
-#: desktop-properties/property-mouse.c:186
-msgid "Left handed"
-msgstr "Venstrehendt"
-
-#: desktop-properties/property-mouse.c:188
-msgid "Right handed"
-msgstr "Høyrehendt"
-
-#. Frame for setting pointer acceleration.
-#: desktop-properties/property-mouse.c:208
-msgid "Motion"
-msgstr "Bevegelse"
-
-#: desktop-properties/property-mouse.c:213
-msgid "Acceleration"
-msgstr "Aksellerasjon"
-
-#: desktop-properties/property-mouse.c:213
-msgid "Slow"
-msgstr "Sakte"
-
-#: desktop-properties/property-mouse.c:213
-msgid "Fast"
-msgstr "Fort"
-
-#: desktop-properties/property-mouse.c:219
-msgid "Threshold"
-msgstr "Terskel"
-
-#: desktop-properties/property-mouse.c:219
-msgid "Small"
-msgstr "Liten"
-
-#: desktop-properties/property-mouse.c:219
-msgid "Large"
-msgstr "Stor"
-
-#: desktop-properties/property-mouse.c:231
-msgid "Mouse"
-msgstr "Mus"
-
-#: desktop-properties/main.c:31
+#: desktop-properties/property-background.c:1057
 msgid "Set parameters from saved state and exit"
 msgstr "Sett parametere fra lagret modus og avslutt"
 
-#: desktop-properties/app-mouse.c:10
+#: desktop-properties/property-background.c:1058
+msgid "IMAGE"
+msgstr "IMAGE"
+
+#: desktop-properties/property-background.c:1058
+msgid "Sets the wallpaper to the value specified"
+msgstr "Setter bakgrunnen til den spesifiserte verdien"
+
+#: desktop-properties/property-background.c:1059
+#: desktop-properties/property-background.c:1060
+msgid "COLOR"
+msgstr "COLOR"
+
+#: desktop-properties/property-background.c:1059
+msgid "Specifies the background color"
+msgstr "Spesifiserer bakgrunnsfargen"
+
+#: desktop-properties/property-background.c:1060
+msgid "Specifies end background color for gradient"
+msgstr "Spesifiserer bakgrunnsfargen for gradienten"
+
+#: desktop-properties/property-background.c:1061
+msgid "ORIENT"
+msgstr "ORIENT"
+
+#: desktop-properties/property-background.c:1061
+msgid "Gradient orientation: vertical or horizontal"
+msgstr "Retning for gradering: vertikal eller horisontal?"
+
+#: desktop-properties/property-background.c:1062
+msgid "Use a solid fill for the background"
+msgstr "Bruk helfylt bakgrunn"
+
+#: desktop-properties/property-background.c:1063
+msgid "Use a gradient fill for the background"
+msgstr "Bruk gradvis fyll til bakgrunn"
+
+#: desktop-properties/property-background.c:1064
+msgid "MODE"
+msgstr "MODE"
+
+#: desktop-properties/property-background.c:1064
+msgid "Display wallpaper: tiled, centered, scaled or ratio"
+msgstr "Vis bakgrunn: side ved side, sentrért, skalért eller strukket"
+
+#: desktop-properties/property-screensaver.cc:146
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: desktop-properties/property-screensaver.cc:148
+msgid "Wait"
+msgstr "Vent"
+
+#: desktop-properties/property-screensaver.cc:149
+msgid "Min"
+msgstr "Min"
+
+#: desktop-properties/property-screensaver.cc:161
+msgid "Requires Password"
+msgstr "Trenger passord"
+
+#: desktop-properties/property-screensaver.cc:170
+msgid "Use DPMS"
+msgstr "Bruk DPMS"
+
+#: desktop-properties/property-screensaver.cc:179
+msgid "Priority"
+msgstr "Prioritet"
+
+#: desktop-properties/property-screensaver.cc:187
+msgid "Normal"
+msgstr "Normal"
+
+#: desktop-properties/property-screensaver.cc:188
+msgid "Low"
+msgstr "Lav"
+
+#: desktop-properties/property-screensaver.cc:234
+msgid "Screensavers"
+msgstr "Skjermsparere"
+
+#: desktop-properties/property-screensaver.cc:246
+msgid "Setup..."
+msgstr "Oppsett..."
+
+#: desktop-properties/property-screensaver.cc:250
+msgid "Test"
+msgstr "Test"
+
+#: desktop-properties/property-screensaver.cc:356
+msgid " Screensaver "
+msgstr " Skjermsparer "
+
+#: desktop-properties/xlockmore.cc:156
+msgid "XLockMore Properties"
+msgstr "Egenskaper for XLockMore"
+
+#: desktop-properties/xlockmore.cc:174
+msgid "  OK  "
+msgstr "  OK  "
+
+#: desktop-properties/xlockmore.cc:175
+msgid " Apply "
+msgstr " Bruk "
+
+#: desktop-properties/xlockmore.cc:176
+msgid " Cancel "
+msgstr " Avbryt "
+
+#: desktop-properties/xlockmore.cc:177
+msgid " Defaults "
+msgstr " Forhåndsvalg "
+
+#: desktop-properties/xlockmore.cc:178 help-browser/window.c:174
+#: help-browser/window.c:199
+msgid "Help"
+msgstr "Hjelp"
+
+#: desktop-properties/xlockmore.cc:183 desktop-properties/xlockmore.cc:195
+msgid " Mode "
+msgstr " Modus "
+
+#: desktop-properties/xlockmore.cc:184
+msgid " XLockMore "
+msgstr " XLockMore "
+
+#: desktop-properties/xlockmore.cc:193
+msgid " Options "
+msgstr " Alternativer "
+
+#: desktop-properties/xlockmore.cc:194
+msgid " Preview "
+msgstr " Forhåndsvisning "
+
+#. Auto repeat
+#: desktop-properties/property-keyboard.c:160
+msgid "Auto-repeat"
+msgstr "Auto-repetering"
+
+#: desktop-properties/property-keyboard.c:179
+msgid "Enable auto-repeat"
+msgstr "Slå på auto-repetering"
+
+#: desktop-properties/property-keyboard.c:186
+msgid "Repeat rate"
+msgstr "Repeteringsintervall"
+
+#: desktop-properties/property-keyboard.c:207
+msgid "Repeat delay"
+msgstr "Ventetid før repetering"
+
+#. Keyboard click
+#: desktop-properties/property-keyboard.c:235
+msgid "Keyboard click"
+msgstr "Tastatur-klikk"
+
+#: desktop-properties/property-keyboard.c:254
+msgid "Click on keypress"
+msgstr "Klikk ved tastetrykk"
+
+#: desktop-properties/property-keyboard.c:261
+msgid "Click volume"
+msgstr "Klikkvolum"
+
+#: desktop-properties/property-keyboard.c:291
+msgid "Keyboard"
+msgstr "Tastatur"
+
+#. Mouse buttons
+#: desktop-properties/property-mouse.c:201
+msgid "Mouse buttons"
+msgstr "Musknapper"
+
+#: desktop-properties/property-mouse.c:210
+msgid "Left handed"
+msgstr "Venstrehendt"
+
+#: desktop-properties/property-mouse.c:212
+msgid "Right handed"
+msgstr "Høyrehendt"
+
+#. Mouse motion
+#: desktop-properties/property-mouse.c:229
+msgid "Mouse motion"
+msgstr "Musbevegelse"
+
+#: desktop-properties/property-mouse.c:241
+msgid "Acceleration"
+msgstr "Aksellerasjon"
+
+#: desktop-properties/property-mouse.c:241
+msgid "Fast"
+msgstr "Fort"
+
+#: desktop-properties/property-mouse.c:241
+msgid "Slow"
+msgstr "Sakte"
+
+#: desktop-properties/property-mouse.c:253
+msgid "Threshold"
+msgstr "Terskel"
+
+#: desktop-properties/property-mouse.c:253
+msgid "Large"
+msgstr "Stor"
+
+#: desktop-properties/property-mouse.c:253
+msgid "Small"
+msgstr "Liten"
+
+#: desktop-properties/property-mouse.c:260
+msgid "Mouse"
+msgstr "Mus"
+
+#: desktop-properties/app-mouse.c:11
 msgid "Mouse Properties"
 msgstr "Egenskaper for mus"
 
-#: desktop-properties/app-keyboard.c:10
+#: desktop-properties/app-keyboard.c:11
 msgid "Keyboard Properties"
 msgstr "Egenskaper for tastatur"
 
-#: desktop-properties/app-background.c:10
+#: desktop-properties/app-background.c:15
 msgid "Background Properties"
 msgstr "Egenskaper for bakgrunn"
 
@@ -552,195 +907,207 @@ msgstr "[SESJON]"
 msgid "Kill session"
 msgstr "Drep sesjon"
 
-#: help-browser/gnome-help-browser.c:77
+#: gsm/save-session.c:82
+msgid "save-session: couldn't connect to session manager\n"
+msgstr "save-session: kunne ikke koble til sesjonsbehandler\n"
+
+#: help-browser/gnome-help-browser.c:82
 msgid "X"
 msgstr "X"
 
-#: help-browser/gnome-help-browser.c:77
+#: help-browser/gnome-help-browser.c:82
 msgid "X position of window"
 msgstr "Vinduets X-posisjon"
 
-#: help-browser/gnome-help-browser.c:78
+#: help-browser/gnome-help-browser.c:83
 msgid "Y"
 msgstr "Y"
 
-#: help-browser/gnome-help-browser.c:78
+#: help-browser/gnome-help-browser.c:83
 msgid "Y position of window"
 msgstr "Vinduets Y-posisjon"
 
-#: help-browser/gnome-help-browser.c:79
+#: help-browser/gnome-help-browser.c:84
 msgid "WIDTH"
 msgstr "BREDDE"
 
-#: help-browser/gnome-help-browser.c:79
+#: help-browser/gnome-help-browser.c:84
 msgid "Width of window"
 msgstr "Vinduets bredde"
 
-#: help-browser/gnome-help-browser.c:80
+#: help-browser/gnome-help-browser.c:85
 msgid "HEIGHT"
 msgstr "HØYDE"
 
-#: help-browser/gnome-help-browser.c:80
+#: help-browser/gnome-help-browser.c:85
 msgid "Height of window"
 msgstr "Vinduets høyde"
 
-#: help-browser/gnome-help-browser.c:81
+#: help-browser/gnome-help-browser.c:86
 msgid "Debug level"
 msgstr "Nivå for avlusing (debugging)"
 
-#: help-browser/gnome-help-browser.c:89
+#: help-browser/gnome-help-browser.c:94
 msgid "[URL]"
 msgstr "[URL]"
 
-#: help-browser/gnome-help-browser.c:306
+#: help-browser/gnome-help-browser.c:332
 msgid "Gnome Help Browser"
-msgstr ""
+msgstr "Gnome Hjelp Leser"
 
-#: help-browser/gnome-help-browser.c:309
+#: help-browser/gnome-help-browser.c:335
 msgid ""
 "GNOME Help Browser allows easy access to various forms of documentation on "
 "your system"
 msgstr ""
-"GNOME Help Browser gir deg enkel tilgang til forskjellige typer dokumentasjon"
-"på systemet ditt"
+"GNOME Hjelp leser gir deg enkel tilgang til forskjellige typer "
+"dokumentasjon på systemet ditt"
 
-#: help-browser/gnome-help-browser.c:528
+#: help-browser/gnome-help-browser.c:557
 msgid "History size"
-msgstr "Størrelse på historikkfilen"
+msgstr "Historikkstørrelse"
 
-#: help-browser/gnome-help-browser.c:529
+#: help-browser/gnome-help-browser.c:558
 msgid "History file"
 msgstr "Historikkfil"
 
-#: help-browser/gnome-help-browser.c:530
+#: help-browser/gnome-help-browser.c:559
 msgid "Cache size"
 msgstr "Størrelse på cache"
 
-#: help-browser/gnome-help-browser.c:531
+#: help-browser/gnome-help-browser.c:560
 msgid "Cache file"
 msgstr "Cachefil"
 
-#: help-browser/gnome-help-browser.c:532
+#: help-browser/gnome-help-browser.c:561
 msgid "Bookmark file"
 msgstr "Bokmerkefil"
 
-#: help-browser/gnome-help-browser.c:534
+#: help-browser/gnome-help-browser.c:567
 msgid "Man Path"
 msgstr "Sti til manualsider"
 
-#: help-browser/gnome-help-browser.c:535
+#: help-browser/gnome-help-browser.c:568
 msgid "Info Path"
 msgstr "Sti til infosider"
 
-#: help-browser/gnome-help-browser.c:536
+#: help-browser/gnome-help-browser.c:569
 msgid "GNOME Help Path"
-msgstr "Søkesti for GNOME Help"
+msgstr "Søkesti for GNOME Hjelp"
 
-#: help-browser/gnome-help-browser.c:604
+#: help-browser/gnome-help-browser.c:644
 msgid "Gnome Help Configure"
-msgstr "Konfigurer Gnome Help"
+msgstr "Konfigurer Gnome Hjelp"
 
-#: help-browser/window.c:120
+#: help-browser/gnome-help-browser.c:647
+msgid "History and cache"
+msgstr "Historikk og mellomlagring"
+
+#: help-browser/gnome-help-browser.c:648
+msgid "Paths"
+msgstr "Søkestier"
+
+#: help-browser/window.c:125
 msgid "New window"
 msgstr "Nytt vindu"
 
-#: help-browser/window.c:120
+#: help-browser/window.c:125
 msgid "Open new browser window"
 msgstr "Åpne nytt vindu"
 
-#: help-browser/window.c:125
+#: help-browser/window.c:130
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
-#: help-browser/window.c:125
+#: help-browser/window.c:130
 msgid "Add bookmark"
 msgstr "Legg til bokmerke"
 
-#: help-browser/window.c:130
-msgid "Configure"
-msgstr "Konfigurer"
-
 #: help-browser/window.c:135
+msgid "Configure"
+msgstr "Konfigurér"
+
+#: help-browser/window.c:140
 msgid "Close window"
 msgstr "Lukk vindu"
 
-#: help-browser/window.c:140
+#: help-browser/window.c:145
 msgid "Exit"
 msgstr "Avslutt"
 
-#: help-browser/window.c:140
+#: help-browser/window.c:145
 msgid "Exit all windows"
 msgstr "Lukk alle vinduer"
 
-#: help-browser/window.c:149
+#: help-browser/window.c:154
 msgid "About"
 msgstr "Om"
 
-#: help-browser/window.c:149
+#: help-browser/window.c:154
 msgid "Info about this program"
 msgstr "Info om dette programmet"
 
-#: help-browser/window.c:159 help-browser/window.c:189
+#: help-browser/window.c:164 help-browser/window.c:194
 msgid "History"
 msgstr "Historikk"
 
-#: help-browser/window.c:159 help-browser/window.c:189
+#: help-browser/window.c:164 help-browser/window.c:194
 msgid "Show History Window"
 msgstr "Vis historikkvinduet"
 
-#: help-browser/window.c:161
+#: help-browser/window.c:166
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: help-browser/window.c:161 help-browser/window.c:191
+#: help-browser/window.c:166 help-browser/window.c:196
 msgid "Show Bookmarks Window"
 msgstr "Vis bokmerkevinduet"
 
-#: help-browser/window.c:167
+#: help-browser/window.c:172
 msgid "File"
 msgstr "Fil"
 
-#: help-browser/window.c:168
+#: help-browser/window.c:173
 msgid "Window"
 msgstr "Vindu"
 
-#: help-browser/window.c:176
+#: help-browser/window.c:181
 msgid "Back"
 msgstr "Tilbake"
 
-#: help-browser/window.c:177
+#: help-browser/window.c:182
 msgid "Go to the previous location in the history list"
 msgstr "Gå til forrige sted i historikklisten"
 
-#: help-browser/window.c:179
+#: help-browser/window.c:184
 msgid "Forward"
 msgstr "Fremover"
 
-#: help-browser/window.c:180
+#: help-browser/window.c:185
 msgid "Go to the next location in the history list"
 msgstr "Gå til neste sted i historikklisten"
 
-#: help-browser/window.c:183
+#: help-browser/window.c:188
 msgid "Reload"
 msgstr "Last på nytt"
 
-#: help-browser/window.c:186
+#: help-browser/window.c:191
 msgid "Index"
 msgstr "Indeks"
 
-#: help-browser/window.c:186
+#: help-browser/window.c:191
 msgid "Show Documentation Index"
 msgstr "Vis indeks for dokumentasjon"
 
-#: help-browser/window.c:191
+#: help-browser/window.c:196
 msgid "BMarks"
 msgstr "BMerker"
 
-#: help-browser/window.c:194
+#: help-browser/window.c:199
 msgid "Help on Help"
-msgstr "Hjelp om Help"
+msgstr "Hjelp om Hjelp"
 
-#: help-browser/gnome-helpwin.c:270
+#: help-browser/gnome-helpwin.c:214
 msgid "<body><h2>Error: file not found</h2></body>"
 msgstr "<body><h2>Feil: fil ikke funnet</h2></body>"
 
@@ -754,7 +1121,7 @@ msgstr "Sidetittel"
 
 #: help-browser/bookmarks.c:228
 msgid "Gnome Help Bookmarks"
-msgstr "Bokmerker for Gnome Help"
+msgstr "Bokmerker for Gnome Hjelp"
 
 #. Buttons
 #: help-browser/bookmarks.c:238
@@ -775,7 +1142,7 @@ msgstr "Tall"
 
 #: help-browser/history.c:268
 msgid "Gnome Help History"
-msgstr "Historie for Gnome Help"
+msgstr "Historikk for Gnome Hjelp"
 
 #: help-browser/toc-man.c:18 help-browser/toc2-man.c:21
 msgid "User Commands"
@@ -834,7 +1201,16 @@ msgstr "Infosider"
 msgid "GNOME Help"
 msgstr "GNOME Hjelp"
 
-#: help-browser/visit.c:95
+#: help-browser/visit.c:83
+msgid "<BODY>Could not load default TOC page</BODY>"
+msgstr "<BODY>Kunne ikke laste forhåndsvalgt innholdsfortegnelse</BODY>"
+
+#: help-browser/visit.c:101
 msgid "<BODY>Unknown TOC argument</BODY>"
 msgstr "<BODY>Ukjent argument for innholdsfortegnelse</BODY>"
 
+#~ msgid "Apply"
+#~ msgstr "Bruk"
+
+#~ msgid "Speed"
+#~ msgstr "Fart"