Translation updated by Ivar Smolin.

2005-11-11  Priit Laes  <plaes@cvs.gnome.org>

	* et.po: Translation updated by Ivar Smolin.

2 files changed, 571 insertions, 576 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 270c5280..cdf16204 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-11  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
 2005-11-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/et.po b/po/et.po
index 73eb8c5b..6f64be71 100644
--- a/po/et.po
+++ b/po/et.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GDM HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-30 13:49+0100\n"
-"PO-Revision-Date: 2005-10-30 21:33+0200\n"
+"POT-Creation-Date: 2005-11-08 13:56+0100\n"
+"PO-Revision-Date: 2005-11-08 17:32+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
@@ -113,56 +113,56 @@ msgstr "GNOME"
 msgid "This session logs you into GNOME"
 msgstr "See seanss logib sing GNOME keskkonda"
 
-#: ../daemon/auth.c:66
+#: ../daemon/auth.c:56
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
 msgstr "%s: Uut volitamiskirjet pole võimalik kirjutada: %s"
 
-#: ../daemon/auth.c:69
+#: ../daemon/auth.c:59
 #, c-format
 msgid "%s: Could not write new authorization entry.  Possibly out of diskspace"
 msgstr ""
 "%s: Uut volitamiskirjet pole võimalik kirjutada.  Arvatavasti on ketas täis"
 
-#: ../daemon/auth.c:74
+#: ../daemon/auth.c:64
 #, c-format
 msgid ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
 "diskspace.%s%s"
 msgstr ""
 
-#: ../daemon/auth.c:204
+#: ../daemon/auth.c:194
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s: kataloogis %s pole võimalik uut küpsisefaili luua"
 
-#: ../daemon/auth.c:228 ../daemon/auth.c:245 ../daemon/auth.c:877
+#: ../daemon/auth.c:218 ../daemon/auth.c:235 ../daemon/auth.c:875
 #, c-format
 msgid "%s: Cannot safely open %s"
 msgstr "%s: %s pole võimalik turvaliselt avada"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: ../daemon/auth.c:677 ../daemon/auth.c:719
+#: ../daemon/auth.c:674 ../daemon/auth.c:716
 #, c-format
 msgid "%s: Could not open cookie file %s"
 msgstr "%s: Küpsisefaili %s pole võimalik avada"
 
-#: ../daemon/auth.c:698
+#: ../daemon/auth.c:695
 #, c-format
 msgid "%s: Could not lock cookie file %s"
 msgstr "%s: Küpsisefaili pole võimalik lukustada %s"
 
-#: ../daemon/auth.c:748 ../daemon/auth.c:770
+#: ../daemon/auth.c:745 ../daemon/auth.c:767
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s: Küpsist pole võimalik kirjutada"
 
-#: ../daemon/auth.c:853
+#: ../daemon/auth.c:851
 #, c-format
 msgid "%s: Ignoring suspiciously looking cookie file %s"
 msgstr "%s: Jätan kahtlase väljanägemisega küpsise faili %s vahele"
 
-#: ../daemon/auth.c:896 ../daemon/gdm.c:2183 ../daemon/gdm.c:2544
+#: ../daemon/auth.c:894 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
 #, c-format
 msgid "Can't write to %s: %s"
 msgstr "Ei saa kirjutada %s: %s"
@@ -177,7 +177,7 @@ msgstr "Ei saa kirjutada %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:111
+#: ../daemon/display.c:110
 #, c-format
 msgid ""
 "The display server has been shut down about 6 times in the last 90 seconds. "
@@ -185,22 +185,22 @@ msgid ""
 "trying again on display %s."
 msgstr ""
 
-#: ../daemon/display.c:257
+#: ../daemon/display.c:254
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s: Toru pole võimalik luua"
 
-#: ../daemon/display.c:333
+#: ../daemon/display.c:330
 #, c-format
 msgid "%s: Failed forking GDM slave process for %s"
 msgstr "%s: Tõrge GDM alamprotsessi forkimisel %s jaoks"
 
-#: ../daemon/errorgui.c:356
+#: ../daemon/errorgui.c:346
 #, c-format
 msgid "%s not a regular file!\n"
 msgstr "%s ei ole tavaline fail!\n"
 
-#: ../daemon/errorgui.c:373
+#: ../daemon/errorgui.c:363
 msgid ""
 "\n"
 "... File too long to display ...\n"
@@ -208,185 +208,386 @@ msgstr ""
 "\n"
 "... Fail on kuvamiseks liiga pikk ...\n"
 
-#: ../daemon/errorgui.c:382
+#: ../daemon/errorgui.c:372
 #, c-format
 msgid "%s could not be opened"
 msgstr "%s: pole võimalik avada"
 
-#: ../daemon/errorgui.c:494 ../daemon/errorgui.c:635 ../daemon/errorgui.c:743
-#: ../daemon/errorgui.c:861
+#: ../daemon/errorgui.c:484 ../daemon/errorgui.c:625 ../daemon/errorgui.c:733
+#: ../daemon/errorgui.c:851
 #, c-format
 msgid "%s: Cannot fork to display error/info box"
 msgstr "%s: Vea- või teabeakna jaoks pole võimalik forkida"
 
-#: ../daemon/filecheck.c:64
+#: ../daemon/filecheck.c:60
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: Kataloogi %s pole olemas."
 
-#: ../daemon/filecheck.c:76 ../daemon/filecheck.c:118
-#: ../daemon/filecheck.c:180
+#: ../daemon/filecheck.c:72 ../daemon/filecheck.c:114
+#: ../daemon/filecheck.c:177
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: %s omanik ei ole uid %d."
 
-#: ../daemon/filecheck.c:82 ../daemon/filecheck.c:125
+#: ../daemon/filecheck.c:78 ../daemon/filecheck.c:121
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: %s on grupile kirjutatav."
 
-#: ../daemon/filecheck.c:88
+#: ../daemon/filecheck.c:84
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: %s on teistele kirjutatav."
 
-#: ../daemon/filecheck.c:103 ../daemon/filecheck.c:168
+#: ../daemon/filecheck.c:99 ../daemon/filecheck.c:165
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: %s ei ole olemas, kuid peab olema."
 
-#: ../daemon/filecheck.c:111 ../daemon/filecheck.c:174
+#: ../daemon/filecheck.c:107 ../daemon/filecheck.c:171
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: %s ei ole tavaline fail."
 
-#: ../daemon/filecheck.c:132
+#: ../daemon/filecheck.c:128
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: %s on kirjutatav grupile/teistele."
 
-#: ../daemon/filecheck.c:139 ../daemon/filecheck.c:192
+#: ../daemon/filecheck.c:135 ../daemon/filecheck.c:190
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr "%s: %s on suurem kui halduri poolt lubatud faili piirang."
 
-#: ../daemon/gdm-net.c:271
+#: ../daemon/gdm-net.c:270
 #, c-format
 msgid "%s: Could not make socket"
 msgstr "%s: Ei suutnud luua soketit"
 
-#: ../daemon/gdm-net.c:302
+#: ../daemon/gdm-net.c:301
 #, c-format
 msgid "%s: Could not bind socket"
 msgstr "%s: Soklit pole võimalik siduda"
 
-#: ../daemon/gdm-net.c:388
+#: ../daemon/gdm-net.c:387
 #, c-format
 msgid "%s: Could not make FIFO"
 msgstr "%s: Ei saa järjekorda (FIFO) luua"
 
-#: ../daemon/gdm-net.c:396
+#: ../daemon/gdm-net.c:395
 #, c-format
 msgid "%s: Could not open FIFO"
 msgstr "%s: Ei saa järjekorda (FIFO) avada"
 
-#: ../daemon/gdm.c:319
+#. FIXME: how to handle this?
+#: ../daemon/gdm.c:198 ../daemon/gdm.c:206 ../daemon/gdm.c:1495
+#: ../daemon/gdm.c:1503
+#, c-format
+msgid "Cannot write PID file %s: possibly out of diskspace.  Error: %s\n"
+msgstr ""
+"PID faili %s pole võimalik kirjutada kirjutada, arvatavasti on kettaruum "
+"otsas.  Viga: %s\n"
+
+#: ../daemon/gdm.c:200 ../daemon/gdm.c:208 ../daemon/gdm.c:1497
+#: ../daemon/gdm.c:1505
+#, c-format
+msgid "Cannot write PID file %s: possibly out of diskspace.  Error: %s"
+msgstr ""
+"PID faili %s pole võimalik kirjutada kirjutada, arvatavasti on kettaruum "
+"otsas.  Viga: %s"
+
+#: ../daemon/gdm.c:218
+#, c-format
+msgid "%s: fork() failed!"
+msgstr "%s: tõrge fork() käsu täitmisel!"
+
+#. should never happen
+#: ../daemon/gdm.c:221 ../daemon/slave.c:3324
+#, c-format
+msgid "%s: setsid() failed: %s!"
+msgstr "%s: tõrge setsid() käsu täitmisel: %s!"
+
+#: ../daemon/gdm.c:412
+#, c-format
+msgid "%s: Trying failsafe X server %s"
+msgstr "%s: Tõrkekindla X-i serveri %s proovimine"
+
+#: ../daemon/gdm.c:430
+#, c-format
+msgid "%s: Running the XKeepsCrashing script"
+msgstr "%s: XKeepsCrashing skripti käivitamine"
+
+#: ../daemon/gdm.c:547
+msgid ""
+"The X server (your graphical interface) cannot be started.  It is likely "
+"that it is not set up correctly.  You will need to log in on a console and "
+"rerun the X configuration application, then restart GDM."
+msgstr ""
+
+#. else {
+#. * At this point .... screw the user, we don't know how to
+#. * talk to him.  He's on some 'l33t system anyway, so syslog
+#. * reading will do him good
+#. * }
+#: ../daemon/gdm.c:559
 #, c-format
 msgid ""
-"Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
-"does not exist. Please correct GDM configuration and restart GDM."
+"Failed to start X server several times in a short time period; disabling "
+"display %s"
 msgstr ""
-"Serveri autoriseesimiskataloogile (daemon/ServAuthDir) on omistatud väärtus %"
-"s, kuid seda pole olemas. Palun paranda GDM-i seadistused ja taaskäivita GDM."
+"Lühikese aja jooksul on X'i serveri käivitamisel esinenud mitmeid tõrkeid; "
+"kuva %s on nüüd keelatud"
+
+#: ../daemon/gdm.c:569 ../daemon/gdm.c:2295
+msgid "Master suspending..."
+msgstr "Pealiku peatamine..."
 
-#: ../daemon/gdm.c:328
+#: ../daemon/gdm.c:622
 #, c-format
-msgid "%s: Authdir %s does not exist. Aborting."
-msgstr "%s: 'Authdir' %s pole olemas. Katkestan."
+msgid "System is rebooting, please wait ..."
+msgstr "Süsteemi alglaadimine, palun oota ..."
+
+#: ../daemon/gdm.c:624
+#, c-format
+msgid "System is shutting down, please wait ..."
+msgstr "Süsteemi seiskamine, palun oota ..."
+
+#: ../daemon/gdm.c:635
+msgid "Master halting..."
+msgstr "Pealiku seiskamine..."
+
+#: ../daemon/gdm.c:648
+#, c-format
+msgid "%s: Halt failed: %s"
+msgstr "%s: Tõrge seiskamisel: %s"
+
+#: ../daemon/gdm.c:657
+msgid "Master rebooting..."
+msgstr "Pealiku alglaadimine..."
+
+#: ../daemon/gdm.c:670
+#, c-format
+msgid "%s: Reboot failed: %s"
+msgstr "%s: Tõrge taaskäivitamisel: %s"
+
+#: ../daemon/gdm.c:771
+#, c-format
+msgid "Reboot or Halt request when there is no system menu from display %s"
+msgstr ""
+
+#: ../daemon/gdm.c:780
+#, c-format
+msgid "Restart, Reboot or Halt request from a non-static display %s"
+msgstr "Taaskäivitamise, alglaadimise või seiskamise taotlus kaugkuvalt %s"
+
+#. Bury this display for good
+#: ../daemon/gdm.c:846
+#, c-format
+msgid "%s: Aborting display %s"
+msgstr "%s: Kuva %s katkestamine"
+
+#: ../daemon/gdm.c:997
+msgid "GDM restarting ..."
+msgstr "GDM taaskäivitamine ..."
+
+#: ../daemon/gdm.c:1001
+msgid "Failed to restart self"
+msgstr "Tõrge iseenda taaskäivitamisel"
+
+#. FIXME: note that this could mean out of memory
+#: ../daemon/gdm.c:1075
+msgid "main daemon: Got SIGABRT. Something went very wrong. Going down!"
+msgstr ""
+
+#: ../daemon/gdm.c:1233
+msgid "Do not fork into the background"
+msgstr "Taustaprotsessiks ei minda"
+
+#: ../daemon/gdm.c:1235
+msgid "No console (static) servers to be run"
+msgstr "Konsooliservereid (staatilisi) ei käivitata"
+
+#: ../daemon/gdm.c:1237 ../gui/gdmsetup.c:6185
+msgid "Alternative configuration file"
+msgstr "Alternatiivne seadistusfail"
+
+#: ../daemon/gdm.c:1237 ../gui/gdmsetup.c:6185
+msgid "CONFIGFILE"
+msgstr ""
+
+#: ../daemon/gdm.c:1239
+msgid "Preserve LD_* variables"
+msgstr "LD_* keskkonnamuutujad hoitakse alles"
+
+#: ../daemon/gdm.c:1241
+msgid "Print GDM version"
+msgstr "GDM versiooni väljastamine"
+
+#: ../daemon/gdm.c:1243
+msgid "Start the first X server but then halt until we get a GO in the fifo"
+msgstr ""
 
-#: ../daemon/gdm.c:333
+#: ../daemon/gdm.c:1350 ../daemon/gdm.c:1694
+#, c-format
+msgid "Can't open %s for writing"
+msgstr "%s avamine kirjutamiseks nurjus"
+
+#: ../daemon/gdm.c:1408 ../gui/gdmchooser.c:2042
 #, c-format
 msgid ""
-"Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
-"not a directory. Please correct GDM configuration and restart GDM."
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Serveri autoriseesimiskataloogile (daemon/ServAuthDir) on omistatud väärtus %"
-"s, kuid see pole kataloog. Palun paranda GDM-i seadistused ja taaskäivita "
-"GDM."
+"Võtme %s viga: %s.\n"
+"Kõikide võimalike käsureavõtmete vaatamiseks käivita '%s --help'.\n"
+
+#. make sure the pid file doesn't get wiped
+#: ../daemon/gdm.c:1430
+msgid "Only root wants to run gdm\n"
+msgstr "Ainult root tohib gdm-i käivitada\n"
 
-#: ../daemon/gdm.c:342
+#: ../daemon/gdm.c:1446 ../daemon/gdm.c:1450 ../daemon/gdm.c:1533
+#: ../daemon/gdm.c:1537 ../daemon/gdm.c:1541 ../daemon/gdm.c:1545
+#: ../daemon/gdm.c:1555 ../daemon/gdm.c:1561 ../daemon/gdm.c:1572
+#: ../daemon/misc.c:1741 ../daemon/misc.c:1745 ../daemon/misc.c:1749
+#: ../daemon/misc.c:1756 ../daemon/misc.c:1760 ../daemon/misc.c:1764
+#: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:780
+#: ../daemon/slave.c:794 ../daemon/slave.c:804 ../daemon/slave.c:814
+#: ../daemon/slave.c:826 ../gui/gdmchooser.c:1952 ../gui/gdmchooser.c:1955
+#: ../gui/gdmchooser.c:1958 ../gui/gdmlogin.c:3782 ../gui/gdmlogin.c:3792
+#: ../gui/gdmlogin.c:3797 ../gui/greeter/greeter.c:1301
+#: ../gui/greeter/greeter.c:1309 ../gui/greeter/greeter.c:1312
 #, c-format
-msgid "%s: Authdir %s is not a directory. Aborting."
-msgstr "%s: 'Authdir' %s ei ole kataloog. Katkestan."
+msgid "%s: Error setting up %s signal handler: %s"
+msgstr "%s: Viga signaali %s käsitleja ülesseadmisel: %s"
+
+#: ../daemon/gdm.c:1477
+msgid "gdm already running. Aborting!"
+msgstr "gdm juba töötab. Katkestamine!"
 
-#: ../daemon/gdm.c:355
+#: ../daemon/gdm.c:1581
+#, c-format
+msgid "%s: Error setting up CHLD signal handler"
+msgstr "%s: Viga signaali CHLD käsitleja ülesseadmisel"
+
+#: ../daemon/gdm.c:2709
+msgid "DYNAMIC request denied: Not authenticated"
+msgstr ""
+
+#: ../daemon/gdm.c:2860 ../daemon/gdm.c:2878 ../daemon/gdm.c:3066
+#: ../daemon/gdm.c:3117 ../daemon/gdm.c:3169 ../daemon/gdm.c:3210
+#: ../daemon/gdm.c:3236
+#, c-format
+msgid "%s request denied: Not authenticated"
+msgstr ""
+
+#. Don't print the name to syslog as it might be
+#. * long and dangerous
+#: ../daemon/gdm.c:2896
+msgid "Unknown server type requested; using standard server."
+msgstr "Küsiti tundmatut serveritüüpi; kasutatakse standardserverit."
+
+#: ../daemon/gdm.c:2900
 #, c-format
 msgid ""
-"%s: Logdir %s does not exist or isn't a directory.  Using ServAuthDir %s."
+"Requested server %s not allowed to be used for flexible servers; using "
+"standard server."
 msgstr ""
 
-#: ../daemon/gdm.c:391
+#: ../daemon/gdmconfig.c:553
 #, c-format
 msgid "%s: No GDM configuration file: %s. Using defaults."
 msgstr "%s: Puudub GDM-i seadistusfail: %s. Kasutatakse vaikeväärtusi."
 
-#: ../daemon/gdm.c:512
+#: ../daemon/gdmconfig.c:843
 #, c-format
 msgid "%s: BaseXsession empty; using %s/gdm/Xsession"
 msgstr ""
 
-#: ../daemon/gdm.c:565
+#: ../daemon/gdmconfig.c:866
 #, c-format
 msgid "%s: Standard X server not found; trying alternatives"
 msgstr ""
 
-#: ../daemon/gdm.c:608
+#: ../daemon/gdmconfig.c:882
+#, c-format
+msgid "%s: No greeter specified."
+msgstr "%s: Tervitajat (greeter) pole määratud."
+
+#: ../daemon/gdmconfig.c:884
+#, c-format
+msgid "%s: No remote greeter specified."
+msgstr "%s: Kaugtervitajat (remote greeter) pole määratud."
+
+#: ../daemon/gdmconfig.c:886
+#, c-format
+msgid "%s: No sessions directory specified."
+msgstr "%s: Seansikataloog on määramata."
+
+#: ../daemon/gdmconfig.c:956
 #, c-format
 msgid "%s: XDMCP was enabled while there is no XDMCP support; turning it off"
 msgstr ""
 "%s: XDMCP on vaatamata XDMCP toe puudumisele aktiveeritud. Säte lülitatakse "
 "välja"
 
-#: ../daemon/gdm.c:621
+#: ../daemon/gdmconfig.c:1008
 #, c-format
-msgid "%s: Root cannot be logged in automatically, turning off automatic login"
-msgstr ""
-"%s: Root kasutaja ei saa automaatselt sisse logida, automaatset logimist ei "
-"toimu"
+msgid "%s: TimedLoginDelay is less than 5, defaulting to 5."
+msgstr "%s: TimedLoginDelay on väiksem kui 5, vaikimisi väärtus on 5."
 
-#: ../daemon/gdm.c:634
+#: ../daemon/gdmconfig.c:1137
 #, c-format
-msgid "%s: Root cannot be logged in automatically, turning off timed login"
+msgid ""
+"%s: Logdir %s does not exist or isn't a directory.  Using ServAuthDir %s."
 msgstr ""
-"%s: Juurkasutaja ei saa automaatselt sisse logida, viitlogimine lülitatakse "
-"välja"
 
-#: ../daemon/gdm.c:640
+#: ../daemon/gdmconfig.c:1153
 #, c-format
-msgid "%s: TimedLoginDelay is less than 5, defaulting to 5."
-msgstr "%s: TimedLoginDelay on väiksem kui 5, vaikimisi väärtus on 5."
+msgid ""
+"Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
+"does not exist. Please correct GDM configuration and restart GDM."
+msgstr ""
+"Serveri autoriseesimiskataloogile (daemon/ServAuthDir) on omistatud väärtus %"
+"s, kuid seda pole olemas. Palun paranda GDM-i seadistused ja taaskäivita GDM."
 
-#: ../daemon/gdm.c:650
+#: ../daemon/gdmconfig.c:1162
 #, c-format
-msgid "%s: No greeter specified."
-msgstr "%s: Tervitajat (greeter) pole määratud."
+msgid "%s: Authdir %s does not exist. Aborting."
+msgstr "%s: 'Authdir' %s pole olemas. Katkestan."
 
-#: ../daemon/gdm.c:653
+#: ../daemon/gdmconfig.c:1167
 #, c-format
-msgid "%s: No remote greeter specified."
-msgstr "%s: Kaugtervitajat (remote greeter) pole määratud."
+msgid ""
+"Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
+"not a directory. Please correct GDM configuration and restart GDM."
+msgstr ""
+"Serveri autoriseesimiskataloogile (daemon/ServAuthDir) on omistatud väärtus %"
+"s, kuid see pole kataloog. Palun paranda GDM-i seadistused ja taaskäivita "
+"GDM."
 
-#: ../daemon/gdm.c:657
+#: ../daemon/gdmconfig.c:1176
 #, c-format
-msgid "%s: No sessions directory specified."
-msgstr "%s: Seansikataloog on määramata."
+msgid "%s: Authdir %s is not a directory. Aborting."
+msgstr "%s: 'Authdir' %s ei ole kataloog. Katkestan."
 
-#: ../daemon/gdm.c:682
+#: ../daemon/gdmconfig.c:1273
 #, c-format
 msgid "%s: Empty server command; using standard command."
 msgstr "%s: Tühi serverikäsk, kasutatakse standardset käsku."
 
-#: ../daemon/gdm.c:725
+#: ../daemon/gdmconfig.c:1315
 #, c-format
 msgid "%s: Display number %d in use!  Defaulting to %d"
 msgstr "%s: Kuva number %d on kasutusel!  Vaikeväärtustan %d'ks"
 
-#: ../daemon/gdm.c:744
+#: ../daemon/gdmconfig.c:1332
 #, c-format
 msgid "%s: Invalid server line in config file. Ignoring!"
 msgstr "%s: Vigane 'server' rida seadistusfailis. Jätan vahele!"
 
-#: ../daemon/gdm.c:756 ../daemon/gdm.c:797
+#: ../daemon/gdmconfig.c:1343 ../daemon/gdmconfig.c:1381
 #, c-format
 msgid "%s: XDMCP disabled and no static servers defined. Aborting!"
 msgstr ""
@@ -395,7 +596,7 @@ msgstr ""
 
 #. start
 #. server uid
-#: ../daemon/gdm.c:774
+#: ../daemon/gdmconfig.c:1361
 #, c-format
 msgid ""
 "%s: XDMCP disabled and no static servers defined. Adding %s on :%d to allow "
@@ -404,7 +605,7 @@ msgstr ""
 "%s: XDMCP on välja lülitatud ja lokaalseid servereid pole määratud. "
 "Seadistuste lubamiseks lisan %s :%d peale!"
 
-#: ../daemon/gdm.c:789
+#: ../daemon/gdmconfig.c:1373
 msgid ""
 "XDMCP is disabled and GDM cannot find any static server to start.  "
 "Aborting!  Please correct the configuration and restart GDM."
@@ -412,7 +613,7 @@ msgstr ""
 "XDMCP on välja lülitatud ja GDM ei leia ühtegi kohalikku käivitatavat "
 "serverit. Katkestamine! Palun paranda seadistused ja taaskäivita GDM."
 
-#: ../daemon/gdm.c:814
+#: ../daemon/gdmconfig.c:1398
 #, c-format
 msgid ""
 "The GDM user '%s' does not exist. Please correct GDM configuration and "
@@ -421,12 +622,12 @@ msgstr ""
 "GDM'i kasutajat '%s' pole olemas. Palun paranda GDM-i seadistused ja "
 "taaskäivita GDM."
 
-#: ../daemon/gdm.c:822
+#: ../daemon/gdmconfig.c:1406
 #, c-format
 msgid "%s: Can't find the GDM user '%s'. Aborting!"
 msgstr "%s: Ei leia GDM-i kasutajat '%s'. Katkestan!"
 
-#: ../daemon/gdm.c:829
+#: ../daemon/gdmconfig.c:1412
 msgid ""
 "The GDM user is set to be root, but this is not allowed since it can pose a "
 "security risk.  Please correct GDM configuration and restart GDM."
@@ -434,12 +635,12 @@ msgstr ""
 "GDM kasutajaks on määratud root, aga see ei ole turvariski tõttu lubatav. "
 "Palun paranda GDM-i seadistused ja taaskäivita GDM."
 
-#: ../daemon/gdm.c:838
+#: ../daemon/gdmconfig.c:1421
 #, c-format
 msgid "%s: The GDM user should not be root. Aborting!"
 msgstr "%s: GDM kasutaja ei tohi olla root. Katkestan!"
 
-#: ../daemon/gdm.c:845
+#: ../daemon/gdmconfig.c:1427
 #, c-format
 msgid ""
 "The GDM group '%s' does not exist. Please correct GDM configuration and "
@@ -448,12 +649,12 @@ msgstr ""
 "GDM'i gruppi '%s' pole olemas. Palun paranda GDM-i seadistused ja "
 "taaskäivita GDM."
 
-#: ../daemon/gdm.c:853
+#: ../daemon/gdmconfig.c:1434
 #, c-format
 msgid "%s: Can't find the GDM group '%s'. Aborting!"
 msgstr "%s: Ei leia GDM gruppi '%s'. Katkestan!"
 
-#: ../daemon/gdm.c:860
+#: ../daemon/gdmconfig.c:1440
 msgid ""
 "The GDM group is set to be root, but this is not allowed since it can pose a "
 "security risk. Please correct GDM configuration and restart GDM."
@@ -461,36 +662,36 @@ msgstr ""
 "GDM grupiks on määratud root, aga see ei ole turvariski tõttu lubatav. Palun "
 "paranda GDM-i seadistused ja taaskäivita GDM."
 
-#: ../daemon/gdm.c:869
+#: ../daemon/gdmconfig.c:1449
 #, c-format
 msgid "%s: The GDM group should not be root. Aborting!"
 msgstr "%s: GDM grupp ei tohi olla root. Katkestan!"
 
-#: ../daemon/gdm.c:884
+#: ../daemon/gdmconfig.c:1458
 #, c-format
 msgid "%s: Greeter not found or can't be executed by the GDM user"
 msgstr ""
 
-#: ../daemon/gdm.c:891
+#: ../daemon/gdmconfig.c:1464
 #, c-format
 msgid "%s: Remote greeter not found or can't be executed by the GDM user"
 msgstr ""
 
-#: ../daemon/gdm.c:902
+#: ../daemon/gdmconfig.c:1472
 #, c-format
 msgid "%s: Chooser not found or it can't be executed by the GDM user"
 msgstr ""
 
-#: ../daemon/gdm.c:911
+#: ../daemon/gdmconfig.c:1481
 msgid "No daemon/ServAuthDir specified in the GDM configuration file"
 msgstr "Deemonit/ServAuthDir-i ei ole seadistusfailis kirjeldatud"
 
-#: ../daemon/gdm.c:913
+#: ../daemon/gdmconfig.c:1483
 #, c-format
 msgid "%s: No daemon/ServAuthDir specified."
 msgstr "%s: Deemonit/ServAuthDir'i pole määratud."
 
-#: ../daemon/gdm.c:937
+#: ../daemon/gdmconfig.c:1506
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but is not "
@@ -501,12 +702,12 @@ msgstr ""
 "s, kuid selle kataloogi omanikeks pole kasutaja %s ja grupp %s. Palun "
 "paranda GDM-i seadistused ja taaskäivita GDM."
 
-#: ../daemon/gdm.c:948
+#: ../daemon/gdmconfig.c:1516
 #, c-format
 msgid "%s: Authdir %s is not owned by user %s, group %s. Aborting."
 msgstr "%s: 'Authdir' %s ei kuulu kasutajale %s, grupile %s. Katkestan."
 
-#: ../daemon/gdm.c:954
+#: ../daemon/gdmconfig.c:1521
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but has the "
@@ -514,262 +715,48 @@ msgid ""
 "permissions or the GDM configuration and restart GDM."
 msgstr ""
 
-#: ../daemon/gdm.c:966
+#: ../daemon/gdmconfig.c:1533
 #, c-format
 msgid "%s: Authdir %s has wrong permissions %o. Should be %o. Aborting."
 msgstr "%s: Authdir %s loabitid (%o) on valed. Peaks olema %o. Katkestan."
 
-#. FIXME: how to handle this?
-#: ../daemon/gdm.c:1022 ../daemon/gdm.c:1030 ../daemon/gdm.c:2314
-#: ../daemon/gdm.c:2322
-#, c-format
-msgid "Cannot write PID file %s: possibly out of diskspace.  Error: %s\n"
-msgstr ""
-"PID faili %s pole võimalik kirjutada kirjutada, arvatavasti on kettaruum "
-"otsas.  Viga: %s\n"
-
-#: ../daemon/gdm.c:1024 ../daemon/gdm.c:1032 ../daemon/gdm.c:2316
-#: ../daemon/gdm.c:2324
-#, c-format
-msgid "Cannot write PID file %s: possibly out of diskspace.  Error: %s"
-msgstr ""
-"PID faili %s pole võimalik kirjutada kirjutada, arvatavasti on kettaruum "
-"otsas.  Viga: %s"
-
-#: ../daemon/gdm.c:1042
-#, c-format
-msgid "%s: fork() failed!"
-msgstr "%s: tõrge fork() käsu täitmisel!"
-
-#. should never happen
-#: ../daemon/gdm.c:1045 ../daemon/slave.c:3656
-#, c-format
-msgid "%s: setsid() failed: %s!"
-msgstr "%s: tõrge setsid() käsu täitmisel: %s!"
-
-#: ../daemon/gdm.c:1232
-#, c-format
-msgid "%s: Trying failsafe X server %s"
-msgstr "%s: Tõrkekindla X-i serveri %s proovimine"
-
-#: ../daemon/gdm.c:1250
-#, c-format
-msgid "%s: Running the XKeepsCrashing script"
-msgstr "%s: XKeepsCrashing skripti käivitamine"
-
-#: ../daemon/gdm.c:1370
-msgid ""
-"The X server (your graphical interface) cannot be started.  It is likely "
-"that it is not set up correctly.  You will need to log in on a console and "
-"rerun the X configuration application, then restart GDM."
-msgstr ""
-
-#. else {
-#. * At this point .... screw the user, we don't know how to
-#. * talk to him.  He's on some 'l33t system anyway, so syslog
-#. * reading will do him good
-#. * }
-#: ../daemon/gdm.c:1382
-#, c-format
-msgid ""
-"Failed to start X server several times in a short time period; disabling "
-"display %s"
-msgstr ""
-"Lühikese aja jooksul on X'i serveri käivitamisel esinenud mitmeid tõrkeid; "
-"kuva %s on nüüd keelatud"
-
-#: ../daemon/gdm.c:1390 ../daemon/gdm.c:3114
-msgid "Master suspending..."
-msgstr "Pealiku peatamine..."
-
-#: ../daemon/gdm.c:1444
-#, c-format
-msgid "System is rebooting, please wait ..."
-msgstr "Süsteemi alglaadimine, palun oota ..."
-
-#: ../daemon/gdm.c:1446
-#, c-format
-msgid "System is shutting down, please wait ..."
-msgstr "Süsteemi seiskamine, palun oota ..."
-
-#: ../daemon/gdm.c:1457
-msgid "Master halting..."
-msgstr "Pealiku seiskamine..."
-
-#: ../daemon/gdm.c:1470
-#, c-format
-msgid "%s: Halt failed: %s"
-msgstr "%s: Tõrge seiskamisel: %s"
-
-#: ../daemon/gdm.c:1479
-msgid "Master rebooting..."
-msgstr "Pealiku alglaadimine..."
-
-#: ../daemon/gdm.c:1492
-#, c-format
-msgid "%s: Reboot failed: %s"
-msgstr "%s: Tõrge taaskäivitamisel: %s"
-
-#: ../daemon/gdm.c:1593
-#, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
-msgstr ""
-
-#: ../daemon/gdm.c:1602
-#, c-format
-msgid "Restart, Reboot or Halt request from a non-static display %s"
-msgstr "Taaskäivitamise, alglaadimise või seiskamise taotlus kaugkuvalt %s"
-
-#. Bury this display for good
-#: ../daemon/gdm.c:1668
-#, c-format
-msgid "%s: Aborting display %s"
-msgstr "%s: Kuva %s katkestamine"
-
-#: ../daemon/gdm.c:1819
-msgid "GDM restarting ..."
-msgstr "GDM taaskäivitamine ..."
-
-#: ../daemon/gdm.c:1823
-msgid "Failed to restart self"
-msgstr "Tõrge iseenda taaskäivitamisel"
-
-#. FIXME: note that this could mean out of memory
-#: ../daemon/gdm.c:1897
-msgid "main daemon: Got SIGABRT. Something went very wrong. Going down!"
-msgstr ""
-
-#: ../daemon/gdm.c:2055
-msgid "Do not fork into the background"
-msgstr "Taustaprotsessiks ei minda"
-
-#: ../daemon/gdm.c:2057
-msgid "No console (static) servers to be run"
-msgstr "Konsooliservereid (staatilisi) ei käivitata"
-
-#: ../daemon/gdm.c:2059 ../gui/gdmsetup.c:6185
-msgid "Alternative configuration file"
-msgstr "Alternatiivne seadistusfail"
-
-#: ../daemon/gdm.c:2059 ../gui/gdmsetup.c:6185
-msgid "CONFIGFILE"
-msgstr ""
-
-#: ../daemon/gdm.c:2061
-msgid "Preserve LD_* variables"
-msgstr "LD_* keskkonnamuutujad hoitakse alles"
-
-#: ../daemon/gdm.c:2063
-msgid "Print GDM version"
-msgstr "GDM versiooni väljastamine"
-
-#: ../daemon/gdm.c:2065
-msgid "Start the first X server but then halt until we get a GO in the fifo"
-msgstr ""
-
-#: ../daemon/gdm.c:2172 ../daemon/gdm.c:2513
-#, c-format
-msgid "Can't open %s for writing"
-msgstr "%s avamine kirjutamiseks nurjus"
-
-#: ../daemon/gdm.c:2229 ../gui/gdmchooser.c:2046
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Võtme %s viga: %s.\n"
-"Kõikide võimalike käsureavõtmete vaatamiseks käivita '%s --help'.\n"
-
-#: ../daemon/gdm.c:2252
-msgid "Only root wants to run gdm\n"
-msgstr "Ainult root tohib gdm-i käivitada\n"
-
-#: ../daemon/gdm.c:2268 ../daemon/gdm.c:2272 ../daemon/gdm.c:2352
-#: ../daemon/gdm.c:2356 ../daemon/gdm.c:2360 ../daemon/gdm.c:2364
-#: ../daemon/gdm.c:2374 ../daemon/gdm.c:2380 ../daemon/gdm.c:2391
-#: ../daemon/misc.c:1750 ../daemon/misc.c:1754 ../daemon/misc.c:1758
-#: ../daemon/misc.c:1765 ../daemon/misc.c:1769 ../daemon/misc.c:1773
-#: ../daemon/server.c:531 ../daemon/server.c:544 ../daemon/slave.c:833
-#: ../daemon/slave.c:847 ../daemon/slave.c:857 ../daemon/slave.c:867
-#: ../daemon/slave.c:879 ../gui/gdmchooser.c:1956 ../gui/gdmchooser.c:1959
-#: ../gui/gdmchooser.c:1962 ../gui/gdmlogin.c:3782 ../gui/gdmlogin.c:3792
-#: ../gui/gdmlogin.c:3797 ../gui/greeter/greeter.c:1301
-#: ../gui/greeter/greeter.c:1309 ../gui/greeter/greeter.c:1312
-#, c-format
-msgid "%s: Error setting up %s signal handler: %s"
-msgstr "%s: Viga signaali %s käsitleja ülesseadmisel: %s"
-
-#: ../daemon/gdm.c:2296
-msgid "gdm already running. Aborting!"
-msgstr "gdm juba töötab. Katkestamine!"
-
-#: ../daemon/gdm.c:2400
-#, c-format
-msgid "%s: Error setting up CHLD signal handler"
-msgstr "%s: Viga signaali CHLD käsitleja ülesseadmisel"
-
-#: ../daemon/gdm.c:3528
-msgid "DYNAMIC request denied: Not authenticated"
-msgstr ""
-
-#: ../daemon/gdm.c:4085 ../daemon/gdm.c:4103 ../daemon/gdm.c:4435
-#: ../daemon/gdm.c:4488 ../daemon/gdm.c:4542 ../daemon/gdm.c:4586
-#: ../daemon/gdm.c:4612
-#, c-format
-msgid "%s request denied: Not authenticated"
-msgstr ""
-
-#. Don't print the name to syslog as it might be
-#. * long and dangerous
-#: ../daemon/gdm.c:4121
-msgid "Unknown server type requested; using standard server."
-msgstr "Küsiti tundmatut serveritüüpi; kasutatakse standardserverit."
-
-#: ../daemon/gdm.c:4125
-#, c-format
-msgid ""
-"Requested server %s not allowed to be used for flexible servers; using "
-"standard server."
-msgstr ""
-
 #. Translators, don't translate the 'y' and 'n'
-#: ../daemon/misc.c:754
+#: ../daemon/misc.c:745
 msgid "y = Yes or n = No? >"
 msgstr "y = Jah või n = Ei? >"
 
-#: ../daemon/misc.c:1118
+#: ../daemon/misc.c:1109
 #, c-format
 msgid "%s: Cannot get local addresses!"
 msgstr "%s: Ei leia kohalikke aadresse!"
 
-#: ../daemon/misc.c:1270
+#: ../daemon/misc.c:1261
 #, c-format
 msgid "Could not setgid %d. Aborting."
 msgstr "Setgid %d pole võimalik teha. Katkestan."
 
-#: ../daemon/misc.c:1275
+#: ../daemon/misc.c:1266
 #, c-format
 msgid "initgroups() failed for %s. Aborting."
 msgstr "Tõrge %s jaoks initgroups() tegemine. Katkestan."
 
-#: ../daemon/misc.c:1512 ../daemon/misc.c:1526
+#: ../daemon/misc.c:1503 ../daemon/misc.c:1517
 #, c-format
 msgid "%s: Error setting signal %d to %s"
 msgstr "%s: Viga signaali %d sättimisel signaaliks %s"
 
-#: ../daemon/misc.c:2419
+#: ../daemon/misc.c:2410
 #, c-format
 msgid ""
 "Last login:\n"
 "%s"
 msgstr "Viimane sisselogimine:%s"
 
-#: ../daemon/server.c:160
+#: ../daemon/server.c:150
 msgid "Can not start fallback console"
 msgstr ""
 
-#: ../daemon/server.c:350
+#: ../daemon/server.c:340
 #, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should "
@@ -777,7 +764,7 @@ msgid ""
 "starting the server on %s again.%s"
 msgstr ""
 
-#: ../daemon/server.c:358
+#: ../daemon/server.c:348
 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 "
@@ -787,130 +774,130 @@ msgstr ""
 "näiteks Ctrl-Alt-F7 viib sind seitsmendale konsoolile. X-i serverid töötavad "
 "tavaliselt konsoolidel numbriga 7 ja suuremad.)"
 
-#: ../daemon/server.c:404
+#: ../daemon/server.c:394
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "Kuva '%s' pole võimalik Xnest'i poolt avada"
 
-#: ../daemon/server.c:435
+#: ../daemon/server.c:425
 #, c-format
 msgid "Display %s is busy. There is another X server running already."
 msgstr "Kuva %s on hõivatud. Süsteemis on juba käivitatud X server."
 
-#: ../daemon/server.c:519
+#: ../daemon/server.c:509
 #, c-format
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s: Viga toru avamisel: %s"
 
-#: ../daemon/server.c:707
+#: ../daemon/server.c:697
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s: tõrge ühendumisel vanemkuvaga '%s'"
 
 #. Send X too busy
-#: ../daemon/server.c:847
+#: ../daemon/server.c:837
 #, c-format
 msgid "%s: Cannot find a free display number"
 msgstr "%s: Vaba kuva numbrit pole võimalik leida"
 
-#: ../daemon/server.c:874
+#: ../daemon/server.c:864
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s: Kuva %s on hõivatud.  Proovitakse mõnda teist kuva numbrit."
 
-#: ../daemon/server.c:983
+#: ../daemon/server.c:975
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "Vigane serverikäsk '%s'"
 
-#: ../daemon/server.c:988
+#: ../daemon/server.c:980
 #, c-format
 msgid "Server name '%s' not found; using standard server"
 msgstr "Serverit '%s' ei leitud; kasutan standardserverit"
 
-#: ../daemon/server.c:1165
+#: ../daemon/server.c:1157
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s: Kuva %s jaoks pole võimalik logfaili avada!"
 
-#: ../daemon/server.c:1177 ../daemon/server.c:1183 ../daemon/server.c:1188
+#: ../daemon/server.c:1169 ../daemon/server.c:1175 ../daemon/server.c:1180
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s: Viga signaali %s sättimisel signaaliks %s"
 
-#: ../daemon/server.c:1234
+#: ../daemon/server.c:1226
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s: Tühi serverikäsk kuva %s jaoks"
 
-#: ../daemon/server.c:1248
+#: ../daemon/server.c:1240
 #, c-format
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr ""
 
-#: ../daemon/server.c:1263 ../daemon/slave.c:2732 ../daemon/slave.c:3190
+#: ../daemon/server.c:1255 ../daemon/slave.c:2449 ../daemon/slave.c:2920
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Grupi ID'd (groupid) pole võimalik %d-ks seada"
 
-#: ../daemon/server.c:1269 ../daemon/slave.c:2737 ../daemon/slave.c:3195
+#: ../daemon/server.c:1261 ../daemon/slave.c:2455 ../daemon/slave.c:2926
 #, c-format
 msgid "%s: initgroups() failed for %s"
 msgstr "%s: initgroups() ei õnnestunud %s jaoks"
 
-#: ../daemon/server.c:1275 ../daemon/slave.c:2742 ../daemon/slave.c:3200
+#: ../daemon/server.c:1267 ../daemon/slave.c:2460 ../daemon/slave.c:2931
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Kasutaja ID'd (userid) pole võimalik %d-ks seada"
 
-#: ../daemon/server.c:1282
+#: ../daemon/server.c:1274
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s: Grupi ID'd (groupid) pole võimalik 0-ks seada"
 
-#: ../daemon/server.c:1309
+#: ../daemon/server.c:1301
 #, c-format
 msgid "%s: Xserver not found: %s"
 msgstr "%s: Ei leia Xserverit: %s"
 
-#: ../daemon/server.c:1317
+#: ../daemon/server.c:1309
 #, c-format
 msgid "%s: Can't fork Xserver process!"
 msgstr "%s: Xserver protsessi pole võimalik forkida!"
 
-#: ../daemon/slave.c:323
+#: ../daemon/slave.c:269
 msgid "Can't set EGID to user GID"
 msgstr "EGID'i ei saa muuta kasutaja GID'ks"
 
-#: ../daemon/slave.c:331
+#: ../daemon/slave.c:277
 msgid "Can't set EUID to user UID"
 msgstr "EUID'd ei saa muuta kasutaja UID'ks"
 
-#: ../daemon/slave.c:1152
+#: ../daemon/slave.c:1104
 msgid "Log in anyway"
 msgstr "Logi sisse sellegipoolest"
 
-#: ../daemon/slave.c:1154
+#: ../daemon/slave.c:1106
 msgid ""
 "You are already logged in.  You can log in anyway, return to your previous "
 "login session, or abort this login"
 msgstr ""
 
-#: ../daemon/slave.c:1158
+#: ../daemon/slave.c:1110
 msgid "Return to previous login"
 msgstr "Naasmine eelmise sisselogimise juurde"
 
-#: ../daemon/slave.c:1159 ../daemon/slave.c:1165
+#: ../daemon/slave.c:1111 ../daemon/slave.c:1117
 msgid "Abort login"
 msgstr "Katkesta sisselogimine"
 
-#: ../daemon/slave.c:1162
+#: ../daemon/slave.c:1114
 msgid "You are already logged in.  You can log in anyway or abort this login"
 msgstr ""
 "Sa oled juba sisselogitud.  Siiski võid sa sisse logida või käesoleva "
 "sisselogimise katkestada"
 
-#: ../daemon/slave.c:1338
+#: ../daemon/slave.c:1291
 msgid ""
 "Could not start the X\n"
 "server (your graphical environment)\n"
@@ -929,45 +916,45 @@ msgstr ""
 "see kuva blokitud. Kui probleemid on\n"
 "kõrvaldatud, siis palun taaskäivita gdm."
 
-#: ../daemon/slave.c:1586
+#: ../daemon/slave.c:1543
 #, c-format
 msgid "%s: cannot fork"
 msgstr "%s: pole võimalik forkida"
 
-#: ../daemon/slave.c:1633
+#: ../daemon/slave.c:1590
 #, c-format
 msgid "%s: cannot open display %s"
 msgstr "%s: kuva %s pole võimalik avada"
 
-#: ../daemon/slave.c:1784
+#: ../daemon/slave.c:1741
 msgid ""
 "Could not execute the configuration application.  Make sure its path is set "
 "correctly in the configuration file.  Attempting to start it from the "
 "default location."
 msgstr ""
 
-#: ../daemon/slave.c:1798
+#: ../daemon/slave.c:1755
 msgid ""
 "Could not execute the configuration application.  Make sure its path is set "
 "correctly in the configuration file."
 msgstr ""
 
-#: ../daemon/slave.c:1960
+#: ../daemon/slave.c:1919
 msgid "You must authenticate as root to run configuration."
 msgstr "Sätete muutmiseks peab autentima root kasutajana."
 
-#: ../daemon/slave.c:2090 ../daemon/slave.c:2113
+#: ../daemon/slave.c:2051 ../daemon/slave.c:2075
 msgid ""
 "Login sound requested on non-local display or the play software cannot be "
 "run or the sound does not exist."
 msgstr ""
 
-#: ../daemon/slave.c:2686 ../daemon/slave.c:2691
+#: ../daemon/slave.c:2403 ../daemon/slave.c:2408
 #, c-format
 msgid "%s: Can't init pipe to gdmgreeter"
 msgstr "%s: Gdmgreeter-isse pole võimalik toru avada"
 
-#: ../daemon/slave.c:2816
+#: ../daemon/slave.c:2540
 msgid ""
 "No servers were defined in the configuration file and XDMCP was disabled.  "
 "This can only be a configuration error.  GDM has started a single server for "
@@ -975,21 +962,21 @@ msgid ""
 "timed logins are disabled now."
 msgstr ""
 
-#: ../daemon/slave.c:2830
+#: ../daemon/slave.c:2554
 msgid ""
 "Could not start the regular X server (your graphical environment) and so "
 "this is a failsafe X server.  You should log in and properly configure the X "
 "server."
 msgstr ""
 
-#: ../daemon/slave.c:2839
+#: ../daemon/slave.c:2563
 #, c-format
 msgid ""
 "The specified display number was busy, so this server was started on display "
 "%s."
 msgstr ""
 
-#: ../daemon/slave.c:2859
+#: ../daemon/slave.c:2583
 msgid ""
 "The greeter application appears to be crashing.\n"
 "Attempting to use a different one."
@@ -998,19 +985,19 @@ msgstr ""
 "Proovin kasutada mõnda muud."
 
 #. Something went wrong
-#: ../daemon/slave.c:2880
+#: ../daemon/slave.c:2606
 #, c-format
 msgid "%s: Cannot start greeter with gtk modules: %s. Trying without modules"
 msgstr ""
 "%s: Tervitajat pole võimalik gtk moodulitega käivitada: %s. Proovin ilma "
 "mooduliteta"
 
-#: ../daemon/slave.c:2887
+#: ../daemon/slave.c:2613
 #, c-format
 msgid "%s: Cannot start greeter trying default: %s"
 msgstr "%s: Tervitajat pole võimalik käivitada, vaikimisi proovitakse: %s"
 
-#: ../daemon/slave.c:2899
+#: ../daemon/slave.c:2625
 msgid ""
 "Cannot start the greeter application; you will not be able to log in.  This "
 "display will be disabled.  Try logging in by other means and editing the "
@@ -1018,90 +1005,90 @@ msgid ""
 msgstr ""
 
 #. If no greeter we really have to disable the display
-#: ../daemon/slave.c:2906
+#: ../daemon/slave.c:2632
 #, c-format
 msgid "%s: Error starting greeter on display %s"
 msgstr "%s: Viga tervitaja (greeter) kävitamisel kuval %s"
 
-#: ../daemon/slave.c:2910
+#: ../daemon/slave.c:2636
 #, c-format
 msgid "%s: Can't fork gdmgreeter process"
 msgstr "%s: Gdmgreeter protsessi pole võimalik forkida"
 
-#: ../daemon/slave.c:2981
+#: ../daemon/slave.c:2708
 #, c-format
 msgid "%s: Can't open fifo!"
 msgstr "%s: Ei saa avada järjekorda!"
 
-#: ../daemon/slave.c:3150
+#: ../daemon/slave.c:2880
 #, c-format
 msgid "%s: Can't init pipe to gdmchooser"
 msgstr "%s: Gdmchooser'isse pole võimalik toru avada"
 
-#: ../daemon/slave.c:3247
+#: ../daemon/slave.c:2985
 msgid ""
 "Cannot start the chooser application. You will probably not be able to log "
 "in.  Please contact the system administrator."
 msgstr ""
 
-#: ../daemon/slave.c:3251
+#: ../daemon/slave.c:2989
 #, c-format
 msgid "%s: Error starting chooser on display %s"
 msgstr "%s: Viga valija kävitamisel kuval %s"
 
-#: ../daemon/slave.c:3254
+#: ../daemon/slave.c:2992
 #, c-format
 msgid "%s: Can't fork gdmchooser process"
 msgstr "%s: Gdmchooser protsessi pole võimalik forkida"
 
-#: ../daemon/slave.c:3556
+#: ../daemon/slave.c:3225
 #, c-format
 msgid "%s: Could not open ~/.xsession-errors"
 msgstr "%s: Faili ~/.xsession-errors pole võimalik avada"
 
-#: ../daemon/slave.c:3709
+#: ../daemon/slave.c:3377
 #, c-format
 msgid "%s: Execution of PreSession script returned > 0. Aborting."
 msgstr "%s: PreSession skripti kävitamise tulemus > 0. Katkestan."
 
-#: ../daemon/slave.c:3753
+#: ../daemon/slave.c:3421
 #, c-format
 msgid "Language %s does not exist; using %s"
 msgstr "Keelt %s ei ole olemas; kasutame %s keelt"
 
-#: ../daemon/slave.c:3754
+#: ../daemon/slave.c:3422
 msgid "System default"
 msgstr "Süsteemi vaikeväärtus"
 
-#: ../daemon/slave.c:3771
+#: ../daemon/slave.c:3439
 #, c-format
 msgid "%s: Could not setup environment for %s. Aborting."
 msgstr "%s: %s jaoks pole võimalik keskkonda seadistada. Katkestan."
 
-#: ../daemon/slave.c:3818
+#: ../daemon/slave.c:3486
 #, c-format
 msgid "%s: setusercontext() failed for %s. Aborting."
 msgstr "%s: setusercontext() ei õnnestunud %s jaoks. Katkestan."
 
-#: ../daemon/slave.c:3824
+#: ../daemon/slave.c:3492
 #, c-format
 msgid "%s: Could not become %s. Aborting."
 msgstr "%s: Ei saa hakata kasutajaks %s. Katkestan."
 
-#: ../daemon/slave.c:3887
+#: ../daemon/slave.c:3526
 #, c-format
 msgid "%s: No Exec line in the session file: %s. Starting failsafe GNOME"
 msgstr ""
 "%s: Seansifailis puudub Exec-rida: %s. Kasutusele läheb tõrkekindel "
 "(failsafe) GNOME"
 
-#: ../daemon/slave.c:3893
+#: ../daemon/slave.c:3532
 msgid ""
 "The session you selected does not look valid.  Running the GNOME failsafe "
 "session instead."
 msgstr ""
 
-#: ../daemon/slave.c:3907
+#: ../daemon/slave.c:3548
 #, c-format
 msgid ""
 "%s: Cannot find or run the base Xsession script.  Running the GNOME failsafe "
@@ -1110,77 +1097,77 @@ msgstr ""
 "%s: Xsession baasskripti pole võimalik leida või käivitada.  Selle asemel "
 "käivitatakse GNOME tõrkekindel seanss."
 
-#: ../daemon/slave.c:3913
+#: ../daemon/slave.c:3554
 msgid ""
 "Cannot find or run the base session script.  Running the GNOME failsafe "
 "session instead."
 msgstr ""
 
 #. yaikes
-#: ../daemon/slave.c:3928
+#: ../daemon/slave.c:3569
 #, c-format
 msgid "%s: gnome-session not found for a failsafe GNOME session; trying xterm"
 msgstr ""
 
-#: ../daemon/slave.c:3933
+#: ../daemon/slave.c:3574
 msgid ""
 "Could not find the GNOME installation.  Running the \"Failsafe xterm\" "
 "session instead."
 msgstr ""
 
-#: ../daemon/slave.c:3941
+#: ../daemon/slave.c:3582
 msgid ""
 "This is the Failsafe GNOME session.  You will be logged into the 'Default' "
 "session of GNOME without the startup scripts being run.  This should be used "
 "to fix problems in your installation."
 msgstr ""
 
-#: ../daemon/slave.c:3956
+#: ../daemon/slave.c:3597
 msgid "Cannot find \"xterm\" to start a failsafe session."
 msgstr ""
 
-#: ../daemon/slave.c:3969
+#: ../daemon/slave.c:3610
 msgid ""
 "This is the Failsafe xterm session.  You will be logged into a terminal "
 "console so that you may fix your system if you cannot log in any other way.  "
 "To exit the terminal emulator, type 'exit' and an enter into the window."
 msgstr ""
 
-#: ../daemon/slave.c:3996
+#: ../daemon/slave.c:3637
 #, c-format
 msgid "%s: User not allowed to log in"
 msgstr "%s: Kasutajal on sisselogimine keelatud"
 
-#: ../daemon/slave.c:3999
+#: ../daemon/slave.c:3640
 msgid "The system administrator has disabled your account."
 msgstr "Süsteemihaldur on sinu kasutajakonto ära keelanud."
 
-#: ../daemon/slave.c:4030
+#: ../daemon/slave.c:3671
 msgid "Error! Unable to set executable context."
 msgstr ""
 
 #. will go to .xsession-errors
-#: ../daemon/slave.c:4038 ../daemon/slave.c:4043
+#: ../daemon/slave.c:3679 ../daemon/slave.c:3684
 #, c-format
 msgid "%s: Could not exec %s %s %s"
 msgstr "%s: %s %s %s pole võimalik käivitada "
 
 #. we can't really be any more specific
-#: ../daemon/slave.c:4054
+#: ../daemon/slave.c:3695
 msgid "Cannot start the session due to some internal error."
 msgstr "Seanssi pole võimalik sisemiste vigade tõttu alustada."
 
-#: ../daemon/slave.c:4108
+#: ../daemon/slave.c:3749
 #, c-format
 msgid "%s: User passed auth but getpwnam(%s) failed!"
 msgstr ""
 
-#: ../daemon/slave.c:4121
+#: ../daemon/slave.c:3762
 #, c-format
 msgid "%s: Execution of PostLogin script returned > 0. Aborting."
 msgstr "%s: PreSession skripti kävitamise tulemus > 0. Katkestan."
 
-#: ../daemon/slave.c:4143
+#: ../daemon/slave.c:3784
 #, c-format
 msgid ""
 "Your home directory is listed as:\n"
@@ -1191,12 +1178,12 @@ msgid ""
 "It is unlikely anything will work unless you use a failsafe session."
 msgstr ""
 
-#: ../daemon/slave.c:4155
+#: ../daemon/slave.c:3796
 #, c-format
 msgid "%s: Home directory for %s: '%s' does not exist!"
 msgstr "%s: Kasutaja %s kodukataloogi '%s' pole olemas!"
 
-#: ../daemon/slave.c:4234
+#: ../daemon/slave.c:3845
 msgid ""
 "User's $HOME/.dmrc file is being ignored.  This prevents the default session "
 "and language from being saved.  File should be owned by user and have 644 "
@@ -1204,7 +1191,7 @@ msgid ""
 "by other users."
 msgstr ""
 
-#: ../daemon/slave.c:4363
+#: ../daemon/slave.c:3974
 msgid ""
 "GDM could not write to your authorization file.  This could mean that you "
 "are out of disk space or that your home directory could not be opened for "
@@ -1212,12 +1199,12 @@ msgid ""
 "system administrator"
 msgstr ""
 
-#: ../daemon/slave.c:4439
+#: ../daemon/slave.c:4050
 #, c-format
 msgid "%s: Error forking user session"
 msgstr "%s: Viga kasutaja seansi forkimisel"
 
-#: ../daemon/slave.c:4520
+#: ../daemon/slave.c:4131
 msgid ""
 "Your session only lasted less than 10 seconds.  If you have not logged out "
 "yourself, this could mean that there is some installation problem or that "
@@ -1225,52 +1212,52 @@ msgid ""
 "sessions to see if you can fix this problem."
 msgstr ""
 
-#: ../daemon/slave.c:4528
+#: ../daemon/slave.c:4139
 msgid "View details (~/.xsession-errors file)"
 msgstr "Vaata üksikasju (faili ~/.xsession-errors)"
 
-#: ../daemon/slave.c:4692
+#: ../daemon/slave.c:4303
 msgid "GDM detected a shutdown or reboot in progress."
 msgstr "GDM tuvastas käimasoleva alglaadimise või masina seiskamise."
 
-#: ../daemon/slave.c:4786
+#: ../daemon/slave.c:4397
 #, c-format
 msgid "Ping to %s failed; whacking display!"
 msgstr ""
 
-#: ../daemon/slave.c:5065
+#: ../daemon/slave.c:4676
 #, c-format
 msgid "%s: Fatal X error - Restarting %s"
 msgstr "%s: Fataalne X viga - taaskäivitame %s"
 
-#: ../daemon/slave.c:5134
+#: ../daemon/slave.c:4745
 msgid ""
 "Login sound requested on non-local display or the play software cannot be "
 "run or the sound does not exist"
 msgstr ""
 
-#: ../daemon/slave.c:5490
+#: ../daemon/slave.c:5102
 #, c-format
 msgid "%s: Failed starting: %s"
 msgstr "%s: Tõrge käivitumisel: %s"
 
-#: ../daemon/slave.c:5497 ../daemon/slave.c:5636
+#: ../daemon/slave.c:5109 ../daemon/slave.c:5248
 #, c-format
 msgid "%s: Can't fork script process!"
 msgstr "%s: Skriptprotsessi forkimine pole võimalik!"
 
-#: ../daemon/slave.c:5591
+#: ../daemon/slave.c:5203
 #, c-format
 msgid "%s: Failed creating pipe"
 msgstr "%s: Toru pole võimalik luua"
 
-#: ../daemon/slave.c:5630
+#: ../daemon/slave.c:5242
 #, c-format
 msgid "%s: Failed executing: %s"
 msgstr "%s: Tõrge käivitamisel: %s"
 
-#: ../daemon/verify-crypt.c:74 ../daemon/verify-pam.c:1132
-#: ../daemon/verify-shadow.c:75
+#: ../daemon/verify-crypt.c:72 ../daemon/verify-pam.c:1118
+#: ../daemon/verify-shadow.c:73
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
@@ -1278,57 +1265,57 @@ msgstr ""
 "\n"
 " Vale kasutajanimi või parool.  Suur- ja väiketähtedel tehakse vahet."
 
-#: ../daemon/verify-crypt.c:79 ../daemon/verify-pam.c:1142
-#: ../daemon/verify-shadow.c:80
+#: ../daemon/verify-crypt.c:77 ../daemon/verify-pam.c:1128
+#: ../daemon/verify-shadow.c:78
 msgid "Please make sure the Caps Lock key is not enabled."
 msgstr "Palun veendu, et Caps Lock klahv ei ole sisse lülitatud."
 
-#: ../daemon/verify-crypt.c:126 ../daemon/verify-pam.c:538
-#: ../daemon/verify-shadow.c:125 ../gui/gdmlogin.c:3115
+#: ../daemon/verify-crypt.c:124 ../daemon/verify-pam.c:524
+#: ../daemon/verify-shadow.c:123 ../gui/gdmlogin.c:3115
 msgid "Please enter your username"
 msgstr "Palun sisesta oma kasutajanimi"
 
 #. login: is whacked always translate to Username:
-#: ../daemon/verify-crypt.c:127 ../daemon/verify-pam.c:438
-#: ../daemon/verify-pam.c:439 ../daemon/verify-pam.c:440
-#: ../daemon/verify-pam.c:525 ../daemon/verify-pam.c:867
-#: ../daemon/verify-shadow.c:126 ../gui/gdmlogin.c:1338 ../gui/gdmlogin.c:1352
+#: ../daemon/verify-crypt.c:125 ../daemon/verify-pam.c:424
+#: ../daemon/verify-pam.c:425 ../daemon/verify-pam.c:426
+#: ../daemon/verify-pam.c:511 ../daemon/verify-pam.c:853
+#: ../daemon/verify-shadow.c:124 ../gui/gdmlogin.c:1338 ../gui/gdmlogin.c:1352
 #: ../gui/gdmlogin.c:1965 ../gui/gdmlogin.c:2445 ../gui/greeter/greeter.c:397
 #: ../gui/greeter/greeter_parser.c:1125
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
-#: ../daemon/verify-crypt.c:165 ../daemon/verify-pam.c:441
-#: ../daemon/verify-pam.c:442 ../daemon/verify-pam.c:586
-#: ../daemon/verify-shadow.c:183 ../gui/gdmlogin.c:2000
+#: ../daemon/verify-crypt.c:163 ../daemon/verify-pam.c:427
+#: ../daemon/verify-pam.c:428 ../daemon/verify-pam.c:572
+#: ../daemon/verify-shadow.c:181 ../gui/gdmlogin.c:2000
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../daemon/verify-crypt.c:183 ../daemon/verify-crypt.c:197
-#: ../daemon/verify-shadow.c:201 ../daemon/verify-shadow.c:215
+#: ../daemon/verify-crypt.c:181 ../daemon/verify-crypt.c:195
+#: ../daemon/verify-shadow.c:199 ../daemon/verify-shadow.c:213
 #, c-format
 msgid "Couldn't authenticate user \"%s\""
 msgstr "Kasutajat \"%s\" pole võimalik autentida"
 
-#: ../daemon/verify-crypt.c:210 ../daemon/verify-pam.c:978
-#: ../daemon/verify-shadow.c:228
+#: ../daemon/verify-crypt.c:208 ../daemon/verify-pam.c:964
+#: ../daemon/verify-shadow.c:226
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "Root ei tohi kuva '%s' kaudu sisse logida"
 
-#: ../daemon/verify-crypt.c:212 ../daemon/verify-shadow.c:230
+#: ../daemon/verify-crypt.c:210 ../daemon/verify-shadow.c:228
 msgid "The system administrator is not allowed to login from this screen"
 msgstr "Süsteemihalduril ei ole siit sisse logimine lubatud"
 
-#: ../daemon/verify-crypt.c:228 ../daemon/verify-crypt.c:252
-#: ../daemon/verify-shadow.c:246 ../daemon/verify-shadow.c:270
+#: ../daemon/verify-crypt.c:226 ../daemon/verify-crypt.c:250
+#: ../daemon/verify-shadow.c:244 ../daemon/verify-shadow.c:268
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "Kasutajal %s on sisselogimine keelatud"
 
-#: ../daemon/verify-crypt.c:230 ../daemon/verify-crypt.c:254
-#: ../daemon/verify-pam.c:1024 ../daemon/verify-pam.c:1307
-#: ../daemon/verify-shadow.c:248 ../daemon/verify-shadow.c:272
+#: ../daemon/verify-crypt.c:228 ../daemon/verify-crypt.c:252
+#: ../daemon/verify-pam.c:1010 ../daemon/verify-pam.c:1293
+#: ../daemon/verify-shadow.c:246 ../daemon/verify-shadow.c:270
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1336,29 +1323,29 @@ msgstr ""
 "\n"
 "Süsteemihaldur on sinu kasutajakonto keelanud."
 
-#: ../daemon/verify-crypt.c:277 ../daemon/verify-crypt.c:415
-#: ../daemon/verify-pam.c:1042 ../daemon/verify-pam.c:1324
-#: ../daemon/verify-shadow.c:295 ../daemon/verify-shadow.c:433
+#: ../daemon/verify-crypt.c:275 ../daemon/verify-crypt.c:413
+#: ../daemon/verify-pam.c:1028 ../daemon/verify-pam.c:1310
+#: ../daemon/verify-shadow.c:293 ../daemon/verify-shadow.c:431
 #, c-format
 msgid "Cannot set user group for %s"
 msgstr "Kasutajagrupp %s jaoks pole võimalik määrata"
 
-#: ../daemon/verify-crypt.c:279 ../daemon/verify-crypt.c:418
-#: ../daemon/verify-pam.c:1044 ../daemon/verify-pam.c:1327
-#: ../daemon/verify-shadow.c:297 ../daemon/verify-shadow.c:436
+#: ../daemon/verify-crypt.c:277 ../daemon/verify-crypt.c:416
+#: ../daemon/verify-pam.c:1030 ../daemon/verify-pam.c:1313
+#: ../daemon/verify-shadow.c:295 ../daemon/verify-shadow.c:434
 msgid ""
 "\n"
 "Cannot set your user group; you will not be able to log in. Please contact "
 "your system administrator."
 msgstr ""
 
-#: ../daemon/verify-crypt.c:290 ../daemon/verify-crypt.c:363
-#: ../daemon/verify-shadow.c:308 ../daemon/verify-shadow.c:382
+#: ../daemon/verify-crypt.c:288 ../daemon/verify-crypt.c:361
+#: ../daemon/verify-shadow.c:306 ../daemon/verify-shadow.c:380
 #, c-format
 msgid "Password of %s has expired"
 msgstr "Kasutaja %s parool on aegunud"
 
-#: ../daemon/verify-crypt.c:292 ../daemon/verify-shadow.c:310
+#: ../daemon/verify-crypt.c:290 ../daemon/verify-shadow.c:308
 msgid ""
 "You are required to change your password.\n"
 "Please choose a new one."
@@ -1366,21 +1353,21 @@ msgstr ""
 "Sa pead muutma oma parooli.\n"
 "Palun sisesta uus parool"
 
-#: ../daemon/verify-crypt.c:303 ../daemon/verify-shadow.c:321
+#: ../daemon/verify-crypt.c:301 ../daemon/verify-shadow.c:319
 msgid ""
 "\n"
 "Cannot change your password; you will not be able to log in. Please try "
 "again later or contact your system administrator."
 msgstr ""
 
-#: ../daemon/verify-crypt.c:346 ../daemon/verify-crypt.c:354
-#: ../daemon/verify-shadow.c:365 ../daemon/verify-shadow.c:373
+#: ../daemon/verify-crypt.c:344 ../daemon/verify-crypt.c:352
+#: ../daemon/verify-shadow.c:363 ../daemon/verify-shadow.c:371
 msgid ""
 "Your password has been changed but you may have to change it again. Please "
 "try again later or contact your system administrator."
 msgstr ""
 
-#: ../daemon/verify-crypt.c:365 ../daemon/verify-shadow.c:384
+#: ../daemon/verify-crypt.c:363 ../daemon/verify-shadow.c:382
 msgid ""
 "Your password has expired.\n"
 "Only a system administrator can now change it"
@@ -1388,93 +1375,93 @@ msgstr ""
 "Sinu parool on aegunud.\n"
 "Ainult süsteemihaldur saab seda muuta"
 
-#: ../daemon/verify-crypt.c:372 ../daemon/verify-shadow.c:391
+#: ../daemon/verify-crypt.c:370 ../daemon/verify-shadow.c:389
 msgid "Internal error on passwdexpired"
 msgstr ""
 
-#: ../daemon/verify-crypt.c:374 ../daemon/verify-shadow.c:393
+#: ../daemon/verify-crypt.c:372 ../daemon/verify-shadow.c:391
 msgid ""
 "An internal error occurred. You will not be able to log in.\n"
 "Please try again later or contact your system administrator."
 msgstr ""
 
-#: ../daemon/verify-crypt.c:410 ../daemon/verify-shadow.c:428
+#: ../daemon/verify-crypt.c:408 ../daemon/verify-shadow.c:426
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr ""
 
-#: ../daemon/verify-pam.c:443
+#: ../daemon/verify-pam.c:429
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Sa pead viivitamatult muutma oma parooli (parool on vananenud)"
 
-#: ../daemon/verify-pam.c:444
+#: ../daemon/verify-pam.c:430
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
 "Sa pead viivitamatult muutma oma parooli (haldur on selle nii määranud)"
 
-#: ../daemon/verify-pam.c:445
+#: ../daemon/verify-pam.c:431
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Sinu konto on aegunud, palun võta ühendust oma süsteemihalduriga"
 
-#: ../daemon/verify-pam.c:446
+#: ../daemon/verify-pam.c:432
 msgid "No password supplied"
 msgstr "Parooli ei ole antud"
 
-#: ../daemon/verify-pam.c:447
+#: ../daemon/verify-pam.c:433
 msgid "Password unchanged"
 msgstr "Parool muutmata"
 
-#: ../daemon/verify-pam.c:448
+#: ../daemon/verify-pam.c:434
 msgid "Can not get username"
 msgstr "Ei leia kasutajanime"
 
-#: ../daemon/verify-pam.c:449
+#: ../daemon/verify-pam.c:435
 msgid "Retype new UNIX password:"
 msgstr "Sisesta uus UNIX'i parool uuesti:"
 
-#: ../daemon/verify-pam.c:450
+#: ../daemon/verify-pam.c:436
 msgid "Enter new UNIX password:"
 msgstr "Sisesta uus UNIX'i parool:"
 
-#: ../daemon/verify-pam.c:451
+#: ../daemon/verify-pam.c:437
 msgid "(current) UNIX password:"
 msgstr "(praegune) UNIX parool:"
 
-#: ../daemon/verify-pam.c:452
+#: ../daemon/verify-pam.c:438
 msgid "Error while changing NIS password."
 msgstr "Viga NIS parooli vahetamisel."
 
-#: ../daemon/verify-pam.c:453
+#: ../daemon/verify-pam.c:439
 msgid "You must choose a longer password"
 msgstr "Sa pead valima pikema parooli"
 
-#: ../daemon/verify-pam.c:454
+#: ../daemon/verify-pam.c:440
 msgid "Password has been already used. Choose another."
 msgstr "Parool on juba kasutusel. Vali mõni teine parool."
 
-#: ../daemon/verify-pam.c:455
+#: ../daemon/verify-pam.c:441
 msgid "You must wait longer to change your password"
 msgstr "Parooli vahetamiseks pead sa kauem ootama"
 
-#: ../daemon/verify-pam.c:456
+#: ../daemon/verify-pam.c:442
 msgid "Sorry, passwords do not match"
 msgstr "Vabandust, paroolid ei klapi"
 
-#: ../daemon/verify-pam.c:750
+#: ../daemon/verify-pam.c:736
 msgid "Cannot setup pam handle with null display"
 msgstr ""
 
-#: ../daemon/verify-pam.c:767
+#: ../daemon/verify-pam.c:753
 #, c-format
 msgid "Unable to establish service %s: %s\n"
 msgstr ""
 
-#: ../daemon/verify-pam.c:780
+#: ../daemon/verify-pam.c:766
 #, c-format
 msgid "Can't set PAM_TTY=%s"
 msgstr "PAM_TTY=%s seadmine pole võimalik"
 
-#: ../daemon/verify-pam.c:790
+#: ../daemon/verify-pam.c:776
 #, c-format
 msgid "Can't set PAM_RHOST=%s"
 msgstr "PAM_RHOST=%s seadmine pole võimalik"
@@ -1484,12 +1471,12 @@ msgstr "PAM_RHOST=%s seadmine pole võimalik"
 #. is not really an auth problem, but it will
 #. pretty much look as such, it shouldn't really
 #. happen
-#: ../daemon/verify-pam.c:928 ../daemon/verify-pam.c:946
-#: ../daemon/verify-pam.c:1246 ../daemon/verify-pam.c:1258
+#: ../daemon/verify-pam.c:914 ../daemon/verify-pam.c:932
+#: ../daemon/verify-pam.c:1232 ../daemon/verify-pam.c:1244
 msgid "Couldn't authenticate user"
 msgstr "Kasutajat pole võimalik autentida"
 
-#: ../daemon/verify-pam.c:981
+#: ../daemon/verify-pam.c:967
 msgid ""
 "\n"
 "The system administrator is not allowed to login from this screen"
@@ -1497,29 +1484,29 @@ msgstr ""
 "\n"
 "Süsteemihalduril pole lubatud siit sisse logida"
 
-#: ../daemon/verify-pam.c:1005 ../daemon/verify-pam.c:1288
+#: ../daemon/verify-pam.c:991 ../daemon/verify-pam.c:1274
 #, c-format
 msgid "Authentication token change failed for user %s"
 msgstr ""
 
-#: ../daemon/verify-pam.c:1007 ../daemon/verify-pam.c:1291
+#: ../daemon/verify-pam.c:993 ../daemon/verify-pam.c:1277
 msgid ""
 "\n"
 "The change of the authentication token failed. Please try again later or "
 "contact the system administrator."
 msgstr ""
 
-#: ../daemon/verify-pam.c:1022 ../daemon/verify-pam.c:1304
+#: ../daemon/verify-pam.c:1008 ../daemon/verify-pam.c:1290
 #, c-format
 msgid "User %s no longer permitted to access the system"
 msgstr "Kasutajal %s ei ole enam lubatud süsteemi kasutada"
 
-#: ../daemon/verify-pam.c:1028 ../daemon/verify-pam.c:1310
+#: ../daemon/verify-pam.c:1014 ../daemon/verify-pam.c:1296
 #, c-format
 msgid "User %s not permitted to gain access at this time"
 msgstr "Kasutajal %s on ligipääs käesoleval hetkel keeltatud"
 
-#: ../daemon/verify-pam.c:1030
+#: ../daemon/verify-pam.c:1016
 msgid ""
 "\n"
 "The system administrator has disabled access to the system temporarily."
@@ -1527,37 +1514,37 @@ msgstr ""
 "\n"
 "Süsteemihaldur on süsteemile ligipääsu ajutiselt keelanud."
 
-#: ../daemon/verify-pam.c:1035 ../daemon/verify-pam.c:1317
+#: ../daemon/verify-pam.c:1021 ../daemon/verify-pam.c:1303
 #, c-format
 msgid "Couldn't set acct. mgmt for %s"
 msgstr "Ei õnnestunud määrata acct. mgmt %s jaoks"
 
-#: ../daemon/verify-pam.c:1068 ../daemon/verify-pam.c:1351
+#: ../daemon/verify-pam.c:1054 ../daemon/verify-pam.c:1337
 #, c-format
 msgid "Couldn't set credentials for %s"
 msgstr "Ei õnnestunud määrata mandaate %s jaoks"
 
-#: ../daemon/verify-pam.c:1082 ../daemon/verify-pam.c:1367
+#: ../daemon/verify-pam.c:1068 ../daemon/verify-pam.c:1353
 #, c-format
 msgid "Couldn't open session for %s"
 msgstr "Seanssi pole võimalik %s jaoks avada"
 
-#: ../daemon/verify-pam.c:1136
+#: ../daemon/verify-pam.c:1122
 msgid ""
 "\n"
 "Authentication failed.  Letters must be typed in the correct case."
 msgstr ""
 
-#: ../daemon/verify-pam.c:1152 ../daemon/verify-pam.c:1249
-#: ../daemon/verify-pam.c:1261
+#: ../daemon/verify-pam.c:1138 ../daemon/verify-pam.c:1235
+#: ../daemon/verify-pam.c:1247
 msgid "Authentication failed"
 msgstr "Tõrge autentimisel"
 
-#: ../daemon/verify-pam.c:1225
+#: ../daemon/verify-pam.c:1211
 msgid "Automatic login"
 msgstr "Automaatne sisselogimine"
 
-#: ../daemon/verify-pam.c:1313
+#: ../daemon/verify-pam.c:1299
 msgid ""
 "\n"
 "The system administrator has disabled your access to the system temporarily."
@@ -1565,147 +1552,147 @@ msgstr ""
 "\n"
 "Süsteemihaldur on ajutiselt keelanud sinu ligipääsu süsteemile."
 
-#: ../daemon/verify-pam.c:1534 ../daemon/verify-pam.c:1536
+#: ../daemon/verify-pam.c:1520 ../daemon/verify-pam.c:1522
 msgid "Can't find PAM configuration for gdm."
 msgstr "Ei leia PAM seadistusfaili gdm jaoks."
 
-#: ../daemon/xdmcp.c:373
+#: ../daemon/xdmcp.c:350
 #, c-format
 msgid "%s: Could not get server hostname: %s!"
 msgstr "%s: serveri hostinime hankimine pole võimalik: %s!"
 
-#: ../daemon/xdmcp.c:398
+#: ../daemon/xdmcp.c:375
 #, c-format
 msgid "%s: Could not create socket!"
 msgstr "%s: Ei suuda luua soklit!"
 
-#: ../daemon/xdmcp.c:485
+#: ../daemon/xdmcp.c:460
 #, c-format
 msgid "%s: Could not bind to XDMCP socket!"
 msgstr "%s: XDMCP-soklit pole võimalik siduda!"
 
-#: ../daemon/xdmcp.c:557
+#: ../daemon/xdmcp.c:532
 #, c-format
 msgid "%s: Could not create XDMCP buffer!"
 msgstr "%s: XDMCP puhvrit pole võimalik luua!"
 
-#: ../daemon/xdmcp.c:563
+#: ../daemon/xdmcp.c:538
 #, c-format
 msgid "%s: Could not read XDMCP header!"
 msgstr "%s: XDMCP päise lugemine pole võimalik!"
 
-#: ../daemon/xdmcp.c:570
+#: ../daemon/xdmcp.c:545
 #, c-format
 msgid "%s: Incorrect XDMCP version!"
 msgstr "%s: Vale XDMCP versioon!"
 
-#: ../daemon/xdmcp.c:650 ../daemon/xdmcp.c:657
+#: ../daemon/xdmcp.c:625 ../daemon/xdmcp.c:632
 #, c-format
 msgid "%s: Unknown opcode from host %s"
 msgstr "%s: Tundmatu opkood hostilt %s"
 
-#: ../daemon/xdmcp.c:691 ../daemon/xdmcp.c:1136
+#: ../daemon/xdmcp.c:666 ../daemon/xdmcp.c:1111
 #, c-format
 msgid "%s: Could not extract authlist from packet"
 msgstr "%s: Ei õnnestu authlisti paketist kätte saada"
 
-#: ../daemon/xdmcp.c:707 ../daemon/xdmcp.c:1156
+#: ../daemon/xdmcp.c:682 ../daemon/xdmcp.c:1131
 #, c-format
 msgid "%s: Error in checksum"
 msgstr "%s: Viga kontrollsummas"
 
-#: ../daemon/xdmcp.c:1119
+#: ../daemon/xdmcp.c:1094
 #, c-format
 msgid "%s: Could not read display address"
 msgstr "%s: Kuva aadressi pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1127
+#: ../daemon/xdmcp.c:1102
 #, c-format
 msgid "%s: Could not read display port number"
 msgstr "%s: Kuva pordinumbrit pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1191 ../daemon/xdmcp.c:1215
+#: ../daemon/xdmcp.c:1166 ../daemon/xdmcp.c:1190
 #, c-format
 msgid "%s: Bad address"
 msgstr "%s: Vigane aadress"
 
-#: ../daemon/xdmcp.c:1374 ../daemon/xdmcp.c:1381
+#: ../daemon/xdmcp.c:1349 ../daemon/xdmcp.c:1356
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "XDMCP päring hostist %s tagasi lükatud"
 
-#: ../daemon/xdmcp.c:1607 ../daemon/xdmcp.c:1614
+#: ../daemon/xdmcp.c:1585 ../daemon/xdmcp.c:1592
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%s: Keelatud hostilt %s tuli REQUEST"
 
-#: ../daemon/xdmcp.c:1626 ../daemon/xdmcp.c:1999 ../daemon/xdmcp.c:2409
+#: ../daemon/xdmcp.c:1604 ../daemon/xdmcp.c:1977 ../daemon/xdmcp.c:2387
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%s: Kuva numbrit pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1633
+#: ../daemon/xdmcp.c:1611
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%s: Ühenduse tüüpi pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1640
+#: ../daemon/xdmcp.c:1618
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%s: Kliendi aadressi pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1648
+#: ../daemon/xdmcp.c:1626
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%s: Autentimisnimesid pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1657
+#: ../daemon/xdmcp.c:1635
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%s: Autentimisandmeid pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1667
+#: ../daemon/xdmcp.c:1645
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%s: Volitusnimekirja pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1684
+#: ../daemon/xdmcp.c:1662
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%s: Tootja ID'd pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:1710 ../daemon/xdmcp.c:1717
+#: ../daemon/xdmcp.c:1688 ../daemon/xdmcp.c:1695
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%s: Vigane kontrollsumma %s-lt"
 
-#: ../daemon/xdmcp.c:1975 ../daemon/xdmcp.c:1982
+#: ../daemon/xdmcp.c:1953 ../daemon/xdmcp.c:1960
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%s: Keelatud host %s saatis 'Manage'"
 
-#: ../daemon/xdmcp.c:1992 ../daemon/xdmcp.c:2416
+#: ../daemon/xdmcp.c:1970 ../daemon/xdmcp.c:2394
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%s: Seansi identifikaatorit pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:2006
+#: ../daemon/xdmcp.c:1984
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%s: Kuva klassi pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:2127 ../daemon/xdmcp.c:2134 ../daemon/xdmcp.c:2146
-#: ../daemon/xdmcp.c:2256 ../daemon/xdmcp.c:2263 ../daemon/xdmcp.c:2275
+#: ../daemon/xdmcp.c:2105 ../daemon/xdmcp.c:2112 ../daemon/xdmcp.c:2124
+#: ../daemon/xdmcp.c:2234 ../daemon/xdmcp.c:2241 ../daemon/xdmcp.c:2253
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%s: Aadressi pole võimalik lugeda"
 
-#: ../daemon/xdmcp.c:2386 ../daemon/xdmcp.c:2400
+#: ../daemon/xdmcp.c:2364 ../daemon/xdmcp.c:2378
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%s: Keelatud host %s saatis KEEPALIVE"
 
-#: ../daemon/xdmcp.c:2748
+#: ../daemon/xdmcp.c:2728
 #, c-format
 msgid ""
 "%s: Failed to run '%s --display %s --display-authfile %s --to %s --to-"
@@ -1714,8 +1701,8 @@ msgstr ""
 "%s: Failed to run '%s --display %s --display-authfile %s --to %s --to-"
 "authfile %s': %s"
 
-#: ../daemon/xdmcp.c:2783 ../daemon/xdmcp.c:2790 ../daemon/xdmcp.c:2796
-#: ../daemon/xdmcp.c:2802
+#: ../daemon/xdmcp.c:2763 ../daemon/xdmcp.c:2770 ../daemon/xdmcp.c:2776
+#: ../daemon/xdmcp.c:2782
 #, c-format
 msgid "%s: No XDMCP support"
 msgstr "%s: XDMCP toetus puudub"
@@ -1756,7 +1743,7 @@ msgstr ""
 msgid "Don't check for running gdm"
 msgstr "Käivitatud gdm'i kontrolle ei teostata"
 
-#: ../gui/gdmXnestchooser.c:509 ../gui/gdmchooser.c:2057
+#: ../gui/gdmXnestchooser.c:509 ../gui/gdmchooser.c:2053
 #: ../gui/gdmdynamic.c:157 ../gui/gdmflexiserver.c:745 ../gui/gdmlogin.c:3592
 #: ../gui/gdmphotosetup.c:483 ../gui/gdmsetup.c:6264
 #: ../gui/greeter/greeter.c:1253
@@ -1807,7 +1794,7 @@ msgstr "Teenindavaid hoste ei leitud"
 msgid "Choose a ho_st to connect to:"
 msgstr "Vali _host, millega ühenduda:"
 
-#: ../gui/gdmchooser.c:647
+#: ../gui/gdmchooser.c:645
 #, c-format
 msgid ""
 "The host \"%s\" is not willing to support a login session right now.  Please "
@@ -1815,11 +1802,11 @@ msgid ""
 msgstr ""
 "Host \"%s\" ei toeta hetkel sisselogimisseansse. Palun proovi hiljem uuesti."
 
-#: ../gui/gdmchooser.c:657
+#: ../gui/gdmchooser.c:655
 msgid "Cannot connect to remote server"
 msgstr "Ühendumine võrgus asuva serveriga nurjus"
 
-#: ../gui/gdmchooser.c:1276
+#: ../gui/gdmchooser.c:1274
 #, c-format
 msgid ""
 "Did not receive any response from host \"%s\" in %d seconds.  Perhaps the "
@@ -1827,21 +1814,21 @@ msgid ""
 "now.  Please try again later."
 msgstr ""
 
-#: ../gui/gdmchooser.c:1289
+#: ../gui/gdmchooser.c:1287
 msgid "Did not receive response from server"
 msgstr "Ei saanud serveri vastust"
 
-#: ../gui/gdmchooser.c:1391
+#: ../gui/gdmchooser.c:1389
 #, c-format
 msgid "Cannot find the host \"%s\". Perhaps you have mistyped it."
 msgstr ""
 "Hosti \"%s\" pole võimalik leida. Võibolla oled sa selle valesti sisestanud."
 
-#: ../gui/gdmchooser.c:1400
+#: ../gui/gdmchooser.c:1398
 msgid "Cannot find host"
 msgstr "Hosti pole võimalik leida"
 
-#: ../gui/gdmchooser.c:1696
+#: ../gui/gdmchooser.c:1692
 msgid ""
 "The main area of this application shows the hosts on the local network that "
 "have \"XDMCP\" enabled. This allows users to login remotely to other "
@@ -1851,41 +1838,41 @@ msgid ""
 "have selected a host click \"Connect\" to open a session to that computer."
 msgstr ""
 
-#: ../gui/gdmchooser.c:1743
+#: ../gui/gdmchooser.c:1739
 #, c-format
 msgid "Can't open default host icon: %s"
 msgstr "Vaikimisi hostiikooni pole võimalik avada: %s"
 
-#: ../gui/gdmchooser.c:1970 ../gui/gdmlogin.c:3807
+#: ../gui/gdmchooser.c:1966 ../gui/gdmlogin.c:3807
 #: ../gui/greeter/greeter.c:1320 ../gui/greeter/greeter.c:1327
 msgid "Could not set signal mask!"
 msgstr "Signaalimaski pole võimalik seada!"
 
-#: ../gui/gdmchooser.c:1976
+#: ../gui/gdmchooser.c:1972
 msgid "Socket for xdm communication"
 msgstr "Sokkel xdm suhtluseks"
 
-#: ../gui/gdmchooser.c:1976
+#: ../gui/gdmchooser.c:1972
 msgid "SOCKET"
 msgstr "SOKKEL"
 
-#: ../gui/gdmchooser.c:1979
+#: ../gui/gdmchooser.c:1975
 msgid "Client address to return in response to xdm"
 msgstr ""
 
-#: ../gui/gdmchooser.c:1979
+#: ../gui/gdmchooser.c:1975
 msgid "ADDRESS"
 msgstr "AADRESS"
 
-#: ../gui/gdmchooser.c:1982
+#: ../gui/gdmchooser.c:1978
 msgid "Connection type to return in response to xdm"
 msgstr ""
 
-#: ../gui/gdmchooser.c:1982
+#: ../gui/gdmchooser.c:1978
 msgid "TYPE"
 msgstr "TÜÜP"
 
-#: ../gui/gdmchooser.c:2088
+#: ../gui/gdmchooser.c:2084
 #, c-format
 msgid ""
 "The chooser version (%s) does not match the daemon version (%s).  You have "
@@ -1895,52 +1882,48 @@ msgstr ""
 "arvatavasti just värskendanud gdm'i versiooni.  Palun taaskäivita gdm deemon "
 "või tee arvutile alglaadimine"
 
-#: ../gui/gdmchooser.c:2098
+#: ../gui/gdmchooser.c:2094
 msgid "Cannot run chooser"
 msgstr "Valijat pole võimalik käivitada"
 
 #. EOF
 #: ../gui/gdmchooser.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../gui/gdmchooser.glade.h:2
 msgid "A_dd host: "
 msgstr "Hosti l_isamine: "
 
-#: ../gui/gdmchooser.glade.h:3
+#: ../gui/gdmchooser.glade.h:2
 msgid "C_onnect"
 msgstr "_Ühenda"
 
-#: ../gui/gdmchooser.glade.h:4
+#: ../gui/gdmchooser.glade.h:3
 msgid "Exit the application"
 msgstr "Rakenduse töö lõpetamine"
 
-#: ../gui/gdmchooser.glade.h:5
-msgid "GDM Host Chooser"
-msgstr "GDM'i hostivalija"
-
-#: ../gui/gdmchooser.glade.h:6
+#: ../gui/gdmchooser.glade.h:4
 msgid "How to use this application"
 msgstr "Rakenduse kasutamise kohta teabe kuvamine"
 
-#: ../gui/gdmchooser.glade.h:7
+#: ../gui/gdmchooser.glade.h:5
+msgid "Login Host Chooser"
+msgstr "Sisselogimishosti valija"
+
+#: ../gui/gdmchooser.glade.h:6
 msgid "Open a session to the selected host"
 msgstr "Ava seanss valitud serverisse"
 
-#: ../gui/gdmchooser.glade.h:8
+#: ../gui/gdmchooser.glade.h:7
 msgid "Probe the network"
 msgstr "Võrgu sondeerimine"
 
-#: ../gui/gdmchooser.glade.h:9
+#: ../gui/gdmchooser.glade.h:8
 msgid "Query and add this host to the above list"
 msgstr "Hostile andmepäringu tegemine ja hosti lisamine ülalasuvasse loendisse"
 
-#: ../gui/gdmchooser.glade.h:10
+#: ../gui/gdmchooser.glade.h:9
 msgid "Status"
 msgstr "Olek"
 
-#: ../gui/gdmchooser.glade.h:11
+#: ../gui/gdmchooser.glade.h:10
 msgid "_Add"
 msgstr "_Lisa"
 
@@ -3182,17 +3165,21 @@ msgstr "GDM'i seadistamiseks pead sa olema root-kasutaja."
 
 #. EOF
 #: ../gui/gdmsetup.desktop.in.h:1
-msgid "Configure the login screen (GNOME Display Manager)"
-msgstr "Seadista sisselogimisekraani (GNOME Kuvahaldur)"
+msgid "Configure the login window (GNOME Display Manager)"
+msgstr "Sisselogimisakna seadistamine (GNOME Kuvahaldur)"
 
 #: ../gui/gdmsetup.desktop.in.h:2
-msgid "Login Screen Setup"
-msgstr "Sisselogimisekraani sätted"
+msgid "Login Window"
+msgstr "Sisselogimisaken"
+
+#: ../gui/gdmsetup.desktop.in.h:3 ../gui/gdmsetup.glade.h:39
+msgid "Login Window Preferences"
+msgstr "Sisselogimisakna eelistused"
 
 #: ../gui/gdmsetup.glade.h:3
 #, no-c-format
 msgid "%n will be replaced by hostname"
-msgstr ""
+msgstr "%n asendatakse hostinimega"
 
 #: ../gui/gdmsetup.glade.h:4
 msgid ""
@@ -3218,9 +3205,8 @@ msgid "Accessibility"
 msgstr "Hõlbustused"
 
 #: ../gui/gdmsetup.glade.h:8
-#, fuzzy
 msgid "Add / Modify Servers To Start"
-msgstr "Serveri lisamine/redigeerimine"
+msgstr "Käivitatavate serverite lisamine ja redigeerimine"
 
 #: ../gui/gdmsetup.glade.h:9
 msgid "Add S_erver..."
@@ -3244,21 +3230,18 @@ msgid "Background"
 msgstr "Taust"
 
 #: ../gui/gdmsetup.glade.h:14
-#, fuzzy
 msgid "C_ommand:"
-msgstr "Käsk:"
+msgstr "_Käsk:"
 
 #: ../gui/gdmsetup.glade.h:15
 msgid "C_ustom:"
-msgstr ""
+msgstr "_Kohandatud:"
 
 #: ../gui/gdmsetup.glade.h:16
-#, fuzzy
 msgid "Co_lor:"
-msgstr "_Värvus"
+msgstr "_Värvus:"
 
 #: ../gui/gdmsetup.glade.h:17
-#, fuzzy
 msgid "Color depth:"
 msgstr "Värvisügavus:"
 
@@ -3355,10 +3338,6 @@ msgstr "_UDP port, mida kuulatakse: "
 msgid "Local"
 msgstr "_Kohalik: "
 
-#: ../gui/gdmsetup.glade.h:39
-msgid "Login Window Preferences"
-msgstr ""
-
 #: ../gui/gdmsetup.glade.h:40
 #, fuzzy
 msgid "Login _failed:"
@@ -3505,16 +3484,15 @@ msgstr "Tere tulemast"
 
 #: ../gui/gdmsetup.glade.h:79
 msgid "XDMCP Login WIndow Preferences"
-msgstr ""
+msgstr "XDMCP sisselogimisakna eelistused"
 
 #: ../gui/gdmsetup.glade.h:80
 msgid "XServer Login Window Preferences"
-msgstr ""
+msgstr "XServeri sisselogimisakna eelistused"
 
 #: ../gui/gdmsetup.glade.h:81
-#, fuzzy
 msgid "_Add/Modify..."
-msgstr "Serveri lisamine/redigeerimine"
+msgstr "_Lisa/redigeeri..."
 
 #: ../gui/gdmsetup.glade.h:82
 #, fuzzy
@@ -3536,19 +3514,16 @@ msgid "_Default message of \"Welcome\""
 msgstr "Vaikimisi võrgutervituse kasutamine"
 
 #: ../gui/gdmsetup.glade.h:87
-#, fuzzy
 msgid "_Deny TCP connections to Xserver"
-msgstr "Ühendumine võrgus asuva serveriga nurjus"
+msgstr "TCP-ühendused Xserver'isse on _keelatud"
 
 #: ../gui/gdmsetup.glade.h:88
-#, fuzzy
 msgid "_Enable Automatic Login"
-msgstr "Automaatne sisselogimine"
+msgstr "_Automaatne sisselogimine lubatud"
 
 #: ../gui/gdmsetup.glade.h:89
-#, fuzzy
 msgid "_Enable accessible login"
-msgstr "Hõbustuste moodulid lubatud"
+msgstr "_Hõbustustega sisselogimine on lubatud"
 
 #: ../gui/gdmsetup.glade.h:90
 msgid "_Flexible (on demand)"
@@ -3563,9 +3538,8 @@ msgid "_Include all users from /etc/passwd (not for NIS)"
 msgstr ""
 
 #: ../gui/gdmsetup.glade.h:93
-#, fuzzy
 msgid "_Login screen ready:"
-msgstr "Sisselogimisekraani sätted"
+msgstr "Sisselogimisekraan on valmis:"
 
 #: ../gui/gdmsetup.glade.h:94
 msgid "_Logins are handled by this computer"
@@ -3998,6 +3972,23 @@ msgstr "Liidest pole võimalik laadida. See on väga halb! (fail: %s)"
 msgid "Too many alias levels for a locale; may indicate a loop"
 msgstr "Liiga palju aliasetasemeid lokaadi jaoks; võib tähendada tsüklit"
 
+#~ msgid ""
+#~ "%s: Root cannot be logged in automatically, turning off automatic login"
+#~ msgstr ""
+#~ "%s: Root kasutaja ei saa automaatselt sisse logida, automaatset logimist "
+#~ "ei toimu"
+
+#~ msgid "%s: Root cannot be logged in automatically, turning off timed login"
+#~ msgstr ""
+#~ "%s: Juurkasutaja ei saa automaatselt sisse logida, viitlogimine "
+#~ "lülitatakse välja"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Login Screen Setup"
+#~ msgstr "Sisselogimisekraani sätted"
+
 #~ msgid "Open File"
 #~ msgstr "Faili avamine"