15 files changed, 258 insertions, 34 deletions

diff --git a/system/gdm/README b/system/gdm/README
index 77186f432f..dbca3fde17 100644
--- a/system/gdm/README
+++ b/system/gdm/README
@@ -2,10 +2,6 @@ The Gnome Display Manager (GDM) is a display manager that implements all
 significant features required for managing local and remote displays. 
 For full information about GDM features, refer to the documentation.
 
-The Sessions that gdm uses are installed in /etc/X11/gdm/Sessions.
-Several example files are included for blackbox, fluxbox, fvwm2,
-kde, twm, windowmaker, and xfce.
-
 If you want xscreensaver to recognize gdm and add a "New Login" button
 to the unlock screen, add this line to your ~/.xscreensaver file:
   newLoginCommand:       gdmflexiserver -ls
diff --git a/system/gdm/Sessions/xfce.desktop b/system/gdm/Sessions/xfce.desktop
deleted file mode 100644
index 040b6ba746..0000000000
--- a/system/gdm/Sessions/xfce.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=XFCE
-Comment=The Cholesterol Free Desktop Environment
-Exec=/etc/X11/xdm/Xsession xfce
-Icon=/usr/share/pixmaps/xfce4_xicon1.png
-Type=Application
diff --git a/system/gdm/doinst.sh b/system/gdm/doinst.sh
index 161e204bbf..e09179d821 100644
--- a/system/gdm/doinst.sh
+++ b/system/gdm/doinst.sh
@@ -12,6 +12,10 @@ config() {
 }
 
 config etc/X11/gdm/custom.conf.new
+config etc/X11/gdm/Xsession.new
+config etc/X11/gdm/Init/Default.new
+config etc/X11/gdm/PreSession/Default.new
+config etc/X11/gdm/PostSession/Default.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild
index 0c35c52a88..418279c1e1 100644
--- a/system/gdm/gdm.SlackBuild
+++ b/system/gdm/gdm.SlackBuild
@@ -9,7 +9,7 @@
 # Modified by Frank Caraballo <fecaraballo{at}gmail{dot}com>
 
 PRGNAM=gdm
-VERSION=${VERSION:-2.20.10}
+VERSION=${VERSION:-2.20.11}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,22 +71,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-console-helper=no \
   --enable-static=no \
   --enable-ipv6=yes \
-  --with-dmconfdir=/etc/X11/$PRGNAM \
+  --with-dmconfdir=/usr/share/xsessions \
   --build=$ARCH-slackware-linux
 
 make SUSPEND_COMMAND=/usr/sbin/pm-suspend
 make SUSPEND_COMMAND=/usr/sbin/pm-suspend install-strip DESTDIR=$PKG
 
 # Install some simple session files designed to work with Slackware
-mkdir -p $PKG/etc/X11/$PRGNAM/Sessions
-cp -r $CWD/Sessions/* $PKG/etc/X11/$PRGNAM/Sessions
-chmod 0755 $PKG/etc/X11/$PRGNAM/Sessions/*
+mkdir -p $PKG/usr/share/xsessions
+cp $CWD/sessions/* $PKG/usr/share/xsessions
+chmod 0755 $PKG/usr/share/xsessions/*
 
 # Make xfce the default session
 patch -d $PKG -p1 < $CWD/make_xfce_default_session.diff
 
-# Let's not clobber the a custom config
+# Let's not clobber the configs
 mv $PKG/etc/X11/gdm/custom.conf $PKG/etc/X11/gdm/custom.conf.new
+mv $PKG/etc/X11/gdm/Xsession $PKG/etc/X11/gdm/Xsession.new
+mv $PKG/etc/X11/gdm/Init/Default $PKG/etc/X11/gdm/Init/Default.new
+mv $PKG/etc/X11/gdm/PreSession/Default $PKG/etc/X11/gdm/PreSession/Default.new
+mv $PKG/etc/X11/gdm/PostSession/Default $PKG/etc/X11/gdm/PostSession/Default.new
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/system/gdm/gdm.info b/system/gdm/gdm.info
index 1f47be3afb..5f5e38aa96 100644
--- a/system/gdm/gdm.info
+++ b/system/gdm/gdm.info
@@ -1,8 +1,8 @@
 PRGNAM="gdm"
-VERSION="2.20.10"
+VERSION="2.20.11"
 HOMEPAGE="http://www.gnome.org/projects/gdm/"
-DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/gdm/2.20/gdm-2.20.10.tar.bz2"
-MD5SUM="981c7ee7fbe453061e095ab52a3513f8"
+DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-2.20.11.tar.bz2"
+MD5SUM="67696b64c81c317f61065810a32e8b36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
diff --git a/system/gdm/Sessions/twm.desktop b/system/gdm/sessions/afterstep.desktop
index c5f7a7dad3..316d438611 100644
--- a/system/gdm/Sessions/twm.desktop
+++ b/system/gdm/sessions/afterstep.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=TWM
-Comment=The twm window manager
-Exec=/etc/X11/xdm/Xsession twm
+Name=AfterStep
+Comment=The AfterStep Window Manager
+Exec=/etc/X11/xdm/Xsession afterstep
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/system/gdm/Sessions/blackbox.desktop b/system/gdm/sessions/blackbox.desktop
index e678881e31..3c08025ce9 100644
--- a/system/gdm/Sessions/blackbox.desktop
+++ b/system/gdm/sessions/blackbox.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Blackbox
 Comment=The blackbox window manager
 Exec=/etc/X11/xdm/Xsession blackbox
diff --git a/system/gdm/sessions/dotxsession.desktop b/system/gdm/sessions/dotxsession.desktop
new file mode 100644
index 0000000000..75d6da1999
--- /dev/null
+++ b/system/gdm/sessions/dotxsession.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=User Dot xsession
+Comment=This session starts the user's .xsession file
+Exec=/etc/X11/gdm/Xsession custom
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/system/gdm/sessions/enlightenment.desktop b/system/gdm/sessions/enlightenment.desktop
new file mode 100644
index 0000000000..89fc655a03
--- /dev/null
+++ b/system/gdm/sessions/enlightenment.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Enlightenment
+Comment=The Enlightenment Desktop
+Exec=/etc/X11/xdm/Xsession enlightenment
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/system/gdm/Sessions/fluxbox.desktop b/system/gdm/sessions/fluxbox.desktop
index ea81e1acf9..4315b29433 100644
--- a/system/gdm/Sessions/fluxbox.desktop
+++ b/system/gdm/sessions/fluxbox.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Fluxbox
 Comment=The fluxbox window manager
-Exec=/etc/X11/xdm/Xsession fluxbox
+Exec=/etc/X11/xinit/xinitrc.fluxbox
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/system/gdm/Sessions/fvwm2.desktop b/system/gdm/sessions/fvwm.desktop
index 3d22d0b144..6929996fa2 100644
--- a/system/gdm/Sessions/fvwm2.desktop
+++ b/system/gdm/sessions/fvwm.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=FVWM2
-Comment=The fvwm2 window manager
+Name=Fvwm
+Comment=The Fvwm window manager
 Exec=/etc/X11/xdm/Xsession fvwm2
 # no icon yet, only the top three are currently used
 Icon=
diff --git a/system/gdm/sessions/gnome.desktop b/system/gdm/sessions/gnome.desktop
new file mode 100644
index 0000000000..1da21dc659
--- /dev/null
+++ b/system/gdm/sessions/gnome.desktop
@@ -0,0 +1,91 @@
+[Desktop Entry]
+Name=GNOME
+Name[ar]=جنوم
+Name[be]=GNOME
+Name[be@latin]=GNOME
+Name[bn_IN]=GNOME
+Name[ca]=GNOME
+Name[cs]=GNOME
+Name[da]=GNOME
+Name[de]=GNOME
+Name[el]=GNOME
+Name[en_GB]=GNOME
+Name[es]=GNOME
+Name[et]=GNOME
+Name[eu]=GNOME
+Name[fi]=Gnome
+Name[fr]=GNOME
+Name[fur]=GNOME
+Name[ga]=GNOME
+Name[gl]=Gnome
+Name[hu]=GNOME
+Name[it]=GNOME
+Name[ja]=GNOME
+Name[ko]=그놈
+Name[lt]=GNOME
+Name[mk]=GNOME
+Name[mr]=GNOME
+Name[nb]=GNOME
+Name[nl]=Gnome
+Name[oc]=GNOME
+Name[pl]=GNOME
+Name[pt]=GNOME
+Name[pt_BR]=GNOME
+Name[ru]=GNOME
+Name[sk]=GNOME
+Name[sl]=GNOME
+Name[sv]=GNOME
+Name[th]=GNOME
+Name[tr]=GNOME
+Name[uk]=GNOME
+Name[vi]=GNOME
+Name[zh_CN]=GNOME
+Name[zh_HK]=GNOME
+Name[zh_TW]=GNOME
+Comment=This session logs you into GNOME
+Comment[ar]=تولجك هذه الجلسة في جنوم
+Comment[be]=Сэанс GNOME
+Comment[be@latin]=Hetaja sesija ŭruchamlaje GNOME
+Comment[bn_IN]=এই সেশানের মাধ্যমে GNOME-এ লগ-ইন করা যাবে
+Comment[ca]=Aquesta sessió us entra al GNOME
+Comment[cs]=Toto sezení vás přihlásí do GNOME
+Comment[da]=Denne session logger dig ind i GNOME
+Comment[de]=Diese Sitzung meldet Sie bei GNOME an
+Comment[el]=Αυτή η συνεδρία σας συνδέει στο GNOME
+Comment[en_GB]=This session logs you into GNOME
+Comment[es]=Esta sesión accede a GNOME
+Comment[et]=Selle seansiga logitakse GNOME keskkonda
+Comment[eu]=Saio honek GNOMEn sartuko zaitu
+Comment[fi]=Tämä istunto kirjautuu Gnomeen
+Comment[fr]=Cette session vous connecte dans GNOME
+Comment[fur]=Cheste session ti puartarâ dentri GNOME
+Comment[ga]=Logáil an seisiún seo thú isteach i nGNOME
+Comment[gl]=Esta sesión accede a Gnome
+Comment[hu]=Bejelentkezés a GNOME környezetbe
+Comment[it]=Questa sessione esegue l'accesso in GNOME
+Comment[ja]=このセッションで GNOME にログインします
+Comment[ko]=이 세션을 사용하면 그놈에 로그인합니다
+Comment[lt]=Ši sesija atveria GNOME
+Comment[mk]=Оваа сесија Ве најавува во GNOME
+Comment[mr]=GNOME मध्ये दाखल करण्याजोगी सत्र लॉग
+Comment[nb]=Denne sesjonen logger inn i GNOME
+Comment[nl]=Deze sessie laat u in Gnome inloggen
+Comment[oc]=La session vos connectarà dins GNOME
+Comment[pl]=Ta sesja loguje użytkownika do GNOME
+Comment[pt]=Esta é uma sessão no GNOME
+Comment[pt_BR]=Essa sessão o leva ao GNOME
+Comment[ru]=Этот сеанс позволяет вам войти в GNOME
+Comment[sk]=Táto relácia vás prihlási do GNOME
+Comment[sl]=Seja vas prijavi v GNOME namizje
+Comment[sv]=Denna session loggar in dig i GNOME
+Comment[th]=วาระนี้จะเข้าสู่ GNOME
+Comment[tr]=Bu oturum GNOME girişi yapmanızı sağlar
+Comment[uk]=Це - сеанс входу у GNOME
+Comment[vi]=Phiên chạy này sẽ đăng nhập bạn vào GNOME
+Comment[zh_CN]=此会话将您登录到 GNOME
+Comment[zh_HK]=這個作業階段讓你登入 GNOME
+Comment[zh_TW]=這個作業階段讓您登入 GNOME
+Exec=/etc/X11/xinit/xinitrc.gnome
+TryExec=/etc/X11/xinit/xinitrc.gnome
+Icon=
+Type=Application
diff --git a/system/gdm/Sessions/kde.desktop b/system/gdm/sessions/kde.desktop
index 0a98e73f01..d39066b90d 100644
--- a/system/gdm/Sessions/kde.desktop
+++ b/system/gdm/sessions/kde.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=KDE
 Comment=The K Desktop Environment
-Exec=/etc/X11/xdm/Xsession kde
+Exec=/etc/X11/xinit/xinitrc.kde
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/system/gdm/sessions/ssh.desktop b/system/gdm/sessions/ssh.desktop
new file mode 100644
index 0000000000..b03d973b02
--- /dev/null
+++ b/system/gdm/sessions/ssh.desktop
@@ -0,0 +1,128 @@
+[Desktop Entry]
+Name=Secure Remote connection
+Name[ar]=اتصال بعيد مؤمن
+Name[as]=নিৰাপদ দূৰবৰ্তী সংযোগ
+Name[bg]=Сигурна, отдалечена връзка
+Name[bn]=নিরাপদ দূরবর্তী সংযোগ
+Name[bn_IN]=নিরাপদ দূরবর্তী সংযোগ
+Name[ca]=Connexió remota segura
+Name[cs]=Zabezpečené vzdálené připojení
+Name[da]=Sikker ekstern forbindelse
+Name[de]=Sichere entfernte Verbindung
+Name[dz]=ཐག་རིང་མཐུད་ལམ་མཐའ་བཙན་བཟོ།
+Name[el]=Ασφαλή απομακρυσμένη συνεδρία
+Name[en_CA]=Secure Remote connection
+Name[en_GB]=Secure Remote connection
+Name[es]=Conexión segura remota
+Name[et]=Turvaline kaugühendus
+Name[eu]=Urruneko konexio segurua
+Name[fa]=اتصال دوردست امن
+Name[fi]=Turvallinen etäyhteys
+Name[fr]=Connexion distante sécurisée
+Name[gl]=Conexión remota segura
+Name[gu]=સુરક્ષિત દૂરસ્થ જોડાણ
+Name[he]=חיבור מרוחק מאובטח
+Name[hi]=सुरक्षित दूरस्थ संबंधन
+Name[hu]=Biztonságos távoli kapcsolat
+Name[id]=Sambungan Jauh Aman
+Name[it]=Connessione remota sicura
+Name[ja]=セキュアなリモート接続
+Name[kn]=ಸುರಕ್ಷಿತ ದೂರಸ್ಥ ಸಂಪರ್ಕ
+Name[ko]=원격 보안 연결
+Name[ku]=Girêdana Dûr ya Ewledar
+Name[lt]=Saugus nutolęs prisijungimas
+Name[lv]=Drošs attālinātais pieslēgums
+Name[mk]=Оддалечена безбедна врска
+Name[ml]=സുരക്ഷിതമായ വിദൂര കണക്ഷന്‍
+Name[nb]=Sikker ekstern tilkobling
+Name[ne]=टाढाको जडान सुरक्षा गर्नुहोस्
+Name[nl]=Beveiligde verbinding
+Name[nn]=Trygg ekstern tilkopling
+Name[oc]=Connection distanta segura
+Name[or]=ସୁରକ୍ଷିତ ଦୂର ସଂଯୋଗ
+Name[pa]=ਸੁਰੱਖਿਅਤ ਰਿਮੋਟ ਲਾਗਇਨ
+Name[pl]=Bezpieczne zdalne połączenie
+Name[pt]=Ligação Remota Segura
+Name[pt_BR]=Conexão Remota Segura
+Name[ro]=Conectare sigură la distanță
+Name[ru]=Защищённое удалённое соединение
+Name[sk]=Zabezpečené vzdialené pripojenie
+Name[sl]=Varna oddaljena povezava
+Name[sq]=Lidhje e sigurtë në distancë
+Name[sr]=Сигурна удаљена веза
+Name[sr@Latn]=Sigurna udaljena veza
+Name[sv]=Säker fjärranslutning
+Name[ta]=பாதுகாப்பான தொலை இணைப்பு
+Name[te]=రక్షిత సుదూర బంధం
+Name[th]=การเชื่อมต่อนิรภัยจากเครื่องอื่น
+Name[tr]=Güvenli Uzaktan Bağlantı
+Name[uk]=Безпечне віддалене з'єднання
+Name[vi]=Kết nối từ xa bảo mật
+Name[zh_CN]=安全远程连接
+Name[zh_HK]=安全遠端連線
+Name[zh_TW]=安全遠端連線
+Comment=This session logs you into a remote host using ssh
+Comment[ar]=تسجلك هذه الجلسة في مستضيف بعيد باستخدام ssh
+Comment[as]=এই অধিবেশনে ssh সহযোগে দূৰবৰ্তী গৃহস্থ ব্যৱস্থাপ্ৰণালীত প্ৰৱেশ কৰাব
+Comment[bg]=Тази сесия ще ви свърже към отдалечена машина през ssh
+Comment[bn]=এই সেশানে ssh সহযোগে দূরবর্তী হোস্ট সিস্টেম লগ-ইন করা হবে
+Comment[bn_IN]=এই সেশানে ssh সহযোগে দূরবর্তী হোস্ট সিস্টেম লগ-ইন করা হবে
+Comment[ca]=Amb aquesta sessió accedireu a un ordinador remot mitjançant SSH
+Comment[cs]=Toto sezení vás přihlásí na vzdálený počítač s použitím ssh
+Comment[da]=Denne session logger dig på en ekstern vært ved hjælp af ssh
+Comment[de]=Diese Sitzung meldet Sie mittels SSH auf einem entfernten Rechner an
+Comment[dz]=ལཱ་ཡུན་འདི་གིས་ ཨེསི་ཨེསི་ཨེཆ་ ལག་ལེན་འཐབ་ཐོག་ལས་ ཁྱོད་ཐག་རིང་ཧོསིཊི་ཅིག་ལུ་ ནང་བསྐྱོད་འབདཝ་ཨིན།
+Comment[el]=Αυτή η συνεδρία σας εισάγει σε ένα απομακρυσμένο σύστημα με τη χρήση ssh
+Comment[en_CA]=This session logs you into a remote host using SSH
+Comment[en_GB]=This session logs you into a remote host using ssh
+Comment[es]=Con esta sesión le permite entrar en un host remoto usando ssh
+Comment[et]=See seanss logib sind ssh abil võrgusolevasse hosti
+Comment[eu]=Saio honen bidez urruneko ostalarian sartuko zara, ssh erabiliz
+Comment[fa]=این نشست با استفاده از ssh شما را وارد یک میزبان دوردست می‌کند
+Comment[fi]=Tämä istunto kirjaa sisään etäistuntoon käyttäen ssh:ta
+Comment[fr]=Cette session vous connectera à un hôte distant via ssh
+Comment[gl]=Inicie unha sesión nun host remoto usando o ssh
+Comment[gu]=સત્ર તમને દૂરસ્થ યજમાનમાં ssh ની મદદથી પ્રવેશ કરી આપશે
+Comment[hi]=यह सत्र आपको दूरस्थ मेजबान में लॉग ssh के प्रयोग से करेगा
+Comment[hu]=Ez a környezet egy távoli gépre jelentkezteti be ssh használatával
+Comment[id]=Sesi ini memasukkan anda ke host jauh menggunakan ssh
+Comment[it]=Per eseguire l'accesso su un host remoto usando ssh
+Comment[ja]=SSH を使ってリモート・ホストのセッションにログインします
+Comment[kn]=ಈ ಅಧಿವೇಶನವು ನಿಮ್ಮನ್ನು ದೂರಸ್ಥ ಅತಿಥೇಯಕ್ಕೆ ಪ್ರವೇಶಿಸುವಂತೆ ಮಾಡುತ್ತದೆ
+Comment[ko]=세션에서 SSH를 사용해서 원격 호스트에 로그인합니다
+Comment[ku]=Ev danişîn te bi ssh re li termînaleke dûr girê dide
+Comment[lt]=Šis seansas prijungia jus prie nutolusio kompiuterio naudojant ssh
+Comment[lv]=Šī sesija izmantojot ssh jūs pieslēgs attālinātai darbstacijai
+Comment[mk]=Оваа сесија ве најавува во оддалечен хост со користење на ssh
+Comment[ml]=ssh ഉപയോഗിച്ച് നിങ്ങളെ വിദൂരത്തിലുളള ഒരു കംപ്യട്ടറിലേക്ക് (ഹോസ്റ്റ്) പ്രവേശിക്കാന്‍ നിങ്ങളെ സഹായിക്കുന്നു.
+Comment[nb]=Denne sesjonen logger deg inn til en ekstern vert via ssh
+Comment[ne]=यो सत्रले ssh प्रयोग गरेर तपाईँलाई टाढाको होस्टमा लग गर्दछ
+Comment[nl]=Deze sessie meldt u aan bij op een server via ssh
+Comment[nn]=Denne økta loggar deg inn på ein ekstern vert med ssh
+Comment[oc]=Aquesta session vos connectarà a un òste per ssh
+Comment[or]=ଏହି ଅଧିବେଶନ ଆପଣଙ୍କୁ ଗୋଟିଏ ଦୂର ଆଧାରରେ ssh ଚାବି ବ୍ଯବହାର କରି ଲଗ କରାଇଥାଏ
+Comment[pa]=ਇਹ ਸ਼ੈਸ਼ਨ ਤੁਹਾਨੂੰ ਇੱਕ ਰਿਮੋਟ ਹੋਸਟ 'ਚ ssh ਰਾਹੀਂ ਲਾਗਇਨ ਕਰਨ ਦਿੰਦਾ ਹੈ
+Comment[pl]=Sesja logowania do zdalnego komputera przy użyciu ssh
+Comment[pt]=Esta sessão permite-lhe aceder a uma máquina remota utilizando ssh
+Comment[pt_BR]=Esta sessão leva você a um host remoto usando ssh
+Comment[ro]=Această sesiune vă autentifică la un server la distanță utilizând ssh
+Comment[ru]=Этот сеанс подключит вас к уделённому узлу при помощи ssh
+Comment[sk]=Táto relácia Vás prihlási ku vzdialenému hostiteľovi pomocou ssh
+Comment[sl]=S sejo se prijavite preko ssh v oddaljenega gostitelja
+Comment[sq]=Kjo seancë do t'ju fusë në një host në distancë duke përdorur ssh
+Comment[sr]=Ова сесија вас пријављује на удаљени рачунар користећи ssh
+Comment[sr@Latn]=Ova sesija vas prijavljuje na udaljeni računar koristeći ssh
+Comment[sv]=Den här sessionen loggar in dig på en fjärrvärd via ssh
+Comment[ta]=இந்த அமர்வு எஸ்எஸ்ஹெச் ஐ உபயோகித்து தொலை புரவலனில் உங்களை நுழைக்கும்.
+Comment[te]=ssh వాడుటద్వారా ఈ సమకూర్పు మీకు ఒక సూదూర ఆతిథ్య గ్నోమ్ లోకి నమోదుచేస్తుంది
+Comment[th]=วาระนี้จะนำคุณเข้าสู่เครื่องอื่นแบบนิรภัยโดยใช้ ssh
+Comment[tr]=Bu oturumla uzaktaki bir makineye ssh kullanarak girebilirsiniz
+Comment[uk]=У цьому сеансі ви увійдете на віддалений вузол використовуючи ssh
+Comment[uz]=Ushbu seans Sizni ssh orqali masofadagi xostga ulaydi
+Comment[uz@cyrillic]=Ушбу сеанс Сизни ssh орқали масофадаги хостга улайди
+Comment[vi]=Phiên chạy này đăng nhập bạn vào máy từ xa bằng SSH
+Comment[zh_CN]=此会话使您通过 SSH 登录到远程主机
+Comment[zh_HK]=本作業階段會使用 ssh 登入至遠端主機
+Comment[zh_TW]=本作業階段會使用 ssh 登入至遠端主機
+Exec=/usr/libexec/gdm-ssh-session
+Type=Application
diff --git a/system/gdm/Sessions/windowmaker.desktop b/system/gdm/sessions/windowmaker.desktop
index 206a0c7f28..87e0315166 100644
--- a/system/gdm/Sessions/windowmaker.desktop
+++ b/system/gdm/sessions/windowmaker.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Windowmaker
 Comment=The Windowmaker window manager
-Exec=/etc/X11/xdm/Xsession windowmaker
+Exec=/etc/X11/xinit/xinitrc.wmaker
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application