Fix intltool req. Update this.

2006-08-15  Kjartan Maraas  <kmaraas@gnome.org>

	* configure.ac: Fix intltool req.
	* po/nb.po: Update this.

3 files changed, 265 insertions, 256 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e7275c3..7398a2e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-15  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.ac: Fix intltool req.
+	* po/nb.po: Update this.
+
 2006-08-08  Ray Strode <rstrode@redhat.com>
 
 	* gui/gdmwm.[ch] (gdm_wm_center_cursor): new function
diff --git a/configure.ac b/configure.ac
index 0174151b..9c56483e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE(gdm,2.15.9)
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.34.90])
+IT_PROG_INTLTOOL([0.35.0])
 
 GNOME_DOC_INIT
 
diff --git a/po/nb.po b/po/nb.po
index a99e28dc..5cc5a546 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gdm 2.13.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-28 22:34+0200\n"
+"POT-Creation-Date: 2006-08-01 14:52+0200\n"
 "PO-Revision-Date: 2006-05-28 22:42+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -57,13 +57,18 @@ msgid ""
 "Failed to 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 "
 "reconfigure the X server.  Then restart GDM."
-msgstr "Kan ikke starte X-tjeneren (ditt grafiske grensesnitt). Den er sannsynligvis ikke konfigurert riktig. Du må logge inn på et konsoll og kjøre konfigurasjonsprogrammet for X-tjeneren. Start så GDM på nytt."
+msgstr ""
+"Kan ikke starte X-tjeneren (ditt grafiske grensesnitt). Den er sannsynligvis "
+"ikke konfigurert riktig. Du må logge inn på et konsoll og kjøre "
+"konfigurasjonsprogrammet for X-tjeneren. Start så GDM på nytt."
 
 #: ../config/gettextfoo.h:6
 msgid ""
 "Would you like to try to configure the X server?  Note that you will need "
 "the root password for this."
-msgstr "Vil du prøve å konfigurere X-tjeneren? Du må ha root-passordet for for å gjøre dette."
+msgstr ""
+"Vil du prøve å konfigurere X-tjeneren? Du må ha root-passordet for for å "
+"gjøre dette."
 
 #: ../config/gettextfoo.h:7
 msgid "Please type in the root (privileged user) password."
@@ -76,14 +81,17 @@ msgstr "Prøver å starte X-tjeneren på nytt."
 #: ../config/gettextfoo.h:9
 msgid ""
 "The X server is now disabled.  Restart GDM when it is configured correctly."
-msgstr "X-tjeneren er deaktivert. Start GDM på nytt når den er konfigurert riktig."
+msgstr ""
+"X-tjeneren er deaktivert. Start GDM på nytt når den er konfigurert riktig."
 
 #: ../config/gettextfoo.h:10
 msgid ""
 "Failed to start the X server (your graphical interface).  It is likely that "
 "it is not set up correctly.  Would you like to view the X server output to "
 "diagnose the problem?"
-msgstr "Kan ikke starte X-tjeneren (ditt grafiske grensesnitt). Sannsynligvis er den ikke satt opp riktig. Vil du se utskrift fra X-tjeneren?"
+msgstr ""
+"Kan ikke starte X-tjeneren (ditt grafiske grensesnitt). Sannsynligvis er den "
+"ikke satt opp riktig. Vil du se utskrift fra X-tjeneren?"
 
 #: ../config/gettextfoo.h:11
 msgid "Would you like to view the detailed X server output as well?"
@@ -94,13 +102,16 @@ msgid ""
 "Failed to start the X server (your graphical interface).  It seems that the "
 "pointer device (your mouse) is not set up correctly.  Would you like to view "
 "the X server output to diagnose the problem?"
-msgstr "Kan ikke starte X-tjeneren (ditt grafiske grensesnitt). Det ser ut til at pekeren (musen) ikke er satt opp riktig. Vil du se utskrift fra X-tjeneren?"
+msgstr ""
+"Kan ikke starte X-tjeneren (ditt grafiske grensesnitt). Det ser ut til at "
+"pekeren (musen) ikke er satt opp riktig. Vil du se utskrift fra X-tjeneren?"
 
 #: ../config/gettextfoo.h:13 ../config/gettextfoo.h:14
 msgid ""
 "Would you like to try to configure the mouse?  Note that you will need the "
 "root password for this."
-msgstr "Vil du prøve å konfigurere musen? Du må ha root-passordet for å gjøre dette."
+msgstr ""
+"Vil du prøve å konfigurere musen? Du må ha root-passordet for å gjøre dette."
 
 #: ../config/gettextfoo.h:15
 msgid ""
@@ -354,7 +365,7 @@ msgstr ""
 "Gjentatte feil under oppstart av X-tjeneren over en kort tidsperiode; "
 "stenger skjerm %s"
 
-#: ../daemon/gdm.c:568 ../daemon/gdm.c:2306
+#: ../daemon/gdm.c:568 ../daemon/gdm.c:2307
 msgid "Master suspending..."
 msgstr "Sjef går i dvale..."
 
@@ -478,8 +489,8 @@ msgstr "Bare root ønsker å kjøre gdm\n"
 #: ../daemon/misc.c:1794 ../daemon/misc.c:1798 ../daemon/misc.c:1802
 #: ../daemon/server.c:522 ../daemon/server.c:535 ../daemon/slave.c:792
 #: ../daemon/slave.c:806 ../daemon/slave.c:816 ../daemon/slave.c:826
-#: ../daemon/slave.c:838 ../gui/gdmlogin.c:3554 ../gui/gdmlogin.c:3565
-#: ../gui/gdmlogin.c:3571
+#: ../daemon/slave.c:838 ../gui/gdmlogin.c:3399 ../gui/gdmlogin.c:3410
+#: ../gui/gdmlogin.c:3416
 #, c-format
 msgid "%s: Error setting up %s signal handler: %s"
 msgstr "%s: Feil under oppsett av signalhåndterer for %s: %s"
@@ -493,24 +504,24 @@ msgstr "GDM kjører allerede. Avbryter!"
 msgid "%s: Error setting up CHLD signal handler"
 msgstr "%s: Feil under oppsett av CHLD signalhåndtereren"
 
-#: ../daemon/gdm.c:2722
+#: ../daemon/gdm.c:2723
 msgid "DYNAMIC request denied: Not authenticated"
 msgstr "DYNAMIC-forespørsel nektet: Ikke autentisert"
 
-#: ../daemon/gdm.c:2888 ../daemon/gdm.c:2906 ../daemon/gdm.c:3197
-#: ../daemon/gdm.c:3249 ../daemon/gdm.c:3302 ../daemon/gdm.c:3343
-#: ../daemon/gdm.c:3369
+#: ../daemon/gdm.c:2889 ../daemon/gdm.c:2907 ../daemon/gdm.c:3189
+#: ../daemon/gdm.c:3241 ../daemon/gdm.c:3294 ../daemon/gdm.c:3335
+#: ../daemon/gdm.c:3361
 #, c-format
 msgid "%s request denied: Not authenticated"
 msgstr "%s-forespørsel nektet: Ikke autentisert"
 
 #. Don't print the name to syslog as it might be
 #. * long and dangerous
-#: ../daemon/gdm.c:2924
+#: ../daemon/gdm.c:2925
 msgid "Unknown server type requested; using standard server."
 msgstr "Ukjent tjenertype etterspurt, bruker forvalgt tjener."
 
-#: ../daemon/gdm.c:2928
+#: ../daemon/gdm.c:2929
 #, c-format
 msgid ""
 "Requested server %s not allowed to be used for flexible servers; using "
@@ -519,57 +530,57 @@ msgstr ""
 "Forespurt tjener, %s, er ikke tillatt som fleksibel tjener. Bruker forvalgt "
 "tjener."
 
-#: ../daemon/gdmconfig.c:558 ../daemon/gdmconfig.c:565
+#: ../daemon/gdmconfig.c:553 ../daemon/gdmconfig.c:560
 #, c-format
 msgid "%s: No GDM configuration file: %s. Using defaults."
 msgstr "%s: Ingen konfigurasjonsfil for GDM: %s. Bruker forvalg."
 
-#: ../daemon/gdmconfig.c:1076
+#: ../daemon/gdmconfig.c:1072
 #, c-format
 msgid "%s: BaseXsession empty; using %s/gdm/Xsession"
 msgstr "%s: BaseXsession er tom. Bruker %s/gdm/Xsession"
 
-#: ../daemon/gdmconfig.c:1109
+#: ../daemon/gdmconfig.c:1105
 #, c-format
 msgid "%s: Standard X server not found; trying alternatives"
 msgstr "%s: Forvalgt X-tjener ble ikke funnet. Prøver alternativer"
 
-#: ../daemon/gdmconfig.c:1168
+#: ../daemon/gdmconfig.c:1164
 #, c-format
 msgid "%s: No greeter specified."
 msgstr "%s: Ingen velkomst spesifisert."
 
-#: ../daemon/gdmconfig.c:1170
+#: ../daemon/gdmconfig.c:1166
 #, c-format
 msgid "%s: No remote greeter specified."
 msgstr "%s: Ingen velkomst spesifisert."
 
-#: ../daemon/gdmconfig.c:1172
+#: ../daemon/gdmconfig.c:1168
 #, c-format
 msgid "%s: No sessions directory specified."
 msgstr "%s: Ingen sesjonskatalog spesifisert."
 
-#: ../daemon/gdmconfig.c:1256
+#: ../daemon/gdmconfig.c:1252
 #, c-format
 msgid "%s: XDMCP was enabled while there is no XDMCP support; turning it off"
 msgstr "%s: XDMCP er aktivert selv om det ikke er støttet, deaktiverer"
 
-#: ../daemon/gdmconfig.c:1317
+#: ../daemon/gdmconfig.c:1313
 #, c-format
 msgid "%s: TimedLoginDelay is less than 5, defaulting to 5."
 msgstr "%s: TimedLoginDelay er mindre enn 5, bruker 5."
 
-#: ../daemon/gdmconfig.c:1555
+#: ../daemon/gdmconfig.c:1551
 #, c-format
 msgid "%s: Priority out of bounds; changed to %d"
 msgstr "%s: Prioritet utenfor gyldig område; endret til %d"
 
-#: ../daemon/gdmconfig.c:1561
+#: ../daemon/gdmconfig.c:1557
 #, c-format
 msgid "%s: Empty server command; using standard command."
 msgstr "%s: Tom tjenerkommando, bruker forvalgt kommando."
 
-#: ../daemon/gdmconfig.c:1760
+#: ../daemon/gdmconfig.c:1756
 #, c-format
 msgid ""
 "%s: Logdir %s does not exist or isn't a directory.  Using ServAuthDir %s."
@@ -577,7 +588,7 @@ msgstr ""
 "%s: Katalog for logger, %s, eksisterer ikke eller er ikke en katalog. Bruker "
 "ServAuthDir %s."
 
-#: ../daemon/gdmconfig.c:1777
+#: ../daemon/gdmconfig.c:1773
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
@@ -587,12 +598,12 @@ msgstr ""
 "denne eksisterer ikke. Vennligst korriger konfigurasjonen og start GDM på "
 "nytt."
 
-#: ../daemon/gdmconfig.c:1788
+#: ../daemon/gdmconfig.c:1784
 #, c-format
 msgid "%s: Authdir %s does not exist. Aborting."
 msgstr "%s: Autentiseringskatalog %s eksisterer ikke. Avbryter."
 
-#: ../daemon/gdmconfig.c:1794
+#: ../daemon/gdmconfig.c:1790
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
@@ -602,24 +613,24 @@ msgstr ""
 "dette er ikke en katalog. Vennligst korriger konfigurasjonen og start GDM på "
 "nytt."
 
-#: ../daemon/gdmconfig.c:1805
+#: ../daemon/gdmconfig.c:1801
 #, c-format
 msgid "%s: Authdir %s is not a directory. Aborting."
 msgstr "%s: Autentiseringskatalog %s er ikke en katalog. Avbryter."
 
-#: ../daemon/gdmconfig.c:1878
+#: ../daemon/gdmconfig.c:1874
 #, c-format
 msgid "%s: Invalid server line in config file. Ignoring!"
 msgstr "%s: Ugyldig tjenerlinje i konfigurasjonsfil. Ignorerer!"
 
-#: ../daemon/gdmconfig.c:2000 ../daemon/gdmconfig.c:2041
+#: ../daemon/gdmconfig.c:1996 ../daemon/gdmconfig.c:2037
 #, c-format
 msgid "%s: XDMCP disabled and no static servers defined. Aborting!"
 msgstr "%s: XDMCP er deaktivert og ingen lokale tjenere definert. Avbryter!"
 
 #. start
 #. server uid
-#: ../daemon/gdmconfig.c:2018
+#: ../daemon/gdmconfig.c:2014
 #, c-format
 msgid ""
 "%s: XDMCP disabled and no static servers defined. Adding %s on :%d to allow "
@@ -628,7 +639,7 @@ msgstr ""
 "%s: XDMCP er slått av og ingen lokale tjenere definert. Legger til %s på :%d "
 "for å tillate konfigurasjon!"
 
-#: ../daemon/gdmconfig.c:2031
+#: ../daemon/gdmconfig.c:2027
 msgid ""
 "XDMCP is disabled and GDM cannot find any static server to start.  "
 "Aborting!  Please correct the configuration and restart GDM."
@@ -636,7 +647,7 @@ msgstr ""
 "XDMCP er deaktivert og gdm kan ikke finne noen lokale tjenere å starte. "
 "Avbryter! Vennligst korriger konfigurasjon og start GDM på nytt."
 
-#: ../daemon/gdmconfig.c:2060
+#: ../daemon/gdmconfig.c:2056
 #, c-format
 msgid ""
 "The GDM user '%s' does not exist. Please correct GDM configuration and "
@@ -645,12 +656,12 @@ msgstr ""
 "GDM-bruker «%s» eksisterer ikke. Vennligst korriger GDM-konfigurasjonen og "
 "start gdm på nytt."
 
-#: ../daemon/gdmconfig.c:2068
+#: ../daemon/gdmconfig.c:2064
 #, c-format
 msgid "%s: Can't find the GDM user '%s'. Aborting!"
 msgstr "%s: Kan ikke finne GDM-bruker «%s». Avbryter!"
 
-#: ../daemon/gdmconfig.c:2075
+#: ../daemon/gdmconfig.c:2071
 msgid ""
 "The GDM user is set to be root, but this is not allowed since it can pose a "
 "security risk.  Please correct GDM configuration and restart GDM."
@@ -659,12 +670,12 @@ msgstr ""
 "være en sikkerhetsrisiko. Vennligst korriger GDM-konfigurasjonen og start "
 "GDM på nytt."
 
-#: ../daemon/gdmconfig.c:2086
+#: ../daemon/gdmconfig.c:2082
 #, 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/gdmconfig.c:2093
+#: ../daemon/gdmconfig.c:2089
 #, c-format
 msgid ""
 "The GDM group '%s' does not exist. Please correct GDM configuration and "
@@ -673,12 +684,12 @@ msgstr ""
 "GDM-gruppe «%s» eksisterer ikke. Vennligst korriger konfigurasjonen og start "
 "GDM på nytt."
 
-#: ../daemon/gdmconfig.c:2101
+#: ../daemon/gdmconfig.c:2097
 #, c-format
 msgid "%s: Can't find the GDM group '%s'. Aborting!"
 msgstr "%s: Kan ikke finne GDM-gruppe «%s». Avbryter."
 
-#: ../daemon/gdmconfig.c:2108
+#: ../daemon/gdmconfig.c:2104
 msgid ""
 "The GDM group is set to be root, but this is not allowed since it can pose a "
 "security risk. Please correct GDM configuration and restart GDM."
@@ -687,36 +698,36 @@ msgstr ""
 "være en sikkerhetsrisiko. Vennligst korriger konfigurasjonen og start GDM på "
 "nytt."
 
-#: ../daemon/gdmconfig.c:2118
+#: ../daemon/gdmconfig.c:2114
 #, 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/gdmconfig.c:2127
+#: ../daemon/gdmconfig.c:2123
 #, 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/gdmconfig.c:2133
+#: ../daemon/gdmconfig.c:2129
 #, 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/gdmconfig.c:2141
+#: ../daemon/gdmconfig.c:2137
 #, 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/gdmconfig.c:2150
+#: ../daemon/gdmconfig.c:2146
 msgid "No daemon/ServAuthDir specified in the GDM configuration file"
 msgstr "Ingen daemon/ServAuthDir spesifisert i konfigurasjonsfilen for GDM"
 
-#: ../daemon/gdmconfig.c:2153
+#: ../daemon/gdmconfig.c:2149
 #, c-format
 msgid "%s: No daemon/ServAuthDir specified."
 msgstr "%s: daemon/ServAuthDir ikke spesifisert."
 
-#: ../daemon/gdmconfig.c:2177
+#: ../daemon/gdmconfig.c:2173
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but is not "
@@ -727,13 +738,13 @@ msgstr ""
 "denne eies ikke av bruker %s og gruppe %s. Vennligst korriger eierskap eller "
 "konfigurasjonen og start GDM på nytt."
 
-#: ../daemon/gdmconfig.c:2189
+#: ../daemon/gdmconfig.c:2185
 #, 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/gdmconfig.c:2195
+#: ../daemon/gdmconfig.c:2191
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but has the "
@@ -744,7 +755,7 @@ msgstr ""
 "gale rettigheter. Det skal være %o. Vennligst korriger rettighetene eller "
 "konfigurasjonen og start GDM på nytt."
 
-#: ../daemon/gdmconfig.c:2208
+#: ../daemon/gdmconfig.c:2204
 #, c-format
 msgid "%s: Authdir %s has wrong permissions %o. Should be %o. Aborting."
 msgstr ""
@@ -1409,7 +1420,7 @@ msgid "Caps Lock is on."
 msgstr "Caps Lock er på."
 
 #: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:525
-#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2807
+#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2652
 msgid "Please enter your username"
 msgstr "Vennligst skriv inn brukernavn"
 
@@ -1417,16 +1428,16 @@ msgstr "Vennligst skriv inn brukernavn"
 #: ../daemon/verify-crypt.c:119 ../daemon/verify-pam.c:425
 #: ../daemon/verify-pam.c:426 ../daemon/verify-pam.c:427
 #: ../daemon/verify-pam.c:512 ../daemon/verify-pam.c:864
-#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:1009 ../gui/gdmlogin.c:1023
-#: ../gui/gdmlogin.c:1651 ../gui/gdmlogin.c:2137 ../gui/greeter/greeter.c:174
+#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:884 ../gui/gdmlogin.c:898
+#: ../gui/gdmlogin.c:1537 ../gui/gdmlogin.c:1982 ../gui/greeter/greeter.c:188
 #: ../gui/greeter/greeter_parser.c:395
 msgid "Username:"
 msgstr "Brukernavn:"
 
 #: ../daemon/verify-crypt.c:157 ../daemon/verify-pam.c:428
 #: ../daemon/verify-pam.c:429 ../daemon/verify-pam.c:573
-#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1692
-#: ../gui/greeter/greeter.c:199
+#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1575
+#: ../gui/greeter/greeter.c:210
 msgid "Password:"
 msgstr "Passord:"
 
@@ -1454,7 +1465,7 @@ msgid "User %s not allowed to log in"
 msgstr "Bruker %s har ikke tillatelse til å logge inn"
 
 #: ../daemon/verify-crypt.c:222 ../daemon/verify-crypt.c:246
-#: ../daemon/verify-pam.c:1021 ../daemon/verify-pam.c:1312
+#: ../daemon/verify-pam.c:1021 ../daemon/verify-pam.c:1316
 #: ../daemon/verify-shadow.c:240 ../daemon/verify-shadow.c:264
 msgid ""
 "\n"
@@ -1464,14 +1475,14 @@ msgstr ""
 "Systemadministrator har deaktivert din konto."
 
 #: ../daemon/verify-crypt.c:269 ../daemon/verify-crypt.c:407
-#: ../daemon/verify-pam.c:1039 ../daemon/verify-pam.c:1329
+#: ../daemon/verify-pam.c:1039 ../daemon/verify-pam.c:1333
 #: ../daemon/verify-shadow.c:287 ../daemon/verify-shadow.c:425
 #, c-format
 msgid "Cannot set user group for %s"
 msgstr "Kan ikke sette brukergruppe for %s"
 
 #: ../daemon/verify-crypt.c:271 ../daemon/verify-crypt.c:410
-#: ../daemon/verify-pam.c:1041 ../daemon/verify-pam.c:1332
+#: ../daemon/verify-pam.c:1041 ../daemon/verify-pam.c:1336
 #: ../daemon/verify-shadow.c:289 ../daemon/verify-shadow.c:428
 msgid ""
 "\n"
@@ -1621,7 +1632,7 @@ msgstr "Kan ikke sette PAM_RHOST=%s"
 #. pretty much look as such, it shouldn't really
 #. happen
 #: ../daemon/verify-pam.c:925 ../daemon/verify-pam.c:943
-#: ../daemon/verify-pam.c:1251 ../daemon/verify-pam.c:1263
+#: ../daemon/verify-pam.c:1255 ../daemon/verify-pam.c:1267
 msgid "Couldn't authenticate user"
 msgstr "Kunne ikke autentisere bruker"
 
@@ -1633,12 +1644,12 @@ msgstr ""
 "\n"
 "Systemadministrator kan ikke logge inn fra denne skjermen"
 
-#: ../daemon/verify-pam.c:1002 ../daemon/verify-pam.c:1293
+#: ../daemon/verify-pam.c:1002 ../daemon/verify-pam.c:1297
 #, c-format
 msgid "Authentication token change failed for user %s"
 msgstr "Endring av autentiseringstoken feilet for bruker %s"
 
-#: ../daemon/verify-pam.c:1004 ../daemon/verify-pam.c:1296
+#: ../daemon/verify-pam.c:1004 ../daemon/verify-pam.c:1300
 msgid ""
 "\n"
 "The change of the authentication token failed. Please try again later or "
@@ -1648,12 +1659,12 @@ msgstr ""
 "Endring av autentiseringstoken feilet. Vennligst prøve igjen senere eller "
 "kontakt systemadministrator."
 
-#: ../daemon/verify-pam.c:1019 ../daemon/verify-pam.c:1309
+#: ../daemon/verify-pam.c:1019 ../daemon/verify-pam.c:1313
 #, 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:1025 ../daemon/verify-pam.c:1315
+#: ../daemon/verify-pam.c:1025 ../daemon/verify-pam.c:1319
 #, c-format
 msgid "User %s not permitted to gain access at this time"
 msgstr "Bruker %s har ikke tilgangsrettigheter til systemet nå"
@@ -1666,17 +1677,17 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert tilgang til systemet midlertidig."
 
-#: ../daemon/verify-pam.c:1032 ../daemon/verify-pam.c:1322
+#: ../daemon/verify-pam.c:1032 ../daemon/verify-pam.c:1326
 #, c-format
 msgid "Couldn't set acct. mgmt for %s"
 msgstr "Kunne ikke sette kontohåndtering for %s"
 
-#: ../daemon/verify-pam.c:1065 ../daemon/verify-pam.c:1356
+#: ../daemon/verify-pam.c:1065 ../daemon/verify-pam.c:1360
 #, c-format
 msgid "Couldn't set credentials for %s"
 msgstr "Kunne ikke sette credentials for %s"
 
-#: ../daemon/verify-pam.c:1079 ../daemon/verify-pam.c:1372
+#: ../daemon/verify-pam.c:1079 ../daemon/verify-pam.c:1376
 #, c-format
 msgid "Couldn't open session for %s"
 msgstr "Kunne ikke åpne sesjon for %s"
@@ -1689,16 +1700,16 @@ msgstr ""
 "\n"
 "Autentisering feilet. Sjekk store og små bokstaver."
 
-#: ../daemon/verify-pam.c:1147 ../daemon/verify-pam.c:1254
-#: ../daemon/verify-pam.c:1266
+#: ../daemon/verify-pam.c:1147 ../daemon/verify-pam.c:1258
+#: ../daemon/verify-pam.c:1270
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: ../daemon/verify-pam.c:1221
+#: ../daemon/verify-pam.c:1222
 msgid "Automatic login"
 msgstr "Automatisk innlogging"
 
-#: ../daemon/verify-pam.c:1318
+#: ../daemon/verify-pam.c:1322
 msgid ""
 "\n"
 "The system administrator has disabled your access to the system temporarily."
@@ -1706,7 +1717,7 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert din tilgang til systemet midlertidig."
 
-#: ../daemon/verify-pam.c:1540 ../daemon/verify-pam.c:1542
+#: ../daemon/verify-pam.c:1544 ../daemon/verify-pam.c:1546
 msgid "Can't find PAM configuration for GDM."
 msgstr "Kan ikke finne PAM-konfigurasjon for GDM."
 
@@ -2184,7 +2195,7 @@ msgstr "For mange meldinger ble sendt til GDM og programmet gikk i heng."
 msgid "Unknown error occurred."
 msgstr "Ukjent feil oppsto."
 
-#: ../gui/gdmcommon.c:592
+#: ../gui/gdmcommon.c:598
 msgid "%a %b %d, %H:%M"
 msgstr "%a %b %d, %H:%M"
 
@@ -2192,11 +2203,11 @@ msgstr "%a %b %d, %H:%M"
 #. %H:%M if your language does not have AM and PM
 #. equivalent.  Note: %l is a strftime option for
 #. 12-hour clock format
-#: ../gui/gdmcommon.c:598
+#: ../gui/gdmcommon.c:604
 msgid "%a %b %d, %l:%M %p"
 msgstr "%a %d %b, %H:%M"
 
-#: ../gui/gdmcommon.c:704
+#: ../gui/gdmcommon.c:710
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2238,18 +2249,18 @@ msgstr "\t-t maks forsøk på tilkobling (forvalg 15)\n"
 msgid "\t-s sleep value (default 8)\n"
 msgstr "\t-s verdi for pause (forvalg 8)\n"
 
-#: ../gui/gdmdynamic.c:230
+#: ../gui/gdmdynamic.c:229
 msgid "Server busy, will sleep.\n"
 msgstr "Tjener opptatt, venter.\n"
 
-#: ../gui/gdmdynamic.c:320
+#: ../gui/gdmdynamic.c:319
 #, c-format
 msgid "Connection to daemon failed, sleeping for %d seconds.  Retry %d of %d\n"
 msgstr ""
 "Tilkobling til tjenesten feilet. Venter i %d sekunder. Forsøk %d av %d\n"
 
 #. This is a serious error, so print a message even if verbose is off
-#: ../gui/gdmdynamic.c:343
+#: ../gui/gdmdynamic.c:342
 #, c-format
 msgid "Failed to connect to server after %d retries\n"
 msgstr "Kunne ikke koble til tjener etter %d forsøk\n"
@@ -2308,8 +2319,8 @@ msgstr "Skjerm %s på virtuell terminal %d"
 msgid "Nested display %s on virtual terminal %d"
 msgstr "Innbakt skjerm %s på virtuell terminal %d"
 
-#: ../gui/gdmflexiserver.c:262 ../gui/gdmlogin.c:2655
-#: ../gui/greeter/greeter_item_ulist.c:270
+#: ../gui/gdmflexiserver.c:262 ../gui/gdmlogin.c:2500
+#: ../gui/greeter/greeter_item_ulist.c:274
 msgid "Username"
 msgstr "Brukernavn"
 
@@ -2841,119 +2852,92 @@ msgstr "A-M"
 msgid "N-Z"
 msgstr "N-Z"
 
-#: ../gui/gdmlogin.c:356
+#: ../gui/gdmlogin.c:355
 #, c-format
 msgid "Cannot run command '%s': %s."
 msgstr "Kan ikke kjøre kommando «%s»: %s."
 
-#: ../gui/gdmlogin.c:364
+#: ../gui/gdmlogin.c:363
 msgid "Cannot start background application"
 msgstr "Kan ikke starte bakgrunnsprogram"
 
-#: ../gui/gdmlogin.c:438 ../gui/greeter/greeter_parser.c:381
+#: ../gui/gdmlogin.c:437 ../gui/greeter/greeter_parser.c:381
 msgid "User %u will login in %t"
 msgstr "Bruker %u vil logge på om %t"
 
-#: ../gui/gdmlogin.c:656 ../gui/greeter/greeter_system.c:71
+#: ../gui/gdmlogin.c:662 ../gui/greeter/greeter_system.c:76
 msgid "Are you sure you want to restart the computer?"
 msgstr "Er du sikker på at du vil starte datamaskinen på nytt?"
 
-#: ../gui/gdmlogin.c:657 ../gui/gdmlogin.c:2528
-#: ../gui/greeter/greeter_parser.c:356 ../gui/greeter/greeter_system.c:72
-#: ../gui/greeter/greeter_system.c:178
+#: ../gui/gdmlogin.c:663 ../gui/gdmlogin.c:2373
+#: ../gui/greeter/greeter_parser.c:356 ../gui/greeter/greeter_system.c:77
+#: ../gui/greeter/greeter_system.c:196
 msgid "_Restart"
 msgstr "Sta_rt på nytt"
 
-#: ../gui/gdmlogin.c:671 ../gui/greeter/greeter_system.c:83
+#: ../gui/gdmlogin.c:677 ../gui/greeter/greeter_system.c:91
 msgid "Are you sure you want to Shut Down the computer?"
 msgstr "Er du sikker på at du vil slå av datamaskinen?"
 
-#: ../gui/gdmlogin.c:672 ../gui/gdmlogin.c:2538
-#: ../gui/greeter/greeter_parser.c:346 ../gui/greeter/greeter_system.c:84
-#: ../gui/greeter/greeter_system.c:187
+#: ../gui/gdmlogin.c:678 ../gui/gdmlogin.c:2383
+#: ../gui/greeter/greeter_parser.c:346 ../gui/greeter/greeter_system.c:92
+#: ../gui/greeter/greeter_system.c:205
 msgid "Shut _Down"
 msgstr "Slå _av"
 
-#: ../gui/gdmlogin.c:694 ../gui/greeter/greeter_system.c:94
+#: ../gui/gdmlogin.c:700 ../gui/greeter/greeter_system.c:106
 msgid "Are you sure you want to suspend the computer?"
 msgstr "Er du sikker på at du vil sette datamaskinen i hvilemodus?"
 
-#: ../gui/gdmlogin.c:695 ../gui/gdmlogin.c:2548
-#: ../gui/greeter/greeter_system.c:95
+#: ../gui/gdmlogin.c:701 ../gui/gdmlogin.c:2393
+#: ../gui/greeter/greeter_system.c:107
 msgid "_Suspend"
 msgstr "_Hvilemodus"
 
+#: ../gui/gdmlogin.c:748 ../gui/gdmlogin.c:757
+#: ../gui/greeter/greeter_action_language.c:73
+#: ../gui/greeter/greeter_action_language.c:142
+#: ../gui/greeter/greeter_action_language.c:150
+msgid "System Default"
+msgstr "Systemforvalg"
+
 #. never_encoding
 #. no_group
 #. untranslated
 #. markup
-#: ../gui/gdmlogin.c:779 ../gui/gdmlogin.c:808 ../gui/gdmlogin.c:891
+#: ../gui/gdmlogin.c:766 ../gui/gdmsession.c:395 ../gui/gdmsession.c:431
 #: ../gui/greeter/greeter_action_language.c:158
-#: ../gui/greeter/greeter_session.c:119 ../gui/greeter/greeter_session.c:150
 #, c-format
 msgid "Do you wish to make %s the default for future sessions?"
 msgstr "Ønsker du å bruke %s som forvalg for fremtidige sesjoner?"
 
-#: ../gui/gdmlogin.c:782 ../gui/greeter/greeter_session.c:122
+#: ../gui/gdmlogin.c:768 ../gui/gdmsession.c:434
+#: ../gui/greeter/greeter_action_language.c:160
 #, c-format
-msgid "Your preferred session type %s is not installed on this computer."
-msgstr "Din foretrukne sesjonstype %s er ikke installert på denne maskinen."
+msgid "You have chosen %s for this session, but your default setting is %s."
+msgstr "Du har valgt %s for denne sesjonen, men forvalgt innstilling er %s."
 
-#: ../gui/gdmlogin.c:787 ../gui/gdmlogin.c:818 ../gui/gdmlogin.c:899
+#: ../gui/gdmlogin.c:774 ../gui/gdmsession.c:402 ../gui/gdmsession.c:440
 #: ../gui/greeter/greeter_action_language.c:166
-#: ../gui/greeter/greeter_session.c:126 ../gui/greeter/greeter_session.c:159
 msgid "Make _Default"
 msgstr "Bruk som _forvalg"
 
-#: ../gui/gdmlogin.c:787 ../gui/greeter/greeter_session.c:126
-msgid "Just _Log In"
-msgstr "Bare _logg inn"
-
-#: ../gui/gdmlogin.c:812 ../gui/gdmlogin.c:893
-#: ../gui/greeter/greeter_action_language.c:160
-#: ../gui/greeter/greeter_session.c:153
-#, c-format
-msgid "You have chosen %s for this session, but your default setting is %s."
-msgstr "Du har valgt %s for denne sesjonen, men forvalgt innstilling er %s."
-
-#: ../gui/gdmlogin.c:818 ../gui/gdmlogin.c:899
+#: ../gui/gdmlogin.c:774 ../gui/gdmsession.c:440
 #: ../gui/greeter/greeter_action_language.c:166
-#: ../gui/greeter/greeter_session.c:159
 msgid "Just For _This Session"
 msgstr "Kun for _denne sesjonen"
 
-#: ../gui/gdmlogin.c:829
-#, c-format
-msgid "You have chosen %s for this session."
-msgstr "Du har valgt %s for denne sesjonen."
-
-#: ../gui/gdmlogin.c:832
-#, c-format
-msgid ""
-"If you wish to make %s the default for future sessions, run the 'switchdesk' "
-"utility (System Tools->Desktop Switching Tool from the main menu)."
-msgstr ""
-"Kjør programmet «switchdesk» hvis du vil gjøre %s til forvalg for fremtidige "
-"sesjoner. (Systemverktøy->Bytt skrivebord fra hovedmenyen)."
-
-#: ../gui/gdmlogin.c:873 ../gui/gdmlogin.c:882
-#: ../gui/greeter/greeter_action_language.c:73
-#: ../gui/greeter/greeter_action_language.c:142
-#: ../gui/greeter/greeter_action_language.c:150
-msgid "System Default"
-msgstr "Systemforvalg"
-
-#: ../gui/gdmlogin.c:1010 ../gui/gdmlogin.c:1024 ../gui/gdmlogin.c:1655
-#: ../gui/gdmlogin.c:2138 ../gui/gdmlogin.c:2760
+#: ../gui/gdmlogin.c:885 ../gui/gdmlogin.c:899 ../gui/gdmlogin.c:1541
+#: ../gui/gdmlogin.c:1983 ../gui/gdmlogin.c:2605
 msgid "_Username:"
 msgstr "Br_ukernavn:"
 
-#: ../gui/gdmlogin.c:1102
+#: ../gui/gdmlogin.c:977
 #, c-format
 msgid "%s session selected"
 msgstr "%s sesjon valgt"
 
-#: ../gui/gdmlogin.c:1123 ../gui/gdmlogin.c:1241
+#: ../gui/gdmlogin.c:998 ../gui/gdmlogin.c:1116
 msgid "_Last"
 msgstr "_Forrige"
 
@@ -2961,89 +2945,89 @@ msgstr "_Forrige"
 #. no_group
 #. untranslated
 #. makrup
-#: ../gui/gdmlogin.c:1206
+#: ../gui/gdmlogin.c:1081
 #, c-format
 msgid "%s language selected"
 msgstr "språk %s valgt"
 
-#: ../gui/gdmlogin.c:1252
+#: ../gui/gdmlogin.c:1127
 msgid "_System Default"
 msgstr "_Systemets forvalg"
 
-#: ../gui/gdmlogin.c:1284
+#: ../gui/gdmlogin.c:1159
 msgid "_Other"
 msgstr "_Annet"
 
-#: ../gui/gdmlogin.c:1693
+#: ../gui/gdmlogin.c:1576
 msgid "_Password:"
 msgstr "_Passord:"
 
 #. translators:  This is a nice and evil eggie text, translate
 #. * to your favourite currency
-#: ../gui/gdmlogin.c:1925 ../gui/greeter/greeter.c:348
+#: ../gui/gdmlogin.c:1787 ../gui/greeter/greeter.c:340
 msgid "Please insert 25 cents to log in."
 msgstr "Vennligst legg på 5 kroner for å logge inn."
 
-#: ../gui/gdmlogin.c:2259
+#: ../gui/gdmlogin.c:2104
 msgid "GNOME Desktop Manager"
 msgstr "GNOME skrivebordshåndterer"
 
-#: ../gui/gdmlogin.c:2325
+#: ../gui/gdmlogin.c:2170
 msgid "Finger"
 msgstr "Finger"
 
-#: ../gui/gdmlogin.c:2443
+#: ../gui/gdmlogin.c:2288
 msgid "GDM Login"
 msgstr "GDM innlogging"
 
-#: ../gui/gdmlogin.c:2486 ../gui/greeter/greeter_parser.c:326
+#: ../gui/gdmlogin.c:2331 ../gui/greeter/greeter_parser.c:326
 msgid "_Session"
 msgstr "_Sesjon"
 
-#: ../gui/gdmlogin.c:2493 ../gui/greeter/greeter_parser.c:321
+#: ../gui/gdmlogin.c:2338 ../gui/greeter/greeter_parser.c:321
 msgid "_Language"
 msgstr "S_pråk"
 
-#: ../gui/gdmlogin.c:2507 ../gui/greeter/greeter_system.c:153
+#: ../gui/gdmlogin.c:2352 ../gui/greeter/greeter_system.c:171
 msgid "Remote Login via _XDMCP..."
 msgstr "Ekstern pålogging via _XDMCP..."
 
-#: ../gui/gdmlogin.c:2518
+#: ../gui/gdmlogin.c:2363
 msgid "_Configure Login Manager..."
 msgstr "_Konfigurer hånderer for innlogging..."
 
-#: ../gui/gdmlogin.c:2558 ../gui/greeter/greeter_parser.c:331
+#: ../gui/gdmlogin.c:2403 ../gui/greeter/greeter_parser.c:331
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ../gui/gdmlogin.c:2567
+#: ../gui/gdmlogin.c:2412
 msgid "_Theme"
 msgstr "_Tema"
 
-#: ../gui/gdmlogin.c:2578 ../gui/greeter/greeter_canvas_item.c:165
+#: ../gui/gdmlogin.c:2423 ../gui/greeter/greeter_canvas_item.c:165
 #: ../gui/greeter/greeter_parser.c:341
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../gui/gdmlogin.c:2580 ../gui/greeter/greeter_canvas_item.c:167
+#: ../gui/gdmlogin.c:2425 ../gui/greeter/greeter_canvas_item.c:167
 #: ../gui/greeter/greeter_parser.c:336
 msgid "D_isconnect"
 msgstr "Ko_ble fra"
 
-#: ../gui/gdmlogin.c:2648 ../gui/greeter/greeter_item_ulist.c:264
+#: ../gui/gdmlogin.c:2493 ../gui/greeter/greeter_item_ulist.c:268
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../gui/gdmlogin.c:2729
+#: ../gui/gdmlogin.c:2574
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../gui/gdmlogin.c:2845 ../gui/greeter/greeter_parser.c:410
+#: ../gui/gdmlogin.c:2690 ../gui/greeter/greeter_parser.c:410
 msgid "_Start Again"
 msgstr "_Start igjen"
 
-#: ../gui/gdmlogin.c:3398 ../gui/gdmlogin.c:3432 ../gui/greeter/greeter.c:590
-#: ../gui/greeter/greeter.c:625
+#: ../gui/gdmlogin.c:3243 ../gui/gdmlogin.c:3277 ../gui/greeter/greeter.c:565
+#: ../gui/greeter/greeter.c:600
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version. You have "
@@ -3052,17 +3036,17 @@ msgstr ""
 "Velkomst versjonen (%s) er ikke lik tjenestens versjon. Du har sannsynligvis "
 "nettopp oppgradert GDM. Vennligst start GDM-tjenesten eller maskinen på nytt."
 
-#: ../gui/gdmlogin.c:3408 ../gui/gdmlogin.c:3442 ../gui/gdmlogin.c:3490
-#: ../gui/greeter/greeter.c:600 ../gui/greeter/greeter.c:635
-#: ../gui/greeter/greeter.c:684
+#: ../gui/gdmlogin.c:3253 ../gui/gdmlogin.c:3287 ../gui/gdmlogin.c:3335
+#: ../gui/greeter/greeter.c:575 ../gui/greeter/greeter.c:610
+#: ../gui/greeter/greeter.c:659
 msgid "Cannot start the greeter"
 msgstr "Kan ikke starte velkomst"
 
-#: ../gui/gdmlogin.c:3447
+#: ../gui/gdmlogin.c:3292
 msgid "Restart"
 msgstr "Start på nytt"
 
-#: ../gui/gdmlogin.c:3480 ../gui/greeter/greeter.c:674
+#: ../gui/gdmlogin.c:3325 ../gui/greeter/greeter.c:649
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).  You have "
@@ -3072,23 +3056,23 @@ msgstr ""
 "sannsynligvis nettopp oppgradert GDM. Vennligst start GDM tjenesten eller "
 "maskinen på nytt."
 
-#: ../gui/gdmlogin.c:3495 ../gui/greeter/greeter.c:689
+#: ../gui/gdmlogin.c:3340 ../gui/greeter/greeter.c:664
 msgid "Restart GDM"
 msgstr "Start GDM på nytt"
 
-#: ../gui/gdmlogin.c:3497
+#: ../gui/gdmlogin.c:3342
 msgid "Restart computer"
 msgstr "Start datamaskinen på nytt"
 
-#: ../gui/gdmlogin.c:3582
+#: ../gui/gdmlogin.c:3427
 msgid "Could not set signal mask!"
 msgstr "Kunne ikke sette signalmaske!"
 
-#: ../gui/gdmlogin.c:3697 ../gui/greeter/greeter.c:1375
+#: ../gui/gdmlogin.c:3545 ../gui/greeter/greeter.c:1355
 msgid "Session directory is missing"
 msgstr "Sesjonskatalog mangler"
 
-#: ../gui/gdmlogin.c:3698
+#: ../gui/gdmlogin.c:3546
 msgid ""
 "Your session directory is missing or empty!  There are two available "
 "sessions you can use, but you should log in and correct the GDM "
@@ -3097,11 +3081,11 @@ msgstr ""
 "Din sesjonskatalog mangler eller er tom! Du har to tilgjengelige sesjoner du "
 "kan bruke, men du bør logge inn og korrigere konfigurasjonen for GDM."
 
-#: ../gui/gdmlogin.c:3721 ../gui/greeter/greeter.c:1400
+#: ../gui/gdmlogin.c:3569 ../gui/greeter/greeter.c:1380
 msgid "Configuration is not correct"
 msgstr "Konfigurasjonen er ikke korrekt"
 
-#: ../gui/gdmlogin.c:3722 ../gui/greeter/greeter.c:1401
+#: ../gui/gdmlogin.c:3570 ../gui/greeter/greeter.c:1381
 msgid ""
 "The configuration file contains an invalid command line for the login "
 "dialog, so running the default command.  Please fix your configuration."
@@ -3123,13 +3107,13 @@ msgstr "Kan ikke åpne fil"
 msgid "Select User Image"
 msgstr "Velg bilde for bruker"
 
-#: ../gui/gdmphotosetup.c:273 ../gui/gdmsetup.c:5592 ../gui/gdmsetup.c:5714
-#: ../gui/gdmsetup.c:5867 ../gui/gdmsetup.c:5989
+#: ../gui/gdmphotosetup.c:273 ../gui/gdmsetup.c:5597 ../gui/gdmsetup.c:5719
+#: ../gui/gdmsetup.c:5872 ../gui/gdmsetup.c:5994
 msgid "Images"
 msgstr "Bilder"
 
-#: ../gui/gdmphotosetup.c:278 ../gui/gdmsetup.c:3048 ../gui/gdmsetup.c:5597
-#: ../gui/gdmsetup.c:5719 ../gui/gdmsetup.c:5872 ../gui/gdmsetup.c:5994
+#: ../gui/gdmphotosetup.c:278 ../gui/gdmsetup.c:3056 ../gui/gdmsetup.c:5602
+#: ../gui/gdmsetup.c:5724 ../gui/gdmsetup.c:5877 ../gui/gdmsetup.c:5999
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -3151,11 +3135,11 @@ msgstr "<b>Bilde for bruker</b>"
 msgid "Login Photo Preferences"
 msgstr "Brukervalg for påloggingsbilde"
 
-#: ../gui/gdmsession.c:124 ../gui/gdmsession.c:291
+#: ../gui/gdmsession.c:127 ../gui/gdmsession.c:294
 msgid "Failsafe _GNOME"
 msgstr "Feilsikker _GNOME"
 
-#: ../gui/gdmsession.c:125 ../gui/gdmsession.c:292
+#: ../gui/gdmsession.c:128 ../gui/gdmsession.c:295
 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.  "
@@ -3165,11 +3149,11 @@ msgstr ""
 "vil kjøres under innlogging så denne bør kun brukes når man ikke kan logge "
 "inn på andre måter. GNOME vil bruke sesjonen «Forvalgt»."
 
-#: ../gui/gdmsession.c:135 ../gui/gdmsession.c:303
+#: ../gui/gdmsession.c:138 ../gui/gdmsession.c:306
 msgid "Failsafe _Terminal"
 msgstr "Feilsikker _terminal"
 
-#: ../gui/gdmsession.c:136 ../gui/gdmsession.c:304
+#: ../gui/gdmsession.c:139 ../gui/gdmsession.c:307
 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 "
@@ -3180,6 +3164,29 @@ msgstr ""
 "inn på annen måte. For å avslutte terminalemulatoren, skriv «exit» og trykk "
 "linjeskift."
 
+#: ../gui/gdmsession.c:398
+#, c-format
+msgid "Your preferred session type %s is not installed on this computer."
+msgstr "Din foretrukne sesjonstype %s er ikke installert på denne maskinen."
+
+#: ../gui/gdmsession.c:402
+msgid "Just _Log In"
+msgstr "Bare _logg inn"
+
+#: ../gui/gdmsession.c:453
+#, c-format
+msgid "You have chosen %s for this session"
+msgstr "Du har valgt %s for denne sesjonen"
+
+#: ../gui/gdmsession.c:456
+#, c-format
+msgid ""
+"If you wish to make %s the default for future sessions, run the 'switchdesk' "
+"utility (System->Desktop Switching Tool from the panel menu)."
+msgstr ""
+"Hvis du vil gjøre %s til forvalg for fremtidige sesjoner, kjør programmet "
+"«switchdesk» (System->Bytt skrivebord fra panel-menyen)."
+
 #: ../gui/gdmsetup.c:260
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
@@ -3201,71 +3208,71 @@ msgstr "Vanlig"
 msgid "Plain with face browser"
 msgstr "Vanlig med ansiktsvisning"
 
-#: ../gui/gdmsetup.c:1571
+#: ../gui/gdmsetup.c:1573
 msgid "Autologin or timed login to the root account is not allowed."
 msgstr ""
 "Automatisk, eller tidsbasert innlogging til superbrukerkontoen (root) er "
 "ikke tillatt."
 
-#: ../gui/gdmsetup.c:1794
+#: ../gui/gdmsetup.c:1798
 #, c-format
 msgid "The \"%s\" user already exists in the include list."
 msgstr "Bruker «%s» eksisterer allerede i listen med brukere som skal tas med."
 
-#: ../gui/gdmsetup.c:1804 ../gui/gdmsetup.c:1834 ../gui/gdmsetup.c:1871
+#: ../gui/gdmsetup.c:1808 ../gui/gdmsetup.c:1838 ../gui/gdmsetup.c:1875
 msgid "Cannot add user"
 msgstr "Kan ikke legge til bruker"
 
-#: ../gui/gdmsetup.c:1824
+#: ../gui/gdmsetup.c:1828
 #, c-format
 msgid "The \"%s\" user already exists in the exclude list."
 msgstr "Bruker «%s» eksisterer allerede i listen over eksluderte brukere."
 
-#: ../gui/gdmsetup.c:1861
+#: ../gui/gdmsetup.c:1865
 #, c-format
 msgid "The \"%s\" user does not exist."
 msgstr "Bruker «%s» eksisterer ikke."
 
-#: ../gui/gdmsetup.c:3043 ../gui/gdmsetup.glade.h:76
+#: ../gui/gdmsetup.c:3051 ../gui/gdmsetup.glade.h:76
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../gui/gdmsetup.c:3252 ../gui/gdmsetup.c:3310
+#: ../gui/gdmsetup.c:3260 ../gui/gdmsetup.c:3318
 msgid "None"
 msgstr "Ingen"
 
-#: ../gui/gdmsetup.c:3743
+#: ../gui/gdmsetup.c:3751
 msgid "Archive is not of a subdirectory"
 msgstr "Arkivet består ikke av en underkatalog"
 
-#: ../gui/gdmsetup.c:3751
+#: ../gui/gdmsetup.c:3759
 msgid "Archive is not of a single subdirectory"
 msgstr "Arkivet består ikke av en enkelt underkatalog"
 
-#: ../gui/gdmsetup.c:3775 ../gui/gdmsetup.c:3853
+#: ../gui/gdmsetup.c:3783 ../gui/gdmsetup.c:3861
 msgid "File not a tar.gz or tar archive"
 msgstr "Filen er ikke eller et tar arkiv"
 
-#: ../gui/gdmsetup.c:3777
+#: ../gui/gdmsetup.c:3785
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Arkivet inneholder ikke en GdmGreeterTheme.info-fil"
 
-#: ../gui/gdmsetup.c:3799
+#: ../gui/gdmsetup.c:3807
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
-#: ../gui/gdmsetup.c:3919
+#: ../gui/gdmsetup.c:3927
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../gui/gdmsetup.c:3926
+#: ../gui/gdmsetup.c:3934
 msgid "Not a theme archive"
 msgstr "Ikke et tema-arkiv"
 
 #. FIXME: if exists already perhaps we could also have an
 #. * option to change the dir name
-#: ../gui/gdmsetup.c:3948
+#: ../gui/gdmsetup.c:3956
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed. Install again anyway?"
@@ -3273,47 +3280,47 @@ msgstr ""
 "Temakatalog «%s» ser ut til å være installert allerede. Installer igjen "
 "likevel?"
 
-#: ../gui/gdmsetup.c:4040
+#: ../gui/gdmsetup.c:4048
 msgid "Some error occurred when installing the theme"
 msgstr "En feil oppsto under installasjon av temaet"
 
-#: ../gui/gdmsetup.c:4096
+#: ../gui/gdmsetup.c:4104
 msgid "No file selected"
 msgstr "Ingen fil valgt"
 
-#: ../gui/gdmsetup.c:4117
+#: ../gui/gdmsetup.c:4125
 msgid "Select Theme Archive"
 msgstr "Velg tema-arkiv"
 
-#: ../gui/gdmsetup.c:4121 ../gui/gdmsetup.c:5112
+#: ../gui/gdmsetup.c:4129 ../gui/gdmsetup.c:5120
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../gui/gdmsetup.c:4212
+#: ../gui/gdmsetup.c:4220
 #, c-format
 msgid "Remove the \"%s\" theme?"
 msgstr "Fjern tema «%s»?"
 
-#: ../gui/gdmsetup.c:4221
+#: ../gui/gdmsetup.c:4229
 msgid "If you choose to remove the theme, it will be permanently lost."
 msgstr "Hvis du velger å fjerne temaet vil det bli borte for godt."
 
-#: ../gui/gdmsetup.c:4229
+#: ../gui/gdmsetup.c:4237
 msgid "_Remove Theme"
 msgstr "Fje_rn tema"
 
-#: ../gui/gdmsetup.c:5101
+#: ../gui/gdmsetup.c:5109
 #, c-format
 msgid "Install the theme from '%s'?"
 msgstr "Installer tema fra «%s»?"
 
-#: ../gui/gdmsetup.c:5102
+#: ../gui/gdmsetup.c:5110
 #, c-format
 msgid "Select install to add the theme from the file '%s'."
 msgstr "Velg installer for å legge til temaet fra filen «%s»."
 
 #. This is the temporary help dialog
-#: ../gui/gdmsetup.c:5364
+#: ../gui/gdmsetup.c:5372
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3336,26 +3343,26 @@ msgstr ""
 "For komplett dokumentasjon se i GNOME hjelpleser under kategorien GNOME/"
 "System."
 
-#: ../gui/gdmsetup.c:6410
+#: ../gui/gdmsetup.c:6415
 msgid "Apply the changes to users before closing?"
 msgstr "Aktiver endringer for brukere før programmet lukkes?"
 
-#: ../gui/gdmsetup.c:6411
+#: ../gui/gdmsetup.c:6416
 msgid ""
 "If you don't apply, the changes made on the Users tab will be disregarded."
 msgstr ""
 "Hvis du ikke aktiverer dem vil endringene som ble gjort i brukerfanen "
 "ignoreres."
 
-#: ../gui/gdmsetup.c:6414
+#: ../gui/gdmsetup.c:6419
 msgid "Close _without Applying"
 msgstr "Lukk _uten å aktivere"
 
-#: ../gui/gdmsetup.c:6465 ../gui/gdmsetup.c:6472
+#: ../gui/gdmsetup.c:6470 ../gui/gdmsetup.c:6477
 msgid "Could not access GDM configuration file.\n"
 msgstr "Kunne ikke aksessere konfigurasjonsfilen for GDM.\n"
 
-#: ../gui/gdmsetup.c:6521
+#: ../gui/gdmsetup.c:6526
 msgid "You must be the root user to configure GDM."
 msgstr "Du må være superbruker (root) for å konfigurere GDM."
 
@@ -3805,26 +3812,26 @@ msgstr "sekunder"
 msgid "Too many users to list here..."
 msgstr "For mange brukere til å vise alle her..."
 
-#: ../gui/greeter/greeter.c:640 ../gui/greeter/greeter.c:691
+#: ../gui/greeter/greeter.c:615 ../gui/greeter/greeter.c:666
 msgid "Restart Machine"
 msgstr "Start maskinen på nytt"
 
-#: ../gui/greeter/greeter.c:1219
+#: ../gui/greeter/greeter.c:1196
 #, 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:1271
+#: ../gui/greeter/greeter.c:1248
 msgid "The greeter theme is corrupt"
 msgstr "Tema for grafisk velkomst er korrupt"
 
-#: ../gui/greeter/greeter.c:1272
+#: ../gui/greeter/greeter.c:1249
 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:1305
+#: ../gui/greeter/greeter.c:1282
 msgid ""
 "There was an error loading the theme, and the default theme could not be "
 "loaded. Attempting to start the standard greeter"
@@ -3832,7 +3839,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:1327
+#: ../gui/greeter/greeter.c:1304
 msgid ""
 "The GTK+ greeter could not be started.  This display will abort and you may "
 "have to login another way and fix the installation of GDM"
@@ -3840,7 +3847,7 @@ msgstr ""
 "GTK+-velkomst kunne ikke startes. Denne skjermen vil avbrytes og du vil "
 "kanskje måtte logge inn via andre metoder og rette opp installasjonen av GDM"
 
-#: ../gui/greeter/greeter.c:1376
+#: ../gui/greeter/greeter.c:1356
 msgid ""
 "Your session directory is missing or empty!  There are two available "
 "sessions you can use, but you should log in and correct the gdm "
@@ -3853,15 +3860,15 @@ msgstr ""
 msgid "Last Language"
 msgstr "Forrige språk"
 
-#: ../gui/greeter/greeter_action_language.c:227
+#: ../gui/greeter/greeter_action_language.c:230
 msgid "Select a Language"
 msgstr "Velg et språk"
 
-#: ../gui/greeter/greeter_action_language.c:237
+#: ../gui/greeter/greeter_action_language.c:240
 msgid "Change _Language"
 msgstr "Endre _språk"
 
-#: ../gui/greeter/greeter_action_language.c:257
+#: ../gui/greeter/greeter_action_language.c:260
 msgid "_Select the language for your session to use:"
 msgstr "_Velg et språk som skal brukes i din sesjon:"
 
@@ -3879,11 +3886,11 @@ msgstr ""
 "Svar på spørsmål her og trykk Linjeskift når du er ferdig. Trykk F10 for å "
 "få en meny."
 
-#: ../gui/greeter/greeter_item_ulist.c:169
+#: ../gui/greeter/greeter_item_ulist.c:173
 msgid "Already logged in"
 msgstr "Allerede logget inn"
 
-#: ../gui/greeter/greeter_parser.c:351 ../gui/greeter/greeter_system.c:196
+#: ../gui/greeter/greeter_parser.c:351 ../gui/greeter/greeter_system.c:214
 msgid "Sus_pend"
 msgstr "_Hvilemodus"
 
@@ -3907,73 +3914,59 @@ msgstr "_OK"
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../gui/greeter/greeter_session.c:172
-#, c-format
-msgid "You have chosen %s for this session"
-msgstr "Du har valgt %s for denne sesjonen"
-
-#: ../gui/greeter/greeter_session.c:175
-#, c-format
-msgid ""
-"If you wish to make %s the default for future sessions, run the 'switchdesk' "
-"utility (System->Desktop Switching Tool from the panel menu)."
-msgstr ""
-"Hvis du vil gjøre %s til forvalg for fremtidige sesjoner, kjør programmet "
-"«switchdesk» (System->Bytt skrivebord fra panel-menyen)."
-
-#: ../gui/greeter/greeter_session.c:228
+#: ../gui/greeter/greeter_session.c:81
 msgid "Change _Session"
 msgstr "Endre _sesjon"
 
-#: ../gui/greeter/greeter_session.c:250
+#: ../gui/greeter/greeter_session.c:103
 msgid "Sessions"
 msgstr "Sesjoner"
 
-#: ../gui/greeter/greeter_session.c:270
+#: ../gui/greeter/greeter_session.c:123
 msgid "_Last session"
 msgstr "_Forrige sesjon"
 
-#: ../gui/greeter/greeter_session.c:276
+#: ../gui/greeter/greeter_session.c:129
 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/greeter/greeter_system.c:163
+#: ../gui/greeter/greeter_system.c:181
 msgid "Confi_gure Login Manager..."
 msgstr "Konfi_gurer håndterer for innlogging..."
 
-#: ../gui/greeter/greeter_system.c:260
+#: ../gui/greeter/greeter_system.c:278
 msgid "Choose an Action"
 msgstr "Velg en handling"
 
-#: ../gui/greeter/greeter_system.c:282
+#: ../gui/greeter/greeter_system.c:300
 msgid "Shut _down the computer"
 msgstr "Steng ned _datamaskinen"
 
-#: ../gui/greeter/greeter_system.c:285
+#: ../gui/greeter/greeter_system.c:303
 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/greeter/greeter_system.c:300
+#: ../gui/greeter/greeter_system.c:318
 msgid "_Restart the computer"
 msgstr "Sta_rt datamaskinen på nytt"
 
-#: ../gui/greeter/greeter_system.c:303
+#: ../gui/greeter/greeter_system.c:321
 msgid "Restart your computer"
 msgstr "Start datamaskinen på nytt"
 
-#: ../gui/greeter/greeter_system.c:317
+#: ../gui/greeter/greeter_system.c:335
 msgid "Sus_pend the computer"
 msgstr "Se_tt datamaskinen i hvilemodus"
 
-#: ../gui/greeter/greeter_system.c:320
+#: ../gui/greeter/greeter_system.c:338
 msgid "Suspend your computer"
 msgstr "Sett datamaskinen i hvilemodus"
 
-#: ../gui/greeter/greeter_system.c:334
+#: ../gui/greeter/greeter_system.c:352
 msgid "Run _XDMCP chooser"
 msgstr "Kjør _XDMCP-velger"
 
-#: ../gui/greeter/greeter_system.c:337
+#: ../gui/greeter/greeter_system.c:355
 msgid ""
 "Run an XDMCP chooser which will allow you to log into available remote "
 "computers, if there are any."
@@ -3981,11 +3974,11 @@ msgstr ""
 "Kjør en XDMCP-velger som lar deg logge inn på forskjellige eksterne maskiner "
 "hvis noen finnes."
 
-#: ../gui/greeter/greeter_system.c:354
+#: ../gui/greeter/greeter_system.c:372
 msgid "Confi_gure the login manager"
 msgstr "Konfi_gurer hånderer for innlogging"
 
-#: ../gui/greeter/greeter_system.c:357
+#: ../gui/greeter/greeter_system.c:375
 msgid ""
 "Configure GDM (this login manager). This will require the root password."
 msgstr ""
@@ -4033,8 +4026,8 @@ msgstr "GNOME kunstvariasjon av Sirkler"
 msgid "Happy GNOME"
 msgstr "Glad GNOME"
 
-#: ../gui/modules/dwellmouselistener.c:656
-#: ../gui/modules/keymouselistener.c:926
+#: ../gui/modules/dwellmouselistener.c:659
+#: ../gui/modules/keymouselistener.c:929
 #, c-format
 msgid ""
 "Error while trying to run (%s)\n"
@@ -4197,3 +4190,14 @@ msgstr "Ingen grensesnitt kunne lastes! Dette er ikke bra! (fil: %s)"
 #: ../vicious-extensions/ve-nongnome.c:135
 msgid "Too many alias levels for a locale; may indicate a loop"
 msgstr "For mange aliasnivå¨for et locale. Kan indikere en løkke"
+
+#~ msgid "You have chosen %s for this session."
+#~ msgstr "Du har valgt %s for denne sesjonen."
+
+#~ msgid ""
+#~ "If you wish to make %s the default for future sessions, run the "
+#~ "'switchdesk' utility (System Tools->Desktop Switching Tool from the main "
+#~ "menu)."
+#~ msgstr ""
+#~ "Kjør programmet «switchdesk» hvis du vil gjøre %s til forvalg for "
+#~ "fremtidige sesjoner. (Systemverktøy->Bytt skrivebord fra hovedmenyen)."