[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 209/473: Improve handling of translations.

noreply at xfce.org noreply at xfce.org
Mon Feb 16 23:56:19 CET 2015


This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 66efb64ec1ab7d529f644b9ab7447f1f3cf2ff3a
Author: Graeme Gott <graeme at gottcode.org>
Date:   Thu Oct 31 17:16:59 2013 -0400

    Improve handling of translations.
---
 CMakeLists.txt                                     |    3 -
 panel-plugin/whiskermenu.desktop                   |    3 +
 po/CMakeLists.txt                                  |   37 +--
 po/{ar/xfce4-whiskermenu-plugin.po => ar.po}       |  323 ++++++++++----------
 po/ar/CMakeLists.txt                               |    1 -
 po/{bg/xfce4-whiskermenu-plugin.po => bg.po}       |  314 +++++++++----------
 po/bg/CMakeLists.txt                               |    1 -
 po/{ca/xfce4-whiskermenu-plugin.po => ca.po}       |  314 +++++++++----------
 po/ca/CMakeLists.txt                               |    1 -
 po/{cs/xfce4-whiskermenu-plugin.po => cs.po}       |  320 +++++++++----------
 po/cs/CMakeLists.txt                               |    1 -
 po/{da/xfce4-whiskermenu-plugin.po => da.po}       |  317 +++++++++----------
 po/da/CMakeLists.txt                               |    1 -
 po/{de/xfce4-whiskermenu-plugin.po => de.po}       |  314 +++++++++----------
 po/de/CMakeLists.txt                               |    1 -
 po/{el/xfce4-whiskermenu-plugin.po => el.po}       |  321 +++++++++----------
 po/el/CMakeLists.txt                               |    1 -
 po/{en_GB/xfce4-whiskermenu-plugin.po => en_GB.po} |  309 ++++++++++---------
 po/en_GB/CMakeLists.txt                            |    1 -
 po/{es/xfce4-whiskermenu-plugin.po => es.po}       |  314 +++++++++----------
 po/es/CMakeLists.txt                               |    1 -
 po/{et/xfce4-whiskermenu-plugin.po => et.po}       |  300 +++++++++---------
 po/et/CMakeLists.txt                               |    1 -
 po/{fi/xfce4-whiskermenu-plugin.po => fi.po}       |  314 +++++++++----------
 po/fi/CMakeLists.txt                               |    1 -
 po/{fr/xfce4-whiskermenu-plugin.po => fr.po}       |  318 +++++++++----------
 po/fr/CMakeLists.txt                               |    1 -
 po/{he/xfce4-whiskermenu-plugin.po => he.po}       |  314 +++++++++----------
 po/he/CMakeLists.txt                               |    1 -
 po/{hr/xfce4-whiskermenu-plugin.po => hr.po}       |  317 +++++++++----------
 po/hr/CMakeLists.txt                               |    1 -
 po/{hu/xfce4-whiskermenu-plugin.po => hu.po}       |  320 +++++++++----------
 po/hu/CMakeLists.txt                               |    1 -
 po/{id/xfce4-whiskermenu-plugin.po => id.po}       |  320 +++++++++----------
 po/id/CMakeLists.txt                               |    1 -
 po/{it/xfce4-whiskermenu-plugin.po => it.po}       |  314 +++++++++----------
 po/it/CMakeLists.txt                               |    1 -
 po/{ja/xfce4-whiskermenu-plugin.po => ja.po}       |  316 +++++++++----------
 po/ja/CMakeLists.txt                               |    1 -
 po/{kk/xfce4-whiskermenu-plugin.po => kk.po}       |  315 +++++++++----------
 po/kk/CMakeLists.txt                               |    1 -
 po/{ms/xfce4-whiskermenu-plugin.po => ms.po}       |  314 +++++++++----------
 po/ms/CMakeLists.txt                               |    1 -
 po/{nb/xfce4-whiskermenu-plugin.po => nb.po}       |  314 +++++++++----------
 po/nb/CMakeLists.txt                               |    1 -
 po/{nl/xfce4-whiskermenu-plugin.po => nl.po}       |  315 +++++++++----------
 po/nl/CMakeLists.txt                               |    1 -
 po/{pl/xfce4-whiskermenu-plugin.po => pl.po}       |  317 +++++++++----------
 po/pl/CMakeLists.txt                               |    1 -
 po/{pt/xfce4-whiskermenu-plugin.po => pt.po}       |  314 +++++++++----------
 po/pt/CMakeLists.txt                               |    1 -
 po/{pt_BR/xfce4-whiskermenu-plugin.po => pt_BR.po} |  314 +++++++++----------
 po/pt_BR/CMakeLists.txt                            |    1 -
 po/{ro/xfce4-whiskermenu-plugin.po => ro.po}       |  317 +++++++++----------
 po/ro/CMakeLists.txt                               |    1 -
 po/{ru/xfce4-whiskermenu-plugin.po => ru.po}       |  317 +++++++++----------
 po/ru/CMakeLists.txt                               |    1 -
 po/{sk/xfce4-whiskermenu-plugin.po => sk.po}       |  314 +++++++++----------
 po/sk/CMakeLists.txt                               |    1 -
 .../xfce4-whiskermenu-plugin.po => sr at latin.po}    |  317 +++++++++----------
 po/sr at latin/CMakeLists.txt                         |    1 -
 po/{sv/xfce4-whiskermenu-plugin.po => sv.po}       |  320 +++++++++----------
 po/sv/CMakeLists.txt                               |    1 -
 po/{tr/xfce4-whiskermenu-plugin.po => tr.po}       |  320 +++++++++----------
 po/tr/CMakeLists.txt                               |    1 -
 po/uk.po                                           |  239 +++++++++++++++
 po/uk/CMakeLists.txt                               |    1 -
 po/uk/xfce4-whiskermenu-plugin.po                  |  228 --------------
 po/update-po.sh                                    |   45 +++
 po/{uz/xfce4-whiskermenu-plugin.po => uz.po}       |  314 +++++++++----------
 po/uz/CMakeLists.txt                               |    1 -
 po/{vi/xfce4-whiskermenu-plugin.po => vi.po}       |  320 +++++++++----------
 po/vi/CMakeLists.txt                               |    1 -
 po/xfce4-whiskermenu-plugin.pot                    |  219 ++++++-------
 update-po.sh                                       |    8 -
 75 files changed, 5716 insertions(+), 5521 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71f17fd..e548db9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,4 @@
 cmake_minimum_required(VERSION 2.8)
-if(${CMAKE_VERSION} VERSION_LESS "2.8.8")
-	cmake_policy(SET CMP0002 OLD)
-endif()
 
 project(whiskermenu)
 
diff --git a/panel-plugin/whiskermenu.desktop b/panel-plugin/whiskermenu.desktop
index a7bd403..c1b4949 100644
--- a/panel-plugin/whiskermenu.desktop
+++ b/panel-plugin/whiskermenu.desktop
@@ -9,7 +9,9 @@ Name[cs]=Whisker Menu
 Name[da]=Whisker Menu
 Name[de]=Whisker Menü
 Name[el]=Μενού Whisker
+Name[en_GB]=Whisker Menu
 Name[es]=Menú Whisker
+Name[et]=Whisker Menüü
 Name[fi]=Whisker-valikko
 Name[fr]=Menu Whisker
 Name[he]=תפריט זיף
@@ -41,6 +43,7 @@ Comment[cs]=Ukázat menu pro snadný přístup k nainstalovaným aplikacím
 Comment[da]=Vis en menu for hurtig adgang til applikationer
 Comment[de]=Zeige ein Menü um installierte Programme einfach zugänglich zu machen
 Comment[el]=Εμφάνιση ενός μενού για την γρήγορη πρόσβαση στις εγκατεστημένες εφαρμογές.
+Comment[en_GB]=Show a menu to easily access installed applications
 Comment[es]=Muestra un menú para acceder fácilmente a las aplicaciones instaladas
 Comment[fi]=Näytä valikko, josta on helppo pääsy asennettuihin ohjelmiin
 Comment[fr]=Affiche un menu pour accéder facilement aux applications installées
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index ca7634b..c2871de 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,36 +1,3 @@
 find_package(Gettext REQUIRED)
-
-add_subdirectory(ar)
-add_subdirectory(bg)
-add_subdirectory(ca)
-add_subdirectory(cs)
-add_subdirectory(da)
-add_subdirectory(de)
-add_subdirectory(el)
-add_subdirectory(en_GB)
-add_subdirectory(es)
-add_subdirectory(et)
-add_subdirectory(fi)
-add_subdirectory(fr)
-add_subdirectory(he)
-add_subdirectory(hr)
-add_subdirectory(hu)
-add_subdirectory(id)
-add_subdirectory(it)
-add_subdirectory(ja)
-add_subdirectory(kk)
-add_subdirectory(ms)
-add_subdirectory(nb)
-add_subdirectory(nl)
-add_subdirectory(pl)
-add_subdirectory(pt)
-add_subdirectory(pt_BR)
-add_subdirectory(ro)
-add_subdirectory(ru)
-add_subdirectory(sk)
-add_subdirectory(sr at latin)
-add_subdirectory(sv)
-add_subdirectory(tr)
-add_subdirectory(uk)
-add_subdirectory(uz)
-add_subdirectory(vi)
+file(GLOB _po_files *.po)
+GETTEXT_CREATE_TRANSLATIONS(xfce4-whiskermenu-plugin.pot ALL ${_po_files})
diff --git a/po/ar/xfce4-whiskermenu-plugin.po b/po/ar.po
similarity index 58%
rename from po/ar/xfce4-whiskermenu-plugin.po
rename to po/ar.po
index ee3775e..19c3704 100644
--- a/po/ar/xfce4-whiskermenu-plugin.po
+++ b/po/ar.po
@@ -6,229 +6,236 @@
 # Karim Oulad Chalha <herr.linux88 at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-08-07 15:21+0000\n"
 "Last-Translator: Karim Oulad Chalha <herr.linux88 at gmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ar/)\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "كل"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "أضف إلى سطح المكتب"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "قائمة Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "أضف إلى المفضلات"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "مظهر"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "أضف إلى الشريط"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "زر الشريط"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "كل"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "سلوك"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "كل الإعدادات"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "قائمة التطبيقات"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "إختر أيقونة"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "_حجم أيقونة الصنف:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "عرض التطبيقات حسب _الإسم"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "محو المستعملة حديثا"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "عرض _وصف التطبيقات"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "عر_ض:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "فشل تنفيذ الأمر \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "ح_جم أيقونة العنصر:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "فشل إغلاق الشاشة."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "_حجم أيقونة الصنف:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "فشل تسجيل الخروج."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "عر_ض:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "فشل فتح مدير الإعدادات."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "مفضلات"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "أيقونة"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "عنوان"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "أيقونة و عنوان"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "عن_وان:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_أيقونة:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "تبديل الأصناف ح_سب الترفيف"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "ح_جم أيقونة العنصر:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "كبير"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "أكبر"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "كل الإعدادات"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "قفل الشاشة"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "قفل الشاشة"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "تسجيل الخروج"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "تسجيل الخروج"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "رتب أبجديا أ-ي"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "عادي"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "رتب أبجديا ي-أ"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "صغير جدا"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "أصغر"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "مستعملة حديثا"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "صغير"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "حذف من المفضلات"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "عادي"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "إختر أيقونة"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "كبير"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "عرض القائمة لوصول إلى التطبيقات المثبتة بكل سهولة"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "أكبر"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "عرض _وصف التطبيقات"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "كبير جدا"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "عرض التطبيقات حسب _الإسم"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "فشل تنفيذ الأمر \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "صغير"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "كل الإعدادات"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "أصغر"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "قفل الشاشة"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "رتب أبجديا أ-ي"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "تسجيل الخروج"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "رتب أبجديا ي-أ"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "مفضلات"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "تبديل الأصناف ح_سب الترفيف"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "مستعملة حديثا"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "عنوان"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "فشل فتح مدير الإعدادات."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "عاجز عن إضافة المطلقة إلى سطح المكتب."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "فشل إغلاق الشاشة."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "عاجز عن إضافة المطلقة إلى الشريط."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "فشل تسجيل الخروج."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "كبير جدا"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "أضف إلى المفضلات"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "صغير جدا"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "حذف من المفضلات"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "قائمة Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "أضف إلى سطح المكتب"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "مظهر"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "أضف إلى الشريط"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "سلوك"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "عاجز عن إضافة المطلقة إلى سطح المكتب."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "عاجز عن إضافة المطلقة إلى الشريط."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_أيقونة:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "قائمة التطبيقات"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "زر الشريط"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "محو المستعملة حديثا"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "كل الإعدادات"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "عن_وان:"
diff --git a/po/ar/CMakeLists.txt b/po/ar/CMakeLists.txt
deleted file mode 100644
index 3058df3..0000000
--- a/po/ar/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(ar ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/bg/xfce4-whiskermenu-plugin.po b/po/bg.po
similarity index 63%
rename from po/bg/xfce4-whiskermenu-plugin.po
rename to po/bg.po
index 2b124f7..6406bd7 100644
--- a/po/bg/xfce4-whiskermenu-plugin.po
+++ b/po/bg.po
@@ -6,223 +6,229 @@
 # cybercop <cybercop_montana at abv.bg>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-20 15:43+0000\n"
 "Last-Translator: cybercop <cybercop_montana at abv.bg>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/bg/)\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Всички"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Добавяне към Работният плот"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Меню"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Добавяне към Любими"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "Външен вид"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Добавяне в панела"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Бутон в панела"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Всички"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "Поведение"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Всички настройки"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "Команди"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Меню на програмите"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Избор на икона"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Размер на иконите на категориите:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Показване на програмите по имена"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Изчисти последно използваните"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Показване на програмите по описание"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Покажи:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Полето за търсене да се намира след бутона в панела"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Покажи последно използваните по подразбиране"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Командите да се намират след полето за търсене"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Неуспешно изпълнение на команда \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Размер на иконите на елементите:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Неуспешно заключване на екрана."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Размер на иконите на категориите:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Неуспешно излизане."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Покажи:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Неуспешно отваряне на мениджъра на настройките."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Любими"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Икона"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Заглавие"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Икона и заглавие"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "Заглавие:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Покажи любимите в последно използваните"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "Икона:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Размер на иконите на елементите:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Смяна на категориите при посочване"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Голяма"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "По- голяма"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Йерархия на зареждане на менюто"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Покажи любимите в последно използваните"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Покажи последно използваните по подразбиране"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "Настройки:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Заключване на екрана"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Заключване на екрана:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Изход"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Изход:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Сортиране по азбучен ред от А-Я"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Нормална"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Сортиране по азбучен ред от Я-А"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Полето за търсене да се намира след бутона в панела"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Много малка"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Командите да се намират след полето за търсене"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "По- малка"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Последно използвани"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Малка"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Премахване от Любими"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Нормална"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Избор на икона"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Голяма"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Показване на меню за лесен достъп до инсталираните приложения"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "По- голяма"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Показване на програмите по описание"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Много голяма"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Показване на програмите по имена"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Неуспешно изпълнение на команда \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Малка"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Всички настройки"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "По- малка"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Заключване на екрана"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Сортиране по азбучен ред от А-Я"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Изход"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Сортиране по азбучен ред от Я-А"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Любими"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Смяна на категориите при посочване"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Последно използвани"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Заглавие"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Неуспешно отваряне на мениджъра на настройките."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Неуспешно добавяне на стартер върху работният плот."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Неуспешно заключване на екрана."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Неуспешно добавяне на стартер в панела."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Неуспешно излизане."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Много голяма"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Добавяне към Любими"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Много малка"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Премахване от Любими"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Меню"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Добавяне към Работният плот"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "Външен вид"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Добавяне в панела"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "Поведение"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Неуспешно добавяне на стартер върху работният плот."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "Команди"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Неуспешно добавяне на стартер в панела."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "Икона:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Меню на програмите"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Бутон в панела"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Изчисти последно използваните"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "Настройки:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "Заглавие:"
diff --git a/po/bg/CMakeLists.txt b/po/bg/CMakeLists.txt
deleted file mode 100644
index 9b6be37..0000000
--- a/po/bg/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(bg ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/ca/xfce4-whiskermenu-plugin.po b/po/ca.po
similarity index 59%
rename from po/ca/xfce4-whiskermenu-plugin.po
rename to po/ca.po
index 27f1dfb..c227241 100644
--- a/po/ca/xfce4-whiskermenu-plugin.po
+++ b/po/ca.po
@@ -7,223 +7,229 @@
 # oriolfa <oriolfa at ono.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-30 03:44+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitoschido at ubuntu.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Totes"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Afegeix a l’escriptori"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menú Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Afegeix a les favorites"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Aparença"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Afegeix al panell"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Botó del _panell"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Totes"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Comportament"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Tota la configuració"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Ordres"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menú d’aplicacions"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Trieu una icona"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Mida d’icona de la categ_oria:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Ordena les aplicacions per _nom"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Neteja els elements recents"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Mostra la _descripció de les aplicacions"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Mo_stra:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "_Situa el quadre de cerca prop del botó del panell"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Mostra les _usades recentment per defecte"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "S_itua les ordres prop del quadre de cerca"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "S’ha produït un error en executar l’ordre «%s»."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Mida d’icona de l’ele_ment:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "S’ha produït un error en blocar la pantalla."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Mida d’icona de la categ_oria:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "S’ha produït un error en tancar la sessió."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Mo_stra:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "S’ha produït un error en obrir el gestor de configuració."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favorits"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Títol"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icona i títol"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Títol:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Inclou les _favorites a les usades recentment"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Icona:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Mida d’icona de l’ele_ment:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Canvia de categoria en a_puntar amb el ratolí"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Gran"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Més gran"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Càrrega la je_rarquia dels menús"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Inclou les _favorites a les usades recentment"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Mostra les _usades recentment per defecte"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Paràmetres:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Bloca la pantalla"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Bloca la _pantalla:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Finalitza la sessió"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Surt de la sessió:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Ordena alfabèticament A–Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Ordena alfabèticament Z–A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "_Situa el quadre de cerca prop del botó del panell"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Molt petit"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "S_itua les ordres prop del quadre de cerca"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Més petit"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Recents"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Petit"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Suprimeix de les favorites"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Trieu una icona"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Gran"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Mostra un menú per accedir fàcilment a les aplicacions instal·lades"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Més gran"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Mostra la _descripció de les aplicacions"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Molt gran"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Ordena les aplicacions per _nom"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "S’ha produït un error en executar l’ordre «%s»."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Petit"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Tota la configuració"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Més petit"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Bloca la pantalla"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Ordena alfabèticament A–Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Finalitza la sessió"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Ordena alfabèticament Z–A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favorits"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Canvia de categoria en a_puntar amb el ratolí"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Recents"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Títol"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "S’ha produït un error en obrir el gestor de configuració."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "No s’ha pogut afegir el llançador a l’escriptori."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "S’ha produït un error en blocar la pantalla."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "No s’ha pogut afegir el llançador al panell."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "S’ha produït un error en tancar la sessió."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Molt gran"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Afegeix a les favorites"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Molt petit"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Suprimeix de les favorites"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menú Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Afegeix a l’escriptori"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Aparença"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Afegeix al panell"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Comportament"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "No s’ha pogut afegir el llançador a l’escriptori."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Ordres"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "No s’ha pogut afegir el llançador al panell."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Icona:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menú d’aplicacions"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Botó del _panell"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Neteja els elements recents"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Paràmetres:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Títol:"
diff --git a/po/ca/CMakeLists.txt b/po/ca/CMakeLists.txt
deleted file mode 100644
index 24a2904..0000000
--- a/po/ca/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(ca ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/cs/xfce4-whiskermenu-plugin.po b/po/cs.po
similarity index 57%
rename from po/cs/xfce4-whiskermenu-plugin.po
rename to po/cs.po
index f1ac951..624dcf8 100644
--- a/po/cs/xfce4-whiskermenu-plugin.po
+++ b/po/cs.po
@@ -6,229 +6,235 @@
 # Riftyful <riftyful at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-08-21 15:50+0000\n"
 "Last-Translator: Riftyful <riftyful at gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Vše"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Přidat na Plochu"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Přidat k Oblíbeným"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Vzhled"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Přidat na Panel"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Tlačítko Panelu"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Vše"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Chování"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Všechna Nastavení"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu Aplikací"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Vyberte Ikonu"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Velikost ikon kateg_orií:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Ukázat aplikace podle _Jména"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Vyčistit Nedávno Použité"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Ukázat _popisy aplikací"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "_Zobrazení:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Nepodařilo se vykonat příkaz \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "_Velikost ikon položek:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Nepodařilo se uzamknout obrazovku."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Velikost ikon kateg_orií:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Nepodařilo se odhlásit."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "_Zobrazení:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Nepodařilo se otevřít správce nastavení."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Oblíbené"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Název"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikona a název"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "Náz_ev:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikona:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Přepínat _kategorie najetím kurzoru"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "_Velikost ikon položek:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Velké"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Větší"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Všechna Nastavení"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Uzamknout Obrazovku"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Uzamknout Obrazovku"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Odhlásit se"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Odhlásit se"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Seřadit Abecedně A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normální"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Seřadit Abecedně Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Velmi Malé"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Menší"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Nedávno použité"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Malé"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Odebrat z Oblíbených"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normální"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Vyberte Ikonu"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Velké"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Ukázat menu pro snadný přístup k nainstalovaným aplikacím"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Větší"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Ukázat _popisy aplikací"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Velmi Velké"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Ukázat aplikace podle _Jména"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Nepodařilo se vykonat příkaz \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Malé"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Všechna Nastavení"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Menší"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Uzamknout Obrazovku"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Seřadit Abecedně A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Odhlásit se"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Seřadit Abecedně Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Oblíbené"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Přepínat _kategorie najetím kurzoru"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Nedávno použité"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Název"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Nepodařilo se otevřít správce nastavení."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Nelze přidat spouštěč na plochu."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Nepodařilo se uzamknout obrazovku."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Nelze přidat spouštěč na panel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Nepodařilo se odhlásit."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Velmi Velké"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Přidat k Oblíbeným"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Velmi Malé"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Odebrat z Oblíbených"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Přidat na Plochu"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Vzhled"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Přidat na Panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Chování"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Nelze přidat spouštěč na plochu."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Nelze přidat spouštěč na panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikona:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu Aplikací"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Tlačítko Panelu"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Vyčistit Nedávno Použité"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Všechna Nastavení"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "Náz_ev:"
diff --git a/po/cs/CMakeLists.txt b/po/cs/CMakeLists.txt
deleted file mode 100644
index a852105..0000000
--- a/po/cs/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(cs ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/da/xfce4-whiskermenu-plugin.po b/po/da.po
similarity index 58%
rename from po/da/xfce4-whiskermenu-plugin.po
rename to po/da.po
index 832329d..bf9fa7a 100644
--- a/po/da/xfce4-whiskermenu-plugin.po
+++ b/po/da.po
@@ -7,223 +7,230 @@
 # Morten Juhl-Johansen Zölde-Fejér <morten at writtenandread.net>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-27 16:23+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten at writtenandread.net>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/da/)\n"
+"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten at writtenandread."
+"net>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Alt"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Tilføj til skrivebord"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Tilføj til favoritter"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Udseende"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Tilføj til panel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Panelknap"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Alt"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Opførsel"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Alle indstillinger"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Kommandoer"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Applikationsmenu"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Vælg et ikon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kateg_ori ikonstørrelse"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Vis applikationer efter _navn"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Nulstil senest anvendte"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Vis applikationers _beskrivelser"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "_skærm"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Placer _søgning ved siden af panelknap"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Vis _senest anvendte som standard"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Placer kommandoer ved siden af søgning"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Kunne ikke udføre kommandoen \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Valg_mulighed ikonstørrelse"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Kunne ikke låse skærmen."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kateg_ori ikonstørrelse"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Kunne ikke logge ud"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "_skærm"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Kunne ikke åbne indstillings-håndtering"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoritter"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Titel"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikon og titel"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Medtag _favoritter blandt senest anvendte"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Valg_mulighed ikonstørrelse"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Skift kategori ved at flytte musemarkør"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Stor"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Større"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Indlæs menuers hie_rarki"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Medtag _favoritter blandt senest anvendte"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Vis _senest anvendte som standard"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Indstillinger"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Lås skærm"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Lås _skærm:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Log ud"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Log _ud:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sorter alfabetisk A-Å"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sort alfabetisk Å-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Placer _søgning ved siden af panelknap"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Meget lille"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Placer kommandoer ved siden af søgning"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Mindre"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Senest anvendt"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Lille"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Fjern fra favoritter"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Vælg et ikon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Stor"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Vis en menu for hurtig adgang til applikationer"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Større"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Vis applikationers _beskrivelser"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Meget stor"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Vis applikationer efter _navn"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Kunne ikke udføre kommandoen \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Lille"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Alle indstillinger"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Mindre"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Lås skærm"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sorter alfabetisk A-Å"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Log ud"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sort alfabetisk Å-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoritter"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Skift kategori ved at flytte musemarkør"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Senest anvendt"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Titel"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Kunne ikke åbne indstillings-håndtering"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Kunne ikke tilføje opstartsikon til skrivebordet."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Kunne ikke låse skærmen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Kunne ikke tilføje opstartsikon til panelet"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Kunne ikke logge ud"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Meget stor"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Tilføj til favoritter"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Meget lille"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Fjern fra favoritter"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Tilføj til skrivebord"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Udseende"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Tilføj til panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Opførsel"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Kunne ikke tilføje opstartsikon til skrivebordet."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Kommandoer"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Kunne ikke tilføje opstartsikon til panelet"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Applikationsmenu"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Panelknap"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Nulstil senest anvendte"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Indstillinger"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Titel:"
diff --git a/po/da/CMakeLists.txt b/po/da/CMakeLists.txt
deleted file mode 100644
index 634d433..0000000
--- a/po/da/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(da ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/de/xfce4-whiskermenu-plugin.po b/po/de.po
similarity index 58%
rename from po/de/xfce4-whiskermenu-plugin.po
rename to po/de.po
index e6976dc..4b309e5 100644
--- a/po/de/xfce4-whiskermenu-plugin.po
+++ b/po/de.po
@@ -6,223 +6,229 @@
 # manjarolinux <philm at manjaro.org>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-18 18:29+0000\n"
 "Last-Translator: manjarolinux <philm at manjaro.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Alle"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Zum Desktop hinzufügen"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menü"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Zu Favoriten hinzufügen"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Aussehen"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Zum Panel hinzufügen"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Panel-Knopf"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Alle"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Verhalten"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Alle Einstellungen"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Befehle"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Programm Menü"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Wähle ein Symbol"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kateg_oriegröße:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Zeige Programme bei _Namen"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Lösche zuletzt benutzt"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Zeige Programm _Beschreibungen"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Di_splay:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Positioniere _Sucheintrag neben Panel-Knopf"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Zeige zuletzt ben_utzt standardmäßig an"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Positioniere Kommandos neben Such_eintrag"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Konnte Kommando \"%s\" nicht ausführen."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Sy_mbolgröße:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Konnte Bildschirm nicht sperren."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kateg_oriegröße:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Konnte nicht abmelden."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Di_splay:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Konnte Einstellungs-Manager nicht starten."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoriten"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Symbol"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Titel"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Symbol und Titel"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Beziehe _Favorieten in zuletzt benutzt mit ein"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Symbol:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Sy_mbolgröße:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Wechsel Kategorien mit sc_hweben"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Groß"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Größer"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Lademenü-Hie_rarchie"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Beziehe _Favorieten in zuletzt benutzt mit ein"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Zeige zuletzt ben_utzt standardmäßig an"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "Ein_stellungen:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Bildschirm sperren"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Sperre Bild_schirm:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Abmelden"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Abmelden:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sortiere alphabetisch A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sortiere alphabetisch Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Positioniere _Sucheintrag neben Panel-Knopf"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Sehr klein"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Positioniere Kommandos neben Such_eintrag"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Kleiner"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Zuletzt genutzt"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Klein"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Von Favoriten entfernen"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Wähle ein Symbol"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Groß"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Zeige ein Menü um installierte Programme einfach zugänglich zu machen"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Größer"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Zeige Programm _Beschreibungen"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Sehr groß"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Zeige Programme bei _Namen"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Konnte Kommando \"%s\" nicht ausführen."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Klein"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Alle Einstellungen"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Kleiner"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Bildschirm sperren"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sortiere alphabetisch A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Abmelden"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sortiere alphabetisch Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoriten"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Wechsel Kategorien mit sc_hweben"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Zuletzt genutzt"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Titel"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Konnte Einstellungs-Manager nicht starten."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Konnte Launcher nicht zum Desktop hinzufügen."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Konnte Bildschirm nicht sperren."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Konnte Launcher nicht zum Panel hinzufügen."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Konnte nicht abmelden."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Sehr groß"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Zu Favoriten hinzufügen"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Sehr klein"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Von Favoriten entfernen"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menü"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Zum Desktop hinzufügen"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Aussehen"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Zum Panel hinzufügen"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Verhalten"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Konnte Launcher nicht zum Desktop hinzufügen."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Befehle"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Konnte Launcher nicht zum Panel hinzufügen."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Symbol:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Programm Menü"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Panel-Knopf"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Lösche zuletzt benutzt"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "Ein_stellungen:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Titel:"
diff --git a/po/de/CMakeLists.txt b/po/de/CMakeLists.txt
deleted file mode 100644
index 01a9f28..0000000
--- a/po/de/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(de ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/el/xfce4-whiskermenu-plugin.po b/po/el.po
similarity index 62%
rename from po/el/xfce4-whiskermenu-plugin.po
rename to po/el.po
index bb0b9e6..07b133f 100644
--- a/po/el/xfce4-whiskermenu-plugin.po
+++ b/po/el.po
@@ -7,229 +7,236 @@
 # Γιάννης Ανθυμίδης <yannanth at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-08-23 19:51+0000\n"
 "Last-Translator: Γιάννης Ανθυμίδης <yannanth at gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/el/)\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Όλα"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Προσθήκη στην Επιφάνειά Εργασίας"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Μενού Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Προσθήκη στα Αγαπημένα"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Εμφάνιση"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Προσθήκη στο Ταμπλό"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Κουμπί ταμπλό"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Όλα"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Συμπεριφορά"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Όλες οι Επιλογές"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Μενού Εφαρμογών"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Επιλογή Εικονιδίου"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Μέγεθος εικονιδίων _κατηγοριών:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Προβολή εφαρμογών κατά ό_νομα"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Εκκαθάριση Πρόσφατα Χρησιμοποιημένων"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Εμφάνιση περιγραφής _εφαρμογών"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Εμ_φάνιση:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Αποτυχία εκτέλεσης εντολής «%s»."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Μέγεθος εικονιδίων _αντικειμένων:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Αποτυχία κλειδώματος οθόνης."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Μέγεθος εικονιδίων _κατηγοριών:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Αποτυχία αποσύνδεσης."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Εμ_φάνιση:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Αποτυχία εκκίνησης του διαχειριστή ρυθμίσεων."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Αγαπημένα"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Εικονίδιο"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Τίτλος"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Εικονίδιο και τίτλος"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Τίτλος:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Εικονίδιο:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Αλλαγή κατηγοριών στο _πέρασμα του ποντικιού"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Μέγεθος εικονιδίων _αντικειμένων:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Μεγάλα"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Μεγαλύτερα"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Όλες οι Επιλογές"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Κλείδωμα Οθόνης"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Κλείδωμα Οθόνης"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Αποσύνδεση"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Αποσύνδεση"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Αλφαβητική Ταξινόμηση Α-Ω"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Κανονικά"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Αλφαβητική Ταξινόμηση Ω-Α"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Πολύ Μικρά"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Μικρότερα"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Χρησιμοποιήθηκαν Πρόσφατα"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Μικρά"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Αφαίρεση από τα Αγαπημένα"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Κανονικά"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Επιλογή Εικονιδίου"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Μεγάλα"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr ""
+"Εμφάνιση ενός μενού για την γρήγορη πρόσβαση στις εγκατεστημένες εφαρμογές."
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Μεγαλύτερα"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Εμφάνιση περιγραφής _εφαρμογών"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Πολύ Μεγάλα"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Προβολή εφαρμογών κατά ό_νομα"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Αποτυχία εκτέλεσης εντολής «%s»."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Μικρά"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Όλες οι Επιλογές"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Μικρότερα"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Κλείδωμα Οθόνης"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Αλφαβητική Ταξινόμηση Α-Ω"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Αποσύνδεση"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Αλφαβητική Ταξινόμηση Ω-Α"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Αγαπημένα"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Αλλαγή κατηγοριών στο _πέρασμα του ποντικιού"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Χρησιμοποιήθηκαν Πρόσφατα"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Τίτλος"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Αποτυχία εκκίνησης του διαχειριστή ρυθμίσεων."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Απέτυχε η προσθήκη εκκινητή στην επιφάνεια εργασίας."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Αποτυχία κλειδώματος οθόνης."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Απέτυχε η προσθήκη εκκινητή στο ταμπλό."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Αποτυχία αποσύνδεσης."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Πολύ Μεγάλα"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Προσθήκη στα Αγαπημένα"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Πολύ Μικρά"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Αφαίρεση από τα Αγαπημένα"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Μενού Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Προσθήκη στην Επιφάνειά Εργασίας"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Εμφάνιση"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Προσθήκη στο Ταμπλό"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Συμπεριφορά"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Απέτυχε η προσθήκη εκκινητή στην επιφάνεια εργασίας."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Απέτυχε η προσθήκη εκκινητή στο ταμπλό."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Εικονίδιο:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Μενού Εφαρμογών"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Κουμπί ταμπλό"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Εκκαθάριση Πρόσφατα Χρησιμοποιημένων"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Όλες οι Επιλογές"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Τίτλος:"
diff --git a/po/el/CMakeLists.txt b/po/el/CMakeLists.txt
deleted file mode 100644
index d808644..0000000
--- a/po/el/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(el ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/en_GB/xfce4-whiskermenu-plugin.po b/po/en_GB.po
similarity index 57%
rename from po/en_GB/xfce4-whiskermenu-plugin.po
rename to po/en_GB.po
index fb3c279..36c9161 100644
--- a/po/en_GB/xfce4-whiskermenu-plugin.po
+++ b/po/en_GB.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-09 22:00+0000\n"
 "Last-Translator: Graeme Gott <graeme at gottcode.org>\n"
 "Language-Team: \n"
@@ -17,211 +17,216 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "All"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Add to Desktop"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Add to Favourites"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Appearance"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Add to Panel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Panel Button"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "All"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Behaviour"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "All Settings"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Commands"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Applications Menu"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Select An Icon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Categ_ory icon size:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Show applications by _name"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Clear Recently Used"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Show application _descriptions"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Di_splay:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Display recently _used by default"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Position commands next to search _entry"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Failed to execute command \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Ite_m icon size:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Failed to lock screen."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Categ_ory icon size:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Failed to log out."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Di_splay:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Failed to open settings manager."
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favourites"
+
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Title"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icon and title"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Title:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Include _favourites in recently used"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Icon:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Ite_m icon size:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Switch categories by _hovering"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Large"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Larger"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Load menu hie_rarchy"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Include _favourites in recently used"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Display recently _used by default"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Settings:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Lock Screen"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Lock _Screen:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Log Out"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Log _Out:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sort Alphabetically A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sort Alphabetically Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Position _search entry next to panel button"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Very Small"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Position commands next to search _entry"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Smaller"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Recently Used"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Small"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Remove From Favourites"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Select An Icon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Large"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Show a menu to easily access installed applications"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Larger"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Show application _descriptions"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Very Large"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Show applications by _name"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Failed to execute command \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Small"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "All Settings"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Smaller"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Lock Screen"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sort Alphabetically A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Log Out"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sort Alphabetically Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favourites"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Switch categories by _hovering"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Recently Used"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Title"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Failed to open settings manager."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Unable to add launcher to desktop."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Failed to lock screen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Unable to add launcher to panel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Failed to log out."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Very Large"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Add to Favourites"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Very Small"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Remove From Favourites"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Add to Desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Appearance"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Add to Panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Behaviour"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Unable to add launcher to desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Commands"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Unable to add launcher to panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Icon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Applications Menu"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Panel Button"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Clear Recently Used"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Settings:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Title:"
diff --git a/po/en_GB/CMakeLists.txt b/po/en_GB/CMakeLists.txt
deleted file mode 100644
index 701b27e..0000000
--- a/po/en_GB/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(en_GB ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/es/xfce4-whiskermenu-plugin.po b/po/es.po
similarity index 60%
rename from po/es/xfce4-whiskermenu-plugin.po
rename to po/es.po
index 1248cb7..d949945 100644
--- a/po/es/xfce4-whiskermenu-plugin.po
+++ b/po/es.po
@@ -9,223 +9,229 @@
 # Pablo Lezaeta <prflr88 at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-30 03:35+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitoschido at ubuntu.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Todas"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Añadir al escritorio"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menú Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Añadir a las favoritas"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Apariencia"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Añadir al panel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Botón del _panel"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Todas"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Comportamiento"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Todas las configuraciones"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "Ó_rdenes"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menú de aplicaciones"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Seleccione un icono"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Tamaño de icono de las categ_orías:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Ordenar las aplicaciones por _nombre"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Limpiar elementos recientes"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Mostrar las _descripciones de las aplicaciones"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Mo_strar:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Posicionar el cuadro de _búsqueda junto al botón del panel"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Mostrar _usadas recientemente de manera predeterminada"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Posicionar las órdenes junto al _cuadro de búsqueda"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "No se pudo ejecutar la orden «%s»."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Tamaño de icono de los ele_mentos:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "No se pudo bloquear la pantalla."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Tamaño de icono de las categ_orías:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "No se pudo cerrar la sesión."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Mo_strar:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Falló la ejecución del gestor de configuración."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoritas"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icono"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Título"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icono y título"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Título:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Incluir _favoritos en la lista de usadas recientemente"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Icono:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Tamaño de icono de los ele_mentos:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Cambiar de categoría al a_puntarla con el ratón"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Grande"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Muy grande"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Cargar _jerarquía del menú"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Incluir _favoritos en la lista de usadas recientemente"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Mostrar _usadas recientemente de manera predeterminada"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Configuración:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Bloquear la pantalla"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Bloquear la _pantalla:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Cerrar la sesión"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Salir de la sesión:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Ordenar alfabéticamente de A a Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Ordenar alfabéticamente de Z a A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Posicionar el cuadro de _búsqueda junto al botón del panel"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Minúsculo"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Posicionar las órdenes junto al _cuadro de búsqueda"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Muy pequeño"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Usadas recientemente"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Pequeño"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Eliminar de las favoritas"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Seleccione un icono"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Grande"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Muestra un menú para acceder fácilmente a las aplicaciones instaladas"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Muy grande"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Mostrar las _descripciones de las aplicaciones"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Gigante"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Ordenar las aplicaciones por _nombre"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "No se pudo ejecutar la orden «%s»."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Pequeño"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Todas las configuraciones"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Muy pequeño"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Bloquear la pantalla"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Ordenar alfabéticamente de A a Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Cerrar la sesión"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Ordenar alfabéticamente de Z a A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoritas"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Cambiar de categoría al a_puntarla con el ratón"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Usadas recientemente"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Título"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Falló la ejecución del gestor de configuración."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "No se pudo añadir el lanzador al escritorio."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "No se pudo bloquear la pantalla."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "No se pudo añadir el lanzador al panel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "No se pudo cerrar la sesión."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Gigante"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Añadir a las favoritas"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Minúsculo"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Eliminar de las favoritas"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menú Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Añadir al escritorio"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Apariencia"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Añadir al panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Comportamiento"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "No se pudo añadir el lanzador al escritorio."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "Ó_rdenes"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "No se pudo añadir el lanzador al panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Icono:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menú de aplicaciones"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Botón del _panel"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Limpiar elementos recientes"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Configuración:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Título:"
diff --git a/po/es/CMakeLists.txt b/po/es/CMakeLists.txt
deleted file mode 100644
index 3383158..0000000
--- a/po/es/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(es ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/et/xfce4-whiskermenu-plugin.po b/po/et.po
similarity index 53%
rename from po/et/xfce4-whiskermenu-plugin.po
rename to po/et.po
index 2e27667..dd0ea7f 100644
--- a/po/et/xfce4-whiskermenu-plugin.po
+++ b/po/et.po
@@ -6,223 +6,231 @@
 # Asto Banko <kusmis at hot.ee>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-30 00:23+0000\n"
 "Last-Translator: Asto Banko <kusmis at hot.ee>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr ""
-
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menüü"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Lisa töölauale"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr ""
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Lisa lemmikutesse"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr ""
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Lisa paneelile"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
 msgstr ""
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Kõik sätted"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Vali ikoon"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Rakenduste menüü"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Näita programme by_name"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr ""
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Näita application _descriptions"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Puhasta hiljuti kasutatud"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Ebaõnnestus käsu käivitamisel \"%s\"."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr ""
+#: ../panel-plugin/window.cpp:100
+#, fuzzy
+msgid "Failed to lock screen."
+msgstr "Välja logimine ebaõnnestus."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Välja logimine ebaõnnestus."
+
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
 msgstr ""
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Lemmikud"
+
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikoon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr ""
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr ""
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Lisa_lemmikud hiljuti kasutatutesse"
+
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
 msgstr ""
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikoon:"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Suur"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Suurem"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Lae menüü hie_rarhia"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Lisa_lemmikud hiljuti kasutatutesse"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr ""
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Sätted:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Lukusta Ekraan"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
+#, fuzzy
 msgid "Lock _Screen:"
-msgstr ""
+msgstr "Lukusta Ekraan"
+
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Logi välja"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Logi_välja:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normaalne"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
 msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Väga väike"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Väiksem"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Hiljuti kasutatud"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Väike"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Eemalda lemmikutest"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normaalne"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Vali ikoon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Suur"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr ""
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Suurem"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Näita application _descriptions"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Väga suur"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Näita programme by_name"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Ebaõnnestus käsu käivitamisel \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Väike"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Kõik sätted"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Väiksem"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Lukusta Ekraan"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr ""
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Logi välja"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr ""
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Lemmikud"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr ""
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Hiljuti kasutatud"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr ""
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
 msgstr ""
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
 msgstr ""
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Välja logimine ebaõnnestus."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Väga suur"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Lisa lemmikutesse"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Väga väike"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Eemalda lemmikutest"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menüü"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Lisa töölauale"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr ""
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Lisa paneelile"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr ""
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
 msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikoon:"
+
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
 msgstr ""
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Rakenduste menüü"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Sätted:"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Puhasta hiljuti kasutatud"
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr ""
diff --git a/po/et/CMakeLists.txt b/po/et/CMakeLists.txt
deleted file mode 100644
index cbff865..0000000
--- a/po/et/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(et ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/fi/xfce4-whiskermenu-plugin.po b/po/fi.po
similarity index 58%
rename from po/fi/xfce4-whiskermenu-plugin.po
rename to po/fi.po
index a5bb247..aad5897 100644
--- a/po/fi/xfce4-whiskermenu-plugin.po
+++ b/po/fi.po
@@ -6,223 +6,229 @@
 # SamiPerkele <zazaamm at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-25 22:27+0000\n"
 "Last-Translator: SamiPerkele <zazaamm at gmail.com>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Kaikki"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Lisää työpöydälle"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker-valikko"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Lisää suosikkeihin"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Ulkoasu"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Lisää paneeliin"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Paneelinäppäin"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Kaikki"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Toimintatapa"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Kaikki asetukset"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Komennot"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Ohjelmavalikko"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Valitse kuvake"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kateg_orian kuvakkeen koko:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Näytä ohjelmat _nimen mukaan"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Pyyhi viimeksi käytetyt"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Näytä ohjelmien _kuvaukset"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Nä_yttö:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Sijoita _hakukenttä paneelipainikkeen viereen."
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Näytä vakiona viimeksi käytetyt"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Sijoita komennot _hakukentän viereen"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Komennon \"%s\" suorittaminen epäonnistui."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Koh_teen kuvakkeen koko"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Näytön lukitseminen epäonnistui."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kateg_orian kuvakkeen koko:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Ulos kirjautuminen epäonnistui."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Nä_yttö:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Asetustenhallinnan avaaminen epäonnistui."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Suosikit"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Kuvake"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Otsikko"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Kuvake ja otsikko"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Otsikko:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Sisällytä _suosikit viimeksi käytettyihin"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Kuvake:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Koh_teen kuvakkeen koko"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Vaihda ryhmiä _klikkaamatta"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Suuri"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Suurempi"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Lataa valikkohie_rarkia"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Sisällytä _suosikit viimeksi käytettyihin"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Näytä vakiona viimeksi käytetyt"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Asetukset:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Lukitse näyttö"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Lukitse _näyttö:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Kirjaudu ulos"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Kirjaudu _ulos:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Järjestä aakkosten mukaan A-Ö"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normaali"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Järjestä aakkosten mukaan Ö-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Sijoita _hakukenttä paneelipainikkeen viereen."
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Erittäin pieni"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Sijoita komennot _hakukentän viereen"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Pienempi"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Viimeksi käytetyt"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Pieni"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Poista suosikeista"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normaali"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Valitse kuvake"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Suuri"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Näytä valikko, josta on helppo pääsy asennettuihin ohjelmiin"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Suurempi"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Näytä ohjelmien _kuvaukset"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Erittäin suuri"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Näytä ohjelmat _nimen mukaan"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Komennon \"%s\" suorittaminen epäonnistui."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Pieni"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Kaikki asetukset"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Pienempi"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Lukitse näyttö"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Järjestä aakkosten mukaan A-Ö"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Kirjaudu ulos"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Järjestä aakkosten mukaan Ö-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Suosikit"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Vaihda ryhmiä _klikkaamatta"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Viimeksi käytetyt"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Otsikko"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Asetustenhallinnan avaaminen epäonnistui."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Työpöydälle ei voitu luoda käynnistintä."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Näytön lukitseminen epäonnistui."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Paneeliin ei voitu luoda käynnistintä."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Ulos kirjautuminen epäonnistui."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Erittäin suuri"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Lisää suosikkeihin"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Erittäin pieni"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Poista suosikeista"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker-valikko"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Lisää työpöydälle"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Ulkoasu"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Lisää paneeliin"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Toimintatapa"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Työpöydälle ei voitu luoda käynnistintä."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Komennot"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Paneeliin ei voitu luoda käynnistintä."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Kuvake:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Ohjelmavalikko"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Paneelinäppäin"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Pyyhi viimeksi käytetyt"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Asetukset:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Otsikko:"
diff --git a/po/fi/CMakeLists.txt b/po/fi/CMakeLists.txt
deleted file mode 100644
index 53236d5..0000000
--- a/po/fi/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(fi ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/fr/xfce4-whiskermenu-plugin.po b/po/fr.po
similarity index 58%
rename from po/fr/xfce4-whiskermenu-plugin.po
rename to po/fr.po
index 37299b0..75a55d1 100644
--- a/po/fr/xfce4-whiskermenu-plugin.po
+++ b/po/fr.po
@@ -8,228 +8,234 @@
 # Ennoia <ennoia11 at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-27 09:22+0000\n"
 "Last-Translator: Pingax <pingax at gmail.com>\n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/fr_FR/)\n"
+"Language-Team: French (France) (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/fr_FR/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Tout"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Ajouter au bureau"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Ajouter aux favoris"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Apparence"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Ajouter au tableau de bord"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Bouton du panneau"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Tout"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Comportement"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Tous les paramètres"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Commandes"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu des applications"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Sélectionnez une icône"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Taille des icônes des caté_gories :"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Trier les applications par _nom"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Effacer les applications récemment utilisées"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Montrer les _descriptions des applications"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Affichage"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Échec lors de l'exécution de la commande \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Taille des icônes des élé_ments :"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Échec lors du verrouillage de l'écran."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Taille des icônes des caté_gories :"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Échec lors de la déconnexion."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Affichage"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Échec lors du lancement du gestionnaire de paramètres"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoris"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icône"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Texte"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icône et texte"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Titre :"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Icône :"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "C_hanger de catégories en survolant"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Taille des icônes des élé_ments :"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Grand"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Plus grand"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Tous les paramètres"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Écran de verrouillage"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Écran de verrouillage"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Déconnexion"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Déconnexion"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Classement alphabétique croissant"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Classement alphabétique décroissant"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Très petit"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Plus petit"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Récemment utilisés"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Petit"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Retirer des favoris"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Sélectionnez une icône"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Grand"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Affiche un menu pour accéder facilement aux applications installées"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Plus grand"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Montrer les _descriptions des applications"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Très grand"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Trier les applications par _nom"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Échec lors de l'exécution de la commande \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Petit"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Tous les paramètres"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Plus petit"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Écran de verrouillage"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Classement alphabétique croissant"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Déconnexion"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Classement alphabétique décroissant"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoris"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "C_hanger de catégories en survolant"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Récemment utilisés"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Texte"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Échec lors du lancement du gestionnaire de paramètres"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Impossible d'ajouter le lanceur sur le bureau."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Échec lors du verrouillage de l'écran."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Impossible d'ajouter le lanceur dans le tableau de bord."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Échec lors de la déconnexion."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Très grand"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Ajouter aux favoris"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Très petit"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Retirer des favoris"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Ajouter au bureau"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Apparence"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Ajouter au tableau de bord"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Comportement"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Impossible d'ajouter le lanceur sur le bureau."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Commandes"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Impossible d'ajouter le lanceur dans le tableau de bord."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Icône :"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu des applications"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Bouton du panneau"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Effacer les applications récemment utilisées"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Tous les paramètres"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Titre :"
diff --git a/po/fr/CMakeLists.txt b/po/fr/CMakeLists.txt
deleted file mode 100644
index 647f943..0000000
--- a/po/fr/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(fr ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/he/xfce4-whiskermenu-plugin.po b/po/he.po
similarity index 60%
rename from po/he/xfce4-whiskermenu-plugin.po
rename to po/he.po
index d32429e..042f6f9 100644
--- a/po/he/xfce4-whiskermenu-plugin.po
+++ b/po/he.po
@@ -6,223 +6,229 @@
 # GenghisKhan <genghiskhan at gmx.ca>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-15 05:15+0000\n"
 "Last-Translator: GenghisKhan <genghiskhan at gmx.ca>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/he/)\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "כולם"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "הוסף אל תוך שולחן עבודה"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "תפריט זיף"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "הוסף אל תוך מועדפים"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "הו_פעה"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "הוסף אל תוך לוח"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_לחצן לוח"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "כולם"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "הת_נהגות"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "כל ההגדרות"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_פקודות"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "תפריט יישומים"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "בחר צלמית"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "גודל צלמית _קטגוריה:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "הצג יישומים לפי _שם"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "טהר תפריט בשימוש לאחרונה"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "הצג _תיאורי יישום"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "ת_צוגה:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "מקם רישום _חיפוש ליד לחצן לוח"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "הצג בפתיחה את ב_שימוש לאחרונה"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "מקם פקודות ליד _רישום חיפוש"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "נכשל להוציא לפועל פקודה \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "גודל צלמית _פריט:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "נכשל לנעול מרקע."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "גודל צלמית _קטגוריה:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "נכשל להתנתק."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "ת_צוגה:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "נכשל לפתוח מנהל הגדרות."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "מועדפים"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "צלמית"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "כותרת"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "צלמית וגם כותרת"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_כותרת:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "הכלל _מועדפים בתוך בשימוש לאחרונה"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_צלמית:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "גודל צלמית _פריט:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "החלף קטגוריות על ידי _ריחוף"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "גדול"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "גדול יותר"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "טען מ_דרג תפריט"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "הכלל _מועדפים בתוך בשימוש לאחרונה"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "הצג בפתיחה את ב_שימוש לאחרונה"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_הגדרות:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "נעל מרקע"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "נעל _מסך:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "התנתק"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "הת_נתק:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "מיין לפי אלף-בית א-ת"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "רגיל"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "מיין לפי אלף-בית ת-א"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "מקם רישום _חיפוש ליד לחצן לוח"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "קטן מאוד"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "מקם פקודות ליד _רישום חיפוש"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "קטן יותר"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "בשימוש לאחרונה"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "קטן"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "הסר מתוך מועדפים"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "רגיל"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "בחר צלמית"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "גדול"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "תפריט לגישה קלה ליישומים מותקנים"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "גדול יותר"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "הצג _תיאורי יישום"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "גדול מאוד"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "הצג יישומים לפי _שם"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "נכשל להוציא לפועל פקודה \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "קטן"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "כל ההגדרות"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "קטן יותר"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "נעל מרקע"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "מיין לפי אלף-בית א-ת"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "התנתק"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "מיין לפי אלף-בית ת-א"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "מועדפים"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "החלף קטגוריות על ידי _ריחוף"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "בשימוש לאחרונה"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "כותרת"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "נכשל לפתוח מנהל הגדרות."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "אין אפשרות להוסיף משגר אל תוך שולחן עבודה."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "נכשל לנעול מרקע."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "אין אפשרות להוסיף משגר אל תוך לוח."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "נכשל להתנתק."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "גדול מאוד"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "הוסף אל תוך מועדפים"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "קטן מאוד"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "הסר מתוך מועדפים"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "תפריט זיף"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "הוסף אל תוך שולחן עבודה"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "הו_פעה"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "הוסף אל תוך לוח"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "הת_נהגות"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "אין אפשרות להוסיף משגר אל תוך שולחן עבודה."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_פקודות"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "אין אפשרות להוסיף משגר אל תוך לוח."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_צלמית:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "תפריט יישומים"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_לחצן לוח"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "טהר תפריט בשימוש לאחרונה"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_הגדרות:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_כותרת:"
diff --git a/po/he/CMakeLists.txt b/po/he/CMakeLists.txt
deleted file mode 100644
index 7f818af..0000000
--- a/po/he/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(he ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/hr/xfce4-whiskermenu-plugin.po b/po/hr.po
similarity index 58%
rename from po/hr/xfce4-whiskermenu-plugin.po
rename to po/hr.po
index c3ba94b..d266fa5 100644
--- a/po/hr/xfce4-whiskermenu-plugin.po
+++ b/po/hr.po
@@ -6,223 +6,230 @@
 # ilija.culap14 <ilija.culap14 at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-13 09:52+0000\n"
 "Last-Translator: ilija.culap14 <ilija.culap14 at gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Sve"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Dodaj na Radnu površinu"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Izbornik"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Dodaj u Omiljeno"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "Izg_led"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Dodaj na ploču"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Dugm_e na ploči"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Sve"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "Pon_ašanje"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Sve Postavke"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "Nared_be"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Izbornik aplikacija"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Izaberi ikonu"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Veličin_a ikone kategorije:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Prikaži aplikacije po _imenu"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Očisti kategoriju Najčešće korišteno"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Prikazi _opis aplikacije"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Zas_lon:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Postavi _pretraživanje kraj dugmeta na ploči"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Prikaži Najčešće korišteno prema zadanom"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Postavi komande kraj pret_raživanja"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Greška pri izvođenju naredbe \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Veličina ik_one stavke:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Greška pri zaključavanju zaslona."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Veličin_a ikone kategorije:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Greška pri pokušaju odjave."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Zas_lon:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Greška pri otvaranju upravitelja postavki."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Omiljeno"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Naslov"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikona i naslov"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Naslov:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Uključi _Omiljeno u Najčešće korišteno"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikona"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Veličina ik_one stavke:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Promjeni kategoriju prij_elazom miša"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Veliko"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Veće"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Učitaj redosljed izbornika"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Uključi _Omiljeno u Najčešće korišteno"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Prikaži Najčešće korišteno prema zadanom"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "Postavke:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Zaključaj zaslon"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Zaključaj _zaslon:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Odjava"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Od_java"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Posloži prema abecedi (A-Ž)"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normalno"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Posloži prema abecedi (Ž-A)"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Postavi _pretraživanje kraj dugmeta na ploči"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Jako malo"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Postavi komande kraj pret_raživanja"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Manje"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Najčešće korišteno"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Malo"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Obriši iz grupe Omiljeno"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normalno"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Izaberi ikonu"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Veliko"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Prikaži izbornik za brzo pristupanje instaliranim aplikacijama"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Veće"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Prikazi _opis aplikacije"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Jako veliko"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Prikaži aplikacije po _imenu"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Greška pri izvođenju naredbe \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Malo"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Sve Postavke"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Manje"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Zaključaj zaslon"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Posloži prema abecedi (A-Ž)"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Odjava"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Posloži prema abecedi (Ž-A)"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Omiljeno"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Promjeni kategoriju prij_elazom miša"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Najčešće korišteno"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Naslov"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Greška pri otvaranju upravitelja postavki."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Nije moguće dodati pokretač na Radnu površinu."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Greška pri zaključavanju zaslona."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Nije moguće dodati pokretač na Ploču"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Greška pri pokušaju odjave."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Jako veliko"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Dodaj u Omiljeno"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Jako malo"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Obriši iz grupe Omiljeno"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Izbornik"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Dodaj na Radnu površinu"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "Izg_led"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Dodaj na ploču"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "Pon_ašanje"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Nije moguće dodati pokretač na Radnu površinu."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "Nared_be"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Nije moguće dodati pokretač na Ploču"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikona"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Izbornik aplikacija"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Dugm_e na ploči"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Očisti kategoriju Najčešće korišteno"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "Postavke:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Naslov:"
diff --git a/po/hr/CMakeLists.txt b/po/hr/CMakeLists.txt
deleted file mode 100644
index d9893eb..0000000
--- a/po/hr/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(hr ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/hu/xfce4-whiskermenu-plugin.po b/po/hu.po
similarity index 57%
rename from po/hu/xfce4-whiskermenu-plugin.po
rename to po/hu.po
index 78ca6c5..2fc7a02 100644
--- a/po/hu/xfce4-whiskermenu-plugin.po
+++ b/po/hu.po
@@ -6,229 +6,235 @@
 # xazax <xazax.hun at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-07-24 09:59+0000\n"
 "Last-Translator: xazax <xazax.hun at gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Összes"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Ikon hozzáadása az Asztalhoz"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menü"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Hozzáadás a kedvencekhez"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Kinézet"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Ikon hozzáadása a tálcához"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Panel Gomb"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Összes"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Működés"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Minden beállítás"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Alkalmazások Menü"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Ikon kiválasztása"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "_Kategória ikon méret:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "_Név szerinti megjelenítés"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Előzmények törlése"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr " _Leírás szerinti megjelenítés"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "M_egjelenítés:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Nem sikerült végrehajtani a \"%s\" parancsot."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "I_kon méret:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "A képernyő zárolása sikertelen."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "_Kategória ikon méret:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "A kijelentkezés sikertelen"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "M_egjelenítés:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "A beállítások megnyitása sikertelen."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Kedvencek"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Cím"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikon és cím"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Cím:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Kategóriák váltása _fókusszal."
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "I_kon méret:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Nagy"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Nagyobb"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Minden beállítás"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Képernyő zárolása"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Képernyő zárolása"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Kijelentkezés"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Kijelentkezés"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Rendezés ABC rendben növekvően"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normál"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Rendezés ABC rendben csökkenően"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Nagyon Kicsi"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Kissebb"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Előzmények"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Kicsi"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Eltávolítás a kedvencekből"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normál"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Ikon kiválasztása"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Nagy"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Menü megjelenítése a telepített alkalmazások egyszerű eléréséhez."
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Nagyobb"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr " _Leírás szerinti megjelenítés"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Nagyon Nagy"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "_Név szerinti megjelenítés"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Nem sikerült végrehajtani a \"%s\" parancsot."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Kicsi"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Minden beállítás"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Kissebb"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Képernyő zárolása"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Rendezés ABC rendben növekvően"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Kijelentkezés"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Rendezés ABC rendben csökkenően"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Kedvencek"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Kategóriák váltása _fókusszal."
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Előzmények"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Cím"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "A beállítások megnyitása sikertelen."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Nem lehet az ikont kirakni az asztalra."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "A képernyő zárolása sikertelen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Nem lehet az ikont kirakni a tálcára."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "A kijelentkezés sikertelen"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Nagyon Nagy"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Hozzáadás a kedvencekhez"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Nagyon Kicsi"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Eltávolítás a kedvencekből"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menü"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Ikon hozzáadása az Asztalhoz"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Kinézet"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Ikon hozzáadása a tálcához"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Működés"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Nem lehet az ikont kirakni az asztalra."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Nem lehet az ikont kirakni a tálcára."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Alkalmazások Menü"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Panel Gomb"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Előzmények törlése"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Minden beállítás"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Cím:"
diff --git a/po/hu/CMakeLists.txt b/po/hu/CMakeLists.txt
deleted file mode 100644
index c9519d0..0000000
--- a/po/hu/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(hu ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/id/xfce4-whiskermenu-plugin.po b/po/id.po
similarity index 56%
rename from po/id/xfce4-whiskermenu-plugin.po
rename to po/id.po
index cffe7fe..2d5b105 100644
--- a/po/id/xfce4-whiskermenu-plugin.po
+++ b/po/id.po
@@ -6,229 +6,235 @@
 # Mohamad Hasan Al Banna, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-07-31 21:33+0000\n"
 "Last-Translator: Mohamad Hasan Al Banna\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Semua"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Tambahkan ke Desktop"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Tambahkan ke Favorit"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Penampilan"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Tambahkan ke Panel"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Tombol Panel"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Semua"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Kebiasaan"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Semua Pengaturan"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu Aplikasi"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Pilih Ikon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "ukuran ikon Kateg_ory:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Tampilkan aplikasi berdasarkan _nama"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Bersihkan yang Baru diGunakan"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Tampilkan _deskripsi aplikasi"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Ta_mpilan:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Gagak mengeksekusi perintah \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "ukuran ikon ite_m:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Gagal mengunci layar."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "ukuran ikon Kateg_ory:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Gagal keluar."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Ta_mpilan:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Gagal membuka menejer pengaturan."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favorit"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Judul"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikon dan judul"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Judul:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Ganti kategori dengan _melayang"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "ukuran ikon ite_m:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Besar"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Lebih Besar"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Semua Pengaturan"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Kunci Layar"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Kunci Layar"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Keluar"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Keluar"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Urutan Alfabet A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Urutan Alfabet Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Sangat Kecil"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Lebih Kecil"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Terakhir diGunakan"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Kecil"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Hapus Dari Favorit"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Pilih Ikon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Besar"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Tampilkan menu untuk mempermudah akses aplikasi yang terpasang"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Lebih Besar"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Tampilkan _deskripsi aplikasi"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Sangat Besar"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Tampilkan aplikasi berdasarkan _nama"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Gagak mengeksekusi perintah \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Kecil"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Semua Pengaturan"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Lebih Kecil"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Kunci Layar"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Urutan Alfabet A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Keluar"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Urutan Alfabet Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favorit"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Ganti kategori dengan _melayang"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Terakhir diGunakan"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Judul"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Gagal membuka menejer pengaturan."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Gagal menambahkan peluncur ke desktop."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Gagal mengunci layar."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Gagal menambahkan peluncur ke panel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Gagal keluar."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Sangat Besar"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Tambahkan ke Favorit"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Sangat Kecil"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Hapus Dari Favorit"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Tambahkan ke Desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Penampilan"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Tambahkan ke Panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Kebiasaan"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Gagal menambahkan peluncur ke desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Gagal menambahkan peluncur ke panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu Aplikasi"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Tombol Panel"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Bersihkan yang Baru diGunakan"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Semua Pengaturan"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Judul:"
diff --git a/po/id/CMakeLists.txt b/po/id/CMakeLists.txt
deleted file mode 100644
index 2a0d171..0000000
--- a/po/id/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(id ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/it/xfce4-whiskermenu-plugin.po b/po/it.po
similarity index 59%
rename from po/it/xfce4-whiskermenu-plugin.po
rename to po/it.po
index 586f81c..f01d9ea 100644
--- a/po/it/xfce4-whiskermenu-plugin.po
+++ b/po/it.po
@@ -6,223 +6,229 @@
 # Bernardo Miguel Savone <bmsavone at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plguin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-12 12:24+0000\n"
 "Last-Translator: Bernardo Miguel Savone <bmsavone at gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Tutto"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Aggiungi al Desktop"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Aggiungi ai Preferiti"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Aspetto"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Aggiungi al Pannello"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Pulsante del pannello"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Tutto"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Comportamento"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Tutte le impostazioni"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Comandi"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu Applicazioni"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Selezionare un'icona"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Dimensione icona Categ_oria:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Mostra le applicazioni per _nome"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Cancella Usati di recente"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "mostra una _descrizione delle applicazioni"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Di_splay:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Posizionare il campo _Cerca accanto al pulsante del pannello"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Visualizzare _usati di di recente come predeterminato"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Posizionare comandi  accanto al _campo cerca"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Impossibile eseguire il comando \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Dimensione icona Ite_m:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Impossibile bloccare lo schermo."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Dimensione icona Categ_oria:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Disconnessione non riuscita."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Di_splay:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Impossibile aprire il Gestore delle impostazioni."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Preferiti"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Titolo"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icona e titolo"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Titolo:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Includere _preferiti  in usati di recente"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Icona:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Dimensione icona Ite_m:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Cambia categorie al _passaggio del mouse"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Grande"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Più grande"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Carica st_ruttura del menu"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Includere _preferiti  in usati di recente"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Visualizzare _usati di di recente come predeterminato"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Impostazioni:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Blocca schermo"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Blocco schermo:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Esci"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Log _Out:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Ordina alfabeticamente A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normale"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Ordina alfabeticamente Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Posizionare il campo _Cerca accanto al pulsante del pannello"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Molto piccolo"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Posizionare comandi  accanto al _campo cerca"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Più piccolo"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Usati di recente"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Piccolo"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Rimuovi dai Preferiti"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normale"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Selezionare un'icona"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Grande"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Mostra un menu per accedere facilmente le applicazioni installate"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Più grande"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "mostra una _descrizione delle applicazioni"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Molto grande"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Mostra le applicazioni per _nome"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Impossibile eseguire il comando \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Piccolo"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Tutte le impostazioni"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Più piccolo"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Blocca schermo"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Ordina alfabeticamente A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Esci"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Ordina alfabeticamente Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Preferiti"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Cambia categorie al _passaggio del mouse"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Usati di recente"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Titolo"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Impossibile aprire il Gestore delle impostazioni."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Impossibile aggiungere lanciatore al desktop."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Impossibile bloccare lo schermo."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Impossibile aggiungere lanciatore al pannello."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Disconnessione non riuscita."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Molto grande"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Aggiungi ai Preferiti"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Molto piccolo"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Rimuovi dai Preferiti"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Aggiungi al Desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Aspetto"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Aggiungi al Pannello"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Comportamento"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Impossibile aggiungere lanciatore al desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Comandi"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Impossibile aggiungere lanciatore al pannello."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Icona:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu Applicazioni"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Pulsante del pannello"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Cancella Usati di recente"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Impostazioni:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Titolo:"
diff --git a/po/it/CMakeLists.txt b/po/it/CMakeLists.txt
deleted file mode 100644
index b659596..0000000
--- a/po/it/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(it ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/ja/xfce4-whiskermenu-plugin.po b/po/ja.po
similarity index 61%
rename from po/ja/xfce4-whiskermenu-plugin.po
rename to po/ja.po
index b4bc62b..1ade348 100644
--- a/po/ja/xfce4-whiskermenu-plugin.po
+++ b/po/ja.po
@@ -6,223 +6,231 @@
 # Masato HASHIMOTO <cabezon.hashimoto at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-18 06:16+0000\n"
 "Last-Translator: Masato HASHIMOTO <cabezon.hashimoto at gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "すべて"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "デスクトップに追加"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "お気に入りに追加"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "外観(_A)"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "パネルに追加"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "パネルボタン(_P)"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "すべて"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "振る舞い(_B)"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "設定マネージャー"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "コマンド(_C)"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "アプリケーションメニュー"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "アイコンの選択"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "カテゴリのアイコンサイズ(_O):"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "アプリケーションを名前で表示する(_N)"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "最近使ったものをクリア"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "アプリケーションの説明を表示する(_D)"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "表示(_S):"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "検索フィールドをパネルボタンの後に置く(_S)"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "デフォルトで最近使ったものを表示する(_U)"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "コマンドを検索フィールドの後に置く(_E)"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "コマンド \"%s\" の実行に失敗しました。"
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "アイテムのアイコンサイズ(_M):"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "スクリーンのロックに失敗しました。"
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "カテゴリのアイコンサイズ(_O):"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "ログアウトに失敗しました。"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "表示(_S):"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "設定マネージャーを開くことに失敗しました。"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "お気に入り"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "アイコン"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "タイトル"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "アイコンとタイトル"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "タイトル(_T):"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "最近使ったものにお気に入りを含める(_F)"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "アイコン(_I):"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "アイテムのアイコンサイズ(_M):"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "ホバーでカテゴリを切り替える(_H)"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "少し大きい"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "大きい"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "メニュー階層を読み込む(_R)"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "最近使ったものにお気に入りを含める(_F)"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "デフォルトで最近使ったものを表示する(_U)"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "設定(_S):"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "スクリーンをロック"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "スクリーンをロック(_S):"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "ログアウト"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "ログアウト(_O):"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "アルファベット順 (A-Z) で並び替え"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "普通"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "アルファベットの逆順 (Z-A) で並び替え"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "検索フィールドをパネルボタンの後に置く(_S)"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "とても小さい"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "コマンドを検索フィールドの後に置く(_E)"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "小さい"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "最近使ったもの"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "少し小さい"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "お気に入りから削除"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "普通"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "アイコンの選択"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "少し大きい"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr ""
+"インストールされているアプリケーションに簡単にアクセスできるメニューを表示し"
+"ます"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "大きい"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "アプリケーションの説明を表示する(_D)"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "とても大きい"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "アプリケーションを名前で表示する(_N)"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "コマンド \"%s\" の実行に失敗しました。"
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "少し小さい"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "設定マネージャー"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "小さい"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "スクリーンをロック"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "アルファベット順 (A-Z) で並び替え"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "ログアウト"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "アルファベットの逆順 (Z-A) で並び替え"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "お気に入り"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "ホバーでカテゴリを切り替える(_H)"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "最近使ったもの"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "タイトル"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "設定マネージャーを開くことに失敗しました。"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "デスクトップにランチャーを追加できません。"
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "スクリーンのロックに失敗しました。"
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "パネルにランチャーを追加できません。"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "ログアウトに失敗しました。"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "とても大きい"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "お気に入りに追加"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "とても小さい"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "お気に入りから削除"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "デスクトップに追加"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "外観(_A)"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "パネルに追加"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "振る舞い(_B)"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "デスクトップにランチャーを追加できません。"
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "コマンド(_C)"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "パネルにランチャーを追加できません。"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "アイコン(_I):"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "アプリケーションメニュー"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "パネルボタン(_P)"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "最近使ったものをクリア"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "設定(_S):"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "タイトル(_T):"
diff --git a/po/ja/CMakeLists.txt b/po/ja/CMakeLists.txt
deleted file mode 100644
index 9c82ce9..0000000
--- a/po/ja/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(ja ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/kk/xfce4-whiskermenu-plugin.po b/po/kk.po
similarity index 62%
rename from po/kk/xfce4-whiskermenu-plugin.po
rename to po/kk.po
index 845eaab..10926b8 100644
--- a/po/kk/xfce4-whiskermenu-plugin.po
+++ b/po/kk.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-07-18 22:46+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -18,217 +18,222 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Барлығы"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Жұмыс үстеліне қосу"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker мәзірі"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Таңдамалыларға қосу"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Сыртқы түрі"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Панельге қосу"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Панель батырмасы"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Барлығы"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Мінез-құлығы"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Барлық баптаулар"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Қолданбалар мәзірі"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Таңбашаны таңдаңыз"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Сан_ат таңбашасы өлшемі:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Қолданбаларды а_ты бойынша көрсету"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Соңғы қолданылған тізімін тазалау"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Қолданбалар с_ипаттамаларын көрсету"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Көр_сету:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "\"%s\" командасын орындау сәтсіз аяқталды."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Эле_мент таңбашасы өлшемі:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Экранды бұғаттау сәтсіз аяқталды."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Сан_ат таңбашасы өлшемі:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Жүйеден шығу сәтсіз аяқталды."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Көр_сету:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Баптаулар басқарушысын ашу сәтсіз аяқталды."
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Таңдамалы"
+
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Таңбаша"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Атауы"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Таңбаша және атауы"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "А_тауы:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Таңбаша:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Санаттарды үстіне а_пару арқылы ауыстырыңыз"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Эле_мент таңбашасы өлшемі:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Үлкен"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Үлкенірек"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Барлық баптаулар"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Экранды бұғаттау"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Экранды бұғаттау"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Шығу"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Шығу"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Әліппемен сұрыптау A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Қалыпты"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Әліппемен сұрыптау Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Өте кішкентай"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Кішірек"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Соңғы қолданылған"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Кіші"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Таңдамалылардан өшіру"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Қалыпты"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Таңбашаны таңдаңыз"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Үлкен"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Орнатылған қолданбаларға қатынау үшін қарапайым мәзірді көрсету"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Үлкенірек"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Қолданбалар с_ипаттамаларын көрсету"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Өте үлкен"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Қолданбаларды а_ты бойынша көрсету"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "\"%s\" командасын орындау сәтсіз аяқталды."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Кіші"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Барлық баптаулар"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Кішірек"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Экранды бұғаттау"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Әліппемен сұрыптау A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Шығу"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Әліппемен сұрыптау Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Таңдамалы"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Санаттарды үстіне а_пару арқылы ауыстырыңыз"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Соңғы қолданылған"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Атауы"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Баптаулар басқарушысын ашу сәтсіз аяқталды."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Жөнелткішті жұмыс үстеліне қосу мүмкін емес."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Экранды бұғаттау сәтсіз аяқталды."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Жөнелткішті панельге қосу мүмкін емес."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Жүйеден шығу сәтсіз аяқталды."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Өте үлкен"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Таңдамалыларға қосу"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Өте кішкентай"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Таңдамалылардан өшіру"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker мәзірі"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Жұмыс үстеліне қосу"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Сыртқы түрі"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Панельге қосу"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Мінез-құлығы"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Жөнелткішті жұмыс үстеліне қосу мүмкін емес."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Жөнелткішті панельге қосу мүмкін емес."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Таңбаша:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Қолданбалар мәзірі"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Панель батырмасы"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Соңғы қолданылған тізімін тазалау"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Барлық баптаулар"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "А_тауы:"
diff --git a/po/kk/CMakeLists.txt b/po/kk/CMakeLists.txt
deleted file mode 100644
index 143019b..0000000
--- a/po/kk/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(kk ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/ms/xfce4-whiskermenu-plugin.po b/po/ms.po
similarity index 57%
rename from po/ms/xfce4-whiskermenu-plugin.po
rename to po/ms.po
index ee762e9..b3c8292 100644
--- a/po/ms/xfce4-whiskermenu-plugin.po
+++ b/po/ms.po
@@ -6,223 +6,229 @@
 # abuyop <abuyop at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-26 05:10+0000\n"
 "Last-Translator: abuyop <abuyop at gmail.com>\n"
-"Language-Team: Malay (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ms/)\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/ms/)\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Semua"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Tambah ke Desktop"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Tambah ke Kegemaran"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "Pen_apilan"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Tambah ke Panel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Butang _Panel"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Semua"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Kelakuan"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Semua Tetapan"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "P_erintah"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu Aplikasi"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Pilih Satu Ikon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Saiz ikon kateg_ori:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Tunjuk aplikasi mengikut _nama"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Kosongkan Yang Diguna Baru-baru Ini"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Tunjuk _keterangan aplikasi"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Papa_ran:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Kedudukan masukan _gelintar bersebelahan butang panel"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Papar dig_una baru-baru ini secara lalai"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Kedudukan perintah bersebelahan _masukan gelintar"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Gagal lakukan perintah \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Saiz ikon ite_m:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Gagal mengunci skrin."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Saiz ikon kateg_ori:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Gagal mendaftar keluar."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Papa_ran:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Gagal membuka pengurus tetapan."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Kegemaran"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Tajuk"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikon dan tajuk"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Tajuk:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Sertakan ke_gemaran dalam diguna baru-baru ini"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Saiz ikon ite_m:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Tukar kategori mengikut pe_ngapungan"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Besar"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Lebih Besar"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Muat hie_raki menu"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Sertakan ke_gemaran dalam diguna baru-baru ini"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Papar dig_una baru-baru ini secara lalai"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Tetapan:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Kunci Skrin"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Kunci _Skrin:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Daftar Keluar"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Daftar Keluar:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Isih A-Z Secara Berabjad"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Biasa"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Isih Z-A Secara Berabjad"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Kedudukan masukan _gelintar bersebelahan butang panel"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Sangat Kecil"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Kedudukan perintah bersebelahan _masukan gelintar"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Lebih Kecil"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Diguna Baru-baru Ini"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Kecil"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Buang Dari Kegemaran"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Biasa"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Pilih Satu Ikon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Besar"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Tunjuk menu untuk capai aplikasi terpasang dengan mudah"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Lebih Besar"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Tunjuk _keterangan aplikasi"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Sangat Besar"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Tunjuk aplikasi mengikut _nama"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Gagal lakukan perintah \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Kecil"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Semua Tetapan"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Lebih Kecil"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Kunci Skrin"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Isih A-Z Secara Berabjad"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Daftar Keluar"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Isih Z-A Secara Berabjad"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Kegemaran"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Tukar kategori mengikut pe_ngapungan"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Diguna Baru-baru Ini"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Tajuk"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Gagal membuka pengurus tetapan."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Tidak boleh tambah pelancar ke desktop."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Gagal mengunci skrin."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Tidak boleh tambah pelancar ke panel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Gagal mendaftar keluar."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Sangat Besar"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Tambah ke Kegemaran"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Sangat Kecil"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Buang Dari Kegemaran"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Tambah ke Desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "Pen_apilan"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Tambah ke Panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Kelakuan"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Tidak boleh tambah pelancar ke desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "P_erintah"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Tidak boleh tambah pelancar ke panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu Aplikasi"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Butang _Panel"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Kosongkan Yang Diguna Baru-baru Ini"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Tetapan:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Tajuk:"
diff --git a/po/ms/CMakeLists.txt b/po/ms/CMakeLists.txt
deleted file mode 100644
index 5fc3cfc..0000000
--- a/po/ms/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(ms ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/nb/xfce4-whiskermenu-plugin.po b/po/nb.po
similarity index 57%
rename from po/nb/xfce4-whiskermenu-plugin.po
rename to po/nb.po
index 625e5a5..c62d008 100644
--- a/po/nb/xfce4-whiskermenu-plugin.po
+++ b/po/nb.po
@@ -6,223 +6,229 @@
 # viking60 <thomasbjornvold at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-21 15:08+0000\n"
 "Last-Translator: viking60 <thomasbjornvold at gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/nb/)\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Alle"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Legg til på skrivebordet"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker-meny"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Legg til i favoritter"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Utseende"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Legg til på panel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Paneltast"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Alle"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Oppførsel"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Alle innstillinger"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Kommandoer"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Applikasjonsmeny"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Velg et ikon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kateg_ori ikonstørrelse:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Vis etter applikasjonsnavn"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Fjern sist brukte"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Vis applikasjonsbeskrivelser"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Vi_sning:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Plasser _søket ved siden av paneltasten"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Vis siste_brukte som standard"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Plasser kommandoer ved siden av søket"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Kunne ikke kjøre kommandoen \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "lkonstørrelse:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Kunne ikke låse skjermen"
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kateg_ori ikonstørrelse:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Kunne ikke logge ut"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Vi_sning:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Kunne ikke åpne innstillinger"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoritter"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Tittel"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikon og tittel"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Tittel"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Inkluder_favoritter i siste brukte"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "lkonstørrelse:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Endre kategorier ved mus over"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Stor"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Større"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Last menystruktur"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Inkluder_favoritter i siste brukte"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Vis siste_brukte som standard"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Innstillinger"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Lås skjermen"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Lås_skjermen"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Logg ut"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Logg_ut"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sorter alfabetisk A-Ø"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sorter alfabetisk Ø-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Plasser _søket ved siden av paneltasten"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Veldig liten"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Plasser kommandoer ved siden av søket"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Mindre"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Siste brukte"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Liten"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Fjern fra favoritter"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Velg et ikon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Stor"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Vis en meny for enkel tilgang til installerte applikasjoner"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Større"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Vis applikasjonsbeskrivelser"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Veldig stor"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Vis etter applikasjonsnavn"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Kunne ikke kjøre kommandoen \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Liten"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Alle innstillinger"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Mindre"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Lås skjermen"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sorter alfabetisk A-Ø"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Logg ut"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sorter alfabetisk Ø-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoritter"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Endre kategorier ved mus over"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Siste brukte"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Tittel"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Kunne ikke åpne innstillinger"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Kunne ikke legge oppstarter til skrivebordet"
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Kunne ikke låse skjermen"
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Kunne ikke legge oppstarter til panelet"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Kunne ikke logge ut"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Veldig stor"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Legg til i favoritter"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Veldig liten"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Fjern fra favoritter"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker-meny"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Legg til på skrivebordet"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Utseende"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Legg til på panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Oppførsel"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Kunne ikke legge oppstarter til skrivebordet"
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Kommandoer"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Kunne ikke legge oppstarter til panelet"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Applikasjonsmeny"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Paneltast"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Fjern sist brukte"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Innstillinger"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Tittel"
diff --git a/po/nb/CMakeLists.txt b/po/nb/CMakeLists.txt
deleted file mode 100644
index 591e0c2..0000000
--- a/po/nb/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(nb ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/nl/xfce4-whiskermenu-plugin.po b/po/nl.po
similarity index 58%
rename from po/nl/xfce4-whiskermenu-plugin.po
rename to po/nl.po
index d08124d..5209f77 100644
--- a/po/nl/xfce4-whiskermenu-plugin.po
+++ b/po/nl.po
@@ -6,223 +6,230 @@
 # Pjotr123 <pjotrvertaalt at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-17 22:25+0000\n"
 "Last-Translator: Pjotr123 <pjotrvertaalt at gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Alle"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Voeg toe aan bureaublad"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whiskermenu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Voeg toe aan favorieten"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "Uiterlijk"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Voeg toe aan werkbalk"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Werkbalkknop"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Alle"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "Gedrag"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Alle instellingen"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "Opdrachten"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Toepassingenmenu"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Kies een pictogram"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Pictogramgrootte van categorie:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Toon toepassingen op _naam"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Verwijder onlangs gebruikt"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Toon _beschrijvingen van toepassingen"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Tonen:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Plaats zoekopdracht naast werkbalkknop"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Toon standaard onlangs gebruikt"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Plaats opdrachten naast zoekopdracht"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Kon opdracht '%s' niet uitvoeren"
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Pictogramgrootte van element:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Kon scherm niet vergrendelen."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Pictogramgrootte van categorie:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Kon niet afmelden."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Tonen:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Kon instellingenbeheerder niet openen."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favorieten"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Pictogram"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Titel"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Pictogram en titel"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Titel:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Favorieten opnemen in onlangs gebruikt"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Pictogram:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Pictogramgrootte van element:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Verwissel van categorie door muispijl erop te laten rusten"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Groot"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Groter"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Menu-opbouw laden"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Favorieten opnemen in onlangs gebruikt"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Toon standaard onlangs gebruikt"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "Instellingen:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Scherm vergrendelen"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Scherm vergrendelen:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Afmelden"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Afmelden:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sorteer alfabetisch van A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normaal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sorteer alfabetisch van Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Plaats zoekopdracht naast werkbalkknop"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Heel klein"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Plaats opdrachten naast zoekopdracht"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Kleiner"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Onlangs gebruikt"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Klein"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Verwijder uit favorieten"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normaal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Kies een pictogram"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Groot"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr ""
+"Toon een menu om geïnstalleerde toepassingen makkelijk te kunnen benaderen"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Groter"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Toon _beschrijvingen van toepassingen"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Heel groot"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Toon toepassingen op _naam"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Kon opdracht '%s' niet uitvoeren"
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Klein"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Alle instellingen"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Kleiner"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Scherm vergrendelen"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sorteer alfabetisch van A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Afmelden"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sorteer alfabetisch van Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favorieten"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Verwissel van categorie door muispijl erop te laten rusten"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Onlangs gebruikt"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Titel"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Kon instellingenbeheerder niet openen."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Kon starter niet toevoegen aan bureaublad."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Kon scherm niet vergrendelen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Kon starter niet toevoegen aan werkbalk."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Kon niet afmelden."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Heel groot"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Voeg toe aan favorieten"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Heel klein"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Verwijder uit favorieten"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whiskermenu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Voeg toe aan bureaublad"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "Uiterlijk"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Voeg toe aan werkbalk"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "Gedrag"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Kon starter niet toevoegen aan bureaublad."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "Opdrachten"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Kon starter niet toevoegen aan werkbalk."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Pictogram:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Toepassingenmenu"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Werkbalkknop"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Verwijder onlangs gebruikt"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "Instellingen:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Titel:"
diff --git a/po/nl/CMakeLists.txt b/po/nl/CMakeLists.txt
deleted file mode 100644
index f163fc6..0000000
--- a/po/nl/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(nl ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/pl/xfce4-whiskermenu-plugin.po b/po/pl.po
similarity index 58%
rename from po/pl/xfce4-whiskermenu-plugin.po
rename to po/pl.po
index c90fd8b..612b8df 100644
--- a/po/pl/xfce4-whiskermenu-plugin.po
+++ b/po/pl.po
@@ -8,223 +8,230 @@
 # M T <michtrz at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-20 16:22+0000\n"
 "Last-Translator: M T <michtrz at gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Wszystkie"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Dodaj na Pulpit"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Dodaj do Ulubionych"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Wygląd"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Dodaj do Panelu"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Przycisk _panelu"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Wszystkie"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Zachowanie"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Wszystkie ustawienia"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Polecenia"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu aplikacji"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Wybierz ikonę"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Rozmiar ikony kateg_orii:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Pokaż aplikacje po _nazwie"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Wyczyść ostatnio używane"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Pokaż _opis aplikacji"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "_Wyświetlacz:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Umieść pasek _wyszukiwania się obok paska przycisków"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Pokaż ostatnio _używane domyślnie"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Umieść _polecenia obok paska wyszukiwania"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Nie można uruchomić polecenia \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Rozmiar ikony przed_miotu:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Niepowodzenie zablokowania ekranu"
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Rozmiar ikony kateg_orii:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Niepowodzenie wylogowania"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "_Wyświetlacz:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Niepowodzenie uruchomienia menedżera ustawień"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Ulubione"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Etykieta"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikona i nazwa"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Nazwa"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Dołącz _faworyty do ostatnio używanych"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikona:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Rozmiar ikony przed_miotu:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Zmień kategorię _najeżdżając"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Duża"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Większa"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Załaduj hie_rarchię menu"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Dołącz _faworyty do ostatnio używanych"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Pokaż ostatnio _używane domyślnie"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Ustawienia:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Zablokuj ekran"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Zablokuj _ekran:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Wyloguj"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Wyloguj:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sortuj alfabetycznie A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Standardowa"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sortuj alfabetycznie Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Umieść pasek _wyszukiwania się obok paska przycisków"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Najmniejsza"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Umieść _polecenia obok paska wyszukiwania"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Mniejsza"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Ostatnio używane"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Mała"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Usuń z Ulubionych"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Standardowa"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Wybierz ikonę"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Duża"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Pokaż menu łatwego dostępu do zainstalowanych aplikacji"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Większa"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Pokaż _opis aplikacji"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Największa"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Pokaż aplikacje po _nazwie"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Nie można uruchomić polecenia \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Mała"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Wszystkie ustawienia"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Mniejsza"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Zablokuj ekran"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sortuj alfabetycznie A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Wyloguj"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sortuj alfabetycznie Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Ulubione"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Zmień kategorię _najeżdżając"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Ostatnio używane"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Etykieta"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Niepowodzenie uruchomienia menedżera ustawień"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Nie można dodać aktywatora na pulpicie"
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Niepowodzenie zablokowania ekranu"
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Nie można dodać aktywatora do panelu"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Niepowodzenie wylogowania"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Największa"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Dodaj do Ulubionych"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Najmniejsza"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Usuń z Ulubionych"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Dodaj na Pulpit"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Wygląd"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Dodaj do Panelu"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Zachowanie"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Nie można dodać aktywatora na pulpicie"
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Polecenia"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Nie można dodać aktywatora do panelu"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikona:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu aplikacji"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Przycisk _panelu"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Wyczyść ostatnio używane"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Ustawienia:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Nazwa"
diff --git a/po/pl/CMakeLists.txt b/po/pl/CMakeLists.txt
deleted file mode 100644
index 7241060..0000000
--- a/po/pl/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(pl ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/pt/xfce4-whiskermenu-plugin.po b/po/pt.po
similarity index 59%
rename from po/pt/xfce4-whiskermenu-plugin.po
rename to po/pt.po
index c618e7e..0b24867 100644
--- a/po/pt/xfce4-whiskermenu-plugin.po
+++ b/po/pt.po
@@ -7,223 +7,229 @@
 # Sérgio Marques <smarquespt at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-10 00:00+0000\n"
 "Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Todas"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Adicionar à área de trabalho"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Adicionar aos favoritos"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Aparência"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Adicionar ao painel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Botão do _painel"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Todas"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "C_omportamento"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Todas as definições"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Comandos"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu de aplicações"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Escolha um icone"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Tamanho do ícone da categ_oria:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Mostrar aplicações por _nome"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Limpar itens recentes"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Mostrar _descrição das aplicações"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "E_xibição:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Po_sicionar pesquisa junto ao botão do painel"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Por definição, mostrar itens recentes _utilizados"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Posicionar comandos junto à _entrada de pesquisa"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Falha ao executar o comando \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Tamanho do ícone do ite_m:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Falha ao bloquear ecrã."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Tamanho do ícone da categ_oria:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Falha ao sair."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "E_xibição:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Falha ao abrir o gestor de definições."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoritos"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icone"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Título"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icone e título"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Título:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Incluir _favoritos nos itens recentes"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "Í_cone:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Tamanho do ícone do ite_m:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Trocar categorias ao _passar com o rato"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Grande"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Muito grande"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Carrega_r hierarquida de menu"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Incluir _favoritos nos itens recentes"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Por definição, mostrar itens recentes _utilizados"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "Definiçõe_s:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Bloquear ecrã"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Ecrã de _bloqueio:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Sair"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Sair:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Ordem alfabética A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Ordem alfabética Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Po_sicionar pesquisa junto ao botão do painel"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Minúsculo"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Posicionar comandos junto à _entrada de pesquisa"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Muito pequeno"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Usadas recentemente"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Pequeno"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Remover dos favoritos"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Escolha um icone"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Grande"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Mostra um menu um rápido acesso às aplicações instaladas"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Muito grande"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Mostrar _descrição das aplicações"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Enorme"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Mostrar aplicações por _nome"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Falha ao executar o comando \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Pequeno"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Todas as definições"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Muito pequeno"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Bloquear ecrã"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Ordem alfabética A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Sair"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Ordem alfabética Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoritos"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Trocar categorias ao _passar com o rato"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Usadas recentemente"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Título"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Falha ao abrir o gestor de definições."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Não foi possível adicionar lançador à área de trabalho."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Falha ao bloquear ecrã."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Não foi possível adicionar lançador ao painel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Falha ao sair."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Enorme"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Adicionar aos favoritos"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Minúsculo"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Remover dos favoritos"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Adicionar à área de trabalho"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Aparência"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Adicionar ao painel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "C_omportamento"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Não foi possível adicionar lançador à área de trabalho."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Comandos"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Não foi possível adicionar lançador ao painel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "Í_cone:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu de aplicações"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Botão do _painel"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Limpar itens recentes"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "Definiçõe_s:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Título:"
diff --git a/po/pt/CMakeLists.txt b/po/pt/CMakeLists.txt
deleted file mode 100644
index 11692b0..0000000
--- a/po/pt/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(pt ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/pt_BR/xfce4-whiskermenu-plugin.po b/po/pt_BR.po
similarity index 58%
rename from po/pt_BR/xfce4-whiskermenu-plugin.po
rename to po/pt_BR.po
index 932eeaa..ad89ac2 100644
--- a/po/pt_BR/xfce4-whiskermenu-plugin.po
+++ b/po/pt_BR.po
@@ -7,223 +7,229 @@
 # brk0_0, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-28 22:44+0000\n"
 "Last-Translator: brk0_0\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"xfce4-whiskermenu-plugin/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Tudo"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Adicionar à área de trabalho"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Adicionar aos Favoritos"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Aparência"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Adicionaro ao painel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Botão do Painel"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Tudo"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Comportamento"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Todas as configurações"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Comandos"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu de aplicativos"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Selecione um icone"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Tamanho do icone da categ_oria"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Mostrar aplicativos por _nome"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Limpar os usados recentemente"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Mostrar descrição do aplicativo"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Mo_strar:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Posicionar entrada de _busca ao lado do botão do painel"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Mostrar recentemente _usados por padrão"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Posicionar comandos ao lado da _entrada de busca"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Falhou ao executar o comando \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Tamanho do icone do íte_m"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Falhou ao travar a tela"
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Tamanho do icone da categ_oria"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Falhou ao sair"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Mo_strar:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Falhou ao abrir o gerenciador de configurações"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoritos"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Icone"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Título"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Icone e título"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Título"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Incluir os _favoritos nos recentemente usados"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Icone:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Tamanho do icone do íte_m"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Trocar categoria ao _passar do mouse"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Grande"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Muito Grande"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Carregar hie_rarquia de menu"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Incluir os _favoritos nos recentemente usados"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Mostrar recentemente _usados por padrão"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Configurações"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Travar a tela"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Bloquear _Tela"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Sair"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Sair:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Organizar alfabeticamente A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Organizar alfabeticamente Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Posicionar entrada de _busca ao lado do botão do painel"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Minúsculo"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Posicionar comandos ao lado da _entrada de busca"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Muito pequeno"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Usados Recentemente"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Pequeno"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Remover dos favoritos"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Selecione um icone"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Grande"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Mostra um menu para facilmente acessar os aplicativos instalados"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Muito Grande"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Mostrar descrição do aplicativo"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Enorme"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Mostrar aplicativos por _nome"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Falhou ao executar o comando \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Pequeno"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Todas as configurações"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Muito pequeno"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Travar a tela"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Organizar alfabeticamente A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Sair"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Organizar alfabeticamente Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoritos"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Trocar categoria ao _passar do mouse"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Usados Recentemente"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Título"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Falhou ao abrir o gerenciador de configurações"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Impossível adicionar o lançador à área de trabalho"
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Falhou ao travar a tela"
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Impossível adicionar o lançador ao painel"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Falhou ao sair"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Enorme"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Adicionar aos Favoritos"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Minúsculo"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Remover dos favoritos"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Adicionar à área de trabalho"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Aparência"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Adicionaro ao painel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Comportamento"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Impossível adicionar o lançador à área de trabalho"
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Comandos"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Impossível adicionar o lançador ao painel"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Icone:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu de aplicativos"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Botão do Painel"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Limpar os usados recentemente"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Configurações"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Título"
diff --git a/po/pt_BR/CMakeLists.txt b/po/pt_BR/CMakeLists.txt
deleted file mode 100644
index 4267306..0000000
--- a/po/pt_BR/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(pt_BR ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/ro/xfce4-whiskermenu-plugin.po b/po/ro.po
similarity index 58%
rename from po/ro/xfce4-whiskermenu-plugin.po
rename to po/ro.po
index fa0f0c2..a2711fb 100644
--- a/po/ro/xfce4-whiskermenu-plugin.po
+++ b/po/ro.po
@@ -6,223 +6,230 @@
 # Ayceman <alexandru.ianu at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-10 22:04+0000\n"
 "Last-Translator: Ayceman <alexandru.ianu at gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Toate"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Adaugă la desktop"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Meniu Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Adaugă la favorite"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Aspect"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Adaugă la panou"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Buton de Panou"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Toate"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "Compo_rtament"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Toate setările"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Comenzi"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Meniul de aplicații"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Selectează o iconiță"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Mărimea iconiței categ_oriei:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Arată aplicațiile după _nume"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Șterge recent folositele"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Arată _descrierile aplicațiilor"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Afi_șaj:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Poziționează căsuța de căutare _lângă butonul de panou"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Arată implicit recent _utilizatele"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Poziționează comen_zi lângă căsuța de căutare"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "A eșuat executarea comenzii \"%s\""
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "_Mărimea iconiței articolului:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "A eșuat blocarea ecranului."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Mărimea iconiței categ_oriei:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "A eșuat închiderea sesiunii."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Afi_șaj:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "A eșuat deschiderea gestionarului de setări."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favorite"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Iconiță"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Titlu"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Iconiță și titlu"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Titlu"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Include _favoritele în utilizate recent"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Iconiță:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "_Mărimea iconiței articolului:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Schimbă categoriile _planând cursorul"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Mare"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Mai mare"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Încarcă ierar_hia meniului"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Include _favoritele în utilizate recent"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Arată implicit recent _utilizatele"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Setări"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Blochează ecranul"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Blochează _Ecranul:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Închide sesiunea"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Delo_ghează:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sortează alfabetic A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sortează alfabetic Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Poziționează căsuța de căutare _lângă butonul de panou"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Foarte mic"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Poziționează comen_zi lângă căsuța de căutare"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Mai mic"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Folosite recent"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Mic"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Șterge din favorite"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Selectează o iconiță"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Mare"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Arată un meniu pentru a accesa ușor aplicațiile instalate"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Mai mare"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Arată _descrierile aplicațiilor"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Foarte mare"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Arată aplicațiile după _nume"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "A eșuat executarea comenzii \"%s\""
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Mic"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Toate setările"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Mai mic"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Blochează ecranul"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sortează alfabetic A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Închide sesiunea"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sortează alfabetic Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favorite"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Schimbă categoriile _planând cursorul"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Folosite recent"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Titlu"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "A eșuat deschiderea gestionarului de setări."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Nu s-a putut adăuga lansator la desktop."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "A eșuat blocarea ecranului."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Nu s-a putut adăuga lansator la panou."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "A eșuat închiderea sesiunii."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Foarte mare"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Adaugă la favorite"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Foarte mic"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Șterge din favorite"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Meniu Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Adaugă la desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Aspect"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Adaugă la panou"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "Compo_rtament"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Nu s-a putut adăuga lansator la desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Comenzi"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Nu s-a putut adăuga lansator la panou."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Iconiță:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Meniul de aplicații"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Buton de Panou"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Șterge recent folositele"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Setări"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Titlu"
diff --git a/po/ro/CMakeLists.txt b/po/ro/CMakeLists.txt
deleted file mode 100644
index c947841..0000000
--- a/po/ro/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(ro ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/ru/xfce4-whiskermenu-plugin.po b/po/ru.po
similarity index 62%
rename from po/ru/xfce4-whiskermenu-plugin.po
rename to po/ru.po
index 7c2437d..fcaec7a 100644
--- a/po/ru/xfce4-whiskermenu-plugin.po
+++ b/po/ru.po
@@ -9,223 +9,230 @@
 # shlyapugin <shlyapugin at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-30 06:44+0000\n"
 "Last-Translator: shlyapugin <shlyapugin at gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Все"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Добавить на рабочий стол"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Меню Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Добавить в «Избранное»"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Вид"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Добавить на панель"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Кнопка панели"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Все"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Поведение"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Настройки"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "Ко_манды"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Меню приложений"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Выбрать значок"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Размер значка _категории:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Показывать _имена приложений"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Очистить историю"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Показывать _описания приложений"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "_Показывать:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Строка _поиска около панели"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "По _умолчанию показывать «Недавние»"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Кнопки команд _рядом со строкой поиска"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Ошибка выполнения команды \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Размер значка _элемента:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Не удалось заблокировать экран."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Размер значка _категории:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Не удалось выйти."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "_Показывать:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Не удалось открыть диспетчер настроек."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Избранное"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Значок"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Заголовок"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Значок и заголовок"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Заголовок:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Включать «_Избранное» в «Недавние»"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "Зна_чок:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Размер значка _элемента:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Переключать категории по наведению _мыши"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Крупный"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Большой"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "_Группировать пункты в меню"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Включать «_Избранное» в «Недавние»"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "По _умолчанию показывать «Недавние»"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Настройки:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Блокировка экрана"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Блокировка _экрана:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Выйти"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Выход из системы:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Сортировать по алфавиту от А до Я"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Нормальный"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Сортировать по алфавиту от Я до А"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Строка _поиска около панели"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Крошечный"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Кнопки команд _рядом со строкой поиска"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Очень маленький"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Недавние"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Маленький"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Удалить из «Избранного»"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Нормальный"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Выбрать значок"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Крупный"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Показывает меню для простого доступа к установленным приложениям"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Большой"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Показывать _описания приложений"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Очень большой"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Показывать _имена приложений"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Ошибка выполнения команды \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Маленький"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Настройки"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Очень маленький"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Блокировка экрана"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Сортировать по алфавиту от А до Я"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Выйти"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Сортировать по алфавиту от Я до А"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Избранное"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Переключать категории по наведению _мыши"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Недавние"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Заголовок"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Не удалось открыть диспетчер настроек."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Нельзя добавить на рабочий стол."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Не удалось заблокировать экран."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Нельзя добавить на панель."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Не удалось выйти."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Очень большой"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Добавить в «Избранное»"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Крошечный"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Удалить из «Избранного»"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Меню Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Добавить на рабочий стол"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Вид"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Добавить на панель"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Поведение"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Нельзя добавить на рабочий стол."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "Ко_манды"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Нельзя добавить на панель."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "Зна_чок:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Меню приложений"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Кнопка панели"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Очистить историю"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Настройки:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Заголовок:"
diff --git a/po/ru/CMakeLists.txt b/po/ru/CMakeLists.txt
deleted file mode 100644
index 68a3e8f..0000000
--- a/po/ru/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(ru ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/sk/xfce4-whiskermenu-plugin.po b/po/sk.po
similarity index 58%
rename from po/sk/xfce4-whiskermenu-plugin.po
rename to po/sk.po
index b10610c..26436c4 100644
--- a/po/sk/xfce4-whiskermenu-plugin.po
+++ b/po/sk.po
@@ -6,223 +6,229 @@
 # Slavko <linux at slavino.sk>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-10 15:03+0000\n"
 "Last-Translator: Slavko <linux at slavino.sk>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Všetky"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Pridať na plochu"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Pridať k obľúbeným"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "Vzhľ_ad"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Pridať do panela"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Tlačidlo _panela"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Všetky"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Správanie"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Všetky nastavenia"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Príkazy"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu aplikácií"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Vyberte ikonu"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Veľkosť ikony _kategorie"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Zobraziť aplikácie podľa _mena"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Vymazať nedávne"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Zobraziť _popis aplikácie"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "_Zobraziť:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Umiestniť položku hľadať vedľa tlačidla panela"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Predvolene zobraziť nedávno _použité"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Umiestniť príkazy _vedľa položky hľadať"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Zlyhalo vykonanie príkazu „%s”."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Veľkosť ikony _položky"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Zlyhalo zamknutie obrazovky."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Veľkosť ikony _kategorie"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Zlyhalo odhlásenie."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "_Zobraziť:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Zlyhalo otvorenie správcu nastavení."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Obľúbené"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Názov"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikona a názov"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Názov:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "V Nedávno použitých zahrnúť _Obľúbené"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikona:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Veľkosť ikony _položky"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Nasledovať kategóriu po_d myšou"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Veľké"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Väčšie"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Načítať hierarchiu menu"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "V Nedávno použitých zahrnúť _Obľúbené"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Predvolene zobraziť nedávno _použité"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Nastavenia:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Zamknúť obrazovku"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "_Zamknúť obrazovku_"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Odhlásiť"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "_Odhlásiť:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Zoradiť abecedne A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normálne"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Zoradiť abecedne Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Umiestniť položku hľadať vedľa tlačidla panela"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Celkom malé"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Umiestniť príkazy _vedľa položky hľadať"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Menšie"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Nedávne"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Malé"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Odstrániť z obľúbených"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normálne"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Vyberte ikonu"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Veľké"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Zobrazí menu na ľahký prístup k nainštalovaným aplikáciám"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Väčšie"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Zobraziť _popis aplikácie"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Celkom veľké"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Zobraziť aplikácie podľa _mena"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Zlyhalo vykonanie príkazu „%s”."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Malé"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Všetky nastavenia"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Menšie"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Zamknúť obrazovku"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Zoradiť abecedne A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Odhlásiť"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Zoradiť abecedne Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Obľúbené"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Nasledovať kategóriu po_d myšou"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Nedávne"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Názov"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Zlyhalo otvorenie správcu nastavení."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Nemožno pridať spúšťač na plochu"
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Zlyhalo zamknutie obrazovky."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Nemožno pridať spúšťač do panela"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Zlyhalo odhlásenie."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Celkom veľké"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Pridať k obľúbeným"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Celkom malé"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Odstrániť z obľúbených"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker Menu"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Pridať na plochu"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "Vzhľ_ad"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Pridať do panela"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Správanie"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Nemožno pridať spúšťač na plochu"
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Príkazy"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Nemožno pridať spúšťač do panela"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikona:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu aplikácií"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Tlačidlo _panela"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Vymazať nedávne"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Nastavenia:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Názov:"
diff --git a/po/sk/CMakeLists.txt b/po/sk/CMakeLists.txt
deleted file mode 100644
index 24df2f1..0000000
--- a/po/sk/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(sk ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/sr at latin/xfce4-whiskermenu-plugin.po b/po/sr at latin.po
similarity index 58%
rename from po/sr at latin/xfce4-whiskermenu-plugin.po
rename to po/sr at latin.po
index c3719ce..281c3b0 100644
--- a/po/sr at latin/xfce4-whiskermenu-plugin.po
+++ b/po/sr at latin.po
@@ -7,223 +7,230 @@
 # Vladimir Rujević <vladimir.rujevic95 at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-19 13:35+0000\n"
 "Last-Translator: Vladimir Rujević <vladimir.rujevic95 at gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/sr@latin/)\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/sr at latin/)\n"
+"Language: sr at latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr at latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Sve"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Dodaj na radnu površinu"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Meni Whisker"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Dodaj u omiljene"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Izgled"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Dodaj na panel"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "Dugme _Panela"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Sve"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Ponašanje"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Sva podešavanja"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Komande"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Meni aplikacije"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Izaberi ikonu"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Veličina ikonice kategor_ije:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Prikaži aplikacije po _imenu"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Obriši nedvano korišćeno"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Prikaži _opis aplikacije"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Pri_kaži:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "Postavi _polje za pretragu pored dugmeta na panelu"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Prikaži nedavno _korišćeno kao opšte"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "Postavi komande pored polja _za pretragu"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Neuspelo izvrašavanje komande \"%s\""
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Stavk_a veličina ikone:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Neuspelo zaključavanje ekrana."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Veličina ikonice kategor_ije:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Neuspelo odjavljivanje."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Pri_kaži:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Neuspelo otvaranje menadžera podešavanja."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Omiljeni"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikona"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Naziv"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikona i naziv"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Naziv:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "Obuhvati _omiljene u nedavno korišćeno"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikona"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Stavk_a veličina ikone:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Zameni kategorije prilikom _zadržavanja"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Veliko"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Veće"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Učitaj hije_rarhiju menija"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "Obuhvati _omiljene u nedavno korišćeno"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Prikaži nedavno _korišćeno kao opšte"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Podešavanja:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Zaključaj ekran"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "Zaključaj _ekran:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Odjavi se"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Odjavi _se:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sortiraj abecedno A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normalno"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sortiraj abecedno Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "Postavi _polje za pretragu pored dugmeta na panelu"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Najmanje"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "Postavi komande pored polja _za pretragu"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Manje"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Nedavno korišćeno"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Malo"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Ukloni iz omiljenih"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normalno"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Izaberi ikonu"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Veliko"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Prikaži Meni za lak pristup instaliranim aplikacijama"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Veće"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Prikaži _opis aplikacije"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Najveće"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Prikaži aplikacije po _imenu"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Neuspelo izvrašavanje komande \"%s\""
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Malo"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Sva podešavanja"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Manje"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Zaključaj ekran"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sortiraj abecedno A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Odjavi se"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sortiraj abecedno Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Omiljeni"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Zameni kategorije prilikom _zadržavanja"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Nedavno korišćeno"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Naziv"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Neuspelo otvaranje menadžera podešavanja."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Neuspelo dodavanje pokretača na radnu površinu."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Neuspelo zaključavanje ekrana."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Neuspjelo dodavanje prečice na panel."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Neuspelo odjavljivanje."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Najveće"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Dodaj u omiljene"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Najmanje"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Ukloni iz omiljenih"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Meni Whisker"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Dodaj na radnu površinu"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Izgled"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Dodaj na panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Ponašanje"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Neuspelo dodavanje pokretača na radnu površinu."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Komande"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Neuspjelo dodavanje prečice na panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikona"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Meni aplikacije"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "Dugme _Panela"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Obriši nedvano korišćeno"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Podešavanja:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Naziv:"
diff --git a/po/sr at latin/CMakeLists.txt b/po/sr at latin/CMakeLists.txt
deleted file mode 100644
index f5522ae..0000000
--- a/po/sr at latin/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(sr at latin ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/sv/xfce4-whiskermenu-plugin.po b/po/sv.po
similarity index 56%
rename from po/sv/xfce4-whiskermenu-plugin.po
rename to po/sv.po
index 6f1aa8f..a912f0c 100644
--- a/po/sv/xfce4-whiskermenu-plugin.po
+++ b/po/sv.po
@@ -7,229 +7,235 @@
 # tsw <tarvidsson7834 at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-07-24 09:29+0000\n"
 "Last-Translator: addegsson <addegsson at gmail.com>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/sv_SE/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Alla"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Lägg till på skrivbordet"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whiskermeny"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Lägg till i favoriter"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Utseende"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Lägg till i panlen"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Panelknapp"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Alla"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Beteende"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Alla inställningar"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Programmeny"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Välj en ikon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kategori ikonstorlek:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Visa applikationer efter _namn"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Töm Nyligen Använda"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Applikations beskrivning"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Visa:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Misslyckades att exekvera kommando \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Objekt ikonstorlek:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Kan ej låsa skärmen."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kategori ikonstorlek:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Kan ej logga ut."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Visa:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Kan ej öppna inställningshanteraren."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Favoriter"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Titel"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Ikon och titel"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "Titel:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Ikon:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Byt kategori med muspekaren"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Objekt ikonstorlek:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Stor"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Större"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Alla inställningar"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Låskärm"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Låskärm"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Logga ut"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Logga ut"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sortera Alfabetiskt A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sortera Alfabetiskt Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Väldigt Liten"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Mindre"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Nyligen använda"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Liten"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Ta bort från favoriter"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Välj en ikon"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Stor"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "En meny för att visa dina installerade program"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Större"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Applikations beskrivning"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Väldigt Stor"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Visa applikationer efter _namn"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Misslyckades att exekvera kommando \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Liten"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Alla inställningar"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Mindre"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Låskärm"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sortera Alfabetiskt A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Logga ut"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sortera Alfabetiskt Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Favoriter"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Byt kategori med muspekaren"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Nyligen använda"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Titel"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Kan ej öppna inställningshanteraren."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Kan ej skapa skrivbordsgenväg."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Kan ej låsa skärmen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Kan ej lägga till i panelen."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Kan ej logga ut."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Väldigt Stor"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Lägg till i favoriter"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Väldigt Liten"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Ta bort från favoriter"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whiskermeny"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Lägg till på skrivbordet"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Utseende"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Lägg till i panlen"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Beteende"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Kan ej skapa skrivbordsgenväg."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Kan ej lägga till i panelen."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Ikon:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Programmeny"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Panelknapp"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Töm Nyligen Använda"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Alla inställningar"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "Titel:"
diff --git a/po/sv/CMakeLists.txt b/po/sv/CMakeLists.txt
deleted file mode 100644
index 539f612..0000000
--- a/po/sv/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(sv ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/tr/xfce4-whiskermenu-plugin.po b/po/tr.po
similarity index 57%
rename from po/tr/xfce4-whiskermenu-plugin.po
rename to po/tr.po
index 1b193e8..34ec73f 100644
--- a/po/tr/xfce4-whiskermenu-plugin.po
+++ b/po/tr.po
@@ -7,229 +7,235 @@
 # yfdogan <yfdogan at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-07-14 22:07+0000\n"
 "Last-Translator: yfdogan <yfdogan at gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Hepsi"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Masaüstüne Ekle"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Gözde Menü"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Gözdelere Ekle"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Görünüm"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Panele Ekle"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Panel Düğmesi"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Hepsi"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Davranış:"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Bütün Ayarlar"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Uygulamalar Menüsü"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Bir Simge Seçin"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kategori simge boyutu:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Uygulamaları _isme göre göster"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Yakında Kullanılanları Temizle"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Uygulama _tanımlarını göster"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "Görüntü:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "\"%s\" Komutunu Yürütme Hatası"
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Öğe simge boyutu:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Ekran Kilitleme Hatası"
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kategori simge boyutu:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Çıkış Hatası"
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "Görüntü:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Ayarlar Yöneticisini Açma Hatası"
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Gözdeler"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Simge"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Başlık"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Başlık ve Simge"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Başlık:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Simge"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Kategorileri gezintiye göre değiştir"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Öğe simge boyutu:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Büyük"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Daha büyük"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Bütün Ayarlar"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Ekranı Kilitle"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Ekranı Kilitle"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Çıkış"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Çıkış"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Alfabetik diz A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Normal"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Alfabetik diz Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Çok küçük"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Daha küçük"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Son Kullanılanlar"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Küçük"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Gözdelerden Kaldır"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Bir Simge Seçin"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Büyük"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Kurulu uygulamalara kolay erişim menüsünü göster"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Daha büyük"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Uygulama _tanımlarını göster"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Çok büyük"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Uygulamaları _isme göre göster"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "\"%s\" Komutunu Yürütme Hatası"
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Küçük"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Bütün Ayarlar"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Daha küçük"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Ekranı Kilitle"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Alfabetik diz A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Çıkış"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Alfabetik diz Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Gözdeler"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Kategorileri gezintiye göre değiştir"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Son Kullanılanlar"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Başlık"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Ayarlar Yöneticisini Açma Hatası"
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Çalıştırıcı Masaüstüne Eklenemedi"
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Ekran Kilitleme Hatası"
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Çalıştırıcı Panele Eklenemedi"
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Çıkış Hatası"
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Çok büyük"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Gözdelere Ekle"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Çok küçük"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Gözdelerden Kaldır"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Gözde Menü"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Masaüstüne Ekle"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Görünüm"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Panele Ekle"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Davranış:"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Çalıştırıcı Masaüstüne Eklenemedi"
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Çalıştırıcı Panele Eklenemedi"
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Simge"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Uygulamalar Menüsü"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Panel Düğmesi"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Yakında Kullanılanları Temizle"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Bütün Ayarlar"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Başlık:"
diff --git a/po/tr/CMakeLists.txt b/po/tr/CMakeLists.txt
deleted file mode 100644
index ac678aa..0000000
--- a/po/tr/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(tr ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 0000000..631e4b1
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,239 @@
+# Ukrainian translation of xfce4-whiskermenu-plugin.
+# Copyright (C) 2013 Graeme Gott
+# This file is distributed under the same license as the xfce4-whiskermenu-plugin package.
+#
+# Translators:
+# zubr139 <zubr139 at ukr.net>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Whisker Menu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
+"PO-Revision-Date: 2013-10-20 22:01+0000\n"
+"Last-Translator: zubr139 <zubr139 at ukr.net>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/uk/)\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Додати до стільниці"
+
+#: ../panel-plugin/page.cpp:195
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Додати на панель"
+
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Додати на панель"
+
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr ""
+
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Всі налаштування"
+
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr ""
+
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr ""
+
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr ""
+
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr ""
+
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr ""
+
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr ""
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:355
+msgid "Icon"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:357
+msgid "Icon and title"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr ""
+
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr ""
+
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
+msgstr ""
+
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Блокування екрану"
+
+#: ../panel-plugin/configuration-dialog.cpp:468
+#, fuzzy
+msgid "Lock _Screen:"
+msgstr "Блокування екрану"
+
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Вихід"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
+#, fuzzy
+msgid "Log _Out:"
+msgstr "Вихід"
+
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
+
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr ""
+
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr ""
+
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr ""
+
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr ""
+
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr ""
+
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr ""
+
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr ""
+
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr ""
+
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr ""
+
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr ""
+
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Всі налаштування"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr ""
diff --git a/po/uk/CMakeLists.txt b/po/uk/CMakeLists.txt
deleted file mode 100644
index 46682aa..0000000
--- a/po/uk/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(uk ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/uk/xfce4-whiskermenu-plugin.po b/po/uk/xfce4-whiskermenu-plugin.po
deleted file mode 100644
index 69d3b39..0000000
--- a/po/uk/xfce4-whiskermenu-plugin.po
+++ /dev/null
@@ -1,228 +0,0 @@
-# Ukrainian translation of xfce4-whiskermenu-plugin.
-# Copyright (C) 2013 Graeme Gott
-# This file is distributed under the same license as the xfce4-whiskermenu-plugin package.
-#
-# Translators:
-# zubr139 <zubr139 at ukr.net>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
-"PO-Revision-Date: 2013-10-20 22:01+0000\n"
-"Last-Translator: zubr139 <zubr139 at ukr.net>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/uk/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr ""
-
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr ""
-
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr ""
-
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr ""
-
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr ""
-
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
-
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr ""
-
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr ""
-
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr ""
-
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr ""
-
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
-
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:354
-msgid "Icon"
-msgstr ""
-
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr ""
-
-#: src/configuration_dialog.cpp:356
-msgid "Icon and title"
-msgstr ""
-
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr ""
-
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
-
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr ""
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:467
-msgid "Lock _Screen:"
-msgstr ""
-
-#: src/configuration_dialog.cpp:482
-msgid "Log _Out:"
-msgstr ""
-
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr ""
-
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr ""
-
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr ""
-
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr ""
-
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr ""
-
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr ""
-
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr ""
-
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr ""
-
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr ""
-
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr ""
-
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Всі налаштування"
-
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Блокування екрану"
-
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Вихід"
-
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr ""
-
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr ""
-
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr ""
-
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr ""
-
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr ""
-
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr ""
-
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr ""
-
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Додати до стільниці"
-
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Додати на панель"
-
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr ""
-
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr ""
-
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr ""
-
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr ""
diff --git a/po/update-po.sh b/po/update-po.sh
new file mode 100755
index 0000000..1571a4b
--- /dev/null
+++ b/po/update-po.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+
+BASEDIR=../panel-plugin
+WDIR=`pwd`
+
+
+echo -n 'Preparing desktop file...'
+cd ${BASEDIR}
+rm -f whiskermenu.desktop.in.h
+rm -f whiskermenu.desktop.in
+cp whiskermenu.desktop whiskermenu.desktop.in
+sed -e '/Name\[/ d' \
+	-e '/Comment\[/ d' \
+	-e 's/Name/_Name/' \
+	-e 's/Comment/_Comment/' \
+	-i whiskermenu.desktop.in
+intltool-extract --quiet --type=gettext/ini whiskermenu.desktop.in
+cd ${WDIR}
+echo ' DONE'
+
+
+echo -n 'Extracting messages...'
+# Sort alphabetically to match cmake
+xgettext --from-code=UTF-8 --c++ --keyword=_ --keyword=N_:1 --sort-output \
+	--package-name='Whisker Menu' --copyright-holder='Graeme Gott' \
+	--output=xfce4-whiskermenu-plugin.pot ${BASEDIR}/*.cpp ${BASEDIR}/*.h
+echo ' DONE'
+
+
+echo -n 'Merging translations...'
+for POFILE in *.po;
+do
+	echo -n " $POFILE"
+	msgmerge --quiet --update --backup=none $POFILE xfce4-whiskermenu-plugin.pot
+done
+echo ' DONE'
+
+
+echo -n 'Merging desktop file translations...'
+cd ${BASEDIR}
+intltool-merge --quiet --desktop-style ${WDIR} whiskermenu.desktop.in whiskermenu.desktop
+rm -f whiskermenu.desktop.in.h
+rm -f whiskermenu.desktop.in
+echo ' DONE'
diff --git a/po/uz/xfce4-whiskermenu-plugin.po b/po/uz.po
similarity index 59%
rename from po/uz/xfce4-whiskermenu-plugin.po
rename to po/uz.po
index f291a77..cb4f813 100644
--- a/po/uz/xfce4-whiskermenu-plugin.po
+++ b/po/uz.po
@@ -6,223 +6,229 @@
 # Umidjon Almasov <u.almasov at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-10-19 10:18+0000\n"
 "Last-Translator: Umidjon Almasov <u.almasov at gmail.com>\n"
-"Language-Team: Uzbek (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/uz/)\n"
+"Language-Team: Uzbek (http://www.transifex.com/projects/p/xfce4-whiskermenu-"
+"plugin/language/uz/)\n"
+"Language: uz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Hammasi"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Ishchi stolga qo'shish"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Whisker menyusi"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Tanlanganlarga qo'shish"
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
-msgstr "_Ko'rinish"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Panelga qo'shish"
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
-msgstr "_Panel tugmasi"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Hammasi"
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
-msgstr "_Xulqi"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Hamma moslamalar"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr "_Buyruqlar"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Dasturlar menyusi"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Nishonchani tanlash"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "_Toifa nishonchasinig o'lchami:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Dasturlarni _nomi bo'yicha ko'rsatish"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Yaqinda foydalanilganlarni tozalash"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Dastur _ta'riflarini ko'rsatish"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "_Ko'rsatish:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
-msgstr "_Qidirish elementini panel tugmasidan keyin joylashtirish"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
+msgstr "Yaqinda _foydalanilganlarni sukut bo'yicha ko'rsatish"
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr "_Buyruqlarni qidirish elementidan keyin joylashtirish"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "\"%s\" buyrug'ini bajarish muvaffaqiyatsiz tugadi."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "_Band nishonchasining o'lchami:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Ekranni qulflash muvaffaqiyatsiz tugadi."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "_Toifa nishonchasinig o'lchami:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Tizimdan chiqish muvaffaqiyatsiz tugadi."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "_Ko'rsatish:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Moslamalar boshqaruvchisini ochish muvaffaqiyatsiz tugadi."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Tanlanganlar"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Nishoncha"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Sarlavha"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Nishoncha va sarlavha"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Sarlavha"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr "_Tanlanganlarni yaqinda foydalanilganlarga qo'shish"
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Nishoncha:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "_Band nishonchasining o'lchami:"
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Toifalarni sichqoncha ustiga borganda o'zgartirish"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Katta"
 
-#: src/configuration_dialog.cpp:415
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Kattaroq"
+
+#: ../panel-plugin/configuration-dialog.cpp:416
 msgid "Load menu hie_rarchy"
 msgstr "Menyu _ierarxiyasini yuklash"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr "_Tanlanganlarni yaqinda foydalanilganlarga qo'shish"
-
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
-msgstr "Yaqinda _foydalanilganlarni sukut bo'yicha ko'rsatish"
-
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
-msgstr "_Moslamalar:"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Ekranni qulflash"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 msgid "Lock _Screen:"
 msgstr "_Ekranni qulflash:"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Tizimdan chiqish"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr "Tizimdan _chiqish:"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Alifbo bo'yicha saralash A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Oddiy"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Alifbo bo'yicha saralash Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr "_Qidirish elementini panel tugmasidan keyin joylashtirish"
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Juda kichik"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr "_Buyruqlarni qidirish elementidan keyin joylashtirish"
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Kichikroq"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Yaqinda foydalanilganlar"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Kichik"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Tanlanganlardan olib tashlash"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Oddiy"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Nishonchani tanlash"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Katta"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "O'rnatilgan dasturlarga oson yetish uchun menyu ko'rsatish"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Kattaroq"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Dastur _ta'riflarini ko'rsatish"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Juda katta"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Dasturlarni _nomi bo'yicha ko'rsatish"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "\"%s\" buyrug'ini bajarish muvaffaqiyatsiz tugadi."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Kichik"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Hamma moslamalar"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Kichikroq"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Ekranni qulflash"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Alifbo bo'yicha saralash A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Tizimdan chiqish"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Alifbo bo'yicha saralash Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Tanlanganlar"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Toifalarni sichqoncha ustiga borganda o'zgartirish"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Yaqinda foydalanilganlar"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Sarlavha"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Moslamalar boshqaruvchisini ochish muvaffaqiyatsiz tugadi."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Ishga tushiruvchini ishchi stolga qo'shib bo'lmadi."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Ekranni qulflash muvaffaqiyatsiz tugadi."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Ishga tushiruvchini panelga qo'shib bo'lmadi."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Tizimdan chiqish muvaffaqiyatsiz tugadi."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Juda katta"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Tanlanganlarga qo'shish"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Juda kichik"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Tanlanganlardan olib tashlash"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Whisker menyusi"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Ishchi stolga qo'shish"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
+msgstr "_Ko'rinish"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Panelga qo'shish"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
+msgstr "_Xulqi"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Ishga tushiruvchini ishchi stolga qo'shib bo'lmadi."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr "_Buyruqlar"
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Ishga tushiruvchini panelga qo'shib bo'lmadi."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Nishoncha:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Dasturlar menyusi"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
+msgstr "_Panel tugmasi"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Yaqinda foydalanilganlarni tozalash"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr "_Moslamalar:"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Sarlavha"
diff --git a/po/uz/CMakeLists.txt b/po/uz/CMakeLists.txt
deleted file mode 100644
index 7b20ca4..0000000
--- a/po/uz/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(uz ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/vi/xfce4-whiskermenu-plugin.po b/po/vi.po
similarity index 58%
rename from po/vi/xfce4-whiskermenu-plugin.po
rename to po/vi.po
index 2b8bee7..2efe9e8 100644
--- a/po/vi/xfce4-whiskermenu-plugin.po
+++ b/po/vi.po
@@ -6,229 +6,235 @@
 # ppanhh <ppanhh at gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: 2013-07-13 01:38+0000\n"
 "Last-Translator: ppanhh <ppanhh at gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/projects/p/xfce4-"
+"whiskermenu-plugin/language/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
-msgstr "Tất cả"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
+msgstr "Thêm vào Desktop"
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
-msgstr "Menu Tách Biệt"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
+msgstr "Thêm vào Ưa Thích"
 
-#: src/configuration_dialog.cpp:65
-#, fuzzy
-msgid "_Appearance"
-msgstr "Giao diện"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
+msgstr "Thêm và Khung"
 
-#: src/configuration_dialog.cpp:66
-#, fuzzy
-msgid "_Panel Button"
-msgstr "Nút điều khiển"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
+msgstr "Tất cả"
 
-#: src/configuration_dialog.cpp:67
-#, fuzzy
-msgid "_Behavior"
-msgstr "Tác động"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
+msgstr "Tất cả thiết lập"
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
-msgstr ""
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
+msgstr "Menu ứng dụng"
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
-msgstr "Chọn một biểu tượng"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
+msgstr "Kích thướ_c biểu tượng phân loại:"
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
-msgstr "Hiển thị ứng dụng bằng_tên"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
+msgstr "Dọn danh sách được dùng gần đây"
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
-msgstr "Hiển thị mô tả_ứng dụng"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
+msgstr "H_iển thị:"
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
-msgstr ""
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
+msgstr "Thất bại khi thi hành lệnh \"%s\"."
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
-msgstr "Kí_ch thước biểu tượng đối tượng:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
+msgstr "Thất bại khi khóa màn hình."
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
-msgstr "Kích thướ_c biểu tượng phân loại:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
+msgstr "Thất bại khi đăng xuất."
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
-msgstr "H_iển thị:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
+msgstr "Thất bại khi mở quản lý thiết lập."
+
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
+msgstr "Ưa Thích"
 
-#: src/configuration_dialog.cpp:354
+#: ../panel-plugin/configuration-dialog.cpp:355
 msgid "Icon"
 msgstr "Biểu tượng"
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
-msgstr "Tiêu đề"
-
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr "Tiêu đề và biểu tượng"
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
-msgstr "_Tiêu đề:"
-
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
-msgstr "_Biểu tượng:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
+msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
-msgstr "Chuyển đổi tiêu đề khi rê ch_uột"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
+msgstr "Kí_ch thước biểu tượng đối tượng:"
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
+msgstr "Lớn"
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
-msgstr ""
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
+msgstr "Lớn hơn"
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-#, fuzzy
-msgid "_Settings:"
-msgstr "Tất cả thiết lập"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
+msgstr "Khóa màn hình"
 
-#: src/configuration_dialog.cpp:467
+#: ../panel-plugin/configuration-dialog.cpp:468
 #, fuzzy
 msgid "Lock _Screen:"
 msgstr "Khóa màn hình"
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
+msgstr "Đăng xuất"
+
+#: ../panel-plugin/configuration-dialog.cpp:483
 #, fuzzy
 msgid "Log _Out:"
 msgstr "Đăng xuất"
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
-msgstr "Sắp xếp theo thứ tự A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
+msgstr "Bình thường"
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
-msgstr "Sắp xếp theo thứ tự Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
+msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
-msgstr "Rất nhỏ"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
+msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
-msgstr "Nhỏ hơn"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
+msgstr "Truy cập gần đây"
 
-#: src/icon_size.cpp:52
-msgid "Small"
-msgstr "Nhỏ"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
+msgstr "Loại bỏ khỏi Ưa Thích"
 
-#: src/icon_size.cpp:53
-msgid "Normal"
-msgstr "Bình thường"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
+msgstr "Chọn một biểu tượng"
 
-#: src/icon_size.cpp:54
-msgid "Large"
-msgstr "Lớn"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
+msgstr "Hiển thị menu để dễ dàng truy cập tới các ứng dụng đã cài đặt"
 
-#: src/icon_size.cpp:55
-msgid "Larger"
-msgstr "Lớn hơn"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
+msgstr "Hiển thị mô tả_ứng dụng"
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
-msgstr "Rất lớn"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
+msgstr "Hiển thị ứng dụng bằng_tên"
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
-msgstr "Thất bại khi thi hành lệnh \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
+msgstr "Nhỏ"
 
-#: src/menu.cpp:110
-msgid "All Settings"
-msgstr "Tất cả thiết lập"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
+msgstr "Nhỏ hơn"
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
-msgstr "Khóa màn hình"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
+msgstr "Sắp xếp theo thứ tự A-Z"
 
-#: src/menu.cpp:116
-msgid "Log Out"
-msgstr "Đăng xuất"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
+msgstr "Sắp xếp theo thứ tự Z-A"
 
-#: src/menu.cpp:130
-msgid "Favorites"
-msgstr "Ưa Thích"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
+msgstr "Chuyển đổi tiêu đề khi rê ch_uột"
 
-#: src/menu.cpp:136
-msgid "Recently Used"
-msgstr "Truy cập gần đây"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
+msgstr "Tiêu đề"
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
-msgstr "Thất bại khi mở quản lý thiết lập."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
+msgstr "Không thể thêm vào thanh truy cập nhanh ở desktop."
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
-msgstr "Thất bại khi khóa màn hình."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
+msgstr "Không thể thêm vào thanh truy cập nhanh hay khung."
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
-msgstr "Thất bại khi đăng xuất."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
+msgstr "Rất lớn"
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
-msgstr "Thêm vào Ưa Thích"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
+msgstr "Rất nhỏ"
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
-msgstr "Loại bỏ khỏi Ưa Thích"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
+msgstr "Menu Tách Biệt"
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
-msgstr "Thêm vào Desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+#, fuzzy
+msgid "_Appearance"
+msgstr "Giao diện"
 
-#: src/page.cpp:213
-msgid "Add to Panel"
-msgstr "Thêm và Khung"
+#: ../panel-plugin/configuration-dialog.cpp:68
+#, fuzzy
+msgid "_Behavior"
+msgstr "Tác động"
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
-msgstr "Không thể thêm vào thanh truy cập nhanh ở desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
+msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
-msgstr "Không thể thêm vào thanh truy cập nhanh hay khung."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
+msgstr "_Biểu tượng:"
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
-msgstr "Menu ứng dụng"
+#: ../panel-plugin/configuration-dialog.cpp:67
+#, fuzzy
+msgid "_Panel Button"
+msgstr "Nút điều khiển"
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
-msgstr "Dọn danh sách được dùng gần đây"
+#: ../panel-plugin/configuration-dialog.cpp:453
+#, fuzzy
+msgid "_Settings:"
+msgstr "Tất cả thiết lập"
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
+msgstr "_Tiêu đề:"
diff --git a/po/vi/CMakeLists.txt b/po/vi/CMakeLists.txt
deleted file mode 100644
index 5523be4..0000000
--- a/po/vi/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-GETTEXT_PROCESS_PO_FILES(vi ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po)
diff --git a/po/xfce4-whiskermenu-plugin.pot b/po/xfce4-whiskermenu-plugin.pot
index 3fff20b..cae83b6 100644
--- a/po/xfce4-whiskermenu-plugin.pot
+++ b/po/xfce4-whiskermenu-plugin.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2013 Graeme Gott
-# This file is distributed under the same license as the xfce4-whiskermenu-plugin package.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n"
+"Project-Id-Version: Whisker Menu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-09 22:00+0000\n"
+"POT-Creation-Date: 2013-10-31 20:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,211 +17,216 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/applications_page.cpp:312
-msgid "All"
+#: ../panel-plugin/page.cpp:210
+msgid "Add to Desktop"
 msgstr ""
 
-#: src/configuration_dialog.cpp:57
-msgid "Whisker Menu"
+#: ../panel-plugin/page.cpp:195
+msgid "Add to Favorites"
 msgstr ""
 
-#: src/configuration_dialog.cpp:65
-msgid "_Appearance"
+#: ../panel-plugin/page.cpp:214
+msgid "Add to Panel"
 msgstr ""
 
-#: src/configuration_dialog.cpp:66
-msgid "_Panel Button"
+#: ../panel-plugin/applications-page.cpp:313
+msgid "All"
 msgstr ""
 
-#: src/configuration_dialog.cpp:67
-msgid "_Behavior"
+#: ../panel-plugin/window.cpp:97
+msgid "All Settings"
 msgstr ""
 
-#: src/configuration_dialog.cpp:68
-msgid "_Commands"
+#: ../panel-plugin/plugin.cpp:162
+msgid "Applications Menu"
 msgstr ""
 
-#: src/configuration_dialog.cpp:94
-msgid "Select An Icon"
+#: ../panel-plugin/configuration-dialog.cpp:314
+msgid "Categ_ory icon size:"
 msgstr ""
 
-#: src/configuration_dialog.cpp:265
-msgid "Show applications by _name"
+#: ../panel-plugin/recent-page.cpp:72
+msgid "Clear Recently Used"
 msgstr ""
 
-#: src/configuration_dialog.cpp:271
-msgid "Show application _descriptions"
+#: ../panel-plugin/configuration-dialog.cpp:349
+msgid "Di_splay:"
 msgstr ""
 
-#: src/configuration_dialog.cpp:277
-msgid "Position _search entry next to panel button"
+#: ../panel-plugin/configuration-dialog.cpp:428
+msgid "Display recently _used by default"
 msgstr ""
 
-#: src/configuration_dialog.cpp:283
-msgid "Position commands next to search _entry"
+#: ../panel-plugin/launcher.cpp:259
+#, c-format
+msgid "Failed to execute command \"%s\"."
 msgstr ""
 
-#: src/configuration_dialog.cpp:293
-msgid "Ite_m icon size:"
+#: ../panel-plugin/window.cpp:100
+msgid "Failed to lock screen."
 msgstr ""
 
-#: src/configuration_dialog.cpp:313
-msgid "Categ_ory icon size:"
+#: ../panel-plugin/window.cpp:103
+msgid "Failed to log out."
 msgstr ""
 
-#: src/configuration_dialog.cpp:348
-msgid "Di_splay:"
+#: ../panel-plugin/window.cpp:97
+msgid "Failed to open settings manager."
 msgstr ""
 
-#: src/configuration_dialog.cpp:354
-msgid "Icon"
+#: ../panel-plugin/window.cpp:117
+msgid "Favorites"
 msgstr ""
 
-#: src/configuration_dialog.cpp:355
-msgid "Title"
+#: ../panel-plugin/configuration-dialog.cpp:355
+msgid "Icon"
 msgstr ""
 
-#: src/configuration_dialog.cpp:356
+#: ../panel-plugin/configuration-dialog.cpp:357
 msgid "Icon and title"
 msgstr ""
 
-#: src/configuration_dialog.cpp:366
-msgid "_Title:"
+#: ../panel-plugin/configuration-dialog.cpp:422
+msgid "Include _favorites in recently used"
 msgstr ""
 
-#: src/configuration_dialog.cpp:381
-msgid "_Icon:"
+#: ../panel-plugin/configuration-dialog.cpp:294
+msgid "Ite_m icon size:"
 msgstr ""
 
-#: src/configuration_dialog.cpp:409
-msgid "Switch categories by _hovering"
+#: ../panel-plugin/icon-size.cpp:55
+msgid "Large"
 msgstr ""
 
-#: src/configuration_dialog.cpp:415
-msgid "Load menu hie_rarchy"
+#: ../panel-plugin/icon-size.cpp:56
+msgid "Larger"
 msgstr ""
 
-#: src/configuration_dialog.cpp:421
-msgid "Include _favorites in recently used"
+#: ../panel-plugin/configuration-dialog.cpp:416
+msgid "Load menu hie_rarchy"
 msgstr ""
 
-#: src/configuration_dialog.cpp:427
-msgid "Display recently _used by default"
+#: ../panel-plugin/window.cpp:100
+msgid "Lock Screen"
 msgstr ""
 
-#: src/configuration_dialog.cpp:452
-msgid "_Settings:"
+#: ../panel-plugin/configuration-dialog.cpp:468
+msgid "Lock _Screen:"
 msgstr ""
 
-#: src/configuration_dialog.cpp:467
-msgid "Lock _Screen:"
+#: ../panel-plugin/window.cpp:103
+msgid "Log Out"
 msgstr ""
 
-#: src/configuration_dialog.cpp:482
+#: ../panel-plugin/configuration-dialog.cpp:483
 msgid "Log _Out:"
 msgstr ""
 
-#: src/favorites_page.cpp:89
-msgid "Sort Alphabetically A-Z"
+#: ../panel-plugin/icon-size.cpp:54
+msgid "Normal"
 msgstr ""
 
-#: src/favorites_page.cpp:95
-msgid "Sort Alphabetically Z-A"
+#: ../panel-plugin/configuration-dialog.cpp:278
+msgid "Position _search entry next to panel button"
 msgstr ""
 
-#: src/icon_size.cpp:50
-msgid "Very Small"
+#: ../panel-plugin/configuration-dialog.cpp:284
+msgid "Position commands next to search _entry"
 msgstr ""
 
-#: src/icon_size.cpp:51
-msgid "Smaller"
+#: ../panel-plugin/window.cpp:123
+msgid "Recently Used"
 msgstr ""
 
-#: src/icon_size.cpp:52
-msgid "Small"
+#: ../panel-plugin/page.cpp:203
+msgid "Remove From Favorites"
 msgstr ""
 
-#: src/icon_size.cpp:53
-msgid "Normal"
+#: ../panel-plugin/configuration-dialog.cpp:95
+msgid "Select An Icon"
 msgstr ""
 
-#: src/icon_size.cpp:54
-msgid "Large"
+#: ../panel-plugin/whiskermenu.desktop.in.h:2
+msgid "Show a menu to easily access installed applications"
 msgstr ""
 
-#: src/icon_size.cpp:55
-msgid "Larger"
+#: ../panel-plugin/configuration-dialog.cpp:272
+msgid "Show application _descriptions"
 msgstr ""
 
-#: src/icon_size.cpp:56
-msgid "Very Large"
+#: ../panel-plugin/configuration-dialog.cpp:266
+msgid "Show applications by _name"
 msgstr ""
 
-#: src/launcher.cpp:259
-#, c-format
-msgid "Failed to execute command \"%s\"."
+#: ../panel-plugin/icon-size.cpp:53
+msgid "Small"
 msgstr ""
 
-#: src/menu.cpp:110
-msgid "All Settings"
+#: ../panel-plugin/icon-size.cpp:52
+msgid "Smaller"
 msgstr ""
 
-#: src/menu.cpp:113
-msgid "Lock Screen"
+#: ../panel-plugin/favorites-page.cpp:90
+msgid "Sort Alphabetically A-Z"
 msgstr ""
 
-#: src/menu.cpp:116
-msgid "Log Out"
+#: ../panel-plugin/favorites-page.cpp:96
+msgid "Sort Alphabetically Z-A"
 msgstr ""
 
-#: src/menu.cpp:130
-msgid "Favorites"
+#: ../panel-plugin/configuration-dialog.cpp:410
+msgid "Switch categories by _hovering"
 msgstr ""
 
-#: src/menu.cpp:136
-msgid "Recently Used"
+#: ../panel-plugin/configuration-dialog.cpp:356
+msgid "Title"
 msgstr ""
 
-#: src/menu.cpp:963
-msgid "Failed to open settings manager."
+#: ../panel-plugin/page.cpp:304
+msgid "Unable to add launcher to desktop."
 msgstr ""
 
-#: src/menu.cpp:977
-msgid "Failed to lock screen."
+#: ../panel-plugin/page.cpp:343 ../panel-plugin/page.cpp:352
+msgid "Unable to add launcher to panel."
 msgstr ""
 
-#: src/menu.cpp:991
-msgid "Failed to log out."
+#: ../panel-plugin/icon-size.cpp:57
+msgid "Very Large"
 msgstr ""
 
-#: src/page.cpp:194
-msgid "Add to Favorites"
+#: ../panel-plugin/icon-size.cpp:51
+msgid "Very Small"
 msgstr ""
 
-#: src/page.cpp:202
-msgid "Remove From Favorites"
+#: ../panel-plugin/configuration-dialog.cpp:58
+#: ../panel-plugin/whiskermenu.desktop.in.h:1
+msgid "Whisker Menu"
 msgstr ""
 
-#: src/page.cpp:209
-msgid "Add to Desktop"
+#: ../panel-plugin/configuration-dialog.cpp:66
+msgid "_Appearance"
 msgstr ""
 
-#: src/page.cpp:213
-msgid "Add to Panel"
+#: ../panel-plugin/configuration-dialog.cpp:68
+msgid "_Behavior"
 msgstr ""
 
-#: src/page.cpp:303
-msgid "Unable to add launcher to desktop."
+#: ../panel-plugin/configuration-dialog.cpp:69
+msgid "_Commands"
 msgstr ""
 
-#: src/page.cpp:342 src/page.cpp:351
-msgid "Unable to add launcher to panel."
+#: ../panel-plugin/configuration-dialog.cpp:382
+msgid "_Icon:"
 msgstr ""
 
-#: src/panel_plugin.cpp:160
-msgid "Applications Menu"
+#: ../panel-plugin/configuration-dialog.cpp:67
+msgid "_Panel Button"
 msgstr ""
 
-#: src/recent_page.cpp:71
-msgid "Clear Recently Used"
+#: ../panel-plugin/configuration-dialog.cpp:453
+msgid "_Settings:"
+msgstr ""
+
+#: ../panel-plugin/configuration-dialog.cpp:367
+msgid "_Title:"
 msgstr ""
diff --git a/update-po.sh b/update-po.sh
deleted file mode 100755
index eb530bf..0000000
--- a/update-po.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-xgettext --language=C++ --keyword=_ --package-name="xfce4-whiskermenu-plugin" --package-version="1.2.0" `find src -name \*.cpp | sort` -o po/xfce4-whiskermenu-plugin.pot
-
-for pofile in `find po -name \*.po`;
-do
-	msgmerge --quiet --update --backup=none $pofile po/xfce4-whiskermenu-plugin.pot
-done

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list