Updated Norwegian translation.

2003-07-11  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian translation.

2 files changed, 1435 insertions, 1011 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index e5c5dacd..d06391a0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
 2003-07-10  Artur Flinta  <aflinta@cvs.gnome.org>
 
 	* pl.po: Updated Polish translation.
diff --git a/po/no.po b/po/no.po
index a980c3e4..47bf7d17 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,14 +5,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm 2.2.2.2\n"
-"POT-Creation-Date: 2003-03-08 01:10+0100\n"
-"PO-Revision-Date: 2003-03-08 01:12+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-11 10:14+0200\n"
+"PO-Revision-Date: 2003-07-11 11:50+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: config/CDE.desktop.in.h:1
+msgid "CDE"
+msgstr "CDE"
+
+#: config/CDE.desktop.in.h:2
+msgid "This session logs you into CDE"
+msgstr "Denne sesjonen logger deg inn til CDE"
+
+#: config/Default.desktop.in.h:1
+msgid "Default System Session"
+msgstr "Forvalgt sesjon for systemet"
+
+#: config/Default.desktop.in.h:2
+msgid "This is the default system session"
+msgstr "Dette er forvalgt sesjon for systemet"
+
 #. DON\'T CHANGE THIS BY HAND! CHANGE THE SCRIPT THIS IS GENERATED
 #. ALWAYS ADD A CHANGELOG OR I WILL PERSONALLY KICK YOUR ASS!
 #: config/gettextfoo.h:3
@@ -77,6 +94,14 @@ msgstr ""
 "Vil du at jeg skal prøve å kjøre konfigurasjonsprogrammet for musen? Merk at "
 "du må ha passordet for \"root\" for å gjøre dette."
 
+#: config/gnome.desktop.in.h:1
+msgid "GNOME"
+msgstr "GNOME"
+
+#: config/gnome.desktop.in.h:2
+msgid "This session logs you into GNOME"
+msgstr "Denne sesjonen logger deg inn til GNOME"
+
 #: daemon/auth.c:55
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
@@ -97,104 +122,118 @@ msgstr ""
 "GDM kunne ikke skrive en ny autorisasjonsoppføring til disk. Muligens tom "
 "for diskplass. %s%s"
 
-#: daemon/auth.c:179
+#: daemon/auth.c:188
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s: Kunne ikke lage ny cookie-fil i %s"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: daemon/auth.c:437 daemon/auth.c:471
+#: daemon/auth.c:453 daemon/auth.c:491
 #, c-format
-msgid "gdm_auth_user_add: Could not open cookie file %s"
-msgstr "gdm_auth_user_add: Kunne ikke åpne cookie-fil %s"
+msgid "%s: Could not open cookie file %s"
+msgstr "%s: Kunne ikke åpne cookie-fil %s"
 
-#: daemon/auth.c:454
+#: daemon/auth.c:472
 #, c-format
-msgid "gdm_auth_user_add: Could not lock cookie file %s"
-msgstr "gdm_auth_user_add: Kunne ikke låse cookie-fil %s"
+msgid "%s: Could not lock cookie file %s"
+msgstr "%s: Kunne ikke låse cookie-fil %s"
 
-#: daemon/auth.c:500
+#: daemon/auth.c:522
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s: Kunne ikke skrive informasjonskapsel"
 
-#: daemon/auth.c:574
+#: daemon/auth.c:596
 #, c-format
-msgid "gdm_auth_user_remove: Ignoring suspiciously looking cookie file %s"
-msgstr "gdm_auth_user_remove: Overser suspekt cookie-fil %s"
+msgid "%s: Ignoring suspiciously looking cookie file %s"
+msgstr "%s: Overser suspekt cookie-fil %s"
 
 #. This means we have no clue what's happening,
 #. * it's not X server crashing as we would have
 #. * cought that elsewhere.  Things are just
-#. * not working out, so tell the user
-#: daemon/display.c:98 daemon/display.c:105
+#. * not working out, so tell the user.
+#. * However this may have been caused by a malicious local user
+#. * zapping the display repeatedly, that shouldn't cause gdm
+#. * to stop working completely so just wait for 2 minutes,
+#. * that should give people ample time to stop gdm if needed,
+#. * or just wait for the stupid malicious user to get bored
+#. * and go away
+#: daemon/display.c:111
 #, c-format
 msgid ""
-"Failed to start the display server several times in a short time period; "
-"disabling display %s"
+"The display server has been shut down about 6 times in the last 90 seconds, "
+"it is likely that something bad is going on.  I will wait for 2 minutes "
+"before trying again on display %s."
 msgstr ""
-"Gjentatte feil under oppstart av X-tjeneren over en kort tidsperiode; "
-"deaktiverer skjerm %s"
 
-#: daemon/display.c:163
+#: daemon/display.c:182
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s: Kan ikke opprette rør"
 
-#: daemon/display.c:254
+#: daemon/display.c:275
 #, c-format
-msgid "gdm_display_manage: Failed forking gdm slave process for %s"
-msgstr "gdm_display_manage: Feil under splitting av gdm slaveprosess for %s"
+msgid "%s: Failed forking gdm slave process for %s"
+msgstr "%s: Feil under starting av gdm slaveprosess for %s"
 
-#: daemon/errorgui.c:133
+#: daemon/errorgui.c:194
+#, c-format
+msgid "%s not a regular file!\n"
+msgstr "%s er ikke en vanlig fil!\n"
+
+#: daemon/errorgui.c:204
+msgid ""
+"\n"
+"... File too long to display ...\n"
+msgstr ""
+
+#: daemon/errorgui.c:210
 #, c-format
 msgid "%s could not be opened"
 msgstr "%s: kunne ikke åpnes"
 
-#: daemon/errorgui.c:283
-msgid "gdm_error_box: Cannot fork to display error/info box"
-msgstr "gdm_error_box: Kan ikke kjøre fork for å vise feil/info boks"
-
-#: daemon/errorgui.c:435 daemon/errorgui.c:557
-msgid "gdm_failsafe_question: Cannot fork to display error/info box"
-msgstr "gdm_failsafe_question: Kan ikke kjøre fork for å vise feil/info boks"
+#: daemon/errorgui.c:324 daemon/errorgui.c:482 daemon/errorgui.c:610
+#: daemon/errorgui.c:748
+#, c-format
+msgid "%s: Cannot fork to display error/info box"
+msgstr "%s: Kan ikke starte dialogen"
 
-#: daemon/filecheck.c:49
+#: daemon/filecheck.c:52
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: Katalogen %s eksisterer ikke."
 
-#: daemon/filecheck.c:56 daemon/filecheck.c:97
+#: daemon/filecheck.c:59 daemon/filecheck.c:100
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: %s eies ikke av uid %d."
 
-#: daemon/filecheck.c:62 daemon/filecheck.c:104
+#: daemon/filecheck.c:65 daemon/filecheck.c:107
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: %s er skrivbar av gruppe."
 
-#: daemon/filecheck.c:68
+#: daemon/filecheck.c:71
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: %s er skrivbar av andre."
 
-#: daemon/filecheck.c:82
+#: daemon/filecheck.c:85
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: %s eksisterer ikke men kreves."
 
-#: daemon/filecheck.c:90
+#: daemon/filecheck.c:93
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: %s er ikke en vanlig fil."
 
-#: daemon/filecheck.c:111
+#: daemon/filecheck.c:114
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: %s er skrivbar av gruppe/andre."
 
-#: daemon/filecheck.c:118
+#: daemon/filecheck.c:121
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr ""
@@ -221,79 +260,84 @@ msgstr "%s: Kunne ikke lage FIFO"
 msgid "%s: Could not open FIFO"
 msgstr "%s: Kunne ikke åpne FIFO"
 
-#: daemon/gdm.c:225
+#: daemon/gdm.c:237 gui/gdmlogin.c:842 gui/greeter/greeter.c:94
 #, c-format
 msgid "%s: No configuration file: %s. Using defaults."
 msgstr "%s: Ingen konfigurasjonsfil: %s. Bruker forvalg."
 
-#: daemon/gdm.c:298
+#: daemon/gdm.c:282
+#, c-format
+msgid "%s: BaseXsession empty, using %s/gdm/Xsession"
+msgstr ""
+
+#: daemon/gdm.c:326
 #, c-format
 msgid "%s: Standard X server not found, trying alternatives"
 msgstr "%s: Forvalgt X-tjener ikke funnet. Prøver alternativer"
 
-#: daemon/gdm.c:327
+#: daemon/gdm.c:354
 #, c-format
 msgid "%s: XDMCP was enabled while there is no XDMCP support, turning it off"
 msgstr "%s: XDMCP ble slått på selv om det ikke er støttet, deaktiverer"
 
-#: daemon/gdm.c:340
+#: daemon/gdm.c:367
 #, c-format
 msgid "%s: Root cannot be autologged in, turing off automatic login"
 msgstr "%s: Root kan ikke logges inn automatisk, slår av automatisk innlogging"
 
-#: daemon/gdm.c:353
+#: daemon/gdm.c:380
 #, c-format
 msgid "%s: Root cannot be autologged in, turing off timed login"
 msgstr ""
 "%s: Root kan ikke logges inn automatisk, slår av tidsbestemt innlogging"
 
-#: daemon/gdm.c:359
+#: daemon/gdm.c:386
 #, c-format
-msgid "%s: TimedLoginDelay less then 5, so I will just use 5."
+msgid "%s: TimedLoginDelay less than 5, so I will just use 5."
 msgstr "%s: TimedLoginDelay mindre enn 5, bruker 5."
 
-#: daemon/gdm.c:369
+#: daemon/gdm.c:396
 #, c-format
 msgid "%s: No greeter specified."
 msgstr "%s: Ingen velkomst spesifisert."
 
-#: daemon/gdm.c:372
+#: daemon/gdm.c:399
 #, c-format
 msgid "%s: No remote greeter specified."
 msgstr "%s: Ingen velkomst spesifisert."
 
-#: daemon/gdm.c:377
+#: daemon/gdm.c:404
 msgid "No daemon/ServAuthDir specified in the configuration file"
 msgstr "Ingen daemon/ServAuthDir spesifisert i konfigurasjonsfilen"
 
-#: daemon/gdm.c:379
+#: daemon/gdm.c:406
 #, c-format
 msgid "%s: No authdir specified."
 msgstr "%s: Ingen autentiseringskatalog spesifisert."
 
-#: daemon/gdm.c:386
+#: daemon/gdm.c:413
 #, c-format
 msgid "%s: No sessions directory specified."
 msgstr "%s: Ingen sesjonskatalog spesifisert."
 
-#: daemon/gdm.c:412
+#: daemon/gdm.c:438
 #, c-format
 msgid "%s: Empty server command, using standard one."
 msgstr "%s: Tom tjenerkommando, bruker forvalgt."
 
-#: daemon/gdm.c:458
+#: daemon/gdm.c:479
 #, c-format
 msgid "%s: Display number %d in use!  I will use %d"
 msgstr "%s: Skjerm nummer %d er i bruk! Vil bruke %d"
 
-#: daemon/gdm.c:475
+#: daemon/gdm.c:498
 #, c-format
 msgid "%s: Invalid server line in config file. Ignoring!"
 msgstr "%s: Ugyldig tjenerlinje i konfigurasjonsfil. Ignorerer!"
 
 #. start
 #. server uid
-#: daemon/gdm.c:498
+#: daemon/gdm.c:518
 #, c-format
 msgid ""
 "%s: XDMCP disabled and no local servers defined. Adding %s on :%d to allow "
@@ -302,7 +346,7 @@ msgstr ""
 "%s: XDMCP er slått av og ingen lokale tjenere definert. Legger til %s på :%d "
 "for å tillate konfigurasjon!"
 
-#: daemon/gdm.c:513
+#: daemon/gdm.c:533
 #, c-format
 msgid ""
 "XDMCP is disabled and gdm cannot find any local server to start.  Aborting!  "
@@ -311,17 +355,17 @@ msgstr ""
 "XDMCP er deaktivert og gdm kan ikke finne noen lokale tjenere å starte. "
 "Avbryter! Vennligst korriger konfigurasjon %s og start gdm på nytt."
 
-#: daemon/gdm.c:521
+#: daemon/gdm.c:541
 #, c-format
 msgid "%s: XDMCP disabled and no local servers defined. Aborting!"
 msgstr "%s: XDMCP slått av og ingen lokale tjenere definert. Avbryter!"
 
-#: daemon/gdm.c:529
+#: daemon/gdm.c:549
 #, c-format
 msgid "%s: Can't find the gdm user (%s). Trying 'nobody'!"
 msgstr "%s: Kan ikke finne gdm-bruker (%s). Prøver «nobody»!"
 
-#: daemon/gdm.c:537
+#: daemon/gdm.c:557
 #, c-format
 msgid ""
 "The gdm user does not exist. Please correct gdm configuration %s and restart "
@@ -330,12 +374,12 @@ msgstr ""
 "gdm-brukeren eksisterer ikke. Vennligst korriger gdm konfigurasjon %s og "
 "start gdm på nytt."
 
-#: daemon/gdm.c:543
+#: daemon/gdm.c:563
 #, c-format
 msgid "%s: Can't find the gdm user (%s). Aborting!"
 msgstr "%s: Kan ikke finne gdm-bruker (%s). Avbryter!"
 
-#: daemon/gdm.c:550
+#: daemon/gdm.c:570
 #, c-format
 msgid ""
 "The gdm user is set to be root, but this is not allowed since it can pose a "
@@ -345,17 +389,17 @@ msgstr ""
 "være en sikkerhetsrisiko. Vennligst korriger gdm konfigurasjon %s og start "
 "gdm på nytt."
 
-#: daemon/gdm.c:557
+#: daemon/gdm.c:577
 #, c-format
 msgid "%s: The gdm user should not be root. Aborting!"
 msgstr "%s: Bruker for gdm bør ikke være root. Avbryter!"
 
-#: daemon/gdm.c:563
+#: daemon/gdm.c:583
 #, c-format
 msgid "%s: Can't find the gdm group (%s). Trying 'nobody'!"
 msgstr "%s: Kan ikke finne gdm-gruppe (%s). Prøver «nobody»!"
 
-#: daemon/gdm.c:571
+#: daemon/gdm.c:591
 #, c-format
 msgid ""
 "The gdm group does not exist. Please correct gdm configuration %s and "
@@ -364,12 +408,12 @@ msgstr ""
 "gdm-gruppe eksisterer ikke. Vennligst korriger gdm konfigurasjon %s og start "
 "gdm på nytt."
 
-#: daemon/gdm.c:577
+#: daemon/gdm.c:597
 #, c-format
 msgid "%s: Can't find the gdm group (%s). Aborting!"
 msgstr "%s: Kan ikke finne gdm-gruppe (%s). Avbryter."
 
-#: daemon/gdm.c:584
+#: daemon/gdm.c:604
 #, c-format
 msgid ""
 "The gdm group is set to be root, but this is not allowed since it can pose a "
@@ -379,27 +423,27 @@ msgstr ""
 "være en sikkerhetsrisiko. Vennligst korriger gdm konfigurasjon %s og start "
 "gdm på nytt."
 
-#: daemon/gdm.c:591
+#: daemon/gdm.c:611
 #, c-format
 msgid "%s: The gdm group should not be root. Aborting!"
 msgstr "%s: Gruppen for gdm bør ikke være root. Avbryter!"
 
-#: daemon/gdm.c:606
+#: daemon/gdm.c:626
 #, c-format
 msgid "%s: Greeter not found or can't be executed by the gdm user"
 msgstr "%s: Velkomst ikke funnet eller kan ikke kjøres av gdm-brukeren"
 
-#: daemon/gdm.c:613
+#: daemon/gdm.c:633
 #, c-format
 msgid "%s: Remote greeter not found or can't be executed by the gdm user"
 msgstr "%s: Ekstern velkomst ikke funnet eller kan ikke kjøres av gdm-brukeren"
 
-#: daemon/gdm.c:624
+#: daemon/gdm.c:644
 #, c-format
 msgid "%s: Chooser not found or it can't be executed by the gdm user"
 msgstr "%s: Velger ikke funnet eller kan ikke kjøres av gdm-brukeren"
 
-#: daemon/gdm.c:633
+#: daemon/gdm.c:653
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
@@ -409,12 +453,12 @@ msgstr ""
 "denne eksisterer ikke. Vennligst korriger gdm konfigurasjon %s og start gdm "
 "på nytt."
 
-#: daemon/gdm.c:641
+#: daemon/gdm.c:661
 #, c-format
 msgid "%s: Authdir %s does not exist. Aborting."
 msgstr "%s: Autentiseringskatalog %s eksisterer ikke. Avbryter."
 
-#: daemon/gdm.c:646
+#: daemon/gdm.c:666
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
@@ -424,12 +468,12 @@ msgstr ""
 "dette er ikke en katalog. Vennligst korriger gdm konfigurasjon %s og start "
 "gdm på nytt."
 
-#: daemon/gdm.c:654
+#: daemon/gdm.c:674
 #, c-format
 msgid "%s: Authdir %s is not a directory. Aborting."
 msgstr "%s: Autentiseringskatalog %s er ikke en katalog. Avbryter."
 
-#: daemon/gdm.c:659
+#: daemon/gdm.c:679
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but is not "
@@ -440,13 +484,13 @@ msgstr ""
 "denne eies ikke av bruker %s og gruppe %s. Vennligst korriger eierskap eller "
 "konfigurasjon %s og start gdm på nytt."
 
-#: daemon/gdm.c:669
+#: daemon/gdm.c:689
 #, c-format
 msgid "%s: Authdir %s is not owned by user %s, group %s. Aborting."
 msgstr ""
 "%s: Autentiseringskatalog %s er eies ikke av bruker %s, gruppe %s. Avbryter."
 
-#: daemon/gdm.c:675
+#: daemon/gdm.c:695
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but has the "
@@ -457,34 +501,35 @@ msgstr ""
 "gale rettigheter. Det skal være 0750. Vennligst korriger rettighetene eller "
 "gdm konfigurasjon %s og start gdm på nytt."
 
-#: daemon/gdm.c:685
+#: daemon/gdm.c:705
 #, c-format
 msgid "%s: Authdir %s has wrong permissions %o. Should be 0750. Aborting."
 msgstr ""
 "%s: Autentiseringskatalog %s har ikke riktige tilgangsrettigheter %o. Skal "
 "være 0750. Avbryter."
 
-#: daemon/gdm.c:740
+#: daemon/gdm.c:762
 #, c-format
 msgid "%s: fork() failed!"
 msgstr "%s: fork() feilet!"
 
 #. should never happen
-#: daemon/gdm.c:743 daemon/slave.c:2281
+#: daemon/gdm.c:765 daemon/slave.c:2559
 #, c-format
 msgid "%s: setsid() failed: %s!"
 msgstr "%s: setsid() feilet: %s!"
 
-#: daemon/gdm.c:875
+#: daemon/gdm.c:897
 #, c-format
-msgid "deal_with_x_crashes: Trying failsafe X server %s"
-msgstr "deal_with_x_crashes: Prøver feilsikker X-tjener %s"
+msgid "%s: Trying failsafe X server %s"
+msgstr "%s: Prøver feilsikker X-tjener %s"
 
-#: daemon/gdm.c:891
-msgid "deal_with_x_crashes: Running the XKeepsCrashing script"
-msgstr "deal_with_x_crashes: Kjører XKeepsCrashing skriptet"
+#: daemon/gdm.c:915
+#, c-format
+msgid "%s: Running the XKeepsCrashing script"
+msgstr "%s: Kjører skriptet XKeepsCrashing"
 
-#: daemon/gdm.c:964
+#: daemon/gdm.c:991
 msgid ""
 "I cannot start the X server (your graphical interface).  It is likely that "
 "it is not set up correctly. You will need to log in on a console and rerun "
@@ -499,7 +544,7 @@ msgstr ""
 #. * talk to him.  He's on some 'l33t system anyway, so syslog
 #. * reading will do him good
 #. * }
-#: daemon/gdm.c:976
+#: daemon/gdm.c:1003
 #, c-format
 msgid ""
 "Failed to start X server several times in a short time period; disabling "
@@ -508,76 +553,77 @@ msgstr ""
 "Gjentatte feil under oppstart av X-tjeneren over en kort tidsperiode; "
 "stenger skjerm %s"
 
-#: daemon/gdm.c:1058
-#, c-format
-msgid ""
-"gdm_child_action: Reboot or Halt request when there is no system menu from "
-"display %s"
+#: daemon/gdm.c:1046
+msgid "System is rebooting, please wait ..."
 msgstr ""
-"gdm_child_action: Omstart eller nedstenging forespurt selv om det ikke "
-"finnes en systemmeny fra skjerm %s"
 
-#: daemon/gdm.c:1066
-#, c-format
-msgid ""
-"gdm_child_action: Restart, Reboot or Halt request from a non-local display %s"
+#: daemon/gdm.c:1048
+msgid "System is shutting down, please wait ..."
 msgstr ""
-"gdm_child_action: Forespørsel om omstart eller nedstenging fra en ekstern "
-"skjerm %s"
+
+#: daemon/gdm.c:1132
+#, c-format
+msgid "Reboot or Halt request when there is no system menu from display %s"
+msgstr "Omstart eller nedstenging forespurt selv om det ikke finnes en systemmeny fra skjerm %s"
+
+#: daemon/gdm.c:1141
+#, c-format
+msgid "Restart, Reboot or Halt request from a non-local display %s"
+msgstr "Forespørsel om omstart eller nedstenging fra en ekstern skjerm %s"
 
 #. Bury this display for good
-#: daemon/gdm.c:1102
+#: daemon/gdm.c:1201
 #, c-format
-msgid "gdm_child_action: Aborting display %s"
-msgstr "gdm_child_action: Avbryter skjerm %s"
+msgid "%s: Aborting display %s"
+msgstr "%s: Avbryter skjerm %s"
 
 #. Reboot machine
-#: daemon/gdm.c:1114
-msgid "gdm_child_action: Master rebooting..."
-msgstr "gdm_child_action: Mester starter på nytt..."
+#: daemon/gdm.c:1214
+#, fuzzy
+msgid "Master rebooting..."
+msgstr "Mester starter på nytt..."
 
-#: daemon/gdm.c:1122
+#: daemon/gdm.c:1226
 #, c-format
-msgid "gdm_child_action: Reboot failed: %s"
-msgstr "gdm_child_action: Omstart feilet: %s"
+msgid "%s: Reboot failed: %s"
+msgstr "%s: Omstart feilet: %s"
 
 #. Halt machine
-#: daemon/gdm.c:1129
-msgid "gdm_child_action: Master halting..."
-msgstr "gdm_child_action: Mester stopper..."
+#: daemon/gdm.c:1234
+#, fuzzy
+msgid "Master halting..."
+msgstr "Master stopper..."
 
-#: daemon/gdm.c:1137
+#: daemon/gdm.c:1246
 #, c-format
-msgid "gdm_child_action: Halt failed: %s"
-msgstr "gdm_child_action: Stopp feilet: %s"
+msgid "%s: Halt failed: %s"
+msgstr "%s: Nedstenging feilet: %s"
 
 #. Suspend machine
-#: daemon/gdm.c:1144
-msgid "gdm_child_action: Master suspending..."
-msgstr "gdm_child_action: Mester går i dvale..."
-
-#: daemon/gdm.c:1152
-#, c-format
-msgid "gdm_child_action: Suspend failed: %s"
-msgstr "gdm_child_action: Suspend feilet: %s"
-
-#: daemon/gdm.c:1250
+#. XXX: this is ugly, why should there be a suspend like this,
+#. * see GDM_SOP_SUSPEND_MACHINE
+#: daemon/gdm.c:1256 daemon/gdm.c:2247
+#, fuzzy
+msgid "Master suspending..."
+msgstr "Mester går i dvale..."
+
+#: daemon/gdm.c:1367
 msgid "GDM restarting ..."
 msgstr "GDM starter på nytt..."
 
-#: daemon/gdm.c:1255
+#: daemon/gdm.c:1372
 msgid "Failed to restart self"
 msgstr "Feil under gjenoppstarting"
 
-#: daemon/gdm.c:1352
+#: daemon/gdm.c:1469
 msgid "Do not fork into the background"
 msgstr "Ikke kjør fork() og gå til bakgrunnen"
 
-#: daemon/gdm.c:1354
+#: daemon/gdm.c:1471
 msgid "Preserve LD_* variables"
 msgstr "Bevar LD_* variabler"
 
-#: daemon/gdm.c:1436 gui/gdmchooser.c:1071
+#: daemon/gdm.c:1573 gui/gdmchooser.c:1319
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -587,50 +633,50 @@ msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige "
 "kommandolinjeflagg.\n"
 
-#: daemon/gdm.c:1448
+#: daemon/gdm.c:1585
 msgid "Only root wants to run gdm\n"
 msgstr "Bare root kan kjøre gdm\n"
 
-#: daemon/gdm.c:1476
+#: daemon/gdm.c:1613
 msgid "gdm already running. Aborting!"
 msgstr "gdm kjører allerede. Avbryter!"
 
-#: daemon/gdm.c:1510
+#: daemon/gdm.c:1647
 #, c-format
 msgid "%s: Error setting up TERM signal handler"
 msgstr "%s: Feil under oppsett av TERM signalhåndtereren"
 
-#: daemon/gdm.c:1514
+#: daemon/gdm.c:1651
 #, c-format
 msgid "%s: Error setting up INT signal handler"
 msgstr "%s: Feil under oppsett av INT signalhåndtereren"
 
-#: daemon/gdm.c:1518
+#: daemon/gdm.c:1655
 #, c-format
 msgid "%s: Error setting up HUP signal handler"
 msgstr "%s: Feil under oppsett av HUP signalhåndtereren"
 
-#: daemon/gdm.c:1522
+#: daemon/gdm.c:1659
 #, c-format
 msgid "%s: Error setting up USR1 signal handler"
 msgstr "%s: Feil under oppsett av USR1 signalhåndtereren"
 
-#: daemon/gdm.c:1531
+#: daemon/gdm.c:1668
 #, c-format
 msgid "%s: Error setting up CHLD signal handler"
 msgstr "%s: Feil under oppsett av CHLD signalhåndtereren"
 
-#: daemon/gdm.c:2634 daemon/gdm.c:2652
+#: daemon/gdm.c:2884 daemon/gdm.c:2903
 msgid "Flexible server request denied: Not authenticated"
 msgstr "Fleksibel tjenerforespørsel nektet: Ikke autentisert"
 
 #. Don't print the name to syslog as it might be
 #. * long and dangerous
-#: daemon/gdm.c:2670
+#: daemon/gdm.c:2921
 msgid "Unknown server type requested, using standard server."
 msgstr "Ukjent tjenertype forespurt, bruker forvalgt tjener."
 
-#: daemon/gdm.c:2674
+#: daemon/gdm.c:2925
 #, c-format
 msgid ""
 "Requested server %s not allowed to be used for flexible servers, using "
@@ -640,21 +686,21 @@ msgstr ""
 "tjener."
 
 #. Translators, don't translate the 'y' and 'n'
-#: daemon/misc.c:491
+#: daemon/misc.c:523
 msgid "y = Yes or n = No? >"
 msgstr "y = Ja eller n = Nei? >"
 
-#: daemon/misc.c:775
+#: daemon/misc.c:810
 #, c-format
 msgid "%s: Cannot get local addresses!"
 msgstr "%s: Kan ikke hente lokale adresser!"
 
-#: daemon/misc.c:890
+#: daemon/misc.c:925
 #, c-format
 msgid "Could not setgid %d. Aborting."
 msgstr "Kunne ikke kjøre setgid %d. Avbryter."
 
-#: daemon/misc.c:895
+#: daemon/misc.c:930
 #, c-format
 msgid "initgroups() failed for %s. Aborting."
 msgstr "initgroups() feilet for %s. Avbryter."
@@ -700,12 +746,12 @@ msgstr "%s: Feil under åpning av et rør: %s"
 msgid "%s: Error setting up USR1 signal handler: %s"
 msgstr "%s: Feil under oppsett av signalhåndterer for USR1: %s"
 
-#: daemon/server.c:483 daemon/slave.c:291
+#: daemon/server.c:483 daemon/slave.c:312
 #, c-format
 msgid "%s: Error setting up CHLD signal handler: %s"
 msgstr "%s: Feil under oppsett av signalhåndterer for CHLD: %s"
 
-#: daemon/server.c:497 daemon/slave.c:267
+#: daemon/server.c:497 daemon/slave.c:288
 #, c-format
 msgid "%s: Error setting up ALRM signal handler: %s"
 msgstr "%s: Feil under oppsett av signalhåndterer for TERM: %s"
@@ -721,92 +767,101 @@ msgstr "%s: Kan ikke finne et ledig skjermnummer"
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s: Skjerm %s er opptatt. Prøver et annet skjermnummer."
 
-#: daemon/server.c:787
+#: daemon/server.c:788
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "Ugyldig tjenerkommando '%s'"
 
-#: daemon/server.c:792
+#: daemon/server.c:793
 #, c-format
 msgid "Server name '%s' not found, using standard server"
 msgstr "Tjenernavn '%s' ikke funnet, bruker forvalgt tjener"
 
-#: daemon/server.c:939
-#, c-format
-msgid "gdm_server_spawn: Could not open logfile for display %s!"
-msgstr "gdm_server_spawn: Kunne ikke åpne loggfil for skjerm %s!"
-
-#: daemon/server.c:949
-msgid "gdm_server_spawn: Error setting USR1 to SIG_IGN"
-msgstr "gdm_server_spawn: Feil ved setting av USR1 til SIG_IGN"
-
-#: daemon/server.c:953
-msgid "gdm_server_spawn: Error setting TTIN to SIG_IGN"
-msgstr "gdm_server_spawn: Feil ved setting av TTIN til SIG_IGN"
-
-#: daemon/server.c:957
-msgid "gdm_server_spawn: Error setting TTOU to SIG_IGN"
-msgstr "gdm_server_spawn: Feil ved setting av TTOU til SIG_IGN"
-
 #: daemon/server.c:967
-msgid "gdm_server_spawn: Error setting HUP to SIG_DFL"
-msgstr "gdm_server_spawn: Feil ved setting av HUP til SIG_DFL"
+#, c-format
+msgid "%s: Could not open logfile for display %s!"
+msgstr "%s: Kunne ikke åpne loggfil for skjerm %s!"
 
-#: daemon/server.c:971
-msgid "gdm_server_spawn: Error setting TERM to SIG_DFL"
-msgstr "gdm_server_spawn: Feil ved setting av TERM til SIG_DFL"
+#: daemon/server.c:978 daemon/server.c:983 daemon/server.c:988
+#: daemon/server.c:999 daemon/server.c:1004
+#, c-format
+msgid "%s: Error setting %s to %s"
+msgstr "%s: Feil under setting  av %s til %s"
 
-#: daemon/server.c:1004
+#: daemon/server.c:1038
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s: Tjenerkommandoen for skjerm %s er tom"
 
-#: daemon/server.c:1018
+#: daemon/server.c:1052
 #, c-format
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr ""
 "%s: Tjeneren skulle startes av uid %d, men denne brukeren eksisterer ikke"
 
-#: daemon/server.c:1033 daemon/slave.c:1483 daemon/slave.c:1849
+#: daemon/server.c:1067 daemon/slave.c:1706 daemon/slave.c:2121
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Kunne ikke sette gruppe-id til %d"
 
-#: daemon/server.c:1039 daemon/slave.c:1488 daemon/slave.c:1854
+#: daemon/server.c:1073 daemon/slave.c:1711 daemon/slave.c:2126
 #, c-format
 msgid "%s: initgroups() failed for %s"
 msgstr "%s: initgroups() feilet for %s"
 
-#: daemon/server.c:1045 daemon/slave.c:1493 daemon/slave.c:1859
+#: daemon/server.c:1079 daemon/slave.c:1716 daemon/slave.c:2131
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Kunne ikke sette bruker-id til %d"
 
-#: daemon/server.c:1052
+#: daemon/server.c:1086
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s: Kunne ikke sette gruppe-id til 0"
 
-#: daemon/server.c:1063
+#: daemon/server.c:1097
 #, c-format
-msgid "gdm_server_spawn: Xserver not found: %s"
-msgstr "gdm_server_spawn: Xserver ikke funnet: %s"
+msgid "%s: Xserver not found: %s"
+msgstr "%s: Xserver ikke funnet: %s"
 
-#: daemon/server.c:1070
-msgid "gdm_server_spawn: Can't fork Xserver process!"
-msgstr "gdm_server_spawn: Kan ikke kjøre fork på Xserver-prosessen!"
+#: daemon/server.c:1105
+#, c-format
+msgid "%s: Can't fork Xserver process!"
+msgstr "%s: Kan ikke kjøre Xserver-prosess!"
 
-#: daemon/slave.c:281
+#: daemon/slave.c:302
 #, c-format
 msgid "%s: Error setting up TERM/INT signal handler: %s"
 msgstr "%s: Feil under oppsett av signalhåndtereren for TERM/INT: %s"
 
-#: daemon/slave.c:301
+#: daemon/slave.c:322
 #, c-format
 msgid "%s: Error setting up USR2 signal handler: %s"
 msgstr "%s: Feil under oppsett av signalhåndterer for USR2: %s"
 
-#: daemon/slave.c:512
+#: daemon/slave.c:587
+msgid "Log in anyway"
+msgstr "Logg inn likevel"
+
+#: daemon/slave.c:589
+msgid ""
+"You are already logged in.  You can log in anyway, return to your previous "
+"login session, or abort this login"
+msgstr ""
+
+#: daemon/slave.c:593
+msgid "Return to previous login"
+msgstr "Gå tilbake til innlogging"
+
+#: daemon/slave.c:594 daemon/slave.c:600
+msgid "Abort login"
+msgstr "Avbryt innlogging"
+
+#: daemon/slave.c:597
+msgid "You are already logged in.  You can log in anyway or abort this login"
+msgstr ""
+
+#: daemon/slave.c:684
 msgid ""
 "I could not start the X\n"
 "server (your graphical environment)\n"
@@ -826,16 +881,17 @@ msgstr ""
 "skjermen slås av. Vennligst start gdm på\n"
 "nytt når problemet er rettet."
 
-#: daemon/slave.c:737
-msgid "focus_first_x_window: cannot fork"
-msgstr "focus_first_x_window: kan ikke kjøre fork"
+#: daemon/slave.c:915
+#, c-format
+msgid "%s: cannot fork"
+msgstr ""
 
-#: daemon/slave.c:761
+#: daemon/slave.c:957
 #, c-format
-msgid "focus_first_x_window: cannot open display %s"
-msgstr "focus_first_x_window: kan ikke åpne skjerm %s"
+msgid "%s: cannot open display %s"
+msgstr "%s: kan ikke åpne skjerm %s"
 
-#: daemon/slave.c:901
+#: daemon/slave.c:1103
 msgid ""
 "Could not execute the configuration\n"
 "program.  Make sure it's path is set\n"
@@ -849,7 +905,7 @@ msgstr ""
 "forsøke å starte det fra standard\n"
 "lokasjon."
 
-#: daemon/slave.c:915
+#: daemon/slave.c:1117
 msgid ""
 "Could not execute the configuration\n"
 "program.  Make sure it's path is set\n"
@@ -859,7 +915,7 @@ msgstr ""
 "programmet. Sjekk at stien er satt\n"
 "riktig i konfigurasjonsfilen."
 
-#: daemon/slave.c:1032
+#: daemon/slave.c:1234
 msgid ""
 "Enter the root password\n"
 "to run the configuration."
@@ -867,16 +923,16 @@ msgstr ""
 "Skriv inn passord for root\n"
 "for å kjøre konfigurasjonen."
 
-#: daemon/slave.c:1055 daemon/slave.c:1139
+#: daemon/slave.c:1257 daemon/slave.c:1341
 msgid "gdm_slave_wait_for_login: No login/Bad login"
 msgstr "gdm_slave_wait_for_login: Ingen innlogging/ugyldig innlogging"
 
-#: daemon/slave.c:1445
+#: daemon/slave.c:1668
 #, c-format
 msgid "%s: Can't init pipe to gdmgreeter"
 msgstr "%s: Kan ikke åpne rør til gdmgreeter"
 
-#: daemon/slave.c:1560
+#: daemon/slave.c:1783
 msgid ""
 "No servers were defined in the\n"
 "configuration file and XDMCP was\n"
@@ -896,7 +952,7 @@ msgstr ""
 "Merk at automatisk og tidsbestemt\n"
 "innlogging er deaktivert nå."
 
-#: daemon/slave.c:1574
+#: daemon/slave.c:1797
 msgid ""
 "I could not start the regular X\n"
 "server (your graphical environment)\n"
@@ -910,7 +966,7 @@ msgstr ""
 "Du bør logge inn og konfigurere\n"
 "X-tjeneren riktig."
 
-#: daemon/slave.c:1583
+#: daemon/slave.c:1806
 #, c-format
 msgid ""
 "The specified display number was busy, so this server was started on display "
@@ -919,14 +975,24 @@ msgstr ""
 "Spesifisert skjermnummer var opptatt så denne tjeneren ble startet på skjerm "
 "%s."
 
-#: daemon/slave.c:1596
+#: daemon/slave.c:1826
+msgid ""
+"The greeter program appears to be crashing.\n"
+"I will attempt to use a different one."
+msgstr ""
+
+#. Something went wrong
+#: daemon/slave.c:1851
 #, c-format
-msgid "gdm_slave_greeter: Cannot start greeter trying default: %s"
+msgid "%s: Cannot start greeter with gtk modules: %s. Trying without modules"
 msgstr ""
-"gdm_slave_greeter: Kan ikke starte velkomst ved forsøk på å bruke standard: %"
-"s"
 
-#: daemon/slave.c:1608
+#: daemon/slave.c:1858
+#, c-format
+msgid "%s: Cannot start greeter trying default: %s"
+msgstr "%s: Kan ikke starte velkomst ved forsøk på å bruke standard: %s"
+
+#: daemon/slave.c:1871
 msgid ""
 "Cannot start the greeter program,\n"
 "you will not be able to log in.\n"
@@ -940,52 +1006,54 @@ msgstr ""
 "Prøv å logge inn på andre måter og\n"
 "rediger konfigurasjonsfilen"
 
-#: daemon/slave.c:1614
+#. If no greeter we really have to disable the display
+#: daemon/slave.c:1878
 #, c-format
 msgid "%s: Error starting greeter on display %s"
 msgstr "%s: Feil under oppstart av velkomst på skjerm %s"
 
-#: daemon/slave.c:1618
+#: daemon/slave.c:1882
 #, c-format
 msgid "%s: Can't fork gdmgreeter process"
 msgstr "%s: Kan ikke kjøre fork() for gdmgreeter-prosess"
 
-#: daemon/slave.c:1685 daemon/slave.c:1784
+#: daemon/slave.c:1952 daemon/slave.c:2056
 #, c-format
 msgid "%s: Can't open fifo!"
 msgstr "%s: Kan ikke åpne fifo!"
 
-#: daemon/slave.c:1810
+#: daemon/slave.c:2082
 msgid "gdm_slave_chooser: Can't init pipe to gdmchooser"
 msgstr "gdm_slave_chooser: Kan ikke åpne rør til gdmchooser"
 
-#: daemon/slave.c:1895
+#: daemon/slave.c:2167
+#, fuzzy
 msgid ""
 "Cannot start the chooser program,\n"
-"you will not be able to log in.\n"
+"you will probably not be able to log in.\n"
 "Please contact the system administrator.\n"
 msgstr ""
 "Kan ikke starte velgerprogrammet.\n"
 "Du vil ikke kunne logge inn.\n"
 "Vennligst kontakt din systemadministrator.\n"
 
-#: daemon/slave.c:1899
+#: daemon/slave.c:2171
 #, c-format
 msgid "gdm_slave_chooser: Error starting chooser on display %s"
 msgstr "gdm_slave_chooser: Feil under oppstart av velkomst på skjerm %s"
 
-#: daemon/slave.c:1902
+#: daemon/slave.c:2174
 msgid "gdm_slave_chooser: Can't fork gdmchooser process"
 msgstr "gdm_slave_chooser: Kan ikke kjøre fork() på gdmchooser prosess"
 
 #. open stdout - fd 1
 #. open stderr - fd 2
-#: daemon/slave.c:2253
+#: daemon/slave.c:2525
 #, c-format
 msgid "%s: Could not open ~/.xsession-errors"
 msgstr "%s: Kunne ikke åpne ~/.xsession-errors"
 
-#: daemon/slave.c:2275
+#: daemon/slave.c:2553
 msgid ""
 "gdm_slave_session_start: Execution of PreSession script returned > 0. "
 "Aborting."
@@ -993,43 +1061,63 @@ msgstr ""
 "gdm_slave_session_start: Kjøring av PreSession skript returnerte > 0. "
 "Avbryter."
 
-#: daemon/slave.c:2308
+#: daemon/slave.c:2587
 #, c-format
 msgid "Language %s does not exist, using %s"
 msgstr "Språk %s eksisterer ikke. Bruker %s"
 
-#: daemon/slave.c:2309 gui/gdmlogin.c:1114 gui/gdmlogin.c:1123
-#: gui/gdmlogin.c:1661 gui/greeter/greeter_action_language.c:52
-#: gui/greeter/greeter_action_language.c:138
-#: gui/greeter/greeter_action_language.c:146
+#: daemon/slave.c:2588 gui/gdmlogin.c:1130 gui/gdmlogin.c:1139
+#: gui/gdmlogin.c:1666 gui/greeter/greeter_action_language.c:52
+#: gui/greeter/greeter_action_language.c:132
+#: gui/greeter/greeter_action_language.c:140
 msgid "System default"
 msgstr "Systemets forvalg"
 
-#: daemon/slave.c:2321
+#: daemon/slave.c:2600
 #, c-format
 msgid "%s: Could not setup environment for %s. Aborting."
 msgstr "%s: Kunne ikke sette opp miljø for %s. Avbryter."
 
-#: daemon/slave.c:2335
+#: daemon/slave.c:2614
 #, c-format
 msgid "%s: setusercontext() failed for %s. Aborting."
 msgstr "%s: setusercontext() feilet for %s. Avbryter."
 
-#: daemon/slave.c:2341
+#: daemon/slave.c:2620
 #, c-format
 msgid "gdm_slave_session_start: Could not become %s. Aborting."
 msgstr "gdm_slave_session_start: Kunne ikke bli %s. Avbryter."
 
-#. yaikes
-#: daemon/slave.c:2415
+#: daemon/slave.c:2701
+#, fuzzy, c-format
+msgid "%s: No Exec line in the session file: %s, starting failsafe GNOME"
+msgstr "Ingen forvalgt sesjonlenke funnet. Bruker Feilsikker GNOME.\n"
+
+#: daemon/slave.c:2707
+msgid ""
+"The session you selected does not look valid.  I will run the GNOME failsafe "
+"session for you."
+msgstr ""
+
+#: daemon/slave.c:2721
+#, c-format
 msgid ""
-"gdm_slave_session_start: gnome-session not found for a failsafe gnome "
-"session, trying xterm"
+"%s: Cannot find or run the base Xsession script, will try GNOME failsafe"
 msgstr ""
-"gdm_slave_session_start: gnome-session ble ikke funnet for en feilsikker "
-"gnome sesjon, prøver xterm"
 
-#: daemon/slave.c:2419
+#: daemon/slave.c:2726
+msgid ""
+"Cannot find or run the base session script, will try the GNOME failsafe "
+"session for you."
+msgstr ""
+
+#. yaikes
+#: daemon/slave.c:2741
+#, c-format
+msgid "%s: gnome-session not found for a failsafe GNOME session, trying xterm"
+msgstr "%s: gnome-session ble ikke funnet for en feilsikker gnome sesjon, prøver xterm"
+
+#: daemon/slave.c:2746
 msgid ""
 "Could not find the GNOME installation,\n"
 "will try running the \"Failsafe xterm\"\n"
@@ -1039,7 +1127,7 @@ msgstr ""
 "vil forsøke å kjøre \"Feilsikker xterm\"-\n"
 "sesjonen."
 
-#: daemon/slave.c:2425
+#: daemon/slave.c:2754
 msgid ""
 "This is the Failsafe Gnome session.\n"
 "You will be logged into the 'Default'\n"
@@ -1053,11 +1141,11 @@ msgstr ""
 "skript. Bruk denne kun for å rette opp\n"
 "problemer med installasjonen."
 
-#: daemon/slave.c:2446
+#: daemon/slave.c:2769
 msgid "Cannot find \"xterm\" to start a failsafe session."
 msgstr "Kan ikke finne \"xterm\" for en feilsikker sesjon."
 
-#: daemon/slave.c:2453
+#: daemon/slave.c:2781
 msgid ""
 "This is the Failsafe xterm session.\n"
 "You will be logged into a terminal\n"
@@ -1074,16 +1162,17 @@ msgstr ""
 "terminalemulatoren, skriv 'exit' og\n"
 "trykk linjeskift."
 
-#: daemon/slave.c:2481
+#: daemon/slave.c:2792
 #, c-format
-msgid "Running %s for %s on %s"
-msgstr "Kjører %s for %s på %s"
+msgid "Running %s %s %s for %s on %s"
+msgstr "Kjører %s %s %s for %s på %s"
 
-#: daemon/slave.c:2495
-msgid "gdm_slave_session_start: User not allowed to log in"
-msgstr "gdm_slave_session_start: Bruker har ikke tillatelse til å logge inn"
+#: daemon/slave.c:2808
+#, c-format, fuzzy
+msgid "%s: User not allowed to log in"
+msgstr "Bruker %s har ikke tillatelse til å logge inn"
 
-#: daemon/slave.c:2497
+#: daemon/slave.c:2811
 msgid ""
 "The system administrator has\n"
 "disabled your account."
@@ -1091,52 +1180,31 @@ msgstr ""
 "Systemadministrator har\n"
 "deaktivert din konto."
 
-#: daemon/slave.c:2500
+#. will go to .xsession-errors
+#: daemon/slave.c:2820 daemon/slave.c:2825
 #, c-format
-msgid "gdm_slave_session_start: Could not find/run session `%s'"
-msgstr "gdm_slave_session_start: Kunne ikke finne/kjøre sesjon `%s'"
+msgid "%s: Could not exec %s %s %s"
+msgstr "%s: Kunne ikke kjøre %s %s %s"
 
-#: daemon/slave.c:2505
-msgid ""
-"Cannot start the session, most likely the\n"
-"session does not exist.  Please select from\n"
-"the list of available sessions in the login\n"
-"dialog window."
+#. we can't really be any more specific
+#: daemon/slave.c:2836
+msgid "Cannot start the session due to some internal error."
 msgstr ""
-"Kan ikke starte sesjonen. Sesjonen eksisterer\n"
-"sannsynligvis ikke. Vennligst velg fra listen\n"
-"med tilgjengelige sesjoner i innloggings-\n"
-"vinduet."
 
-#: daemon/slave.c:2539
-#, c-format
-msgid "gdm_slave_session_start: Could not start session `%s'"
-msgstr "gdm_slave_session_start: Kunne ikke starte sesjon `%s'"
-
-#: daemon/slave.c:2542
-msgid ""
-"Cannot start your shell.  It could be that the\n"
-"system administrator has disabled your login.\n"
-"It could also indicate an error with your account.\n"
-msgstr ""
-"Kan ikke starte ditt skall. Det er mulig at\n"
-"systemadministrator har deaktivert innlogging.\n"
-"Det kan også indikere en feil med din konto.\n"
-
-#: daemon/slave.c:2576
+#: daemon/slave.c:2867
 #, c-format
 msgid "gdm_slave_session_start: User passed auth but getpwnam(%s) failed!"
 msgstr ""
 "gdm_slave_session_start: Bruker passerte autentisering men getpwnam(%s) "
 "feilet.!"
 
-#: daemon/slave.c:2582
-#, c-format
+#: daemon/slave.c:2880
+#, fuzzy, c-format
 msgid ""
 "Your home directory is listed as:\n"
 "'%s'\n"
 "but it does not appear to exist.\n"
-"Do you want to log in with the root\n"
+"Do you want to log in with the /tmp\n"
 "directory as your home directory?\n"
 "\n"
 "It is unlikely anything will work unless\n"
@@ -1151,12 +1219,12 @@ msgstr ""
 "Der er usannsynlig at ting vil fungere\n"
 "med mindre du bruker en feilsikker sesjon."
 
-#: daemon/slave.c:2590
+#: daemon/slave.c:2888
 #, c-format
 msgid "%s: Home directory for %s: '%s' does not exist!"
 msgstr "%s: Hjemmekatalog for %s: '%s' eksisterer ikke!"
 
-#: daemon/slave.c:2756
+#: daemon/slave.c:3048
 msgid ""
 "GDM could not write to your authorization\n"
 "file.  This could mean that you are out of\n"
@@ -1171,13 +1239,14 @@ msgstr ""
 "Uansett vil det ikke være mulig å logge inn.\n"
 "Vennligst kontakt din systemadministrator"
 
-#: daemon/slave.c:2790
+#: daemon/slave.c:3084
 msgid "gdm_slave_session_start: Error forking user session"
 msgstr "gdm_slave_session_start: Feil under forking av brukersesjon"
 
-#: daemon/slave.c:2848
+#: daemon/slave.c:3141
+#, fuzzy
 msgid ""
-"Your session only lasted less then\n"
+"Your session only lasted less than\n"
 "10 seconds.  If you have not logged out\n"
 "yourself, this could mean that there is\n"
 "some installation problem or that you may\n"
@@ -1193,92 +1262,109 @@ msgstr ""
 "sesjonene for å se om dette løser\n"
 "problemet."
 
-#: daemon/slave.c:2856
+#: daemon/slave.c:3149
 msgid "View details (~/.xsession-errors file)"
 msgstr "Vis detaljer (~/.xsession-errors filen)"
 
-#: daemon/slave.c:2990
+#: daemon/slave.c:3281
+msgid "GDM detected a shutdown or reboot in progress."
+msgstr ""
+
+#: daemon/slave.c:3346
 #, c-format
 msgid "Ping to %s failed, whacking display!"
 msgstr "Ping til %s feilet. Dæjå!"
 
-#: daemon/slave.c:3190
+#. no_shutdown_check
+#: daemon/slave.c:3561
 #, c-format
-msgid "gdm_slave_xioerror_handler: Fatal X error - Restarting %s"
-msgstr "gdm_slave_xioerror_handler: Fatal X feil - Starter %s på nytt"
+msgid "%s: Fatal X error - Restarting %s"
+msgstr "%s: Fatal X feil - Starter %s på nytt"
 
-#: daemon/slave.c:3550
+#: daemon/slave.c:3944
 #, c-format
 msgid "gdm_slave_exec_script: Failed starting: %s"
 msgstr "gdm_slave_exec_script: Feil under oppstart: %s"
 
-#: daemon/slave.c:3558
+#: daemon/slave.c:3952
 msgid "gdm_slave_exec_script: Can't fork script process!"
 msgstr "gdm_slave_exec_script: Kan ikke kjøre fork på skriptprosessen!"
 
-#: daemon/slave.c:3652
-msgid "gdm_parse_enriched_login: Failed creating pipe"
-msgstr "gdm_parse_enriched_login: Feil under oppretting av rør"
+#: daemon/slave.c:4046
+#, c-format
+msgid "%s: Failed creating pipe"
+msgstr "%s: Kan ikke opprette rør"
+
+#: daemon/slave.c:4075
+#, c-format
+msgid "%s: Failed executing: %s"
+msgstr "%s: Feil under kjøring: %s"
 
-#: daemon/slave.c:3680
+#: daemon/slave.c:4081
 #, c-format
-msgid "gdm_parse_enriched_login: Failed executing: %s"
-msgstr "gdm_parse_enriched_login: Feil under kjøring: %s"
+msgid "%s: Can't fork script process!"
+msgstr "%s: Kan ikke kjøre skript-prosess!"
+
+#: daemon/verify-crypt.c:70 daemon/verify-pam.c:657 daemon/verify-shadow.c:71
+#, fuzzy
+msgid ""
+"\n"
+"Incorrect username or password.  Letters must be typed in the correct case."
+msgstr ""
+"\n"
+"Ugyldig brukernavn eller passord. Det må tas hensyn til små/store bokstaver. "
+"Vennligst sjekk at ikke Caps Lock tasten er aktivert"
 
-#: daemon/slave.c:3685
-msgid "gdm_parse_enriched_login: Can't fork script process!"
-msgstr "gdm_parse_enriched_login: Kan ikke kjøre fork på skriptprosessen!"
+#: daemon/verify-crypt.c:75 daemon/verify-pam.c:667 daemon/verify-shadow.c:76
+msgid "Please make sure the Caps Lock key is not enabled."
+msgstr ""
 
-#. Ask gdmgreeter for the user's login. Just for good measure
-#: daemon/verify-crypt.c:71 daemon/verify-pam.c:319 daemon/verify-shadow.c:70
-#: gui/gdmlogin.c:3339
+#. I think I'll add the buttons next to this
+#: daemon/verify-crypt.c:114 daemon/verify-pam.c:159
+#: daemon/verify-shadow.c:113 gui/gdmlogin.c:3388
 msgid "Please enter your username"
 msgstr "Vennligst skriv inn brukernavn"
 
-#: daemon/verify-crypt.c:72 daemon/verify-pam.c:320 daemon/verify-shadow.c:71
-#: gui/gdmlogin.c:3297 gui/greeter/greeter_parser.c:961
-#: gui/greeter/themes/circles/circles.xml.in.h:5
-#: gui/greeter/themes/happygnome/happygnome.xml.in.h:5
+#. login: is whacked always translate to Username:
+#: daemon/verify-crypt.c:115 daemon/verify-pam.c:85 daemon/verify-pam.c:86
+#: daemon/verify-pam.c:153 daemon/verify-pam.c:460 daemon/verify-shadow.c:114
+#: gui/gdmlogin.c:1279 gui/gdmlogin.c:2639 gui/gdmlogin.c:3346
+#: gui/greeter/greeter.c:267 gui/greeter/greeter_parser.c:986
+#: gui/greeter/themes/circles/circles.xml.in.h:4
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:4
+#: gui/greeter/themes/happygnome/happygnome.xml.in.h:4
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: daemon/verify-crypt.c:96 daemon/verify-shadow.c:105
-msgid "Password: "
-msgstr "Passord: "
+#: daemon/verify-crypt.c:153 daemon/verify-pam.c:87 daemon/verify-pam.c:200
+#: daemon/verify-shadow.c:171
+msgid "Password:"
+msgstr "Passord:"
 
-#: daemon/verify-crypt.c:114 daemon/verify-pam.c:361 daemon/verify-pam.c:532
-#: daemon/verify-shadow.c:123
-msgid "Couldn't authenticate user"
-msgstr "Kunne ikke autentisere"
-
-#: daemon/verify-crypt.c:120 daemon/verify-crypt.c:140
-msgid ""
-"\n"
-"Incorrect username or password.  Letters must be typed in the correct case.  "
-"Please be sure the Caps Lock key is not enabled"
-msgstr ""
-"\n"
-"Ugyldig brukernavn eller passord. Det må tas hensyn til små/store bokstaver. "
-"Vennligst sjekk at ikke Caps Lock tasten er aktivert"
+#: daemon/verify-crypt.c:171 daemon/verify-crypt.c:185
+#: daemon/verify-shadow.c:189 daemon/verify-shadow.c:203
+#, c-format
+msgid "Couldn't authenticate user \"%s\""
+msgstr "Kunne ikke autentisere bruker «%s»"
 
-#: daemon/verify-crypt.c:154 daemon/verify-pam.c:374
-#: daemon/verify-shadow.c:163
+#: daemon/verify-crypt.c:198 daemon/verify-pam.c:552
+#: daemon/verify-shadow.c:216
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "Root innlogging ikke tillatt på skjerm '%s'"
 
-#: daemon/verify-crypt.c:156 daemon/verify-shadow.c:165
+#: daemon/verify-crypt.c:200 daemon/verify-shadow.c:218
 msgid "The system administrator is not allowed to login from this screen"
 msgstr ""
 "Systemadministrator har ikke tillatelse til å logge inn fra denne skjermen"
 
-#: daemon/verify-crypt.c:172 daemon/verify-shadow.c:181
+#: daemon/verify-crypt.c:216 daemon/verify-shadow.c:234
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "Bruker %s har ikke tillatelse til å logge inn"
 
-#: daemon/verify-crypt.c:174 daemon/verify-pam.c:404 daemon/verify-pam.c:565
-#: daemon/verify-shadow.c:183
+#: daemon/verify-crypt.c:218 daemon/verify-pam.c:582 daemon/verify-pam.c:808
+#: daemon/verify-shadow.c:236
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1286,16 +1372,16 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert din konto."
 
-#: daemon/verify-crypt.c:189 daemon/verify-crypt.c:223 daemon/verify-pam.c:422
-#: daemon/verify-pam.c:582 daemon/verify-shadow.c:197
-#: daemon/verify-shadow.c:230
+#: daemon/verify-crypt.c:233 daemon/verify-crypt.c:270 daemon/verify-pam.c:600
+#: daemon/verify-pam.c:825 daemon/verify-shadow.c:250
+#: daemon/verify-shadow.c:286
 #, c-format
 msgid "Cannot set user group for %s"
 msgstr "Kan ikke sette brukergruppe for %s"
 
-#: daemon/verify-crypt.c:191 daemon/verify-crypt.c:226 daemon/verify-pam.c:424
-#: daemon/verify-pam.c:585 daemon/verify-shadow.c:199
-#: daemon/verify-shadow.c:233
+#: daemon/verify-crypt.c:235 daemon/verify-crypt.c:273 daemon/verify-pam.c:602
+#: daemon/verify-pam.c:828 daemon/verify-shadow.c:252
+#: daemon/verify-shadow.c:289
 msgid ""
 "\n"
 "Cannot set your user group, you will not be able to log in, please contact "
@@ -1305,36 +1391,104 @@ msgstr ""
 "Kan ikke sette din brukergruppe. Du vil ikke kunne logge inn. Vennligst "
 "kontakt din systemadministrator."
 
-#: daemon/verify-crypt.c:218 daemon/verify-shadow.c:225
+#: daemon/verify-crypt.c:265 daemon/verify-shadow.c:281
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr "Kan ikke finne passwd-structure for %s"
 
-#: daemon/verify-pam.c:238
-msgid "Cannot setup pam handle with null login and/or display"
-msgstr "Kan ikke sette opp pam håndterer med null login og/eller skjerm"
+#: daemon/verify-pam.c:88
+msgid "You are required to change your password immediately (password aged)"
+msgstr ""
+
+#: daemon/verify-pam.c:89
+msgid "You are required to change your password immediately (root enforced)"
+msgstr ""
+
+#: daemon/verify-pam.c:90
+#, fuzzy
+msgid "Your account has expired; please contact your system administrator"
+msgstr ""
+"\n"
+"Kan ikke sette din brukergruppe. Du vil ikke kunne logge inn. Vennligst "
+"kontakt din systemadministrator."
+
+#: daemon/verify-pam.c:91
+msgid "No password supplied"
+msgstr ""
+
+#: daemon/verify-pam.c:92
+msgid "Password unchanged"
+msgstr "Passord ikke endret"
+
+#: daemon/verify-pam.c:93
+msgid "Can not get username"
+msgstr "Kan ikke finne brukernavn"
+
+#: daemon/verify-pam.c:94
+msgid "Retype new UNIX password:"
+msgstr ""
+
+#: daemon/verify-pam.c:95
+msgid "Enter new UNIX password:"
+msgstr ""
+
+#: daemon/verify-pam.c:96
+msgid "(current) UNIX password:"
+msgstr ""
+
+#: daemon/verify-pam.c:97
+msgid "Error while changing NIS password."
+msgstr ""
+
+#: daemon/verify-pam.c:98
+msgid "You must choose a longer password"
+msgstr ""
+
+#: daemon/verify-pam.c:99
+msgid "Password has been already used. Choose another."
+msgstr ""
+
+#: daemon/verify-pam.c:100
+msgid "You must wait longer to change your password"
+msgstr ""
+
+#: daemon/verify-pam.c:101
+msgid "Sorry, passwords do not match"
+msgstr ""
+
+#: daemon/verify-pam.c:361
+msgid "Cannot setup pam handle with null display"
+msgstr "Kan ikke sette opp pam håndterer uten skjerm"
 
-#: daemon/verify-pam.c:252
+#: daemon/verify-pam.c:374
 #, c-format
-msgid "Can't find /etc/pam.d/%s!"
-msgstr "Kan ikke finne /etc/pam.d/%s!"
+msgid "Unable to establish service %s: %s\n"
+msgstr ""
 
-#: daemon/verify-pam.c:259
+#: daemon/verify-pam.c:382
 #, c-format
 msgid "Can't set PAM_TTY=%s"
 msgstr "Kan ikke sette PAM_TTY=%s"
 
-#: daemon/verify-pam.c:266
+#: daemon/verify-pam.c:392
 #, c-format
 msgid "Can't set PAM_RUSER=%s"
 msgstr "Kan ikke sette PAM_RUSER=%s"
 
-#: daemon/verify-pam.c:274
+#: daemon/verify-pam.c:403
 #, c-format
 msgid "Can't set PAM_RHOST=%s"
 msgstr "Kan ikke sette PAM_RHOST=%s"
 
-#: daemon/verify-pam.c:377
+#. is not really an auth problem, but it will
+#. pretty much look as such, it shouldn't really
+#. happen
+#: daemon/verify-pam.c:508 daemon/verify-pam.c:527 daemon/verify-pam.c:758
+#: daemon/verify-pam.c:771
+msgid "Couldn't authenticate user"
+msgstr "Kunne ikke autentisere"
+
+#: daemon/verify-pam.c:555
 msgid ""
 "\n"
 "The system administrator is not allowed to login from this screen"
@@ -1342,12 +1496,12 @@ msgstr ""
 "\n"
 "Systemadministrator kan ikke logge inn fra denne skjermen"
 
-#: daemon/verify-pam.c:393
+#: daemon/verify-pam.c:571
 #, c-format
 msgid "Authentication token change failed for user %s"
 msgstr "Endring av autentiseringstoken feilet for bruker %s"
 
-#: daemon/verify-pam.c:395
+#: daemon/verify-pam.c:573
 msgid ""
 "\n"
 "The change of the authentication token failed. Please try again later or "
@@ -1357,17 +1511,17 @@ msgstr ""
 "Endring av autentiseringstoken feilet. Vennligst prøve igjen senere eller "
 "kontakt systemadministrator."
 
-#: daemon/verify-pam.c:402 daemon/verify-pam.c:562
+#: daemon/verify-pam.c:580 daemon/verify-pam.c:805
 #, c-format
 msgid "User %s no longer permitted to access the system"
 msgstr "Bruker %s har ikke tilgangsrettigheter til systemet lenger"
 
-#: daemon/verify-pam.c:408 daemon/verify-pam.c:568
+#: daemon/verify-pam.c:586 daemon/verify-pam.c:811
 #, c-format
 msgid "User %s not permitted to gain access at this time"
 msgstr "Bruker %s har ikke tilgangsrettigheter til systemet nå"
 
-#: daemon/verify-pam.c:410
+#: daemon/verify-pam.c:588
 msgid ""
 "\n"
 "The system administrator has disabled access to the system temporarily."
@@ -1375,41 +1529,36 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert tilgang til systemet midlertidig."
 
-#: daemon/verify-pam.c:415 daemon/verify-pam.c:575
+#: daemon/verify-pam.c:593 daemon/verify-pam.c:818
 #, c-format
 msgid "Couldn't set acct. mgmt for %s"
 msgstr "Kunne ikke sette kontohåndtering for %s"
 
-#: daemon/verify-pam.c:434 daemon/verify-pam.c:595
+#: daemon/verify-pam.c:612 daemon/verify-pam.c:838
 #, c-format
 msgid "Couldn't set credentials for %s"
 msgstr "Kunne ikke sette credentials for %s"
 
-#: daemon/verify-pam.c:444 daemon/verify-pam.c:606
+#: daemon/verify-pam.c:622 daemon/verify-pam.c:849
 #, c-format
 msgid "Couldn't open session for %s"
 msgstr "Kunne ikke åpne sesjon for %s"
 
-#: daemon/verify-pam.c:470 daemon/verify-shadow.c:129
-#: daemon/verify-shadow.c:149
+#: daemon/verify-pam.c:661
 msgid ""
 "\n"
-"Incorrect username or password. Letters must be typed in the correct case. "
-"Please make sure the Caps Lock key is not enabled."
+"Authentication failed.  Letters must be typed in the correct case."
 msgstr ""
-"\n"
-"Ugyldig brukernavn eller passord. Det må tas hensyn til små/store bokstaver. "
-"Vennligst sjekk at ikke Caps Lock tasten er aktivert"
 
-#: daemon/verify-pam.c:475 daemon/verify-pam.c:535
+#: daemon/verify-pam.c:677 daemon/verify-pam.c:761 daemon/verify-pam.c:774
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: daemon/verify-pam.c:520 gui/gdmsetup-strings.c:19 gui/gdmsetup.glade.h:10
+#: daemon/verify-pam.c:727
 msgid "Automatic login"
 msgstr "Automatisk innlogging"
 
-#: daemon/verify-pam.c:571
+#: daemon/verify-pam.c:814
 msgid ""
 "\n"
 "The system administrator has disabled your access to the system temporary."
@@ -1417,265 +1566,275 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert din tilgang til systemet midlertidig."
 
-#: daemon/verify-pam.c:698 daemon/verify-pam.c:700
+#: daemon/verify-pam.c:941 daemon/verify-pam.c:943
 msgid "Can't find PAM configuration for gdm."
 msgstr "Kan ikke finne PAM-konfigurasjonsfil for gdm."
 
-#: daemon/xdmcp.c:244
+#: daemon/xdmcp.c:248
 #, c-format
-msgid "gdm_xdmcp_init: Could not get server hostname: %s!"
-msgstr "gdm_xdmcp_init: Fikk ikke tjenerens vertsnavn: %s!"
-
-#: daemon/xdmcp.c:264
-msgid "gdm_xdmcp_init: Could not create socket!"
-msgstr "gdm_xdmcp_init: Kunne ikke opprette socket!"
+msgid "%s: Could not get server hostname: %s!"
+msgstr "%s: Fikk ikke tjenerens vertsnavn: %s!"
 
-#: daemon/xdmcp.c:274
-msgid "gdm_xdmcp_init: Could not bind to XDMCP socket!"
-msgstr "gdm_xdmcp_init: Kunne ikke binde til XDMCP socket!"
+#: daemon/xdmcp.c:269
+#, c-format
+msgid "%s: Could not create socket!"
+msgstr "%s: Kunne ikke lage socket!"
 
-#: daemon/xdmcp.c:333
-msgid "gdm_xdmcp_decode: Could not create XDMCP buffer!"
-msgstr "gdm_xdmcp_decode: Kunne ikke opprette XDMCP buffer!"
+#: daemon/xdmcp.c:279
+#, c-format
+msgid "%s: Could not bind to XDMCP socket!"
+msgstr "%s: Kunne ikke binde til XDMCP-socket!"
 
 #: daemon/xdmcp.c:338
-msgid "gdm_xdmcp_decode: Could not read XDMCP header!"
-msgstr "gdm_xdmcp_decode: Kunne ikke lese XDMCP header!"
+#, c-format
+msgid "%s: Could not create XDMCP buffer!"
+msgstr "%s: Kunne ikke opprette XDMCP buffer!"
 
 #: daemon/xdmcp.c:344
-msgid "gdm_xdmcp_decode: Incorrect XDMCP version!"
-msgstr "gdm_xdmcp_decode: Feil XDMCP versjon!"
-
-#: daemon/xdmcp.c:397
 #, c-format
-msgid "gdm_xdmcp_decode_packet: Unknown opcode from host %s"
-msgstr "gdm_xdmcp_decode_packet: Ukjent opkode fra vert %s"
+msgid "%s: Could not read XDMCP header!"
+msgstr "%s: Kunne ikke lese XDMCP header!"
 
-#: daemon/xdmcp.c:416
-msgid "gdm_xdmcp_handle_query: Could not extract authlist from packet"
-msgstr ""
-"gdm_xdmcp_handle_query: Kunne ikke hente ut autentiseringsliste fra pakke"
+#: daemon/xdmcp.c:351
+#, c-format
+msgid "%s: Incorrect XDMCP version!"
+msgstr "%s: Feil XDMCP versjon!"
 
-#: daemon/xdmcp.c:428
-msgid "gdm_xdmcp_handle_query: Error in checksum"
-msgstr "gdm_xdmcp_handle_query: Feil i sjekksum"
+#: daemon/xdmcp.c:405
+#, c-format
+msgid "%s: Unknown opcode from host %s"
+msgstr "%s: Ukjent opkode fra vert %s"
 
-#: daemon/xdmcp.c:671
-msgid "gdm_xdmcp_handle_forward_query: Could not read display address"
-msgstr "gdm_xdmcp_handle_forward_query: Kunne ikke lese skjermadresse"
+#: daemon/xdmcp.c:425 daemon/xdmcp.c:699
+#, c-format
+msgid "%s: Could not extract authlist from packet"
+msgstr "%s: Kunne ikke hente ut autentiseringsliste fra pakke"
 
-#: daemon/xdmcp.c:678
-msgid "gdm_xdmcp_handle_forward_query: Could not read display port number"
-msgstr "gdm_xdmcp_handle_forward_query: Kunne ikke lese skjermens portnummer"
+#: daemon/xdmcp.c:438 daemon/xdmcp.c:716
+#, c-format
+msgid "%s: Error in checksum"
+msgstr "%s: Feil i sjekksum"
 
-#: daemon/xdmcp.c:686
-msgid "gdm_xdmcp_handle_forward_query: Could not extract authlist from packet"
-msgstr ""
-"gdm_xdmcp_handle_forward_query: Kunne ikke hente ut autentiseringsliste fra "
-"pakke"
+#: daemon/xdmcp.c:682
+#, c-format
+msgid "%s: Could not read display address"
+msgstr "%s: Kunne ikke lese adresse for skjerm"
 
-#: daemon/xdmcp.c:702
-msgid "gdm_xdmcp_handle_forward_query: Error in checksum"
-msgstr "gdm_xdmcp_handle_forward_query: Feil i sjekksum"
+#: daemon/xdmcp.c:690
+#, c-format
+msgid "%s: Could not read display port number"
+msgstr "%s: Kunne ikke lese portnummer for skjerm"
 
-#: daemon/xdmcp.c:708
-msgid "gdm_xdmcp_handle_forward_query: Bad address"
-msgstr "gdm_xdmcp_handle_forward_query: Ugyldig adresse"
+#: daemon/xdmcp.c:723
+#, c-format
+msgid "%s: Bad address"
+msgstr "%s: Ugyldig adresse"
 
-#: daemon/xdmcp.c:816
+#: daemon/xdmcp.c:832
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "Nektet XDMCP spørring fra vert %s"
 
-#: daemon/xdmcp.c:962
+#: daemon/xdmcp.c:959
 #, c-format
-msgid "gdm_xdmcp_handle_request: Got REQUEST from banned host %s"
-msgstr "gdm_xdmcp_handle_request: Mottok REQUEST fra bannlyst vert %s"
+msgid "%s: Got REQUEST from banned host %s"
+msgstr "%s: Mottok REQUEST fra bannlyst vert %s"
 
-#: daemon/xdmcp.c:969
-msgid "gdm_xdmcp_handle_request: Could not read Display Number"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese skjermnummer"
+#: daemon/xdmcp.c:967 daemon/xdmcp.c:1233 daemon/xdmcp.c:1465
+#, c-format
+msgid "%s: Could not read Display Number"
+msgstr "%s: Kunne ikke lese skjermnummer"
 
-#: daemon/xdmcp.c:975
-msgid "gdm_xdmcp_handle_request: Could not read Connection Type"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese forbindelsestype"
+#: daemon/xdmcp.c:974
+#, c-format
+msgid "%s: Could not read Connection Type"
+msgstr "%s: Kunne ikke lese forbindelsestype"
 
 #: daemon/xdmcp.c:981
-msgid "gdm_xdmcp_handle_request: Could not read Client Address"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese klientadresse"
-
-#: daemon/xdmcp.c:988
-msgid "gdm_xdmcp_handle_request: Could not read Authentication Names"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese autentiseringsnavn"
+#, c-format
+msgid "%s: Could not read Client Address"
+msgstr "%s: Kunne ikke lese klientens adresse"
 
-#: daemon/xdmcp.c:996
-msgid "gdm_xdmcp_handle_request: Could not read Authentication Data"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese autentiseringsdata"
+#: daemon/xdmcp.c:989
+#, c-format
+msgid "%s: Could not read Authentication Names"
+msgstr "%s: Kunne ikke lese autentiseringsnavn"
 
-#: daemon/xdmcp.c:1005
-msgid "gdm_xdmcp_handle_request: Could not read Authorization List"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese autorisasjonslisten"
+#: daemon/xdmcp.c:998
+#, c-format
+msgid "%s: Could not read Authentication Data"
+msgstr "%s: Kunne ikke lese autentiseringsdata"
 
-#: daemon/xdmcp.c:1020
-msgid "gdm_xdmcp_handle_request: Could not read Manufacturer ID"
-msgstr "gdm_xdmcp_handle_request: Kunne ikke lese produsent-ID"
+#: daemon/xdmcp.c:1008
+#, c-format
+msgid "%s: Could not read Authorization List"
+msgstr "%s: Kunne ikke lese autorisasjonslisten"
 
-#: daemon/xdmcp.c:1043
+#: daemon/xdmcp.c:1024
 #, c-format
-msgid "gdm_xdmcp_handle_request: Failed checksum from %s"
-msgstr "gdm_xdmcp_handle_request: Feilet sjekksum fra %s"
+msgid "%s: Could not read Manufacturer ID"
+msgstr "%s: Kunne ikke lese produsent-ID"
 
-#: daemon/xdmcp.c:1210
+#: daemon/xdmcp.c:1048
 #, c-format
-msgid "gdm_xdmcp_handle_manage: Got Manage from banned host %s"
-msgstr "gdm_xdmcp_handle_manage: Mottok Manage fra bannlyst vert %s"
+msgid "%s: Failed checksum from %s"
+msgstr "%s: Feilet sjekksum fra %s"
 
-#: daemon/xdmcp.c:1217
-msgid "gdm_xdmcp_handle_manage: Could not read Session ID"
-msgstr "gdm_xdmcp_handle_manage: Kunne ikke lese sesjons-ID"
+#: daemon/xdmcp.c:1218
+#, c-format
+msgid "%s: Got Manage from banned host %s"
+msgstr "%s: Mottok Manage fra bannlyst vert %s"
 
-#: daemon/xdmcp.c:1223
-msgid "gdm_xdmcp_handle_manage: Could not read Display Number"
-msgstr "gdm_xdmcp_handle_manage: Kunne ikke lese skjermnummer"
+#: daemon/xdmcp.c:1226 daemon/xdmcp.c:1472
+#, c-format
+msgid "%s: Could not read Session ID"
+msgstr "%s: Kunne ikke lese sesjons-ID"
 
-#: daemon/xdmcp.c:1232
-msgid "gdm_xdmcp_handle_manage: Could not read Display Class"
-msgstr "gdm_xdmcp_handle_manage: Kunne ikke lese skjermklasse"
+#: daemon/xdmcp.c:1243
+#, c-format
+msgid "%s: Could not read Display Class"
+msgstr "%s: Kunne ikke lese skjermklasse"
 
-#: daemon/xdmcp.c:1307 daemon/xdmcp.c:1313 daemon/xdmcp.c:1363
-#: daemon/xdmcp.c:1369
+#: daemon/xdmcp.c:1319 daemon/xdmcp.c:1325 daemon/xdmcp.c:1375
+#: daemon/xdmcp.c:1381
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%s: Kunne ikke lese adresse"
 
-#: daemon/xdmcp.c:1445
+#: daemon/xdmcp.c:1457
 #, c-format
-msgid "gdm_xdmcp_handle_keepalive: Got KEEPALIVE from banned host %s"
-msgstr "gdm_xdmcp_handle_keepalive: Mottok KEEPALIVE fra bannlyst vert %s"
-
-#: daemon/xdmcp.c:1452
-msgid "gdm_xdmcp_handle_keepalive: Could not read Display Number"
-msgstr "gdm_xdmcp_handle_keepalive: Kunne ikke lese skjermnummer"
+msgid "%s: Got KEEPALIVE from banned host %s"
+msgstr "%s: Mottok KEEPALIVE fra bannlyst vert %s"
 
-#: daemon/xdmcp.c:1458
-msgid "gdm_xdmcp_handle_keepalive: Could not read Session ID"
-msgstr "gdm_xdmcp_handle_keepalive: Kunne ikke lese sesjons-ID"
-
-#: daemon/xdmcp.c:1661
-msgid "gdm_xdmcp_init: No XDMCP support"
-msgstr "gdm_xdmcp_init: Ingen støtte for XDMCP"
-
-#: daemon/xdmcp.c:1668
-msgid "gdm_xdmcp_run: No XDMCP support"
-msgstr "gdm_xdmcp_run: Ingen støtte for XDMCP"
-
-#: daemon/xdmcp.c:1674
-msgid "gdm_xdmcp_close: No XDMCP support"
-msgstr "gdm_xdmcp_close: Ingen støtte for XDMCP"
+#: daemon/xdmcp.c:1693 daemon/xdmcp.c:1700 daemon/xdmcp.c:1706
+#, c-format
+msgid "%s: No XDMCP support"
+msgstr "%s: Ingen støtte for XDMCP"
 
-#: gui/gdmXnestchooser.c:114 gui/gdmXnestchooser.c:121
+#: gui/gdmXnestchooser.c:132 gui/gdmXnestchooser.c:139
 msgid "Xnest command line"
 msgstr "Xnest-kommandolinje"
 
-#: gui/gdmXnestchooser.c:114 gui/gdmXnestchooser.c:121
+#: gui/gdmXnestchooser.c:132 gui/gdmXnestchooser.c:139
 msgid "STRING"
 msgstr "STRENG"
 
-#: gui/gdmXnestchooser.c:115 gui/gdmXnestchooser.c:122
+#: gui/gdmXnestchooser.c:133 gui/gdmXnestchooser.c:140
 msgid "Extra options for Xnest"
 msgstr "Ekstra flagg for Xnest"
 
-#: gui/gdmXnestchooser.c:115 gui/gdmXnestchooser.c:122
+#: gui/gdmXnestchooser.c:133 gui/gdmXnestchooser.c:140
 msgid "OPTIONS"
 msgstr "FLAGG"
 
-#: gui/gdmXnestchooser.c:116 gui/gdmXnestchooser.c:126
+#: gui/gdmXnestchooser.c:134 gui/gdmXnestchooser.c:144
 msgid "Run in background"
 msgstr "Kjør i bakgrunnen"
 
-#: gui/gdmXnestchooser.c:123
+#: gui/gdmXnestchooser.c:141
 msgid "Just run Xnest, no query (no chooser)"
 msgstr "Bare kjør Xnest, ingen spørring (ingen velger)"
 
-#: gui/gdmXnestchooser.c:124
+#: gui/gdmXnestchooser.c:142
 msgid "Do direct query instead of indirect (chooser)"
 msgstr "Utfør direkte spørring istedet for indirekte (velger)"
 
-#: gui/gdmXnestchooser.c:125
+#: gui/gdmXnestchooser.c:143
 msgid "Run broadcast instead of indirect (chooser)"
 msgstr "Kjør kringkasting i stedet for indirekte (velger)"
 
-#: gui/gdmXnestchooser.c:127
+#: gui/gdmXnestchooser.c:145
 msgid "Don't check for running gdm"
 msgstr "Ikke sjekk om gdm kjører"
 
-#: gui/gdmXnestchooser.c:468
-msgid ""
-"Xnest doesn't exist.\n"
-"Please ask your system administrator\n"
-"to install it."
-msgstr ""
-"Xnest eksisterer ikke.\n"
-"Vennligst be systemadministrator\n"
-"om å installere det."
+#: gui/gdmXnestchooser.c:486
+msgid "Xnest doesn't exist."
+msgstr "Xnest eksisterer ikke."
 
-#: gui/gdmXnestchooser.c:493
-msgid ""
-"Indirect XDMCP is not enabled,\n"
-"please ask your system administrator to enable it\n"
-"in the GDM configurator program."
-msgstr ""
-"Indirekte XDMCP er ikke konfigurert.\n"
-"Vennligst spør din systemadministrator om dette kan\n"
-"slås på i GDM konfigurasjonsprogrammet."
+#: gui/gdmXnestchooser.c:488
+msgid "Please ask your system administrator to install it."
+msgstr "Vennligst be systemadministrator om å installere den."
+
+#: gui/gdmXnestchooser.c:513
+msgid "Indirect XDMCP is not enabled"
+msgstr "Indirekte XDMCP er ikke aktivert"
 
-#: gui/gdmXnestchooser.c:522
+#: gui/gdmXnestchooser.c:515 gui/gdmXnestchooser.c:535
 msgid ""
-"GDM is not running.\n"
-"Please ask your system administrator to start it."
-msgstr ""
-"GDM kjører ikke.\n"
-"Vennligst spør din systemadministrator om å starte det."
+"Please ask your system administrator to enable it in the GDM configurator "
+"program."
+msgstr "Vennligst spør din systemadministrator om dette kan slås på i GDM konfigurasjonsprogrammet."
+
+#: gui/gdmXnestchooser.c:533
+msgid "XDMCP is not enabled"
+msgstr "XDMCP er ikke aktivert"
+
+#: gui/gdmXnestchooser.c:563
+msgid "GDM is not running"
+msgstr "GDM kjører ikke"
 
-#: gui/gdmXnestchooser.c:539
+#: gui/gdmXnestchooser.c:565
+msgid "Please ask your system administrator to start it."
+msgstr "Vennligst spør din systemadministrator om å starte den."
+
+#: gui/gdmXnestchooser.c:581
 msgid "Could not find a free display number"
 msgstr "Kunne ikke finne en ledig skjerm"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Soubor s přeložitelnými řetězci generovaný programem Glade.
+#. * Přidejte tento soubor do POTFILES.in svého projektu.
+#. * NEPŘEKLÁDEJTE JEJ jako součást své aplikace.
 #.
-#: gui/gdmchooser-strings.c:7 gui/gdmchooser.glade.h:3
+#: gui/gdmchooser-strings.c:7 gui/gdmchooser.glade.h:6
 msgid "GDM Host Chooser"
 msgstr "GDM vertsvelger"
 
-#: gui/gdmchooser-strings.c:8 gui/gdmchooser.glade.h:4
+#: gui/gdmchooser-strings.c:8 gui/gdmchooser.glade.h:7
 msgid "How to use this application"
 msgstr "Hvordan bruke denne applikasjonen"
 
-#: gui/gdmchooser-strings.c:9 gui/gdmchooser.glade.h:6
+#: gui/gdmchooser-strings.c:9 gui/gdmchooser.glade.h:9
 msgid "Open a session to the selected host"
 msgstr "Åpne en sesjon til valgt vert"
 
-#. EOF
-#: gui/gdmchooser-strings.c:10 gui/gdmchooser.glade.h:1
+#: gui/gdmchooser-strings.c:10 gui/gdmchooser.glade.h:4
 msgid "C_onnect"
 msgstr "K_oble til"
 
-#: gui/gdmchooser-strings.c:11 gui/gdmchooser.glade.h:7
+#: gui/gdmchooser-strings.c:11 gui/gdmchooser.glade.h:10
 msgid "Probe the network"
 msgstr "Søk på nettverket"
 
-#: gui/gdmchooser-strings.c:12 gui/gdmchooser.glade.h:2
+#: gui/gdmchooser-strings.c:12 gui/gdmchooser.glade.h:5
 msgid "Exit the application"
 msgstr "Avslutt applikasjonen"
 
-#: gui/gdmchooser-strings.c:13 gui/gdmchooser.glade.h:8
+#: gui/gdmchooser-strings.c:13 gui/gdmchooser.glade.h:12
 msgid "Status"
 msgstr "Status"
 
-#: gui/gdmchooser-strings.c:14 gui/gdmchooser.glade.h:9
+#: gui/gdmchooser-strings.c:14 gui/gdmchooser.glade.h:3
+msgid "Add host: "
+msgstr ""
+
+#. EOF
+#: gui/gdmchooser-strings.c:15 gui/gdmchooser.glade.h:1
+#: gui/gdmsetup-strings.c:19 gui/gdmsetup-strings.c:21
+#: gui/gdmsetup-strings.c:26 gui/gdmsetup-strings.c:32
+#: gui/gdmsetup-strings.c:37 gui/gdmsetup-strings.c:47 gui/gdmsetup.glade.h:2
+msgid "*"
+msgstr "*"
+
+#: gui/gdmchooser-strings.c:16 gui/gdmchooser.glade.h:11
+msgid "Query and add this host to the above list"
+msgstr ""
+
+#: gui/gdmchooser-strings.c:17 gui/gdmchooser.glade.h:2
+msgid "Add"
+msgstr ""
+
+#: gui/gdmchooser-strings.c:18 gui/gdmchooser.glade.h:13
 msgid ""
 "The main area of this application shows the hosts on the local network that "
 "have \"XDMCP\" enabled. This allows users to login remotely to other "
@@ -1692,24 +1851,56 @@ msgstr ""
 "Når du har valgt en vert klikk «Koble til» for å åpne en sesjon.\n"
 "til den maskinen."
 
-#: gui/gdmchooser-strings.c:17 gui/gdmchooser.glade.h:5
+#: gui/gdmchooser-strings.c:21 gui/gdmchooser.glade.h:8
 msgid "Information"
 msgstr "Informasjon"
 
-#: gui/gdmchooser.c:75
+#: gui/gdmchooser.c:70
 msgid "Please wait: scanning local network for XDMCP-enabled hosts..."
 msgstr ""
 "Vennligst vent: skanner lokalt nettverk for verter som støtter XDMCP..."
 
-#: gui/gdmchooser.c:76
+#: gui/gdmchooser.c:71
 msgid "No serving hosts were found."
 msgstr "Ingen verter funnet."
 
-#: gui/gdmchooser.c:77
+#: gui/gdmchooser.c:72
 msgid "Choose a host to connect to from the selection below."
 msgstr "Velg en vert du vil koble til fra utvalget under."
 
-#: gui/gdmchooser.c:871
+#: gui/gdmchooser.c:443
+msgid "Cannot connect to remote server"
+msgstr ""
+
+#: gui/gdmchooser.c:444
+#, c-format
+msgid ""
+"The host \"%s\" is not willing to support a login session right now.  Please "
+"try again later."
+msgstr ""
+
+#: gui/gdmchooser.c:810
+msgid "Did not receive response from server"
+msgstr ""
+
+#: gui/gdmchooser.c:811
+#, c-format
+msgid ""
+"Did not receive any response from host \"%s\" in %d seconds.  Perhaps the "
+"host is not turned on, or is not willing to support a login session right "
+"now.  Please try again later."
+msgstr ""
+
+#: gui/gdmchooser.c:863
+msgid "Cannot find host"
+msgstr ""
+
+#: gui/gdmchooser.c:864
+#, c-format
+msgid "I cannot find the host \"%s\", perhaps you have mistyped it."
+msgstr ""
+
+#: gui/gdmchooser.c:1089
 msgid ""
 "The main area of this application shows the hosts on the local network that "
 "have \"XDMCP\" enabled. This allows users to login remotely to other "
@@ -1726,107 +1917,114 @@ msgstr ""
 "Når du har valgt en vert klikk «Koble til» for å åpne en sesjon.\n"
 "til den maskinen."
 
-#: gui/gdmchooser.c:899
+#: gui/gdmchooser.c:1122
 #, c-format
 msgid "Can't open default host icon: %s"
 msgstr "Kunne ikke åpne forvalgt ikon for vert: %s"
 
-#: gui/gdmchooser.c:955
+#: gui/gdmchooser.c:1205
 msgid "gdm_signals_init: Error setting up HUP signal handler"
 msgstr "gdm_signals_init: Feil under oppsett av HUP signalhåndtereren"
 
-#: gui/gdmchooser.c:958
+#: gui/gdmchooser.c:1208
 msgid "gdm_signals_init: Error setting up INT signal handler"
 msgstr "gdm_signals_init: Feil under oppsett av INT signalhåndtereren"
 
-#: gui/gdmchooser.c:961
+#: gui/gdmchooser.c:1211
 msgid "gdm_signals_init: Error setting up TERM signal handler"
 msgstr "gdm_signals_init: Feil under oppsett av TERM signalhåndtereren"
 
-#: gui/gdmchooser.c:969 gui/gdmlogin.c:4227 gui/greeter/greeter.c:1075
+#: gui/gdmchooser.c:1219 gui/gdmlogin.c:4285 gui/greeter/greeter.c:1190
 msgid "Could not set signal mask!"
 msgstr "Kunne ikke sette signalmaske!"
 
-#: gui/gdmchooser.c:975
+#: gui/gdmchooser.c:1225
 msgid "Socket for xdm communication"
 msgstr "Socket for xdm-kommunikasjon"
 
-#: gui/gdmchooser.c:975
+#: gui/gdmchooser.c:1225
 msgid "SOCKET"
 msgstr "SOCKET"
 
-#: gui/gdmchooser.c:978
+#: gui/gdmchooser.c:1228
 msgid "Client address to return in response to xdm"
 msgstr "Klientadresse som skal returneres i svar til xdm"
 
-#: gui/gdmchooser.c:978
+#: gui/gdmchooser.c:1228
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
-#: gui/gdmchooser.c:981
+#: gui/gdmchooser.c:1231
 msgid "Connection type to return in response to xdm"
 msgstr "Tilkoblingstype som skal returneres i svar til xdm"
 
-#: gui/gdmchooser.c:981
+#: gui/gdmchooser.c:1231
 msgid "TYPE"
 msgstr "TYPE"
 
-#: gui/gdmchooser.c:1101
-#, c-format
+#: gui/gdmchooser.c:1352
+msgid "Cannot run chooser"
+msgstr ""
+
+#: gui/gdmchooser.c:1353
+#, fuzzy, c-format
 msgid ""
-"The chooser version (%s) does not match the daemon version (%s).\n"
-"You have probably just upgraded gdm.\n"
-"Please restart the gdm daemon or reboot the computer."
+"The chooser version (%s) does not match the daemon version (%s).  You have "
+"probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
+"computer."
 msgstr ""
 "Velger versjon (%s) er ikke lik daemon versjon (%s).\n"
 "Du har sannsynligvis nettopp oppgradert gdm.\n"
 "Vennligst start gdm daemonen på nytt eller start maskinen på nytt."
 
+#: gui/gdmcomm.c:392 gui/gdmphotosetup.c:65
+msgid "GDM (The GNOME Display Manager) is not running."
+msgstr "GDM (GNOME Display Manager) kjører ikke."
+
 #: gui/gdmcomm.c:395 gui/gdmphotosetup.c:68
 msgid ""
-"<b>GDM (The GNOME Display Manager) is not running.</b>\n"
-"\n"
 "You might in fact be using a different display manager, such as KDM (KDE "
-"Display Manager or xdm).\n"
-"If you still wish to use this feature, either start GDM your self or ask "
-"your system administrator to start GDM."
+"Display Manager or xdm)."
 msgstr ""
-"<b>GDM (GNOME Display Manager) kjører ikke.</b>\n"
-"\n"
-"Kanskje du kjører en annen skjermhåndterer slik som KDM (KDE Display "
-"Manager) eller XDM.\n"
-"Hvis du likevel ønsker å bruke denne funksjonen må du starte GDM eller be "
-"din systemadministrator om å gjøre dette."
 
-#: gui/gdmcomm.c:417
+#: gui/gdmcomm.c:398 gui/gdmphotosetup.c:71
+#, fuzzy
 msgid ""
-"Cannot communicate with GDM (The GNOME Display Manager), perhaps you have an "
-"old version running."
+"If you still wish to use this feature, either start GDM yourself or ask your "
+"system administrator to start GDM."
 msgstr ""
-"Kan ikke kommunisere med GDM (GNOME Display Manager), kanskje en gammel "
-"versjon kjører."
+"GDM kjører ikke.\n"
+"Vennligst spør din systemadministrator om å starte det."
+
+#: gui/gdmcomm.c:416 gui/gdmflexiserver.c:253
+msgid "Cannot communicate with GDM (The GNOME Display Manager)"
+msgstr "Kan ikke kommunisere med GDM (GNOME Display Manager)."
+
+#: gui/gdmcomm.c:419 gui/gdmflexiserver.c:256
+msgid "Perhaps you have an old version of GDM running."
+msgstr "Kanskje en gammel versjon av GDM kjører."
 
-#: gui/gdmcomm.c:435 gui/gdmcomm.c:438 gui/gdmflexiserver.c:252
+#: gui/gdmcomm.c:436 gui/gdmcomm.c:439
 msgid "Cannot communicate with gdm, perhaps you have an old version running."
 msgstr "Kan ikke kommunisere med gdm, kanskje en gammel versjon kjørrer."
 
-#: gui/gdmcomm.c:441
+#: gui/gdmcomm.c:442
 msgid "The allowed limit of flexible X servers reached."
 msgstr "Tillatt grense for fleksible X-tjenere er nådd."
 
-#: gui/gdmcomm.c:443
+#: gui/gdmcomm.c:444
 msgid "There were errors trying to start the X server."
 msgstr "Det oppsto feil under forsøk på å starte X-tjeneren."
 
-#: gui/gdmcomm.c:445
+#: gui/gdmcomm.c:446
 msgid "The X server failed.  Perhaps it is not configured well."
 msgstr "X-tjeneren feilet. Kanskje den ikke er konfigurert korrekt."
 
-#: gui/gdmcomm.c:448
+#: gui/gdmcomm.c:449
 msgid "Too many X sessions running."
 msgstr "For mange X-sesjoner kjører."
 
-#: gui/gdmcomm.c:450
+#: gui/gdmcomm.c:451
 msgid ""
 "The nested X server (Xnest) cannot connect to your current X server.  You "
 "may be missing an X authorization file."
@@ -1834,7 +2032,7 @@ msgstr ""
 "Xnest kan ikke koble til din aktive X-tjener. Du mangler kanskje en X-"
 "autorisasjonsfil."
 
-#: gui/gdmcomm.c:455
+#: gui/gdmcomm.c:456
 msgid ""
 "The nested X server (Xnest) is not available, or gdm is badly configured.\n"
 "Please install the Xnest package in order to use the nested login."
@@ -1842,16 +2040,16 @@ msgstr ""
 "Xnest er ikke tilgjengelig, eller gdm er feilkonfigurert.\n"
 "Vennligst installer Xnest pakken for å bruke denne typen innlogging."
 
-#: gui/gdmcomm.c:460
+#: gui/gdmcomm.c:461
 msgid ""
 "The X server is not available, it is likely that gdm is badly configured."
 msgstr "X-tjeneren er ikke tilgjengelig. GDM er sannsynligvis feilkonfigurert."
 
-#: gui/gdmcomm.c:464
+#: gui/gdmcomm.c:465
 msgid "Trying to update an unsupported configuration key."
 msgstr "Prøver å oppdatere en konfigurasjonsnøkkel som ikke er støttet."
 
-#: gui/gdmcomm.c:466
+#: gui/gdmcomm.c:467
 msgid ""
 "You do not seem to have authentication needed be for this operation.  "
 "Perhaps your .Xauthority file is not set up correctly."
@@ -1859,7 +2057,7 @@ msgstr ""
 "Du ser ikke ut til å ha nødvendig autentisering for denne operasjonen. "
 "Kanskje din .Xauthority-fil ikke er satt opp korrekt."
 
-#: gui/gdmcomm.c:470
+#: gui/gdmcomm.c:471
 msgid "Unknown error occured."
 msgstr "Ukjent feil oppsto."
 
@@ -1868,103 +2066,107 @@ msgid "Log in as another user inside a nested window"
 msgstr "Logg inn som en annen bruker i et nytt vindu"
 
 #: gui/gdmflexiserver-xnest.desktop.in.h:2
-msgid "New login in a nested window"
-msgstr "Ny innlogging i et \"nested\" vindu"
+msgid "New Login in a Nested Window"
+msgstr "Ny innlogging i et vindu"
 
 #: gui/gdmflexiserver.c:129
 msgid "Choose server"
 msgstr "Velg tjener"
 
-#: gui/gdmflexiserver.c:139
+#: gui/gdmflexiserver.c:140
 msgid "Choose the X server to start"
 msgstr "Velg X-tjener som skal kjøres"
 
-#: gui/gdmflexiserver.c:145
+#: gui/gdmflexiserver.c:146
 msgid "Standard server"
 msgstr "Forvalgt tjener"
 
-#: gui/gdmflexiserver.c:193
+#: gui/gdmflexiserver.c:194
 msgid "Send the specified protocol command to gdm"
 msgstr "Send spesifisert protokollkommando til gdm"
 
-#: gui/gdmflexiserver.c:193
+#: gui/gdmflexiserver.c:194
 msgid "COMMAND"
 msgstr "KOMMANDO"
 
-#: gui/gdmflexiserver.c:194
+#: gui/gdmflexiserver.c:195
 msgid "Xnest mode"
 msgstr "Xnest-modus"
 
-#: gui/gdmflexiserver.c:195
+#: gui/gdmflexiserver.c:196
 msgid "Do not lock current screen"
 msgstr "Ikke lås aktiv skjerm"
 
-#: gui/gdmflexiserver.c:196
+#: gui/gdmflexiserver.c:197
 msgid "Debugging output"
 msgstr "Feilsøkingsinformasjon"
 
-#: gui/gdmflexiserver.c:197
+#: gui/gdmflexiserver.c:198
 msgid "Authenticate before running --command"
 msgstr "Autentiser før kjøring av --command"
 
-#: gui/gdmflexiserver.c:269
-msgid ""
-"You do not seem to have the authentication needed for this operation.  "
-"Perhaps your .Xauthority file is not set up correctly."
-msgstr ""
-"Du ser ikke ut til å ha nødvendig autentisering for denne operasjonen. "
-"Kanskje din .Xauthority-fil ikke er satt opp korrekt."
+#: gui/gdmflexiserver.c:273
+msgid "You do not seem to have the authentication needed for this operation"
+msgstr "Du ser ikke ut til å ha nødvendig autentisering for denne operasjonen."
 
-#: gui/gdmflexiserver.c:295
-msgid ""
-"You do not seem to be logged in on the console.  Starting a new login only "
-"works correctly on the console."
-msgstr ""
-"Du ser ikke ut til å være logget inn på konsollet. Start av en ny innlogging "
-"virker bare riktig på konsollet."
+#: gui/gdmflexiserver.c:277
+msgid "Perhaps your .Xauthority file is not set up correctly."
+msgstr "Kanskje din .Xauthority-fil ikke er satt opp korrekt."
+
+#: gui/gdmflexiserver.c:302
+msgid "You do not seem to be logged in on the console"
+msgstr "Du ser ikke ut til å være logget inn på konsollet."
+
+#: gui/gdmflexiserver.c:305
+msgid "Starting a new login only works correctly on the console."
+msgstr "Start av en ny innlogging fungerer kun fra konsollet."
 
-#: gui/gdmflexiserver.c:323
+#: gui/gdmflexiserver.c:334
 msgid "Can't lock screen"
 msgstr "Kan ikke låse skjermen"
 
-#: gui/gdmflexiserver.c:326
+#: gui/gdmflexiserver.c:337
 msgid "Can't disable xscreensaver display hacks"
 msgstr "Kan ikke slå av xscreensaver skjerm-hack"
 
+#: gui/gdmflexiserver.c:351
+msgid "Cannot start new display"
+msgstr "Kan ikke starte ny skjerm"
+
 #: gui/gdmflexiserver.desktop.in.h:1
 msgid "Log in as another user without logging out"
 msgstr "Logg inn som en annen bruker uten å logge ut"
 
 #: gui/gdmflexiserver.desktop.in.h:2
-msgid "New login"
+msgid "New Login"
 msgstr "Ny innlogging"
 
 #. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:53
-msgid "A-M|Azerbaijani"
-msgstr "A-M|Asserbadsjansk"
-
-#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:55
 msgid "A-M|Albanian"
 msgstr "A-M|Albansk"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:57
+#: gui/gdmlanguages.c:55
 msgid "A-M|Amharic"
 msgstr "A-M|Amharisk"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:59
+#: gui/gdmlanguages.c:57
 msgid "A-M|Arabic (Egypt)"
 msgstr "A-M|Arabisk (Egypt)"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:61
+#: gui/gdmlanguages.c:59
 msgid "A-M|Arabic (Lebanon)"
 msgstr "A-M|Arabisk (Libanon)"
 
 #. Note translate the A-M to the A-M you used in the group label
+#: gui/gdmlanguages.c:61
+msgid "A-M|Azerbaijani"
+msgstr "A-M|Asserbadsjansk"
+
+#. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:63
 msgid "A-M|Basque"
 msgstr "A-M|Baskisk"
@@ -2036,30 +2238,30 @@ msgstr "A-M|Engelsk"
 
 #. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:91
-msgid "A-M|Estonian"
-msgstr "A-M|Estisk"
-
-#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:93
 msgid "A-M|English (American)"
 msgstr "A-M|Engelsk (Amerikansk)"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:95
+#: gui/gdmlanguages.c:93
 msgid "A-M|English (Australian)"
 msgstr "A-M|Engelsk (Australsk)"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:97
+#: gui/gdmlanguages.c:95
 msgid "A-M|English (British)"
 msgstr "A-M|Engelsk (Britisk)"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:99
+#: gui/gdmlanguages.c:97
 msgid "A-M|English (Ireland)"
 msgstr "A-M|Engelsk (Irland)"
 
 #. Note translate the A-M to the A-M you used in the group label
+#: gui/gdmlanguages.c:99
+msgid "A-M|Estonian"
+msgstr "A-M|Estisk"
+
+#. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:101
 msgid "A-M|Finnish"
 msgstr "A-M|Finsk"
@@ -2166,256 +2368,248 @@ msgstr "A-M|Malayisk"
 
 #. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:145
+msgid "A-M|Malayalam"
+msgstr "A-M|Malayalam"
+
+#. Note translate the A-M to the A-M you used in the group label
+#: gui/gdmlanguages.c:147
+msgid "A-M|Marathi"
+msgstr "A-M|Marathi"
+
+#. Note translate the A-M to the A-M you used in the group label
+#: gui/gdmlanguages.c:149
 msgid "A-M|Mongolian"
 msgstr "A-M|Mongolsk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:147
+#: gui/gdmlanguages.c:151
 msgid "N-Z|Norwegian (bokmal)"
 msgstr "N-Z|Norsk (bokmål)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:149
+#: gui/gdmlanguages.c:153
 msgid "N-Z|Norwegian (nynorsk)"
 msgstr "N-Z|Norsk (nynorsk)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:151
+#: gui/gdmlanguages.c:155
+msgid "N-Z|Oriya"
+msgstr "N-Z|Oriya"
+
+#. Note translate the N-Z to the N-Z you used in the group label
+#: gui/gdmlanguages.c:157
+msgid "N-Z|Panjabi"
+msgstr "N-Z|Panjabi"
+
+#. Note translate the N-Z to the N-Z you used in the group label
+#: gui/gdmlanguages.c:159
 msgid "N-Z|Persian"
 msgstr "N-Z|Persisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:153
+#: gui/gdmlanguages.c:161
 msgid "N-Z|Polish"
 msgstr "N-Z|Polsk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:155
+#: gui/gdmlanguages.c:163
 msgid "N-Z|Portuguese"
 msgstr "N-Z|Portugisisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:157
+#: gui/gdmlanguages.c:165
 msgid "N-Z|Portuguese (Brazilian)"
 msgstr "N-Z|Portugisisk (Brasiliensk)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:159
-msgid "N-Z|Panjabi"
-msgstr "N-Z|Panjabi"
-
-#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:161
+#: gui/gdmlanguages.c:167
 msgid "N-Z|Romanian"
 msgstr "N-Z|Rumensk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:163
+#: gui/gdmlanguages.c:169
 msgid "N-Z|Russian"
 msgstr "N-Z|Russisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:165
+#: gui/gdmlanguages.c:171
 msgid "N-Z|Serbian"
 msgstr "N-Z|Serbisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:167
+#: gui/gdmlanguages.c:173
 msgid "N-Z|Slovak"
 msgstr "N-Z|Slovakisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:169
+#: gui/gdmlanguages.c:175
 msgid "N-Z|Slovenian"
 msgstr "N-Z|Slovensk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:171
+#: gui/gdmlanguages.c:177
 msgid "N-Z|Spanish"
 msgstr "N-Z|Spansk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:173
+#: gui/gdmlanguages.c:179
 msgid "N-Z|Spanish (Mexico)"
 msgstr "N-Z|Spansk (Mexico)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:175
+#: gui/gdmlanguages.c:181
 msgid "N-Z|Swedish"
 msgstr "N-Z|Svensk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:177
+#: gui/gdmlanguages.c:183
 msgid "N-Z|Swedish (Finland)"
 msgstr "N-Z|Svensk (Finland)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:179
+#: gui/gdmlanguages.c:185
 msgid "N-Z|Tamil"
 msgstr "N-Z|Tamil"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:181
+#: gui/gdmlanguages.c:187
 msgid "N-Z|Telugu"
 msgstr "N-Z|Telugu"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:183
+#: gui/gdmlanguages.c:189
 msgid "N-Z|Thai"
 msgstr "N-Z|Thai"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:185
+#: gui/gdmlanguages.c:191
 msgid "N-Z|Turkish"
 msgstr "N-Z|Tyrkisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:187
+#: gui/gdmlanguages.c:193
 msgid "N-Z|Ukrainian"
 msgstr "N-Z|Ukrainsk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:189
+#: gui/gdmlanguages.c:195
 msgid "N-Z|Vietnamese"
 msgstr "N-Z|Vietnamesisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:191
+#: gui/gdmlanguages.c:197
 msgid "N-Z|Walloon"
 msgstr "N-Z|Walloon"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:193
+#: gui/gdmlanguages.c:199
 msgid "N-Z|Welsh"
 msgstr "N-Z|Walisisk"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:195
+#: gui/gdmlanguages.c:201
 msgid "N-Z|Yiddish"
 msgstr "N-Z|Yiddish"
 
 #. This is the POSIX/C locale for english, should really be in Other
-#: gui/gdmlanguages.c:197
+#: gui/gdmlanguages.c:203
 msgid "Other|POSIX/C English"
 msgstr "Annet|POSIX/C engelsk"
 
 #. This should be the same as in the front of the language strings
 #. * else the languages will appear in the "Other" submenu
-#: gui/gdmlanguages.c:372
+#: gui/gdmlanguages.c:378
 msgid "A-M"
 msgstr "A-M"
 
 #. This should be the same as in the front of the language strings
 #. * else the languages will appear in the "Other" submenu
-#: gui/gdmlanguages.c:380
+#: gui/gdmlanguages.c:386
 msgid "N-Z"
 msgstr "N-Z"
 
-#: gui/gdmlogin.c:69
-msgid "AnotherLevel"
-msgstr "AnotherLevel"
-
-#. default is nicely translated
-#. Translators: default GNOME session
-#: gui/gdmlogin.c:70 gui/gdmlogin.c:1884 gui/gdmlogin.c:1906
-msgid "Default"
-msgstr "Standard"
-
-#: gui/gdmlogin.c:71
-msgid "Failsafe"
-msgstr "Feilsikker"
-
-#: gui/gdmlogin.c:72
-msgid "Gnome"
-msgstr "GNOME"
-
-#: gui/gdmlogin.c:73
-msgid "KDE"
-msgstr "KDE"
-
-#: gui/gdmlogin.c:74
-msgid "XSession"
-msgstr "XSession"
-
-#: gui/gdmlogin.c:75 gui/gdmlogin.c:1477 gui/greeter/greeter_session.c:353
-msgid "Gnome Chooser"
-msgstr "GNOME velger"
-
-#: gui/gdmlogin.c:76 gui/gdmlogin.c:1646
-#: gui/greeter/greeter_action_language.c:45
-msgid "Last"
-msgstr "Forrige"
-
-#: gui/gdmlogin.c:218 gui/greeter/greeter_parser.c:948
-#: gui/greeter/themes/circles/circles.xml.in.h:4
-#: gui/greeter/themes/happygnome/happygnome.xml.in.h:4
+#: gui/gdmlogin.c:219 gui/greeter/greeter_parser.c:972
+#: gui/greeter/themes/circles/circles.xml.in.h:3
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:3
+#: gui/greeter/themes/happygnome/happygnome.xml.in.h:3
 #, no-c-format
 msgid "User %s will login in %d seconds"
 msgstr "Bruker %s vil logge på om %d sekunder"
 
-#: gui/gdmlogin.c:518
+#: gui/gdmlogin.c:519
 msgid ""
 "Doubleclick here to un-iconify the login window, so that you may log in."
 msgstr ""
 "Dobbelklikk her for å av-ikonifisere innloggingsvinduet, slik at du kan "
 "logge inn."
 
-#: gui/gdmlogin.c:588 gui/gdmlogin.c:600
+#: gui/gdmlogin.c:591
+msgid "gdm_parse_enriched_string: String too long!"
+msgstr "gdm_parse_enriched_string: Strengen er for lang!"
+
+#: gui/gdmlogin.c:593
 #, c-format
 msgid "%sWelcome to %s%s"
 msgstr "%sVelkommen til %s%s"
 
-#: gui/gdmlogin.c:598
-msgid "gdm_parse_enriched_string: String too long!"
-msgstr "gdm_parse_enriched_string: Strengen er for lang!"
+#: gui/gdmlogin.c:747
+msgid "Could not fork a new process!"
+msgstr "Kunne ikke kjøre en ny prosess!"
 
-#: gui/gdmlogin.c:755
-msgid ""
-"Could not fork a new process!\n"
-"\n"
-"You likely won't be able to log in either."
-msgstr ""
-"Kunne ikke kjøre fork for en ny prosess!\n"
-"\n"
-"Du vil sannsynligvis ikke kunne logge inn heller."
+#: gui/gdmlogin.c:749
+msgid "You likely won't be able to log in either."
+msgstr "Du vil sannsynligvis ikke kunne logge inn heller."
 
-#: gui/gdmlogin.c:803 gui/greeter/greeter_system.c:52
+#: gui/gdmlogin.c:793 gui/greeter/greeter_system.c:55
 msgid "Are you sure you want to reboot the machine?"
 msgstr "Er du sikker på at du vil starte maskinen på nytt?"
 
-#: gui/gdmlogin.c:815 gui/greeter/greeter_system.c:63
+#: gui/gdmlogin.c:794 gui/greeter/greeter_system.c:56
+msgid "_Reboot"
+msgstr "Omsta_rt"
+
+#: gui/gdmlogin.c:806 gui/greeter/greeter_system.c:67
 msgid "Are you sure you want to shut down the machine?"
 msgstr "Er du sikker på at du vil slå av maskinen?"
 
-#: gui/gdmlogin.c:826 gui/greeter/greeter_system.c:73
+#: gui/gdmlogin.c:807 gui/greeter/greeter_system.c:68
+msgid "Shut _Down"
+msgstr "Steng ne_d"
+
+#: gui/gdmlogin.c:827 gui/greeter/greeter_system.c:78
 msgid "Are you sure you want to suspend the machine?"
 msgstr "Er du sikker på at du vil sette maskinen i hvilemodus?"
 
-#: gui/gdmlogin.c:841
-#, c-format
-msgid "gdm_login_parse_config: No configuration file: %s. Using defaults."
-msgstr "gdm_login_parse_config: Ingen konfigurasjonsfil: %s. Bruker forvalg."
+#: gui/gdmlogin.c:828 gui/greeter/greeter_system.c:79
+msgid "_Suspend"
+msgstr "_Hvilemodus"
+
+#: gui/gdmlogin.c:883 gui/gdmlogin.c:4061 gui/greeter/greeter.c:148
+#: gui/greeter/greeter.c:982
+msgid "Welcome"
+msgstr "Velkommen"
 
-#: gui/gdmlogin.c:873 gui/gdmlogin.c:4009
+#: gui/gdmlogin.c:886 gui/gdmlogin.c:4064 gui/greeter/greeter.c:151
+#: gui/greeter/greeter.c:985
 #, c-format
 msgid "Welcome to %n"
 msgstr "Velkommen til %n"
 
-#: gui/gdmlogin.c:918 gui/greeter/greeter.c:128
-msgid "TimedLoginDelay was less then 5.  I'll just use 5."
+#: gui/gdmlogin.c:934 gui/greeter/greeter.c:176
+msgid "TimedLoginDelay was less than 5.  I'll just use 5."
 msgstr "TimedLoginDelay var mindre enn 5. Bruker 5."
 
-#: gui/gdmlogin.c:978 gui/gdmlogin.c:1525 gui/greeter/greeter_session.c:65
-#: gui/greeter/greeter_session.c:400
+#: gui/gdmlogin.c:997 gui/gdmlogin.c:1530 gui/greeter/greeter_session.c:70
+#: gui/greeter/greeter_session.c:402
 msgid "Failsafe Gnome"
 msgstr "Feilsikker GNOME"
 
-#: gui/gdmlogin.c:980 gui/gdmlogin.c:1550 gui/greeter/greeter_session.c:67
+#: gui/gdmlogin.c:999 gui/gdmlogin.c:1555 gui/greeter/greeter_session.c:72
 #: gui/greeter/greeter_session.c:426
 msgid "Failsafe xterm"
 msgstr "Feilsikker xterm"
 
-#: gui/gdmlogin.c:1026 gui/greeter/greeter_session.c:111
+#: gui/gdmlogin.c:1045 gui/greeter/greeter_session.c:116
 #, c-format
 msgid ""
 "Your preferred session type %s is not installed on this machine.\n"
@@ -2424,12 +2618,22 @@ msgstr ""
 "Din foretrukne sesjonstype %s er ikke installert på denne maskinen.\n"
 "Ønsker du å gjøre %s forvalgt for fremtidige sesjoner?"
 
+#: gui/gdmlogin.c:1051 gui/gdmlogin.c:1079 gui/gdmlogin.c:1154
+#: gui/greeter/greeter_action_language.c:154 gui/greeter/greeter_session.c:122
+#: gui/greeter/greeter_session.c:153
+msgid "Make _Default"
+msgstr "Bruk som _forvalg"
+
+#: gui/gdmlogin.c:1051 gui/greeter/greeter_session.c:122
+msgid "Just _Log In"
+msgstr "Bare _logg inn"
+
 #. never_encoding
 #. no_group
 #. untranslated
 #. markup
-#: gui/gdmlogin.c:1051 gui/gdmlogin.c:1132
-#: gui/greeter/greeter_action_language.c:154 gui/greeter/greeter_session.c:139
+#: gui/gdmlogin.c:1071 gui/gdmlogin.c:1148
+#: gui/greeter/greeter_action_language.c:148 gui/greeter/greeter_session.c:145
 #, c-format
 msgid ""
 "You have chosen %s for this session, but your default setting is %s.\n"
@@ -2438,12 +2642,17 @@ msgstr ""
 "Du har valgt %s for denne sesjonen, men forvalgt innstilling er %s.\n"
 "Ønsker du å gjøre %s til forvalg for fremtidige sesjoner?"
 
+#: gui/gdmlogin.c:1079 gui/gdmlogin.c:1154
+#: gui/greeter/greeter_action_language.c:154 gui/greeter/greeter_session.c:153
+msgid "Just For _This Session"
+msgstr ""
+
 #. if !GdmShowLastSession then our saved session is
 #. * irrelevant, we are in "switchdesk mode"
 #. * and the relevant thing is the saved session
 #. * in .Xclients
 #.
-#: gui/gdmlogin.c:1067 gui/greeter/greeter_session.c:157
+#: gui/gdmlogin.c:1087 gui/greeter/greeter_session.c:163
 #, c-format
 msgid ""
 "You have chosen %s for this session.\n"
@@ -2456,25 +2665,25 @@ msgstr ""
 "kjør programmet 'switchdesk'\n"
 "(System->Bytt skrivebord fra panel-menyen)."
 
-#: gui/gdmlogin.c:1327
+#: gui/gdmlogin.c:1337
 #, c-format
 msgid "%s session selected"
 msgstr "%s sesjon valgt"
 
-#: gui/gdmlogin.c:1362 gui/greeter/greeter_session.c:231
+#: gui/gdmlogin.c:1370 gui/greeter/greeter_session.c:282
 msgid "Log in using the session that you have used last time you logged in"
 msgstr "Logg inn med sesjonen du brukte ved forrige innlogging"
 
-#: gui/gdmlogin.c:1375 gui/greeter/greeter_session.c:244
-msgid "gdm_login_session_init: Session script directory not found!"
-msgstr "gdm_login_session_init: Sesjonens skriptkatalog ikke funnet!"
+#: gui/gdmlogin.c:1383 gui/greeter/greeter_session.c:293
+#, c-format
+msgid "gdm_login_session_init: Session directory %s not found!"
+msgstr "gdm_login_session_init: Sesjonens katalog %s ble ikke funnet!"
 
-#: gui/gdmlogin.c:1465 gui/greeter/greeter_session.c:339
-msgid ""
-"This session will log you directly into GNOME, into your current session."
-msgstr "Denne sesjonen vil logge deg direkte inn til GNOME, med aktiv sesjon."
+#: gui/gdmlogin.c:1483
+msgid "Gnome Chooser"
+msgstr "GNOME velger"
 
-#: gui/gdmlogin.c:1480 gui/greeter/greeter_session.c:356
+#: gui/gdmlogin.c:1486
 msgid ""
 "This session will log you into GNOME and it will let you choose which one of "
 "the GNOME sessions you want to use."
@@ -2482,11 +2691,11 @@ msgstr ""
 "Denne sesjonen vil logge deg inn til GNOME og du vil kunne velge hvilken av "
 "GNOME-sesjonene du ønsker å bruke."
 
-#: gui/gdmlogin.c:1515 gui/greeter/greeter_session.c:389
+#: gui/gdmlogin.c:1519 gui/greeter/greeter_session.c:390
 msgid "Yaikes, nothing found in the session directory."
 msgstr "Hjelp, ingenting funnet i sesjonskatalogen."
 
-#: gui/gdmlogin.c:1527 gui/greeter/greeter_session.c:402
+#: gui/gdmlogin.c:1532 gui/greeter/greeter_session.c:404
 msgid ""
 "This is a failsafe session that will log you into GNOME.  No startup scripts "
 "will be read and it is only to be used when you can't log in otherwise.  "
@@ -2496,7 +2705,7 @@ msgstr ""
 "oppstartsskript vil kjøres og den bør kun brukes hvis du ikke kan logge inn "
 "på annen måte. GNOME vil bruke 'Forvalgt' sesjon."
 
-#: gui/gdmlogin.c:1552 gui/greeter/greeter_session.c:428
+#: gui/gdmlogin.c:1557 gui/greeter/greeter_session.c:428
 msgid ""
 "This is a failsafe session that will log you into a terminal.  No startup "
 "scripts will be read and it is only to be used when you can't log in "
@@ -2506,7 +2715,7 @@ msgstr ""
 "oppstartsskript vil kjøres og den bør bare brukes hvis du ikke kan logge inn "
 "på annen måte. Skriv 'exit' for å avslutte terminalen."
 
-#: gui/gdmlogin.c:1573 gui/greeter/greeter_session.c:450
+#: gui/gdmlogin.c:1578 gui/greeter/greeter_session.c:448
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr "Ingen forvalgt sesjonlenke funnet. Bruker Feilsikker GNOME.\n"
 
@@ -2514,219 +2723,273 @@ msgstr "Ingen forvalgt sesjonlenke funnet. Bruker Feilsikker GNOME.\n"
 #. no_group
 #. untranslated
 #. makrup
-#: gui/gdmlogin.c:1617
+#: gui/gdmlogin.c:1622
 #, c-format
 msgid "%s language selected"
 msgstr "språk %s valgt"
 
-#: gui/gdmlogin.c:1657
+#: gui/gdmlogin.c:1651 gui/greeter/greeter_action_language.c:45
+msgid "Last"
+msgstr "Forrige"
+
+#: gui/gdmlogin.c:1662
 msgid "Log in using the language that you have used last time you logged in"
 msgstr "Logg inn med språket du brukte ved forrige innlogging"
 
-#: gui/gdmlogin.c:1672
+#: gui/gdmlogin.c:1677
 msgid "Log in using the default system language"
 msgstr "Logg inn med systemets forvalgte språk"
 
-#: gui/gdmlogin.c:1692
+#: gui/gdmlogin.c:1697
 msgid "Other"
 msgstr "Annet"
 
-#: gui/gdmlogin.c:1846 gui/gdmlogin.c:1853
+#: gui/gdmlogin.c:1853 gui/gdmlogin.c:1861
 msgid "Select GNOME session"
 msgstr "Veg GNOME sesjon"
 
-#: gui/gdmlogin.c:1920
+#. default is nicely translated
+#. Translators: default GNOME session
+#: gui/gdmlogin.c:1892 gui/gdmlogin.c:1914
+msgid "Default"
+msgstr "Standard"
+
+#: gui/gdmlogin.c:1928
 msgid "Create new session"
 msgstr "Opprett ny sesjon"
 
-#: gui/gdmlogin.c:1929
+#: gui/gdmlogin.c:1937
 msgid "Name: "
 msgstr "Navn: "
 
 #. Translators: this is to remember the chosen gnome session
 #. * for next time
-#: gui/gdmlogin.c:1951
+#: gui/gdmlogin.c:1959
 msgid "Remember this setting"
 msgstr "Husk denne innstillingen"
 
-#: gui/gdmlogin.c:2335
+#: gui/gdmlogin.c:2401
 msgid "Please insert 25 cents to log in."
 msgstr "Vennligst legg på 5 kroner for å logge inn."
 
-#: gui/gdmlogin.c:2742
+#: gui/gdmlogin.c:2647 gui/greeter/greeter_item_ulist.c:335
+msgid "Doubleclick on the user to log in"
+msgstr ""
+
+#: gui/gdmlogin.c:2796
 msgid "GNOME Desktop Manager"
 msgstr "GNOME skrivebordshåndterer"
 
-#: gui/gdmlogin.c:2750
+#: gui/gdmlogin.c:2804
 #, c-format
 msgid "Can't open icon file: %s. Suspending iconify feature!"
 msgstr "Kan ikke åpne ikonfilen: %s. Suspenderer ikonofiseringsfunksjonen!"
 
-#: gui/gdmlogin.c:2772
+#: gui/gdmlogin.c:2826
 msgid "Iconify the login window"
 msgstr "Ikonifiser innloggingsvinduet"
 
-#: gui/gdmlogin.c:2797 gui/greeter/greeter_item.c:96
+#: gui/gdmlogin.c:2851 gui/greeter/greeter_item.c:96
 msgid "%a %b %d, %H:%M"
 msgstr "%a %b %d, %H:%M"
 
-#: gui/gdmlogin.c:2799 gui/greeter/greeter_item.c:100
+#: gui/gdmlogin.c:2853 gui/greeter/greeter_item.c:100
 msgid "%a %b %d, %I:%M %p"
 msgstr "%a %b %d, %H:%M"
 
-#: gui/gdmlogin.c:2865
+#: gui/gdmlogin.c:2919
 msgid "Finger"
 msgstr "Finger"
 
-#: gui/gdmlogin.c:2957
+#: gui/gdmlogin.c:3012
 msgid "GDM Login"
 msgstr "GDM innlogging"
 
-#: gui/gdmlogin.c:3000 gui/greeter/greeter_canvas_item.c:129
-#: gui/greeter/greeter_parser.c:923
+#: gui/gdmlogin.c:3055 gui/greeter/greeter_parser.c:937
 #: gui/greeter/themes/circles/circles.xml.in.h:11
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:11
 #: gui/greeter/themes/happygnome/happygnome.xml.in.h:11
 msgid "_Session"
 msgstr "_Sesjon"
 
-#: gui/gdmlogin.c:3007 gui/greeter/greeter_canvas_item.c:122
-#: gui/greeter/greeter_parser.c:918
+#: gui/gdmlogin.c:3062 gui/greeter/greeter_parser.c:932
 #: gui/greeter/themes/circles/circles.xml.in.h:9
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:9
 #: gui/greeter/themes/happygnome/happygnome.xml.in.h:9
 msgid "_Language"
 msgstr "S_pråk"
 
-#: gui/gdmlogin.c:3019
-msgid "_Configure..."
-msgstr "_Konfigurer..."
+#: gui/gdmlogin.c:3074 gui/greeter/greeter_system.c:141
+msgid "Run _XDMCP Chooser"
+msgstr ""
 
-#: gui/gdmlogin.c:3026
+#: gui/gdmlogin.c:3081 gui/greeter/greeter_system.c:148
+#: gui/greeter/greeter_system.c:340
+msgid ""
+"Run an XDMCP chooser which will allow you to log into available remote "
+"machines, if there are any."
+msgstr ""
+
+#: gui/gdmlogin.c:3090 gui/greeter/greeter_system.c:156
+msgid "_Configure the login manager..."
+msgstr ""
+
+#: gui/gdmlogin.c:3097 gui/greeter/greeter_system.c:163
+#: gui/greeter/greeter_system.c:360
 msgid ""
 "Configure GDM (this login manager). This will require the root password."
 msgstr ""
 "Konfigurer GDM (denne innloggingshåndtereren). Dette krever root-passordet."
 
-#: gui/gdmlogin.c:3033
+#: gui/gdmlogin.c:3104
 msgid "_Reboot..."
 msgstr "_Omstart..."
 
-#: gui/gdmlogin.c:3040
+#: gui/gdmlogin.c:3111 gui/greeter/greeter_system.c:180
 msgid "Reboot your computer"
 msgstr "Start din datamaskin på nytt"
 
-#: gui/gdmlogin.c:3046
+#: gui/gdmlogin.c:3117
 msgid "Shut _down..."
 msgstr "Steng ne_d..."
 
-#: gui/gdmlogin.c:3053
+#: gui/gdmlogin.c:3124 gui/greeter/greeter_system.c:194
+#: gui/greeter/greeter_system.c:294
 msgid "Shut down your computer so that you may turn it off."
 msgstr "Steng ned din datamaskin slik at du kan skru den av."
 
-#: gui/gdmlogin.c:3060
+#: gui/gdmlogin.c:3131
 msgid "_Suspend..."
 msgstr "_Hvilemodus..."
 
-#: gui/gdmlogin.c:3067
+#: gui/gdmlogin.c:3138 gui/greeter/greeter_system.c:209
 msgid "Suspend your computer"
 msgstr "Sett datamaskinen i hvilemodus"
 
-#: gui/gdmlogin.c:3073 gui/greeter/greeter_canvas_item.c:138
-#: gui/greeter/greeter_parser.c:928
-#: gui/greeter/themes/circles/circles.xml.in.h:2
-#: gui/greeter/themes/happygnome/happygnome.xml.in.h:2
-msgid "S_ystem"
-msgstr "S_ystem"
+#: gui/gdmlogin.c:3144 gui/greeter/greeter_parser.c:942
+#: gui/greeter/themes/circles/circles.xml.in.h:8
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:8
+#: gui/greeter/themes/happygnome/happygnome.xml.in.h:8
+msgid "_Actions"
+msgstr "H_andlinger"
 
-#: gui/gdmlogin.c:3085 gui/greeter/greeter_canvas_item.c:151
-#: gui/greeter/greeter_parser.c:938
+#: gui/gdmlogin.c:3156 gui/greeter/greeter_canvas_item.c:145
+#: gui/greeter/greeter_parser.c:952
 #: gui/greeter/themes/circles/circles.xml.in.h:10
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:10
 #: gui/greeter/themes/happygnome/happygnome.xml.in.h:10
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: gui/gdmlogin.c:3087 gui/greeter/greeter_canvas_item.c:153
-#: gui/greeter/greeter_parser.c:933
+#: gui/gdmlogin.c:3158 gui/greeter/greeter_canvas_item.c:147
+#: gui/greeter/greeter_parser.c:947
 #: gui/greeter/themes/circles/circles.xml.in.h:1
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:1
 #: gui/greeter/themes/happygnome/happygnome.xml.in.h:1
 msgid "D_isconnect"
 msgstr "Ko_ble fra"
 
-#: gui/gdmlogin.c:3644
+#: gui/gdmlogin.c:3233 gui/greeter/greeter_item_ulist.c:396
+msgid "Icon"
+msgstr "Ikon"
+
+#: gui/gdmlogin.c:3240 gui/greeter/greeter_item_ulist.c:403
+msgid "Username"
+msgstr "Brukernavn"
+
+#: gui/gdmlogin.c:3688
 #, c-format
 msgid "Can't open DefaultImage: %s. Suspending face browser!"
 msgstr "Kan ikke åpne DefaultImage: %s. Suspenderer ansiktsvisning!"
 
-#: gui/gdmlogin.c:4084 gui/gdmlogin.c:4113 gui/greeter/greeter.c:556
-#: gui/greeter/greeter.c:585
-#, c-format
+#: gui/gdmlogin.c:4139 gui/gdmlogin.c:4169 gui/gdmlogin.c:4212
+#: gui/greeter/greeter.c:634 gui/greeter/greeter.c:664
+#: gui/greeter/greeter.c:708
+msgid "Cannot start the greeter"
+msgstr "Kan ikke starte velkomst"
+
+#: gui/gdmlogin.c:4140 gui/gdmlogin.c:4170
+#, fuzzy, c-format
 msgid ""
-"The greeter version (%s) does not match the daemon version.\n"
-"You have probably just upgraded gdm.\n"
-"Please restart the gdm daemon or reboot the computer."
+"The greeter version (%s) does not match the daemon version.  You have "
+"probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
+"computer."
 msgstr ""
 "Velkomst versjonen (%s) er ikke lik daemon-versjonen.\n"
 "Du har sannsynligvis nettopp oppgradert gdm.\n"
 "Vennligst start gdm-daemonen eller maskinen på nytt."
 
-#: gui/gdmlogin.c:4119 gui/gdmlogin.c:4163 gui/greeter/greeter.c:591
-#: gui/greeter/greeter.c:636
+#: gui/gdmlogin.c:4176 gui/gdmlogin.c:4221 gui/greeter/greeter.c:671
+#: gui/greeter/greeter.c:717
 msgid "Reboot"
 msgstr "Omstart"
 
-#: gui/gdmlogin.c:4155 gui/greeter/greeter.c:628
-#, c-format
+#: gui/gdmlogin.c:4213
+#, fuzzy, c-format
 msgid ""
-"The greeter version (%s) does not match the daemon version (%s).\n"
-"You have probably just upgraded gdm.\n"
-"Please restart the gdm daemon or reboot the computer."
+"The greeter version (%s) does not match the daemon version (%s).  You have "
+"probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
+"computer."
 msgstr ""
 "Velkomst versjon (%s) er ikke lik daemon versjon (%s).\n"
 "Du har sannsynligvis nettopp oppgradert gdm.\n"
 "Vennligst start gdm daemonen eller maskinen på nytt."
 
-#: gui/gdmlogin.c:4161 gui/greeter/greeter.c:634
+#: gui/gdmlogin.c:4219 gui/greeter/greeter.c:715
 msgid "Restart"
 msgstr "Søk på nytt"
 
-#: gui/gdmlogin.c:4206 gui/greeter/greeter.c:1055
+#: gui/gdmlogin.c:4264 gui/greeter/greeter.c:1170
 msgid "main: Error setting up HUP signal handler"
 msgstr "main: Feil under oppsett av HUP signalhåndtereren"
 
-#: gui/gdmlogin.c:4214 gui/greeter/greeter.c:1063
+#: gui/gdmlogin.c:4272 gui/greeter/greeter.c:1178
 msgid "main: Error setting up INT signal handler"
 msgstr "main: Feil under oppsett av INT signalhåndtereren"
 
-#: gui/gdmlogin.c:4217 gui/greeter/greeter.c:1066
+#: gui/gdmlogin.c:4275 gui/greeter/greeter.c:1181
 msgid "main: Error setting up TERM signal handler"
 msgstr "main: Feil under oppsett av TERM signalhåndtereren"
 
-#: gui/gdmlogin.c:4308 gui/greeter/greeter.c:1279
+#: gui/gdmlogin.c:4366 gui/greeter/greeter.c:1402
+msgid "Session directory is missing"
+msgstr "Sesjonskatalog mangler"
+
+#: gui/gdmlogin.c:4368 gui/greeter/greeter.c:1404
+#, fuzzy
 msgid ""
-"Your session directory is missing or empty!\n"
-"\n"
-"There are two available sessions you can use, but\n"
-"you should log in and correct the gdm configuration."
+"Your session directory is missing or empty!  There are two available "
+"sessions you can use, but you should log in and correct the gdm "
+"configuration."
 msgstr ""
 "Din sesjonskatalog mangler eller er tom!\n"
 "\n"
 "Du har to tilgjengelige sesjoner du kan bruke, men\n"
 "du bør logge inn og korrigere gdm konfigurasjonen."
 
-#: gui/gdmlogin.c:4331 gui/greeter/greeter.c:1303
+#: gui/gdmlogin.c:4391 gui/greeter/greeter.c:1428
+msgid "Configuration is not correct"
+msgstr ""
+
+#: gui/gdmlogin.c:4393 gui/greeter/greeter.c:1430
+#, fuzzy
 msgid ""
-"The configuration file contains an invalid command\n"
-"line for the login dialog, and thus I ran the\n"
-"default command.  Please fix your configuration."
+"The configuration file contains an invalid command line for the login "
+"dialog, and thus I ran the default command.  Please fix your configuration."
 msgstr ""
 "Konfigurasjonsfilen inneholder en ugyldig kommando\n"
 "linje for innloggingsdialogen. Kjørte derfor forvalgt\n"
 "kommando. Vennligst rett opp din konfigurasjon."
 
-#: gui/gdmlogin.c:4355 gui/greeter/greeter.c:1328
+#: gui/gdmlogin.c:4417 gui/greeter/greeter.c:1456
+msgid "No configuration was found"
+msgstr ""
+
+#: gui/gdmlogin.c:4419 gui/greeter/greeter.c:1458
+#, fuzzy
 msgid ""
-"The configuration was not found.  GDM is using\n"
-"defaults to run this session.  You should log in\n"
-"and create a configuration file with the GDM\n"
+"The configuration was not found.  GDM is using defaults to run this "
+"session.  You should log in and create a configuration file with the GDM "
 "configuration program."
 msgstr ""
 "Konfigurasjonen ble ikke funnet. GDM bruker\n"
@@ -2734,44 +2997,56 @@ msgstr ""
 "logge inn og opprette en konfigurasjonsfil med\n"
 "GDM konfigurasjonsprogrammet."
 
-#: gui/gdmphotosetup.c:129
+#: gui/gdmphotosetup.c:138
+#, fuzzy
+msgid "The face browser is not configured"
+msgstr "X-tjeneren feilet. Kanskje den ikke er konfigurert korrekt."
+
+#: gui/gdmphotosetup.c:141
+#, fuzzy
 msgid ""
-"The face browser is not configured,\n"
-"please ask your system administrator to enable it\n"
-"in the GDM configurator program."
+"The face browser is not configured in the GDM configuration.  Please ask "
+"your system administrator to enable it in the GDM configurator program."
 msgstr ""
 "Ansiktsviseren er ikke konfigurert.\n"
 "Vennligst spør din systemadministrator om den kan\n"
 "slås på i GDM konfigurasjonsprogrammet."
 
-#: gui/gdmphotosetup.c:138
-msgid "Select a photo"
-msgstr "Velg et bilde"
+#: gui/gdmphotosetup.c:151 gui/gdmphotosetup.desktop.in.h:2
+msgid "Login Photo"
+msgstr "Påloggingsbilde"
 
-#: gui/gdmphotosetup.c:147
+#: gui/gdmphotosetup.c:161
 msgid "Select a photograph to show in the facebrowser:"
 msgstr "Velg et bilde som skal vises i ansiktsleseren:"
 
-#: gui/gdmphotosetup.c:152
+#: gui/gdmphotosetup.c:166
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: gui/gdmphotosetup.c:185
+#: gui/gdmphotosetup.c:199
 msgid "No picture selected."
 msgstr "Ingen bilder valgt."
 
-#: gui/gdmphotosetup.c:194
-#, c-format
+#: gui/gdmphotosetup.c:209
+msgid "Picture is too large"
+msgstr ""
+
+#: gui/gdmphotosetup.c:210
+#, fuzzy, c-format
 msgid ""
-"The picture is too large and the system administrator\n"
-"disallowed pictures larger then %d bytes to\n"
-"show in the face browser"
+"The system administrator disallowed pictures larger than %d bytes to show in "
+"the face browser"
 msgstr ""
 "Bildet er for stort da systemadministratoren ikke\n"
 "tillater visning av bilder større enn %d bytes\n"
 "i ansiktsviseren"
 
-#: gui/gdmphotosetup.c:220
+#: gui/gdmphotosetup.c:235 gui/gdmphotosetup.c:254
+msgid "Cannot open file"
+msgstr "Kan ikke åpne fil"
+
+#: gui/gdmphotosetup.c:236
 #, c-format
 msgid ""
 "File %s cannot be open for reading\n"
@@ -2780,7 +3055,7 @@ msgstr ""
 "Fil %s kan ikke åpnes for lesing\n"
 "Feil: %s"
 
-#: gui/gdmphotosetup.c:238
+#: gui/gdmphotosetup.c:255
 #, c-format
 msgid ""
 "File %s cannot be open for writing\n"
@@ -2795,148 +3070,169 @@ msgid ""
 msgstr ""
 "Endre bildet som skal vises i GDM's (innloggingshåndtererens) ansiktsviser"
 
-#: gui/gdmphotosetup.desktop.in.h:2
-msgid "Login Photo"
-msgstr "Påloggingsbilde"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Soubor s přeložitelnými řetězci generovaný programem Glade.
+#. * Přidejte tento soubor do souboru vašeho projektu POTFILES.in.
+#. * NEPŘEKLÁDEJTE JEJ jako součást vaší aplikace.
 #.
-#: gui/gdmsetup-strings.c:7 gui/gdmsetup.glade.h:15
-msgid "GDM Setup"
-msgstr "GDM oppsett"
+#: gui/gdmsetup-strings.c:7 gui/gdmsetup.desktop.in.h:2
+#: gui/gdmsetup.glade.h:24
+msgid "Login Screen Setup"
+msgstr ""
 
 #: gui/gdmsetup-strings.c:8 gui/gdmsetup.glade.h:20
+msgid "Greeter"
+msgstr "Velkomst"
+
+#: gui/gdmsetup-strings.c:9 gui/gdmsetup-strings.c:24
+#: gui/gdmsetup-strings.c:29 gui/gdmsetup-strings.c:36
+#: gui/gdmsetup-strings.c:39 gui/gdmsetup-strings.c:42
+#: gui/gdmsetup-strings.c:65 gui/gdmsetup-strings.c:78 gui/gdmsetup.glade.h:1
+msgid "    "
+msgstr ""
+
+#: gui/gdmsetup-strings.c:10 gui/gdmsetup.glade.h:22
 msgid "L_ocal: "
 msgstr "L_okal: "
 
-#: gui/gdmsetup-strings.c:9 gui/gdmsetup.glade.h:51
+#: gui/gdmsetup-strings.c:11 gui/gdmsetup.glade.h:62
 msgid "_Remote: "
 msgstr "Ekste_rn: "
 
-#: gui/gdmsetup-strings.c:10 gui/gdmsetup-strings.c:12
-#: gui/gdmsetup-strings.c:42 gui/gdmsetup.c:807 gui/gdmsetup.glade.h:39
+#: gui/gdmsetup-strings.c:12 gui/gdmsetup.glade.h:65
+msgid "_Welcome string: "
+msgstr "_Velkomstmelding: "
+
+#: gui/gdmsetup-strings.c:13 gui/gdmsetup.glade.h:40
+msgid "Re_mote welcome string: "
+msgstr "_Ekstern velkomstmelding: "
+
+#: gui/gdmsetup-strings.c:14 gui/gdmsetup-strings.c:16
+#: gui/gdmsetup-strings.c:51 gui/gdmsetup.c:814 gui/gdmsetup.glade.h:46
 msgid "Standard greeter"
 msgstr "Forvalgt velkomst"
 
-#: gui/gdmsetup-strings.c:11 gui/gdmsetup-strings.c:13
-#: gui/gdmsetup-strings.c:52 gui/gdmsetup.c:809 gui/gdmsetup.glade.h:17
+#: gui/gdmsetup-strings.c:15 gui/gdmsetup-strings.c:17
+#: gui/gdmsetup-strings.c:63 gui/gdmsetup.c:816 gui/gdmsetup.glade.h:19
 msgid "Graphical greeter"
 msgstr "Grafisk velkomst"
 
-#: gui/gdmsetup-strings.c:14 gui/gdmsetup.glade.h:9
+#: gui/gdmsetup-strings.c:18 gui/gdmsetup.glade.h:48
+#, no-c-format
+msgid ""
+"String to be shown in the greeter as welcome.  You can insert %n in here and "
+"it will be replaced by the name of your computer."
+msgstr ""
+
+#: gui/gdmsetup-strings.c:20 gui/gdmsetup.glade.h:50
+#, no-c-format
+msgid ""
+"String to be shown in the greeter for people logging in remotely with "
+"XDMCP.  You can insert %n in here and it will be replaced by the name of "
+"your computer."
+msgstr ""
+
+#: gui/gdmsetup-strings.c:22 gui/gdmsetup.glade.h:9
 msgid "Always use 24 hour cloc_k format"
 msgstr "Alltid bruk 24-timers _klokkeformat"
 
-#: gui/gdmsetup-strings.c:15 gui/gdmsetup.glade.h:18
-msgid "Greeter"
-msgstr "Velkomst"
-
-#: gui/gdmsetup-strings.c:16 gui/gdmsetup.glade.h:48
-msgid "_Login a user automatically on first bootup"
-msgstr "_Logg inn en bruker automatisk ved første oppstart"
+#: gui/gdmsetup-strings.c:23 gui/gdmsetup.glade.h:11
+msgid "Automatic Login"
+msgstr "Automatisk innlogging"
 
-#: gui/gdmsetup-strings.c:17 gui/gdmsetup.glade.h:44
+#: gui/gdmsetup-strings.c:25 gui/gdmsetup.glade.h:54
 msgid "_Automatic login username:"
 msgstr "Brukernavn for _automatisk innlogging:"
 
-#: gui/gdmsetup-strings.c:18 gui/gdmsetup-strings.c:23
-#: gui/gdmsetup-strings.c:26 gui/gdmsetup-strings.c:29
-#: gui/gdmsetup-strings.c:37 gui/gdmsetup.glade.h:1
-msgid "*"
-msgstr "*"
+#: gui/gdmsetup-strings.c:27 gui/gdmsetup.glade.h:59
+msgid "_Login a user automatically on first bootup"
+msgstr "_Logg inn en bruker automatisk ved første oppstart"
 
-#: gui/gdmsetup-strings.c:20 gui/gdmsetup.glade.h:22
-msgid "Login a user automa_tically after a specified number of seconds"
-msgstr "Logg inn en bruker automa_tisk etter spesifisert antall sekunder"
+#: gui/gdmsetup-strings.c:28 gui/gdmsetup.glade.h:51
+msgid "Timed Login"
+msgstr "Tidsbestemt innlogging"
 
-#: gui/gdmsetup-strings.c:21 gui/gdmsetup.glade.h:41
+#: gui/gdmsetup-strings.c:30 gui/gdmsetup.glade.h:52
 msgid "Timed login us_ername:"
 msgstr "Bruk_ernavn for tidsbestemt innlogging:"
 
-#: gui/gdmsetup-strings.c:22 gui/gdmsetup.glade.h:53
+#: gui/gdmsetup-strings.c:31 gui/gdmsetup.glade.h:64
 msgid "_Seconds before login:"
 msgstr "_Sekunder før innlogging:"
 
-#: gui/gdmsetup-strings.c:24 gui/gdmsetup.glade.h:40
-msgid "Timed login"
-msgstr "Tidsbestemt innlogging"
+#: gui/gdmsetup-strings.c:33 gui/gdmsetup.glade.h:25
+msgid "Login a user automa_tically after a specified number of seconds"
+msgstr "Logg inn en bruker automa_tisk etter spesifisert antall sekunder"
 
-#: gui/gdmsetup-strings.c:25 gui/gdmsetup.glade.h:16
+#: gui/gdmsetup-strings.c:34 gui/gdmsetup.glade.h:18
 msgid "General"
 msgstr "Generell"
 
-#: gui/gdmsetup-strings.c:27 gui/gdmsetup.glade.h:54
-msgid "_Welcome string: "
-msgstr "_Velkomstmelding: "
-
-#: gui/gdmsetup-strings.c:28 gui/gdmsetup.glade.h:42
-msgid "Welcome string: "
-msgstr "Velkomstmelding: "
-
-#: gui/gdmsetup-strings.c:30 gui/gdmsetup.glade.h:23
+#: gui/gdmsetup-strings.c:35 gui/gdmsetup.glade.h:26
 msgid "Logo"
 msgstr "Logo"
 
-#: gui/gdmsetup-strings.c:31 gui/gdmsetup.glade.h:38
+#: gui/gdmsetup-strings.c:38 gui/gdmsetup.glade.h:32
+msgid "Miscellaneous"
+msgstr "Forskjellig"
+
+#: gui/gdmsetup-strings.c:40 gui/gdmsetup.glade.h:44
 msgid "Show choosable user images (_face browser)"
 msgstr "Vis valgbare bilder av _brukere (ansiktsvisning)"
 
-#: gui/gdmsetup-strings.c:32 gui/gdmsetup.glade.h:29
-msgid "Miscellaneous"
-msgstr "Forskjellig"
+#: gui/gdmsetup-strings.c:41 gui/gdmsetup.glade.h:12
+msgid "Background"
+msgstr "Bakgrunn"
 
-#: gui/gdmsetup-strings.c:33 gui/gdmsetup.glade.h:49
+#: gui/gdmsetup-strings.c:43 gui/gdmsetup.glade.h:60
 msgid "_No background"
 msgstr "I_ngen bakgrunn"
 
-#: gui/gdmsetup-strings.c:34 gui/gdmsetup.glade.h:46
+#: gui/gdmsetup-strings.c:44 gui/gdmsetup.glade.h:57
 msgid "_Image"
 msgstr "B_ilde"
 
-#: gui/gdmsetup-strings.c:35 gui/gdmsetup.glade.h:12
+#: gui/gdmsetup-strings.c:45 gui/gdmsetup.glade.h:13
 msgid "Co_lor"
 msgstr "_Farge"
 
-#: gui/gdmsetup-strings.c:36 gui/gdmsetup.glade.h:52
+#: gui/gdmsetup-strings.c:46 gui/gdmsetup.glade.h:63
 msgid "_Scale background image to fit"
 msgstr "_Skaler bakgrunnsbilde så det passer"
 
-#: gui/gdmsetup-strings.c:38 gui/gdmsetup.glade.h:50
+#: gui/gdmsetup-strings.c:48 gui/gdmsetup.glade.h:61
 msgid "_Only color on remote displays"
 msgstr "K_un farge på eksterne skjermer"
 
-#: gui/gdmsetup-strings.c:39 gui/gdmsetup.glade.h:45
+#: gui/gdmsetup-strings.c:49 gui/gdmsetup.glade.h:55
 msgid "_Background color: "
 msgstr "_Bakgrunnsfarge: "
 
-#: gui/gdmsetup-strings.c:40 gui/gdmsetup.glade.h:33
+#: gui/gdmsetup-strings.c:50 gui/gdmsetup.glade.h:36
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: gui/gdmsetup-strings.c:41 gui/gdmsetup.glade.h:11
-msgid "Background"
-msgstr "Bakgrunn"
-
-#: gui/gdmsetup-strings.c:43 gui/gdmsetup.glade.h:4
-msgid "<b>Preview:</b>"
-msgstr "<b>Forhåndsvis:</b>"
+#: gui/gdmsetup-strings.c:52 gui/gdmsetup.glade.h:39
+msgid "Preview:"
+msgstr "Forhåndsvis:"
 
-#: gui/gdmsetup-strings.c:44 gui/gdmsetup.glade.h:31
+#: gui/gdmsetup-strings.c:53 gui/gdmsetup.glade.h:34
 msgid "No screenshot available"
 msgstr "Ingen skjermdump tilgjengelig"
 
-#: gui/gdmsetup-strings.c:45 gui/gdmsetup.glade.h:3
-msgid "<b>Description:</b>"
-msgstr "<b>Beskrivelse:</b>"
+#: gui/gdmsetup-strings.c:54 gui/gdmsetup.glade.h:15
+msgid "Description:"
+msgstr "Beskrivelse:"
 
-#: gui/gdmsetup-strings.c:46 gui/gdmsetup.glade.h:2
-msgid "<b>Author:</b>"
-msgstr "<b>Programmerer:</b>"
+#: gui/gdmsetup-strings.c:55 gui/gdmsetup.glade.h:14
+msgid "Copyright:"
+msgstr "Opphavsrett:"
 
-#: gui/gdmsetup-strings.c:47 gui/gdmsetup.glade.h:57
+#: gui/gdmsetup-strings.c:56 gui/gdmsetup.glade.h:10
+msgid "Author:"
+msgstr "Forfatter:"
+
+#: gui/gdmsetup-strings.c:57 gui/gdmsetup.glade.h:68
 msgid ""
 "description\n"
 "widget"
@@ -2944,51 +3240,73 @@ msgstr ""
 "beskrivelse\n"
 "widget"
 
-#: gui/gdmsetup-strings.c:49 gui/gdmsetup.glade.h:55
+#: gui/gdmsetup-strings.c:59 gui/gdmsetup.glade.h:66
 msgid "author"
 msgstr "programmerer"
 
-#: gui/gdmsetup-strings.c:50 gui/gdmsetup.glade.h:56
+#: gui/gdmsetup-strings.c:60 gui/gdmsetup.glade.h:67
 msgid "copyright"
 msgstr "opphavsrett"
 
-#: gui/gdmsetup-strings.c:51 gui/gdmsetup.glade.h:47
+#: gui/gdmsetup-strings.c:61 gui/gdmsetup.glade.h:58
 msgid "_Install new theme"
 msgstr "_Installer nytt tema"
 
-#: gui/gdmsetup-strings.c:53 gui/gdmsetup.glade.h:5
+#: gui/gdmsetup-strings.c:62 gui/gdmsetup.glade.h:56
+msgid "_Delete theme"
+msgstr "_Slett tema"
+
+#: gui/gdmsetup-strings.c:64 gui/gdmsetup.glade.h:35
+msgid "Options"
+msgstr "Alternativer"
+
+#: gui/gdmsetup-strings.c:66 gui/gdmsetup.glade.h:4
 msgid "Allow _root to login with GDM"
 msgstr "La _root logge på via GDM"
 
-#: gui/gdmsetup-strings.c:54 gui/gdmsetup.glade.h:8
+#: gui/gdmsetup-strings.c:67 gui/gdmsetup.glade.h:7
 msgid "Allow root to login r_emotely with GDM"
 msgstr "La root logge på _eksternt via GDM"
 
-#: gui/gdmsetup-strings.c:55 gui/gdmsetup.glade.h:7
+#: gui/gdmsetup-strings.c:68 gui/gdmsetup.glade.h:6
 msgid "Allow remote _timed logins"
 msgstr "Tillat _tidsbestemt pålogging"
 
-#: gui/gdmsetup-strings.c:56 gui/gdmsetup.glade.h:37
-msgid "Show _system menu"
-msgstr "Vis _systemmeny"
+#: gui/gdmsetup-strings.c:69 gui/gdmsetup.glade.h:45
+msgid ""
+"Show the \"Actions\" menu (formerly known as the \"System\" menu).  If not "
+"set, none of the system commands will be available (this includes reboot, "
+"shutdown, configure, chooser)"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:70 gui/gdmsetup.glade.h:43
+msgid "Show _actions menu"
+msgstr "Vis meny for h_andlinger"
 
-#: gui/gdmsetup-strings.c:57 gui/gdmsetup.glade.h:6
+#: gui/gdmsetup-strings.c:71 gui/gdmsetup.glade.h:5
 msgid "Allow c_onfiguration from the login screen"
 msgstr "Tillat k_onfigurasjon fra påloggingsbildet"
 
-#: gui/gdmsetup-strings.c:58 gui/gdmsetup.glade.h:35
+#: gui/gdmsetup-strings.c:72 gui/gdmsetup.glade.h:3
+#, fuzzy
+msgid "Allo_w running XDMCP chooser from the login screen"
+msgstr "Tillat k_onfigurasjon fra påloggingsbildet"
+
+#: gui/gdmsetup-strings.c:73 gui/gdmsetup.glade.h:8
+msgid ""
+"Always disallow TCP connections to _X server (disables all remote "
+"connections)"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:74 gui/gdmsetup.glade.h:41
 msgid "Retry _delay (seconds) :"
 msgstr "_Pause før nytt forsøk (sekunder) :"
 
-#: gui/gdmsetup-strings.c:59 gui/gdmsetup.glade.h:32
-msgid "Options"
-msgstr "Alternativer"
-
-#: gui/gdmsetup-strings.c:60 gui/gdmsetup.glade.h:36
+#: gui/gdmsetup-strings.c:75 gui/gdmsetup.glade.h:42
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: gui/gdmsetup-strings.c:61 gui/gdmsetup.glade.h:30
+#: gui/gdmsetup-strings.c:76 gui/gdmsetup.glade.h:33
 msgid ""
 "No XDMCP support in the binary.  To enable XDMCP support you must recompile "
 "GDM with the XDMCP libraries."
@@ -2996,47 +3314,54 @@ msgstr ""
 "Ingen XDMCP-støtte i binærfilen. Du må rekompilere GDM med XDMCP-"
 "bibliotekene for å aktivere XDMCP-støtte "
 
-#: gui/gdmsetup-strings.c:62 gui/gdmsetup.glade.h:19
+#: gui/gdmsetup-strings.c:77 gui/gdmsetup.glade.h:17
+msgid "Enable _XDMCP"
+msgstr "Aktiver _XDMCP"
+
+#: gui/gdmsetup-strings.c:79 gui/gdmsetup.glade.h:21
 msgid "Honour _indirect requests"
 msgstr "Ta hensyn til _indirekte forespørsler"
 
-#: gui/gdmsetup-strings.c:63 gui/gdmsetup.glade.h:21
-msgid "Listen on UDP port: "
-msgstr "Lyt på UDP-port: "
+#: gui/gdmsetup-strings.c:80 gui/gdmsetup.glade.h:23
+msgid "Listen on _UDP port: "
+msgstr "Lytt på _UDP-port: "
 
-#: gui/gdmsetup-strings.c:64 gui/gdmsetup.glade.h:26
-msgid "Maximum pending requests:"
+#: gui/gdmsetup-strings.c:81 gui/gdmsetup.glade.h:28
+#, fuzzy
+msgid "Maximum _pending requests:"
 msgstr "Maksimalt antall utestående forespørsler:"
 
-#: gui/gdmsetup-strings.c:65 gui/gdmsetup.glade.h:24
-msgid "Max pending indirect requests:"
+#: gui/gdmsetup-strings.c:82 gui/gdmsetup.glade.h:27
+#, fuzzy
+msgid "Max p_ending indirect requests:"
 msgstr "Maksimalt antall utestående indirekte forespørsler:"
 
-#: gui/gdmsetup-strings.c:66 gui/gdmsetup.glade.h:27
-msgid "Maximum remote sessions:"
+#: gui/gdmsetup-strings.c:83 gui/gdmsetup.glade.h:29
+#, fuzzy
+msgid "Maximum _remote sessions:"
 msgstr "Maksimalt antall eksterne sesjoner:"
 
-#: gui/gdmsetup-strings.c:67 gui/gdmsetup.glade.h:28
-msgid "Maximum wait time:"
-msgstr "Maksimal ventetid:"
+#: gui/gdmsetup-strings.c:84 gui/gdmsetup.glade.h:30
+msgid "Maximum _wait time:"
+msgstr "Maksimal _ventetid:"
 
-#: gui/gdmsetup-strings.c:68 gui/gdmsetup.glade.h:25
-msgid "Maximum indirect wait time:"
-msgstr "Maksimal indirekte ventetid:"
+#: gui/gdmsetup-strings.c:85 gui/gdmsetup.glade.h:31
+msgid "Maximum indirect w_ait time:"
+msgstr "M_aksimal indirekte ventetid:"
 
-#: gui/gdmsetup-strings.c:69 gui/gdmsetup.glade.h:13
-msgid "Displays per host:"
-msgstr "Skjermer per vert:"
+#: gui/gdmsetup-strings.c:86 gui/gdmsetup.glade.h:16
+msgid "Displays per _host:"
+msgstr "Skjermer per _vert:"
 
-#: gui/gdmsetup-strings.c:70 gui/gdmsetup.glade.h:34
-msgid "Ping interval (minutes):"
-msgstr "Ping intervall (minutter):"
+#: gui/gdmsetup-strings.c:87 gui/gdmsetup.glade.h:37
+msgid "Pin_g interval (seconds):"
+msgstr "Pin_g-intervall (sekunder):"
 
-#: gui/gdmsetup-strings.c:71 gui/gdmsetup.glade.h:14
-msgid "Enable _XDMCP"
-msgstr "Bruk _XDMCP"
+#: gui/gdmsetup-strings.c:88 gui/gdmsetup.glade.h:38
+msgid "Ping interval (seconds):"
+msgstr "Ping intervall (sekunder):"
 
-#: gui/gdmsetup-strings.c:72 gui/gdmsetup.glade.h:43
+#: gui/gdmsetup-strings.c:89 gui/gdmsetup.glade.h:53
 msgid "XDMCP"
 msgstr "XDMCP"
 
@@ -3048,40 +3373,46 @@ msgstr ""
 "En feil har oppstått under forsøk på å kontakte innloggingsskjermene. Alle "
 "oppdateringer er kanskje ikke aktivert."
 
-#: gui/gdmsetup.c:1324
+#: gui/gdmsetup.c:442
+msgid "Too many users to list here..."
+msgstr ""
+
+#: gui/gdmsetup.c:1348
 msgid "Archive is not of a subdirectory"
 msgstr "Arkivet består ikke av en underkatalog"
 
-#: gui/gdmsetup.c:1332
+#: gui/gdmsetup.c:1356
 msgid "Archive is not of a single subdirectory"
 msgstr "Arkivet består ikke av en enkelt underkatalog"
 
-#: gui/gdmsetup.c:1356 gui/gdmsetup.c:1435
+#: gui/gdmsetup.c:1380 gui/gdmsetup.c:1459
 msgid "File not a tar.gz or tar archive"
 msgstr "Filen er ikke eller et tar arkiv"
 
-#: gui/gdmsetup.c:1358
+#: gui/gdmsetup.c:1382
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Arkivet inneholder ikke en GdmGreeterTheme.info-fil"
 
-#: gui/gdmsetup.c:1380
+#: gui/gdmsetup.c:1404
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
-#: gui/gdmsetup.c:1488
+#: gui/gdmsetup.c:1512
 msgid "No file selected"
 msgstr "Ingen fil valgt"
 
-#: gui/gdmsetup.c:1514
+#: gui/gdmsetup.c:1539
+msgid "Not a theme archive"
+msgstr "Ikke et tema-arkiv"
+
+#: gui/gdmsetup.c:1540
 #, c-format
-msgid ""
-"Not a theme archive\n"
-"Details: %s"
-msgstr ""
-"Ikke et tema-arkiv\n"
-"Detaljer: %s"
+msgid "Details: %s"
+msgstr "Detaljer: %s"
 
-#: gui/gdmsetup.c:1536
+#. FIXME: if exists already perhaps we could also have an
+#. * option to change the dir name
+#: gui/gdmsetup.c:1556
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed, install again anyway?"
@@ -3089,16 +3420,21 @@ msgstr ""
 "Temakatalog «%s» ser ut til å være installert allerede. Installer igjen "
 "likevel?"
 
-#: gui/gdmsetup.c:1581
+#: gui/gdmsetup.c:1629
 msgid "Some error occured when installing the theme"
 msgstr "En feil oppsto under installasjon av temaet"
 
-#: gui/gdmsetup.c:1626
+#: gui/gdmsetup.c:1675
 msgid "Select new theme archive to install"
 msgstr "Velg et nytt tema-arkiv som skal installeres"
 
+#: gui/gdmsetup.c:1743
+#, c-format
+msgid "Do you really wish to remove theme '%s' from the system?"
+msgstr ""
+
 #. This is the temporary help dialog
-#: gui/gdmsetup.c:1766
+#: gui/gdmsetup.c:1941
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3115,9 +3451,9 @@ msgstr ""
 "Merk at ikke alle konfigurasjonsalternativer er listet her. Du ønsker "
 "kanskje å redigere %s hvis du ikke finner det du leter etter."
 
-#: gui/gdmsetup.c:2070
-msgid "You must be the superuser (root) to configure GDM.\n"
-msgstr "Du må være superbruker (root) for å konfigurere GDM.\n"
+#: gui/gdmsetup.c:2312
+msgid "You must be the superuser (root) to configure GDM."
+msgstr "Du må være superbruker (root) for å konfigurere GDM."
 
 #. EOF
 #: gui/gdmsetup.desktop.in.h:1
@@ -3125,29 +3461,44 @@ msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
 msgstr ""
 "En grafisk applikasjon for konfigurasjon av GNOME Display Manager (GDM)"
 
-#: gui/gdmsetup.desktop.in.h:2
-msgid "GDM Configurator"
-msgstr "GDM konfigurator"
+#: gui/greeter/greeter.c:635 gui/greeter/greeter.c:665
+#, c-format
+msgid ""
+"The greeter version (%s) does not match the daemon version.\n"
+"You have probably just upgraded gdm.\n"
+"Please restart the gdm daemon or reboot the computer."
+msgstr ""
+"Velkomst versjonen (%s) er ikke lik daemon-versjonen.\n"
+"Du har sannsynligvis nettopp oppgradert gdm.\n"
+"Vennligst start gdm-daemonen eller maskinen på nytt."
 
-#: gui/greeter/greeter.c:72
+#: gui/greeter/greeter.c:709
 #, c-format
-msgid "greeter_parse_config: No configuration file: %s. Using defaults."
-msgstr "greeter_parse_config: Ingen konfigurasjonsfil: %s. Bruker forvalg."
+msgid ""
+"The greeter version (%s) does not match the daemon version (%s).\n"
+"You have probably just upgraded gdm.\n"
+"Please restart the gdm daemon or reboot the computer."
+msgstr ""
+"Velkomst versjon (%s) er ikke lik daemon versjon (%s).\n"
+"Du har sannsynligvis nettopp oppgradert gdm.\n"
+"Vennligst start gdm daemonen eller maskinen på nytt."
 
-#: gui/greeter/greeter.c:1141
+#: gui/greeter/greeter.c:1253
 #, c-format
 msgid "There was an error loading the theme %s"
 msgstr "Det oppsto en feil under lasting av tema %s"
 
-#: gui/greeter/greeter.c:1179
-msgid ""
-"The theme for the graphical greeter is corrupt.  It does not contain "
-"definition for the username/password entry element."
+#: gui/greeter/greeter.c:1298
+msgid "The theme for the graphical greeter is corrupt"
 msgstr ""
-"Temaet for grafisk velkomst er korrupt. Det har ingen definisjon for "
-"elementet brukernavn/passord"
 
-#: gui/greeter/greeter.c:1212
+#: gui/greeter/greeter.c:1301
+msgid ""
+"The theme does not contain definition for the username/password entry "
+"element."
+msgstr "Temaet har ingen definisjon for elementet brukernavn/passord."
+
+#: gui/greeter/greeter.c:1333
 msgid ""
 "There was an error loading the theme, and the default theme also could not "
 "have been loaded, I will attempt to start the standard greeter"
@@ -3155,7 +3506,7 @@ msgstr ""
 "Det oppsto en feil under lasting av tema, og forvalgt tema kan heller ikke "
 "lastes. Forsøker å starte forvalgt velkomst"
 
-#: gui/greeter/greeter.c:1232
+#: gui/greeter/greeter.c:1354
 msgid ""
 "I could not start the standard greeter.  This display will abort and you may "
 "have to login another way and fix the installation of gdm"
@@ -3163,42 +3514,85 @@ msgstr ""
 "Kunne ikke starte forvalgt velkomst. Denne skjermen vil avbryte og du vil "
 "kanskje måtte logge inn via andre metoder og rette opp installasjonen av gdm"
 
-#: gui/greeter/greeter_action_language.c:194
+#: gui/greeter/greeter_action_language.c:188
 msgid "Select a language"
 msgstr "Velg et språk"
 
-#: gui/greeter/greeter_action_language.c:207
+#: gui/greeter/greeter_action_language.c:205
 msgid "Select a language for your session to use:"
 msgstr "Velg et språk for bruk med din sesjon:"
 
-#: gui/greeter/greeter_system.c:150
-msgid "Shut down the computer"
-msgstr "Slå av datamaskinen"
+#: gui/greeter/greeter_canvas_item.c:124
+msgid "Select _Language..."
+msgstr "Ve_lg et språk..."
 
-#: gui/greeter/greeter_system.c:162
-msgid "Suspend the computer"
-msgstr "Sett datamaskinen i hvilemodus"
+#: gui/greeter/greeter_canvas_item.c:131
+msgid "Select _Session..."
+msgstr "Veg _sesjon..."
 
-#: gui/greeter/greeter_system.c:174
-msgid "Reboot the computer"
-msgstr "Start datamaskinen på nytt"
+#: gui/greeter/greeter_canvas_item.c:326
+msgid "Answer questions here and press Enter when done.  For a menu press F10."
+msgstr ""
 
-#: gui/greeter/greeter_system.c:187
-msgid "Configure"
-msgstr "Konfigurer"
+#: gui/greeter/greeter_item_ulist.c:259
+#, c-format
+msgid "Can't open DefaultImage: %s!"
+msgstr "Kunne ikke åpne DefaultImage: %s!"
 
-#: gui/greeter/greeter_parser.c:943
-#: gui/greeter/themes/circles/circles.xml.in.h:8
-#: gui/greeter/themes/happygnome/happygnome.xml.in.h:8
-msgid "You've got capslock on!"
-msgstr "Du har capslock på!"
+#: gui/greeter/greeter_parser.c:957
+msgid "_XDMCP Chooser"
+msgstr "_XDMCP-velger"
+
+#: gui/greeter/greeter_parser.c:962
+msgid "_Configure"
+msgstr "_Konfigurer"
 
-#: gui/greeter/greeter_parser.c:955
+#: gui/greeter/greeter_parser.c:967
 #: gui/greeter/themes/circles/circles.xml.in.h:7
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:7
 #: gui/greeter/themes/happygnome/happygnome.xml.in.h:7
-#, no-c-format
-msgid "Welcome to %h"
-msgstr "Velkommen til %h"
+msgid "You've got capslock on!"
+msgstr "Du har capslock på!"
+
+#: gui/greeter/greeter_session.c:254
+msgid "Choose a Session"
+msgstr "Velg en sesjon"
+
+#: gui/greeter/greeter_system.c:173
+msgid "_Reboot the computer..."
+msgstr "Sta_rt datamaskinen på nytt..."
+
+#: gui/greeter/greeter_system.c:187
+msgid "Shut _down the computer..."
+msgstr "Steng ned _datamaskinen..."
+
+#: gui/greeter/greeter_system.c:202
+msgid "Sus_pend the computer..."
+msgstr "Se_tt datamaskinen i hvilemodus..."
+
+#: gui/greeter/greeter_system.c:269
+msgid "Choose an Action"
+msgstr "Velg en handling"
+
+#: gui/greeter/greeter_system.c:291
+msgid "Shut _down the computer"
+msgstr "Steng ned _datamaskinen"
+
+#: gui/greeter/greeter_system.c:309
+msgid "_Reboot the computer"
+msgstr "Sta_rt datamaskinen på nytt"
+
+#: gui/greeter/greeter_system.c:323
+msgid "Sus_pend the computer"
+msgstr "Se_tt datamaskinen i hvilemodus"
+
+#: gui/greeter/greeter_system.c:337
+msgid "Run _XDMCP chooser"
+msgstr "Kjør _XDMCP-velger"
+
+#: gui/greeter/greeter_system.c:357
+msgid "_Configure the login manager"
+msgstr "_Konfigurer hånderer for innlogging"
 
 #: gui/greeter/themes/circles/GdmGreeterTheme.desktop.in.h:1
 msgid "(c) 2002 Bond, James Bond"
@@ -3216,22 +3610,48 @@ msgstr "Sirkler"
 msgid "Theme with blue circles"
 msgstr "Tema med blå sirkler"
 
+#: gui/greeter/themes/circles/circles.xml.in.h:6
+#: gui/greeter/themes/happygnome-list/happygnome.xml.in.h:6
+#: gui/greeter/themes/happygnome/happygnome.xml.in.h:6
+#, no-c-format
+msgid "Welcome to %h"
+msgstr "Velkommen til %h"
+
+#: gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in.h:1
 #: gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in.h:1
 msgid "(c) 2002 GNOME"
 msgstr "© 2002 GNOME"
 
-#: gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in.h:2
-msgid "GNOME Art variation of Circles"
+#: gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in.h:2
+#, fuzzy
+msgid "GNOME Art variation of Circles with a Face Browser"
 msgstr "GNOME kunstvariasjon av Sirkler"
 
+#: gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in.h:3
 #: gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in.h:3
 msgid "GNOME Artists"
 msgstr "GNOME kunstnere"
 
+#: gui/greeter/themes/happygnome-list/GdmGreeterTheme.desktop.in.h:4
+#, fuzzy
+msgid "Happy GNOME with Browser"
+msgstr "Glad GNOME"
+
+#: gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in.h:2
+msgid "GNOME Art variation of Circles"
+msgstr "GNOME kunstvariasjon av Sirkler"
+
 #: gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in.h:4
 msgid "Happy GNOME"
 msgstr "Glad GNOME"
 
+#: gui/modules/dwellmouselistener.c:573 gui/modules/keymouselistener.c:634
+#, c-format
+msgid ""
+"Error while trying to run (%s)\n"
+"which is linked to (%s)"
+msgstr ""
+
 #: utils/gdmaskpass.c:26
 msgid "gdmaskpass only runs as root\n"
 msgstr "gdmaskpass kjører kun som root\n"
@@ -3240,23 +3660,27 @@ msgstr "gdmaskpass kjører kun som root\n"
 msgid "Authentication failure!\n"
 msgstr "Autentiseringfeil!\n"
 
-#: vicious-extensions/glade-helper.c:82
+#: vicious-extensions/glade-helper.c:83
 msgid "(memory buffer)"
 msgstr "(minnebuffer)"
 
-#: vicious-extensions/glade-helper.c:114 vicious-extensions/glade-helper.c:136
-#: vicious-extensions/glade-helper.c:156
+#: vicious-extensions/glade-helper.c:115 vicious-extensions/glade-helper.c:137
+#: vicious-extensions/glade-helper.c:157
 msgid "(memory buffer"
 msgstr "(minnebuffer"
 
-#: vicious-extensions/glade-helper.c:188
-#, c-format
+#: vicious-extensions/glade-helper.c:189 vicious-extensions/glade-helper.c:236
+#: vicious-extensions/glade-helper.c:273
+msgid "Cannot load user interface"
+msgstr "Kan ikke laste brukergrensesnitt"
+
+#: vicious-extensions/glade-helper.c:190
+#, fuzzy, c-format
 msgid ""
-"An error occured while loading the user interface\n"
-"element %s%s from file %s.\n"
-"Possibly the glade interface description was corrupted.\n"
-"%s cannot continue and will exit now.\n"
-"You should check your installation of %s or reinstall %s."
+"An error occured while loading the user interface element %s%s from file %"
+"s.  Possibly the glade interface description was corrupted.  %s cannot "
+"continue and will exit now.  You should check your installation of %s or "
+"reinstall %s."
 msgstr ""
 "En feil oppsto under lasting av element %s%s av\n"
 "brukergrensesnittet fra fil %s.\n"
@@ -3264,7 +3688,7 @@ msgstr ""
 "%s kan ikke fortsette og vil avslutte nå.\n"
 "Du bør sjekke installasjonen av %s eller reinsallere %s."
 
-#: vicious-extensions/glade-helper.c:204
+#: vicious-extensions/glade-helper.c:206
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3273,15 +3697,13 @@ msgstr ""
 "Glade filen er på crack! Sjekk at korrekt fil er installert!\n"
 "fil: %s widget %s"
 
-#: vicious-extensions/glade-helper.c:234
-#, c-format
+#: vicious-extensions/glade-helper.c:237
+#, fuzzy, c-format
 msgid ""
-"An error occured while loading the user interface\n"
-"element %s%s from file %s.\n"
-"CList type widget should have %d columns.\n"
-"Possibly the glade interface description was corrupted.\n"
-"%s cannot continue and will exit now.\n"
-"You should check your installation of %s or reinstall %s."
+"An error occured while loading the user interface element %s%s from file %"
+"s.  CList type widget should have %d columns.  Possibly the glade interface "
+"description was corrupted.  %s cannot continue and will exit now.  You "
+"should check your installation of %s or reinstall %s."
 msgstr ""
 "En feil oppsto under lasting av et element av\n"
 "brukergrensesnittet %s%s fra fil %s.\n"
@@ -3290,7 +3712,7 @@ msgstr ""
 "%s kan ikke fortsette og vil avslutte nå.\n"
 "Du bør sjekke installasjonen av %s eller reinstallere %s."
 
-#: vicious-extensions/glade-helper.c:252
+#: vicious-extensions/glade-helper.c:255
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3299,14 +3721,12 @@ msgstr ""
 "Glade filen er på crack! Sjekk at korrekt fil er installert!\n"
 "fil: %s widget: %s forventet antall clist-kolonner: %d"
 
-#: vicious-extensions/glade-helper.c:270
-#, c-format
+#: vicious-extensions/glade-helper.c:274
+#, fuzzy, c-format
 msgid ""
-"An error occured while loading the user interface\n"
-"from file %s.\n"
-"Possibly the glade interface description was not found.\n"
-"%s cannot continue and will exit now.\n"
-"You should check your installation of %s or reinstall %s."
+"An error occured while loading the user interface from file %s.  Possibly "
+"the glade interface description was not found.  %s cannot continue and will "
+"exit now.  You should check your installation of %s or reinstall %s."
 msgstr ""
 "En feil oppsto under lasting av brukergrensesnitt\n"
 "fra fil %s.\n"
@@ -3315,7 +3735,7 @@ msgstr ""
 "%s kan ikke fortsette og vil avslutte nå.\n"
 "Du bør sjekke installasjonen av %s eller installere %s på nytt."
 
-#: vicious-extensions/glade-helper.c:281
+#: vicious-extensions/glade-helper.c:286
 #, c-format
 msgid "No interface could be loaded, BAD! (file: %s)"
 msgstr "Ingen grensesnitt kunne lastes! (fil: %s)"