Updated Norwegian bokmål translation. Same.

2006-01-23  Kjartan Maraas,,23491770  <kmaraas@gnome.org>

	* nb.po: Updated Norwegian bokmål translation.
	* no.po: Same.

3 files changed, 363 insertions, 352 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7fd53cd3..fac336d8 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23  Kjartan Maraas,,23491770  <kmaraas@gnome.org>
+
+	* nb.po: Updated Norwegian bokmål translation.
+	* no.po: Same.
+
 2006-01-23  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
diff --git a/po/nb.po b/po/nb.po
index e8f312f7..55ed2ef3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm 2.8.0.1\n"
+"Project-Id-Version: gdm 2.13.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 12:25+0100\n"
-"PO-Revision-Date: 2006-01-17 12:27+0100\n"
+"POT-Creation-Date: 2006-01-23 11:10+0100\n"
+"PO-Revision-Date: 2006-01-23 11:11+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -128,18 +128,18 @@ msgstr "GNOME"
 msgid "This session logs you into GNOME"
 msgstr "Denne sesjonen logger deg inn til GNOME"
 
-#: ../daemon/auth.c:56
+#: ../daemon/auth.c:57
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
 msgstr "%s: Kunne ikke skrive ny autorisasjonsoppføring: %s"
 
-#: ../daemon/auth.c:59
+#: ../daemon/auth.c:60
 #, c-format
 msgid "%s: Could not write new authorization entry.  Possibly out of diskspace"
 msgstr ""
 "%s: Kunne ikke skrive ny autorisasjonsoppføring. Muligens tom for diskplass"
 
-#: ../daemon/auth.c:64
+#: ../daemon/auth.c:65
 #, c-format
 msgid ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
@@ -148,38 +148,38 @@ msgstr ""
 "GDM kunne ikke skrive en ny autorisasjonsoppføring til disk. Muligens tom "
 "for diskplass. %s%s"
 
-#: ../daemon/auth.c:194
+#: ../daemon/auth.c:195
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s: Kunne ikke lage ny cookie-fil i %s"
 
-#: ../daemon/auth.c:218 ../daemon/auth.c:235 ../daemon/auth.c:875
+#: ../daemon/auth.c:219 ../daemon/auth.c:236 ../daemon/auth.c:876
 #, c-format
 msgid "%s: Cannot safely open %s"
 msgstr "%s: Kan ikke åpne %s på en sikker måte"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: ../daemon/auth.c:674 ../daemon/auth.c:716
+#: ../daemon/auth.c:675 ../daemon/auth.c:717
 #, c-format
 msgid "%s: Could not open cookie file %s"
 msgstr "%s: Kunne ikke åpne cookie-fil %s"
 
-#: ../daemon/auth.c:695
+#: ../daemon/auth.c:696
 #, c-format
 msgid "%s: Could not lock cookie file %s"
 msgstr "%s: Kunne ikke låse cookie-fil %s"
 
-#: ../daemon/auth.c:745 ../daemon/auth.c:767
+#: ../daemon/auth.c:746 ../daemon/auth.c:768
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s: Kunne ikke skrive informasjonskapsel"
 
-#: ../daemon/auth.c:851
+#: ../daemon/auth.c:852
 #, c-format
 msgid "%s: Ignoring suspiciously looking cookie file %s"
 msgstr "%s: Overser suspekt cookie-fil %s"
 
-#: ../daemon/auth.c:894 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
+#: ../daemon/auth.c:895 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
 #, c-format
 msgid "Can't write to %s: %s"
 msgstr "Kan ikke skrive til %s: %s"
@@ -194,7 +194,7 @@ msgstr "Kan ikke skrive til %s: %s"
 #. * that should give people ample time to stop gdm if needed,
 #. * or just wait for the stupid malicious user to get bored
 #. * and go away
-#: ../daemon/display.c:110
+#: ../daemon/display.c:111
 #, c-format
 msgid ""
 "The display server has been shut down about 6 times in the last 90 seconds. "
@@ -205,22 +205,22 @@ msgstr ""
 "90 sekundene, så det er sannsynlig at noe ikke fungerer. Venter i tominutter "
 "før nytt forsøk på skjerm %s."
 
-#: ../daemon/display.c:254
+#: ../daemon/display.c:255
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s: Kan ikke opprette rør"
 
-#: ../daemon/display.c:330
+#: ../daemon/display.c:331
 #, c-format
 msgid "%s: Failed forking GDM slave process for %s"
 msgstr "%s: Feil under start av GDM-slaveprosess for %s"
 
-#: ../daemon/errorgui.c:347
+#: ../daemon/errorgui.c:348
 #, c-format
 msgid "%s not a regular file!\n"
 msgstr "%s er ikke en vanlig fil!\n"
 
-#: ../daemon/errorgui.c:364
+#: ../daemon/errorgui.c:365
 msgid ""
 "\n"
 "... File too long to display ...\n"
@@ -228,54 +228,54 @@ msgstr ""
 "\n"
 "... Filen er for lang til å vises ...\n"
 
-#: ../daemon/errorgui.c:373
+#: ../daemon/errorgui.c:374
 #, c-format
 msgid "%s could not be opened"
 msgstr "%s: kunne ikke åpnes"
 
-#: ../daemon/errorgui.c:487 ../daemon/errorgui.c:631 ../daemon/errorgui.c:742
-#: ../daemon/errorgui.c:863
+#: ../daemon/errorgui.c:488 ../daemon/errorgui.c:632 ../daemon/errorgui.c:743
+#: ../daemon/errorgui.c:864
 #, c-format
 msgid "%s: Cannot fork to display error/info box"
 msgstr "%s: Kan ikke starte dialogen"
 
-#: ../daemon/filecheck.c:60
+#: ../daemon/filecheck.c:61
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: Katalogen %s eksisterer ikke."
 
-#: ../daemon/filecheck.c:72 ../daemon/filecheck.c:114
-#: ../daemon/filecheck.c:177
+#: ../daemon/filecheck.c:73 ../daemon/filecheck.c:115
+#: ../daemon/filecheck.c:178
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: %s eies ikke av uid %d."
 
-#: ../daemon/filecheck.c:78 ../daemon/filecheck.c:121
+#: ../daemon/filecheck.c:79 ../daemon/filecheck.c:122
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: %s er skrivbar av gruppe."
 
-#: ../daemon/filecheck.c:84
+#: ../daemon/filecheck.c:85
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: %s er skrivbar av andre."
 
-#: ../daemon/filecheck.c:99 ../daemon/filecheck.c:165
+#: ../daemon/filecheck.c:100 ../daemon/filecheck.c:166
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: %s eksisterer ikke men kreves."
 
-#: ../daemon/filecheck.c:107 ../daemon/filecheck.c:171
+#: ../daemon/filecheck.c:108 ../daemon/filecheck.c:172
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: %s er ikke en vanlig fil."
 
-#: ../daemon/filecheck.c:128
+#: ../daemon/filecheck.c:129
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: %s er skrivbar av gruppe/andre."
 
-#: ../daemon/filecheck.c:135 ../daemon/filecheck.c:190
+#: ../daemon/filecheck.c:136 ../daemon/filecheck.c:191
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr ""
@@ -366,7 +366,7 @@ msgstr "Sjef går i dvale..."
 
 #: ../daemon/gdm.c:622
 #, c-format
-msgid "System is rebooting, please wait ..."
+msgid "System is restarting, please wait ..."
 msgstr "Systemet starter på nytt. Vennligst vent..."
 
 #: ../daemon/gdm.c:624
@@ -384,25 +384,29 @@ msgid "%s: Halt failed: %s"
 msgstr "%s: Nedstenging feilet: %s"
 
 #: ../daemon/gdm.c:657
-msgid "Master rebooting..."
-msgstr "Sjef starter på nytt..."
+msgid "Restarting computer..."
+msgstr "Start datamaskinen på nytt..."
 
 #: ../daemon/gdm.c:670
 #, c-format
-msgid "%s: Reboot failed: %s"
+msgid "%s: Restart failed: %s"
 msgstr "%s: Omstart feilet: %s"
 
 #: ../daemon/gdm.c:771
 #, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
+msgid ""
+"Restart GDM, Restart machine, Suspend, or Halt request when there is no "
+"system menu from display %s"
 msgstr ""
-"Omstart eller nedstenging forespurt selv om det ikke finnes en systemmeny "
-"fra skjerm %s"
+"Forespørsel for omstart av GDM, omstart av maskinen, hvilemodus eller "
+"nedstenging selv om det ikke finnes en systemmeny på skjerm %s"
 
 #: ../daemon/gdm.c:780
 #, c-format
-msgid "Restart, Reboot or Halt request from a non-static display %s"
-msgstr "Forespørsel om omstart eller nedstenging fra en ekstern skjerm %s"
+msgid ""
+"Restart GDM, Restart machine, Suspend or Halt request from a non-static "
+"display %s"
+msgstr "Forespørsel om omstart av GDM, omstart av maskinen, hvilemodus eller nedstenging fra en ikke-statisk skjerm %s"
 
 #. Bury this display for good
 #: ../daemon/gdm.c:846
@@ -476,7 +480,7 @@ msgstr "Bare root ønsker å kjøre gdm\n"
 #: ../daemon/gdm.c:1555 ../daemon/gdm.c:1561 ../daemon/gdm.c:1572
 #: ../daemon/misc.c:1771 ../daemon/misc.c:1775 ../daemon/misc.c:1779
 #: ../daemon/misc.c:1786 ../daemon/misc.c:1790 ../daemon/misc.c:1794
-#: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:780
+#: ../daemon/server.c:522 ../daemon/server.c:535 ../daemon/slave.c:780
 #: ../daemon/slave.c:794 ../daemon/slave.c:804 ../daemon/slave.c:814
 #: ../daemon/slave.c:826 ../gui/gdmchooser.c:1841 ../gui/gdmchooser.c:1844
 #: ../gui/gdmchooser.c:1847 ../gui/gdmlogin.c:3388 ../gui/gdmlogin.c:3398
@@ -787,11 +791,11 @@ msgstr ""
 "Siste innlogging:\n"
 "%s"
 
-#: ../daemon/server.c:150
+#: ../daemon/server.c:151
 msgid "Can not start fallback console"
 msgstr "Kan ikke starte reservekonsoll"
 
-#: ../daemon/server.c:340
+#: ../daemon/server.c:341
 #, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should "
@@ -802,7 +806,7 @@ msgstr ""
 "et annet skjermnummer? Hvis du svarer nei vil jeg forsøke å starte tjeneren "
 "på %s igjen.%s"
 
-#: ../daemon/server.c:348
+#: ../daemon/server.c:349
 msgid ""
 "  (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
 "Ctrl-Alt-F7 to go to console 7.  X servers usually run on consoles 7 and "
@@ -812,99 +816,99 @@ msgstr ""
 "som ctrl-alt-F7 for å gå til konsoll 7. X-tjenere kjører vanligvis på "
 "konsoll 7 og høyere.)"
 
-#: ../daemon/server.c:394
+#: ../daemon/server.c:395
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "Skjerm '%s' kan ikke åpnes av Xnest"
 
-#: ../daemon/server.c:425
+#: ../daemon/server.c:426
 #, c-format
 msgid "Display %s is busy. There is another X server running already."
 msgstr "Skjerm %s er opptatt, en annen X-tjener kjører allerede."
 
-#: ../daemon/server.c:509
+#: ../daemon/server.c:510
 #, c-format
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s: Feil under åpning av et rør: %s"
 
-#: ../daemon/server.c:697
+#: ../daemon/server.c:698
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s: kunne ikke koble til opphavsskjerm «%s»"
 
 #. Send X too busy
-#: ../daemon/server.c:837
+#: ../daemon/server.c:838
 #, c-format
 msgid "%s: Cannot find a free display number"
 msgstr "%s: Kan ikke finne et ledig skjermnummer"
 
-#: ../daemon/server.c:864
+#: ../daemon/server.c:865
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s: Skjerm %s er opptatt. Prøver et annet skjermnummer."
 
-#: ../daemon/server.c:975
+#: ../daemon/server.c:976
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "Ugyldig tjenerkommando '%s'"
 
-#: ../daemon/server.c:980
+#: ../daemon/server.c:981
 #, c-format
 msgid "Server name '%s' not found; using standard server"
 msgstr "Tjenernavn «%s» ble ikke funnet, bruker forvalgt tjener"
 
-#: ../daemon/server.c:1159
+#: ../daemon/server.c:1160
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s: Kunne ikke åpne loggfil for skjerm %s!"
 
-#: ../daemon/server.c:1171 ../daemon/server.c:1177 ../daemon/server.c:1182
+#: ../daemon/server.c:1172 ../daemon/server.c:1178 ../daemon/server.c:1183
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s: Feil under setting  av %s til %s"
 
-#: ../daemon/server.c:1228
+#: ../daemon/server.c:1229
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s: Tjenerkommandoen for skjerm %s er tom"
 
-#: ../daemon/server.c:1238
+#: ../daemon/server.c:1239
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s: Prioritet for tjener kunne ikke settes til %d: %s"
 
-#: ../daemon/server.c:1250
+#: ../daemon/server.c:1251
 #, c-format
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr ""
 "%s: Tjeneren skulle startes av uid %d, men denne brukeren eksisterer ikke"
 
-#: ../daemon/server.c:1265 ../daemon/slave.c:2450 ../daemon/slave.c:2921
+#: ../daemon/server.c:1266 ../daemon/slave.c:2450 ../daemon/slave.c:2921
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Kunne ikke sette gruppe-id til %d"
 
-#: ../daemon/server.c:1271 ../daemon/slave.c:2456 ../daemon/slave.c:2927
+#: ../daemon/server.c:1272 ../daemon/slave.c:2456 ../daemon/slave.c:2927
 #, c-format
 msgid "%s: initgroups () failed for %s"
 msgstr "%s: initgroups () feilet for %s"
 
-#: ../daemon/server.c:1277 ../daemon/slave.c:2461 ../daemon/slave.c:2932
+#: ../daemon/server.c:1278 ../daemon/slave.c:2461 ../daemon/slave.c:2932
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Kunne ikke sette bruker-id til %d"
 
-#: ../daemon/server.c:1284
+#: ../daemon/server.c:1285
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s: Kunne ikke sette gruppe-id til 0"
 
-#: ../daemon/server.c:1311
+#: ../daemon/server.c:1312
 #, c-format
 msgid "%s: Xserver not found: %s"
 msgstr "%s: Xserver ikke funnet: %s"
 
-#: ../daemon/server.c:1319
+#: ../daemon/server.c:1320
 #, c-format
 msgid "%s: Can't fork Xserver process!"
 msgstr "%s: Kan ikke kjøre Xserver-prosess!"
@@ -1313,8 +1317,9 @@ msgid "View details (~/.xsession-errors file)"
 msgstr "Vis detaljer (~/.xsession-errors filen)"
 
 #: ../daemon/slave.c:4314
-msgid "GDM detected a halt or reboot in progress."
-msgstr "GDM oppdaget at maskinen er i ferd med å stenges ned eller startes på nytt."
+msgid "GDM detected a halt or restart in progress."
+msgstr ""
+"GDM oppdaget at maskinen er i ferd med å stenges ned eller startes på nytt."
 
 #: ../daemon/slave.c:4408
 #, c-format
@@ -1354,8 +1359,8 @@ msgstr "%s: Kan ikke opprette rør"
 msgid "%s: Failed executing: %s"
 msgstr "%s: Feil under kjøring: %s"
 
-#: ../daemon/verify-crypt.c:67 ../daemon/verify-pam.c:1119
-#: ../daemon/verify-shadow.c:68
+#: ../daemon/verify-crypt.c:68 ../daemon/verify-pam.c:1119
+#: ../daemon/verify-shadow.c:69
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
@@ -1363,59 +1368,59 @@ msgstr ""
 "\n"
 "Ugyldig brukernavn eller passord. Det må tas hensyn til små/store bokstaver."
 
-#: ../daemon/verify-crypt.c:72 ../daemon/verify-pam.c:1129
-#: ../daemon/verify-shadow.c:73 ../gui/greeter/greeter_parser.c:1101
+#: ../daemon/verify-crypt.c:73 ../daemon/verify-pam.c:1129
+#: ../daemon/verify-shadow.c:74 ../gui/greeter/greeter_parser.c:1101
 msgid "Caps Lock is on."
 msgstr "Caps Lock er på."
 
-#: ../daemon/verify-crypt.c:117 ../daemon/verify-pam.c:525
-#: ../daemon/verify-shadow.c:116 ../gui/gdmlogin.c:2773
+#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:525
+#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2773
 msgid "Please enter your username"
 msgstr "Vennligst skriv inn brukernavn"
 
 #. login: is whacked always translate to Username:
-#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:425
+#: ../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:854
-#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
+#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
 #: ../gui/gdmlogin.c:1624 ../gui/gdmlogin.c:2104 ../gui/greeter/greeter.c:172
 #: ../gui/greeter/greeter_parser.c:1120
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../daemon/verify-crypt.c:156 ../daemon/verify-pam.c:428
+#: ../daemon/verify-crypt.c:157 ../daemon/verify-pam.c:428
 #: ../daemon/verify-pam.c:429 ../daemon/verify-pam.c:573
-#: ../daemon/verify-shadow.c:174 ../gui/gdmlogin.c:1659
+#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1659
 #: ../gui/greeter/greeter.c:190
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../daemon/verify-crypt.c:174 ../daemon/verify-crypt.c:188
-#: ../daemon/verify-shadow.c:192 ../daemon/verify-shadow.c:206
+#: ../daemon/verify-crypt.c:175 ../daemon/verify-crypt.c:189
+#: ../daemon/verify-shadow.c:193 ../daemon/verify-shadow.c:207
 #, c-format
 msgid "Couldn't authenticate user \"%s\""
 msgstr "Kunne ikke autentisere bruker «%s»"
 
-#: ../daemon/verify-crypt.c:201 ../daemon/verify-pam.c:965
-#: ../daemon/verify-shadow.c:219
+#: ../daemon/verify-crypt.c:202 ../daemon/verify-pam.c:965
+#: ../daemon/verify-shadow.c:220
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "Root innlogging ikke tillatt på skjerm «%s»"
 
-#: ../daemon/verify-crypt.c:203 ../daemon/verify-shadow.c:221
+#: ../daemon/verify-crypt.c:204 ../daemon/verify-shadow.c:222
 msgid "The system administrator is not allowed to login from this screen"
 msgstr ""
 "Systemadministrator har ikke tillatelse til å logge inn fra denne skjermen"
 
-#: ../daemon/verify-crypt.c:219 ../daemon/verify-crypt.c:243
-#: ../daemon/verify-shadow.c:237 ../daemon/verify-shadow.c:261
+#: ../daemon/verify-crypt.c:220 ../daemon/verify-crypt.c:244
+#: ../daemon/verify-shadow.c:238 ../daemon/verify-shadow.c:262
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "Bruker %s har ikke tillatelse til å logge inn"
 
-#: ../daemon/verify-crypt.c:221 ../daemon/verify-crypt.c:245
+#: ../daemon/verify-crypt.c:222 ../daemon/verify-crypt.c:246
 #: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1292
-#: ../daemon/verify-shadow.c:239 ../daemon/verify-shadow.c:263
+#: ../daemon/verify-shadow.c:240 ../daemon/verify-shadow.c:264
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1423,16 +1428,16 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert din konto."
 
-#: ../daemon/verify-crypt.c:268 ../daemon/verify-crypt.c:406
+#: ../daemon/verify-crypt.c:269 ../daemon/verify-crypt.c:407
 #: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1309
-#: ../daemon/verify-shadow.c:286 ../daemon/verify-shadow.c:424
+#: ../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:270 ../daemon/verify-crypt.c:409
+#: ../daemon/verify-crypt.c:271 ../daemon/verify-crypt.c:410
 #: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1312
-#: ../daemon/verify-shadow.c:288 ../daemon/verify-shadow.c:427
+#: ../daemon/verify-shadow.c:289 ../daemon/verify-shadow.c:428
 msgid ""
 "\n"
 "Cannot set your user group; you will not be able to log in. Please contact "
@@ -1442,13 +1447,13 @@ msgstr ""
 "Kan ikke sette din brukergruppe. Du vil ikke kunne logge inn. Vennligst "
 "kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:281 ../daemon/verify-crypt.c:354
-#: ../daemon/verify-shadow.c:299 ../daemon/verify-shadow.c:373
+#: ../daemon/verify-crypt.c:282 ../daemon/verify-crypt.c:355
+#: ../daemon/verify-shadow.c:300 ../daemon/verify-shadow.c:374
 #, c-format
 msgid "Password of %s has expired"
 msgstr "Passord for %s er utgått"
 
-#: ../daemon/verify-crypt.c:283 ../daemon/verify-shadow.c:301
+#: ../daemon/verify-crypt.c:284 ../daemon/verify-shadow.c:302
 msgid ""
 "You are required to change your password.\n"
 "Please choose a new one."
@@ -1456,7 +1461,7 @@ msgstr ""
 "Det kreves at du endrer ditt passord.\n"
 "Vennligst velg et nytt."
 
-#: ../daemon/verify-crypt.c:294 ../daemon/verify-shadow.c:312
+#: ../daemon/verify-crypt.c:295 ../daemon/verify-shadow.c:313
 msgid ""
 "\n"
 "Cannot change your password; you will not be able to log in. Please try "
@@ -1466,8 +1471,8 @@ msgstr ""
 "Kan ikke endre ditt passord. Du vil ikke kunne logge inn. Vennligst prøv "
 "igjen senere, eller kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:337 ../daemon/verify-crypt.c:345
-#: ../daemon/verify-shadow.c:356 ../daemon/verify-shadow.c:364
+#: ../daemon/verify-crypt.c:338 ../daemon/verify-crypt.c:346
+#: ../daemon/verify-shadow.c:357 ../daemon/verify-shadow.c:365
 msgid ""
 "Your password has been changed but you may have to change it again. Please "
 "try again later or contact your system administrator."
@@ -1475,7 +1480,7 @@ msgstr ""
 "Passordet ditt err endret, men du vil kanskje måtte endre det igjen. "
 "Vennligst prøv igjen senere, eller kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:356 ../daemon/verify-shadow.c:375
+#: ../daemon/verify-crypt.c:357 ../daemon/verify-shadow.c:376
 msgid ""
 "Your password has expired.\n"
 "Only a system administrator can now change it"
@@ -1483,11 +1488,11 @@ msgstr ""
 "Passordet ditt er utgått.\n"
 "Kun en systemadministrator kan endre det nå."
 
-#: ../daemon/verify-crypt.c:363 ../daemon/verify-shadow.c:382
+#: ../daemon/verify-crypt.c:364 ../daemon/verify-shadow.c:383
 msgid "Internal error on passwdexpired"
 msgstr "Intern feil med passwdexpired"
 
-#: ../daemon/verify-crypt.c:365 ../daemon/verify-shadow.c:384
+#: ../daemon/verify-crypt.c:366 ../daemon/verify-shadow.c:385
 msgid ""
 "An internal error occurred. You will not be able to log in.\n"
 "Please try again later or contact your system administrator."
@@ -1495,7 +1500,7 @@ msgstr ""
 "En intern feil oppsto. Du vil ikke kunne logge inn.\n"
 "Vennligst prøv igjen senere eller kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:401 ../daemon/verify-shadow.c:419
+#: ../daemon/verify-crypt.c:402 ../daemon/verify-shadow.c:420
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr "Kan ikke finne passwd-data for %s"
@@ -2776,7 +2781,8 @@ 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:650 ../gui/gdmlogin.c:2494
-#: ../gui/greeter/greeter_parser.c:1086
+#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:68
+#: ../gui/greeter/greeter_system.c:187
 msgid "_Restart"
 msgstr "Sta_rt på nytt"
 
@@ -2966,7 +2972,7 @@ msgstr ""
 msgid "Cannot start the greeter"
 msgstr "Kan ikke starte velkomst"
 
-#: ../gui/gdmlogin.c:3280 ../gui/greeter/greeter.c:674
+#: ../gui/gdmlogin.c:3280
 msgid "Restart"
 msgstr "Start på nytt"
 
@@ -2980,7 +2986,7 @@ msgstr ""
 "sannsynligvis nettopp oppgradert GDM. Vennligst start GDM tjenesten eller "
 "maskinen på nytt."
 
-#: ../gui/gdmlogin.c:3328
+#: ../gui/gdmlogin.c:3328 ../gui/greeter/greeter.c:674
 msgid "Restart GDM"
 msgstr "Start GDM på nytt"
 
@@ -3032,13 +3038,13 @@ msgstr "Kan ikke åpne fil"
 msgid "Select User Image"
 msgstr "Velg bilde for bruker"
 
-#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5581 ../gui/gdmsetup.c:5703
-#: ../gui/gdmsetup.c:5856 ../gui/gdmsetup.c:5978
+#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5582 ../gui/gdmsetup.c:5704
+#: ../gui/gdmsetup.c:5857 ../gui/gdmsetup.c:5979
 msgid "Images"
 msgstr "Bilder"
 
-#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3045 ../gui/gdmsetup.c:5586
-#: ../gui/gdmsetup.c:5708 ../gui/gdmsetup.c:5861 ../gui/gdmsetup.c:5983
+#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3046 ../gui/gdmsetup.c:5587
+#: ../gui/gdmsetup.c:5709 ../gui/gdmsetup.c:5862 ../gui/gdmsetup.c:5984
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -3102,7 +3108,7 @@ msgstr "Fant ikke noe i sesjonskatalogen."
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr "Fant ikke lenke til forvalg sesjon. Bruker Feilsikker GNOME.\n"
 
-#: ../gui/gdmsetup.c:259
+#: ../gui/gdmsetup.c:260
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
@@ -3110,84 +3116,84 @@ msgstr ""
 "En feil har oppstått under forsøk på å kontakte innloggingsskjermene. Alle "
 "oppdateringer er kanskje ikke aktivert."
 
-#: ../gui/gdmsetup.c:800 ../gui/gdmsetup.c:818 ../gui/gdmsetup.c:973
-#: ../gui/gdmsetup.c:1219
+#: ../gui/gdmsetup.c:801 ../gui/gdmsetup.c:819 ../gui/gdmsetup.c:974
+#: ../gui/gdmsetup.c:1220
 msgid "Themed"
 msgstr "Med tema"
 
-#: ../gui/gdmsetup.c:803 ../gui/gdmsetup.c:834
+#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
 msgid "Plain"
 msgstr "Vanlig"
 
-#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
+#: ../gui/gdmsetup.c:805 ../gui/gdmsetup.c:836
 msgid "Plain with face browser"
 msgstr "Vanlig med ansiktsvisning"
 
-#: ../gui/gdmsetup.c:1570
+#: ../gui/gdmsetup.c:1571
 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:1791
+#: ../gui/gdmsetup.c:1792
 #, 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:1801 ../gui/gdmsetup.c:1831 ../gui/gdmsetup.c:1868
+#: ../gui/gdmsetup.c:1802 ../gui/gdmsetup.c:1832 ../gui/gdmsetup.c:1869
 msgid "Cannot add user"
 msgstr "Kan ikke legge til bruker"
 
-#: ../gui/gdmsetup.c:1821
+#: ../gui/gdmsetup.c:1822
 #, 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:1858
+#: ../gui/gdmsetup.c:1859
 #, c-format
 msgid "The \"%s\" user does not exist."
 msgstr "Bruker «%s» eksisterer ikke."
 
-#: ../gui/gdmsetup.c:3040 ../gui/gdmsetup.glade.h:73
+#: ../gui/gdmsetup.c:3041 ../gui/gdmsetup.glade.h:73
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../gui/gdmsetup.c:3244 ../gui/gdmsetup.c:3302
+#: ../gui/gdmsetup.c:3245 ../gui/gdmsetup.c:3303
 msgid "None"
 msgstr "Ingen"
 
-#: ../gui/gdmsetup.c:3735
+#: ../gui/gdmsetup.c:3736
 msgid "Archive is not of a subdirectory"
 msgstr "Arkivet består ikke av en underkatalog"
 
-#: ../gui/gdmsetup.c:3743
+#: ../gui/gdmsetup.c:3744
 msgid "Archive is not of a single subdirectory"
 msgstr "Arkivet består ikke av en enkelt underkatalog"
 
-#: ../gui/gdmsetup.c:3767 ../gui/gdmsetup.c:3845
+#: ../gui/gdmsetup.c:3768 ../gui/gdmsetup.c:3846
 msgid "File not a tar.gz or tar archive"
 msgstr "Filen er ikke eller et tar arkiv"
 
-#: ../gui/gdmsetup.c:3769
+#: ../gui/gdmsetup.c:3770
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Arkivet inneholder ikke en GdmGreeterTheme.info-fil"
 
-#: ../gui/gdmsetup.c:3791
+#: ../gui/gdmsetup.c:3792
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
-#: ../gui/gdmsetup.c:3911
+#: ../gui/gdmsetup.c:3912
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../gui/gdmsetup.c:3918
+#: ../gui/gdmsetup.c:3919
 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:3940
+#: ../gui/gdmsetup.c:3941
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed. Install again anyway?"
@@ -3195,47 +3201,47 @@ msgstr ""
 "Temakatalog «%s» ser ut til å være installert allerede. Installer igjen "
 "likevel?"
 
-#: ../gui/gdmsetup.c:4032
+#: ../gui/gdmsetup.c:4033
 msgid "Some error occurred when installing the theme"
 msgstr "En feil oppsto under installasjon av temaet"
 
-#: ../gui/gdmsetup.c:4088
+#: ../gui/gdmsetup.c:4089
 msgid "No file selected"
 msgstr "Ingen fil valgt"
 
-#: ../gui/gdmsetup.c:4109
+#: ../gui/gdmsetup.c:4110
 msgid "Select Theme Archive"
 msgstr "Velg tema-arkiv"
 
-#: ../gui/gdmsetup.c:4113 ../gui/gdmsetup.c:5102
+#: ../gui/gdmsetup.c:4114 ../gui/gdmsetup.c:5103
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../gui/gdmsetup.c:4204
+#: ../gui/gdmsetup.c:4205
 #, c-format
 msgid "Remove the \"%s\" theme?"
 msgstr "Fjern tema «%s»?"
 
-#: ../gui/gdmsetup.c:4213
+#: ../gui/gdmsetup.c:4214
 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:4221
+#: ../gui/gdmsetup.c:4222
 msgid "_Remove Theme"
 msgstr "Fje_rn tema"
 
-#: ../gui/gdmsetup.c:5091
+#: ../gui/gdmsetup.c:5092
 #, c-format
 msgid "Install the theme from '%s'?"
 msgstr "Installer tema fra «%s»?"
 
-#: ../gui/gdmsetup.c:5092
+#: ../gui/gdmsetup.c:5093
 #, 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:5353
+#: ../gui/gdmsetup.c:5354
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3258,26 +3264,26 @@ msgstr ""
 "For komplett dokumentasjon se i GNOME hjelpleser under kategorien GNOME/"
 "System."
 
-#: ../gui/gdmsetup.c:6399
+#: ../gui/gdmsetup.c:6400
 msgid "Apply the changes to users before closing?"
 msgstr "Aktiver endringer for brukere før programmet lukkes?"
 
-#: ../gui/gdmsetup.c:6400
+#: ../gui/gdmsetup.c:6401
 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:6403
+#: ../gui/gdmsetup.c:6404
 msgid "Close _without Applying"
 msgstr "Lukk _uten å aktivere"
 
-#: ../gui/gdmsetup.c:6451
+#: ../gui/gdmsetup.c:6452
 msgid "Could not access GDM configuration file.\n"
 msgstr "Kunne ikke aksessere konfigurasjonsfilen for GDM.\n"
 
-#: ../gui/gdmsetup.c:6495
+#: ../gui/gdmsetup.c:6496
 msgid "You must be the root user to configure GDM."
 msgstr "Du må være superbruker (root) for å konfigurere GDM."
 
@@ -3717,8 +3723,8 @@ msgstr ""
 "nettopp oppgradert GDM. Vennligst start GDM-tjenesten eller maskinen på nytt."
 
 #: ../gui/greeter/greeter.c:625 ../gui/greeter/greeter.c:676
-msgid "Reboot"
-msgstr "Omstart"
+msgid "Restart Machine"
+msgstr "Start maskinen på nytt"
 
 #: ../gui/greeter/greeter.c:1099
 #, c-format
@@ -3853,10 +3859,6 @@ msgstr "_Forrige sesjon"
 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:68 ../gui/greeter/greeter_system.c:187
-msgid "_Reboot"
-msgstr "Omsta_rt"
-
 #: ../gui/greeter/greeter_system.c:160 ../gui/greeter/greeter_system.c:356
 msgid ""
 "Run an XDMCP chooser which will allow you to log into available remote "
@@ -3872,12 +3874,13 @@ msgstr ""
 "Konfigurer GDM (denne innloggingshåndtereren). Dette krever root-passordet."
 
 #: ../gui/greeter/greeter_system.c:194 ../gui/greeter/greeter_system.c:322
-msgid "Reboot your computer"
-msgstr "Start din datamaskin på nytt"
+msgid "Restart your computer"
+msgstr "Start datamaskinen på nytt"
 
 #: ../gui/greeter/greeter_system.c:206
 msgid "Shut Down the system so that you may safely turn off the computer."
-msgstr "Steng ned systemet slik at du kan skru av datamaskinen på en trygg måte."
+msgstr ""
+"Steng ned systemet slik at du kan skru av datamaskinen på en trygg måte."
 
 #: ../gui/greeter/greeter_system.c:219 ../gui/greeter/greeter_system.c:339
 msgid "Suspend your computer"
@@ -3896,7 +3899,7 @@ 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:319
-msgid "_Reboot the computer"
+msgid "_Restart the computer"
 msgstr "Sta_rt datamaskinen på nytt"
 
 #: ../gui/greeter/greeter_system.c:336
@@ -3953,7 +3956,7 @@ msgstr "GNOME kunstvariasjon av Sirkler"
 msgid "Happy GNOME"
 msgstr "Glad GNOME"
 
-#: ../gui/modules/dwellmouselistener.c:655
+#: ../gui/modules/dwellmouselistener.c:656
 #: ../gui/modules/keymouselistener.c:926
 #, c-format
 msgid ""
@@ -3968,55 +3971,55 @@ msgstr ""
 msgid "Cannot open gestures file: %s"
 msgstr "Kan ikke åpne gestikuleringsfil: %s"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:38
+#: ../utils/gdm-dmx-reconnect-proxy.c:37
 msgid "DMX display to migrate to"
 msgstr "DMX-skjerm du vil migrere til"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:39 ../utils/gdm-dmx-reconnect-proxy.c:44
+#: ../utils/gdm-dmx-reconnect-proxy.c:38 ../utils/gdm-dmx-reconnect-proxy.c:43
 msgid "DISPLAY"
 msgstr "SKJERM"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:43
+#: ../utils/gdm-dmx-reconnect-proxy.c:42
 msgid "Backend display name"
 msgstr "Visningsnavn for bakstykke"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:48
+#: ../utils/gdm-dmx-reconnect-proxy.c:47
 msgid "Xauthority file for destination display"
 msgstr "Xauthority-fil for destinasjonsvisning"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:49 ../utils/gdm-dmx-reconnect-proxy.c:54
+#: ../utils/gdm-dmx-reconnect-proxy.c:48 ../utils/gdm-dmx-reconnect-proxy.c:53
 msgid "AUTHFILE"
 msgstr "AUTENTISERINGSFIL"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:53
+#: ../utils/gdm-dmx-reconnect-proxy.c:52
 msgid "Xauthority file for backend display"
 msgstr "Xauthority-fil for bakstykkevisning"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:71
+#: ../utils/gdm-dmx-reconnect-proxy.c:70
 #, c-format
 msgid "Failed to open display \"%s\"\n"
 msgstr "Klarte ikke å åpne skjerm «%s»\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:75
+#: ../utils/gdm-dmx-reconnect-proxy.c:74
 #, c-format
 msgid "DMX extension not present on \"%s\"\n"
 msgstr "DMX-utvidelsen finnes ikke på «%s»\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:98
+#: ../utils/gdm-dmx-reconnect-proxy.c:97
 msgid "- migrate a backend display from one DMX display to another"
 msgstr "- migrer en bakstykkevisning fra en DMX-visning til en annen"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:104
+#: ../utils/gdm-dmx-reconnect-proxy.c:103
 #, c-format
 msgid "You must specify a destination DMX display using %s\n"
 msgstr "Du må spesifisere en destinatsjon DMX-visning ved å bruke %s\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:109
+#: ../utils/gdm-dmx-reconnect-proxy.c:108
 #, c-format
 msgid "You must specify a backend display by using %s\n"
 msgstr "Du må spesifisere en bakstykkevisning ved å bruke %s\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:124
+#: ../utils/gdm-dmx-reconnect-proxy.c:123
 #, c-format
 msgid "DMXAddScreen \"%s\" failed on \"%s\"\n"
 msgstr "DMXAddScreen «%s» feilet på «%s»\n"
@@ -4031,14 +4034,14 @@ msgstr "gdmaskpass kjører kun som root\n"
 msgid "Authentication failure!\n"
 msgstr "Autentiseringfeil!\n"
 
-#: ../vicious-extensions/glade-helper.c:85
-#: ../vicious-extensions/glade-helper.c:117
-#: ../vicious-extensions/glade-helper.c:139
-#: ../vicious-extensions/glade-helper.c:159
+#: ../vicious-extensions/glade-helper.c:84
+#: ../vicious-extensions/glade-helper.c:116
+#: ../vicious-extensions/glade-helper.c:138
+#: ../vicious-extensions/glade-helper.c:158
 msgid "(memory buffer)"
 msgstr "(minnebuffer)"
 
-#: ../vicious-extensions/glade-helper.c:191
+#: ../vicious-extensions/glade-helper.c:190
 #, c-format
 msgid ""
 "An error occurred while loading user interface element %s%s from file %s.  "
@@ -4050,13 +4053,13 @@ msgstr ""
 "kan ikke fortsette og vil avslutte nå. Du bør sjekke installasjonen av %s "
 "eller reinsallere %s."
 
-#: ../vicious-extensions/glade-helper.c:209
-#: ../vicious-extensions/glade-helper.c:277
-#: ../vicious-extensions/glade-helper.c:319
+#: ../vicious-extensions/glade-helper.c:208
+#: ../vicious-extensions/glade-helper.c:276
+#: ../vicious-extensions/glade-helper.c:318
 msgid "Cannot load user interface"
 msgstr "Kan ikke laste brukergrensesnitt"
 
-#: ../vicious-extensions/glade-helper.c:215
+#: ../vicious-extensions/glade-helper.c:214
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -4065,7 +4068,7 @@ msgstr ""
 "Glade filen er på crack! Sjekk at korrekt fil er installert!\n"
 "fil: %s widget %s"
 
-#: ../vicious-extensions/glade-helper.c:247
+#: ../vicious-extensions/glade-helper.c:246
 #, c-format
 msgid ""
 "An error occurred while loading the user interface element %s%s from file %"
@@ -4088,7 +4091,7 @@ msgstr[1] ""
 "at glade grensesnittbeskrivelsen er korrupt. %s kan ikke fortsette og vil "
 "avslutte nå. Du bør sjekke installasjonen av %s eller reinstallere %s."
 
-#: ../vicious-extensions/glade-helper.c:283
+#: ../vicious-extensions/glade-helper.c:282
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -4097,7 +4100,7 @@ msgstr ""
 "Glade filen er på crack! Sjekk at korrekt fil er installert!\n"
 "fil: %s widget: %s forventet antall clist-kolonner: %d"
 
-#: ../vicious-extensions/glade-helper.c:303
+#: ../vicious-extensions/glade-helper.c:302
 #, c-format
 msgid ""
 "An error occurred while loading the user interface from file %s.  Possibly "
@@ -4109,11 +4112,11 @@ msgstr ""
 "fortsette og vil avslutte nå. Du bør sjekke installasjonen av %s eller "
 "installere %s på nytt."
 
-#: ../vicious-extensions/glade-helper.c:322
+#: ../vicious-extensions/glade-helper.c:321
 #, c-format
 msgid "No interface could be loaded. This is BAD! (file: %s)"
 msgstr "Ingen grensesnitt kunne lastes! Dette er ikke bra! (fil: %s)"
 
-#: ../vicious-extensions/ve-nongnome.c:134
+#: ../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"
diff --git a/po/no.po b/po/no.po
index e8f312f7..55ed2ef3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm 2.8.0.1\n"
+"Project-Id-Version: gdm 2.13.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-17 12:25+0100\n"
-"PO-Revision-Date: 2006-01-17 12:27+0100\n"
+"POT-Creation-Date: 2006-01-23 11:10+0100\n"
+"PO-Revision-Date: 2006-01-23 11:11+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -128,18 +128,18 @@ msgstr "GNOME"
 msgid "This session logs you into GNOME"
 msgstr "Denne sesjonen logger deg inn til GNOME"
 
-#: ../daemon/auth.c:56
+#: ../daemon/auth.c:57
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
 msgstr "%s: Kunne ikke skrive ny autorisasjonsoppføring: %s"
 
-#: ../daemon/auth.c:59
+#: ../daemon/auth.c:60
 #, c-format
 msgid "%s: Could not write new authorization entry.  Possibly out of diskspace"
 msgstr ""
 "%s: Kunne ikke skrive ny autorisasjonsoppføring. Muligens tom for diskplass"
 
-#: ../daemon/auth.c:64
+#: ../daemon/auth.c:65
 #, c-format
 msgid ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
@@ -148,38 +148,38 @@ msgstr ""
 "GDM kunne ikke skrive en ny autorisasjonsoppføring til disk. Muligens tom "
 "for diskplass. %s%s"
 
-#: ../daemon/auth.c:194
+#: ../daemon/auth.c:195
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s: Kunne ikke lage ny cookie-fil i %s"
 
-#: ../daemon/auth.c:218 ../daemon/auth.c:235 ../daemon/auth.c:875
+#: ../daemon/auth.c:219 ../daemon/auth.c:236 ../daemon/auth.c:876
 #, c-format
 msgid "%s: Cannot safely open %s"
 msgstr "%s: Kan ikke åpne %s på en sikker måte"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: ../daemon/auth.c:674 ../daemon/auth.c:716
+#: ../daemon/auth.c:675 ../daemon/auth.c:717
 #, c-format
 msgid "%s: Could not open cookie file %s"
 msgstr "%s: Kunne ikke åpne cookie-fil %s"
 
-#: ../daemon/auth.c:695
+#: ../daemon/auth.c:696
 #, c-format
 msgid "%s: Could not lock cookie file %s"
 msgstr "%s: Kunne ikke låse cookie-fil %s"
 
-#: ../daemon/auth.c:745 ../daemon/auth.c:767
+#: ../daemon/auth.c:746 ../daemon/auth.c:768
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s: Kunne ikke skrive informasjonskapsel"
 
-#: ../daemon/auth.c:851
+#: ../daemon/auth.c:852
 #, c-format
 msgid "%s: Ignoring suspiciously looking cookie file %s"
 msgstr "%s: Overser suspekt cookie-fil %s"
 
-#: ../daemon/auth.c:894 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
+#: ../daemon/auth.c:895 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
 #, c-format
 msgid "Can't write to %s: %s"
 msgstr "Kan ikke skrive til %s: %s"
@@ -194,7 +194,7 @@ msgstr "Kan ikke skrive til %s: %s"
 #. * that should give people ample time to stop gdm if needed,
 #. * or just wait for the stupid malicious user to get bored
 #. * and go away
-#: ../daemon/display.c:110
+#: ../daemon/display.c:111
 #, c-format
 msgid ""
 "The display server has been shut down about 6 times in the last 90 seconds. "
@@ -205,22 +205,22 @@ msgstr ""
 "90 sekundene, så det er sannsynlig at noe ikke fungerer. Venter i tominutter "
 "før nytt forsøk på skjerm %s."
 
-#: ../daemon/display.c:254
+#: ../daemon/display.c:255
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s: Kan ikke opprette rør"
 
-#: ../daemon/display.c:330
+#: ../daemon/display.c:331
 #, c-format
 msgid "%s: Failed forking GDM slave process for %s"
 msgstr "%s: Feil under start av GDM-slaveprosess for %s"
 
-#: ../daemon/errorgui.c:347
+#: ../daemon/errorgui.c:348
 #, c-format
 msgid "%s not a regular file!\n"
 msgstr "%s er ikke en vanlig fil!\n"
 
-#: ../daemon/errorgui.c:364
+#: ../daemon/errorgui.c:365
 msgid ""
 "\n"
 "... File too long to display ...\n"
@@ -228,54 +228,54 @@ msgstr ""
 "\n"
 "... Filen er for lang til å vises ...\n"
 
-#: ../daemon/errorgui.c:373
+#: ../daemon/errorgui.c:374
 #, c-format
 msgid "%s could not be opened"
 msgstr "%s: kunne ikke åpnes"
 
-#: ../daemon/errorgui.c:487 ../daemon/errorgui.c:631 ../daemon/errorgui.c:742
-#: ../daemon/errorgui.c:863
+#: ../daemon/errorgui.c:488 ../daemon/errorgui.c:632 ../daemon/errorgui.c:743
+#: ../daemon/errorgui.c:864
 #, c-format
 msgid "%s: Cannot fork to display error/info box"
 msgstr "%s: Kan ikke starte dialogen"
 
-#: ../daemon/filecheck.c:60
+#: ../daemon/filecheck.c:61
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: Katalogen %s eksisterer ikke."
 
-#: ../daemon/filecheck.c:72 ../daemon/filecheck.c:114
-#: ../daemon/filecheck.c:177
+#: ../daemon/filecheck.c:73 ../daemon/filecheck.c:115
+#: ../daemon/filecheck.c:178
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: %s eies ikke av uid %d."
 
-#: ../daemon/filecheck.c:78 ../daemon/filecheck.c:121
+#: ../daemon/filecheck.c:79 ../daemon/filecheck.c:122
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: %s er skrivbar av gruppe."
 
-#: ../daemon/filecheck.c:84
+#: ../daemon/filecheck.c:85
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: %s er skrivbar av andre."
 
-#: ../daemon/filecheck.c:99 ../daemon/filecheck.c:165
+#: ../daemon/filecheck.c:100 ../daemon/filecheck.c:166
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: %s eksisterer ikke men kreves."
 
-#: ../daemon/filecheck.c:107 ../daemon/filecheck.c:171
+#: ../daemon/filecheck.c:108 ../daemon/filecheck.c:172
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: %s er ikke en vanlig fil."
 
-#: ../daemon/filecheck.c:128
+#: ../daemon/filecheck.c:129
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: %s er skrivbar av gruppe/andre."
 
-#: ../daemon/filecheck.c:135 ../daemon/filecheck.c:190
+#: ../daemon/filecheck.c:136 ../daemon/filecheck.c:191
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr ""
@@ -366,7 +366,7 @@ msgstr "Sjef går i dvale..."
 
 #: ../daemon/gdm.c:622
 #, c-format
-msgid "System is rebooting, please wait ..."
+msgid "System is restarting, please wait ..."
 msgstr "Systemet starter på nytt. Vennligst vent..."
 
 #: ../daemon/gdm.c:624
@@ -384,25 +384,29 @@ msgid "%s: Halt failed: %s"
 msgstr "%s: Nedstenging feilet: %s"
 
 #: ../daemon/gdm.c:657
-msgid "Master rebooting..."
-msgstr "Sjef starter på nytt..."
+msgid "Restarting computer..."
+msgstr "Start datamaskinen på nytt..."
 
 #: ../daemon/gdm.c:670
 #, c-format
-msgid "%s: Reboot failed: %s"
+msgid "%s: Restart failed: %s"
 msgstr "%s: Omstart feilet: %s"
 
 #: ../daemon/gdm.c:771
 #, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
+msgid ""
+"Restart GDM, Restart machine, Suspend, or Halt request when there is no "
+"system menu from display %s"
 msgstr ""
-"Omstart eller nedstenging forespurt selv om det ikke finnes en systemmeny "
-"fra skjerm %s"
+"Forespørsel for omstart av GDM, omstart av maskinen, hvilemodus eller "
+"nedstenging selv om det ikke finnes en systemmeny på skjerm %s"
 
 #: ../daemon/gdm.c:780
 #, c-format
-msgid "Restart, Reboot or Halt request from a non-static display %s"
-msgstr "Forespørsel om omstart eller nedstenging fra en ekstern skjerm %s"
+msgid ""
+"Restart GDM, Restart machine, Suspend or Halt request from a non-static "
+"display %s"
+msgstr "Forespørsel om omstart av GDM, omstart av maskinen, hvilemodus eller nedstenging fra en ikke-statisk skjerm %s"
 
 #. Bury this display for good
 #: ../daemon/gdm.c:846
@@ -476,7 +480,7 @@ msgstr "Bare root ønsker å kjøre gdm\n"
 #: ../daemon/gdm.c:1555 ../daemon/gdm.c:1561 ../daemon/gdm.c:1572
 #: ../daemon/misc.c:1771 ../daemon/misc.c:1775 ../daemon/misc.c:1779
 #: ../daemon/misc.c:1786 ../daemon/misc.c:1790 ../daemon/misc.c:1794
-#: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:780
+#: ../daemon/server.c:522 ../daemon/server.c:535 ../daemon/slave.c:780
 #: ../daemon/slave.c:794 ../daemon/slave.c:804 ../daemon/slave.c:814
 #: ../daemon/slave.c:826 ../gui/gdmchooser.c:1841 ../gui/gdmchooser.c:1844
 #: ../gui/gdmchooser.c:1847 ../gui/gdmlogin.c:3388 ../gui/gdmlogin.c:3398
@@ -787,11 +791,11 @@ msgstr ""
 "Siste innlogging:\n"
 "%s"
 
-#: ../daemon/server.c:150
+#: ../daemon/server.c:151
 msgid "Can not start fallback console"
 msgstr "Kan ikke starte reservekonsoll"
 
-#: ../daemon/server.c:340
+#: ../daemon/server.c:341
 #, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should "
@@ -802,7 +806,7 @@ msgstr ""
 "et annet skjermnummer? Hvis du svarer nei vil jeg forsøke å starte tjeneren "
 "på %s igjen.%s"
 
-#: ../daemon/server.c:348
+#: ../daemon/server.c:349
 msgid ""
 "  (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
 "Ctrl-Alt-F7 to go to console 7.  X servers usually run on consoles 7 and "
@@ -812,99 +816,99 @@ msgstr ""
 "som ctrl-alt-F7 for å gå til konsoll 7. X-tjenere kjører vanligvis på "
 "konsoll 7 og høyere.)"
 
-#: ../daemon/server.c:394
+#: ../daemon/server.c:395
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "Skjerm '%s' kan ikke åpnes av Xnest"
 
-#: ../daemon/server.c:425
+#: ../daemon/server.c:426
 #, c-format
 msgid "Display %s is busy. There is another X server running already."
 msgstr "Skjerm %s er opptatt, en annen X-tjener kjører allerede."
 
-#: ../daemon/server.c:509
+#: ../daemon/server.c:510
 #, c-format
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s: Feil under åpning av et rør: %s"
 
-#: ../daemon/server.c:697
+#: ../daemon/server.c:698
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s: kunne ikke koble til opphavsskjerm «%s»"
 
 #. Send X too busy
-#: ../daemon/server.c:837
+#: ../daemon/server.c:838
 #, c-format
 msgid "%s: Cannot find a free display number"
 msgstr "%s: Kan ikke finne et ledig skjermnummer"
 
-#: ../daemon/server.c:864
+#: ../daemon/server.c:865
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s: Skjerm %s er opptatt. Prøver et annet skjermnummer."
 
-#: ../daemon/server.c:975
+#: ../daemon/server.c:976
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "Ugyldig tjenerkommando '%s'"
 
-#: ../daemon/server.c:980
+#: ../daemon/server.c:981
 #, c-format
 msgid "Server name '%s' not found; using standard server"
 msgstr "Tjenernavn «%s» ble ikke funnet, bruker forvalgt tjener"
 
-#: ../daemon/server.c:1159
+#: ../daemon/server.c:1160
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s: Kunne ikke åpne loggfil for skjerm %s!"
 
-#: ../daemon/server.c:1171 ../daemon/server.c:1177 ../daemon/server.c:1182
+#: ../daemon/server.c:1172 ../daemon/server.c:1178 ../daemon/server.c:1183
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s: Feil under setting  av %s til %s"
 
-#: ../daemon/server.c:1228
+#: ../daemon/server.c:1229
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s: Tjenerkommandoen for skjerm %s er tom"
 
-#: ../daemon/server.c:1238
+#: ../daemon/server.c:1239
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s: Prioritet for tjener kunne ikke settes til %d: %s"
 
-#: ../daemon/server.c:1250
+#: ../daemon/server.c:1251
 #, c-format
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr ""
 "%s: Tjeneren skulle startes av uid %d, men denne brukeren eksisterer ikke"
 
-#: ../daemon/server.c:1265 ../daemon/slave.c:2450 ../daemon/slave.c:2921
+#: ../daemon/server.c:1266 ../daemon/slave.c:2450 ../daemon/slave.c:2921
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Kunne ikke sette gruppe-id til %d"
 
-#: ../daemon/server.c:1271 ../daemon/slave.c:2456 ../daemon/slave.c:2927
+#: ../daemon/server.c:1272 ../daemon/slave.c:2456 ../daemon/slave.c:2927
 #, c-format
 msgid "%s: initgroups () failed for %s"
 msgstr "%s: initgroups () feilet for %s"
 
-#: ../daemon/server.c:1277 ../daemon/slave.c:2461 ../daemon/slave.c:2932
+#: ../daemon/server.c:1278 ../daemon/slave.c:2461 ../daemon/slave.c:2932
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Kunne ikke sette bruker-id til %d"
 
-#: ../daemon/server.c:1284
+#: ../daemon/server.c:1285
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s: Kunne ikke sette gruppe-id til 0"
 
-#: ../daemon/server.c:1311
+#: ../daemon/server.c:1312
 #, c-format
 msgid "%s: Xserver not found: %s"
 msgstr "%s: Xserver ikke funnet: %s"
 
-#: ../daemon/server.c:1319
+#: ../daemon/server.c:1320
 #, c-format
 msgid "%s: Can't fork Xserver process!"
 msgstr "%s: Kan ikke kjøre Xserver-prosess!"
@@ -1313,8 +1317,9 @@ msgid "View details (~/.xsession-errors file)"
 msgstr "Vis detaljer (~/.xsession-errors filen)"
 
 #: ../daemon/slave.c:4314
-msgid "GDM detected a halt or reboot in progress."
-msgstr "GDM oppdaget at maskinen er i ferd med å stenges ned eller startes på nytt."
+msgid "GDM detected a halt or restart in progress."
+msgstr ""
+"GDM oppdaget at maskinen er i ferd med å stenges ned eller startes på nytt."
 
 #: ../daemon/slave.c:4408
 #, c-format
@@ -1354,8 +1359,8 @@ msgstr "%s: Kan ikke opprette rør"
 msgid "%s: Failed executing: %s"
 msgstr "%s: Feil under kjøring: %s"
 
-#: ../daemon/verify-crypt.c:67 ../daemon/verify-pam.c:1119
-#: ../daemon/verify-shadow.c:68
+#: ../daemon/verify-crypt.c:68 ../daemon/verify-pam.c:1119
+#: ../daemon/verify-shadow.c:69
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
@@ -1363,59 +1368,59 @@ msgstr ""
 "\n"
 "Ugyldig brukernavn eller passord. Det må tas hensyn til små/store bokstaver."
 
-#: ../daemon/verify-crypt.c:72 ../daemon/verify-pam.c:1129
-#: ../daemon/verify-shadow.c:73 ../gui/greeter/greeter_parser.c:1101
+#: ../daemon/verify-crypt.c:73 ../daemon/verify-pam.c:1129
+#: ../daemon/verify-shadow.c:74 ../gui/greeter/greeter_parser.c:1101
 msgid "Caps Lock is on."
 msgstr "Caps Lock er på."
 
-#: ../daemon/verify-crypt.c:117 ../daemon/verify-pam.c:525
-#: ../daemon/verify-shadow.c:116 ../gui/gdmlogin.c:2773
+#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:525
+#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2773
 msgid "Please enter your username"
 msgstr "Vennligst skriv inn brukernavn"
 
 #. login: is whacked always translate to Username:
-#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:425
+#: ../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:854
-#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
+#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
 #: ../gui/gdmlogin.c:1624 ../gui/gdmlogin.c:2104 ../gui/greeter/greeter.c:172
 #: ../gui/greeter/greeter_parser.c:1120
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../daemon/verify-crypt.c:156 ../daemon/verify-pam.c:428
+#: ../daemon/verify-crypt.c:157 ../daemon/verify-pam.c:428
 #: ../daemon/verify-pam.c:429 ../daemon/verify-pam.c:573
-#: ../daemon/verify-shadow.c:174 ../gui/gdmlogin.c:1659
+#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1659
 #: ../gui/greeter/greeter.c:190
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../daemon/verify-crypt.c:174 ../daemon/verify-crypt.c:188
-#: ../daemon/verify-shadow.c:192 ../daemon/verify-shadow.c:206
+#: ../daemon/verify-crypt.c:175 ../daemon/verify-crypt.c:189
+#: ../daemon/verify-shadow.c:193 ../daemon/verify-shadow.c:207
 #, c-format
 msgid "Couldn't authenticate user \"%s\""
 msgstr "Kunne ikke autentisere bruker «%s»"
 
-#: ../daemon/verify-crypt.c:201 ../daemon/verify-pam.c:965
-#: ../daemon/verify-shadow.c:219
+#: ../daemon/verify-crypt.c:202 ../daemon/verify-pam.c:965
+#: ../daemon/verify-shadow.c:220
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "Root innlogging ikke tillatt på skjerm «%s»"
 
-#: ../daemon/verify-crypt.c:203 ../daemon/verify-shadow.c:221
+#: ../daemon/verify-crypt.c:204 ../daemon/verify-shadow.c:222
 msgid "The system administrator is not allowed to login from this screen"
 msgstr ""
 "Systemadministrator har ikke tillatelse til å logge inn fra denne skjermen"
 
-#: ../daemon/verify-crypt.c:219 ../daemon/verify-crypt.c:243
-#: ../daemon/verify-shadow.c:237 ../daemon/verify-shadow.c:261
+#: ../daemon/verify-crypt.c:220 ../daemon/verify-crypt.c:244
+#: ../daemon/verify-shadow.c:238 ../daemon/verify-shadow.c:262
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "Bruker %s har ikke tillatelse til å logge inn"
 
-#: ../daemon/verify-crypt.c:221 ../daemon/verify-crypt.c:245
+#: ../daemon/verify-crypt.c:222 ../daemon/verify-crypt.c:246
 #: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1292
-#: ../daemon/verify-shadow.c:239 ../daemon/verify-shadow.c:263
+#: ../daemon/verify-shadow.c:240 ../daemon/verify-shadow.c:264
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1423,16 +1428,16 @@ msgstr ""
 "\n"
 "Systemadministrator har deaktivert din konto."
 
-#: ../daemon/verify-crypt.c:268 ../daemon/verify-crypt.c:406
+#: ../daemon/verify-crypt.c:269 ../daemon/verify-crypt.c:407
 #: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1309
-#: ../daemon/verify-shadow.c:286 ../daemon/verify-shadow.c:424
+#: ../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:270 ../daemon/verify-crypt.c:409
+#: ../daemon/verify-crypt.c:271 ../daemon/verify-crypt.c:410
 #: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1312
-#: ../daemon/verify-shadow.c:288 ../daemon/verify-shadow.c:427
+#: ../daemon/verify-shadow.c:289 ../daemon/verify-shadow.c:428
 msgid ""
 "\n"
 "Cannot set your user group; you will not be able to log in. Please contact "
@@ -1442,13 +1447,13 @@ msgstr ""
 "Kan ikke sette din brukergruppe. Du vil ikke kunne logge inn. Vennligst "
 "kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:281 ../daemon/verify-crypt.c:354
-#: ../daemon/verify-shadow.c:299 ../daemon/verify-shadow.c:373
+#: ../daemon/verify-crypt.c:282 ../daemon/verify-crypt.c:355
+#: ../daemon/verify-shadow.c:300 ../daemon/verify-shadow.c:374
 #, c-format
 msgid "Password of %s has expired"
 msgstr "Passord for %s er utgått"
 
-#: ../daemon/verify-crypt.c:283 ../daemon/verify-shadow.c:301
+#: ../daemon/verify-crypt.c:284 ../daemon/verify-shadow.c:302
 msgid ""
 "You are required to change your password.\n"
 "Please choose a new one."
@@ -1456,7 +1461,7 @@ msgstr ""
 "Det kreves at du endrer ditt passord.\n"
 "Vennligst velg et nytt."
 
-#: ../daemon/verify-crypt.c:294 ../daemon/verify-shadow.c:312
+#: ../daemon/verify-crypt.c:295 ../daemon/verify-shadow.c:313
 msgid ""
 "\n"
 "Cannot change your password; you will not be able to log in. Please try "
@@ -1466,8 +1471,8 @@ msgstr ""
 "Kan ikke endre ditt passord. Du vil ikke kunne logge inn. Vennligst prøv "
 "igjen senere, eller kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:337 ../daemon/verify-crypt.c:345
-#: ../daemon/verify-shadow.c:356 ../daemon/verify-shadow.c:364
+#: ../daemon/verify-crypt.c:338 ../daemon/verify-crypt.c:346
+#: ../daemon/verify-shadow.c:357 ../daemon/verify-shadow.c:365
 msgid ""
 "Your password has been changed but you may have to change it again. Please "
 "try again later or contact your system administrator."
@@ -1475,7 +1480,7 @@ msgstr ""
 "Passordet ditt err endret, men du vil kanskje måtte endre det igjen. "
 "Vennligst prøv igjen senere, eller kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:356 ../daemon/verify-shadow.c:375
+#: ../daemon/verify-crypt.c:357 ../daemon/verify-shadow.c:376
 msgid ""
 "Your password has expired.\n"
 "Only a system administrator can now change it"
@@ -1483,11 +1488,11 @@ msgstr ""
 "Passordet ditt er utgått.\n"
 "Kun en systemadministrator kan endre det nå."
 
-#: ../daemon/verify-crypt.c:363 ../daemon/verify-shadow.c:382
+#: ../daemon/verify-crypt.c:364 ../daemon/verify-shadow.c:383
 msgid "Internal error on passwdexpired"
 msgstr "Intern feil med passwdexpired"
 
-#: ../daemon/verify-crypt.c:365 ../daemon/verify-shadow.c:384
+#: ../daemon/verify-crypt.c:366 ../daemon/verify-shadow.c:385
 msgid ""
 "An internal error occurred. You will not be able to log in.\n"
 "Please try again later or contact your system administrator."
@@ -1495,7 +1500,7 @@ msgstr ""
 "En intern feil oppsto. Du vil ikke kunne logge inn.\n"
 "Vennligst prøv igjen senere eller kontakt din systemadministrator."
 
-#: ../daemon/verify-crypt.c:401 ../daemon/verify-shadow.c:419
+#: ../daemon/verify-crypt.c:402 ../daemon/verify-shadow.c:420
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr "Kan ikke finne passwd-data for %s"
@@ -2776,7 +2781,8 @@ 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:650 ../gui/gdmlogin.c:2494
-#: ../gui/greeter/greeter_parser.c:1086
+#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:68
+#: ../gui/greeter/greeter_system.c:187
 msgid "_Restart"
 msgstr "Sta_rt på nytt"
 
@@ -2966,7 +2972,7 @@ msgstr ""
 msgid "Cannot start the greeter"
 msgstr "Kan ikke starte velkomst"
 
-#: ../gui/gdmlogin.c:3280 ../gui/greeter/greeter.c:674
+#: ../gui/gdmlogin.c:3280
 msgid "Restart"
 msgstr "Start på nytt"
 
@@ -2980,7 +2986,7 @@ msgstr ""
 "sannsynligvis nettopp oppgradert GDM. Vennligst start GDM tjenesten eller "
 "maskinen på nytt."
 
-#: ../gui/gdmlogin.c:3328
+#: ../gui/gdmlogin.c:3328 ../gui/greeter/greeter.c:674
 msgid "Restart GDM"
 msgstr "Start GDM på nytt"
 
@@ -3032,13 +3038,13 @@ msgstr "Kan ikke åpne fil"
 msgid "Select User Image"
 msgstr "Velg bilde for bruker"
 
-#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5581 ../gui/gdmsetup.c:5703
-#: ../gui/gdmsetup.c:5856 ../gui/gdmsetup.c:5978
+#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5582 ../gui/gdmsetup.c:5704
+#: ../gui/gdmsetup.c:5857 ../gui/gdmsetup.c:5979
 msgid "Images"
 msgstr "Bilder"
 
-#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3045 ../gui/gdmsetup.c:5586
-#: ../gui/gdmsetup.c:5708 ../gui/gdmsetup.c:5861 ../gui/gdmsetup.c:5983
+#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3046 ../gui/gdmsetup.c:5587
+#: ../gui/gdmsetup.c:5709 ../gui/gdmsetup.c:5862 ../gui/gdmsetup.c:5984
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -3102,7 +3108,7 @@ msgstr "Fant ikke noe i sesjonskatalogen."
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr "Fant ikke lenke til forvalg sesjon. Bruker Feilsikker GNOME.\n"
 
-#: ../gui/gdmsetup.c:259
+#: ../gui/gdmsetup.c:260
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
@@ -3110,84 +3116,84 @@ msgstr ""
 "En feil har oppstått under forsøk på å kontakte innloggingsskjermene. Alle "
 "oppdateringer er kanskje ikke aktivert."
 
-#: ../gui/gdmsetup.c:800 ../gui/gdmsetup.c:818 ../gui/gdmsetup.c:973
-#: ../gui/gdmsetup.c:1219
+#: ../gui/gdmsetup.c:801 ../gui/gdmsetup.c:819 ../gui/gdmsetup.c:974
+#: ../gui/gdmsetup.c:1220
 msgid "Themed"
 msgstr "Med tema"
 
-#: ../gui/gdmsetup.c:803 ../gui/gdmsetup.c:834
+#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
 msgid "Plain"
 msgstr "Vanlig"
 
-#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
+#: ../gui/gdmsetup.c:805 ../gui/gdmsetup.c:836
 msgid "Plain with face browser"
 msgstr "Vanlig med ansiktsvisning"
 
-#: ../gui/gdmsetup.c:1570
+#: ../gui/gdmsetup.c:1571
 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:1791
+#: ../gui/gdmsetup.c:1792
 #, 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:1801 ../gui/gdmsetup.c:1831 ../gui/gdmsetup.c:1868
+#: ../gui/gdmsetup.c:1802 ../gui/gdmsetup.c:1832 ../gui/gdmsetup.c:1869
 msgid "Cannot add user"
 msgstr "Kan ikke legge til bruker"
 
-#: ../gui/gdmsetup.c:1821
+#: ../gui/gdmsetup.c:1822
 #, 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:1858
+#: ../gui/gdmsetup.c:1859
 #, c-format
 msgid "The \"%s\" user does not exist."
 msgstr "Bruker «%s» eksisterer ikke."
 
-#: ../gui/gdmsetup.c:3040 ../gui/gdmsetup.glade.h:73
+#: ../gui/gdmsetup.c:3041 ../gui/gdmsetup.glade.h:73
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../gui/gdmsetup.c:3244 ../gui/gdmsetup.c:3302
+#: ../gui/gdmsetup.c:3245 ../gui/gdmsetup.c:3303
 msgid "None"
 msgstr "Ingen"
 
-#: ../gui/gdmsetup.c:3735
+#: ../gui/gdmsetup.c:3736
 msgid "Archive is not of a subdirectory"
 msgstr "Arkivet består ikke av en underkatalog"
 
-#: ../gui/gdmsetup.c:3743
+#: ../gui/gdmsetup.c:3744
 msgid "Archive is not of a single subdirectory"
 msgstr "Arkivet består ikke av en enkelt underkatalog"
 
-#: ../gui/gdmsetup.c:3767 ../gui/gdmsetup.c:3845
+#: ../gui/gdmsetup.c:3768 ../gui/gdmsetup.c:3846
 msgid "File not a tar.gz or tar archive"
 msgstr "Filen er ikke eller et tar arkiv"
 
-#: ../gui/gdmsetup.c:3769
+#: ../gui/gdmsetup.c:3770
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Arkivet inneholder ikke en GdmGreeterTheme.info-fil"
 
-#: ../gui/gdmsetup.c:3791
+#: ../gui/gdmsetup.c:3792
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
-#: ../gui/gdmsetup.c:3911
+#: ../gui/gdmsetup.c:3912
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../gui/gdmsetup.c:3918
+#: ../gui/gdmsetup.c:3919
 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:3940
+#: ../gui/gdmsetup.c:3941
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed. Install again anyway?"
@@ -3195,47 +3201,47 @@ msgstr ""
 "Temakatalog «%s» ser ut til å være installert allerede. Installer igjen "
 "likevel?"
 
-#: ../gui/gdmsetup.c:4032
+#: ../gui/gdmsetup.c:4033
 msgid "Some error occurred when installing the theme"
 msgstr "En feil oppsto under installasjon av temaet"
 
-#: ../gui/gdmsetup.c:4088
+#: ../gui/gdmsetup.c:4089
 msgid "No file selected"
 msgstr "Ingen fil valgt"
 
-#: ../gui/gdmsetup.c:4109
+#: ../gui/gdmsetup.c:4110
 msgid "Select Theme Archive"
 msgstr "Velg tema-arkiv"
 
-#: ../gui/gdmsetup.c:4113 ../gui/gdmsetup.c:5102
+#: ../gui/gdmsetup.c:4114 ../gui/gdmsetup.c:5103
 msgid "_Install"
 msgstr "_Installer"
 
-#: ../gui/gdmsetup.c:4204
+#: ../gui/gdmsetup.c:4205
 #, c-format
 msgid "Remove the \"%s\" theme?"
 msgstr "Fjern tema «%s»?"
 
-#: ../gui/gdmsetup.c:4213
+#: ../gui/gdmsetup.c:4214
 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:4221
+#: ../gui/gdmsetup.c:4222
 msgid "_Remove Theme"
 msgstr "Fje_rn tema"
 
-#: ../gui/gdmsetup.c:5091
+#: ../gui/gdmsetup.c:5092
 #, c-format
 msgid "Install the theme from '%s'?"
 msgstr "Installer tema fra «%s»?"
 
-#: ../gui/gdmsetup.c:5092
+#: ../gui/gdmsetup.c:5093
 #, 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:5353
+#: ../gui/gdmsetup.c:5354
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3258,26 +3264,26 @@ msgstr ""
 "For komplett dokumentasjon se i GNOME hjelpleser under kategorien GNOME/"
 "System."
 
-#: ../gui/gdmsetup.c:6399
+#: ../gui/gdmsetup.c:6400
 msgid "Apply the changes to users before closing?"
 msgstr "Aktiver endringer for brukere før programmet lukkes?"
 
-#: ../gui/gdmsetup.c:6400
+#: ../gui/gdmsetup.c:6401
 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:6403
+#: ../gui/gdmsetup.c:6404
 msgid "Close _without Applying"
 msgstr "Lukk _uten å aktivere"
 
-#: ../gui/gdmsetup.c:6451
+#: ../gui/gdmsetup.c:6452
 msgid "Could not access GDM configuration file.\n"
 msgstr "Kunne ikke aksessere konfigurasjonsfilen for GDM.\n"
 
-#: ../gui/gdmsetup.c:6495
+#: ../gui/gdmsetup.c:6496
 msgid "You must be the root user to configure GDM."
 msgstr "Du må være superbruker (root) for å konfigurere GDM."
 
@@ -3717,8 +3723,8 @@ msgstr ""
 "nettopp oppgradert GDM. Vennligst start GDM-tjenesten eller maskinen på nytt."
 
 #: ../gui/greeter/greeter.c:625 ../gui/greeter/greeter.c:676
-msgid "Reboot"
-msgstr "Omstart"
+msgid "Restart Machine"
+msgstr "Start maskinen på nytt"
 
 #: ../gui/greeter/greeter.c:1099
 #, c-format
@@ -3853,10 +3859,6 @@ msgstr "_Forrige sesjon"
 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:68 ../gui/greeter/greeter_system.c:187
-msgid "_Reboot"
-msgstr "Omsta_rt"
-
 #: ../gui/greeter/greeter_system.c:160 ../gui/greeter/greeter_system.c:356
 msgid ""
 "Run an XDMCP chooser which will allow you to log into available remote "
@@ -3872,12 +3874,13 @@ msgstr ""
 "Konfigurer GDM (denne innloggingshåndtereren). Dette krever root-passordet."
 
 #: ../gui/greeter/greeter_system.c:194 ../gui/greeter/greeter_system.c:322
-msgid "Reboot your computer"
-msgstr "Start din datamaskin på nytt"
+msgid "Restart your computer"
+msgstr "Start datamaskinen på nytt"
 
 #: ../gui/greeter/greeter_system.c:206
 msgid "Shut Down the system so that you may safely turn off the computer."
-msgstr "Steng ned systemet slik at du kan skru av datamaskinen på en trygg måte."
+msgstr ""
+"Steng ned systemet slik at du kan skru av datamaskinen på en trygg måte."
 
 #: ../gui/greeter/greeter_system.c:219 ../gui/greeter/greeter_system.c:339
 msgid "Suspend your computer"
@@ -3896,7 +3899,7 @@ 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:319
-msgid "_Reboot the computer"
+msgid "_Restart the computer"
 msgstr "Sta_rt datamaskinen på nytt"
 
 #: ../gui/greeter/greeter_system.c:336
@@ -3953,7 +3956,7 @@ msgstr "GNOME kunstvariasjon av Sirkler"
 msgid "Happy GNOME"
 msgstr "Glad GNOME"
 
-#: ../gui/modules/dwellmouselistener.c:655
+#: ../gui/modules/dwellmouselistener.c:656
 #: ../gui/modules/keymouselistener.c:926
 #, c-format
 msgid ""
@@ -3968,55 +3971,55 @@ msgstr ""
 msgid "Cannot open gestures file: %s"
 msgstr "Kan ikke åpne gestikuleringsfil: %s"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:38
+#: ../utils/gdm-dmx-reconnect-proxy.c:37
 msgid "DMX display to migrate to"
 msgstr "DMX-skjerm du vil migrere til"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:39 ../utils/gdm-dmx-reconnect-proxy.c:44
+#: ../utils/gdm-dmx-reconnect-proxy.c:38 ../utils/gdm-dmx-reconnect-proxy.c:43
 msgid "DISPLAY"
 msgstr "SKJERM"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:43
+#: ../utils/gdm-dmx-reconnect-proxy.c:42
 msgid "Backend display name"
 msgstr "Visningsnavn for bakstykke"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:48
+#: ../utils/gdm-dmx-reconnect-proxy.c:47
 msgid "Xauthority file for destination display"
 msgstr "Xauthority-fil for destinasjonsvisning"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:49 ../utils/gdm-dmx-reconnect-proxy.c:54
+#: ../utils/gdm-dmx-reconnect-proxy.c:48 ../utils/gdm-dmx-reconnect-proxy.c:53
 msgid "AUTHFILE"
 msgstr "AUTENTISERINGSFIL"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:53
+#: ../utils/gdm-dmx-reconnect-proxy.c:52
 msgid "Xauthority file for backend display"
 msgstr "Xauthority-fil for bakstykkevisning"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:71
+#: ../utils/gdm-dmx-reconnect-proxy.c:70
 #, c-format
 msgid "Failed to open display \"%s\"\n"
 msgstr "Klarte ikke å åpne skjerm «%s»\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:75
+#: ../utils/gdm-dmx-reconnect-proxy.c:74
 #, c-format
 msgid "DMX extension not present on \"%s\"\n"
 msgstr "DMX-utvidelsen finnes ikke på «%s»\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:98
+#: ../utils/gdm-dmx-reconnect-proxy.c:97
 msgid "- migrate a backend display from one DMX display to another"
 msgstr "- migrer en bakstykkevisning fra en DMX-visning til en annen"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:104
+#: ../utils/gdm-dmx-reconnect-proxy.c:103
 #, c-format
 msgid "You must specify a destination DMX display using %s\n"
 msgstr "Du må spesifisere en destinatsjon DMX-visning ved å bruke %s\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:109
+#: ../utils/gdm-dmx-reconnect-proxy.c:108
 #, c-format
 msgid "You must specify a backend display by using %s\n"
 msgstr "Du må spesifisere en bakstykkevisning ved å bruke %s\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:124
+#: ../utils/gdm-dmx-reconnect-proxy.c:123
 #, c-format
 msgid "DMXAddScreen \"%s\" failed on \"%s\"\n"
 msgstr "DMXAddScreen «%s» feilet på «%s»\n"
@@ -4031,14 +4034,14 @@ msgstr "gdmaskpass kjører kun som root\n"
 msgid "Authentication failure!\n"
 msgstr "Autentiseringfeil!\n"
 
-#: ../vicious-extensions/glade-helper.c:85
-#: ../vicious-extensions/glade-helper.c:117
-#: ../vicious-extensions/glade-helper.c:139
-#: ../vicious-extensions/glade-helper.c:159
+#: ../vicious-extensions/glade-helper.c:84
+#: ../vicious-extensions/glade-helper.c:116
+#: ../vicious-extensions/glade-helper.c:138
+#: ../vicious-extensions/glade-helper.c:158
 msgid "(memory buffer)"
 msgstr "(minnebuffer)"
 
-#: ../vicious-extensions/glade-helper.c:191
+#: ../vicious-extensions/glade-helper.c:190
 #, c-format
 msgid ""
 "An error occurred while loading user interface element %s%s from file %s.  "
@@ -4050,13 +4053,13 @@ msgstr ""
 "kan ikke fortsette og vil avslutte nå. Du bør sjekke installasjonen av %s "
 "eller reinsallere %s."
 
-#: ../vicious-extensions/glade-helper.c:209
-#: ../vicious-extensions/glade-helper.c:277
-#: ../vicious-extensions/glade-helper.c:319
+#: ../vicious-extensions/glade-helper.c:208
+#: ../vicious-extensions/glade-helper.c:276
+#: ../vicious-extensions/glade-helper.c:318
 msgid "Cannot load user interface"
 msgstr "Kan ikke laste brukergrensesnitt"
 
-#: ../vicious-extensions/glade-helper.c:215
+#: ../vicious-extensions/glade-helper.c:214
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -4065,7 +4068,7 @@ msgstr ""
 "Glade filen er på crack! Sjekk at korrekt fil er installert!\n"
 "fil: %s widget %s"
 
-#: ../vicious-extensions/glade-helper.c:247
+#: ../vicious-extensions/glade-helper.c:246
 #, c-format
 msgid ""
 "An error occurred while loading the user interface element %s%s from file %"
@@ -4088,7 +4091,7 @@ msgstr[1] ""
 "at glade grensesnittbeskrivelsen er korrupt. %s kan ikke fortsette og vil "
 "avslutte nå. Du bør sjekke installasjonen av %s eller reinstallere %s."
 
-#: ../vicious-extensions/glade-helper.c:283
+#: ../vicious-extensions/glade-helper.c:282
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -4097,7 +4100,7 @@ msgstr ""
 "Glade filen er på crack! Sjekk at korrekt fil er installert!\n"
 "fil: %s widget: %s forventet antall clist-kolonner: %d"
 
-#: ../vicious-extensions/glade-helper.c:303
+#: ../vicious-extensions/glade-helper.c:302
 #, c-format
 msgid ""
 "An error occurred while loading the user interface from file %s.  Possibly "
@@ -4109,11 +4112,11 @@ msgstr ""
 "fortsette og vil avslutte nå. Du bør sjekke installasjonen av %s eller "
 "installere %s på nytt."
 
-#: ../vicious-extensions/glade-helper.c:322
+#: ../vicious-extensions/glade-helper.c:321
 #, c-format
 msgid "No interface could be loaded. This is BAD! (file: %s)"
 msgstr "Ingen grensesnitt kunne lastes! Dette er ikke bra! (fil: %s)"
 
-#: ../vicious-extensions/ve-nongnome.c:134
+#: ../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"