Updated Norwegian Nynorsk translation

1 files changed, 297 insertions, 336 deletions

diff --git a/po/nn.po b/po/nn.po
index 6b70c5fa..8a752ab8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,20 +4,21 @@
 # Kjartan Maraas  <kmaraas@gnome.org>, 2001.
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001.
 # Åsmund Skjæveland <aasmunds@fys.uio.no>, 2003, 2004, 2005, 2006.
-# Åsmund Skjæveland <aasmunds@ulrik.uio.no>, 2009.
+# Åsmund Skjæveland <aasmunds@ulrik.uio.no>, 2009, 2010.
+# Torstein Adolf Winterseth <kvikende@yahoo.no>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gdm&component=general\n"
-"POT-Creation-Date: 2009-09-12 01:28+0000\n"
-"PO-Revision-Date: 2009-10-16 10:33+0200\n"
+"POT-Creation-Date: 2010-01-27 16:57+0000\n"
+"PO-Revision-Date: 2010-02-27 13:25+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language-Team: Norsk (nynorsk) <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../common/gdm-common.c:437
@@ -25,26 +26,18 @@ msgstr ""
 msgid "/dev/urandom is not a character device"
 msgstr "/dev/urandom er ikkje ei teikn-eining"
 
-#: ../daemon/factory-slave-main.c:170 ../daemon/main.c:516
-#: ../daemon/product-slave-main.c:174 ../daemon/session-worker-main.c:137
-#: ../daemon/simple-slave-main.c:179 ../daemon/xdmcp-chooser-slave-main.c:179
-msgid "Enable debugging code"
-msgstr "Bruk feilsøkingskode"
-
-#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175
-#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180
-#| msgid "Display"
+#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
+#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
 msgid "Display ID"
 msgstr "Display-ID"
 
-#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175
-#: ../daemon/simple-slave-main.c:180 ../daemon/xdmcp-chooser-slave-main.c:180
-msgid "id"
-msgstr "id"
+#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
+#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+msgid "ID"
+msgstr "ID"
 
-#: ../daemon/factory-slave-main.c:183 ../daemon/product-slave-main.c:187
-#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:192
-#| msgid "GNOME Desktop Manager"
+#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193
+#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195
 msgid "GNOME Display Manager Slave"
 msgstr "GNOME displayhandsamar-slave"
 
@@ -53,35 +46,24 @@ msgstr "GNOME displayhandsamar-slave"
 msgid "could not find user \"%s\" on system"
 msgstr "klarte ikkje finna brukaren «%s» på systemet"
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:220
+#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225
 msgid "Unable to initialize login system"
 msgstr "Klarte ikkje å starta påloggingsystemet"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:256
-#| msgid "Couldn't authenticate user"
+#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261
 msgid "Unable to authenticate user"
-msgstr "Klarte ikkje autentisera brukar"
+msgstr "Klarte ikkje å autentisera brukar"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:310
+#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315
 msgid "Unable to authorize user"
 msgstr "Klarte ikkje å autorisera brukar"
 
-#: ../daemon/gdm-factory-slave.c:281 ../daemon/gdm-simple-slave.c:432
-#| msgid "Unable to establish service %s: %s\n"
+#: ../daemon/gdm-factory-slave.c:281 ../daemon/gdm-simple-slave.c:443
 msgid "Unable to establish credentials"
 msgstr "Klarte ikkje å fastslå akkreditering"
 
 #: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1111
-#| msgid ""
-#| "Could not start the X\n"
-#| "server (your graphical environment)\n"
-#| "due to some internal error.\n"
-#| "Please contact your system administrator\n"
-#| "or check your syslog to diagnose.\n"
-#| "In the meantime this display will be\n"
-#| "disabled.  Please restart GDM when\n"
-#| "the problem is corrected."
+#: ../daemon/gdm-simple-slave.c:1122
 msgid ""
 "Could not start the X server (your graphical environment) due to some "
 "internal error. Please contact your system administrator or check your "
@@ -98,28 +80,27 @@ msgstr ""
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s: Klarte ikkje kopla til forelderdisplay «%s»"
 
-#: ../daemon/gdm-server.c:361, c-format
-#| msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
+#: ../daemon/gdm-server.c:361
+#, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "Tenaren skulle startast av brukar %s, men den brukaren finst ikkje"
 
-#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:444, c-format
-#| msgid "%s: Couldn't set groupid to %d"
+#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554
+#, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "Klarte ikkje setja groupid til %d"
 
-#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:450, c-format
-#| msgid "%s: initgroups () failed for %s"
+#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560
+#, c-format
 msgid "initgroups () failed for %s"
 msgstr "initgroups () feila for %s"
 
-#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:456, c-format
-#| msgid "%s: Couldn't set userid to %d"
+#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566
+#, c-format
 msgid "Couldn't set userid to %d"
 msgstr "Klarte ikkje setja brukarid til %d"
 
-#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:464
-#| msgid "%s: Couldn't set groupid to 0"
+#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574
 msgid "Couldn't set groupid to 0"
 msgstr "Klarte ikkje setja groupid til 0"
 
@@ -149,12 +130,10 @@ msgid "Username"
 msgstr "Brukarnamn"
 
 #: ../daemon/gdm-session-auditor.c:91
-#| msgid "Username"
 msgid "The username"
 msgstr "Brukarnamnet"
 
 #: ../daemon/gdm-session-auditor.c:95
-#| msgid "Username"
 msgid "Hostname"
 msgstr "Vertsnamn"
 
@@ -163,7 +142,6 @@ msgid "The hostname"
 msgstr "Vertsnamnet"
 
 #: ../daemon/gdm-session-auditor.c:101
-#| msgid "Display"
 msgid "Display Device"
 msgstr "Display-eining"
 
@@ -171,303 +149,292 @@ msgstr "Display-eining"
 msgid "The display device"
 msgstr "Display-eininga"
 
-#: ../daemon/gdm-session-worker.c:1293
+#: ../daemon/gdm-session-worker.c:1298
 #, c-format
 msgid "error initiating conversation with authentication system - %s"
 msgstr "feil under oppstart av samtale med autentiseringssystemet - %s"
 
-#: ../daemon/gdm-session-worker.c:1294
+#: ../daemon/gdm-session-worker.c:1299
 msgid "general failure"
 msgstr "uspesifikk feil"
 
-#: ../daemon/gdm-session-worker.c:1295
+#: ../daemon/gdm-session-worker.c:1300
 msgid "out of memory"
 msgstr "tom for minne"
 
-#: ../daemon/gdm-session-worker.c:1296
+#: ../daemon/gdm-session-worker.c:1301
 msgid "application programmer error"
 msgstr "programmeringsfeil"
 
-#: ../daemon/gdm-session-worker.c:1297
-#| msgid "Unknown error occurred."
+#: ../daemon/gdm-session-worker.c:1302
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: ../daemon/gdm-session-worker.c:1304
+#: ../daemon/gdm-session-worker.c:1309
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: ../daemon/gdm-session-worker.c:1310
+#: ../daemon/gdm-session-worker.c:1315
 #, c-format
 msgid "error informing authentication system of preferred username prompt - %s"
 msgstr ""
 "feil under varsling av autentiseringssystemet om foretrukken "
 "brukarnamndialog - %s"
 
-#: ../daemon/gdm-session-worker.c:1324
+#: ../daemon/gdm-session-worker.c:1329
 #, c-format
 msgid "error informing authentication system of user's hostname - %s"
 msgstr ""
-"feil under varsling av autentiseringssystemet om vertsnamnet til brukaren - "
-"%s"
+"feil under varsling av autentiseringssystemet om vertsnamnet til brukaren - %"
+"s"
 
-#: ../daemon/gdm-session-worker.c:1339
+#: ../daemon/gdm-session-worker.c:1344
 #, c-format
 msgid "error informing authentication system of user's console - %s"
 msgstr ""
 "feil under varsling av autentiseringssystemet om konsollet til brukaren - %s"
 
-#: ../daemon/gdm-session-worker.c:1352
+#: ../daemon/gdm-session-worker.c:1357
 #, c-format
 msgid "error informing authentication system of display string - %s"
 msgstr "feil under varsling av autentiseringssystemet om display-streng - %s"
 
-#: ../daemon/gdm-session-worker.c:1367, c-format
+#: ../daemon/gdm-session-worker.c:1372
+#, c-format
 msgid "error informing authentication system of display xauth credentials - %s"
 msgstr ""
 "feil under varsling av autentiseringssystemet om display-xauth-akkreditering "
 "- %s"
 
-#: ../daemon/gdm-session-worker.c:1648 ../daemon/gdm-session-worker.c:1666
+#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680
 #, c-format
 msgid "no user account available"
 msgstr "ingen brukarkonto tilgjengeleg"
 
-#: ../daemon/gdm-session-worker.c:1693
+#: ../daemon/gdm-session-worker.c:1707
 msgid "Unable to change to user"
 msgstr "Klarte ikkje å byta til brukar"
 
-#: ../daemon/gdm-welcome-session.c:426, c-format
-#| msgid "Xnest doesn't exist."
+#: ../daemon/gdm-welcome-session.c:532
+#, c-format
 msgid "User %s doesn't exist"
 msgstr "Brukaren %s finst ikkje"
 
-#: ../daemon/gdm-welcome-session.c:433, c-format
-#| msgid "Xnest doesn't exist."
+#: ../daemon/gdm-welcome-session.c:539
+#, c-format
 msgid "Group %s doesn't exist"
 msgstr "Gruppa %s finst ikkje"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:595
-#| msgid "%s: Could not create socket!"
+#: ../daemon/gdm-xdmcp-display-factory.c:596
 msgid "Could not create socket!"
 msgstr "Klarte ikkje laga sokkel!"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:862
+#: ../daemon/gdm-xdmcp-display-factory.c:865
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "Avslo XDCMP-førespurnad frå vert %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1019
-#: ../daemon/gdm-xdmcp-display-factory.c:1240
-#| msgid "%s: Could not extract authlist from packet"
+#: ../daemon/gdm-xdmcp-display-factory.c:1023
+#: ../daemon/gdm-xdmcp-display-factory.c:1247
 msgid "Could not extract authlist from packet"
 msgstr "Klarte ikkje henta autentiseringsliste frå pakken"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1032
-#: ../daemon/gdm-xdmcp-display-factory.c:1255
-#| msgid "%s: Error in checksum"
+#: ../daemon/gdm-xdmcp-display-factory.c:1036
+#: ../daemon/gdm-xdmcp-display-factory.c:1262
 msgid "Error in checksum"
 msgstr "Feil i sjekksum"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1506
-#| msgid "%s: Bad address"
+#: ../daemon/gdm-xdmcp-display-factory.c:1515
 msgid "Bad address"
 msgstr "Ugyldig adresse"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1587
+#: ../daemon/gdm-xdmcp-display-factory.c:1599
 #, c-format
 msgid "%s: Could not read display address"
 msgstr "%s: Klarte ikkje lesa displayadresse"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1595
+#: ../daemon/gdm-xdmcp-display-factory.c:1607
 #, c-format
 msgid "%s: Could not read display port number"
 msgstr "%s: Klarte ikkje lesa portnummeret til displayet."
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1604
+#: ../daemon/gdm-xdmcp-display-factory.c:1616
 #, c-format
 msgid "%s: Could not extract authlist from packet"
 msgstr "%s: Klarte ikkje henta autentiseringsliste frå pakken"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1624
+#: ../daemon/gdm-xdmcp-display-factory.c:1636
 #, c-format
 msgid "%s: Error in checksum"
 msgstr "%s: Feil i sjekksum"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2133
+#: ../daemon/gdm-xdmcp-display-factory.c:2155
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%s: Fekk REQUEST frå bannlyst vert %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2143
-#: ../daemon/gdm-xdmcp-display-factory.c:2498
-#: ../daemon/gdm-xdmcp-display-factory.c:2750
+#: ../daemon/gdm-xdmcp-display-factory.c:2165
+#: ../daemon/gdm-xdmcp-display-factory.c:2521
+#: ../daemon/gdm-xdmcp-display-factory.c:2775
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%s: Klarte ikkje lesa displaynummer"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2150
+#: ../daemon/gdm-xdmcp-display-factory.c:2172
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%s: Klarte ikkje lesa tilkoplingstype"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2157
+#: ../daemon/gdm-xdmcp-display-factory.c:2179
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%s: Klarte ikkje lesa klientadressa"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2165
+#: ../daemon/gdm-xdmcp-display-factory.c:2187
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%s: Klarte ikkje lesa autentiseringsnamn"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2174
+#: ../daemon/gdm-xdmcp-display-factory.c:2196
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%s: Klarte ikkje lesa autentiseringsdata"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2184
+#: ../daemon/gdm-xdmcp-display-factory.c:2206
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%s: Klarte ikkje lesa autoriseringslista"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2203
+#: ../daemon/gdm-xdmcp-display-factory.c:2225
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%s: Klarte ikkje lesa produsent-ID"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2230
+#: ../daemon/gdm-xdmcp-display-factory.c:2252
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%s: Sjekksum feila for %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2482
+#: ../daemon/gdm-xdmcp-display-factory.c:2505
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%s: Fekk Manage frå bannlyst vert %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2491
-#: ../daemon/gdm-xdmcp-display-factory.c:2757
+#: ../daemon/gdm-xdmcp-display-factory.c:2514
+#: ../daemon/gdm-xdmcp-display-factory.c:2782
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%s: Klarte ikkje lesa økt-ID"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2505
+#: ../daemon/gdm-xdmcp-display-factory.c:2528
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%s: Klarte ikkje lesa displayklasse"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2610
-#: ../daemon/gdm-xdmcp-display-factory.c:2660
-#: ../daemon/gdm-xdmcp-display-factory.c:2666
+#: ../daemon/gdm-xdmcp-display-factory.c:2634
+#: ../daemon/gdm-xdmcp-display-factory.c:2684
+#: ../daemon/gdm-xdmcp-display-factory.c:2690
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%s: Klarte ikkje lesa adresse"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2740
+#: ../daemon/gdm-xdmcp-display-factory.c:2765
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%s: Fekk KEEPALIVE frå bannlyst vert %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2829
-#| msgid "%s: Could not read XDMCP header!"
+#: ../daemon/gdm-xdmcp-display-factory.c:2854
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactory: Klarte ikkje lesa XDMCP-hovud!"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2835
+#: ../daemon/gdm-xdmcp-display-factory.c:2860
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
-#| msgid "%s: Incorrect XDMCP version!"
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XDMCP: Feil versjon av XDMCP!"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2841
+#: ../daemon/gdm-xdmcp-display-factory.c:2866
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
 msgid "XMDCP: Unable to parse address"
 msgstr "XDMCP: Klarte ikkje å tolka adressa"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3286, c-format
-#| msgid "%s: Could not get server hostname: %s!"
+#: ../daemon/gdm-xdmcp-display-factory.c:3311
+#, c-format
 msgid "Could not get server hostname: %s!"
 msgstr "Klarte ikkje å få tak i maskinnamnet til tenaren: %s!"
 
-#: ../daemon/main.c:237 ../daemon/main.c:250, c-format
-#| msgid "Cannot write PID file %s: possibly out of diskspace.  Error: %s"
+#: ../daemon/main.c:237 ../daemon/main.c:250
+#, c-format
 msgid "Cannot write PID file %s: possibly out of diskspace: %s"
 msgstr "Klarte ikkje skriva PID-fila %s. Kanskje disken er full: %s"
 
-#: ../daemon/main.c:270, c-format
-#| msgid ""
-#| "%s: Logdir %s does not exist or isn't a directory.  Using ServAuthDir %s."
+#: ../daemon/main.c:271
+#, c-format
 msgid "Logdir %s does not exist or isn't a directory."
 msgstr "Loggkatalogen %s finst ikkje eller er ikkje ein katalog."
 
 # TRN: Authorization or authentication?
-#: ../daemon/main.c:283, c-format
-#| msgid "%s: Authdir %s does not exist. Aborting."
+#: ../daemon/main.c:287
+#, c-format
 msgid "Authdir %s does not exist. Aborting."
 msgstr "Autorisasjonskatalogen %s finst ikkje. Stoppar."
 
-#: ../daemon/main.c:287, c-format
-#| msgid "%s: Authdir %s is not a directory. Aborting."
+#: ../daemon/main.c:291
+#, c-format
 msgid "Authdir %s is not a directory. Aborting."
 msgstr "Autorisasjonskatalogen %s er ikkje ein katalog. Stoppar."
 
-#: ../daemon/main.c:361, c-format
-#| msgid "%s: Authdir %s is not owned by user %s, group %s. Aborting."
+#: ../daemon/main.c:365
+#, c-format
 msgid "Authdir %s is not owned by user %d, group %d. Aborting."
 msgstr ""
 " Autorisasjonskatalogen %s er ikkje eigd av brukar %d gruppe %d. Stoppar."
 
-#: ../daemon/main.c:368, c-format
-#| msgid "%s: Authdir %s has wrong permissions %o. Should be %o. Aborting."
+#: ../daemon/main.c:372
+#, c-format
 msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting."
 msgstr "Autorisasjonskatalogen %s har feil løyve %o. Må ha %o. Stoppar."
 
-#: ../daemon/main.c:405, c-format
-#| msgid "%s: Can't find the GDM user '%s'. Aborting!"
+#: ../daemon/main.c:409
+#, c-format
 msgid "Can't find the GDM user '%s'. Aborting!"
 msgstr "Klarte ikkje finna GDM-brukaren «%s». Stoppar."
 
-#: ../daemon/main.c:411
-#| msgid "%s: The GDM user should not be root. Aborting!"
+#: ../daemon/main.c:415
 msgid "The GDM user should not be root. Aborting!"
 msgstr "GDM-brukaren skal ikkje vera root. Stoppar."
 
-#: ../daemon/main.c:417, c-format
-#| msgid "%s: Can't find the GDM group '%s'. Aborting!"
+#: ../daemon/main.c:421
+#, c-format
 msgid "Can't find the GDM group '%s'. Aborting!"
 msgstr "Klarte ikkje finna GDM-gruppa «%s». Stoppar."
 
-#: ../daemon/main.c:423
-#| msgid "%s: The GDM group should not be root. Aborting!"
+#: ../daemon/main.c:427
 msgid "The GDM group should not be root. Aborting!"
 msgstr "GDM-gruppa skal ikkje vera root. Stoppar."
 
-#: ../daemon/main.c:517
+#: ../daemon/main.c:533
 msgid "Make all warnings fatal"
 msgstr "Gjer alle åtvaringar fatale"
 
-#: ../daemon/main.c:518
+#: ../daemon/main.c:534
 msgid "Exit after a time - for debugging"
 msgstr "Avslutt etter ei tid - for feilsøking"
 
-#: ../daemon/main.c:519
+#: ../daemon/main.c:535
 msgid "Print GDM version"
 msgstr "Skriv GDM-versjon"
 
-#: ../daemon/main.c:534
-#| msgid "GNOME Desktop Manager"
+#: ../daemon/main.c:550
 msgid "GNOME Display Manager"
 msgstr "GNOME displayhandsamar"
 
 #. make sure the pid file doesn't get wiped
-#: ../daemon/main.c:595
-#| msgid "Only root wants to run GDM\n"
-msgid "Only root wants to run GDM"
+#: ../daemon/main.c:611
+#| msgid "Only root wants to run GDM"
+msgid "Only the root user can run GDM"
 msgstr "Det er berre root som skal starta GDM"
 
-#: ../daemon/session-worker-main.c:149
-#| msgid "GDM (The GNOME Display Manager) is not running."
+#: ../daemon/session-worker-main.c:156
 msgid "GNOME Display Manager Session Worker"
 msgstr "GNOME Display Manager øktarbeidar"
 
@@ -476,7 +443,7 @@ msgid "AT SPI Registry Wrapper"
 msgstr "AT SPI registerinnpakking"
 
 #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1767
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434
 msgid "Login Window"
 msgstr "Innloggingsvindauge"
 
@@ -493,7 +460,6 @@ msgid "GNOME Settings Daemon"
 msgstr "GNOME innstillingsnisse"
 
 #: ../data/greeter-autostart/gnome-mag.desktop.in.h:1
-#| msgid "GNOME Desktop Manager"
 msgid "GNOME Screen Magnifier"
 msgstr "GNOME skjermforstørrar"
 
@@ -510,7 +476,6 @@ msgid "Use an onscreen keyboard"
 msgstr "Vis tastatur på skjermen"
 
 #: ../data/greeter-autostart/metacity.desktop.in.h:1
-#| msgid "Security"
 msgid "Metacity"
 msgstr "Metacity"
 
@@ -522,153 +487,147 @@ msgstr "Orca skjermlesar"
 msgid "Present on-screen information as speech or braille"
 msgstr "Legg fram informasjon på skjermen som tale eller blindeskrift"
 
-#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.h:1
-#| msgid "Authentication failed"
+#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1
 msgid "PolicyKit Authentication Agent"
 msgstr "PolicyKit autentiseringsagent"
 
 #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148
-#| msgid "Select User Image"
 msgid "Select System"
 msgstr "Vel system"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214
-#| msgid "%s: Could not create XDMCP buffer!"
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213
 msgid "XDMCP: Could not create XDMCP buffer!"
 msgstr "XDMCP: Klarte ikkje laga XDMCP-mellomlager."
 
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:220
-#| msgid "%s: Could not read XDMCP header!"
 msgid "XDMCP: Could not read XDMCP header!"
 msgstr "XDMCP: Klarte ikkje lesa XDMCP-hovud."
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:253
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244
 msgid "Value"
 msgstr "Verdi"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:254
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245
 msgid "percentage of time complete"
 msgstr "prosent ferdig, i tid"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1321
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1281
 msgid "Inactive Text"
 msgstr "Inaktiv tekst"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1322
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1282
 msgid "The text to use in the label if the user hasn't picked an item yet"
 msgstr ""
 "Tekst som vert brukt i merkelappen om brukaren ikkje har gjort eit val enno"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1330
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1290
 msgid "Active Text"
 msgstr "Aktiv tekst"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1331
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1291
 msgid "The text to use in the label if the user has picked an item"
 msgstr "Tekst som vert brukt i merkelappen om brukaren har gjort eit val"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1340
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1300
 msgid "List Visible"
 msgstr "Liste synleg"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1341
-msgid "Whether or not the chooser list is visible"
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1301
+#| msgid "Whether or not the chooser list is visible"
+msgid "Whether the chooser list is visible"
 msgstr "Om veljarlista er synleg"
 
-#: ../gui/simple-greeter/gdm-clock-widget.c:66
-msgid "%l:%M:%S %p"
-msgstr "%H.%M.%S"
+#. translators: This is the time format to use when both
+#. * the date and time with seconds are being shown together.
+#.
+#: ../gui/simple-greeter/gdm-clock-widget.c:70
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%a %e. %b, %H.%M.%S"
+
+#. translators: This is the time format to use when both
+#. * the date and time without seconds are being shown together.
+#.
+#: ../gui/simple-greeter/gdm-clock-widget.c:76
+msgid "%a %b %e, %l:%M %p"
+msgstr "%a %e. %b, %H.%M"
 
-#: ../gui/simple-greeter/gdm-clock-widget.c:66
-#| msgid "%a %b %d, %l:%M %p"
-msgid "%l:%M %p"
-msgstr "%H.%M"
+#. translators: This is the time format to use when there is
+#. * no date, just weekday and time with seconds.
+#.
+#: ../gui/simple-greeter/gdm-clock-widget.c:83
+msgid "%a %l:%M:%S %p"
+msgstr "%a %H.%M.%S"
 
-#. translators: replace %e with %d if, when the day of the
-#. *              month as a decimal number is a single digit, it
-#. *              should begin with a 0 in your locale (e.g. "May
-#. *              01" instead of "May  1").
+#. translators: This is the time format to use for the date
 #.
-#: ../gui/simple-greeter/gdm-clock-widget.c:72
-#| msgid "%a %b %d, %H:%M"
-msgid "%a %b %e"
-msgstr "%a %e. %b"
-
-#. translators: reverse the order of these arguments
-#. *              if the time should come before the
-#. *              date on a clock in your locale.
+#: ../gui/simple-greeter/gdm-clock-widget.c:87
+#: ../gui/simple-greeter/gdm-clock-widget.c:94
+#, c-format
+msgid "%x"
+msgstr "%x"
+
+#. translators: This is the time format to use when there is
+#. * no date, just weekday and time without seconds.
 #.
-#: ../gui/simple-greeter/gdm-clock-widget.c:77, c-format
-#| msgid "%s: %s"
-msgid "%1$s, %2$s"
-msgstr "%1$s %2$s"
+#: ../gui/simple-greeter/gdm-clock-widget.c:92
+msgid "%a %l:%M %p"
+msgstr "%a %H.%M"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:291
-#| msgid "Automatic login"
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:278
 msgid "Automatically logging in..."
 msgstr "Loggar inn automatisk …"
 
 #. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:758
-#| msgid "Master halting..."
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:570
 msgid "Cancelling..."
 msgstr "Stoppar …"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1185
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:870
 msgid "Select language and click Log In"
 msgstr "Vel språk og klikk «Logg inn»"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1
-#| msgid "Authentication failed"
-msgid "Authentication Dialog"
-msgstr "Autentiseringsdialog"
-
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2
+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
 msgid "Computer Name"
 msgstr "Maskinnamn"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3
-#| msgid "Just _Log In"
+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
 msgid "Log In"
 msgstr "Logg inn"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4
-msgid "Restart"
-msgstr "Start om att"
+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
+msgid "Version"
+msgstr "Versjon"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5
-#| msgid "Shut _Down"
-msgid "Shut Down"
-msgstr "Slå av"
+#: ../gui/simple-greeter/gdm-greeter-panel.c:852
+msgid "Panel"
+msgstr "Panel"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6
-#| msgid "_Suspend"
+#: ../gui/simple-greeter/gdm-greeter-panel.c:923
+msgid "Shutdown Options..."
+msgstr "Brukarval for avslutting …"
+
+#: ../gui/simple-greeter/gdm-greeter-panel.c:945
 msgid "Suspend"
 msgstr "Gå i kvilemodus"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7
-#| msgid "_Session"
-msgid "Version"
-msgstr "Versjon"
+#: ../gui/simple-greeter/gdm-greeter-panel.c:950
+msgid "Restart"
+msgstr "Start om att"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:583
-#| msgid "_Cancel"
-msgid "Panel"
-msgstr "Panel"
+#: ../gui/simple-greeter/gdm-greeter-panel.c:954
+msgid "Shut Down"
+msgstr "Slå av"
 
 #: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201
-#| msgid "_Language"
 msgid "Languages"
 msgstr "Språk"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:272
-#| msgid "_Language"
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274
 msgid "_Languages:"
 msgstr "S_pråk:"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:273
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275
 #: ../gui/simple-greeter/gdm-language-option-widget.c:274
-#| msgid "_Language"
 msgid "_Language:"
 msgstr "S_pråk:"
 
@@ -676,7 +635,6 @@ msgstr "S_pråk:"
 #. * with a list of languages to choose from
 #.
 #: ../gui/simple-greeter/gdm-language-option-widget.c:243
-#| msgid "_Other"
 msgctxt "language"
 msgid "Other..."
 msgstr "Anna …"
@@ -685,7 +643,7 @@ msgstr "Anna …"
 msgid "Choose a language from the full list of available languages."
 msgstr "Vel eit språk frå den fulle lista over tilgjengelege språk."
 
-#: ../gui/simple-greeter/gdm-languages.c:609
+#: ../gui/simple-greeter/gdm-languages.c:698
 msgid "Unspecified"
 msgstr "Uspesifisert"
 
@@ -703,7 +661,6 @@ msgstr "_Tastatur:"
 #. * available keyboard layouts
 #.
 #: ../gui/simple-greeter/gdm-layout-option-widget.c:235
-#| msgid "_Other"
 msgctxt "keyboard"
 msgid "Other..."
 msgstr "Anna …"
@@ -713,32 +670,30 @@ msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr ""
 "Vel eit tastaturoppsett frå den fulle lista over tilgjengelege oppsett."
 
-#: ../gui/simple-greeter/gdm-option-widget.c:521
+#: ../gui/simple-greeter/gdm-option-widget.c:507
 msgid "Label Text"
 msgstr "Tekst på merkelapp"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:522
+#: ../gui/simple-greeter/gdm-option-widget.c:508
 msgid "The text to use as a label"
 msgstr "Tekst å bruka på merkelapp"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:529
-#| msgid "Icon"
+#: ../gui/simple-greeter/gdm-option-widget.c:515
 msgid "Icon name"
 msgstr "Ikonnamn"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:530
+#: ../gui/simple-greeter/gdm-option-widget.c:516
 msgid "The icon to use with the label"
 msgstr "Ikon å bruka på merkelapp"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:538
-#| msgid "Default System Session"
+#: ../gui/simple-greeter/gdm-option-widget.c:524
 msgid "Default Item"
 msgstr "Standardelement"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:539
-#| msgid "This is the default system session"
-msgid "The id of the default item"
-msgstr "Id på standardelementet"
+#: ../gui/simple-greeter/gdm-option-widget.c:525
+#| msgid "The id of the default item"
+msgid "The ID of the default item"
+msgstr "ID på standardelementet"
 
 #: ../gui/simple-greeter/gdm-recent-option-widget.c:310
 msgid "Max Item Count"
@@ -748,8 +703,8 @@ msgstr "Største tal på element"
 msgid "The maximum number of items to keep around in the list"
 msgstr "Det største talet på element å ha i lista"
 
-#: ../gui/simple-greeter/gdm-remote-login-window.c:188, c-format
-#| msgid "Remote Login via _XDMCP..."
+#: ../gui/simple-greeter/gdm-remote-login-window.c:188
+#, c-format
 msgid "Remote Login (Connecting to %s...)"
 msgstr "Fjerninnlogging ( Koplar til %s …)"
 
@@ -759,12 +714,10 @@ msgid "Remote Login (Connected to %s)"
 msgstr "Fjerninnlogging (kopla til %s)"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:281
-#| msgid "Remote Login via _XDMCP"
 msgid "Remote Login"
 msgstr "Fjerninnlogging"
 
 #: ../gui/simple-greeter/gdm-session-option-widget.c:162
-#| msgid "_Session"
 msgid "_Sessions:"
 msgstr "_Økter:"
 
@@ -785,87 +738,76 @@ msgid "Do not show known users in the login window"
 msgstr "Ikkje vis kjende brukarar i påloggingsvindauget"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5
-#| msgid "_Enable accessible login"
 msgid "Enable accessibility keyboard plugin"
 msgstr "Slå på tilgjengetillegg for tastatur"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6
-#| msgid "Enable _Timed Login"
-msgid "Enable debugging"
-msgstr "Bruk feilsøking"
-
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7
-msgid "Enable debugging mode for the greeter."
-msgstr "Bruk feilsøkingsmodus i velkomsten."
-
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8
 msgid "Enable on-screen keyboard"
 msgstr "Bruk skrivebord på skjermen"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7
 msgid "Enable screen magnifier"
 msgstr "Bruk skjermforstørrar"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10
-#| msgid "_Login screen ready:"
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8
 msgid "Enable screen reader"
 msgstr "Bruk skjermlesar"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9
 msgid "Enable showing the banner message"
 msgstr "Vis overskrifta"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10
 msgid "Icon name to use for greeter logo"
 msgstr "Ikonnamn til velkomstlogoen"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11
 msgid "Recently selected keyboard layouts"
 msgstr "Nyleg valde tastaturopsett"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12
 msgid "Recently selected languages"
 msgstr "Nyleg valde språk"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
 msgid ""
 "Set to a list of keyboard layouts to be shown by default at the login window."
 msgstr ""
 ".Lag ei liste over tastaturoppsett som skal visast i påloggingsvindauget"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
 msgid "Set to a list of languages to be shown by default at the login window."
 msgstr ".Lag ei liste over språk som skal visast i påloggingsvindauget"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
 msgid "Set to the themed icon name to use for the greeter logo."
 msgstr "Vel draktikonet som skal brukast i velkomstlogoen."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16
 msgid "Set to true to disable showing known users in the login window."
 msgstr "Sett til sann for å ikkje visa kjende brukarar i påloggingsvindauget."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17
 msgid "Set to true to disable showing the restart buttons in the login window."
 msgstr ""
 "Sett til sann for å slå av framsyning av omstartknappane i "
 "påloggingsvindauget."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
 msgid "Set to true to enable the background settings manager plugin."
 msgstr ""
 "Sett til sann for å bruka tillegget for bakgrunnsinnstillingshandsamaren."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
 msgid "Set to true to enable the media-keys settings manager plugin."
 msgstr ""
 "Sett til sann for å bruka tillegget for mediatastinnstillingshandsamaren."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
 msgid "Set to true to enable the on-screen keyboard."
 msgstr "Sett til sann for å bruka tastatur på skjermen."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
 msgid ""
 "Set to true to enable the plugin to manage the accessibility keyboard "
 "settings."
@@ -873,37 +815,37 @@ msgstr ""
 "Sett til sann for å bruka tillegget til å styra innstillingar for "
 "tastaturhjelpefunksjonar."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
 msgid "Set to true to enable the screen magnifier."
 msgstr "Sett til sann for å bruka skjermforstørraren."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
 msgid "Set to true to enable the screen reader."
 msgstr "Sett til sann for å bruka skjermlesaren."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
 msgid "Set to true to enable the sound settings manager plugin."
 msgstr "Sett til sann for å bruka tillegget for handsaming av lydstyring."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
 msgid "Set to true to enable the xrandr settings manager plugin."
 msgstr ""
 "Sett til sann for å bruka tillegget for handsaming av xrandr-innstillingar."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
 msgid "Set to true to enable the xsettings settings manager plugin."
 msgstr ""
 "Sett til sann for å bruka tillegget for styring av xsettings-innstillingar."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27
 msgid "Set to true to show the banner message text."
 msgstr "Sett til sann for å visa tekstoverskrifta."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
 msgid "Set to true to use compiz as the window manager."
 msgstr "Sett til sann for å bruka compiz som vindaugehandsamar."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
 msgid ""
 "Text banner message to show on the login window when the user chooser is "
 "empty, instead of banner_message_text."
@@ -911,32 +853,32 @@ msgstr ""
 "Tekstoverskrift å visa på påloggingsskjermen når brukarveljaren er tom, i "
 "staden for banner_message_text."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
 msgid "Text banner message to show on the login window."
 msgstr "Tekstoverskrift å visa på påloggingsskjermen."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
 msgid "True if the background settings manager plugin is enabled."
 msgstr "Sann om tillegget for styring av bakgrunnsinnstillingar er i bruk."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
 msgid "True if the media-keys settings manager plugin is enabled."
 msgstr ""
 "Sann om tillegget for styring av innstillingar for mediatastar er i bruk."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
 msgid "True if the sound settings manager plugin is enabled."
 msgstr "Sann om tillegget for styring av lydinnstillingar er i bruk."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
 msgid "True if the xrandr settings manager plugin is enabled."
 msgstr "Sann om tillegget for styring av xrandr-innstillingar er i bruk."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:37
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35
 msgid "True if the xsettings settings manager plugin is enabled."
 msgstr "Sann om tillegget for styring av xsettings-innstillingar er i bruk."
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:38
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36
 msgid "Use compiz as the window manager"
 msgstr "Bruk compiz som vindaugehandsamar"
 
@@ -949,7 +891,6 @@ msgid "Number of seconds until timer stops"
 msgstr "Kor mange sekund til nedteljinga stoggar"
 
 #: ../gui/simple-greeter/gdm-timer.c:157
-#| msgid "_Start Again"
 msgid "Start time"
 msgstr "Starttid"
 
@@ -958,16 +899,15 @@ msgid "Time the timer was started"
 msgstr "Tida nedteljinga starta"
 
 #: ../gui/simple-greeter/gdm-timer.c:165
-#| msgid "GDM is not running"
 msgid "Is it Running?"
 msgstr "Går ho?"
 
 #: ../gui/simple-greeter/gdm-timer.c:166
-msgid "Whether or not the timer is currently ticking"
+#| msgid "Whether or not the timer is currently ticking"
+msgid "Whether the timer is currently ticking"
 msgstr "Om nedteljinga går"
 
 #: ../gui/simple-greeter/gdm-user.c:245
-#| msgid "_Language"
 msgid "Manager"
 msgstr "Handsamar"
 
@@ -980,45 +920,41 @@ msgstr "Brukarhandsamarobjektet denne brukaren er kontrollert av."
 #. * manually instead of choosing from
 #. * a list.
 #.
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:164
-#| msgid "_Other"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166
 msgctxt "user"
 msgid "Other..."
 msgstr "Anna …"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:165
-#| msgid "Choose an Action"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167
 msgid "Choose a different account"
 msgstr "Vel ein annan konto"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:177
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179
 msgid "Guest"
 msgstr "Gjest"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:178
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180
 msgid "Login as a temporary guest"
 msgstr "Logg inn som mellombels gjest"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:191
-#| msgid "Automatic login"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193
 msgid "Automatic Login"
 msgstr "Automatisk innlogging"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:192
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
 msgid "Automatically login to the system after selecting options"
 msgstr "Logg inn på systemet automatisk etter å ha gjort val"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:383, c-format
-#| msgid "Log in anyway"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385
+#, c-format
 msgid "Log in as %s"
 msgstr "Logg inn som %s"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:737
-#| msgid "Already logged in"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738
 msgid "Currently logged in"
 msgstr "Er logga inn"
 
-#: ../gui/user-switch-applet/applet.c:162
+#: ../gui/user-switch-applet/applet.c:164
 msgid ""
 "The User Switch Applet is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -1030,7 +966,7 @@ msgstr ""
 "utgjeven av Free Software Foundation; anten versjon 2 av lisensen, eller "
 "(viss du ynskjer det) einkvar seinare versjon."
 
-#: ../gui/user-switch-applet/applet.c:166
+#: ../gui/user-switch-applet/applet.c:168
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -1041,7 +977,7 @@ msgstr ""
 "GARANTI, ikkje eingong implisitt garanti om at det er SALGBART eller PASSAR "
 "EIT BESTEMT FORMÅL. Sjå GNU General Public License for detaljar."
 
-#: ../gui/user-switch-applet/applet.c:170
+#: ../gui/user-switch-applet/applet.c:172
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -1052,84 +988,85 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA."
 
-#: ../gui/user-switch-applet/applet.c:184
+#: ../gui/user-switch-applet/applet.c:186
 msgid "A menu to quickly switch between users."
 msgstr "Ein meny for å byta raskt mellom brukarar."
 
-#: ../gui/user-switch-applet/applet.c:188
+#: ../gui/user-switch-applet/applet.c:190
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas\n"
 "Roy-Magne Mo\n"
 "Åsmund Skjæveland\n"
+"Torstein A. Winterseth\n"
 "Send feilmeldingar og kommentarar til i18n-nn@lister.ping.uio.no"
 
-#: ../gui/user-switch-applet/applet.c:647
-#: ../gui/user-switch-applet/applet.c:784
-#: ../gui/user-switch-applet/applet.c:823, c-format
-#| msgid "Can't write to %s: %s"
+#: ../gui/user-switch-applet/applet.c:649
+#: ../gui/user-switch-applet/applet.c:788
+#: ../gui/user-switch-applet/applet.c:827
+#, c-format
 msgid "Can't lock screen: %s"
 msgstr "Klarte ikke låsa skjermen: %s"
 
-#: ../gui/user-switch-applet/applet.c:669
+#: ../gui/user-switch-applet/applet.c:671
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
 msgstr "Klarte ikkje å mellombels byta til skjermsparar med blank skjerm: %s"
 
-#: ../gui/user-switch-applet/applet.c:882, c-format
-#| msgid ""
-#| "Last login:\n"
-#| "%s"
+#: ../gui/user-switch-applet/applet.c:886
+#, c-format
 msgid "Can't logout: %s"
 msgstr "Klarte ikkje logga ut: %s"
 
-#: ../gui/user-switch-applet/applet.c:966
+#: ../gui/user-switch-applet/applet.c:970
 msgid "Available"
 msgstr "Tilgjengeleg"
 
-#: ../gui/user-switch-applet/applet.c:967
+#: ../gui/user-switch-applet/applet.c:971
 msgid "Invisible"
 msgstr "Usynleg"
 
-#: ../gui/user-switch-applet/applet.c:968
+#: ../gui/user-switch-applet/applet.c:972
 msgid "Busy"
 msgstr "Oppteken"
 
-#: ../gui/user-switch-applet/applet.c:969
+#: ../gui/user-switch-applet/applet.c:973
 msgid "Away"
 msgstr "Vekke"
 
-#: ../gui/user-switch-applet/applet.c:1129
-msgid "Account Information..."
-msgstr "Kontoinformasjon …"
+#: ../gui/user-switch-applet/applet.c:1133
+#| msgid "Account Information..."
+msgid "Account Information"
+msgstr "Kontoinformasjon"
 
-#: ../gui/user-switch-applet/applet.c:1141
-msgid "System Preferences..."
-msgstr "Systembrukarval …"
+#: ../gui/user-switch-applet/applet.c:1145
+#| msgid "System Preferences..."
+msgid "System Preferences"
+msgstr "Systembrukarval"
 
-#: ../gui/user-switch-applet/applet.c:1157
+#: ../gui/user-switch-applet/applet.c:1161
 msgid "Lock Screen"
 msgstr "Lås skjerm"
 
-#: ../gui/user-switch-applet/applet.c:1168
+#. Only show if not locked down
+#: ../gui/user-switch-applet/applet.c:1172
 msgid "Switch User"
 msgstr "Byt brukar"
 
 #. Only show switch user if there are other users
-#: ../gui/user-switch-applet/applet.c:1179
-#| msgid "_Quit"
+#: ../gui/user-switch-applet/applet.c:1183
 msgid "Quit..."
 msgstr "Avslutt …"
 
-#: ../gui/user-switch-applet/applet.c:1294
+#: ../gui/user-switch-applet/applet.c:1304
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../gui/user-switch-applet/applet.c:1412
+#: ../gui/user-switch-applet/applet.c:1422
 msgid "User Switch Applet"
 msgstr "Program for brukarbyte"
 
-#: ../gui/user-switch-applet/applet.c:1421
+#: ../gui/user-switch-applet/applet.c:1436
 msgid "Change account settings and status"
 msgstr "Endra kontoinnstillingar og status"
 
@@ -1157,22 +1094,24 @@ msgstr "_Om"
 msgid "_Edit Users and Groups"
 msgstr "_Endra brukarar og grupper"
 
-#: ../utils/gdmflexiserver.c:61 ../utils/gdmflexiserver.c:62
-#: ../utils/gdmflexiserver.c:63 ../utils/gdmflexiserver.c:65
-#: ../utils/gdmflexiserver.c:66
-msgid "Ignored - retained for compatibility"
-msgstr "Ignorert - teke med av kompatibilitetsomsyn"
+#: ../utils/gdmflexiserver.c:61
+msgid "Only the VERSION command is supported"
+msgstr "Berre VERSION-kommandoen er støtta"
 
 #: ../utils/gdmflexiserver.c:61
 msgid "COMMAND"
 msgstr "KOMMANDO"
 
+#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
+#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
+msgid "Ignored - retained for compatibility"
+msgstr "Ignorert - teke med av kompatibilitetsomsyn"
+
 #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
 msgid "Debugging output"
 msgstr "Utdata frå feilsøking"
 
 #: ../utils/gdmflexiserver.c:68
-#| msgid "How to use this application"
 msgid "Version of this application"
 msgstr "Versjonen av dette programmet"
 
@@ -1183,24 +1122,46 @@ msgstr "Klarte ikkje identifisera den noverande økta."
 
 #. Option parsing
 #: ../utils/gdmflexiserver.c:711
-#| msgid "- Nested gdm login"
 msgid "- New GDM login"
 msgstr "- Ny GDM-innlogging"
 
 #: ../utils/gdmflexiserver.c:767
-#| msgid "Cannot start new display"
 msgid "Unable to start new display"
 msgstr "Klarte ikkje starta nytt display"
 
-#: ../utils/gdm-screenshot.c:219
+#: ../utils/gdm-screenshot.c:216
 msgid "Screenshot taken"
 msgstr "Skjermbilete teke"
 
 #. Option parsing
-#: ../utils/gdm-screenshot.c:284
+#: ../utils/gdm-screenshot.c:281
 msgid "Take a picture of the screen"
 msgstr "Ta eit bilete av skjermen"
 
+#~ msgid "Authentication Dialog"
+#~ msgstr "Autentiseringsdialog"
+
+#~ msgid "Enable debugging code"
+#~ msgstr "Bruk feilsøkingskode"
+
+#~ msgid "id"
+#~ msgstr "id"
+
+#~| msgid "%a %b %d, %H:%M"
+#~ msgid "%a %b %e"
+#~ msgstr "%a %e. %b"
+
+#~| msgid "%s: %s"
+#~ msgid "%1$s, %2$s"
+#~ msgstr "%1$s %2$s"
+
+#~| msgid "Enable _Timed Login"
+#~ msgid "Enable debugging"
+#~ msgstr "Bruk feilsøking"
+
+#~ msgid "Enable debugging mode for the greeter."
+#~ msgstr "Bruk feilsøkingsmodus i velkomsten."
+
 #~ msgid "CDE"
 #~ msgstr "CDE"