diff --git a/Makefile b/Makefile
index 2322409..5991316 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-SUBDIRS := usr/share/applications/po
+SUBDIRS := usr/share/applications/po usr/share/xsessions/po
  
 all: install
 
diff --git a/src/usr/share/applications/po/Makefile b/src/usr/share/applications/po/Makefile
index 146bee2..9b075d1 100644
--- a/src/usr/share/applications/po/Makefile
+++ b/src/usr/share/applications/po/Makefile
@@ -5,7 +5,7 @@ POTFILES := $(shell cat POTFILES.in)
 all: generate-po-files
 
 generate-pot: POTFILES.in
-	intltool-update --pot --gettext-package=lubuntu-default-settings-files
+	intltool-update --pot --gettext-package=lubuntu-default-settings-applications
 
 generate-po-files:
 	for i in $(POTFILES); do \
@@ -16,7 +16,7 @@ generate-po-files:
 update-po:
 	for i in *.po; do \
 		code=$$(echo $$i | sed 's/.po//'); \
-		intltool-update --gettext-package=lubuntu-default-settings-files --dist $$code; \
+		intltool-update --gettext-package=lubuntu-default-settings-applications --dist $$code; \
 	done
 
 # vim:ts=4
diff --git a/src/usr/share/applications/po/lubuntu-default-settings-files.pot b/src/usr/share/applications/po/lubuntu-default-settings-applications.pot
similarity index 100%
rename from src/usr/share/applications/po/lubuntu-default-settings-files.pot
rename to src/usr/share/applications/po/lubuntu-default-settings-applications.pot
diff --git a/src/usr/share/xsessions/Lubuntu-Netbook.desktop b/src/usr/share/xsessions/Lubuntu-Netbook.desktop
deleted file mode 100644
index d47f7e0..0000000
--- a/src/usr/share/xsessions/Lubuntu-Netbook.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-# The names/descriptions should really be better
-Name=Lubuntu Netbook
-Comment=Lubuntu Netbook - Lightweight X11 desktop environment based on LXDE
-Exec=/usr/bin/lxsession -s Lubuntu-Netbook -e LXDE
-# Icon=
-Type=Application
diff --git a/src/usr/share/xsessions/Lubuntu-Netbook.desktop.in b/src/usr/share/xsessions/Lubuntu-Netbook.desktop.in
new file mode 100644
index 0000000..20b893c
--- /dev/null
+++ b/src/usr/share/xsessions/Lubuntu-Netbook.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=Lubuntu Netbook
+_Comment=Lubuntu Netbook - Lubuntu based session for netbook
+Exec=/usr/bin/lxsession -s Lubuntu-Netbook -e LXDE
+Type=Application
diff --git a/src/usr/share/xsessions/Lubuntu.desktop b/src/usr/share/xsessions/Lubuntu.desktop
deleted file mode 100644
index 3cde5b8..0000000
--- a/src/usr/share/xsessions/Lubuntu.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-# The names/descriptions should really be better
-Name=Lubuntu
-Comment=Lubuntu - Lightweight X11 desktop environment based on LXDE
-Comment[zh_TW]=Lubuntu - 輕量級的 X11 桌面環境
-Comment[fi]=Lubuntu - kevyt X11-työpöytäympäristö
-Comment[ja]=Lubuntu - 軽量な X11 デスクトップ環境
-Exec=/usr/bin/lxsession -s Lubuntu -e LXDE
-# Icon=
-Type=Application
diff --git a/src/usr/share/xsessions/Lubuntu.desktop.in b/src/usr/share/xsessions/Lubuntu.desktop.in
new file mode 100644
index 0000000..4391fb8
--- /dev/null
+++ b/src/usr/share/xsessions/Lubuntu.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=Lubuntu
+_Comment=Lubuntu - Lightweight X11 desktop environment based on LXDE
+Exec=/usr/bin/lxsession -s Lubuntu -e LXDE
+Type=Application
diff --git a/src/usr/share/xsessions/QLubuntu.desktop b/src/usr/share/xsessions/QLubuntu.desktop.in
similarity index 50%
rename from src/usr/share/xsessions/QLubuntu.desktop
rename to src/usr/share/xsessions/QLubuntu.desktop.in
index e31c06e..f499001 100644
--- a/src/usr/share/xsessions/QLubuntu.desktop
+++ b/src/usr/share/xsessions/QLubuntu.desktop.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Name=Lubuntu Qt session
-Comment=A specific Lubuntu session using Qt
+_Name=Lubuntu Qt session
+_Comment=A specific Lubuntu session using Qt
 Exec=/usr/bin/lxsession -s QLubuntu -e LXQt
-# Icon=
 Type=Application
diff --git a/src/usr/share/xsessions/lubuntu-nexus7.desktop b/src/usr/share/xsessions/lubuntu-nexus7.desktop
deleted file mode 100644
index 91f5261..0000000
--- a/src/usr/share/xsessions/lubuntu-nexus7.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Lubuntu Nexus7 session
-Comment=A specific Lubuntu session optimised for Nexus7
-Exec=/usr/bin/lxsession -s Lubuntu-Nexus7 -e LXDE
-# Icon=
-Type=Application
diff --git a/src/usr/share/xsessions/lubuntu-nexus7.desktop.in b/src/usr/share/xsessions/lubuntu-nexus7.desktop.in
new file mode 100644
index 0000000..8182cfd
--- /dev/null
+++ b/src/usr/share/xsessions/lubuntu-nexus7.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=Lubuntu Nexus7 session
+_Comment=A specific Lubuntu session optimised for Nexus7
+Exec=/usr/bin/lxsession -s Lubuntu-Nexus7 -e LXDE
+Type=Application
diff --git a/src/usr/share/xsessions/lxgames.desktop b/src/usr/share/xsessions/lxgames.desktop
deleted file mode 100644
index 0f3a1eb..0000000
--- a/src/usr/share/xsessions/lxgames.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-# The names/descriptions should really be better
-Name=LX Games
-Comment=LX Games - A collection of games, using LXDE desktop.
-Exec=/usr/bin/lxsession -s LX-Games -e LXDE
-# Icon=
-Type=Application
diff --git a/src/usr/share/xsessions/lxgames.desktop.in b/src/usr/share/xsessions/lxgames.desktop.in
new file mode 100644
index 0000000..c80cc6f
--- /dev/null
+++ b/src/usr/share/xsessions/lxgames.desktop.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=LX Games
+_Comment=LX Games - A collection of games, using LXDE desktop.
+Exec=/usr/bin/lxsession -s LX-Games -e LXDE
+Type=Application
diff --git a/src/usr/share/xsessions/po/Makefile b/src/usr/share/xsessions/po/Makefile
new file mode 100644
index 0000000..a0799ec
--- /dev/null
+++ b/src/usr/share/xsessions/po/Makefile
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+POTFILES := $(shell cat POTFILES.in)
+
+all: generate-po-files
+
+generate-pot: POTFILES.in
+	intltool-update --pot --gettext-package=lubuntu-default-settings-xsessions
+
+generate-po-files:
+	for i in $(POTFILES); do \
+		f=$$(echo $$i | sed 's/\.in//'); \
+		intltool-merge -d . ../$$i ../$$f; \
+	done
+
+update-po:
+	for i in *.po; do \
+		code=$$(echo $$i | sed 's/.po//'); \
+		intltool-update --gettext-package=lubuntu-default-settings-xsessions --dist $$code; \
+	done
+
+# vim:ts=4
diff --git a/src/usr/share/xsessions/po/POTFILES.in b/src/usr/share/xsessions/po/POTFILES.in
new file mode 100644
index 0000000..64a3880
--- /dev/null
+++ b/src/usr/share/xsessions/po/POTFILES.in
@@ -0,0 +1,5 @@
+Lubuntu.desktop.in
+lubuntu-nexus7.desktop.inpo
+Lubuntu-Netbook.desktop.in
+lxgames.desktop.in
+QLubuntu.desktop.in
diff --git a/src/usr/share/xsessions/po/lubuntu-default-settings-xsessions.pot b/src/usr/share/xsessions/po/lubuntu-default-settings-xsessions.pot
new file mode 100644
index 0000000..7588776
--- /dev/null
+++ b/src/usr/share/xsessions/po/lubuntu-default-settings-xsessions.pot
@@ -0,0 +1,50 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-27 18:02+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../lubuntu-logout.desktop.in.h:1
+msgid "Shutdown"
+msgstr ""
+
+#: ../lubuntu-logout.desktop.in.h:2
+msgid "Shutdown or Reboot"
+msgstr ""
+
+#: ../lubuntu-nexus7-identica.desktop.in.h:1
+msgid "identi.ca"
+msgstr ""
+
+#: ../lubuntu-nexus7-identica.desktop.in.h:2
+msgid "Launching identi.ca"
+msgstr ""
+
+#: ../lubuntu-nexus7-rotate.desktop.in.h:1
+msgid "Rotate your screen"
+msgstr ""
+
+#: ../lubuntu-nexus7-rotate.desktop.in.h:2
+msgid "Rotate your screen using xrotate"
+msgstr ""
+
+#: ../lubuntu-screenlock.desktop.in.h:1
+msgid "ScreenLock"
+msgstr ""
+
+#: ../lubuntu-screenlock.desktop.in.h:2
+msgid "Lock your screen"
+msgstr ""