diff --git a/openboxlogout/locale/en/LC_MESSAGES/cb-openbox-logout.mo b/openboxlogout/locale/en/LC_MESSAGES/cb-openbox-logout.mo
deleted file mode 100644
index 743828a..0000000
Binary files a/openboxlogout/locale/en/LC_MESSAGES/cb-openbox-logout.mo and /dev/null differ
diff --git a/openboxlogout/locale/en_GB/LC_MESSAGES/openboxlogout.mo b/openboxlogout/locale/en_GB/LC_MESSAGES/openboxlogout.mo
new file mode 100644
index 0000000..1e0c688
Binary files /dev/null and b/openboxlogout/locale/en_GB/LC_MESSAGES/openboxlogout.mo differ
diff --git a/openboxlogout/messages.pot b/openboxlogout/messages.pot
index 1b46f7d..7ad668d 100644
--- a/openboxlogout/messages.pot
+++ b/openboxlogout/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-17 23:05+0000\n"
+"POT-Creation-Date: 2009-01-17 23:14+0000\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"
diff --git a/openboxlogout/pofiles/en.po b/openboxlogout/pofiles/openboxlogout_en_GB.po
similarity index 94%
rename from openboxlogout/pofiles/en.po
rename to openboxlogout/pofiles/openboxlogout_en_GB.po
index 24a60f3..9a8979f 100644
--- a/openboxlogout/pofiles/en.po
+++ b/openboxlogout/pofiles/openboxlogout_en_GB.po
@@ -26,4 +26,4 @@ msgid "lock"
 msgstr "Lock Screen"
 
 msgid "switch"
-msgstr "Switch User
+msgstr "Switch User"
diff --git a/tools/mki18n.py b/tools/mki18n.py
index 0d4cfb7..e1cba7c 100755
--- a/tools/mki18n.py
+++ b/tools/mki18n.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/python
 # -*- coding: iso-8859-1 -*-
 # 
 #   PYTHON MODULE:     MKI18N.PY
@@ -232,19 +232,19 @@ def makeMO(applicationDirectoryPath,targetDir='./locale',applicationDomain=None,
         applicationName = applicationDomain
     currentDir = os.getcwd()
     os.chdir(applicationDirectoryPath)
-
     languageDict = getlanguageDict()
 
     for langCode in languageDict.keys():
         if (langCode == 'en') and (forceEnglish==0):
             pass
-        else:
-            langPOfileName = "%s_%s.po" % (applicationName , langCode)
+        else:
+            print langCode
+            langPOfileName = "./pofiles/%s_%s.po" % (applicationName , langCode)
             if os.path.exists(langPOfileName):
                 mo_targetDir = "%s/%s/LC_MESSAGES" % (targetDir,langCode) 
                 if not os.path.exists(mo_targetDir):
                     mkdir(mo_targetDir)
-                cmd = 'msgfmt --output-file="%s/%s.mo" "%s_%s.po"' % (mo_targetDir,applicationName,applicationName,langCode)
+                cmd = 'msgfmt --output-file="%s/%s.mo" "%s"' % (mo_targetDir,applicationName, langPOfileName)
                 if verbose: print cmd
                 os.system(cmd)
     os.chdir(currentDir)