diff --git a/po/no.po b/po/no.po
index d57ffa30d..5759affac 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-core 0.30\n"
-"POT-Creation-Date: 1998-11-22 11:03+0100\n"
+"POT-Creation-Date: 1998-11-30 23:56+0100\n"
 "PO-Revision-Date: 1998-11-22 11:11+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@fib.hl.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -20,14 +20,14 @@ msgstr "Om"
 #: applets/asclock/asclock.c:151 applets/clockmail/clockmail.c:428
 #: applets/cpuload/cpuload.c:221 applets/diskusage/diskusage.c:710
 #: applets/drivemount/drivemount.c:455 applets/fish/fish.c:460
-#: applets/gen_util/clock.c:258 applets/gen_util/mailcheck.c:684
-#: applets/gen_util/printer.c:399 applets/gkb/gkb.c:174
+#: applets/gen_util/clock.c:260 applets/gen_util/mailcheck.c:687
+#: applets/gen_util/printer.c:405 applets/gkb/gkb.c:181
 #: applets/icewm-pager/wmpager_applet.c:91
 #: applets/modemlights/modemlights.c:719 applets/multiload/cpuload.c:240
 #: applets/multiload/memload.c:279 applets/multiload/swapload.c:240
 #: applets/netload/netload.c:345 applets/slashapp/slashapp.c:625
 #: applets/webcontrol/webcontrol.c:314 panel/drawer.c:409 panel/launcher.c:265
-#: panel/menu.c:2248
+#: panel/menu.c:2245
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
@@ -40,19 +40,19 @@ msgid "Who said NeXT is dead?"
 msgstr "Hvem sa at NeXT er død?"
 
 #. ---
-#: applets/asclock/dialogs.c:104 applets/clockmail/properties.c:371
-#: applets/cpuload/properties.c:210 applets/diskusage/properties.c:322
+#: applets/asclock/dialogs.c:105 applets/clockmail/properties.c:371
+#: applets/cpuload/properties.c:216 applets/diskusage/properties.c:322
 #: applets/drivemount/properties.c:204 applets/fvwm-pager/properties.c:246
 #: applets/modemlights/properties.c:197 applets/multiload/properties-cpu.c:231
 #: applets/multiload/properties-mem.c:283
-#: applets/multiload/properties-swap.c:233 applets/netload/properties.c:260
+#: applets/multiload/properties-swap.c:233 applets/netload/properties.c:276
 #: applets/slashapp/properties.c:328
 #: capplets/sound-properties/sound-properties.c:150
-#: gnome-terminal/gnome-terminal.c:808
+#: gnome-terminal/gnome-terminal.c:813
 msgid "General"
 msgstr "Generelt"
 
-#: applets/asclock/dialogs.c:110
+#: applets/asclock/dialogs.c:111
 msgid "Timezone"
 msgstr "Tidssone"
 
@@ -152,8 +152,8 @@ msgstr "Intern feil: ugyldig modus i battery_set_mode"
 
 #: applets/battery/battery.c:398 applets/cpuload/cpuload.c:203
 #: applets/fish/fish.c:435 applets/freshapp/freshapp.c:39
-#: applets/gen_util/clock.c:231 applets/gen_util/mailcheck.c:651
-#: applets/gen_util/printer.c:374 applets/gkb/gkb.c:136
+#: applets/gen_util/clock.c:233 applets/gen_util/mailcheck.c:654
+#: applets/gen_util/printer.c:380 applets/gkb/gkb.c:139
 #: applets/netload/netload.c:320
 msgid "Can't create applet!\n"
 msgstr "Kan ikke opprette applet!\n"
@@ -170,11 +170,11 @@ msgstr "Innstillinger for batterimonitor:"
 msgid "General Properties"
 msgstr "Generelle egenskaper"
 
-#: applets/battery/properties.c:45 applets/cpuload/properties.c:135
+#: applets/battery/properties.c:45 applets/cpuload/properties.c:138
 #: applets/diskusage/properties.c:213 applets/fvwm-pager/properties.c:178
 #: applets/multiload/properties-cpu.c:141
 #: applets/multiload/properties-mem.c:192
-#: applets/multiload/properties-swap.c:143 applets/netload/properties.c:129
+#: applets/multiload/properties-swap.c:143 applets/netload/properties.c:141
 msgid "Applet Height"
 msgstr "Applet-høyde"
 
@@ -236,11 +236,11 @@ msgstr "APM er sl
 
 #. { GNOME_APP_UI_HELP, NULL, NULL, NULL, NULL, NULL,
 #. GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL },
-#: applets/bussign/bussign.c:73 applets/charpick/charpick.c:337
+#: applets/bussign/bussign.c:73 applets/charpick/charpick.c:338
 #: applets/clockmail/clockmail.c:435 applets/dialer/dialer.c:162
-#: applets/drivemount/drivemount.c:461 applets/fifteen/fifteen.c:306
-#: applets/fish/fish.c:452 applets/gen_util/mailcheck.c:691
-#: applets/gkb/gkb.c:168 applets/icewm-pager/wmpager_applet.c:83
+#: applets/drivemount/drivemount.c:461 applets/fifteen/fifteen.c:309
+#: applets/fish/fish.c:452 applets/gen_util/mailcheck.c:694
+#: applets/gkb/gkb.c:175 applets/icewm-pager/wmpager_applet.c:83
 #: applets/modemlights/modemlights.c:725 applets/netload/netload.c:338
 #: applets/slashapp/slashapp.c:631 applets/webcontrol/webcontrol.c:306
 #: gmenu/gmenu.c:68 panel/menu.c:1729
@@ -255,7 +255,7 @@ msgstr "Gjenoppfrisk bilde"
 msgid "The Bus Sign Applet"
 msgstr "The Bus Sign Applet"
 
-#: applets/bussign/bussign.c:243 applets/gen_util/mailcheck.c:611
+#: applets/bussign/bussign.c:243 applets/gen_util/mailcheck.c:612
 msgid "(c) 1998 the Free Software Foundation"
 msgstr "(c) 1998 the Free Software Foundation"
 
@@ -336,7 +336,7 @@ msgstr " (GMT %+d)"
 msgid "None (default)"
 msgstr "Ingen (forvalgt)"
 
-#: applets/clockmail/properties.c:269 applets/gen_util/clock.c:363
+#: applets/clockmail/properties.c:269 applets/gen_util/clock.c:365
 msgid "Clock"
 msgstr "Klokke"
 
@@ -372,34 +372,34 @@ msgstr "Postboksen anses som full etter (Kbytes):"
 msgid "Theme file (directory):"
 msgstr "Temafil (katalog):"
 
-#: applets/clockmail/properties.c:418
+#: applets/clockmail/properties.c:417
 msgid "Theme"
 msgstr "Tema"
 
-#: applets/cpuload/properties.c:123 applets/multiload/properties-cpu.c:133
+#: applets/cpuload/properties.c:126 applets/multiload/properties-cpu.c:133
 msgid "User Load"
 msgstr "Brukerlast"
 
-#: applets/cpuload/properties.c:129 applets/multiload/properties-cpu.c:137
+#: applets/cpuload/properties.c:132 applets/multiload/properties-cpu.c:137
 msgid "System Load"
 msgstr "Systemlast"
 
-#: applets/cpuload/properties.c:141 applets/diskusage/properties.c:219
+#: applets/cpuload/properties.c:144 applets/diskusage/properties.c:219
 #: applets/fvwm-pager/properties.c:184 applets/multiload/properties-cpu.c:149
 #: applets/multiload/properties-mem.c:200
-#: applets/multiload/properties-swap.c:151 applets/netload/properties.c:135
+#: applets/multiload/properties-swap.c:151 applets/netload/properties.c:147
 #: panel/swallow.c:243
 msgid "Width"
 msgstr "Bredde"
 
-#: applets/cpuload/properties.c:156 applets/diskusage/properties.c:240
+#: applets/cpuload/properties.c:159 applets/diskusage/properties.c:240
 #: applets/multiload/properties-cpu.c:169
 #: applets/multiload/properties-mem.c:220
-#: applets/multiload/properties-swap.c:171 applets/netload/properties.c:154
+#: applets/multiload/properties-swap.c:171 applets/netload/properties.c:170
 msgid "Update Frequency"
 msgstr "Oppdateringsfrekvens"
 
-#: applets/cpuload/properties.c:207 applets/multiload/properties-cpu.c:228
+#: applets/cpuload/properties.c:213 applets/multiload/properties-cpu.c:228
 msgid "CPULoad Settings"
 msgstr "Innstillinger for prosessorlast"
 
@@ -507,23 +507,23 @@ msgstr "Monteringspunkt:"
 msgid "Use automount friendly status test"
 msgstr "Bruk automount-vennlig statustest"
 
-#: applets/fifteen/fifteen.c:35
+#: applets/fifteen/fifteen.c:36
 msgid "You win!"
 msgstr "Du vinner!"
 
-#: applets/fifteen/fifteen.c:263
+#: applets/fifteen/fifteen.c:266
 msgid "Fifteen sliding pieces"
 msgstr "Femten skliende stykker"
 
-#: applets/fifteen/fifteen.c:264
+#: applets/fifteen/fifteen.c:267
 msgid "1.0"
 msgstr "1.0"
 
-#: applets/fifteen/fifteen.c:265
+#: applets/fifteen/fifteen.c:268
 msgid "Copyright (C) The Free Software Foundation"
 msgstr "Copyright (C) The Free Software Foundation"
 
-#: applets/fifteen/fifteen.c:267
+#: applets/fifteen/fifteen.c:270
 msgid ""
 "Sam Lloyd's all-time favorite game, now for your delight in the Gnome Panel. "
 "Guaranteed to be a productivity buster."
@@ -531,11 +531,11 @@ msgstr ""
 "Sam Lloyds favorittspill, nå til alles begeistring tilgjengelig i "
 "Panelet.Garantert ødeleggende for produktiviteten."
 
-#: applets/fifteen/fifteen.c:289
+#: applets/fifteen/fifteen.c:292
 msgid "Can't create fifteen applet!"
 msgstr "Kan ikke opprette femten appleten!"
 
-#: applets/fifteen/fifteen.c:299
+#: applets/fifteen/fifteen.c:302
 msgid "Scramble pieces"
 msgstr "Bland stykkene"
 
@@ -562,9 +562,9 @@ msgstr "Navnet p
 msgid "The Animation Filename:"
 msgstr "Filnavn for animasjonen:"
 
-#: applets/fish/fish.c:219 gnome-terminal/gnome-terminal.c:915
-#: panel/menu.c:2192 panel/panel-util.c:188 panel/panel-util.c:225
-#: panel/panel_config.c:726 panel/swallow.c:233
+#: applets/fish/fish.c:219 gnome-terminal/gnome-terminal.c:929
+#: panel/menu.c:2187 panel/panel-util.c:180 panel/panel-util.c:218
+#: panel/panel-util.c:255 panel/panel_config.c:721 panel/swallow.c:233
 msgid "Browse"
 msgstr "Se på"
 
@@ -600,24 +600,24 @@ msgstr ""
 "minne. Hvis noen blir tatt i å bruke denne appleten, burde vedkommende "
 "straks sendes til psykisk evaluering."
 
-#: applets/fvwm-pager/fvwm-pager.c:141
+#: applets/fvwm-pager/fvwm-pager.c:142
 msgid "Fvwm Pager Applet"
 msgstr "Applet for valg av viruelt skjermområde"
 
-#: applets/fvwm-pager/fvwm-pager.c:143
+#: applets/fvwm-pager/fvwm-pager.c:144
 msgid "Copyright (C) 1998 M. Lausch"
 msgstr "Copyright (C) 1998 M. Lausch"
 
-#: applets/fvwm-pager/fvwm-pager.c:233
+#: applets/fvwm-pager/fvwm-pager.c:241
 #, c-format
 msgid "Desk %d"
 msgstr "Skrivebord %d"
 
-#: applets/fvwm-pager/fvwm-pager.c:323
+#: applets/fvwm-pager/fvwm-pager.c:332
 msgid "About\t"
 msgstr "Om\t"
 
-#: applets/fvwm-pager/fvwm-pager.c:329 gmenu/gmenu.c:95
+#: applets/fvwm-pager/fvwm-pager.c:338 gmenu/gmenu.c:95
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -680,15 +680,15 @@ msgstr "%I:%M %p"
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: applets/gen_util/clock.c:311
+#: applets/gen_util/clock.c:313
 msgid "Clock properties"
 msgstr "Egenskaper for klokke"
 
-#: applets/gen_util/clock.c:321
+#: applets/gen_util/clock.c:323
 msgid "12 hour"
 msgstr "12 timer"
 
-#: applets/gen_util/clock.c:330
+#: applets/gen_util/clock.c:332
 msgid "24 hour"
 msgstr "24 timer"
 
@@ -732,15 +732,15 @@ msgstr "Egenskaper for postsjekking"
 msgid "Mail check"
 msgstr "Postsjekk"
 
-#: applets/gen_util/mailcheck.c:610
+#: applets/gen_util/mailcheck.c:611
 msgid "Mail check Applet"
 msgstr "Postsjekk-applet"
 
-#: applets/gen_util/mailcheck.c:613
+#: applets/gen_util/mailcheck.c:614
 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:672
+#: applets/gen_util/mailcheck.c:675
 msgid "Text only"
 msgstr "Bare tekst"
 
@@ -756,38 +756,38 @@ msgstr "Start i postsjekkingsmodus"
 msgid "Start in printer mode"
 msgstr "Start i skrivermodus"
 
-#: applets/gen_util/printer.c:337
+#: applets/gen_util/printer.c:341
 msgid "Printer properties"
 msgstr "Egenskaper for skrivere"
 
-#: applets/gen_util/printer.c:345
+#: applets/gen_util/printer.c:349
 msgid "Printer name:"
 msgstr "Skrivernavn:"
 
-#: applets/gen_util/printer.c:349
+#: applets/gen_util/printer.c:353
 msgid "Print command:"
 msgstr "Skriverkommando:"
 
-#: applets/gen_util/printer.c:355
+#: applets/gen_util/printer.c:359
 msgid "Printer"
 msgstr "Skriver"
 
-#: applets/gkb/gkb.c:93
+#: applets/gkb/gkb.c:96
 msgid "The GNOME KB Applet"
 msgstr "GNOME KB-applet"
 
-#: applets/gkb/gkb.c:93
-msgid "0.28"
-msgstr "0.28"
+#: applets/gkb/gkb.c:96
+msgid "0.31"
+msgstr "0.31"
 
-#: applets/gkb/gkb.c:94
+#: applets/gkb/gkb.c:97
 msgid "(C) 1998 LSC - Linux Supporting Center"
 msgstr "(C) 1998 LSC - Linux Supporting Center"
 
-#: applets/gkb/gkb.c:96
+#: applets/gkb/gkb.c:99
 msgid ""
 "This applet used to switch between keyboard maps. No more. It uses "
-"setxkbmap. The main site of this app moved tempolary to URL "
+"setxkbmap, or xmodmap. The main site of this app moved tempolary to URL "
 "http://lsc.kva.hu/gkb.Mail me your flag, please (60x40 size),I will put it "
 "to CVS."
 msgstr ""
@@ -796,19 +796,19 @@ msgstr ""
 "URL'en http://lsc.kva.hu/gkb. Vær vennlig å send en e-post med flagget ditt, "
 "så vil jeg legge det til i CVS."
 
-#: applets/gkb/gkb.c:104
+#: applets/gkb/gkb.c:107
 msgid "gkb.xpm"
 msgstr "gkb.xpm"
 
-#: applets/gkb/properties.c:93
+#: applets/gkb/properties.c:105
 msgid "Icon Selection"
 msgstr "Ikonvalg"
 
-#: applets/gkb/properties.c:188
+#: applets/gkb/properties.c:219
 msgid "GKB settings"
 msgstr "Instillinger for GKB"
 
-#: applets/gkb/properties.c:217 applets/gkb/properties.c:234
+#: applets/gkb/properties.c:248 applets/gkb/properties.c:265
 msgid ""
 "Couldn't\n"
 "load\n"
@@ -818,7 +818,15 @@ msgstr ""
 "laste\n"
 "ikonet"
 
-#: applets/gkb/properties.c:244 panel/menu.c:2203
+#: applets/gkb/properties.c:277
+msgid "Xkb"
+msgstr "Xkb"
+
+#: applets/gkb/properties.c:281
+msgid "Xmodmap"
+msgstr "Xmodmap"
+
+#: applets/gkb/properties.c:295 panel/menu.c:2200
 msgid "Menu"
 msgstr "Meny"
 
@@ -982,35 +990,31 @@ msgstr ""
 "at/proc/net/ip_acct grensesnittet er tilgjengelig, og riktig satt opp for "
 "enheten."
 
-#: applets/netload/properties.c:61
-msgid "Can't allocate memory for color\n"
-msgstr "Kan ikke allokere minne for farge\n"
-
-#: applets/netload/properties.c:119
+#: applets/netload/properties.c:133
 msgid "Network Traffic"
 msgstr "Nettverkstrafikk"
 
-#: applets/netload/properties.c:124
+#: applets/netload/properties.c:137
 msgid "Traffic bars"
 msgstr "Trafikkstolper"
 
-#: applets/netload/properties.c:199
+#: applets/netload/properties.c:215
 msgid "Device name (like ppp0 or eth0)"
 msgstr "Enhetsnavn (som ppp0 eller eth0)"
 
-#: applets/netload/properties.c:207
+#: applets/netload/properties.c:223
 msgid "Vertical spacing of bars (in kilobytes)"
 msgstr "Vertikal avstand mellom stolper (i kilobytes)"
 
-#: applets/netload/properties.c:251
+#: applets/netload/properties.c:267
 msgid "properties.c: gnome_property_box_new() failed.\n"
 msgstr "properties.c: gnome_property_box_new() feilet.\n"
 
-#: applets/netload/properties.c:257
+#: applets/netload/properties.c:273
 msgid "Network Load Settings"
 msgstr "Innstillinger for nettlast"
 
-#: applets/netload/properties.c:266
+#: applets/netload/properties.c:282
 msgid "Device"
 msgstr "Enhet"
 
@@ -1068,7 +1072,7 @@ msgstr "Bildetjener Url:"
 msgid "Image path:"
 msgstr "Bildesti:"
 
-#: applets/slashapp/properties.c:337 gnome-terminal/gnome-terminal.c:994
+#: applets/slashapp/properties.c:337 gnome-terminal/gnome-terminal.c:1008
 msgid "Scrolling"
 msgstr "Rullende"
 
@@ -1231,53 +1235,53 @@ msgid "Test settings"
 msgstr "Testinnstillinger"
 
 #. Mouse buttons
-#: capplets/mouse-properties/mouse-properties.c:225
+#: capplets/mouse-properties/mouse-properties.c:222
 #: desktop-properties/property-mouse.c:215
 msgid "Mouse buttons"
 msgstr "Musknapper"
 
-#: capplets/mouse-properties/mouse-properties.c:234
+#: capplets/mouse-properties/mouse-properties.c:231
 #: desktop-properties/property-mouse.c:224
 msgid "Left handed"
 msgstr "Venstrehendt"
 
-#: capplets/mouse-properties/mouse-properties.c:236
+#: capplets/mouse-properties/mouse-properties.c:233
 #: desktop-properties/property-mouse.c:226
 msgid "Right handed"
 msgstr "Høyrehendt"
 
 #. Mouse motion
-#: capplets/mouse-properties/mouse-properties.c:262
+#: capplets/mouse-properties/mouse-properties.c:259
 #: desktop-properties/property-mouse.c:243
 msgid "Mouse motion"
 msgstr "Musbevegelse"
 
-#: capplets/mouse-properties/mouse-properties.c:274
+#: capplets/mouse-properties/mouse-properties.c:271
 #: desktop-properties/property-mouse.c:255
 msgid "Acceleration"
 msgstr "Aksellerasjon"
 
-#: capplets/mouse-properties/mouse-properties.c:274
+#: capplets/mouse-properties/mouse-properties.c:271
 #: desktop-properties/property-mouse.c:255
 msgid "Fast"
 msgstr "Fort"
 
-#: capplets/mouse-properties/mouse-properties.c:274
+#: capplets/mouse-properties/mouse-properties.c:271
 #: desktop-properties/property-mouse.c:255
 msgid "Slow"
 msgstr "Sakte"
 
-#: capplets/mouse-properties/mouse-properties.c:286
+#: capplets/mouse-properties/mouse-properties.c:283
 #: desktop-properties/property-mouse.c:267
 msgid "Threshold"
 msgstr "Terskel"
 
-#: capplets/mouse-properties/mouse-properties.c:286
+#: capplets/mouse-properties/mouse-properties.c:283
 #: desktop-properties/property-mouse.c:267
 msgid "Large"
 msgstr "Stor"
 
-#: capplets/mouse-properties/mouse-properties.c:286
+#: capplets/mouse-properties/mouse-properties.c:283
 #: desktop-properties/property-mouse.c:267
 msgid "Small"
 msgstr "Liten"
@@ -1378,7 +1382,7 @@ msgstr "_Avslutt"
 msgid "_Help with GNOME..."
 msgstr "_Hjelp med GNOME..."
 
-#: control-center/main.c:32 gnome-terminal/gnome-terminal.c:1158
+#: control-center/main.c:32 gnome-terminal/gnome-terminal.c:1172
 msgid "_About..."
 msgstr "_Om..."
 
@@ -1414,7 +1418,7 @@ msgstr "Egenskaper for Gnomes utseende"
 msgid "Set parameters from saved state and exit"
 msgstr "Sett parametere fra lagret modus og avslutt"
 
-#: desktop-properties/property-background.c:494 panel/panel_config.c:703
+#: desktop-properties/property-background.c:494 panel/panel_config.c:698
 msgid "Color"
 msgstr "Farge"
 
@@ -1426,12 +1430,12 @@ msgstr "Flat"
 msgid "Gradient"
 msgstr "Gradient"
 
-#: desktop-properties/property-background.c:539 panel/panel_config.c:551
+#: desktop-properties/property-background.c:539 panel/panel_config.c:546
 msgid "Vertical"
 msgstr "Vertikal"
 
 #. Horizontal
-#: desktop-properties/property-background.c:545 panel/panel_config.c:538
+#: desktop-properties/property-background.c:545 panel/panel_config.c:533
 msgid "Horizontal"
 msgstr "Horisontal"
 
@@ -1481,7 +1485,7 @@ msgstr "Setter bakgrunnen til den spesifiserte verdien"
 
 #: desktop-properties/property-background.c:1059
 #: desktop-properties/property-background.c:1060
-#: gnome-terminal/gnome-terminal.c:1749 gnome-terminal/gnome-terminal.c:1752
+#: gnome-terminal/gnome-terminal.c:1768 gnome-terminal/gnome-terminal.c:1771
 msgid "COLOR"
 msgstr "COLOR"
 
@@ -1606,22 +1610,22 @@ msgstr "Toppniv
 msgid "Modal"
 msgstr "Modulær"
 
-#: desktop-properties/property-ui.c:89 gnome-terminal/gnome-terminal.c:747
-#: panel/panel_config.c:307
+#: desktop-properties/property-ui.c:89 gnome-terminal/gnome-terminal.c:752
+#: panel/panel_config.c:302
 msgid "Left"
 msgstr "Venstre"
 
-#: desktop-properties/property-ui.c:90 gnome-terminal/gnome-terminal.c:748
-#: panel/panel_config.c:318
+#: desktop-properties/property-ui.c:90 gnome-terminal/gnome-terminal.c:753
+#: panel/panel_config.c:313
 msgid "Right"
 msgstr "Høyre"
 
 #. Top Position
-#: desktop-properties/property-ui.c:91 panel/panel_config.c:285
+#: desktop-properties/property-ui.c:91 panel/panel_config.c:280
 msgid "Top"
 msgstr "Øverst"
 
-#: desktop-properties/property-ui.c:92 panel/panel_config.c:296
+#: desktop-properties/property-ui.c:92 panel/panel_config.c:291
 msgid "Bottom"
 msgstr "Nederst"
 
@@ -1666,30 +1670,42 @@ msgid "Toolbar buttons have relieved border"
 msgstr "Verktøylinjens knapper har avslepen kant"
 
 #: desktop-properties/property-ui.c:274
+msgid "Toolbars have flat look"
+msgstr "Verktøylinjer er flate"
+
+#: desktop-properties/property-ui.c:283
+msgid "Toolbars have line separators"
+msgstr "Verktøylinjens knapper har linjeseparatorer"
+
+#: desktop-properties/property-ui.c:292
+msgid "Toolbars have text labels"
+msgstr "Verktøylinjer har tekst-etiketter"
+
+#: desktop-properties/property-ui.c:301
 msgid "Statusbar is interactive when possible"
 msgstr "Statuslinjen er interaktiv om mulig"
 
-#: desktop-properties/property-ui.c:283
+#: desktop-properties/property-ui.c:310
 msgid "Dialog buttons have icons"
 msgstr "Dialogknapper har ikoner"
 
-#: desktop-properties/property-ui.c:292
+#: desktop-properties/property-ui.c:319
 msgid "Menu items have icons"
 msgstr "Menyinnhold har ikoner"
 
-#: desktop-properties/property-ui.c:301
+#: desktop-properties/property-ui.c:328
 msgid "Application"
 msgstr "Applikasjon"
 
-#: desktop-properties/property-ui.c:306
+#: desktop-properties/property-ui.c:333
 msgid "Default MDI mode"
 msgstr "Standard MDI modus"
 
-#: desktop-properties/property-ui.c:311
+#: desktop-properties/property-ui.c:338
 msgid "MDI notebook tab position"
 msgstr "MDI notisblokk tabulator posisjon"
 
-#: desktop-properties/property-ui.c:317
+#: desktop-properties/property-ui.c:344
 msgid "MDI"
 msgstr "MDI"
 
@@ -1753,7 +1769,7 @@ msgstr " Avbryt "
 msgid " Defaults "
 msgstr " Forvalg "
 
-#: desktop-properties/xlockmore.cc:178 gnome-terminal/gnome-terminal.c:1169
+#: desktop-properties/xlockmore.cc:178 gnome-terminal/gnome-terminal.c:1183
 #: help-browser/window.c:184 help-browser/window.c:209
 msgid "Help"
 msgstr "Hjelp"
@@ -1969,7 +1985,7 @@ msgstr "_Sorter"
 msgid "Create a new folder"
 msgstr "Opprett en ny katalog"
 
-#: gmenu/gmenu.c:87 gsm/session-properties.c:196
+#: gmenu/gmenu.c:87
 msgid "Delete"
 msgstr "Slett"
 
@@ -2057,24 +2073,24 @@ msgstr "Brukermenyer"
 msgid "Top of user menus"
 msgstr "Toppen på brukermenyene"
 
-#: gnome-terminal/gnome-terminal.c:130
+#: gnome-terminal/gnome-terminal.c:135
 msgid "GNOME Terminal"
 msgstr "GNOME terminal"
 
-#: gnome-terminal/gnome-terminal.c:133
+#: gnome-terminal/gnome-terminal.c:138
 msgid "The GNOME terminal emulation program."
 msgstr "GNOME terminalemulering"
 
-#: gnome-terminal/gnome-terminal.c:414 gnome-terminal/gnome-terminal.c:847
-#: gnome-terminal/gnome-terminal.c:857
+#: gnome-terminal/gnome-terminal.c:419 gnome-terminal/gnome-terminal.c:852
+#: gnome-terminal/gnome-terminal.c:862
 msgid "Default"
 msgstr "Forvalgt"
 
-#: gnome-terminal/gnome-terminal.c:415
+#: gnome-terminal/gnome-terminal.c:420
 msgid "Config"
 msgstr "Konfigurasjon"
 
-#: gnome-terminal/gnome-terminal.c:568
+#: gnome-terminal/gnome-terminal.c:573
 msgid ""
 "You have switched the class of this window. Do you\n"
 " want to reconfigure this window to match the default\n"
@@ -2084,208 +2100,228 @@ msgstr ""
 " rekonfigurere dette vinduet så det passer med den forvalgte\n"
 "konfigurasjonen til den nye klassen?"
 
-#: gnome-terminal/gnome-terminal.c:731
+#: gnome-terminal/gnome-terminal.c:736
 msgid "Linux console"
 msgstr "Linux konsoll"
 
-#: gnome-terminal/gnome-terminal.c:732
+#: gnome-terminal/gnome-terminal.c:737
 msgid "Color Xterm"
 msgstr "Xterm i farger"
 
-#: gnome-terminal/gnome-terminal.c:733
+#: gnome-terminal/gnome-terminal.c:738
 msgid "rxvt"
 msgstr "rxvt"
 
-#: gnome-terminal/gnome-terminal.c:738
+#: gnome-terminal/gnome-terminal.c:743
 msgid "White on black"
 msgstr "Hvitt på sort"
 
-#: gnome-terminal/gnome-terminal.c:739
+#: gnome-terminal/gnome-terminal.c:744
 msgid "Black on white"
 msgstr "Sort på hvitt"
 
-#: gnome-terminal/gnome-terminal.c:740
+#: gnome-terminal/gnome-terminal.c:745
 msgid "Green on black"
 msgstr "Grønn på sort"
 
-#: gnome-terminal/gnome-terminal.c:741
+#: gnome-terminal/gnome-terminal.c:746
 msgid "Black on light yellow"
 msgstr "Sort på lys gult"
 
-#: gnome-terminal/gnome-terminal.c:742
+#: gnome-terminal/gnome-terminal.c:747
 msgid "Custom colors"
 msgstr "Egendefinerte farger"
 
-#: gnome-terminal/gnome-terminal.c:749
+#: gnome-terminal/gnome-terminal.c:754
 msgid "Hidden"
 msgstr "Gjemt"
 
 #. Font
-#: gnome-terminal/gnome-terminal.c:811
+#: gnome-terminal/gnome-terminal.c:816
 msgid "Font:"
 msgstr "Skrifttype:"
 
-#: gnome-terminal/gnome-terminal.c:831
+#: gnome-terminal/gnome-terminal.c:836
 msgid "Browse..."
 msgstr "Se på..."
 
 #. Terminal class
-#: gnome-terminal/gnome-terminal.c:839
+#: gnome-terminal/gnome-terminal.c:844
 msgid "Terminal Class"
 msgstr "Terminalklasse"
 
 #. Blinking status
-#: gnome-terminal/gnome-terminal.c:867
+#: gnome-terminal/gnome-terminal.c:872
 msgid "Blinking cursor"
 msgstr "Blinkende markør"
 
 #. Show menu bar
-#: gnome-terminal/gnome-terminal.c:876
+#: gnome-terminal/gnome-terminal.c:881
 msgid "Hide menu bar"
 msgstr "Gjem menylinjen"
 
 #. Toggle the bell
-#: gnome-terminal/gnome-terminal.c:885
+#: gnome-terminal/gnome-terminal.c:890
 msgid "Silence Terminal bell"
 msgstr ""
 
 #. Swap keys
-#: gnome-terminal/gnome-terminal.c:894
+#: gnome-terminal/gnome-terminal.c:899
 msgid "Swap DEL/Backspace"
 msgstr "Bytt mellom DEL/Backspace"
 
+#: gnome-terminal/gnome-terminal.c:913
+msgid "Image"
+msgstr "Bilde"
+
 #. Background Pixmap checkbox
-#: gnome-terminal/gnome-terminal.c:903
+#: gnome-terminal/gnome-terminal.c:917
 msgid "Background pixmap"
 msgstr "Bakgrunnsbilde"
 
 #. Background pixmap filename
-#: gnome-terminal/gnome-terminal.c:912
+#: gnome-terminal/gnome-terminal.c:926
 msgid "Pixmap file:"
 msgstr "Bildefil:"
 
 #. Transparency
-#: gnome-terminal/gnome-terminal.c:927
+#: gnome-terminal/gnome-terminal.c:941
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
 #. Shaded
-#: gnome-terminal/gnome-terminal.c:936
+#: gnome-terminal/gnome-terminal.c:950
 msgid "Background should be shaded (slow)"
 msgstr "Skyggelagt bakgrunn (treg)"
 
-#: gnome-terminal/gnome-terminal.c:947
+#: gnome-terminal/gnome-terminal.c:961
 msgid "Colors"
 msgstr "Farger"
 
 #. Color palette
-#: gnome-terminal/gnome-terminal.c:950
+#: gnome-terminal/gnome-terminal.c:964
 msgid "Color palette:"
 msgstr "Fargepalett:"
 
 #. Foreground, background buttons
-#: gnome-terminal/gnome-terminal.c:960
+#: gnome-terminal/gnome-terminal.c:974
 msgid "Foreground color:"
 msgstr "Forgrunnsfarge:"
 
-#: gnome-terminal/gnome-terminal.c:969
+#: gnome-terminal/gnome-terminal.c:983
 msgid "Background color:"
 msgstr "Bakgrunnsfarge:"
 
 #. default foreground/backgorund selector
-#: gnome-terminal/gnome-terminal.c:981
+#: gnome-terminal/gnome-terminal.c:995
 msgid "Colors:"
 msgstr "Farger:"
 
 #. Scrollbar position
-#: gnome-terminal/gnome-terminal.c:997
+#: gnome-terminal/gnome-terminal.c:1011
 msgid "Scrollbar position"
 msgstr "Rullefelt posisjon"
 
 #. Scroll back
-#: gnome-terminal/gnome-terminal.c:1008
+#: gnome-terminal/gnome-terminal.c:1022
 msgid "Scrollback lines"
 msgstr "Antall linjer tilbakerulling"
 
 #. Scroll on keystroke checkbox
-#: gnome-terminal/gnome-terminal.c:1020
+#: gnome-terminal/gnome-terminal.c:1034
 msgid "Scroll on keystroke"
 msgstr "Rull ned ved tastetrykk"
 
 #. Scroll on output checkbox
-#: gnome-terminal/gnome-terminal.c:1029
+#: gnome-terminal/gnome-terminal.c:1043
 msgid "Scroll on output"
 msgstr "Rull ned ved output"
 
-#: gnome-terminal/gnome-terminal.c:1058
+#: gnome-terminal/gnome-terminal.c:1072
 msgid "Color selector"
 msgstr "Fargevelger"
 
-#: gnome-terminal/gnome-terminal.c:1154
+#: gnome-terminal/gnome-terminal.c:1168
 msgid "_Hide menubar"
 msgstr "_Gjem menylinje"
 
-#: gnome-terminal/gnome-terminal.c:1155
+#: gnome-terminal/gnome-terminal.c:1169
 msgid "_Show menubar"
 msgstr "_Vis menylinje"
 
-#: gnome-terminal/gnome-terminal.c:1168
+#: gnome-terminal/gnome-terminal.c:1182
 msgid "Terminal"
 msgstr "Terminal"
 
-#: gnome-terminal/gnome-terminal.c:1731
+#: gnome-terminal/gnome-terminal.c:1750
 msgid "Terminal class name"
 msgstr "Navn på terminalklasse"
 
-#: gnome-terminal/gnome-terminal.c:1731
+#: gnome-terminal/gnome-terminal.c:1750
 msgid "CLASS"
 msgstr "KLASSE"
 
-#: gnome-terminal/gnome-terminal.c:1734
+#: gnome-terminal/gnome-terminal.c:1753
 msgid "Specifies font name"
 msgstr "Spesifiserer navnet på skrifttypen"
 
-#: gnome-terminal/gnome-terminal.c:1734
+#: gnome-terminal/gnome-terminal.c:1753
 msgid "FONT"
 msgstr "FONT"
 
-#: gnome-terminal/gnome-terminal.c:1737
+#: gnome-terminal/gnome-terminal.c:1756
 msgid "Do not start up shells as logins shells"
 msgstr "Ikke start opp kommandoskall som loginskall"
 
-#: gnome-terminal/gnome-terminal.c:1740
+#: gnome-terminal/gnome-terminal.c:1759
 msgid "Start up shells as logins shells"
 msgstr "Start opp kommandoskall som loginskall"
 
-#: gnome-terminal/gnome-terminal.c:1743
+#: gnome-terminal/gnome-terminal.c:1762
 msgid "Specifies the geometry for the main window"
 msgstr "Spesifiserer geometrien for hovedvinduet"
 
-#: gnome-terminal/gnome-terminal.c:1743 gsm/session-properties.c:287
+#: gnome-terminal/gnome-terminal.c:1762 gsm/session-properties.c:256
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: gnome-terminal/gnome-terminal.c:1746
+#: gnome-terminal/gnome-terminal.c:1765
 msgid "Execute this program instead of a shell"
 msgstr "Kjør dette programmet i stedet for et skall"
 
-#: gnome-terminal/gnome-terminal.c:1746
+#: gnome-terminal/gnome-terminal.c:1765
 msgid "COMMAND"
 msgstr "KOMMANDO"
 
-#: gnome-terminal/gnome-terminal.c:1749
+#: gnome-terminal/gnome-terminal.c:1768
 msgid "Foreground color"
 msgstr "Forgrunnsfarge"
 
-#: gnome-terminal/gnome-terminal.c:1752 panel/panel_config.c:752
+#: gnome-terminal/gnome-terminal.c:1771 panel/panel_config.c:747
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: control-center/capplet-widget-libs.c:43
-#: gnome-terminal/gnome-terminal.c:1755 panel/main.c:44
+#: control-center/capplet-widget-libs.c:41
+#: gnome-terminal/gnome-terminal.c:1774 panel/main.c:73
 msgid "ID"
 msgstr "ID"
 
+#: gnome-terminal/gnome-terminal.c:1777
+msgid "Update utmp/wtmp entries"
+msgstr "Oppdater utmp/wtmp-oppføringer"
+
+#: gnome-terminal/gnome-terminal.c:1777
+msgid "UTMP"
+msgstr "UTMP"
+
+#: gnome-terminal/gnome-terminal.c:1780
+msgid "Do not update utmp/wtmp entries"
+msgstr "Ikke oppdater utmp/wtmp-oppføringer"
+
+#: gnome-terminal/gnome-terminal.c:1780
+msgid "NOUTMP"
+msgstr "NOUTMP"
+
 #: gsm/main.c:41
 msgid "Enable gsm debugging"
 msgstr "Slå på debugging av gsm"
@@ -2298,19 +2334,15 @@ msgstr "Drep sesjon"
 msgid "save-session: couldn't connect to session manager\n"
 msgstr "save-session: kunne ikke koble til sesjonsbehandler\n"
 
-#: gsm/session-properties.c:189
-msgid "Startup"
-msgstr "Oppstart"
-
-#: gsm/session-properties.c:192
-msgid "Programs to invoke at session startup:"
-msgstr "Programmer som skal startes ved sesjonstart:"
-
-#: gsm/session-properties.c:239
+#: gsm/session-properties.c:97
 msgid "Gnome Session Properties"
 msgstr "Egenskaper for sesjon"
 
-#: gsm/session-properties.c:286
+#: gsm/session-properties.c:106
+msgid "Startup Programs"
+msgstr "Programmer som kjøres ved oppstart"
+
+#: gsm/session-properties.c:256
 msgid "Geometry of window"
 msgstr "Vinduets geometri"
 
@@ -2367,11 +2399,11 @@ msgstr "H
 msgid "Debug level"
 msgstr "Nivå for avlusing (debugging)"
 
-#: help-browser/gnome-help-browser.c:349 help-browser/window.c:699
+#: help-browser/gnome-help-browser.c:348 help-browser/window.c:699
 msgid "Gnome Help Browser"
 msgstr "Gnome Hjelp Leser"
 
-#: help-browser/gnome-help-browser.c:352
+#: help-browser/gnome-help-browser.c:351
 msgid ""
 "GNOME Help Browser allows easy access to various forms of documentation on "
 "your system"
@@ -2379,47 +2411,47 @@ msgstr ""
 "Gnome Hjelp Leser gir lett tilgang til forskjellige typer dokumentasjon på "
 "systemet ditt"
 
-#: help-browser/gnome-help-browser.c:611
+#: help-browser/gnome-help-browser.c:610
 msgid "History size"
 msgstr "Historikkstørrelse"
 
-#: help-browser/gnome-help-browser.c:612
+#: help-browser/gnome-help-browser.c:611
 msgid "History file"
 msgstr "Historikkfil"
 
-#: help-browser/gnome-help-browser.c:613
+#: help-browser/gnome-help-browser.c:612
 msgid "Cache size"
 msgstr "Størrelse på cache"
 
-#: help-browser/gnome-help-browser.c:614
+#: help-browser/gnome-help-browser.c:613
 msgid "Cache file"
 msgstr "Cachefil"
 
-#: help-browser/gnome-help-browser.c:615
+#: help-browser/gnome-help-browser.c:614
 msgid "Bookmark file"
 msgstr "Bokmerkefil"
 
-#: help-browser/gnome-help-browser.c:621
+#: help-browser/gnome-help-browser.c:620
 msgid "Man Path"
 msgstr "Sti til manualsider"
 
-#: help-browser/gnome-help-browser.c:622
+#: help-browser/gnome-help-browser.c:621
 msgid "Info Path"
 msgstr "Sti til infosider"
 
-#: help-browser/gnome-help-browser.c:623
+#: help-browser/gnome-help-browser.c:622
 msgid "GNOME Help Path"
 msgstr "Søkesti for GNOME Hjelp"
 
-#: help-browser/gnome-help-browser.c:698
+#: help-browser/gnome-help-browser.c:697
 msgid "Gnome Help Configure"
 msgstr "Konfigurer Gnome Hjelp"
 
-#: help-browser/gnome-help-browser.c:701
+#: help-browser/gnome-help-browser.c:700
 msgid "History and cache"
 msgstr "Historikk og mellomlagring"
 
-#: help-browser/gnome-help-browser.c:702
+#: help-browser/gnome-help-browser.c:701
 msgid "Paths"
 msgstr "Søkestier"
 
@@ -2468,7 +2500,7 @@ msgid "Games"
 msgstr "Spill"
 
 #: help-browser/toc-man.c:25 help-browser/toc2-man.c:27
-#: panel/panel_config_global.c:575
+#: panel/panel_config_global.c:566
 msgid "Miscellaneous"
 msgstr "Forskjellig"
 
@@ -2757,7 +2789,7 @@ msgstr "Opprett oppstarts-applet"
 msgid "Log out"
 msgstr "Logg ut"
 
-#: panel/main.c:43
+#: panel/main.c:72
 msgid "Discard session"
 msgstr "Avbryt sesjon"
 
@@ -2801,11 +2833,11 @@ msgstr "..."
 msgid "Applets"
 msgstr "Appleter"
 
-#: panel/menu.c:1493 panel/panel_config.c:878
+#: panel/menu.c:1493 panel/panel_config.c:873
 msgid "Edge Panel"
 msgstr "Kantpanel"
 
-#: panel/menu.c:1500 panel/panel_config.c:884
+#: panel/menu.c:1500 panel/panel_config.c:879
 msgid "Corner Panel"
 msgstr "Hjørnepanel"
 
@@ -2857,250 +2889,254 @@ msgstr "L
 msgid "About GNOME..."
 msgstr "Om GNOME..."
 
-#: panel/menu.c:2104
+#: panel/menu.c:2005
+msgid "Can't open directory, using main menu!"
+msgstr "Kan ikke åpne katalogen, bruker hovedmenyen!"
+
+#: panel/menu.c:2099
 msgid "Menu properties"
 msgstr "Egenskaper for meny"
 
-#: panel/menu.c:2111
+#: panel/menu.c:2106
 msgid "Menu Type"
 msgstr "Menytype"
 
-#: panel/menu.c:2118 panel/menu.c:2138
+#: panel/menu.c:2113 panel/menu.c:2133
 msgid "Main Menu"
 msgstr "Hovedmeny"
 
-#: panel/menu.c:2129 panel/menu.c:2179
+#: panel/menu.c:2124 panel/menu.c:2174
 msgid "Normal Menu"
 msgstr "Normalmeny"
 
-#: panel/menu.c:2148
+#: panel/menu.c:2143
 msgid "Both System and User menus on the same menu"
 msgstr "Både system- og brukermenyer på samme meny"
 
-#: panel/menu.c:2160
+#: panel/menu.c:2155
 msgid "System on the main menu, User menu as a submenu"
 msgstr "System på hovedmeny, brukermeny som undermeny"
 
-#: panel/menu.c:2171
+#: panel/menu.c:2166
 msgid "User on the main menu, System menu as a submenu"
 msgstr "Bruker på hovedmeny, systemmeny som undermeny"
 
-#: panel/menu.c:2189
+#: panel/menu.c:2184
 msgid "Menu path"
 msgstr "Menysti"
 
 #. Position frame
-#: panel/panel_config.c:272 panel/panel_config.c:449
+#: panel/panel_config.c:267 panel/panel_config.c:444
 msgid "Position"
 msgstr "Posisjon"
 
 #. Auto-hide/stayput frame
-#: panel/panel_config.c:346
+#: panel/panel_config.c:341
 msgid "Minimize Options"
 msgstr "Minimeringsalternativer"
 
 #. Stay Put
-#: panel/panel_config.c:357
+#: panel/panel_config.c:352
 msgid "Explicitly Hide"
 msgstr "Gjem eksplisitt"
 
-#: panel/panel_config.c:370
+#: panel/panel_config.c:365
 msgid "Auto Hide"
 msgstr "Gjem automatisk"
 
 #. Hidebuttons disable
-#: panel/panel_config.c:381 panel/panel_config.c:574
+#: panel/panel_config.c:376 panel/panel_config.c:569
 msgid "Disable hidebuttons"
 msgstr "Slå av knappegjemming"
 
 #. Arrow disable
-#: panel/panel_config.c:392 panel/panel_config.c:585
+#: panel/panel_config.c:387 panel/panel_config.c:580
 msgid "Disable hidebutton arrows"
 msgstr "Slå av piler for knappegjemming"
 
 #. North East Position
-#: panel/panel_config.c:462
+#: panel/panel_config.c:457
 msgid "North East"
 msgstr "Nordøst"
 
-#: panel/panel_config.c:473
+#: panel/panel_config.c:468
 msgid "South West"
 msgstr "Sørvest"
 
-#: panel/panel_config.c:484
+#: panel/panel_config.c:479
 msgid "North West"
 msgstr "Nordvest"
 
-#: panel/panel_config.c:495
+#: panel/panel_config.c:490
 msgid "South East"
 msgstr "Sørøst"
 
 #. Orientation frame
-#: panel/panel_config.c:527
+#: panel/panel_config.c:522
 msgid "Orientation"
 msgstr "Plassering"
 
 #. Hidebuttons frame
-#: panel/panel_config.c:562
+#: panel/panel_config.c:557
 msgid "Hidebutton Options"
 msgstr "Alternativer for Hidebutton"
 
 #. selector frame
-#: panel/panel_config.c:677 panel/panel_config.c:899
+#: panel/panel_config.c:672 panel/panel_config.c:894
 msgid "Background"
 msgstr "Bakgrunn"
 
 #. standard background
-#: panel/panel_config.c:687
+#: panel/panel_config.c:682
 msgid "Standard"
 msgstr "Forvalgt"
 
-#: panel/panel_config.c:695
+#: panel/panel_config.c:690
 msgid "Pixmap"
 msgstr "Pixmap"
 
 #. image frame
-#: panel/panel_config.c:709
+#: panel/panel_config.c:704
 msgid "Image file"
 msgstr "Bildefil"
 
-#: panel/panel_config.c:738
+#: panel/panel_config.c:733
 msgid "Scale image to fit panel"
 msgstr "Skaler bilde til å passe panelet"
 
-#: panel/panel_config.c:867
+#: panel/panel_config.c:862
 msgid "Panel properties"
 msgstr "Egenskaper for panelet"
 
 #. Animation disable
-#: panel/panel_config_global.c:202
+#: panel/panel_config_global.c:195
 msgid "Disable animations"
 msgstr "Slå av animasjoner"
 
 #. AutoHide Animation step_size scale frame
-#: panel/panel_config_global.c:210
+#: panel/panel_config_global.c:203
 msgid "Auto-Hide Animation Speed"
 msgstr "Animasjonshastighet for automatisk gjemming"
 
 #. ExplicitHide Animation step_size scale frame
-#: panel/panel_config_global.c:219
+#: panel/panel_config_global.c:212
 msgid "Explicit-Hide Animation Speed"
 msgstr "Animasjonshastighet for eksplisitt gjemming"
 
 #. DrawerHide Animation step_size scale frame
-#: panel/panel_config_global.c:228
+#: panel/panel_config_global.c:221
 msgid "Drawer Animation Speed"
 msgstr "Animasjonshastighet for skuff"
 
 #. Minimize Delay scale frame
-#: panel/panel_config_global.c:237
+#: panel/panel_config_global.c:230
 msgid "Auto-Hide Minimize Delay (ms)"
 msgstr "Minimeringsventetid for automatisk gjemming (ms)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:244
+#: panel/panel_config_global.c:237
 msgid "Auto-Hide Minimized Size (pixels)"
 msgstr "Minimert størrelse for automatisk gjemming (piksler)"
 
 #. toggle button
-#: panel/panel_config_global.c:338
+#: panel/panel_config_global.c:331
 msgid "Tiles enabled"
 msgstr "Fliser på"
 
 #. Image frame
-#: panel/panel_config_global.c:348
+#: panel/panel_config_global.c:341
 msgid "Image files"
 msgstr "Bildefiler"
 
-#: panel/panel_config_global.c:361
+#: panel/panel_config_global.c:354
 msgid "Tile filename (up)"
 msgstr "Filnavn for flis (opp)"
 
-#: panel/panel_config_global.c:366
+#: panel/panel_config_global.c:358
 msgid "Tile filename (down)"
 msgstr "Filnavn for flis (ned)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:374
+#: panel/panel_config_global.c:365
 msgid "Border width (tile only)"
 msgstr "Kantbredde (bare flis)"
 
 #. Minimized size scale frame
-#: panel/panel_config_global.c:382
+#: panel/panel_config_global.c:373
 msgid "Depth (displacement when pressed)"
 msgstr "Dybde (forskyvning når nedtrykt)"
 
 #. Tooltips frame
-#: panel/panel_config_global.c:404
+#: panel/panel_config_global.c:395
 msgid "Tooltips"
 msgstr "Verktøystips"
 
 #. Tooltips enable
-#: panel/panel_config_global.c:415
+#: panel/panel_config_global.c:406
 msgid "Tooltips enabled"
 msgstr "Verktøystips på"
 
 #. Menu frame
-#: panel/panel_config_global.c:425
+#: panel/panel_config_global.c:416
 msgid "Menus"
 msgstr "Menyer"
 
 #. Small Icons
-#: panel/panel_config_global.c:436
+#: panel/panel_config_global.c:427
 msgid "Show small icons"
 msgstr "Vis små ikoner"
 
 #. Dot Buttons
-#: panel/panel_config_global.c:446
+#: panel/panel_config_global.c:437
 msgid "Show ... buttons"
 msgstr "Vis ... knapper"
 
 #. Movement frame
-#: panel/panel_config_global.c:456
+#: panel/panel_config_global.c:447
 msgid "Movement"
 msgstr "Bevegelse"
 
 #. Switched
-#: panel/panel_config_global.c:467
+#: panel/panel_config_global.c:458
 msgid "Switched movement"
 msgstr "Byttet bevegelse"
 
-#: panel/panel_config_global.c:479
+#: panel/panel_config_global.c:470
 msgid "Free movement (doesn't disturb other applets)"
 msgstr "Fri bevegelse (forstyrrer ikke andre applets)"
 
 #. Logout frame
-#: panel/panel_config_global.c:489
+#: panel/panel_config_global.c:480
 msgid "Log Out"
 msgstr "Logg av"
 
 #. Prompt before log out
-#: panel/panel_config_global.c:500
+#: panel/panel_config_global.c:491
 msgid "Prompt before logout"
 msgstr "Spør før avlogging"
 
 #. Minimize Delay scale frame
-#: panel/panel_config_global.c:510
+#: panel/panel_config_global.c:501
 msgid "Applet Padding"
 msgstr "Applet-fyll"
 
-#: panel/panel_config_global.c:526
+#: panel/panel_config_global.c:517
 msgid "Launcher icon"
 msgstr "Ikon for oppstarter"
 
-#: panel/panel_config_global.c:527
+#: panel/panel_config_global.c:518
 msgid "Drawer icon"
 msgstr "Ikon for skuff"
 
-#: panel/panel_config_global.c:528
+#: panel/panel_config_global.c:519
 msgid "Menu icon"
 msgstr "Ikon for meny"
 
-#: panel/panel_config_global.c:549
+#: panel/panel_config_global.c:540
 msgid "Global Panel Configuration"
 msgstr "Global konfigurering av panel"
 
-#: panel/panel_config_global.c:557
+#: panel/panel_config_global.c:548
 msgid "Animation"
 msgstr "Animasjon"
 
@@ -3128,31 +3164,31 @@ msgstr "Kommando (valgfri)"
 msgid "Height"
 msgstr "Høyde"
 
-#: control-center/capplet-widget-libs.c:43
+#: control-center/capplet-widget-libs.c:41
 msgid "id of the capplet -- assigned by the control-center"
 msgstr "cappletens id -- utdelt av kontrollsenteret"
 
-#: control-center/capplet-widget-libs.c:44
+#: control-center/capplet-widget-libs.c:42
 msgid "multi-capplet id."
 msgstr "multi-capplet id."
 
-#: control-center/capplet-widget-libs.c:44
+#: control-center/capplet-widget-libs.c:42
 msgid "CAPID"
 msgstr "CAPID"
 
-#: control-center/capplet-widget-libs.c:45
+#: control-center/capplet-widget-libs.c:43
 msgid "X id of the socket it's plugged into"
 msgstr "X-id til socketen den er pluggen inn i"
 
-#: control-center/capplet-widget-libs.c:45
+#: control-center/capplet-widget-libs.c:43
 msgid "XID"
 msgstr "XID"
 
-#: control-center/capplet-widget-libs.c:46
+#: control-center/capplet-widget-libs.c:44
 msgid "ior of the control-center"
 msgstr "kontrollsenterets ior"
 
-#: control-center/capplet-widget-libs.c:46
+#: control-center/capplet-widget-libs.c:44
 msgid "IOR"
 msgstr "IOR"