diff --git a/configure.ac b/configure.ac
index a3f48bfb2..f661e4c69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ AM_GCONF_SOURCE_2
 
 dnl Internationalization
 GETTEXT_PACKAGE=guake
-ALL_LINGUAS="ca cs_CZ de el es fa fr gl hr hu id it ja nb_NO nl pa pl pt_BR ru sv tr uk_UA zh_CN"
+ALL_LINGUAS="ca cs de el es fa fr gl hr hu id it ja nb nl pa pl pt_BR ru sv tr uk zh_CN"
 
 AC_SUBST([GETTEXT_PACKAGE])
 AC_SUBST([ALL_LINGUAS])
diff --git a/data/guake-autoconfigure.desktop.in b/data/guake-autoconfigure.desktop.in
index b91aac515..de00e5a97 100644
--- a/data/guake-autoconfigure.desktop.in
+++ b/data/guake-autoconfigure.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Autoconfigure Guake
-Comment=Autoconfigure the start of the Guake terminal
+_Name=Autoconfigure Guake
+_Comment=Autoconfigure the start of the Guake terminal
 TryExec=~/scripts/guake-autoconfigure.sh
 Exec=~/scripts/guake-autoconfigure.sh
 Icon=/usr/share/pixmaps/guake/guake.png
diff --git a/data/guake-autostart.desktop.in b/data/guake-autostart.desktop.in
index fd26c537a..933c60c4a 100644
--- a/data/guake-autostart.desktop.in
+++ b/data/guake-autostart.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Autostart Guake Terminal
-Comment=Automatically start Guake terminal at login
+_Name=Autostart Guake Terminal
+_Comment=Automatically start Guake terminal at login
 TryExec=guake
 Exec=guake
 Icon=/usr/share/pixmaps/guake/guake.png
diff --git a/data/guake-prefs.desktop.in b/data/guake-prefs.desktop.in
index efc47e65d..d1fb90ffd 100644
--- a/data/guake-prefs.desktop.in
+++ b/data/guake-prefs.desktop.in
@@ -1,10 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Guake Preferences
-Name[pt_BR]=Preferências do Guake
-Comment=Configure your Guake sessions
-Comment[pt_BR]=Configurações do terminal Guake
-Comment[fr_FR]=Configurer votre session Guake
+_Name=Guake Preferences
+_Comment=Configure your Guake sessions
 TryExec=guake-prefs
 Exec=guake-prefs
 Icon=guake-prefs
@@ -13,4 +10,4 @@ Type=Application
 StartupNotify=true
 Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
 X-Desktop-File-Install-Version=0.15
-Keywords=Terminal;Utility;
+_Keywords=Terminal;Utility;
diff --git a/data/guake.desktop.in b/data/guake.desktop.in
index 199977a24..b8404fdb7 100644
--- a/data/guake.desktop.in
+++ b/data/guake.desktop.in
@@ -1,19 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Guake Terminal
-Name[pt]=Guake Terminal
-Name[pt_BR]=Guake Terminal
-Name[fr]=Guake Terminal
-Name[fr_FR]=Guake Terminal
-Comment=Use the command line in a Quake-like terminal
-Comment[pt]=Utilizar a linha de comando em um terminal estilo Quake
-Comment[pt_BR]=Utilizar a linha de comando em um terminal estilo Quake
-Comment[fr]=Utilisez la ligne de commande comme dans un terminal quake
-Comment[fr_FR]=Utilisez la ligne de commande comme dans un terminal quake
+_Name=Guake Terminal
+_Comment=Use the command line in a Quake-like terminal
 TryExec=guake
 Exec=guake
 Icon=guake
 Type=Application
 Categories=GNOME;GTK;System;Utility;TerminalEmulator;
 StartupNotify=true
-Keywords=Terminal;Utility;
+_Keywords=Terminal;Utility;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 278018e3e..ab8de5418 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,12 @@
 [encoding: UTF-8]
 data/about.glade
-data/guake.glade
-data/prefs.glade
+data/guake-autoconfigure.desktop.in
+data/guake-autostart.desktop.in
 data/guake.desktop.in
+data/guake.glade
 data/guake-prefs.desktop.in
-guake/dbusiface.py
-guake/main.py
-guake/prefs.py
-guake/common.py
-guake/notifier.py
+data/prefs.glade
+src/guake/gconfhandler.py
+src/guake/guake_app.py
+src/guake/main.py
+src/guake/prefs.py
diff --git a/po/cs_CZ.po b/po/cs.po
similarity index 100%
rename from po/cs_CZ.po
rename to po/cs.po
diff --git a/po/nb_NO.po b/po/nb.po
similarity index 100%
rename from po/nb_NO.po
rename to po/nb.po
diff --git a/po/uk_UA.po b/po/uk.po
similarity index 100%
rename from po/uk_UA.po
rename to po/uk.po