[Xfce4-commits] <xfce4-xkb-plugin:master> Rerun make update-po.

Igor Slepchin noreply at xfce.org
Wed Aug 22 23:24:18 CEST 2012


Updating branch refs/heads/master
         to b3116497bbc3d8078d50f1ef00e2efd7c8c85bd8 (commit)
       from 18afdce6c6e868426fd8f188478dabc23fb4cf46 (commit)

commit b3116497bbc3d8078d50f1ef00e2efd7c8c85bd8
Author: Igor Slepchin <igor.slepchin at gmail.com>
Date:   Fri Jul 27 21:15:16 2012 -0400

    Rerun make update-po.

 po/ar.po                |  121 +++++++++++------------
 po/ast.po               |  113 ++++++++++------------
 po/be.po                |  121 +++++++++++------------
 po/bg.po                |  122 +++++++++++------------
 po/ca.po                |  117 +++++++++++------------
 po/cs.po                |  117 +++++++++++------------
 po/da.po                |  119 +++++++++++------------
 po/de.po                |  121 +++++++++++------------
 po/el.po                |  117 +++++++++++------------
 po/en_GB.po             |  123 +++++++++++------------
 po/es.po                |  121 +++++++++++------------
 po/eu.po                |  121 +++++++++++------------
 po/fr.po                |  123 +++++++++++------------
 po/gl.po                |  119 ++++++++++-------------
 po/hr.po                |  115 ++++++++++------------
 po/hu.po                |  121 +++++++++++------------
 po/id.po                |  121 +++++++++++------------
 po/it.po                |  127 +++++++++++-------------
 po/ja.po                |  121 +++++++++++------------
 po/ka.po                |  120 +++++++++++------------
 po/kk.po                |  121 +++++++++++------------
 po/ko.po                |  121 +++++++++++------------
 po/lt.po                |  117 +++++++++++------------
 po/lv.po                |  113 ++++++++++------------
 po/nl.po                |  123 +++++++++++------------
 po/pl.po                |  115 ++++++++++------------
 po/pt.po                |  118 +++++++++++------------
 po/pt_BR.po             |  121 +++++++++++------------
 po/ro.po                |  113 ++++++++++------------
 po/ru.po                |  121 +++++++++++------------
 po/sk.po                |  119 +++++++++++------------
 po/sq.po                |  110 +++++++++------------
 po/sv.po                |  113 ++++++++++------------
 po/tr.po                |  117 ++++++++++------------
 po/ug.po                |  248 +++++++++++++++++++++++------------------------
 po/uk.po                |  124 +++++++++++------------
 po/ur.po                |  113 ++++++++++------------
 po/ur_PK.po             |  113 ++++++++++------------
 po/xfce4-xkb-plugin.pot |   75 ++++-----------
 po/zh_CN.po             |  117 +++++++++++------------
 po/zh_TW.po             |  117 +++++++++++------------
 41 files changed, 2286 insertions(+), 2663 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index c5698ce..f91f882 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,129 +1,122 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-08-12 15:43-0000\n"
 "Last-Translator: كريم أولاد الشلحة <herr.linux88 at gmail.com>\n"
 "Language-Team: Arabic Xfce Translation Team <herr.linux88 at gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: Arabic\n"
 "X-Poedit-Country: Morocco\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB ضبط التحريرات\n"
-"معطل من ملف التكوين.\n"
-"\n"
-"شاهد ملف README للمزيد من المعلومات."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "تخطيطات لوحة المفاتيح"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "نموذج لوحة المفاتيح:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "تغيير خيارات التخطيط:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "تكوين موقع المفتاح:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "تخطيطات لوحة المفاتيح"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "إفتراضي"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "تخطيط"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "متغير"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "أظهر التخطيط كـ:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "صورة"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "نص"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "حجم النص:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "صغير"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "متوسط"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "كبير"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "إدارة التخطيطات:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "للكل"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "حسب النوافذ"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "حسب التطبيق"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "إضافة تخطيطات لوحة المفاتيح"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "السماح لك بضبط و إستعمال عدة تخطيطات لوحة المفاتيح."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "إضافات أخرى متوفرة هنا"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "أضف تخطيط"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "تخطيطات لوحة المفاتيح"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "إعدادات تخطيطات لوحة المفاتيح و إضافة المفتاح"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB ضبط التحريرات\n"
+#~ "معطل من ملف التكوين.\n"
+#~ "\n"
+#~ "شاهد ملف README للمزيد من المعلومات."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "نموذج لوحة المفاتيح:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "تغيير خيارات التخطيط:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "تكوين موقع المفتاح:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "تخطيطات لوحة المفاتيح"
+
+#~ msgid "Default"
+#~ msgstr "إفتراضي"
+
+#~ msgid "Layout"
+#~ msgstr "تخطيط"
+
+#~ msgid "Variant"
+#~ msgstr "متغير"
+
+#~ msgid "Add layout"
+#~ msgstr "أضف تخطيط"
diff --git a/po/ast.po b/po/ast.po
index dded4ae..383d1e6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-07-13 19:55+0100\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -12,117 +12,104 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"La modificación de configuración de XKB ta\n"
-"desactivada nel ficheru de configuración.\n"
-"\n"
-"Llea'l ficheru README pa más información."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Distribuciones de tecláu"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Modelu tecláu:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Camudar opción de distribución:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Definir sitiu de tecla:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Distribuciones de tecláu:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Amestar distribución"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Amosar distribución como:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imaxen"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "testu"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Alministrar distribución:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalmente"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per ventana"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per aplicación"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Complementu de distribuciones de tecláu"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Permite-y configurar y usar delles distribuciones de tecláu."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Otros complementos disponibles equí"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Amestar distribución"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Distribuciones de tecláu"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Complementu de configuración y seleición de distribuciones de tecláu"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "La modificación de configuración de XKB ta\n"
+#~ "desactivada nel ficheru de configuración.\n"
+#~ "\n"
+#~ "Llea'l ficheru README pa más información."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Modelu tecláu:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Camudar opción de distribución:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Definir sitiu de tecla:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Distribuciones de tecláu:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Amestar distribución"
+
+#~ msgid "Add layout"
+#~ msgstr "Amestar distribución"
diff --git a/po/be.po b/po/be.po
index 8ebe562..8e1f5fb 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,130 +2,123 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Alexander Nyakhaychyk <nyakhaychyk at gmail.com>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2008-11-09 13:58+0200\n"
 "Last-Translator: Alexander Nyakhaychyk <nyakhaychyk at gmail.com>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Мадыфікатары канфігурацыі XKB адключаныя\n"
-"ў файле наладак.\n"
-"\n"
-"Па даведку зьвяртайцеся ў файл README."
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Раскладкі клявіятуры"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Мадэль клявіятуры:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Опцыі раскладкі:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Прызначыць клавішу Compose:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Раскладкі клявіятуры:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Па-змоўчванню"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Разкладка"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Варыянт"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Інфармаваць пра раскладку ў выглядзе:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "відарыса"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "тэксту"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Памер тэксту"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "маленькі"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "сярэдні"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "вялікі"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Дзеяньне раскладкі:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "глябальнае"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "для кожнага вакна"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "для кожнага дастасаваньня"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Модуль раскладак клявіятуры"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Дазваляе вам наладжіць і выкарыстоўваць некалькі раскладак клявіятуры."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Іншыя наяўныя ўтулкі"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Дадаць раскладку"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Раскладкі клявіятуры"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Модуль наладкі й пераключэньня раскладак клявіятуры"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Мадыфікатары канфігурацыі XKB адключаныя\n"
+#~ "ў файле наладак.\n"
+#~ "\n"
+#~ "Па даведку зьвяртайцеся ў файл README."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Мадэль клявіятуры:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Опцыі раскладкі:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Прызначыць клавішу Compose:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Раскладкі клявіятуры:"
+
+#~ msgid "Default"
+#~ msgstr "Па-змоўчванню"
+
+#~ msgid "Layout"
+#~ msgstr "Разкладка"
+
+#~ msgid "Variant"
+#~ msgstr "Варыянт"
+
+#~ msgid "Add layout"
+#~ msgstr "Дадаць раскладку"
diff --git a/po/bg.po b/po/bg.po
index 715a6cc..86fc1e6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,126 +7,120 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-12-29 00:03+0200\n"
 "Last-Translator: Milen Milev <fanfolet at gmail.com>\n"
 "Language-Team: Bulgarian <sasoiliev at mamul.org>\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"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Промяната на XKB конфигурацията е забранена\n"
-"от конфигурационния файл.\n"
-"\n"
-"За повече информация вижте README файла."
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Клавиатурни подредби"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Модел клавиатура:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Промяна на подредбата:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Позиция на клавиша Compose:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Клавиатурни подредби:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "По подразбиране"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Подредба"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Вариант"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Показване на подредбата като:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "картинка"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "текст"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Размер на текста:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "малък"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "среден"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "голям"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Помни подредбата:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "глобално"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "за всеки прозорец"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "за всяко приложение"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Клавиатурна подредба"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
-msgstr "Позволява Ви да конфигурирате и използвате повече от една клавиатурна подредба."
+msgstr ""
+"Позволява Ви да конфигурирате и използвате повече от една клавиатурна "
+"подредба."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Тук ще намерите други плъгини"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Добави подредба"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Клавиатурни подредби"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Плъгин за настройка и превключване на клавиатурни подредби"
 
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Промяната на XKB конфигурацията е забранена\n"
+#~ "от конфигурационния файл.\n"
+#~ "\n"
+#~ "За повече информация вижте README файла."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Модел клавиатура:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Промяна на подредбата:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Позиция на клавиша Compose:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Клавиатурни подредби:"
+
+#~ msgid "Default"
+#~ msgstr "По подразбиране"
+
+#~ msgid "Layout"
+#~ msgstr "Подредба"
+
+#~ msgid "Variant"
+#~ msgstr "Вариант"
+
+#~ msgid "Add layout"
+#~ msgstr "Добави подредба"
diff --git a/po/ca.po b/po/ca.po
index 53038a5..3f0ab00 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-01-15 19:52+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\n"
@@ -20,121 +20,114 @@ msgstr ""
 "X-Poedit-Language: Catalan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Les modificacions de la configuració de XKB\n"
-"s'han deshabilitat en el fitxer de configuració.\n"
-"\n"
-"Mireu el fitxer README per més informació."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Tipus de teclat"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model de teclat:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Canvia les opcions del tipus:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Posició de la tecla «Compose»:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Tipus de teclat:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Per defecte"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Tipus"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variant"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Mostra el tipus com:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imatge"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Mida del text:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "petit"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "mitjà"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "gran"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Gestiona el tipus:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalment"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per finestra"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per aplicació"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Connector de tipus de teclat"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Us permet configurar i emprar diversos tipus de teclat."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Altres connectors disponibles"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Afegeix tipus"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Tipus de teclat"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Connector de configuració i canvi del tipus teclat"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Les modificacions de la configuració de XKB\n"
+#~ "s'han deshabilitat en el fitxer de configuració.\n"
+#~ "\n"
+#~ "Mireu el fitxer README per més informació."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model de teclat:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Canvia les opcions del tipus:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Posició de la tecla «Compose»:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Tipus de teclat:"
+
+#~ msgid "Default"
+#~ msgstr "Per defecte"
+
+#~ msgid "Layout"
+#~ msgstr "Tipus"
+
+#~ msgid "Variant"
+#~ msgstr "Variant"
+
+#~ msgid "Add layout"
+#~ msgstr "Afegeix tipus"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index e762328..69c74e4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-01-08 16:29+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -17,121 +17,114 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Změny konfigurace XKB jsou zakázány\n"
-"souborem konfigurace.\n"
-"\n"
-"Více informací naleznete v souboru README (v angličtině)."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Rozložení klávesnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model klávesnice:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Volba změny rozložení:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Složení pozice klávesy:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Rozložení klávesnice:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Výchozí"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Rozložení"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Varianta"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Zobrazit rozložení jako:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "obrázek"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Velikost textu:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "malý"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "střední"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "velký"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Spravovat rozložení:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globálně"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "pro jednotlivá okna"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "pro jednotlivé aplikace"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Přepínač rozložení klávesnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Umožňuje konfigurovat a používat více rozložení klávesnic."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Další zásuvné moduly jsou dostupné zde"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Přidat rozložení"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Rozložení klávesnice"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Nastavuje a přepíná rozložení klávesnice"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Změny konfigurace XKB jsou zakázány\n"
+#~ "souborem konfigurace.\n"
+#~ "\n"
+#~ "Více informací naleznete v souboru README (v angličtině)."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model klávesnice:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Volba změny rozložení:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Složení pozice klávesy:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Rozložení klávesnice:"
+
+#~ msgid "Default"
+#~ msgstr "Výchozí"
+
+#~ msgid "Layout"
+#~ msgstr "Rozložení"
+
+#~ msgid "Variant"
+#~ msgstr "Varianta"
+
+#~ msgid "Add layout"
+#~ msgstr "Přidat rozložení"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/da.po b/po/da.po
index dba967f..a0809e9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,128 +7,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-08-22 17:17+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\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"
 "X-Poedit-Language: Danish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: DENMARK\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB-indstillingsmuligheder er\n"
-"blevet slået fra i config-fil.\n"
-"\n"
-"Se README-fil for flere informationer."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Tastaturlayouts"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Tastaturmodel:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Ændr layoutindstilling:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Position af sammensætningstast:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Tastaturlayouts:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Standard"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Layout"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variant"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Vis layout som:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "billede"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "tekst"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Tekst størrelse:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "lille"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "mellem"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "stor"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Håndtér layout:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalt"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "hvert vindue"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "hvert program"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Udvidelsesmodul til tastaturlayouts"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Tillader dig at indstille og bruge flere tastaturlayouts."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Andre plugins er tilgængelige her"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Tilføj layout"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Tastaturlayouts"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Udvidelsesmodul til indstilling og skift af tastaturlayout"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB-indstillingsmuligheder er\n"
+#~ "blevet slået fra i config-fil.\n"
+#~ "\n"
+#~ "Se README-fil for flere informationer."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Tastaturmodel:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Ændr layoutindstilling:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Position af sammensætningstast:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Tastaturlayouts:"
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Layout"
+#~ msgstr "Layout"
+
+#~ msgid "Variant"
+#~ msgstr "Variant"
+
+#~ msgid "Add layout"
+#~ msgstr "Tilføj layout"
diff --git a/po/de.po b/po/de.po
index f461c20..2c637f2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,138 +4,131 @@
 # xfce4-xkb-plugin package.
 # Frank Lanitz <frank at frank.uvena.de>, 2006.
 # Fabian Nowak <timystery at arcor.de>, 2007, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2008-11-03 22:21+0100\n"
 "Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
 "Language-Team: <frank at frank.uvena.de>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Veränderungen an der XKB-Konfiguration\n"
-"sind in der Einstellungsdatei abgeschaltet.\n"
-"\n"
-"Lesen Sie die Datei »README« für weitere Informationen."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Tastaturbelegung"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Tastaturmodell:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Belegung ändern:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Position der Compose-Taste:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Tastaturbelegungen:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Vorgabe"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Tastaturbelegung"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variante"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Zeige Belegung an als:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "Bild"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "Text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Textgröße:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "klein"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "mittel"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "groß"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Belegung verwalten:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "global"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "pro Fenster"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "pro Anwendung"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Tastaturbelegungs-Plugin"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Ermöglicht das Einstellen und Verwenden verschiedener Tastaturbelegungen."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Weitere Plugins kann man hier finden"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Tastaturbelegung hinzufügen"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Tastaturbelegung"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Plugin zum Einstellen und Umschalten der Tastaturbelegung"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Veränderungen an der XKB-Konfiguration\n"
+#~ "sind in der Einstellungsdatei abgeschaltet.\n"
+#~ "\n"
+#~ "Lesen Sie die Datei »README« für weitere Informationen."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Tastaturmodell:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Belegung ändern:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Position der Compose-Taste:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Tastaturbelegungen:"
+
+#~ msgid "Default"
+#~ msgstr "Vorgabe"
+
+#~ msgid "Layout"
+#~ msgstr "Tastaturbelegung"
+
+#~ msgid "Variant"
+#~ msgstr "Variante"
+
+#~ msgid "Add layout"
+#~ msgstr "Tastaturbelegung hinzufügen"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/el.po b/po/el.po
index d94e34c..5eec0c7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-05-20 04:18+0300\n"
 "Last-Translator: Efstathios Iosifidis <iosifidis at opensuse.org>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el at opensuse.org>\n"
@@ -18,123 +18,116 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Οι τροποποιήσεις των ρυθμίσεων του xkb είναι\n"
-"απενεργοποιημένες από το αρχείο ρυθμίσεων.\n"
-"\n"
-"Δείτε το αρχείο README για περισσότερες πληροφορίες."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Διατάξεις πληκτρολογίου"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Μοντέλο πληκτρολογίου:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Συνδυασμός αλλαγής διάταξης:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Πλήκτρο σύνθεσης:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Διατάξεις πληκτρολογίου:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Προεπιλογή"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Διάταξη"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Παραλλαγή"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Εμφάνιση διάταξης ως"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "εικόνα"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "κείμενο"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Μέγεθος κειμένου:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "μικρό"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "μεσαίο"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "μεγάλο"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Διαχείριση διάταξης:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "καθολικά"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "ανά παράθυρο"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "ανά εφαρμογή"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Άρθρωμα διάταξης πληκτρολογίου"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Σας επιτρέπει να ρυθμίσετε και να χρησιμοποιήσετε πολλαπλές διατάξεις του "
 "πληκτρολογίου"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Άλλα διαθέσιμα πρόσθετα"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Προσθήκη διάταξης"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Διατάξεις πληκτρολογίου"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Άρθρωμα εναλλαγής και ρύθμισης των διατάξεων πληκτρολογίου"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Οι τροποποιήσεις των ρυθμίσεων του xkb είναι\n"
+#~ "απενεργοποιημένες από το αρχείο ρυθμίσεων.\n"
+#~ "\n"
+#~ "Δείτε το αρχείο README για περισσότερες πληροφορίες."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Μοντέλο πληκτρολογίου:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Συνδυασμός αλλαγής διάταξης:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Πλήκτρο σύνθεσης:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Διατάξεις πληκτρολογίου:"
+
+#~ msgid "Default"
+#~ msgstr "Προεπιλογή"
+
+#~ msgid "Layout"
+#~ msgstr "Διάταξη"
+
+#~ msgid "Variant"
+#~ msgstr "Παραλλαγή"
+
+#~ msgid "Add layout"
+#~ msgstr "Προσθήκη διάταξης"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 96fbb80..08b5e67 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,137 +2,130 @@
 # Copyright (C) 2007 THE xfce4-xkb-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
 # Jeff Bailes <thepizzaking at gmail.com>, 2007.
+#
+#
 #, fuzzy
-# 
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-08-30 17:14+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Keyboard Layouts"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Keyboard model:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Change layout option:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Compose key position:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Keyboard layouts:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Default"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Layout"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variant"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Show layout as:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "image"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Text size:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "small"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "medium"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "large"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Manage layout:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globally"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per window"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per application"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Keyboard Layouts Plugin"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Allows you to configure and use multiple keyboard layouts."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Other plugins available here"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Add layout"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Keyboard Layouts"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Keyboard layouts setup and switch plugin"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Keyboard model:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Change layout option:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Compose key position:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Keyboard layouts:"
+
+#~ msgid "Default"
+#~ msgstr "Default"
+
+#~ msgid "Layout"
+#~ msgstr "Layout"
+
+#~ msgid "Variant"
+#~ msgstr "Variant"
+
+#~ msgid "Add layout"
+#~ msgstr "Add layout"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 568c184..bc6327d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,131 +3,124 @@
 # Copyright (C) 2009 THE xfce4-xkb-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
 #  <abel.martin.ruiz at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-02-11 21:34+0100\n"
 "Last-Translator: Abel Martín <abel.martin.ruiz at gmail.com>\n"
 "Language-Team: Spanish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"La modificación de configuración de XKB está\n"
-"desactivada en el archivo de configuración.\n"
-"\n"
-"Lea el archivo README para más información."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Distribuciones de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Modelo de teclado:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Cambiar opción de distribución:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Definir posición de tecla:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Distribuciones de teclado:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Diseño"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variante"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Mostrar distribución como:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imagen"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "texto"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Tamaño del texto:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "pequeño"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "medio"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "grande"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Administrar distribución:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalmente"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "por ventana"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "por aplicación"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Complemento de distribuciones de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Le permite configurar y usar múltiples distribuciones de teclado."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Otros complementos disponibles aquí"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Añadir distribución"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Distribuciones de teclado"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Complemento de configuración y selección de distribuciones de teclado"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "La modificación de configuración de XKB está\n"
+#~ "desactivada en el archivo de configuración.\n"
+#~ "\n"
+#~ "Lea el archivo README para más información."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Modelo de teclado:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Cambiar opción de distribución:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Definir posición de tecla:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Distribuciones de teclado:"
+
+#~ msgid "Default"
+#~ msgstr "Predeterminado"
+
+#~ msgid "Layout"
+#~ msgstr "Diseño"
+
+#~ msgid "Variant"
+#~ msgstr "Variante"
+
+#~ msgid "Add layout"
+#~ msgstr "Añadir distribución"
diff --git a/po/eu.po b/po/eu.po
index 41e797f..a91fdf6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,133 +2,126 @@
 # Basque translations for xfce4-xkb-plugin package.
 # Copyright (C) 2004-2006 Alexander Iliev.
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
-# 
+#
 # Piarres Beobide <pi at beobide.net>,2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-08-18 09:30+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu at lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB konfigurazio aldaketak konfigurazio\n"
-"fitxategitik desgaiturik daude.\n"
-"\n"
-"Ikusi README fitxategia argibide gehiagotako."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Teklatu inguruneak"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Teklatu modeloa:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Aldatu ingurune aukera:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Konposizio tekla kokalekua:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Teklatu inguruneak:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Lehenetsia"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Ingurunea"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Aldagaia"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Ikusi ingurunea horrela:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "irudia"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "testua"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Testu tamaina:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "txikia"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "ertaina"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "handia"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Kudeatu ingurunea:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "orokorrean"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "leiho bakoitzeko"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "Aplikazio bakoizeko"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Teklatu ingurune plugina"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Teklatu ingurune ezberdinak konfiguratzeko aukera ematen du."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Hemen eskurgarri dauden beste zenbait plugin:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Gehitu ingurunea"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Teklatu inguruneak"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Teklatu ingurune konfigurazio eta txandakatze plugina"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB konfigurazio aldaketak konfigurazio\n"
+#~ "fitxategitik desgaiturik daude.\n"
+#~ "\n"
+#~ "Ikusi README fitxategia argibide gehiagotako."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Teklatu modeloa:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Aldatu ingurune aukera:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Konposizio tekla kokalekua:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Teklatu inguruneak:"
+
+#~ msgid "Default"
+#~ msgstr "Lehenetsia"
+
+#~ msgid "Layout"
+#~ msgstr "Ingurunea"
+
+#~ msgid "Variant"
+#~ msgstr "Aldagaia"
+
+#~ msgid "Add layout"
+#~ msgstr "Gehitu ingurunea"
diff --git a/po/fr.po b/po/fr.po
index 8d26673..9b26cfe 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,136 +2,129 @@
 # Copyright (C) 2008 Alexander Iliev <sasoiliev at mamul.org>
 # This file is distributed under the same license as the xfce4-rss-plugin package.
 # Maximilian Schleiss <maximilian at xfce.org>, 2006-2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2010-04-11 12:03+0200\n"
 "Last-Translator: Maximilian Schleiss <maximilian at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\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"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Les modifications de la configuration XKB\n"
-"sont désactivées dans le fichier de configuration.\n"
-"\n"
-"Veuillez consulter le fichier README pour\n"
-"de plus amples informations."
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Dispositions de clavier"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Type de clavier :"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Changer la disposition :"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Position de la touche compose :"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Dispositions de clavier :"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Défaut"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Disposition"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variante"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Afficher la disposition en tant que :"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "image"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "texte"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Taille du texte :"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "petit"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "moyen"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "grand"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Gérer la disposition :"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalement"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "par fenêtre"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "par application"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Greffon de disposition de clavier"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Permet l'utilisation de plusieurs dispositions de clavier."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Autres greffons disponibles ici"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Ajouter disposition"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Dispositions de clavier"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Greffon de disposition de clavier"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Les modifications de la configuration XKB\n"
+#~ "sont désactivées dans le fichier de configuration.\n"
+#~ "\n"
+#~ "Veuillez consulter le fichier README pour\n"
+#~ "de plus amples informations."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Type de clavier :"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Changer la disposition :"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Position de la touche compose :"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Dispositions de clavier :"
+
+#~ msgid "Default"
+#~ msgstr "Défaut"
+
+#~ msgid "Layout"
+#~ msgstr "Disposition"
+
+#~ msgid "Variant"
+#~ msgstr "Variante"
+
+#~ msgid "Add layout"
+#~ msgstr "Ajouter disposition"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr "Permet d'afficher et changer la disposition du clavier"
diff --git a/po/gl.po b/po/gl.po
index ea2384c..b14ab76 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,136 +1,123 @@
 # Galician translation of xfce4-xkb-plugin
 # Copyright (C) 2008-2009 Leandro Regueiro
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
-# 
+#
 # Leandro Regueiro <leandro.regueiro at gmail.com>, 2006, 2008, 2009.
-# 
+#
 # Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas
 # colaborar connosco, podes atopar máis información en <http://trasno.net>
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2010-01-08 13:07+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"As modificacións da configuración de XKB\n"
-"están desactivadas no ficheiro de configuración.\n"
-"\n"
-"Consulte o ficheiro README para obter máis información."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Disposicións de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Modelo de teclado:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Cambiar a opción de disposición:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Posición da tecla de composición:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Disposicións de teclado:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Disposición"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Mostrar a disposición como:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imaxe"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "texto"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Tamaño do texto:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "pequeno"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "mediano"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "grande"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Xestionar a disposición:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalmente"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "por xanela"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "por aplicativo"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Engadido de disposicións de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Permítelle configurar e usar múltiples disposicións de teclado."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Outros engadidos dispoñibles aquí"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Engadir disposición"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Disposicións de teclado"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Engadido de configuración e cambio de disposicións de teclado"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "As modificacións da configuración de XKB\n"
+#~ "están desactivadas no ficheiro de configuración.\n"
+#~ "\n"
+#~ "Consulte o ficheiro README para obter máis información."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Modelo de teclado:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Cambiar a opción de disposición:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Posición da tecla de composición:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Disposicións de teclado:"
+
+#~ msgid "Layout"
+#~ msgstr "Disposición"
+
+#~ msgid "Add layout"
+#~ msgstr "Engadir disposición"
diff --git a/po/hr.po b/po/hr.po
index ffab0ac..66fae99 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2,130 +2,123 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
 # Ivica Kolić <ikoli at yahoo.com>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-11-01 01:28+0100\n"
 "Last-Translator: Ivica Kolić <ikoli at yahoo.com>\n"
 "Language-Team: Hrvatski <>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: \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"
 "X-Poedit-Language: Croatian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: CROATIA\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr "XKB konfiguracijske promjene su \\ nonemogućene iz konfiguracijske datoteke.\\ n \\ nPogledajte README datoteku za više informacija."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Rasporedi tipkovnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model tipkovnice"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Opcija promjene rasporeda"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr ""
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Rasporedi tipkovnice:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Zadano"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Raspored"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Varijanta"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Pokaži raspored kao:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "sliku"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "tekst"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Veličina teksta:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "mali"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "srednji"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "veliki"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Upravljajte raporedom"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalno"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "za svaki prozor"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "za svaki program"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Priključak rasporeda tipkovnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Dozvoljava vam da konfigurirate i koristite više rasporeda tipkovnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Ostali priključci dostupni ovdje"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Dodaj raspored"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Rasporedi tipkovnice"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr ""
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB konfiguracijske promjene su \\ nonemogućene iz konfiguracijske "
+#~ "datoteke.\\ n \\ nPogledajte README datoteku za više informacija."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model tipkovnice"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Opcija promjene rasporeda"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Rasporedi tipkovnice:"
+
+#~ msgid "Default"
+#~ msgstr "Zadano"
+
+#~ msgid "Layout"
+#~ msgstr "Raspored"
+
+#~ msgid "Variant"
+#~ msgstr "Varijanta"
+
+#~ msgid "Add layout"
+#~ msgstr "Dodaj raspored"
diff --git a/po/hu.po b/po/hu.po
index a872342..9450ad1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,133 +1,126 @@
 # Hungarian translation of xfce4-xkb-plugin
 # Copyright 2009. Free Software Foundation, Inc.
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
-# 
+#
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-07-25 10:54+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Az XKB beállításainak módosítása\n"
-"a beállítófájlban le van tiltva.\n"
-"\n"
-"További információkért lásd a README fájlt."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Billentyűzetkiosztások"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Billentyűzet típusa:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Kiosztás beállításának módosítása:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Kombináló billentyű pozíciója:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Billentyűzetkiosztások:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Alapértelmezett"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Kiosztás"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Változat"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Kiosztás megjelenítése mint:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "Kép"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "Szöveg"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Szövegméret:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "kicsi"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "közepes"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "nagy"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Kiosztás kezelése:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "Globálisan"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "Ablakonként"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "Alkalmazásonként"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Billentyűzetkiosztás-bővítmény"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Lehetővé teszi több billentyűzetkiosztás beállítását és használatát."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "További elérhető bővítmények"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Kiosztás hozzáadása"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Billentyűzetkiosztások"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Billentyűzetkiosztás-beállító és -váltó bővítmény"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Az XKB beállításainak módosítása\n"
+#~ "a beállítófájlban le van tiltva.\n"
+#~ "\n"
+#~ "További információkért lásd a README fájlt."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Billentyűzet típusa:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Kiosztás beállításának módosítása:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Kombináló billentyű pozíciója:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Billentyűzetkiosztások:"
+
+#~ msgid "Default"
+#~ msgstr "Alapértelmezett"
+
+#~ msgid "Layout"
+#~ msgstr "Kiosztás"
+
+#~ msgid "Variant"
+#~ msgstr "Változat"
+
+#~ msgid "Add layout"
+#~ msgstr "Kiosztás hozzáadása"
diff --git a/po/id.po b/po/id.po
index d4e3680..32ca6d4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,136 +2,129 @@
 # Copyright (C) 2008 THE xfce4-xkb-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
 # Andhika Padmawan <andhika.padmawan at gmail.com>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin v0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2008-10-22 22:20+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\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"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Modifikasi konfigurasi XKB dinonaktifkan\n"
-"dari berkas konfigurasi.\n"
-"\n"
-"Lihat berkas README untuk informasi lebih lanjut."
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Tata Letak Papan Ketik"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model papan ketik:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Ubah opsi tata letak:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Tulis posisi tombol:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Tata letak papan ketik:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Standar"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Tata Letak"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Varian"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Tampilkan tata letak sebagai:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "gambar"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "teks"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Ukuran teks:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "kecil"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "sedang"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "besar"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Atur tata letak:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "secara global"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per jendela"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per aplikasi"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Plugin Tata Letak Papan Ketik"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Izinkan anda untuk mengatur dan menggunakan tata letak banyak papan ketik."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Plugin lainnya tersedia di sini"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Tambah tata letak"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Tata Letak Papan Ketik"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Pengaturan tata letak papan ketik dan pengalih plugin"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Modifikasi konfigurasi XKB dinonaktifkan\n"
+#~ "dari berkas konfigurasi.\n"
+#~ "\n"
+#~ "Lihat berkas README untuk informasi lebih lanjut."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model papan ketik:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Ubah opsi tata letak:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Tulis posisi tombol:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Tata letak papan ketik:"
+
+#~ msgid "Default"
+#~ msgstr "Standar"
+
+#~ msgid "Layout"
+#~ msgstr "Tata Letak"
+
+#~ msgid "Variant"
+#~ msgstr "Varian"
+
+#~ msgid "Add layout"
+#~ msgstr "Tambah tata letak"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/it.po b/po/it.po
index 8d53404..ff53ece 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,134 +2,127 @@
 # Copyright (C) 2006 Adriano Winter Bess <adriano at xfce.org>
 # This file is distributed under the same license as the xfce4-rss-plugin package.
 # Cristian Marchi <cri.penta at gmail.com>, 2009
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2010-04-24 08:58+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian <xfce-it-translators at googlegroups.com>\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"
-
-# GLOSSARIO
-# layout = mappatura
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Le modifiche alla configurazione di XKB\n"
-"sono disabilitate dal file di configurazione.\n"
-"\n"
-"Consultare il file README per maggiori\n"
-"informazioni"
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Disposizione della tastiera"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Modello di tastiera:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Modifica le opzioni di disposizione:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Posizione del tasto di composizione:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Disposizione della tastiera:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Disposizione"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variante"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Mostra la disposizione come:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "immagine"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "testo"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Dimensione testo:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "piccolo"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "medio"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "grande"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Gestisci disposizione:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalmente"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per finestra"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per applicazione"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Plugin per la disposizione della tastiera"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Permette di configurare e utilizzare diverse disposizioni della tastiera"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Altri plugin sono disponibili qui"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Aggiungi disposizione"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Disposizione della tastiera"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Impostazione della disposizione tastiera e plugin di scelta"
+
+# GLOSSARIO
+# layout = mappatura
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Le modifiche alla configurazione di XKB\n"
+#~ "sono disabilitate dal file di configurazione.\n"
+#~ "\n"
+#~ "Consultare il file README per maggiori\n"
+#~ "informazioni"
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Modello di tastiera:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Modifica le opzioni di disposizione:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Posizione del tasto di composizione:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Disposizione della tastiera:"
+
+#~ msgid "Default"
+#~ msgstr "Predefinito"
+
+#~ msgid "Layout"
+#~ msgstr "Disposizione"
+
+#~ msgid "Variant"
+#~ msgstr "Variante"
+
+#~ msgid "Add layout"
+#~ msgstr "Aggiungi disposizione"
diff --git a/po/ja.po b/po/ja.po
index 6234c51..cd92ad0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,130 +3,123 @@
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
 # Daichi Kawahata <daichi at xfce.org>, 2006.
 # Nobuhiro Iwamatsu <iwamatsu at nigauri.org>, 2007 - 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-03-15 23:34+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: Japanese <xfce-i18n at xfce.org>\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"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB 設定は設定ファイルによって\n"
-"無効になっています。\n"
-"\n"
-"より詳しい情報は READMEファイルを参照してください。"
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "キーボードレイアウト"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "キーボードモデル:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "レイアウトオプションの変更:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "コンポーズキーの位置:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "キーボードレイアウト:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "デフォルト"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "レイアウト"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "バリアント"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "レイアウトの表示:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "画像"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "文字"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "文字サイズ:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "小さい"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "普通"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "大きい"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "レイアウトの管理:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "システム全体"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "ウィンドウ毎"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "アプリケーション毎"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "キーボードレイアウトプラグイン"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "複数のキーボードレイアウトを構成し、使うことを許可する。"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "その他のプラグインはここにあります。"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "レイアウトの追加"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "キーボードレイアウト"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "キーボードレイアウトのセットアップと切替用プラグインです。"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB 設定は設定ファイルによって\n"
+#~ "無効になっています。\n"
+#~ "\n"
+#~ "より詳しい情報は READMEファイルを参照してください。"
+
+#~ msgid "Keyboard model:"
+#~ msgstr "キーボードモデル:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "レイアウトオプションの変更:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "コンポーズキーの位置:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "キーボードレイアウト:"
+
+#~ msgid "Default"
+#~ msgstr "デフォルト"
+
+#~ msgid "Layout"
+#~ msgstr "レイアウト"
+
+#~ msgid "Variant"
+#~ msgstr "バリアント"
+
+#~ msgid "Add layout"
+#~ msgstr "レイアウトの追加"
diff --git a/po/ka.po b/po/ka.po
index 05cefc1..206d349 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-02-16 22:34+0400\n"
 "Last-Translator: Beqa Arabuli <arabulibeqa at gmail.com>\n"
 "Language-Team: Georgian <arabulibeqa at gmail.com>\n"
@@ -18,117 +18,111 @@ msgstr ""
 "X-Poedit-Language: Georgian\n"
 "X-Poedit-Country: GEORGIA\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB-ს კონფიგურაციის შეცვლის შესაძლებლობა\n"
-"გამორთულია კონფიგურაციის ფაილიდან. \n"
-"\n"
-"მეტი ინფორმაციისთვის წაიკითხეთ README ფაილი."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "ლავიატურის განლაგებები"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "კლავიატურის მოდელი:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "განლაგების შესაცვლელი კლავიშები"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Compose ღილაკის მდებარეობა:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "კლავიატურის განლაგებები"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "ნაგულისხმევი"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "განლაგება"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "ვარიანტი"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "განლაგების ჩვენება"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "სურათით"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "ტექსტით"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "ტექსტის ზომა:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "პატარა"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "საშუალო"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "დიდი"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "განლაგების მართვა:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "გლობალურად"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "თითო ფანჯრისთვის"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "თითო პროგრამისთვის"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "კლავიატურის განლაგებების მოდული"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
-msgstr "საშუალებას გაძლევთ რომ გამართოთ და მარტივად გამოიყენოთ კლავიატურის განლაგებები."
+msgstr ""
+"საშუალებას გაძლევთ რომ გამართოთ და მარტივად გამოიყენოთ კლავიატურის "
+"განლაგებები."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "სხვა ხელმისაწვდომი მოდულები"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "განლაგების დამატება"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "ლავიატურის განლაგებები"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "კლავიატურის განლაგების დაყენების და გადართვის მოდული"
 
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB-ს კონფიგურაციის შეცვლის შესაძლებლობა\n"
+#~ "გამორთულია კონფიგურაციის ფაილიდან. \n"
+#~ "\n"
+#~ "მეტი ინფორმაციისთვის წაიკითხეთ README ფაილი."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "კლავიატურის მოდელი:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "განლაგების შესაცვლელი კლავიშები"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Compose ღილაკის მდებარეობა:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "კლავიატურის განლაგებები"
+
+#~ msgid "Default"
+#~ msgstr "ნაგულისხმევი"
+
+#~ msgid "Layout"
+#~ msgstr "განლაგება"
+
+#~ msgid "Variant"
+#~ msgstr "ვარიანტი"
+
+#~ msgid "Add layout"
+#~ msgstr "განლაგების დამატება"
diff --git a/po/kk.po b/po/kk.po
index 854b870..b6ea7c5 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -2,131 +2,124 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Baurzhan Muftakhidinov <baurthefirst at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-08-16 13:12+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB баптауларын түзетуге баптаулар\n"
-"файлында тыйым салынған.\n"
-"\n"
-"Көбірек білу үшін README файлын оқыңыз."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Keyboard Layouts"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Пернетақта түрі:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Жайманы ауыстыру пернелері:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Уақытша ауыстыру пернесі:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Пернетақта жаймалары:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Бастапқы"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Жайма"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Нұсқасы"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Жайманы қалайша көрсету:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "сурет"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "мәтін"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Мәтін өлшемі:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "кіші"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "орта"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "үлкен"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Жайманы орнату:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "глобалды"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "әр терезе үшін"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "әр қолданба үшін"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Пернетақта жаймалары плагині"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Сізге көптеген пернетақта жаймаларын баптау мен қолдануға көмектеседі."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Басқа плагиндер осында бар"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Жайманы қосу"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Keyboard Layouts"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Пернетақта жаймаларын орнату мен ауыстыру плагині"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB баптауларын түзетуге баптаулар\n"
+#~ "файлында тыйым салынған.\n"
+#~ "\n"
+#~ "Көбірек білу үшін README файлын оқыңыз."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Пернетақта түрі:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Жайманы ауыстыру пернелері:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Уақытша ауыстыру пернесі:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Пернетақта жаймалары:"
+
+#~ msgid "Default"
+#~ msgstr "Бастапқы"
+
+#~ msgid "Layout"
+#~ msgstr "Жайма"
+
+#~ msgid "Variant"
+#~ msgstr "Нұсқасы"
+
+#~ msgid "Add layout"
+#~ msgstr "Жайманы қосу"
diff --git a/po/ko.po b/po/ko.po
index ce07829..109a350 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin.master\n"
-"Report-Msgid-Bugs-To: xfce-i18n <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-02-21 14:44+0900\n"
 "Last-Translator: Seong-ho, Cho <darkcircle.0426 at gmail.com>\n"
-"Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge.net>\n"
+"Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge."
+"net>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,117 +21,109 @@ msgstr ""
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB 설정 변경이 환경설정 파일에서 비활성화\n"
-"되어 있습니다.\n"
-"\n"
-"더 자세한 정보를 보시려면 README파일을 봅니다."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "키보드 배치"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "키보드 모델:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "배치 옵션 바꾸기:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "키 위치 구성:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "키보드 배치:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "기본"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "배치"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "변형"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "다음 방식으로 배치 보기:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "그림"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "텍스트"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "텍스트 크기:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "작게"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "중간"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "크게"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "배치 관리:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "전역"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "창별"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "프로그램별"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "키보드 배치 플러그인"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "다중 키보드 배치를 설정하고 사용할 수 있게 합니다."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "다른 플러그인은 여기에 있습니다"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "배치 추가"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "키보드 배치"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "키보드 베치 설정 및 플러그인 변경"
 
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB 설정 변경이 환경설정 파일에서 비활성화\n"
+#~ "되어 있습니다.\n"
+#~ "\n"
+#~ "더 자세한 정보를 보시려면 README파일을 봅니다."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "키보드 모델:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "배치 옵션 바꾸기:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "키 위치 구성:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "키보드 배치:"
+
+#~ msgid "Default"
+#~ msgstr "기본"
+
+#~ msgid "Layout"
+#~ msgstr "배치"
+
+#~ msgid "Variant"
+#~ msgstr "변형"
+
+#~ msgid "Add layout"
+#~ msgstr "배치 추가"
diff --git a/po/lt.po b/po/lt.po
index 4f18835..d4b4295 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xkb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-02-16 11:41+0200\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas at gmail.com>\n"
 "Language-Team: Lietuvių <>\n"
@@ -19,116 +19,109 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB konfigūracijos išjungtos\n"
-"naudojant konfigūracijos failą.\n"
-"\n"
-"Peržiūrėkite README failą detalesnei informacijai."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Klaviatūros išdėstymai"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Klaviatūros modelis:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Keisti išdėstymo būdą:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Komponavimo klavišo pozicija:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Klaviatūros išdėstymai:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Numatytasis"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Išdėstymas"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variantas"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Rodyti išdėstymą kaip:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "paveikslėlį"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "tekstą"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Teksto dydis:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "mažas"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "vidutinis"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "didelis"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Išdėstymą taikyti:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "bendrai"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "langui"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "programai"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Klaviatūros išdėstymų įskiepis"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Leidžia konfigūruoti ir naudoti kelis klaviatūros išdėstymus."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Kiti įskiepiai prieinami čia"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Pridėti išdėstymą"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Klaviatūros išdėstymai"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Klaviatūros išdėstymų nustatymo ir perjungimo įskiepis"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB konfigūracijos išjungtos\n"
+#~ "naudojant konfigūracijos failą.\n"
+#~ "\n"
+#~ "Peržiūrėkite README failą detalesnei informacijai."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Klaviatūros modelis:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Keisti išdėstymo būdą:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Komponavimo klavišo pozicija:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Klaviatūros išdėstymai:"
+
+#~ msgid "Default"
+#~ msgstr "Numatytasis"
+
+#~ msgid "Layout"
+#~ msgstr "Išdėstymas"
+
+#~ msgid "Variant"
+#~ msgstr "Variantas"
+
+#~ msgid "Add layout"
+#~ msgstr "Pridėti išdėstymą"
diff --git a/po/lv.po b/po/lv.po
index 21d3c21..5b22001 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-09-18 23:53+0100\n"
 "Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
@@ -20,122 +20,109 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB konfigurācijas modifikācijas ir\n"
-"izslēgtas iekš konfigurācijas faila.\n"
-"\n"
-"Apskatiet README failu, lai uzzinātu ko vairāk."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Klaviatūras izkārtojumi"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Klaviatūras modelis:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Mainīt izkārtojuma opcijas:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Salikt taustiņu pozīciju:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Klaviatūras izkārtojums:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Pievienot izkārtojumu"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Rādīt izkārtojumu, kā:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "attēlu"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "tekstu"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Pārvaldīt izkārtojumu"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globāli"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "pa logam"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "pa aplikācijai"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Klaviatūras izkārtojuma spraudnis"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Ļauj konfigurēt un izmantot vairākus klaviatūru izkārtojumus"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Citi spraudņi pieejami šeit"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Pievienot izkārtojumu"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Klaviatūras izkārtojumi"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Klaviatūras izkārtojuma uzstādījumi un pārslēgšanas spraudnis"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB konfigurācijas modifikācijas ir\n"
+#~ "izslēgtas iekš konfigurācijas faila.\n"
+#~ "\n"
+#~ "Apskatiet README failu, lai uzzinātu ko vairāk."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Klaviatūras modelis:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Mainīt izkārtojuma opcijas:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Salikt taustiņu pozīciju:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Klaviatūras izkārtojums:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Pievienot izkārtojumu"
+
+#~ msgid "Add layout"
+#~ msgstr "Pievienot izkārtojumu"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 9a8f16c..81c9cca 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,134 +3,127 @@
 # This file is distributed under the same license as the
 # xfce4-xkb-plugin package.
 # Pjotr, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-06-15 11:34+0200\n"
 "Last-Translator: Pjotr\n"
 "Language-Team: Dutch (Flemish)\n"
+"Language: nl (Dutch)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl (Dutch)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Aanpassingen van XKB-configuratie zijn\n"
-"uitgeschakeld vanuit het configuratie-\n"
-"bestand.\n"
-"Zie het LEESMIJ(README)-bestand voor\n"
-"meer informatie."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Toetsenbordindelingen"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Toetsenbordmodel:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Verander indelingsoptie:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Positie van Samensteltoets:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Toetsenbordindelingen:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Standaard"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Indeling"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variant"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Toon indeling als:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "afbeelding"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "tekst"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Tekstgrootte:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "klein"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "gemiddeld"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "groot"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Indeling beheren:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "systeembreed"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per venster"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per toepassing"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Toetsenbordindelingen-plugin"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Stelt u in staat om meerdere toetsenbordindelingen in te stellen en te "
 "gebruiken."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Andere plugins zijn hier beschikbaar"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Voeg indeling toe"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Toetsenbordindelingen"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Plugin voor het instellen en veranderen van toetsenbordindelingen"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Aanpassingen van XKB-configuratie zijn\n"
+#~ "uitgeschakeld vanuit het configuratie-\n"
+#~ "bestand.\n"
+#~ "Zie het LEESMIJ(README)-bestand voor\n"
+#~ "meer informatie."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Toetsenbordmodel:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Verander indelingsoptie:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Positie van Samensteltoets:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Toetsenbordindelingen:"
+
+#~ msgid "Default"
+#~ msgstr "Standaard"
+
+#~ msgid "Layout"
+#~ msgstr "Indeling"
+
+#~ msgid "Variant"
+#~ msgstr "Variant"
+
+#~ msgid "Add layout"
+#~ msgstr "Voeg indeling toe"
diff --git a/po/pl.po b/po/pl.po
index 973dc41..f969e27 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-04-03 16:34+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish\n"
@@ -17,123 +17,110 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Konfiguracja wtyczki XKB została wyłączona\n"
-"za pośrednictwem pliku konfiguracyjnego.\n"
-"\n"
-"Więcej informacji w pliku README."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Układy klawiatury"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model klawiatury"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Klawisz zmiany układu"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-#, fuzzy
-msgid "Compose key position:"
-msgstr "Klawisz szybkiego uruchamiania"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Układy"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Dodaj"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Przycisk"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "Ikona"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "Etykieta"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Zastosowanie"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "Środowisko"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "Okno"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "Program"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "xfce4 xkb plugin"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Umożliwia skonfigurowanie i używanie wielu układów klawiatury"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Inne wtyczki dostępne tutaj"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Dodaj"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Układy klawiatury"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Konfiguruje i przełącza układy klawiatury"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Konfiguracja wtyczki XKB została wyłączona\n"
+#~ "za pośrednictwem pliku konfiguracyjnego.\n"
+#~ "\n"
+#~ "Więcej informacji w pliku README."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model klawiatury"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Klawisz zmiany układu"
+
+#, fuzzy
+#~ msgid "Compose key position:"
+#~ msgstr "Klawisz szybkiego uruchamiania"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Układy"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Dodaj"
+
+#~ msgid "Add layout"
+#~ msgstr "Dodaj"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 1ea78c3..96ec426 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,129 +7,121 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-01-09 16:22-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"As modificações na configuração XKB estão\n"
-"inativas no ficheiro config.\n"
-"\n"
-"Veja o ficheiro README para mais informações."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Esquemas de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Modelo do teclado:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Alterar esquema:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Definir posição de tecla:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Esquemas de teclado:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Omissões"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Esquema"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variante"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Mostrar esquema como:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imagem"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "texto"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Tamanho do texto:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "pequeno"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "médio"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "grande"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Gerir esquema:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalmente"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "por janela"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "por aplicação"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "\"Plug-in\" de esquema de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Permite-lhe configurar e utilizar diversos esquemas de teclado."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Outros \"plug-ins\" aqui"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Adicionar esquema"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Esquemas de teclado"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "\"Plug-in\" de configuração do esquema do teclado"
 
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "As modificações na configuração XKB estão\n"
+#~ "inativas no ficheiro config.\n"
+#~ "\n"
+#~ "Veja o ficheiro README para mais informações."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Modelo do teclado:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Alterar esquema:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Definir posição de tecla:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Esquemas de teclado:"
+
+#~ msgid "Default"
+#~ msgstr "Omissões"
+
+#~ msgid "Layout"
+#~ msgstr "Esquema"
+
+#~ msgid "Variant"
+#~ msgstr "Variante"
+
+#~ msgid "Add layout"
+#~ msgstr "Adicionar esquema"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b4087ed..c173c29 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,135 +4,128 @@
 # Vladimir Melo <vladimirmelo at foresightlinux.org>, 2007.
 # Fábio Nogueira <deb-user-ba at ubuntu.com>, 2008.
 # Sérgio Cipolla <secipolla at gmail.com>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-05-26 09:32-0300\n"
 "Last-Translator: Sérgio Cipolla <secipolla at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.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"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"As modificações de configuração do XKB estão\n"
-"desabilitadas no arquivo de configuração.\n"
-"\n"
-"Veja o arquivo README para mais informações."
 
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Disposições de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Modelo do teclado:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Opção para alterar disposição:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Posição da tecla de composição:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Disposições de teclado:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Padrão"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Disposição"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variante"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Mostrar disposição como:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imagem"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "texto"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Tamanho do texto:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "pequeno"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "médio"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "grande"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Gerenciar disposição:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalmente"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "por janela"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "por aplicativo"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Plug-in de disposições de teclado"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Permite configurar e usar múltiplas disposições de teclado."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Outros plug-ins disponíveis aqui"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Adicionar disposição"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Disposições de teclado"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Plug-in configurador e alternador de disposições de teclado"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "As modificações de configuração do XKB estão\n"
+#~ "desabilitadas no arquivo de configuração.\n"
+#~ "\n"
+#~ "Veja o arquivo README para mais informações."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Modelo do teclado:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Opção para alterar disposição:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Posição da tecla de composição:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Disposições de teclado:"
+
+#~ msgid "Default"
+#~ msgstr "Padrão"
+
+#~ msgid "Layout"
+#~ msgstr "Disposição"
+
+#~ msgid "Variant"
+#~ msgstr "Variante"
+
+#~ msgid "Add layout"
+#~ msgstr "Adicionar disposição"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 4f2da96..1a2ff2e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-03-01 18:37+0200\n"
 "Last-Translator: Igor Știrbu <igor.stirbu at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -16,118 +16,105 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Modificările opțiunilor XKB sunt \n"
-"dezactivate din fișierul de configurare.\n"
-"\n"
-"A se vedea fișierul README pentru detalii."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Aranjamente de tastatură"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model tastatură:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Schimbare aranjament:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Poziție tasta «Compose»:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Aranjamente de tastatură:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Adaugă un aranjament"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Arată aranjamentul ca:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "imagine"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Gestionare aranjamente:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "global"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per fereastră"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per aplicație"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Modul pentru aranjamente de tastatură"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Permite configurarea și utilizarea mai multor aranjamente de tastatură."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Alte module disponibile aici"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Adaugă un aranjament"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Aranjamente de tastatură"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Modul pentru opțiunile aranjamentelor de tastatură"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Modificările opțiunilor XKB sunt \n"
+#~ "dezactivate din fișierul de configurare.\n"
+#~ "\n"
+#~ "A se vedea fișierul README pentru detalii."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model tastatură:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Schimbare aranjament:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Poziție tasta «Compose»:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Aranjamente de tastatură:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Adaugă un aranjament"
+
+#~ msgid "Add layout"
+#~ msgstr "Adaugă un aranjament"
diff --git a/po/ru.po b/po/ru.po
index 550295f..ba3a729 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,132 +2,125 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-06-16 14:54+0300\n"
 "Last-Translator: Artem Zolochevskiy <artem.zolochevskiy at gmail.com>\n"
 "Language-Team: Russian <xfce-i18n-ru at xfce.org>\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"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Возможность внесения изменений в настройки XKB\n"
-"отключена в конфигурационном файле.\n"
-"\n"
-"Подробности смотрите в файле README."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Раскладки клавиатуры"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Модель клавиатуры:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Переключение раскладки:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Расположение клавиши Compose:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Раскладки клавиатуры:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "По умолчанию"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Раскладка"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Вариант"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Стиль отображения:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "значок"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "текст"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Размер индикатора:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "Мелкий"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "Средний"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "Крупный"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Управление раскладками:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "глобально"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "для каждого окна"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "для каждого приложения"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Раскладки клавиатуры"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Позволяет настроить и использовать несколько клавиатурных раскладок."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Другие расширения доступны здесь"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Добавить раскладку"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Раскладки клавиатуры"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Настройка и переключение клавиатурных раскладок"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Возможность внесения изменений в настройки XKB\n"
+#~ "отключена в конфигурационном файле.\n"
+#~ "\n"
+#~ "Подробности смотрите в файле README."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Модель клавиатуры:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Переключение раскладки:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Расположение клавиши Compose:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Раскладки клавиатуры:"
+
+#~ msgid "Default"
+#~ msgstr "По умолчанию"
+
+#~ msgid "Layout"
+#~ msgstr "Раскладка"
+
+#~ msgid "Variant"
+#~ msgstr "Вариант"
+
+#~ msgid "Add layout"
+#~ msgstr "Добавить раскладку"
diff --git a/po/sk.po b/po/sk.po
index ac0255d..3754cf2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,127 +7,120 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2011-06-03 13:12+0100\n"
 "Last-Translator: Tomáš Vadina <kyberdev at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.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"
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Zmeny konfigurácie XKB sú zakázané\n"
-"súborom konfigurácie.\n"
-"\n"
-"Viac informácií nájdete v súbore README (v angličtine)."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Rozloženie klávesnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model klávesnice:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Voľba pre zmenu rozloženia:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Zloženie pozície klávesy:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Rozloženie klávesnice:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Predvolené"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Rozloženie"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Variant"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Zobraziť rozloženie ako:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "obrázok"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Veľkosť textu:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "malá"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "stredná"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "veľká"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Spravovať rozloženie:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globálne"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "pre jednotlivé okná"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "pre jednotlivé aplikácie"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Prepínač rozloženia klávesnice"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Umožňuje konfigurovať a používať viac rozložení klávesnice."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Ďalšie zásuvné moduly sú dostupné tu"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Pridať rozloženie"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Rozloženie klávesnice"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Nastavuje a prepína rozloženie klávesnice"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Zmeny konfigurácie XKB sú zakázané\n"
+#~ "súborom konfigurácie.\n"
+#~ "\n"
+#~ "Viac informácií nájdete v súbore README (v angličtine)."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model klávesnice:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Voľba pre zmenu rozloženia:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Zloženie pozície klávesy:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Rozloženie klávesnice:"
+
+#~ msgid "Default"
+#~ msgstr "Predvolené"
+
+#~ msgid "Layout"
+#~ msgstr "Rozloženie"
+
+#~ msgid "Variant"
+#~ msgstr "Variant"
+
+#~ msgid "Add layout"
+#~ msgstr "Pridať rozloženie"
diff --git a/po/sq.po b/po/sq.po
index 2b3f1de..97f3b44 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin v0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2008-11-04 23:37+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -15,117 +15,101 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Ndryshimet për formësime të XKB-së\n"
-"janë çaktivizuar te kartela e formësimit.\n"
-"\n"
-"Për më tepër të dhëna shihni kartelën README."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Skema Tastiere"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Model tastiere:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Ndryshoni mundësi skemash:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr ""
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Skema tastierash:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Shtoni skeme"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Shfaq skemë si:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "pamje"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "tekst"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Administroni stil:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalisht"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "për dritare"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "për zbatim"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Shtojcë Skemash Tastiere"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Ju lejon të formësoni dhe përdorni shumë skema tastiere njëherësh."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Të tjera shtojca të passhme prej këtej"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Shtoni skeme"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Skema Tastiere"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Shtojcë rregullimi dhe këmbimi skemash tastiere"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Ndryshimet për formësime të XKB-së\n"
+#~ "janë çaktivizuar te kartela e formësimit.\n"
+#~ "\n"
+#~ "Për më tepër të dhëna shihni kartelën README."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Model tastiere:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Ndryshoni mundësi skemash:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Skema tastierash:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Shtoni skeme"
+
+#~ msgid "Add layout"
+#~ msgstr "Shtoni skeme"
diff --git a/po/sv.po b/po/sv.po
index b999df2..c578170 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-02-09 00:52+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -16,117 +16,104 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB-konfigurationsändringar är\n"
-"inaktiverade från konfigurationsfilen.\n"
-"\n"
-"Se filen README för mer information."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Tangentbordslayouter"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Tangentbordsmodell:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Ändra layoutalternativ:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Position för Compose-tangent:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Tangentbordslayouter:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Lägg till layout"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Visa layout som:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "bild"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "text"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Hantera layout:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "globalt"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "per fönster"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "per program"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Insticksmodul för tangentbordslayouter"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Låter dig konfigurera och använda flera olika tangentbordslayouter."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Andra insticksmoduler tillgängliga här"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Lägg till layout"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Tangentbordslayouter"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Insticksmodul för konfigurering och växling av tangentbordslayouter"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB-konfigurationsändringar är\n"
+#~ "inaktiverade från konfigurationsfilen.\n"
+#~ "\n"
+#~ "Se filen README för mer information."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Tangentbordsmodell:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Ändra layoutalternativ:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Position för Compose-tangent:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Tangentbordslayouter:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Lägg till layout"
+
+#~ msgid "Add layout"
+#~ msgstr "Lägg till layout"
diff --git a/po/tr.po b/po/tr.po
index 26abd1e..c0ac1d2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,129 +1,116 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4 xkb plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Samed Beyribey <ras0ir at eventualis.org>\n"
 "Language-Team: Xfce-TR <xfce-tr at googlegroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Poedit-Country: TURKEY\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB yapılandırma değişiklikleri\n"
-"yapılandırma dosyasında devre dışı bırakılmış durumda.\n"
-"\n"
-"Daha fazla bilgi için README dosyasını inceleyebilirsiniz."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Klavye Yerleşimleri"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Klavye modeli:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Yerleşim seçeneğini değiştir:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr ""
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Klavye yerleşimleri:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "Varsayılan"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "Yerleşim ekle"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Yerleşimi şu şekilde göster:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "resim"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "yazı"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Metin boyutu:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "küçük"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "orta"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "büyük"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Yerleşimi yönet:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "genel olarak"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "pencere için"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "uygulama için"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Klavye Yerleşimleri Eklentisi"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "Birden fazla klavye yerleşimi kullanmanızı ve yapılandırmanızı sağlar."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Diğer eklentilere ulaşmak için"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Yerleşim ekle"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Klavye Yerleşimleri"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Klavye yerleşimi yapılandırma ve değiştirme eklentisi"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB yapılandırma değişiklikleri\n"
+#~ "yapılandırma dosyasında devre dışı bırakılmış durumda.\n"
+#~ "\n"
+#~ "Daha fazla bilgi için README dosyasını inceleyebilirsiniz."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Klavye modeli:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Yerleşim seçeneğini değiştir:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Klavye yerleşimleri:"
+
+#~ msgid "Default"
+#~ msgstr "Varsayılan"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "Yerleşim ekle"
+
+#~ msgid "Add layout"
+#~ msgstr "Yerleşim ekle"
diff --git a/po/ug.po b/po/ug.po
index ddd596a..5987120 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2,129 +2,125 @@
 # Copyright (C) 2004-2006 Alexander Iliev.
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
 # Gheyret T.Kenji <gheyret at gmail.com>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xfce4-xkb-plugin\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
-"PO-Revision-Date: 2009-03-15 23:34+0900\n"
-"Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
-"Language-Team: Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr "XKB تەڭشىكى تەڭشەك ھۆججىتىدە \n"
-"ئىناۋەتسىز قىلىنغان\n"
-"\n"
-"تەپسىلاتىنى README ھۆججىتىدىن كۆرۈڭ."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
-#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
-msgid "Keyboard Layouts"
-msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى"
-
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "ھەرپتاختا تىپ نومۇرى:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "ئورۇنلاشتۇرۇش تاللانمىسىنى ئۆزگەرتىش:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "بىرىكمە كۇنۇپكىنىڭ ئورنى:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "كۆڭۈلدىكى"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "ئورۇنلاشتۇرۇلۇش"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "ۋارىيانتى"
-
-#. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
-msgid "Show layout as:"
-msgstr "ئورۇنلاشتۇرۇلۇشىنى مۇنداق كۆرسەتسۇن:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:692
-msgid "image"
-msgstr "سۈرەت"
-
-#: ../panel-plugin/xkb-settings-dialog.c:693
-msgid "text"
-msgstr "تېكىست"
-
-#. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
-msgid "Text size:"
-msgstr "تېكىست چوڭلۇقى:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:703
-msgid "small"
-msgstr "كىچىك"
-
-#: ../panel-plugin/xkb-settings-dialog.c:704
-msgid "medium"
-msgstr "ئوتتۇرا"
-
-#: ../panel-plugin/xkb-settings-dialog.c:705
-msgid "large"
-msgstr "چوڭ"
-
-#: ../panel-plugin/xkb-settings-dialog.c:709
-msgid "Manage layout:"
-msgstr "ئورۇنلاشتۇرۇلۇشىنى باشقۇرۇش:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:714
-msgid "globally"
-msgstr "سىستېمىدا"
-
-#: ../panel-plugin/xkb-settings-dialog.c:715
-msgid "per window"
-msgstr "ھەر بىر كۆزنەكتە"
-
-#: ../panel-plugin/xkb-settings-dialog.c:716
-msgid "per application"
-msgstr "ھەر بىر پروگراممىدا"
-
-#: ../panel-plugin/xkb-settings-dialog.c:758
-msgid "Keyboard Layouts Plugin"
-msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى قىستۇرمىسى"
-
-#: ../panel-plugin/xkb-settings-dialog.c:764
-msgid "Allows you to configure and use multiple keyboard layouts."
-msgstr "بىر نەچچە ھەرپتاختا ئورۇنلاشتۇرۇلۇشى تەڭشەپ، ئۇنى ئىشلەتكىلى بولىدىغان قىلىدۇ."
-
-#: ../panel-plugin/xkb-settings-dialog.c:768
-msgid "Other plugins available here"
-msgstr "باشقا قىستۇرمىلارمۇ بار."
-
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "ئورۇنلاشتۇرۇش قوش"
-
-#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
-msgid "Keyboard layouts setup and switch plugin"
-msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشىنى تەڭشەش ۋە ئالماشتۇرۇش قىستۇرمىسىدۇر."
\ No newline at end of file
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-xkb-plugin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
+"PO-Revision-Date: 2009-03-15 23:34+0900\n"
+"Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
+"Language-Team: Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../panel-plugin/xkb-settings-dialog.c:112
+#: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
+msgid "Keyboard Layouts"
+msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى"
+
+#. ***
+#: ../panel-plugin/xkb-settings-dialog.c:122
+msgid "Show layout as:"
+msgstr "ئورۇنلاشتۇرۇلۇشىنى مۇنداق كۆرسەتسۇن:"
+
+#: ../panel-plugin/xkb-settings-dialog.c:127
+msgid "image"
+msgstr "سۈرەت"
+
+#: ../panel-plugin/xkb-settings-dialog.c:128
+msgid "text"
+msgstr "تېكىست"
+
+#. text size option
+#: ../panel-plugin/xkb-settings-dialog.c:133
+msgid "Text size:"
+msgstr "تېكىست چوڭلۇقى:"
+
+#: ../panel-plugin/xkb-settings-dialog.c:138
+msgid "small"
+msgstr "كىچىك"
+
+#: ../panel-plugin/xkb-settings-dialog.c:139
+msgid "medium"
+msgstr "ئوتتۇرا"
+
+#: ../panel-plugin/xkb-settings-dialog.c:140
+msgid "large"
+msgstr "چوڭ"
+
+#: ../panel-plugin/xkb-settings-dialog.c:144
+msgid "Manage layout:"
+msgstr "ئورۇنلاشتۇرۇلۇشىنى باشقۇرۇش:"
+
+#: ../panel-plugin/xkb-settings-dialog.c:149
+msgid "globally"
+msgstr "سىستېمىدا"
+
+#: ../panel-plugin/xkb-settings-dialog.c:150
+msgid "per window"
+msgstr "ھەر بىر كۆزنەكتە"
+
+#: ../panel-plugin/xkb-settings-dialog.c:151
+msgid "per application"
+msgstr "ھەر بىر پروگراممىدا"
+
+#: ../panel-plugin/xkb-settings-dialog.c:185
+msgid "Keyboard Layouts Plugin"
+msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى قىستۇرمىسى"
+
+#: ../panel-plugin/xkb-settings-dialog.c:195
+msgid "Allows you to configure and use multiple keyboard layouts."
+msgstr ""
+"بىر نەچچە ھەرپتاختا ئورۇنلاشتۇرۇلۇشى تەڭشەپ، ئۇنى ئىشلەتكىلى بولىدىغان "
+"قىلىدۇ."
+
+#: ../panel-plugin/xkb-settings-dialog.c:199
+msgid "Other plugins available here"
+msgstr "باشقا قىستۇرمىلارمۇ بار."
+
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى"
+
+#: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
+msgid "Keyboard layouts setup and switch plugin"
+msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشىنى تەڭشەش ۋە ئالماشتۇرۇش قىستۇرمىسىدۇر."
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB تەڭشىكى تەڭشەك ھۆججىتىدە \n"
+#~ "ئىناۋەتسىز قىلىنغان\n"
+#~ "\n"
+#~ "تەپسىلاتىنى README ھۆججىتىدىن كۆرۈڭ."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "ھەرپتاختا تىپ نومۇرى:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "ئورۇنلاشتۇرۇش تاللانمىسىنى ئۆزگەرتىش:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "بىرىكمە كۇنۇپكىنىڭ ئورنى:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى:"
+
+#~ msgid "Default"
+#~ msgstr "كۆڭۈلدىكى"
+
+#~ msgid "Layout"
+#~ msgstr "ئورۇنلاشتۇرۇلۇش"
+
+#~ msgid "Variant"
+#~ msgstr "ۋارىيانتى"
+
+#~ msgid "Add layout"
+#~ msgstr "ئورۇنلاشتۇرۇش قوش"
diff --git a/po/uk.po b/po/uk.po
index d50bb7f..9f6453f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,134 +1,128 @@
 # Ukrainian translation of xfce4-xkb-plugin.
 # Copyright (C) 2007 Dmitry Nikitin.
 # This file is distributed under the same license as the xfce4-xkb-plugin package.
-# 
+#
 # Dmitry Nikitin <luckas_fb at mail.ru>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-02-24 20:05+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce-i18n at xfce.org>\n"
+"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"
+"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"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"Конфігурацію модифікаторів XKB\n"
-"вимкнуто в конфігураційному файлі.\n"
-"\n"
-"Детальнішу інформацію дивись в файлі README."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "Розкладки клавіатури"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "Модель клавіатури:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "Виберіть опції розкладки:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "Позиція клавіші Compose:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "Розкладки клавіатури:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "По замовчуванню"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "Розкладка"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "Варіант"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "Показувати розкладки як:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "малюнок"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "текст"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "Розмір тексту:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "малий"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "середній"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "великий"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "Керувати розкладками:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "глобально"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "для вікна"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "для програми"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "Розширення - Розкладки клавіатури"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 "Дозволяє Вам налаштувати і використовувати кілька розкладок клавіатури."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "Інші доповнення доступні тут"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "Додати розкладку"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "Розкладки клавіатури"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "Розширення для налаштування розкладок клавіатури та їх перемикання"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "Конфігурацію модифікаторів XKB\n"
+#~ "вимкнуто в конфігураційному файлі.\n"
+#~ "\n"
+#~ "Детальнішу інформацію дивись в файлі README."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "Модель клавіатури:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "Виберіть опції розкладки:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "Позиція клавіші Compose:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "Розкладки клавіатури:"
+
+#~ msgid "Default"
+#~ msgstr "По замовчуванню"
+
+#~ msgid "Layout"
+#~ msgstr "Розкладка"
+
+#~ msgid "Variant"
+#~ msgstr "Варіант"
+
+#~ msgid "Add layout"
+#~ msgstr "Додати розкладку"
diff --git a/po/ur.po b/po/ur.po
index f6a78d7..61de56c 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-05-14 03:30+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -20,122 +20,109 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"ایکس کے بی XKB وضع کاری تبدیلیاں\n"
-"کانفگ فائل میں معطل ہیں.\n"
-"\n"
-"مزید معلومات کے لیے ریڈ می README دیکھیں."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "کیبورڈ خاکے"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "کیبورڈ ماڈل:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "خاکہ اختیارات تبدیل کریں:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "کیبورڈ مقام لکھیں:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "کیبورڈ خاکے:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "خاکہ شامل کریں"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "خاکہ ظاہر کریں بطور:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "تصویر"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "متن"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "خاکے مرتب کریں:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "کُل طور پر"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "فی ونڈو"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "فی اطلاقیہ"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "کیبورڈ خاکہ پلگ ان"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "آپ کو متعدد کیبورڈ خاکے استعمال کرنے اور وضع کرنے کی صلاحیت دیتا ہے."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "دیگر پلگ ان یہاں دستیاب ہیں"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "خاکہ شامل کریں"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "کیبورڈ خاکے"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "کیبورڈ خاکہ ترتیبات اور مبدل"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "ایکس کے بی XKB وضع کاری تبدیلیاں\n"
+#~ "کانفگ فائل میں معطل ہیں.\n"
+#~ "\n"
+#~ "مزید معلومات کے لیے ریڈ می README دیکھیں."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "کیبورڈ ماڈل:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "خاکہ اختیارات تبدیل کریں:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "کیبورڈ مقام لکھیں:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "کیبورڈ خاکے:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "خاکہ شامل کریں"
+
+#~ msgid "Add layout"
+#~ msgstr "خاکہ شامل کریں"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/ur_PK.po b/po/ur_PK.po
index f6a78d7..61de56c 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-05-14 03:30+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -20,122 +20,109 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"ایکس کے بی XKB وضع کاری تبدیلیاں\n"
-"کانفگ فائل میں معطل ہیں.\n"
-"\n"
-"مزید معلومات کے لیے ریڈ می README دیکھیں."
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "کیبورڈ خاکے"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "کیبورڈ ماڈل:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "خاکہ اختیارات تبدیل کریں:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "کیبورڈ مقام لکھیں:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "کیبورڈ خاکے:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-#, fuzzy
-msgid "Layout"
-msgstr "خاکہ شامل کریں"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "خاکہ ظاہر کریں بطور:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "تصویر"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "متن"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "خاکے مرتب کریں:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "کُل طور پر"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "فی ونڈو"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "فی اطلاقیہ"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "کیبورڈ خاکہ پلگ ان"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "آپ کو متعدد کیبورڈ خاکے استعمال کرنے اور وضع کرنے کی صلاحیت دیتا ہے."
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "دیگر پلگ ان یہاں دستیاب ہیں"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "خاکہ شامل کریں"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "کیبورڈ خاکے"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "کیبورڈ خاکہ ترتیبات اور مبدل"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "ایکس کے بی XKB وضع کاری تبدیلیاں\n"
+#~ "کانفگ فائل میں معطل ہیں.\n"
+#~ "\n"
+#~ "مزید معلومات کے لیے ریڈ می README دیکھیں."
+
+#~ msgid "Keyboard model:"
+#~ msgstr "کیبورڈ ماڈل:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "خاکہ اختیارات تبدیل کریں:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "کیبورڈ مقام لکھیں:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "کیبورڈ خاکے:"
+
+#, fuzzy
+#~ msgid "Layout"
+#~ msgstr "خاکہ شامل کریں"
+
+#~ msgid "Add layout"
+#~ msgstr "خاکہ شامل کریں"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""
diff --git a/po/xfce4-xkb-plugin.pot b/po/xfce4-xkb-plugin.pot
index 2900c3f..eacae81 100644
--- a/po/xfce4-xkb-plugin.pot
+++ b/po/xfce4-xkb-plugin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\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,110 +17,71 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr ""
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr ""
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr ""
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr ""
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr ""
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr ""
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr ""
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+msgid "Keyboard settings"
 msgstr ""
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2541b4f..8ad063a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin\n"
-"Report-Msgid-Bugs-To: <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2009-11-09 19:49+0800\n"
 "Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n-cn at xfce.org>\n"
@@ -19,115 +19,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"已在配置文件中禁用了 XKB 配置修改。\n"
-"\n"
-"参看 README 文件获取更多信息。"
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "键盘布局"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "键盘类型:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "更改布局选项:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "组合键位置:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "键盘布局:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "默认"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "布局"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "变体"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "显示布局为:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "图片"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "文字"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "文字大小:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "小"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "中"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "大"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "管理布局:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "全局"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "每个窗口"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "每个应用程序"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "键盘布局插件"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "让您配置并使用多种键盘布局。"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "在此处可用的其它插件"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "添加布局"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "键盘布局"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "键盘布局设置和切换插件"
+
+#~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "已在配置文件中禁用了 XKB 配置修改。\n"
+#~ "\n"
+#~ "参看 README 文件获取更多信息。"
+
+#~ msgid "Keyboard model:"
+#~ msgstr "键盘类型:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "更改布局选项:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "组合键位置:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "键盘布局:"
+
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgid "Layout"
+#~ msgstr "布局"
+
+#~ msgid "Variant"
+#~ msgstr "变体"
+
+#~ msgid "Add layout"
+#~ msgstr "添加布局"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 809b96b..5d9c729 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-xkb-plugin 0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 21:50+0600\n"
+"POT-Creation-Date: 2012-07-27 22:05-0400\n"
 "PO-Revision-Date: 2012-01-15 11:58+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -16,121 +16,114 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../panel-plugin/xkb-settings-dialog.c:489
-msgid ""
-"XKB configuration modifications are\n"
-"disabled from the config file.\n"
-"\n"
-"See the README file for more information."
-msgstr ""
-"XKB 組態與修改\n"
-"被組態檔停用。\n"
-"\n"
-"請見 README 檔案瞭解更多資訊。"
-
-#: ../panel-plugin/xkb-settings-dialog.c:515
+#: ../panel-plugin/xkb-settings-dialog.c:112
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:1
 msgid "Keyboard Layouts"
 msgstr "鍵盤配置"
 
-#: ../panel-plugin/xkb-settings-dialog.c:537
-msgid "Keyboard model:"
-msgstr "鍵盤型號:"
-
-#. toggle layout option
-#: ../panel-plugin/xkb-settings-dialog.c:562
-msgid "Change layout option:"
-msgstr "變更鍵盤選項:"
-
-#. compose key position option
-#: ../panel-plugin/xkb-settings-dialog.c:588
-msgid "Compose key position:"
-msgstr "編輯按鍵位置:"
-
-#. the actual layouts
-#: ../panel-plugin/xkb-settings-dialog.c:615
-msgid "Keyboard layouts:"
-msgstr "鍵盤配置:"
-
-#: ../panel-plugin/xkb-settings-dialog.c:628
-msgid "Default"
-msgstr "預設"
-
-#: ../panel-plugin/xkb-settings-dialog.c:635
-msgid "Layout"
-msgstr "配置"
-
-#: ../panel-plugin/xkb-settings-dialog.c:643
-msgid "Variant"
-msgstr "變異"
-
 #. ***
-#: ../panel-plugin/xkb-settings-dialog.c:687
+#: ../panel-plugin/xkb-settings-dialog.c:122
 msgid "Show layout as:"
 msgstr "顯示配置為:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:692
+#: ../panel-plugin/xkb-settings-dialog.c:127
 msgid "image"
 msgstr "影像"
 
-#: ../panel-plugin/xkb-settings-dialog.c:693
+#: ../panel-plugin/xkb-settings-dialog.c:128
 msgid "text"
 msgstr "文字"
 
 #. text size option
-#: ../panel-plugin/xkb-settings-dialog.c:698
+#: ../panel-plugin/xkb-settings-dialog.c:133
 msgid "Text size:"
 msgstr "文字大小:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:703
+#: ../panel-plugin/xkb-settings-dialog.c:138
 msgid "small"
 msgstr "小"
 
-#: ../panel-plugin/xkb-settings-dialog.c:704
+#: ../panel-plugin/xkb-settings-dialog.c:139
 msgid "medium"
 msgstr "中"
 
-#: ../panel-plugin/xkb-settings-dialog.c:705
+#: ../panel-plugin/xkb-settings-dialog.c:140
 msgid "large"
 msgstr "大"
 
-#: ../panel-plugin/xkb-settings-dialog.c:709
+#: ../panel-plugin/xkb-settings-dialog.c:144
 msgid "Manage layout:"
 msgstr "管理配置:"
 
-#: ../panel-plugin/xkb-settings-dialog.c:714
+#: ../panel-plugin/xkb-settings-dialog.c:149
 msgid "globally"
 msgstr "全域"
 
-#: ../panel-plugin/xkb-settings-dialog.c:715
+#: ../panel-plugin/xkb-settings-dialog.c:150
 msgid "per window"
 msgstr "各個視窗獨立"
 
-#: ../panel-plugin/xkb-settings-dialog.c:716
+#: ../panel-plugin/xkb-settings-dialog.c:151
 msgid "per application"
 msgstr "各個程式獨立"
 
-#: ../panel-plugin/xkb-settings-dialog.c:758
+#: ../panel-plugin/xkb-settings-dialog.c:185
 msgid "Keyboard Layouts Plugin"
 msgstr "鍵盤配置插件"
 
-#: ../panel-plugin/xkb-settings-dialog.c:764
+#: ../panel-plugin/xkb-settings-dialog.c:195
 msgid "Allows you to configure and use multiple keyboard layouts."
 msgstr "讓您設定並使用多種鍵盤配置。"
 
-#: ../panel-plugin/xkb-settings-dialog.c:768
+#: ../panel-plugin/xkb-settings-dialog.c:199
 msgid "Other plugins available here"
 msgstr "其他可用的插件"
 
-#: ../panel-plugin/xkb-settings-dialog.c:820
-msgid "Add layout"
-msgstr "新增配置"
+#: ../panel-plugin/xfce4-xkb-plugin.c:125
+#, fuzzy
+msgid "Keyboard settings"
+msgstr "鍵盤配置"
 
 #: ../panel-plugin/xkb-plugin.desktop.in.in.h:2
 msgid "Keyboard layouts setup and switch plugin"
 msgstr "鍵盤配置設置與切換插件"
 
 #~ msgid ""
+#~ "XKB configuration modifications are\n"
+#~ "disabled from the config file.\n"
+#~ "\n"
+#~ "See the README file for more information."
+#~ msgstr ""
+#~ "XKB 組態與修改\n"
+#~ "被組態檔停用。\n"
+#~ "\n"
+#~ "請見 README 檔案瞭解更多資訊。"
+
+#~ msgid "Keyboard model:"
+#~ msgstr "鍵盤型號:"
+
+#~ msgid "Change layout option:"
+#~ msgstr "變更鍵盤選項:"
+
+#~ msgid "Compose key position:"
+#~ msgstr "編輯按鍵位置:"
+
+#~ msgid "Keyboard layouts:"
+#~ msgstr "鍵盤配置:"
+
+#~ msgid "Default"
+#~ msgstr "預設"
+
+#~ msgid "Layout"
+#~ msgstr "配置"
+
+#~ msgid "Variant"
+#~ msgstr "變異"
+
+#~ msgid "Add layout"
+#~ msgstr "新增配置"
+
+#~ msgid ""
 #~ "Allows you to switch the keyboard layout and\n"
 #~ "displays the currently selected layout."
 #~ msgstr ""


More information about the Xfce4-commits mailing list