Sync translations with transifex

71 files changed, 6820 insertions, 11364 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 5cd97c6..2171147 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -33,6 +33,7 @@ he
 hi
 hr
 hu
+hy
 id
 it
 ja
diff --git a/po/am.po b/po/am.po
index 215ebb1..ce0843e 100644
--- a/po/am.po
+++ b/po/am.po
@@ -1,33 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# samson <[email protected]>, 2013
+# samson <[email protected]>, 2013,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
-"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-06-14 01:34+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 19:04+0000\n"
 "Last-Translator: samson <[email protected]>\n"
-"Language-Team: Amharic (http://www.transifex.com/projects/p/MATE/language/am/)\n"
+"Language-Team: Amharic (http://www.transifex.com/mate/MATE/language/am/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "ምስሉ ሲጫን ስህተት ተፈጥሯል: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -35,254 +35,180 @@ msgid ""
 "For licensing see package metadata"
 msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "ያልታወቀ"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "የፊደል ገበታ አቀማመጥ \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "እቅዶች \"%s\""
+msgstr[1] "እቅዶች \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "ምርጫ \"%s\""
 msgstr[1] "ምርጫዎች \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
-msgstr ""
+msgstr "ዘዴ \"%s\", %s እና %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
-msgstr ""
+msgstr "እቅድ የለም"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ምርጫዎች የሉም "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "የፊደል ገበታው አይነት "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "የፊደል ገበታው አይነት "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
-msgstr ""
+msgstr "የ ፊደል ገበታ አቀማመጥ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
-msgstr ""
+msgstr "የ ፊደል ገበታ አቀማመጥ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "የፊደል ገበታ ምርጫዎች"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr ""
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr ""
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "የፊደል ቤተሰብ "
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "ፊደል"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "የፊደሉ መጠን "
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "የፊት ለፊቱ ቀለም "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "የመደቡ ቀለም "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "ንቁ _ተሰኪዎች:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "ንግግሩን መዝጊያ"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "ተሰኪ መጨመሪያ"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_ዝግጁ ተሰኪዎች:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "መግለጫ የለም"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "የ እርዳታ ፋይል መክፈት አልተቻለም"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr ""
+msgstr "የ ፊደል ገበታ አቀማመጥ"
 
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
-msgstr ""
+msgstr "የ ፊደል ገበታ ጠቋሚ መሞከሪያ (%s)"
 
 #: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
diff --git a/po/ar.po b/po/ar.po
index c2c79c4..a5068bc 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,26 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-10-05 15:11+0000\n"
-"Last-Translator: mauron\n"
-"Language-Team: Arabic (http://www.transifex.com/projects/p/MATE/language/ar/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Arabic (http://www.transifex.com/mate/MATE/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "حدث خطأ عند تحميل صورة: \"%s\"."
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "خطأ في بدء XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,16 +36,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "تصميم لوحة المفاتيح \"%s\"\nحقوق النشر &#169; للمساهمين في مؤسسة X.Org و XKeyboardConfig\nلمراجعة الرخصة انظر بيانات الحزمة"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "تخطيط لوحة المفاتيح \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -56,7 +56,7 @@ msgstr[3] "مخططات \"%s\""
 msgstr[4] "مخططات \"%s\""
 msgstr[5] "مخططات \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -67,227 +67,153 @@ msgstr[3] "خيارات \"%s\""
 msgstr[4] "خيارات \"%s\""
 msgstr[5] "خيارات \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "طراز \"%s\"، %s و %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "لا مخطط"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "لا خيارات"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "طراز لوحة المفاتيح"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "طراز لوحة المفاتيح"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "تخطيط لوحة المفاتيح"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "تخطيط لوحة المفاتيح"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "خيارات لوحة المفاتيح"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "معالجات تحديث لوحة المفاتيح"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "مجموعة من البرامج النصية التي تشتغل كلما أُعيد تحميل حالة لوحة المفاتيح. مفيد في إعادة تطبيق التضبيطات المعتمدة على xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "قائمة ملفات modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "قائمة ملفات modmap المتوفرة في الدليل المنزل $HOME"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "المجموعة المبدئية، عند إنشاء نافذة"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "احفظ وأدر مجموعة منفصلة لكل نافذة"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "احفظ/حمّل الموضحات مع مجموعات المخططات"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "اعرض أسماء المخططات بدل أسماء المجموعات"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "اعرض أسماء المخططات بدل أسماء المجموعات (فقط لإصدارات XFree الداعمة للمخططات المتعددة)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "حمّل عناصر التضبيطات الإضافية"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "حمّل التخطيطات الغريبة نادرة الاستخدام"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "لا تظهر التنبيه \"تغيرت إعدادات س\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "معاينة لوحة المفاتيح، الانزياح السيني"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "معاينة لوحة المفاتيح، الانزياح الصادي"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "معاينة لوحة المفاتيح، العرض"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "معاينة لوحة المفاتيح، الارتفاع"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "المجموعات الثانوية"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "اعرض أعلام في البريمج"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "اعرض أعلام في البريمج لتشير للمخطط الحالي"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "الخط"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "خط موضح التخطيط"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "حجم الخط"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "حجم خط موضح التخطيط"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "لون المقدمة"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "لون مقدمة موضح التخطيط"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "لون الخلفية"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "لون خلفية موضح التخطيط"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "قائمة بالملحقات المفعّلة لموضّح لوحة المفاتيح "
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "تخطيط لوحة المفاتيح"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "ملحقات موضّح لوحة المفاتيح"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "الملحقات ال_نشطة:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "قائمة الملحقات النشطة"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "نشِّط ملحقات أكثر"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "ثبِّط الملحق المختار"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "ارفع أولوية الملحق"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "اخفض أولوية الملحق"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "اضبط الملحق المختار"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "أغلق الحوار"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "أضِف ملحق"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "الملحقات المت_وفرة:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "لا وصف."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "لا يمكن فتح ملف المساعدة"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "فشل بدأ MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "ملحقات موضّح لوحة المفاتيح"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "فعّل/عطّل الملحقات المثبتة"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/as.po b/po/as.po
index a34d7c7..27a5335 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,249 +1,215 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Amitakhya Phukan <[email protected]>, 2009.
+# 
+# Translators:
+# Amitakhya Phukan <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-09-18 15:40+0530\n"
-"Last-Translator: \n"
-"Language-Team: Assamese <>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Assamese (http://www.transifex.com/mate/MATE/language/as/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 0.2\n"
+"Language: as\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "ছবি লোড কৰিবলৈ সমস্যা: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB প্ৰাৰম্ভ সংক্ৰান্ত সমস্যা"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"কি-বোৰ্ড বিন্যাস \"%s\"\n"
-"স্বত্বাধিকাৰ &#169; X.Org Foundation আৰু XKeyboardConfig নিৰ্মাতাবৃন্দ\n"
-"অনুজ্ঞাপত্ৰ সংক্ৰান্ত তথ্য জনাৰ বাবে অনুগ্ৰহ কৰি পেকেজেৰ মিটাডাটা চাওক"
+msgstr "কি-বোৰ্ড বিন্যাস \"%s\"\nস্বত্বাধিকাৰ &#169; X.Org Foundation আৰু XKeyboardConfig নিৰ্মাতাবৃন্দ\nঅনুজ্ঞাপত্ৰ সংক্ৰান্ত তথ্য জনাৰ বাবে অনুগ্ৰহ কৰি পেকেজেৰ মিটাডাটা চাওক"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB প্ৰাৰম্ভ সংক্ৰান্ত সমস্যা"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "ছবি লোড কৰিবলৈ সমস্যা: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "বিন্যাস \"%s\""
 msgstr[1] "বিন্যাস \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "বিকল্প \"%s\""
 msgstr[1] "বিকল্প \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "মডেল \"%s\", %s আৰু %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "কোনো বিন্যাস উপস্থিত নাই"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "কোনো বিকল্প উপস্থিত নাই"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "কি-বোৰ্ডেৰ মডেল"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "কি-বোৰ্ডেৰ মডেল"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "কি-বোৰ্ডেৰ বিন্যাস"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "কি-বোৰ্ডেৰ বিন্যাস"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "কি-বোৰ্ড সংক্ৰান্ত বিকল্প"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "কি-বোৰ্ড উন্নতৰ হেন্ডলাৰ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"কি-বোৰ্ডৰ অবস্থান লোড কৰাৰ পিছত সঞ্চালনৰ উদ্দেশ্যে স্ক্ৰিপ্টৰ সংকলন । xmodmap ভিত্তিক "
-"পৰিবৰ্তন পুনৰায় প্ৰয়োগ কৰিবলৈ সহায়ক ।"
+msgstr "কি-বোৰ্ডৰ অবস্থান লোড কৰাৰ পিছত সঞ্চালনৰ উদ্দেশ্যে স্ক্ৰিপ্টৰ সংকলন । xmodmap ভিত্তিক পৰিবৰ্তন পুনৰায় প্ৰয়োগ কৰিবলৈ সহায়ক ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap নথিপত্ৰৰ তালিকা"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME পঞ্জিকাত উপলব্ধ modmap নথিপত্ৰৰ তালিকা ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "অবিকল্পিত দল, সংযোগক্ষেত্ৰ নিৰ্মাণকালত নিৰ্ধাৰিত"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "প্ৰতি সংযোগক্ষেত্ৰৰ বাবে পৃথক সংকলন নিৰ্ধাৰণ আৰু পৰিচালনা কৰক"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "কি-বোৰ্ড উন্নতৰ হেন্ডলাৰ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "কি-বোৰ্ডেৰ বিন্যাস"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "কি-বোৰ্ডেৰ মডেল"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "কি-বোৰ্ড সংক্ৰান্ত বিকল্প"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "বিৰল আৰু কম ব্যবহৃত বিন্যাস আৰু বিকল্প লোড কৰা হ'ব"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "বিন্যাসৰ অতিৰিক্ত সামগ্ৰী লোড কৰা হ'ব"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "বিন্যাসৰ সংকলনৰ সৈতে সংৰক্ষণ/পুনৰুদ্ধাৰ নিৰ্দেশক"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "দ্বিতীয় সংকলন"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "এপ্লেটে ফ্লেগ প্ৰদৰ্শিত হ'ব"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "বৰ্তমানে ব্যবহৃত বিন্যাস নিৰ্দেশেৰ বাবে এপ্লেটে ফ্লেগ প্ৰদৰ্শন কৰা হ'ব"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "সংকলনৰ নামৰ পৰিবৰ্তে বিন্যাসৰ নাম প্ৰদৰ্শন কৰা হ'ব"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"সংকলনৰ নামৰ পৰিবৰ্তে বিন্যাসৰ নাম প্ৰদৰ্শন কৰা হ'ব (অকল একাধিক বিন্যাস বিশিষ্ট "
-"XFree-ৰ সংস্কৰণৰ বাবে)"
+msgstr "সংকলনৰ নামৰ পৰিবৰ্তে বিন্যাসৰ নাম প্ৰদৰ্শন কৰা হ'ব (অকল একাধিক বিন্যাস বিশিষ্ট XFree-ৰ সংস্কৰণৰ বাবে)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "বিন্যাসৰ অতিৰিক্ত সামগ্ৰী লোড কৰা হ'ব"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "বিৰল আৰু কম ব্যবহৃত বিন্যাস আৰু বিকল্প লোড কৰা হ'ব"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\" সতৰ্কবাৰ্তা ৰোধ কৰা হ'ব"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "কি-বোৰ্ডেৰ পূৰ্বপ্ৰদৰ্শন, X অফ-ছেট"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "কি-বোৰ্ডেৰ পূৰ্বপ্ৰদৰ্শন, Y অফ-ছেট"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "কি-বোৰ্ডেৰ পূৰ্বপ্ৰদৰ্শন, উচ্চতা"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "কি-বোৰ্ডেৰ পূৰ্বপ্ৰদৰ্শন, প্ৰস্থ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "সক্ৰিয় কি-বোৰ্ড নিৰ্দেশক প্লাগ-ইনৰ তালিকা"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "কি-বোৰ্ডেৰ বিন্যাস"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "কি-বোৰ্ডেৰ মডেল"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap নথিপত্ৰৰ তালিকা"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "অতিৰিক্ত প্লাগ-ইন সক্ৰিয় কৰক"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "প্লাগ-ইন সক্ৰিয় কৰক: (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "সম্বাদ বন্ধ কৰক"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "নিৰ্বাচিত প্লাগ-ইন কনফিগাৰ কৰক"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "নিৰ্বাচিত প্লাগ-ইন নিষ্ক্ৰিয় কৰক"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "প্লাগ-ইনৰ গুৰুত্ব হ্ৰাস কৰক"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "প্লাগ-ইনৰ গুৰুত্ব বৃদ্ধি কৰক"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "কি-বোৰ্ড নিৰ্দেশক প্লাগ-ইন"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "কি-বোৰ্ডেৰ পূৰ্বপ্ৰদৰ্শন, উচ্চতা"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "সক্ৰিয় প্লাগ-ইনৰ তালিকা"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "দ্বিতীয় সংকলন"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "প্লাগ-ইন যোগ কৰক"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "উপলব্ধ প্লাগ-ইন: (_A)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "কোনো বিবৰণ উপস্থিত নাই ।"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "সহায়িকাৰ নথিপত্ৰ খুলিবলৈ ব্যৰ্থ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf init কৰিবলৈ ব্যৰ্থ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "সংস্থাপন কৰা প্লাগ-ইন সক্ৰিয়/নিষ্ক্ৰিয় কৰক"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "কি-বোৰ্ড নিৰ্দেশকাৰী প্লাগ-ইন"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "কি-বোৰ্ড নিৰ্দেশক পৰীক্ষা (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "নিৰ্দেশক:"
-
diff --git a/po/ast.po b/po/ast.po
index e331d6e..5f93cf7 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,32 +3,32 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ḷḷumex03 <[email protected]>, 2014
+# Ḷḷumex03 <[email protected]>, 2014
 # Xuacu Saturio <[email protected]>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-06-13 07:46+0000\n"
-"Last-Translator: Ḷḷumex03 <[email protected]>\n"
-"Language-Team: Asturian (http://www.transifex.com/projects/p/MATE/language/ast/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Asturian (http://www.transifex.com/mate/MATE/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Hebo un fallu cargando una imaxe: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Fallu d'anicialización de XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,250 +36,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Distribución de tecláu «%s»\nCopyright &#169; la Fundación X.Org y los contribuyidores de XKeyboardConfig\nPa la llicencia mira los metadatos del paquete"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Desconocíu"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Distribución del tecláu \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "esquema «%s»"
 msgstr[1] "esquemes «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opción «%s»"
 msgstr[1] "opciones «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelu «%s», %s y %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ensin esquema"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ensin opciones"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modelu del tecláu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "modelu de tecláu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Distribución del tecláu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "distribución de tecláu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opciones de tecláu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Remanadores d'Anovamientu de Tecláu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Una coleición de scripts pa executar cuando l'estáu del tecláu se recarga. Util pa re-aplicar axustes basaos en xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "llista de ficheros modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Una llista de ficheros modmap disponibles nel direutoriu $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grupu por defeutu, asignáu durante la creación de la ventana"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Caltien y alministra grupos separtaos per ventana"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Guardar/restaurar indicadores xunto colos grupos d'esquemes"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Amuesa nomes de los esquemes en cuantes de nomes de los grupos"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Amuesa los nomes de los esquemes encuantes de nomes de los grupos (namái pa versiones de XFree que sofiten esquemes múltiples)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Cargar elementos de configuración adicionales"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Cargar distribuciones y opciones exótiques, raramente usaes"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprime'l mensax d'alvertencia «sysconfig de X modificáu»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Vista Previa de Tecláu, offset X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Vista Previa de Tecláu, offset Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Vista Previa de Tecláu, anchor"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Vista Previa de Tecláu, altor"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupos secundarios"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Amuesa banderes na applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Amuesa banderes na applet pa indicar l'esquema actual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "La familia de fontes"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "La familia de fontes pal indicador de distribución"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "El tamañu de la fonte"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "El tamañu de fonte pal indicador de distribución"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "El color del primer planu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "El color del primer planu pal indicador de distribución"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "El color de fondu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "El color de fondu pal indicador de distribución"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La llista de complementos del Indicador de Tecláu activaos"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Distribución del tecláu"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Complementos del Indicador de Tecláu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Com_plementos activos:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "La llista de complementos activos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activa más complementos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desactivar el complementu esbilláu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Aumentar la prioridá del complementu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Amenorgar la prioridá del complementu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configurar el complementu esbilláu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Zarrar el diálogu"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Amestar Complementu"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "C_omplementos disponibles:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Ensin descripción."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nun pudo abrise'l ficheru d'ayuda"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Fallu al aniciar de MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Complementos del indicador de tecláu"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Activa/Desactiva complementos instalaos"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/be.po b/po/be.po
index ce3e32b..d9fddf4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,26 +8,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2015-03-20 11:08+0000\n"
-"Last-Translator: Mihail Varantsou <[email protected]>\n"
-"Language-Team: Belarusian (http://www.transifex.com/projects/p/MATE/language/be/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Belarusian (http://www.transifex.com/mate/MATE/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: be\n"
-"Plural-Forms: nplurals=4; 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=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Памылка падчас чытання выявы: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Памылка ініцыялізацыі XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -35,16 +35,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Раскладка клавіятуры \"%s\"\nАўтарскае права &#169; X.Org Foundation і аўтары XKeyboardConfig\nПа ліцэнзію звяртайцеся да метазвестак пакунка"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Невядома"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Раскладка клавіятуры \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -53,7 +53,7 @@ msgstr[1] "раскладкі \"%s\""
 msgstr[2] "раскладкі \"%s\""
 msgstr[3] "раскладкі \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -62,227 +62,153 @@ msgstr[1] "параметры \"%s\""
 msgstr[2] "параметры \"%s\""
 msgstr[3] "параметры \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "мадэль \"%s\", %s і %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "няма раскладкі"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "няма параметраў"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Мадэль клавіятуры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "мадэль клавіятуры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Раскладка клавіятуры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "раскладка клавіятуры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Параметры клавіятуры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Хэндлеры абнаўлення клавіятуры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "спіс modmap-файлаў"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Спіс modmap-файлаў, даступных у каталогу $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Стандартная група, што прызначаецца пры стварэнні акна"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Захоўваць і падтрымліваць розныя групы, на кожнае акно сваю"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Захоўваць/аднаўляць індыкатары разам з групамі раскладак"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Паказваць назвы раскладак замест назваў груп"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Загружаць дадатковыя параметры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Загружаць экзатычныя, рэдка ўжывальныя раскладкі і параметры"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Адключыць папярэджанне \"Сістэмны конфіг X зменены\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Перадпрагляд клавіятуры, зрух па X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Перадпрагляд клавіятуры, зрух па Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Перадпрагляд клавіятуры, шырыня"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Перадпрагляд клавіятуры, вышыня"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Другасныя групы"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Паказваць сцяжкі ў аплеце"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Сямейства шрыфтоў"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Памер шрыфта"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Асноўны колер"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Колер фону"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Спіс актыўных убудоваў клавіятурнага індыкатара"
-
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Раскладка клавіятуры"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Убудовы клавіятурнага індыкатара"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Актыўныя _ўбудовы:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Спіс актыўных убудоваў"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Задзейнічаць больш убудоваў"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Адключыць выбраную ўбудову"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Павялічыць прыярытэт убудовы"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Зменшыць прыярытэт убудовы"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Наставіць выбраную ўбудову"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Закрыць акенца"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Дадаць убудову"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Даступныя ўбудовы:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Няма апісання."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Не выйшла адкрыць файл даведкі"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Не выйшла ініцыялізаваць MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Убудовы клавіятурнага індыкатара"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Уключыць/адключыць усталяваныя ўбудовы"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/bg.po b/po/bg.po
index ea8af05..308f2e0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,298 +1,216 @@
-# Bulgarian translation of libmatekbd po-file.
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# Alexander Shopov <[email protected]>, 2007, 2008, 2009, 2010.
-# Yavor Doganov <[email protected]>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alexander Shopov <[email protected]>, 2007, 2008, 2009, 2010
+# Yavor Doganov <[email protected]>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd master\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 13:42+0300\n"
-"PO-Revision-Date: 2010-08-23 13:42+0300\n"
-"Last-Translator: Alexander Shopov <[email protected]>\n"
-"Language-Team: Bulgarian <[email protected]>\n"
-"Language: bg\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/mate/MATE/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Грешка при зареждането на изображението: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Грешка при инициализирането на XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Клавиатурна подредба „%s“\n"
-"Авторски права &#169; X.Org Foundation и сътрудници на XKeyboardConfig\n"
-"Вижте мета-данните на пакета за информация относно лиценза"
+msgstr "Клавиатурна подредба „%s“\nАвторски права &#169; X.Org Foundation и сътрудници на XKeyboardConfig\nВижте мета-данните на пакета за информация относно лиценза"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Непозната"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Подредба на клавиатурата — %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "подредба „%s“"
 msgstr[1] "подредби „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "настройка „%s“"
 msgstr[1] "настройки „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "модел „%s“, %s и %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "без подредба"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "без опции"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
-msgid ""
-"A collection of scripts to run whenever the keyboard state is reloaded. "
-"Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Набор от скриптове, които да се изпълняват при всяко презареждане на "
-"състоянието на клавиатурата. Полезно е за повторното прилагане на "
-"допълнителни конфигурации по xmodmap."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "A list of modmap files available in the $HOME directory."
-msgstr "Списък с файловете за подредби, налични в домашната папка ($HOME)."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "Default group, assigned on window creation"
-msgstr "Стандартната група, която се присвоява на прозорец при създаването му"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "Keep and manage separate group per window"
-msgstr "Управление на отделна група за всеки прозорец"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Модел на клавиатурата"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Скриптове за обработка на промяната на клавиатурната подредба"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "модел на клавиатурата"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Подредба на клавиатурата"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Модел на клавиатурата"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "подредба на клавиатурата"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Настройки на клавиатурата"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Зареждане на по-рядко използваните подредби и настройки"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Скриптове за обработка на промяната на клавиатурната подредба"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Зареждане на допълнителните настройки"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr "Набор от скриптове, които да се изпълняват при всяко презареждане на състоянието на клавиатурата. Полезно е за повторното прилагане на допълнителни конфигурации по xmodmap."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Save/restore indicators together with layout groups"
-msgstr ""
-"Запазване/възстановяване на индикаторите заедно с групите по подредбата"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "файл със списък на подредбите"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Втори групи"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
+msgstr "Списък с файловете за подредби, налични в домашната папка ($HOME)."
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Показване на знамена в аплета"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
+msgstr "Стандартната група, която се присвоява на прозорец при създаването му"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Показване на знамена в аплета за текущата подредба"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
+msgstr "Управление на отделна група за всеки прозорец"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
+msgid "Save/restore indicators together with layout groups"
+msgstr "Запазване/възстановяване на индикаторите заедно с групите по подредбата"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Показване на имената на подредбите вместо имената на групите"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Показване на имената на подредбите вместо имената на групите (само при "
-"версии на XFree, които поддържат множество подредби)"
+msgstr "Показване на имената на подредбите вместо имената на групите (само при версии на XFree, които поддържат множество подредби)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Зареждане на допълнителните настройки"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Зареждане на по-рядко използваните подредби и настройки"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Съобщенията „Промяна на системните настройки на X“ да не се показват"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Преглед на клавиатурата, отместване по X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Преглед на клавиатурата, отместване по Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Преглед на клавиатурата, височина"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Преглед на клавиатурата, широчина"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Цвят на фона"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Цвят на фона за индикатора на подредбата"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Шрифт"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Преглед на клавиатурата, височина"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Шрифт за индикатора на подредбата"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Втори групи"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Размер на шрифта"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Размер на шрифта за индикатора на подредбата"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Основен цвят"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Основен цвят за индикатора на подредбата"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Списък със задействаните приставки за обозначаване на клавиатурата"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "подредба на клавиатурата"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "модел на клавиатурата"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Цвят на фона"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "файл със списък на подредбите"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Подредба на клавиатурата"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Задействане на още приставки"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Действащи приставки"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Затваряне на диалоговия прозорец"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Настройване на избраната приставка"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Спиране на избраната приставка"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Понижаване на приоритета на приставката"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Повишаване на приоритета на приставката"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Приставки за обозначаване на клавиатурата"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Списък с действащи приставки"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Добавяне на приставка"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Налични приставки"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Без описание."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Файлът с помощта не може да бъде отворен"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Неуспех при инициализирането на MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Задействане/спиране на инсталираните приставки"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Приставки за обозначаване на клавиатурата"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Тест на индикатора на клавиатурата (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Индикатор:"
diff --git a/po/bn.po b/po/bn.po
index ae2ad14..e55ff69 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,286 +1,218 @@
-# Bengali translation for libmatekbd
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Runa Bhattacharjee <[email protected]>, 2007.
-# Runa Bhattacharjee <[email protected]>, 2008.
-# Runa Bhattacharjee <[email protected]>, 2008, 2009.
-# Israt Jahan <[email protected]>, 2009.
-# Israt Jahan <[email protected]>, 2010.
-#
+# 
+# Translators:
+# Israt Jahan <[email protected]>, 2009, 2010
+# Runa Bhattacharjee <[email protected]>, 2008
+# runa <[email protected]>, 2007
+# runab <[email protected]>, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: bn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-01-25 20:57+0000\n"
-"PO-Revision-Date: 2010-03-09 12:20+0600\n"
-"Last-Translator: Israt Jahan <[email protected]>\n"
-"Language-Team: Bengali <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Bengali (http://www.transifex.com/mate/MATE/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:236
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "ছবি লোডে ত্রুটি হয়েছিল: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:707 ../libmatekbd/matekbd-status.c:550
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB প্রারম্ভ সংক্রান্ত ত্রুটি"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2391
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
+msgstr "কীবোর্ডের লেআউট \"%s\"\nস্বত্বাধিকার &#169; X.Org ফাউন্ডেশন ও XKeyboardConfig নির্মাতাবৃন্দ\nলাইসেন্স সংক্রান্ত তথ্য জানার জন্য অনুগ্রহ করে প্যাকেজের মেটাডাটা দেখুন"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
+#, c-format
+msgid "Keyboard Layout \"%s\""
 msgstr ""
-"কীবোর্ডের লেআউট \"%s\"\nস্বত্বাধিকার &#169; X.Org ফাউন্ডেশন ও XKeyboardConfig "
-"নির্মাতাবৃন্দ\nলাইসেন্স সংক্রান্ত তথ্য জানার জন্য অনুগ্রহ করে প্যাকেজের "
-"মেটাডাটা দেখুন"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "বহির্বিন্যাস \"%s\""
 msgstr[1] "বহির্বিন্যাস \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "অপশন \"%s\""
 msgstr[1] "অপশন \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "মডেল \"%s\", %s এবং %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "কোনো বহির্বিন্যাস নেই"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "কোনো অপশন নেই"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "কীবোর্ডের মডেল"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "কীবোর্ডের মডেল"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "কীবোর্ডের বহির্বিন্যাস"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "কীবোর্ডের লেআউট"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "কীবোর্ড সংক্রান্ত অপশন"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "কীবোর্ড আপডেটের হ্যান্ডলার"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"কীবোর্ডের অবস্থান লোড করার পরে চালানোর উদ্দেশ্যে স্ক্রিপ্টের সংকলন। xmodmap ভিত্তিক "
-"পরিবর্তন পুনরায় প্রয়োগ করতে সহায়ক।"
+msgstr "কীবোর্ডের অবস্থান লোড করার পরে চালানোর উদ্দেশ্যে স্ক্রিপ্টের সংকলন। xmodmap ভিত্তিক পরিবর্তন পুনরায় প্রয়োগ করতে সহায়ক।"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ফাইলের তালিকা"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME ডিরেক্টরির মধ্যে বিদ্যমান modmap ফাইলের তালিকা।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "ডিফল্ট গ্রুপ, উইন্ডো নির্মাণকালে নির্ধারিত"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "প্রতিটি উইন্ডোর জন্য পৃথক গ্রুপ নির্ধারণ ও পরিচালনা করুন"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "কীবোর্ড আপডেটের হ্যান্ডলার"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "কীবোর্ডের বহির্বিন্যাস"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "কীবোর্ডের মডেল"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "কীবোর্ড সংক্রান্ত অপশন"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "বিরল ও কম ব্যবহৃত বহির্বিন্যাস ও অপশন লোড করা হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "কনফিগারেশনের অতিরিক্ত আইটেম লোড করা হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "বহির্বিন্যাসের গ্রুপের সাথে সংরক্ষণ/পুনরুদ্ধার নির্দেশক"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "সেকেন্ডারী গ্রুপ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "অ্যাপ্লেটে ফ্ল্যাগ প্রদর্শিত হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "বর্তমানে ব্যবহৃত বহির্বিন্যাস নির্দেশের জন্য অ্যাপ্লেটে ফ্ল্যাগ প্রদর্শন করা হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "গ্রুপের নামের পরিবর্তে বহির্বিন্যাসের নাম প্রদর্শন করা হবে"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"গ্রুপের নামের পরিবর্তে বহির্বিন্যাসের নাম প্রদর্শন করা হবে (শুধুমাত্র একাধিক "
-"বহির্বিন্যাস বিশিষ্ট XFree এর সংস্করণের জন্য)"
+msgstr "গ্রুপের নামের পরিবর্তে বহির্বিন্যাসের নাম প্রদর্শন করা হবে (শুধুমাত্র একাধিক বহির্বিন্যাস বিশিষ্ট XFree এর সংস্করণের জন্য)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "কনফিগারেশনের অতিরিক্ত আইটেম লোড করা হবে"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "বিরল ও কম ব্যবহৃত বহির্বিন্যাস ও অপশন লোড করা হবে"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\" সতর্কবার্তা রোধ করা হবে"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "কীবোর্ডের প্রাকদর্শন, X অফসেট"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "কীবোর্ডের প্রাকদর্শন, Y অফসেট"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "কীবোর্ডের প্রাকদর্শন, উচ্চতা"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "কীবোর্ডের প্রাকদর্শন, প্রস্থ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The background color"
-msgstr "পটভূমির রং"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "The background color for the layout indicator"
-msgstr "বহির্বিন্যাস সূচকের জন্য পটভূমির রঙ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The font family"
-msgstr "ফন্ট ফ্যামিলি"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "কীবোর্ডের প্রাকদর্শন, উচ্চতা"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The font family for the layout indicator"
-msgstr "বহির্বিন্যাস সূচকের জন্য ফন্ট ফ্যামিলি"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "সেকেন্ডারী গ্রুপ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font size"
-msgstr "ফন্টের আকার"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font size for the layout indicator"
-msgstr "বহির্বিন্যাস সূচকের জন্য ফন্টের আকার"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "পুরোভাগের রং"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The foreground color for the layout indicator"
-msgstr "বহির্বিন্যাস সূচকের জন্য পুরোভাগের রং"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "সক্রিয় কীবোর্ড নির্দেশক প্লাগইনের তালিকা"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "keyboard layout"
-msgstr "কীবোর্ডের লেআউট"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "keyboard model"
-msgstr "কীবোর্ডের মডেল"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "modmap file list"
-msgstr "modmap ফাইলের তালিকা"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "অতিরিক্ত প্লাগইন সক্রিয় করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "প্লাগইন সক্রিয় করুন: (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ডায়লগ বন্ধ করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "নির্বাচিত প্লাগইন কনফিগার করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "নির্বাচিত প্লাগইন নিষ্ক্রিয় করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "প্লাগইনের প্রাধান্য হ্রাস করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "প্লাগইনের প্রাধান্য বৃদ্ধি করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "কীবোর্ড নির্দেশক প্লাগইন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "সব সক্রিয় প্লাগইনের তালিকা"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "প্লাগইন যোগ করুন"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "বিদ্যমান প্লাগইন: (_A)"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "কোনো বিবরণ নেই।"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "সহায়িকার ফাইল খুলতে ব্যর্থ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf init করতে ব্যর্থ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "পটভূমির রং"
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ইনস্টল করা প্লাগইন সক্রিয়/নিষ্ক্রিয় করুন"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "কীবোর্ড নির্দেশকারী প্লাগইন"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "কীবোর্ড নির্দেশক পরীক্ষা (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "নির্দেশক:"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 2f3c3f8..3af7ac8 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,251 +1,217 @@
-# translation of bn_IN.po to Bengali INDIA
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Runa Bhattacharjee <[email protected]>, 2007.
-# Runa Bhattacharjee <[email protected]>, 2008.
-# Runa Bhattacharjee <[email protected]>, 2008, 2009.
+# 
+# Translators:
+# Runa Bhattacharjee <[email protected]>, 2008
+# runa <[email protected]>, 2007
+# runab <[email protected]>, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-08-26 18:02+0530\n"
-"Last-Translator: Runa Bhattacharjee <[email protected]>\n"
-"Language-Team: Bengali INDIA <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/mate/MATE/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "ছবি লোড করতে সমস্যা: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB প্রারম্ভ সংক্রান্ত সমস্যা"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"কি-বোর্ড বিন্যাস \"%s\"\n"
-"স্বত্বাধিকার &#169; X.Org Foundation ও XKeyboardConfig নির্মাতাবৃন্দ\n"
-"লাইসেন্স সংক্রান্ত তথ্য জানার জন্য অনুগ্রহ করে প্যাকেজের মিটাডাটা দেখুন"
+msgstr "কি-বোর্ড বিন্যাস \"%s\"\nস্বত্বাধিকার &#169; X.Org Foundation ও XKeyboardConfig নির্মাতাবৃন্দ\nলাইসেন্স সংক্রান্ত তথ্য জানার জন্য অনুগ্রহ করে প্যাকেজের মিটাডাটা দেখুন"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB প্রারম্ভ সংক্রান্ত সমস্যা"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "ছবি লোড করতে সমস্যা: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "বিন্যাস \"%s\""
 msgstr[1] "বিন্যাস \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "বিকল্প \"%s\""
 msgstr[1] "বিকল্প \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "মডেল \"%s\", %s এবং %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "কোনো বিন্যাস উপস্থিত নেই"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "কোনো বিকল্প উপস্থিত নেই"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "কি-বোর্ডের মডেল"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "কি-বোর্ডের মডেল"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "কি-বোর্ডের বিন্যাস"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "কি-বোর্ডের বিন্যাস"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "কি-বোর্ড সংক্রান্ত বিকল্প"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "কি-বোর্ড আপডেটের হ্যান্ডলার"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"কি-বোর্ডের অবস্থান লোড করার পরে সঞ্চালনের উদ্দেশ্যে স্ক্রিপ্টের সংকলন। xmodmap "
-"ভিত্তিক পরিবর্তন পুনরায় প্রয়োগ করতে সহায়ক।"
+msgstr "কি-বোর্ডের অবস্থান লোড করার পরে সঞ্চালনের উদ্দেশ্যে স্ক্রিপ্টের সংকলন। xmodmap ভিত্তিক পরিবর্তন পুনরায় প্রয়োগ করতে সহায়ক।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ফাইলের তালিকা"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME ডিরেক্টির মধ্যে উপলব্ধ modmap ফাইলের তালিকা।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "ডিফল্ট দল, উইন্ডো নির্মাণকালে নির্ধারিত"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "প্রতিটি উইন্ডোর জন্য পৃথক সংকলন নির্ধারণ ও পরিচালনা করুন"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "কি-বোর্ড আপডেটের হ্যান্ডলার"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "কি-বোর্ডের বিন্যাস"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "কি-বোর্ডের মডেল"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "কি-বোর্ড সংক্রান্ত বিকল্প"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "বিরল ও কম ব্যবহৃত বিন্যাস ও বিকল্প লোড করা হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "কনফিগারেশনের অতিরিক্ত সামগ্রী লোড করা হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "বিন্যাসের সংকলনের সাথে সংরক্ষণ/পুনরুদ্ধার নির্দেশক"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "দ্বিতীয় সংকলন"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "অ্যাপ্লেটে ফ্ল্যাগ প্রদর্শিত হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "বর্তমানে ব্যবহৃত বিন্যাস নির্দেশের জন্য অ্যাপ্লেটে ফ্ল্যাগ প্রদর্শন করা হবে"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "সংকলনের নামের পরিবর্তে বিন্যাসের নাম প্রদর্শন করা হবে"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"সংকলনের নামের পরিবর্তে বিন্যাসের নাম প্রদর্শন করা হবে (শুধুমাত্র একাধিক বিন্যাস "
-"বিশিষ্ট XFree-র সংস্করণের জন্য)"
+msgstr "সংকলনের নামের পরিবর্তে বিন্যাসের নাম প্রদর্শন করা হবে (শুধুমাত্র একাধিক বিন্যাস বিশিষ্ট XFree-র সংস্করণের জন্য)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "কনফিগারেশনের অতিরিক্ত সামগ্রী লোড করা হবে"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "বিরল ও কম ব্যবহৃত বিন্যাস ও বিকল্প লোড করা হবে"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\" সতর্কবার্তা রোধ করা হবে"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "কি-বোর্ডের পূর্বপ্রদর্শন, X অফ-সেট"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "কি-বোর্ডের পূর্বপ্রদর্শন, Y অফ-সেট"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "কি-বোর্ডের পূর্বপ্রদর্শন, উচ্চতা"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "কি-বোর্ডের পূর্বপ্রদর্শন, প্রস্থ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "সক্রিয় কি-বোর্ড নির্দেশক প্লাগ-ইনের তালিকা"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "কি-বোর্ডের বিন্যাস"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "কি-বোর্ডের মডেল"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap ফাইলের তালিকা"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "অতিরিক্ত প্লাগ-ইন সক্রিয় করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "প্লাগ-ইন সক্রিয় করুন: (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ডায়লগ বন্ধ করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "নির্বাচিত প্লাগ-ইন কনফিগার করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "নির্বাচিত প্লাগ-ইন নিষ্ক্রিয় করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "প্লাগ-ইনের গুরুত্ব হ্রাস করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "প্লাগ-ইনের গুরুত্ব বৃদ্ধি করুন"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "কি-বোর্ড নির্দেশক প্লাগ-ইন"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "কি-বোর্ডের পূর্বপ্রদর্শন, উচ্চতা"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "সব সক্রিয় প্লাগ-ইনের তালিকা"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "দ্বিতীয় সংকলন"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "প্লাগ-ইন যোগ করুন"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "উপলব্ধ প্লাগ-ইন: (_A)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "কোনো বিবরণ উপস্থিত নেই।"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "সহায়িকার ফাইল খুলতে ব্যর্থ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf init করতে ব্যর্থ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ইনস্টল করা প্লাগ-ইন সক্রিয়/নিষ্ক্রিয় করুন"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "কি-বোর্ড নির্দেশকারী প্লাগ-ইন"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "কি-বোর্ড নির্দেশক পরীক্ষা (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "নির্দেশক:"
-
diff --git a/po/ca.po b/po/ca.po
index 11af744..f7bf282 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,315 +1,215 @@
-# Catalan translation of libmatekbd.
-# Copyright © 2005, 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# Gil Forcada <[email protected]>, 2007, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gil Forcada <[email protected]>, 2007, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-22 10:04+0200\n"
-"PO-Revision-Date: 2010-08-22 10:05+0200\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
-"Language: ca\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Catalan (http://www.transifex.com/mate/MATE/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "S'ha produït un error en carregar una imatge: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Error d'inicialització de l'XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Disposició de teclat «%s»\n"
-"Copyright &#169; la Fundació X.Org i els col·laboradors del XKeyboardConfig\n"
-"Vegeu les metadades del paquet per a la llicència"
+msgstr "Disposició de teclat «%s»\nCopyright &#169; la Fundació X.Org i els col·laboradors del XKeyboardConfig\nVegeu les metadades del paquet per a la llicència"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Disposició del teclat «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "«%s» disposició"
 msgstr[1] "«%s» disposicions"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "«%s» opció"
 msgstr[1] "«%s» opcions"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model «%s, %s i %s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "no hi ha disposició"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "no hi ha opcions"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Model del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "Model del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Disposició del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "Disposició del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Opcions del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Gestors d'actualització del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Una col·lecció d'scripts per executar en qualsevol moment que es recarregui "
-"l'estat del teclat. Útil per tornar a aplicar ajustaments basats en xmodmap"
+msgstr "Una col·lecció d'scripts per executar en qualsevol moment que es recarregui l'estat del teclat. Útil per tornar a aplicar ajustaments basats en xmodmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "llista de fitxers del modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Una llista de fitxers del modmap disponibles en el directori d'inici."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grup predeterminat, s'assigna en la creació d'una finestra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Mantén i gestiona un grup separat per finestra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Gestors d'actualització del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Disposició del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Model del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Opcions del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Carrega disposicions i opcions utilitzades rarament i exòtiques"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Carrega elements de configuració extra"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Desa/restaura els indicadors juntament amb els grups de disposició"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Grups secundaris"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Mostra els indicadors en la miniaplicació"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-"Mostra els indicadors en la miniaplicació per indicar la disposició actual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Mostra els noms de les disposicions en comptes dels noms de grup"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Mostra els noms de les disposicions en comptes dels noms de grup (només per "
-"a les versions del XFree que permeten múltiples disposicions)"
+msgstr "Mostra els noms de les disposicions en comptes dels noms de grup (només per a les versions del XFree que permeten múltiples disposicions)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Carrega elements de configuració extra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Carrega disposicions i opcions utilitzades rarament i exòtiques"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprimeix el missatge d'avís «ha canviat el X sysconfig»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "La previsualització del teclat, desplaçament horitzontal"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "La previsualització del teclat, desplaçament vertical"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "La previsualització del teclat, alçada"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "La previsualització del teclat, amplada"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "El color de fons"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "El color de fons per a l'indicador de disposició"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "La família del tipus de lletra"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "La previsualització del teclat, alçada"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "La família del tipus de lletra per a l'indicador de disposició"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Grups secundaris"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "La mida del tipus de lletra"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "La mida del tipus de lletra per a l'indicador de disposició"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "El color de primer pla"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "El color de primer pla per a l'indicador de disposició"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La llista de connectors d'indicador de teclat habilitats"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "Disposició del teclat"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "Model del teclat"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "El color de fons"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "llista de fitxers del modmap"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Disposició del teclat"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Activa més connectors"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Connectors actius:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Tanca el diàleg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Configureu el connector seleccionat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desactiva el connector seleccionat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Redueix la prioritat del connector"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Augmenta la prioritat del connector"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Connectors de l'indicador del teclat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "La llista dels connectors actius"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Afegeix un connector"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Connectors _disponibles:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Sense descripció."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "No s'ha pogut obrir el fitxer d'ajuda"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "No s'ha pogut iniciar el MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Habiliteu/inhabiliteu els connectors instal·lats"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Connectors de l'indicador de teclat"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Prova de l'indicador del teclat (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indicador:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Es sobreescriurà la configuració del teclat en el mateconf des del sistema "
-#~ "de seguida que es pugui (obsolet)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Molt aviat, es sobreescriurà la configuració del teclat en el mateconf (de "
-#~ "la configuració del sistema). Des del MATE 2.12 que aquesta clau es "
-#~ "considera obsoleta, desfeu la configuració del model, disposicions i "
-#~ "opcions de teclat per a obtenir la configuració predeterminada del "
-#~ "sistema."
diff --git a/po/[email protected] b/po/[email protected]
index eb062a9..04805c9 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,301 +1,215 @@
-# Catalan translation of libmatekbd.
-# Copyright © 2005, 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# Gil Forcada <[email protected]>, 2007, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gil Forcada <[email protected]>, 2007, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 23:03+0200\n"
-"PO-Revision-Date: 2010-04-02 18:35+0200\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/mate/MATE/language/ca@valencia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:311
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "S'ha produït un error en carregar una imatge: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:639
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Error d'inicialització de l'XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2403
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
+msgstr "Disposició de teclat «%s»\nCopyright &#169; la Fundació X.Org i els col·laboradors del XKeyboardConfig\nVegeu les metadades del paquet per a la llicència"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
+#, c-format
+msgid "Keyboard Layout \"%s\""
 msgstr ""
-"Disposició de teclat «%s»\n"
-"Copyright &#169; la Fundació X.Org i els col·laboradors del XKeyboardConfig\n"
-"Vegeu les metadades del paquet per a la llicència"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:754
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "«%s» disposició"
 msgstr[1] "«%s» disposicions"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:773
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "«%s» opció"
 msgstr[1] "«%s» opcions"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model «%s, %s i %s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:782
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "no hi ha disposició"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:783
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "no hi ha opcions"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Model del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "Model del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Disposició del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "Disposició del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Opcions del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Gestors d'actualització del teclat"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Una col·lecció d'scripts per executar en qualsevol moment que es recarregui "
-"l'estat del teclat. Útil per tornar a aplicar ajustaments basats en xmodmap"
+msgstr "Una col·lecció d'scripts per executar en qualsevol moment que es recarregui l'estat del teclat. Útil per tornar a aplicar ajustaments basats en xmodmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "llista de fitxers del modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Una llista de fitxers del modmap disponibles en el directori d'inici."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grup predeterminat, s'assigna en la creació d'una finestra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Mantén i gestiona un grup separat per finestra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Gestors d'actualització del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Disposició del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Model del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Opcions del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Carrega disposicions i opcions utilitzades rarament i exòtiques"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Carrega elements de configuració extra"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Alça/restaura els indicadors juntament amb els grups de disposició"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Grups secundaris"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Mostra els indicadors en la miniaplicació"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-"Mostra els indicadors en la miniaplicació per indicar la disposició actual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Mostra els noms de les disposicions en comptes dels noms de grup"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Mostra els noms de les disposicions en comptes dels noms de grup (només per "
-"a les versions del XFree que permeten múltiples disposicions)"
+msgstr "Mostra els noms de les disposicions en comptes dels noms de grup (només per a les versions del XFree que permeten múltiples disposicions)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Carrega elements de configuració extra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Carrega disposicions i opcions utilitzades rarament i exòtiques"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprimeix el missatge d'avís «ha canviat el X sysconfig»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "La previsualització del teclat, desplaçament horitzontal"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "La previsualització del teclat, desplaçament vertical"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "La previsualització del teclat, alçada"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "La previsualització del teclat, amplada"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "El color de fons"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "El color de fons per a l'indicador de disposició"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "La família del tipus de lletra"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "La previsualització del teclat, alçada"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "La família del tipus de lletra per a l'indicador de disposició"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Grups secundaris"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "La mida del tipus de lletra"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "La mida del tipus de lletra per a l'indicador de disposició"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "El color de primer pla"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "El color de primer pla per a l'indicador de disposició"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La llista de connectors d'indicador de teclat habilitats"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "Disposició del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "Model del teclat"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "llista de fitxers del modmap"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Activa més connectors"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Connectors actius:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Tanca el diàleg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Configureu el connector seleccionat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desactiva el connector seleccionat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Redueix la prioritat del connector"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Augmenta la prioritat del connector"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Connectors de l'indicador del teclat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "La llista dels connectors actius"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Afig un connector"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Connectors _disponibles:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Sense descripció."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "No s'ha pogut obrir el fitxer d'ajuda"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "No s'ha pogut iniciar el MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "El color de fons"
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Habiliteu/inhabiliteu els connectors instal·lats"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Connectors de l'indicador de teclat"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Prova de l'indicador del teclat (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indicador:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Es sobreescriurà la configuració del teclat en el mateconf des del sistema "
-#~ "de seguida que es pugui (obsolet)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Molt aviat, es sobreescriurà la configuració del teclat en el mateconf (de "
-#~ "la configuració del sistema). Des del MATE 2.12 que aquesta clau es "
-#~ "considera obsoleta, desfeu la configuració del model, disposicions i "
-#~ "opcions de teclat per a obtenir la configuració predeterminada del "
-#~ "sistema."
diff --git a/po/cmn.po b/po/cmn.po
index 6aa6be9..0dd2672 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -4,31 +4,31 @@
 # 
 # Translators:
 # Chao-Hsiung Liao <[email protected]>, 2008-2009
-# Wei-Lun Chao <[email protected]>, 2012-2013
+# 趙惟倫 <[email protected]>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-12-20 15:52+0000\n"
-"Last-Translator: Wei-Lun Chao <[email protected]>\n"
-"Language-Team: Chinese (Mandarin) (http://www.transifex.com/projects/p/MATE/language/cmn/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Chinese (Mandarin) (http://www.transifex.com/mate/MATE/language/cmn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cmn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "讀取圖片時發生錯誤：%s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB 初始化錯誤"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,248 +36,174 @@ msgid ""
 "For licensing see package metadata"
 msgstr "鍵盤配置「%s」\n著作權 &#169; X.Org 基金會及 XKeyboardConfig 貢獻者\n要了解授權請查閱套件中繼資料"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "鍵盤配置「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "配置「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "選項「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "型號「%s」，%s 與 %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "沒有配置"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "沒有選項"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "鍵盤型號"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "鍵盤型號"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "鍵盤配置"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "鍵盤配置"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "鍵盤選項"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "鍵盤更新處理程式"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "鍵盤狀態重新載入時執行的指令稿。對重新套用基於 xmodmap 調整很有幫助"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap 檔案列表"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "在 $HOME 目錄中可用的 modmap 檔案列表。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "預設的群組，在視窗建立時分配"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "保持並管理每個視窗中個別的群組"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "儲存/還原指示器及配置群俎"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "顯示配置名稱來代替群組名稱"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "顯示配置名稱來代替群組名稱（只用在支援多重配置的 XFree）"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "載入額外的組態項目"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "載入外來的，很少使用的配置和選項"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "封鎖「X sysconfig 改變」警示言訊息"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "鍵盤預覽，X 位移"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "鍵盤預覽，Y 位移"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "鍵盤預覽，寬度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "鍵盤預覽，高度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "第二群組"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "在面板程式中顯示國旗"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "在面板程式以國旗來表示鍵盤的配置"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "字族"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "鍵盤配置指示器的字族"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "字型大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "鍵盤配置指示器的字型大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "前景顏色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "鍵盤配置指示器的前景顏色"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "背景顏色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "鍵盤配置指示器的背景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "啟用的鍵盤指示器外掛程式列表"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "鍵盤配置"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "鍵盤指示器外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "使用的外掛程式(_P):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "使用中外掛程式列表"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "使用更多外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "停止使用選定的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "提高外掛程式優先權"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "降低外掛程式優先權"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "設定選定的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "關閉這個對話盒"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "加入外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "可用的外掛程式(_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "沒有描述。"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "無法開啟求助檔案"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "初始化 MateConf 失敗：%s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "鍵盤指示器外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "啟用/停用已安裝的外掛程式"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/cs.po b/po/cs.po
index 4a81666..3f4fa78 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,52 +1,51 @@
-# Czech translation of libmatekbd.
-# Copyright (C) 2007, 2008, 2009, 2010 the author(s) of libmatekbd.
-# This file is distributed under the same license as the libmatekbd package.
-# Petr Kovar <[email protected]>, 2007, 2008, 2009, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Petr Kovar <[email protected]>, 2007, 2008, 2009, 2010
+# Stanislav Kučera <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-22 23:59+0200\n"
-"PO-Revision-Date: 2010-09-22 23:59+0200\n"
-"Last-Translator: Petr Kovar <[email protected]>\n"
-"Language-Team: Czech <[email protected]>\n"
-"Language: cs\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-25 17:28+0000\n"
+"Last-Translator: Stanislav Kučera <[email protected]>\n"
+"Language-Team: Czech (http://www.transifex.com/mate/MATE/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Nastala chyba při načítání obrázku: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:720 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Chyba při spouštění XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Rozložení klávesnice \"%s\"\n"
-"Copyright &#169; X.Org Foundation a přispívající k XKeyboardConfig\n"
-"Licencování viz metadata balíčku"
+msgstr "Rozložení klávesnice \"%s\"\nCopyright &#169; X.Org Foundation a přispívající k XKeyboardConfig\nLicencování viz metadata balíčku"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Rozložení klávesnice \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -54,7 +53,7 @@ msgstr[0] "rozložení \"%s\""
 msgstr[1] "rozložení \"%s\""
 msgstr[2] "rozložení \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -62,237 +61,158 @@ msgstr[0] "možnost \"%s\""
 msgstr[1] "možnosti \"%s\""
 msgstr[2] "možností \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s a %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "bez rozložení"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "bez možností"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Model klávesnice"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "model klávesnice"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Rozložení klávesnice"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "rozložení klávesnice"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Možnosti klávesnice"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Obsluha aktualizace klávesnice"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Skupina skriptů určená ke spouštění v okamžiku, kdy dojde k opětovnému "
-"načtení stavu klávesnice. Užitečné v případě opakovaného použití změn "
-"\"xmodmap\"."
+msgstr "Skupina skriptů určená ke spouštění v okamžiku, kdy dojde k opětovnému načtení stavu klávesnice. Užitečné v případě opakovaného použití změn \"xmodmap\"."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "seznam souboru \"modmap\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Seznam souborů \"modmap\" dostupný v adresáři $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Výchozí skupina, přiřazená při vytvoření okna"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "U každého okna udržovat a spravovat oddělenou skupinu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Obsluha aktualizace klávesnice"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Rozložení klávesnice"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Model klávesnice"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Možnosti klávesnice"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Načíst exotická, zřídka užívaná rozložení a možnosti"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Nahrát dodatečné položky nastavení"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Ukládat/obnovovat indikátory společně se skupinami rozložení"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Sekundární skupiny"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Zobrazovat v appletu vlaječky"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Ukazovat aktuální rozložení zobrazením vlaječek v appletu"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Zobrazovat názvy rozložení namísto názvu skupin"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Zobrazí názvy rozložení namísto názvů skupin (pouze u verzí XFree "
-"podporujících vícenásobná rozložení)"
+msgstr "Zobrazí názvy rozložení namísto názvů skupin (pouze u verzí XFree podporujících vícenásobná rozložení)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Nahrát dodatečné položky nastavení"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Načíst exotická, zřídka užívaná rozložení a možnosti"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Nezobrazovat varovnou zprávu o změně systémového nastavení X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Povolit nezobrazování ikony indikace rozložení klávesnice na hlavní liště"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Náhled klávesnice, umístění X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Náhled klávesnice, umístění Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Náhled klávesnice, výška"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Náhled klávesnice, šířka"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Barva pozadí"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Barva pozadí indikátoru rozložení"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Rodina písma"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Náhled klávesnice, výška"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Rodina písma indikátoru rozložení"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekundární skupiny"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Velikost písma"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Písmo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Velikost písma indikátoru rozložení"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Písmo indikátoru rozložení klávesnice. This should be in \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\" format."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Barva popředí"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Barva popředí indikátoru rozložení"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Seznam zapnutých zásuvných modulů indikátoru klávesnice"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "rozložení klávesnice"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "model klávesnice"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Barva pozadí"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "seznam souboru \"modmap\""
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Rozložení klávesnice"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktivuje více zásuvných modulů"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktivní zásuvné _moduly:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Zavře dialogové okno"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Nastaví vybraný zásuvný modul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deaktivuje vybraný zásuvný modul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Sníží prioritu zásuvného modulu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Zvýší prioritu zásuvného modulu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Zásuvné moduly indikátoru klávesnice"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Seznam aktivních zásuvných modulů"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Přidat zásuvný modul"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Dostupné zásuvné moduly:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Bez popisu."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nezdařilo se otevření souboru nápovědy"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Nezdařilo se spustit MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Zapnout/vypnout instalované zásuvné moduly"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Zásuvné moduly indikátoru klávesnice"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Test indikátoru klávesnice (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikátor:"
diff --git a/po/da.po b/po/da.po
index e6d5ed6..2af50f8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,317 +1,216 @@
-# Danish translation of libmatekbd
-# Copyright (C) 2007-2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# Ask Hjorth Larsen <[email protected]>, 2007, 10.
-# Kenneth Nielsen <[email protected]>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Joe Hansen <[email protected]>, 2015
+# Kenneth Nielsen <[email protected]>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 23:51+0200\n"
-"PO-Revision-Date: 2010-09-15 21:04+0200\n"
-"Last-Translator: Ask Hjorth Larsen <[email protected]>\n"
-"Language-Team: Danish <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-11 19:04+0000\n"
+"Last-Translator: Joe Hansen <[email protected]>\n"
+"Language-Team: Danish (http://www.transifex.com/mate/MATE/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Der opstod en fejl ved indlæsning af billede: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:720 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-klargøringsfejl"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Tastetur-udlægning \"%s\"\n"
-"Copyright &#169; X.Org Foundation og XKeyboardConfig-bidragydere\n"
-"Licensen findes i pakkens metadata"
+msgstr "Tastetur-udlægning \"%s\"\nCopyright &#169; X.Org Foundation og XKeyboardConfig-bidragydere\nLicensen findes i pakkens metadata"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Tastaturlayout \"%s\""
 
-# Hmmm. Hvis det er i bestemt form, så siger dansk retskrivning "layoutene"
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "layout \"%s\""
 msgstr[1] "layout \"%s\""
 
-# Bestemt eller ubestemt?
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "indstilling \"%s\""
 msgstr[1] "indstillinger \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s og %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "intet layout"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ingen indstillinger"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Tastaturmodel"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "tastaturmodel"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Tastaturlayout"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "tastaturlayout"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Tastaturindstillinger"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Håndteringer for tastaturopdatering"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"En samling af skripter som køres idet tastaturtilstanden genindlæses. Dette "
-"kan f.eks. bruges til at genanvende xmodmap-baserede justeringer"
+msgstr "En samling af skripter som køres idet tastaturtilstanden genindlæses. Dette kan f.eks. bruges til at genanvende xmodmap-baserede justeringer"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap-filliste"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "En liste af tilgængelige modmap-filer i $HOME mappen."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Standardgruppe - tildelt ved vinduesoprettelse"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Bevar og håndtér separat gruppe for hvert vindue"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Håndteringer for tastaturopdatering"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Tastaturlayout"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Tastaturmodel"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Tastaturindstillinger"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Indlæs eksotiske, sjældent brugte layout og indstillinger"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Indlæs ekstra konfigurationselementer"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Gem/hent indikatorer sammen med layoutgrupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Sekundære grupper"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Vis flag i panelprogrammet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Vis flag i panelprogrammet for at angive det aktuelle layout"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Vis layoutnavne i stedet for gruppenavne"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Vis layoutnavne i stedet for gruppenavne (kun for versioner af XFree der "
-"understøtter flere layout)"
+msgstr "Vis layoutnavne i stedet for gruppenavne (kun for versioner af XFree der understøtter flere layout)"
 
-# Jeg kan umuligt finde den rette danske oversættelse af den advarsel
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Indlæs ekstra konfigurationselementer"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Indlæs eksotiske, sjældent brugte layout og indstillinger"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Undertryk advarslen \"X sysconfig changed\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Tillad at deaktivere statusikon for tastaturindikator"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Vis tastasturledindikator"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Tastatur-forhåndsvisningen, X-afsæt"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Tastatur-forhåndsvisningen, Y-afsæt"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Tastatur-forhåndsvisningen, højde"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Tastatur-forhåndsvisningen, bredde"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Baggrundsfarven"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Layoutindikatorens baggrundsfarve"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Skrifttypefamilien"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Tastatur-forhåndsvisningen, højde"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Layoutindikatorens skrifttypefamilie"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekundære grupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Skriftstørrelsen"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Skrifttypen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Layoutindikatorens skriftstørrelse"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Skrifttypen for layoutindikator. Skal være i formatet »[FAMILIE-LISTE] [STIL-TILVALG] [STR]«."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Forgrundsfarven"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Layoutindikatorens forgrundsfarve"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Listen af aktiverede tastaturindikator-moduler"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "tastaturlayout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Forgrundsfarven for layoutindikatoren. Skal være i formatet »R G B«, for eksempel »255 0 0«."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "tastaturmodel"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Baggrundsfarven"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap-filliste"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Forgrundsfarven for layoutindikatoren. Skal være i formatet »R G B«, for eksempel »255 0 0«."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Tastaturlayout"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktivér flere moduler"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktive _moduler:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Luk vinduet"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Konfigurér det valgte modul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deaktivér det valgte modul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Reducér modulprioritet"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Forøg modulprioritet"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Tastaturindikator-moduler"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Listen af aktive moduler"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Tilføj modul"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Tilgængelige moduler:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Ingen beskrivelse."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Kunne ikke åbne hjælpfil"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Kunne ikke initialisere MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Aktivér/deaktivér installerede moduler"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Tastaturindikator-moduler"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Tastaturindikatortest (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikator:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Tastaturindstillinger i mateconf vil blive underkendt af systemet snarest "
-#~ "muligt (forældet)"
-
-# Det må være key -> nøgle da vi taler om mateconf
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Tastaturindstillinger i mateconf vil meget snart blive underkendt (af "
-#~ "systemkonfigurationen). Denne nøgle har været afskrevet siden Mate 2.12. "
-#~ "Fjern venligst indstillingerne for model-, layout- og tilvalgsnøgler for "
-#~ "at få systemets standardkonfiguration."
diff --git a/po/de.po b/po/de.po
index 1646f14..70ce72a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,32 +7,33 @@
 # Christian <[email protected]>, 2009, 2010
 # Hendrik Richter <[email protected]>, 2007
 # Johannes Hofmann <[email protected]>, 2007
+# Maria Kor <[email protected]>, 2015
 # Mario Blättermann <[email protected]>, 2010
-# Tobias Bannert, 2014
+# Tobias Bannert <[email protected]>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-04-28 15:25+0000\n"
-"Last-Translator: Tobias Bannert\n"
-"Language-Team: German (http://www.transifex.com/projects/p/MATE/language/de/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-08 13:33+0000\n"
+"Last-Translator: Tobias Bannert <[email protected]>\n"
+"Language-Team: German (http://www.transifex.com/mate/MATE/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Beim Laden des Bildes ist ein Fehler aufgetreten: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-Initialisierungsfehler"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -40,250 +41,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Tastaturbelegung »%s«\nUrheberrecht &#169; X.Org Foundation und XKeyboardConfig-Mitwirkende\nFür Informationen zur Lizenz bitte die Paketmetadaten ansehen"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Tastaturbelegung »%s«"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "Belegung »%s«"
 msgstr[1] "Belegungen »%s«"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "Option »%s«"
 msgstr[1] "Optionen »%s«"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "Modell »%s«, %s und %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "Keine Belegung"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "Keine Optionen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Tastaturmodell"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "Tastaturmodell"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Tastaturbelegung"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "Tastaturbelegung"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Tastaturoptionen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Tastaturaktualisierungsroutine"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Skriptsammlung, die beim Neuladen des Tastaturstatus ausgeführt wird. Nützlich, wenn auf xmodpmap basierende Anpassungen wiederholt angewendet werden."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap-Dateiliste"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Eine Liste von modmap-Dateien, die im Persönlichen Ordner verfügbar sind."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Vorgegebene Gruppe, zugewiesen bei der Fenstererstellung"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
-msgstr "Separate Gruppe pro Fenster beibehalten und verwalten"
+msgstr "Einzelne Gruppe pro Fenster beibehalten und verwalten"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Speichern und Wiederherstellen der Anzeigen zusammen mit den Belegungsgruppen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Belegungsnamen anstatt Gruppennamen anzeigen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Belegungsnamen anstatt Gruppennamen anzeigen (Nur für XFree-Versionen, die mehrere Tastaturbelegungen unterstützen)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Zusätzliche Konfigurationsobjekte laden"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Exotische, wenig verwendete Belegungen und Optionen laden"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
-msgstr "Die »X sysconfig changed«-Warnmeldung unterdrücken"
+msgstr "Die Warnmeldung »X sysconfig changed« unterdrücken"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Das Deaktivieren des Tastaturanzeigesymbols in der Systemleiste erlauben"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Tastatur-LED-Anzeige zeigen."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Die Tastaturvorschau, X-Position"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Die Tastaturvorschau, Y-Position"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Die Tastaturvorschau, Breite"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Die Tastaturvorschau, Höhe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Sekundäre Gruppen"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Markierungen im Applet anzeigen"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Markierungen im Applet anzeigen, um die aktuelle Belegung anzuzeigen"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Die Schriftfamilie"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Die Schrift"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Die Schriftfamilie für die Tastaturanzeige"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Die Schriftgröße"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Die Schriftgröße für die Tastaturanzeige"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Die Schrift für die Belegungsanzeige. Diese sollte in folgendem Format sein: [SCHRIFTFAMILIENLISTE] [STILOPTIONEN] [GRÖßE]."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Die Vordergrundfarbe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Die Vordergrundfarbe für die Tastaturanzeige"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Die Vordergrundfarbe für die Belegungsanzeige. Diese sollte im RGB-Format angegeben werden, z.B. »255 0 0«."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Die Hintergrundfarbe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Die Hintergrundfarbe für die Tastaturanzeige"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Die Liste der aktivierten Tastaturanzeigeerweiterungen"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Die Hintergrundfarbe für die Belegungsanzeige. Diese sollte im RGB-Format angegeben werden, z.B. »255 0 0«."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Tastaturbelegung"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Tastaturanzeigeerweiterungen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktive _Erweiterungen:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Die Liste der aktiven Erweiterungen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Weitere Erweiterungen aktivieren"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Die gewählte Erweiterungen deaktivieren"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Die Priorität der Erweiterungen erhöhen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Die Priorität der Erweiterungen verringern"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Die gewählte Erweiterung konfigurieren"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Diesen Dialog schließen"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Erweiterung hinzufügen"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Verfügbare Erweiterungen:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Keine Beschreibung."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Hilfedatei kann nicht geöffnet werden"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Initialisieren von MateConf gescheitert: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Tastaturanzeigeerweiterungen"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Aktivieren oder Deaktivieren installierter Erweiterungen"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/dz.po b/po/dz.po
index f17b6dd..f36c0f2 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,243 +1,212 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.head.dz.po\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-14 04:07+0100\n"
-"PO-Revision-Date: 2008-10-20 09:45+0530\n"
-"Last-Translator: Dawa pemo <[email protected]>\n"
-"Language-Team: Dzongkha <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Dzongkha (http://www.transifex.com/mate/MATE/language/dz/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Poedit-Language: Dzongkha\n"
-"X-Poedit-Country: Bhutan\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2380
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "གཟུགས་བརྙན་ %sམངོན་གསལ་འབདཝ་ད་འཛོལ་བ་བྱུང་ཡོདཔ:"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "ཨེགསི་ཀེ་བི་ འགོ་འབྱེད་འཛོལ་བ་"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"ལྡེ་སྒྲོམ་ སྒྲིག་བཀོད་  \"%s\"\n"
-"འདྲ་བཤུས་དབང་ཆ་ &#169; X.Org Foundation and XKeyboardConfig contributors\n"
-"ཆོག་ཐམ་གྱི་དོན་ལས་ ཐུམ་སྒྲིལ་ མེ་ཊ་གནད་སྡུད་ བལྟ་ "
+msgstr "ལྡེ་སྒྲོམ་ སྒྲིག་བཀོད་  \"%s\"\nའདྲ་བཤུས་དབང་ཆ་ &#169; X.Org Foundation and XKeyboardConfig contributors\nཆོག་ཐམ་གྱི་དོན་ལས་ ཐུམ་སྒྲིལ་ མེ་ཊ་གནད་སྡུད་ བལྟ་ "
 
-#: ../libmatekbd/matekbd-indicator.c:617
-msgid "XKB initialization error"
-msgstr "ཨེགསི་ཀེ་བི་ འགོ་འབྱེད་འཛོལ་བ་"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "གཟུགས་བརྙན་ %sམངོན་གསལ་འབདཝ་ད་འཛོལ་བ་བྱུང་ཡོདཔ:"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:796
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
-msgstr[0] "\"%s\"སྒྲིག་བཀོད་"
-msgstr[1] "\"%s\"སྒྲིག་བཀོད་ཚུ་"
+msgstr[0] ""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:813
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
-msgstr[0] "\"%s\"གདམ་ཁ་"
-msgstr[1] "\"%s\"གདམ་ཁ་ཚུ་"
+msgstr[0] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:821
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "དཔེ་ \"%s\", %s དང་ %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:822
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "སྒྲིག་བཀོད་མེད་"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:823
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "གདམ་ཁ་ཚུ་མེད་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
-msgid "A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments"
-msgstr "ལྡེ་སྒྲོམ་གནས་ལུགས་འདི་ནམ་ལོག་མངོན་གསལ་འབདཝ་ཅིག་གཡོག་བཀོལ་ནི་ལུ་  ཡིག་ཚུགས་ཀྱི་བསྡུ་གསོག།  ཨེགསི་མོཌི་མེཔ་གཞི་བཞག་བདེ་སྒྲིག་ཚུ་ ལོག་འཇུག་སྤྱོད་འབད་ནིའི་དོན་ལུ་  ཕན་ཐོག་ཅན་ཡོདཔ་ཨིན།"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "A list of modmap files available in the $HOME directory."
-msgstr "མོཌི་མེཔ་ཡིག་སྣོད་ཚུ་གི་ཐོ་ཡིག་གཅིག་  $HOME སྣོད་ཐོའི་ནང་ཐོབ་ཚུགས།"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "Default group, assigned on window creation"
-msgstr "སྒོ་སྒྲིག་གསར་བསྐྲུན་གུ་འགན་སྤྲོད་འབད་ཡོད་པའི་སྔོན་སྒྲིག་སྡེ་ཚན་"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "Keep and manage separate group per window"
-msgstr "སྒོ་སྒྲིག་རེ་རེ་ལུ་སྡེ་ཚན་སོ་སོ་འདི་བཞག་ནི་དང་རྒྱུན་སྐྱོང་འཐབ་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "ལྡེ་སྒྲོམ་དཔེ་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "ལྡེ་སྒྲོམ་དུས་མཐུན་ལེགས་སྐྱོང་པ་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "ལྡེ་སྒྲོམ་དཔེ་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "ལྡེ་སྒྲོམ་སྒྲིག་བཀོད་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "ལྡེ་སྒྲོམ་དཔེ་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "ལྡེ་སྒྲོམ་སྒྲིག་བཀོད་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "ལྡེ་སྒྲོམ་གདམ་ཁ་ཚུ་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Keyboard settings in mateconf will be overridden from the system ASAP (deprecated)"
-msgstr "ཇི་རིམ་སྒྲིག་ནང་ལྡེ་སྒྲོམ་སྒྲིག་སྟགས་ཚུ་  རིམ་ལུགས་ཨེ་ཨེསི་ཨེ་པི་(ངོས་ལེན་མེད་པ་) ལས་མེདཔ་གཏངམ་ཨིན།"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "ལྡེ་སྒྲོམ་དུས་མཐུན་ལེགས་སྐྱོང་པ་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Save/restore indicators together with layout groups"
-msgstr "སྒྲིག་བཀོད་སྡེ་ཚན་དང་ཅིག་ཁར་  བརྡ་སྟོན་པ་ཚུ་སྲུང་ནི་/སོར་ཆུད་འབད།"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr "ལྡེ་སྒྲོམ་གནས་ལུགས་འདི་ནམ་ལོག་མངོན་གསལ་འབདཝ་ཅིག་གཡོག་བཀོལ་ནི་ལུ་  ཡིག་ཚུགས་ཀྱི་བསྡུ་གསོག།  ཨེགསི་མོཌི་མེཔ་གཞི་བཞག་བདེ་སྒྲིག་ཚུ་ ལོག་འཇུག་སྤྱོད་འབད་ནིའི་དོན་ལུ་  ཕན་ཐོག་ཅན་ཡོདཔ་ཨིན།"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Secondary groups"
-msgstr "གལ་གནད་ཆུག་བའི་སྡེ་ཚན་ཚུ་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "མོཌི་མེཔ་ཡིག་སྣོད་ཐོ་ཡིག་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet"
-msgstr "ཨེཔ་ལེཊི་ནང་ཟུར་རྟགས་ཚུ་སྟོན་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
+msgstr "མོཌི་མེཔ་ཡིག་སྣོད་ཚུ་གི་ཐོ་ཡིག་གཅིག་  $HOME སྣོད་ཐོའི་ནང་ཐོབ་ཚུགས།"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "ད་ལྟོའི་སྒྲིག་བཀོད་འདི་བརྡ་སྟོན་ནི་ལུ་ ཨེཔ་ལེཊི་ནང་ཟུར་རྟགས་ཚུ་སྟོན་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
+msgstr "སྒོ་སྒྲིག་གསར་བསྐྲུན་གུ་འགན་སྤྲོད་འབད་ཡོད་པའི་སྔོན་སྒྲིག་སྡེ་ཚན་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
+msgstr "སྒོ་སྒྲིག་རེ་རེ་ལུ་སྡེ་ཚན་སོ་སོ་འདི་བཞག་ནི་དང་རྒྱུན་སྐྱོང་འཐབ་"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
+msgid "Save/restore indicators together with layout groups"
+msgstr "སྒྲིག་བཀོད་སྡེ་ཚན་དང་ཅིག་ཁར་  བརྡ་སྟོན་པ་ཚུ་སྲུང་ནི་/སོར་ཆུད་འབད།"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "སྡེ་ཚན་མིང་གི་ཚབ་ལུ་ སྒྲིག་བཀོད་མིང་ཚུ་སྟོན་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
-msgid "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
 msgstr "སྡེ་ཚན་མིང་གི་ཚབ་ལུ་ (ཨེགསི་ཕིརི་རྒྱབ་སྐྱོར་སྣ་མང་སྒྲིག་བཀོད་ཚུ་གི་དོན་རིམ་དོན་ལུ་རྐྱངམ་ཅིག) སྒྲིག་བཀོད་མིང་ཚུ་སྟོན།  "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "ཉེན་བརྡའི་འཕྲིན་དོན་\"X sysconfig changed\" འདི་མར་མནོན་འབད།"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "ལྡེ་སྒྲོམ་སྔོན་ལྟ་  ཨེགསི་པར་ལེན་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "ལྡེ་སྒྲོམ་སྔོན་ལྟ་  ཝའི་པར་ལེན་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
-msgid "The Keyboard Preview, height"
-msgstr "ལྡེ་སྒྲོམ་སྔོན་ལྟ་  མཐོ་ཚད་"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "ལྡེ་སྒྲོམ་སྔོན་ལྟ་  རྒྱ་ཚད་"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "ལྕོགས་ཅན་བཟོ་ཡོད་པའི་ལྡེ་སྒྲོམ་བརྡ་སྟོན་པའི་པ་ལག་ཨིན་ཚུ་གི་ཐོ་ཡིག་"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "Very soon, keyboard settings in mateconf will be overridden (from the system configuration) This key has been deprecated since MATE 2.12, please unset the model, layouts and options keys to get the default system configuration."
-msgstr "མགྱོགས་པ་རང་  ཇི་རིམ་སྒྲིག་ནང་གི་ལྡེ་སྒྲོམ་སྒྲིག་སྟངས་འདི་མེདཔ་གཏང་འོང་(རིམ་ལུགས་རིམ་སྒྲིག་ལས་) ལྡེ་མིག་འདི་MATE 2.12ལས་ཚུར་ངོས་ལེན་མེདཔ་བཟོ་ཡོདཔ་  དཔེ་འདི་གཞི་སྒྲིག་  སྒྲིག་བཀོད་ཚུ་དང་གདམ་ཁའི་ལྡེ་མིག་ཚུ་  སྔོན་སྒྲིག་རིམ་ལུགས་རིམ་སྒྲིག་ལེན་ནི་ལུ་ གཞི་སྒརིག་མ་འབད་བར་བཞག་གནང་།"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "ལྡེ་སྒྲོམ་སྒྲིག་བཀོད་"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "ལྡེ་སྒྲོམ་དཔེ་"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "མོཌི་མེཔ་ཡིག་སྣོད་ཐོ་ཡིག་"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
-msgstr "པ་ལག་ཨིན་ལེ་ཤ་ཤུགས་ལྡན་བཟོ་"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
-msgstr "ཤུགས་ལྡན་པ་ལག་ཨིན་ཚུ: (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
-msgstr "པ་ལག་ཨིན་ཁ་སྐོང་འབད་"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
-msgstr "ཌའི་ལོག་ཁ་བསྡམ་"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
-msgstr "སེལ་འཐུ་འབད་དེ་ཡོད་པའི་པ་ལག་ཨིན་འདི་རིམ་སྒྲིག་འབད་"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
-msgstr "སེལ་འཐུ་འབད་དེ་ཡོད་པའི་པ་ལག་ཨིན་འདི་ཤུགས་ལྡན་བཟོ་བཤོལ་"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
-msgstr "པ་ལག་ཨིན་གཙོ་རིམ་འདི་མར་ཕབ་འབད་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "ལྡེ་སྒྲོམ་སྔོན་ལྟ་  མཐོ་ཚད་"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr "པ་ལག་ཨིན་གཙོ་རིམ་འདི་ཡར་འཕར་འབད་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "གལ་གནད་ཆུག་བའི་སྡེ་ཚན་ཚུ་"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
-msgstr "ལྡེ་སྒྲོམ་བརྡ་སྟོན་པའི་པ་ལག་ཨིནསི་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
-msgstr "ཤུགས་ལྡན་པ་ལག་ཨིནསི་གི་ཐོ་ཡིག་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
-msgstr "ཐོབ་ཚུགས་པའི་པ་ལག་ཨིན་ཚུ: (_A)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:122
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "འགྲེལ་བཤད་མེད།"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:343
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "ཇི་རིམ་སྒྲིག་ཨིན་ཨའིཊི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "གཞི་བཙུགས་འབད་དེ་ཡོད་པའི་པ་ལག་ཨིན་ཚུ་ལྕོགས་ཅན་བཟོ་/ལྕོགས་མེད་བཟོ་"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "ལྡེ་སྒྲོམ་བརྡ་སྟོན་པའི་པ་ལག་ཨིན་ཚུ་"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:59
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "ལྡེ་སྒྲོམ་བརྡ་སྟོན་པའི་བརྟག་ཞིབ་(%s)"
 
-#: ../test/matekbd-indicator-test.c:68
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "བརྡ་སྟོན་པ་:"
-
diff --git a/po/el.po b/po/el.po
index 6ee049d..8cbff57 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,26 +11,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-02-18 22:34+0000\n"
-"Last-Translator: thunk <[email protected]>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/MATE/language/el/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Greek (http://www.transifex.com/mate/MATE/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Υπήρξε σφάλμα κατά την φόρτωση της εικόνας:·%s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Σφάλμα αρχικοποίησης XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -38,250 +38,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Διάταξη πληκτρολογίου \"%s\"\nΠνευματικά δικαιώματα &#169; X.Org Foundation και συντελεστές XKeyboardConfig\nΓια πληροφορίες για την άδεια διάθεσης, δείτε τα μεταδεδομένα του πακέτου"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Διάταξη Πληκτρολογίου «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "διάταξη \"%s\""
 msgstr[1] "διατάξεις \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "επιλογή \"%s\""
 msgstr[1] "επιλογές \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "μοντέλο \"%s\", %s και %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "χωρίς διάταξη"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "χωρίς επιλογές"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Μοντέλο πληκτρολογίου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "μοντέλο πληκτρολογίου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Διάταξη πληκτρολογίου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "διάταξη πληκτρολογίου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Επιλογές πληκτρολογίου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Χειριστές ενημέρωσης πληκτρολογίου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Μια συλλογή από δέσμες ενεργειών όπου εκτελούνται με κάθε επαναφόρτωση της κατάστασης πληκτρολογίου. Χρήσιμο για την επανεφαρμογή προσαρμογών βασισμένων στο xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "λίστα αρχείων modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Λίστα αρχείων modmap που βρίσκονται στον κατάλογο $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Προεπιλεγμένη ομάδα, ορίζετε κατά την δημιουργία του παραθύρου"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Διατήρηση και διαχείριση ξεχωριστών ομάδων για κάθε παράθυρο"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Αποθήκευση/επαναφορά των ενδείξεων μαζί με τις ομάδες διατάξεων"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Εμφάνιση ονομάτων διάταξης αντί ονομάτων ομάδας"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Εμφάνιση ονομάτων διάταξης αντί ονομάτων ομάδας (μόνο για εκδόσεις του XFree με υποστήριξη πολλαπλών διατάξεων)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Φόρτωση έξτρα στοιχεία ρυθμίσεων"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Φόρτωση εξωτικών, σπάνια χρησιμοποιούμενων διατάξεων και επιλογών"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Καταστολή του μηνύματος προειδοποίησης \"Το X sysconfig τροποποιήθηκε\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Προεπισκόπηση πληκτρολογίου, μετατόπιση X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Προεπισκόπηση πληκτρολογίου, μετατόπιση Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Προεπισκόπηση πληκτρολογίου, πλάτος"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Προεπισκόπηση πληκτρολογίου, ύψος"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Δευτερεύουσες ομάδες"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Εμφάνιση σημαιών στη μικροεφαρμογή"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Εμφάνιση σημαιών στη μικροεφαρμογή ως ένδειξη της τρέχουσας διάταξης"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Η οικογένεια γραμματοσειρών"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Η οικογένεια γραμματοσειρών της ένδειξης διάταξης"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Το μέγεθος γραμματοσειράς"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Το μέγεθος γραμματοσειράς της ένδειξης διάταξης"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Το χρώμα προσκηνίου "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Το χρώμα προσκηνίου της ένδειξης διάταξης"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Το χρώμα παρασκηνίου "
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Το χρώμα παρασκηνίου της ένδειξης διάταξης"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Λίστα των ενεργών πρόσθετων λειτουργιών ένδειξης πληκτρολογίου"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Διάταξη πληκτρολογίου"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Πρόσθετες λειτουργίες ένδειξης πληκτρολογίου"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Ενεργές _πρόσθετες λειτουργίες:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Λίστα των ενεργών πρόσθετων λειτουργιών"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Ενεργοποίηση περισσοτέρων πρόσθετων λειτουργιών"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Απενεργοποίηση επιλεγμένης πρόσθετης λειτουργίας"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Αύξηση προτεραιότητας πρόσθετης λειτουργίας"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Μείωση προτεραιότητας πρόσθετης λειτουργίας"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Ρύθμιση επιλεγμένης πρόσθετης λειτουργίας"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Κλείσιμο διάλογου"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Προσθήκη πρόσθετης λειτουργίας"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Δι_αθέσιμες πρόσθετες λειτουργίες:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Χωρίς περιγραφή."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Αποτυχία αρχικοποίησης MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Πρόσθετες λειτουργίες ένδειξης πληκτρολογίου"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Ενεργοποίηση/απενεργοποίηση εγκατεστημένων πρόσθετων λειτουργιών"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/en_AU.po b/po/en_AU.po
index b6db341..0c8335e 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -3,32 +3,32 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Michael Findlay <[email protected]>, 2012
-# Michael Findlay <[email protected]>, 2012
+# Michael Findlay <[email protected]>, 2012
+# Michael Findlay <[email protected]>, 2012,2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-09-05 04:55+0000\n"
-"Last-Translator: Michael Findlay <[email protected]>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/projects/p/MATE/language/en_AU/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-12 07:35+0000\n"
+"Last-Translator: Michael Findlay <[email protected]>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/mate/MATE/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "There was an error loading an image: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB initialisation error"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,250 +36,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Keyboard layout \"%s\"\nCopyright &#169; X.Org Foundation and XKeyboardConfig contributors\nFor licensing see package metadata"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Keyboard Layout \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "layout \"%s\""
 msgstr[1] "layouts \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "option \"%s\""
 msgstr[1] "options \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s and %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "no layout"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "no options"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Keyboard model"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "keyboard model"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Keyboard layout"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "keyboard layout"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Keyboard options"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Keyboard Update Handlers"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap file list"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "A list of modmap files available in the $HOME directory."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Default group, assigned on window creation"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Keep and manage separate group per window"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Save/restore indicators together with layout groups"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Show layout names instead of group names"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Load extra configuration items"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Load exotic, rarely used layouts and options"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suppress the \"X sysconfig changed\" warning message"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Allow to disable the keyboard indicator tray icon"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Show keyboard leds indicator"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "The Keyboard Preview, X offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "The Keyboard Preview, Y offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "The Keyboard Preview, width"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "The Keyboard Preview, height"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Secondary groups"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Show flags in the applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Show flags in the applet to indicate the current layout"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "The font family"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "The font"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "The font family for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "The font size"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\" format."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "The foreground colour"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "The foreground colour for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "The foreground colour for the layout indicator. This should be in \"R G B\" format, for example \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "The background colour"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "The background colour for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "The list of enabled Keyboard Indicator plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "The background colour for the layout indicator. This should be in \"R G B\" format, for example \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Keyboard Layout"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Keyboard Indicator Plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Active _plugins:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "The list of active plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activate more plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deactivate selected plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Increase the plugin priority"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Decrease the plugin priority"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configure the selected plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Close the dialogue"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Add Plugin"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Available plugins:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "No description."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Unable to open help file"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Failed to init MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Keyboard Indicator plugins"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Enable/disable installed plugins"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/en_GB.po b/po/en_GB.po
index 6d03fb8..9dd1d1b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,31 +5,32 @@
 # Translators:
 # Bruce Cowan <[email protected]>, 2010
 # David Lodge <[email protected]>, 2007
+# Martin Wimpress <[email protected]>, 2015
 # pwithnall <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-10-24 16:13+0000\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-09 13:20+0000\n"
 "Last-Translator: Martin Wimpress <[email protected]>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/MATE/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/mate/MATE/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "There was an error loading an image: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB initialisation error"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +38,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Keyboard layout \"%s\"\nCopyright &#169; X.Org Foundation and XKeyboardConfig contributors\nFor licensing see package metadata"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Keyboard Layout \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "layout \"%s\""
 msgstr[1] "layouts \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "option \"%s\""
 msgstr[1] "options \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s and %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "no layout"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "no options"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Keyboard model"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "keyboard model"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Keyboard layout"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "keyboard layout"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Keyboard options"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Keyboard Update Handlers"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap file list"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "A list of modmap files available in the $HOME directory."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Default group, assigned on window creation"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Keep and manage separate group per window"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Save/Restore indicators together with layout groups"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Show layout names instead of group names"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Load extra configuration items"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Load exotic, rarely-used layouts and options"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suppress the \"X sysconfig changed\" warning message"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Allow to disable the keyboard indicator tray icon"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Show keyboard LEDs indicator"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "The Keyboard Preview, X offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "The Keyboard Preview, Y offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "The Keyboard Preview, width"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "The Keyboard Preview, height"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Secondary groups"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Show flags in the applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Show flags in the applet to indicate the current layout"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "The font family"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "The font"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "The font family for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "The font size"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\" format."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "The foreground colour"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "The foreground colour for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "The foreground color for the layout indicator. This should be in \"R G B\" format, for example \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "The background colour"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "The background colour for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "The list of enabled Keyboard Indicator plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "The background color for the layout indicator. This should be in \"R G B\" format, for example \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Keyboard Layout"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Keyboard Indicator Plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Active _plugins:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "The list of active plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activate more plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deactivate selected plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Increase the plugin priority"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Decrease the plugin priority"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configure the selected plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Close the dialogue"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Add Plugin"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Available plugins:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "No description."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Unable to open help file"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Failed to init MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Keyboard Indicator plugins"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Enable/disable installed plugins"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/eo.po b/po/eo.po
index 1bbc7b5..43f65cb 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,297 +1,215 @@
-# Esperanto translation for libmatekbd
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the libmatekbd package.
-# Kristjan SCHMIDT <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# kristjan <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-06-22 20:32+0000\n"
-"PO-Revision-Date: 2010-06-27 15:07+0200\n"
-"Last-Translator: Kristjan SCHMIDT <[email protected]>\n"
-"Language-Team: Esperanto <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Esperanto (http://www.transifex.com/mate/MATE/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Launchpad-Export-Date: 2010-06-27 13:04+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:321
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Okazis eraro dum ŝargado de bildo: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:654
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-prepara eraro"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Klarararanĝoj \"%s\"\n"
-"Kopirajto &#169; X.Org-fondaĵo kaj XKeyboardConfig-kontribuantoj\n"
-"Por permesilado vidu al metadatumoj de la pakaĵo"
+msgstr "Klarararanĝoj \"%s\"\nKopirajto &#169; X.Org-fondaĵo kaj XKeyboardConfig-kontribuantoj\nPor permesilado vidu al metadatumoj de la pakaĵo"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Klavararanĝo \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "aranĝo \"%s\""
 msgstr[1] "aranĝoj \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opcio \"%s\""
 msgstr[1] "opcioj \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelo \"%s\", %s kaj %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "neniu aranĝo"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "neniuj opcioj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Klavarmodelo"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "klavarmodelo"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Klavararanĝo"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "klavararanĝo"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Klavaropcioj"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Klavarĝisdatigaj traktiloj"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Kolekto de skriptoj por ruli ĉiufoje kiam la klavarstato estas reŝargata. "
-"Utila por reaplikado de xmodmap-bazitaj alĝustigoj"
+msgstr "Kolekto de skriptoj por ruli ĉiufoje kiam la klavarstato estas reŝargata. Utila por reaplikado de xmodmap-bazitaj alĝustigoj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap-dosierlisto"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Listo de modmap-dosieroj haveblaj en la dosierujo $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Defaŭlta grupo, atribuita je fenestra kreado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Teni kaj administri apartan grupon per fenestro"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Klavarĝisdatigaj traktiloj"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Klavararanĝo"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Klavarmodelo"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Klavaropcioj"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Ŝarĝi ekzotaj, malofte uzitaj aranĝoj kaj opcioj"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Ŝarĝi kromajn agordoaĵojn"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Konservi/restarigi indikiloj kune kun aranĝgrupoj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Kromaj grupoj"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Montri flagojn en la aplikaĵeto"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Montri flagojn en la aplikaĵeto por indiki la aktualan aranĝon"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Montri aranĝnomojn anstataŭ ol grupnomojn"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Montri aranĝnomojn anstataŭ ol grupnomojn (nur por versioj de XFree "
-"subtenantaj pluraj aranĝoj)"
+msgstr "Montri aranĝnomojn anstataŭ ol grupnomojn (nur por versioj de XFree subtenantaj pluraj aranĝoj)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Ŝarĝi kromajn agordoaĵojn"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Ŝarĝi ekzotaj, malofte uzitaj aranĝoj kaj opcioj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Forigi la avertmesaĝon \"X-sysconfig ŝanĝita\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "La klavar-antaŭrigardo, X-deŝovo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "La klavar-antaŭrigardo, Y-deŝovo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "La klavar-antaŭrigardo, alteco"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "La klavar-antaŭrigardo, larĝeco"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "La fona koloro"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "La fona koloro por la aranĝoindikilo"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "La tiparfamilio"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "La klavar-antaŭrigardo, alteco"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "La tipara familio por la aranĝoindikilo"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Kromaj grupoj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "La tipargrandeco"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "La tipara grandeco por la aranĝoindikilo"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "La malfona koloro"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "La malfona koloro por la aranĝoindikilo"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La listo de enŝaltitaj klavarindikilaj kromaĵoj"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "klavararanĝo"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "klavarmodelo"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "La fona koloro"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap-dosierlisto"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Klavararanĝo"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktivigi pli da kromaĵoj"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktivigi _kromaĵojn:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Fermi la dialogon"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Agordi la elektitan kromaĵon"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Malaktivigi elektitan kromaĵon"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Malpliigi la kromaĵan prioritaton"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Pliigi la kromaĵan prioritaton"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Klavarindikilaj kromaĵoj"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "La listo de aktivaj kromaĵoj"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Aldoni kromaĵon"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Disponeblaj kromaĵoj:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Neniu priskribo."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Ne eblas malfermi helpdosieron"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Malsukcesis prepari MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Enŝalti/elŝalti instalitaj kromaĵoj"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Klavarindikilaj kromaĵoj"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Klavarindikila testo (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikilo:"
diff --git a/po/es.po b/po/es.po
index 5f9b8a5..c2591d6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,33 +3,35 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Adolfo Jayme Barrientos <[email protected]>, 2013
+# Adolfo Jayme Barrientos, 2015
+# Adolfo Jayme Barrientos, 2013
+# Benjamin Perez Carrillo <[email protected]>, 2015
 # Claudio Saavedra <[email protected]>, 2007
 # Jorge González <[email protected]>, 2007, 2008, 2009, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-10-13 04:45+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <[email protected]>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/MATE/language/es/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-25 20:59+0000\n"
+"Last-Translator: Benjamin Perez Carrillo <[email protected]>\n"
+"Language-Team: Spanish (http://www.transifex.com/mate/MATE/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Hubo un error al cargar una imagen: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Error de inicialización de XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +39,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Distribución de teclado «%s»\nCopyright &#169; la Fundación X.Org y los contribuidores de XKeyboardConfig\nPara la licencia vea los metadatos del paquete"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Distribución del teclado «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "distribución «%s»"
 msgstr[1] "distribuciones «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opción «%s»"
 msgstr[1] "opciones «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelo «%s», %s y %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "sin distribución"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "sin opciones"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modelo del teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "modelo de teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Distribución de teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "distribución de teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opciones de teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Manejadores de actualización de teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Una colección de scripts para ejecutar cuando el estado del teclado es recargado. Útil para reaplicar ajustes basados en xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "lista de archivos modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Una lista de archivos modmap disponibles en el directorio $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grupo predeterminado, asignado durante la creación de la ventana"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Mantenga y administre grupos separados por ventana"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Guardar/restaurar indicadores junto con los grupos de distribuciones"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Muestra nombres de las distribuciones en vez de nombres de los grupos"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Muestra los nombres de las distribuciones en vez de los nombres de los grupos (sólo para versiones de XFree que soportan distribuciones múltiples)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Cargar elementos de configuración adicionales"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Cargar distribuciones y opciones exóticas, raramente usadas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprime el mensaje de advertencia «sysconfig de X modificado»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Permitir desactivar el icono del indicador de teclado en el área de notificación"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Mostrar la luz indicadora de teclado"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Vista previa de teclado, desplazamiento X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Vista previa de teclado, desplazamiento Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Vista previa de teclado, anchura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Vista previa de teclado, altura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupos secundarios"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Muestra banderas en la miniaplicación"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Muestra banderas en la miniaplicación para indicar la distribución actual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "La familia tipográfica"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "El tipo de letra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "La familia tipográfica para el indicador de distribución"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "El tamaño de letra"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "El tamaño de la letra del indicador de distribución"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "La tipografía del indicador de diseño. Esta deberia esatr en formato \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "El color de primer plano"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "El color de primer plano para el indicador de distribución"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "El color mas cercano para el indicador de diseño. Este debería estar en formato \"R G B\", por ejemplo \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "El color de fondo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "El color de fondo para el indicador de distribución"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La lista de complementos del Indicador de Teclado activados"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "El color de fondo para el indicador de diseño. Este debería estar en formato \"R G B\", por ejemplo \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Distribución de teclado"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Complementos del Indicador de Teclado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Com_plementos activos:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "La lista de complementos activos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activa más complementos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desactivar el complemento seleccionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Incrementar la prioridad del complemento"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Decrementar la prioridad del complemento"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configurar el complemento seleccionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Cerrar el diálogo"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Añadir complemento"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "C_omplementos disponibles:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "No hay descripción."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "No se pudo abrir el archivo de ayuda"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Falló la inicialización de MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Complementos del indicador de teclado"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Activar/desactivar complementos instalados"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/et.po b/po/et.po
index 766398d..4e62028 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,32 +4,32 @@
 # 
 # Translators:
 # Ivar Smolin <okul linux ee>, 2007, 2009, 2010
-# Ivar Smolin <[email protected]>, 2014
+# Ivar Smolin <[email protected]>, 2014-2015
 # Priit Laes <amd store20 com>, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-08-20 06:52+0000\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-08 12:42+0000\n"
 "Last-Translator: Ivar Smolin <[email protected]>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/MATE/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/mate/MATE/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Pildi laadimisel tekkis viga: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB lähtestamise viga"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +37,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Klaviatuuri paigutus \"%s\"\nAutoriõigused &#169; X.Org Foundation ja XKeyboardConfigi kaasaaitajad\nLitsentsi andmed leiad paki metaandmetest"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Klaviatuuripaigutus \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "paigutus \"%s\""
 msgstr[1] "paigutused \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "valik \"%s\""
 msgstr[1] "valikud \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "mudel \"%s\", %s ja %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "paigutus puudub"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "valikud puuduvad"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Klaviatuuri mudel"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "klaviatuuri mudel"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Klaviatuuri paigutus"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "klaviatuuri paigutus"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Klaviatuuri valikud"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Klaviatuuriuuenduste käsitlejad"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Kogumik skripte, mida käivitatakse klaviatuuri oleku ümberlaadimisel. See on kasulik näiteks xmodmap'il põhinevate sätete rakendamiseks"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap-failide loend"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME kataloogis olevate modmap-failide nimekiri."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Akna loomisega seotud vaikimisi grupp"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Iga akna kohta hoitakse ja hallatakse eraldi gruppi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Näidikute salvestamine ja taastamine koos paigutuste gruppidega"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Grupinimede asemel paigutuste nimede näitamine"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Grupinimede asemel paigutuste nimede näitamine (ainult mitme paugutuse toega XFree versioonidele)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Sätete lisavalikute laadimine"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Eksootiliste, harva kasutatavate paigutuste ja valikute laadimine"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\" teadete peitmine"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Klaviatuurinäidiku salveikooni keelamise võimaldamine"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Klaviatuuritulede näidiku näitamine"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Klaviatuuri eelvaate X-telje nihe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Klaviatuuri eelvaate Y-telje nihe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Klaviatuuri eelvaate laius"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Klaviatuuri eelvaate kõrgus"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Teisejärgulised grupid"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Rakendis lippude näitamine "
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Rakendis lippude näitamine hetkel aktiivse paigutuse kohta"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Kirjatüübi perekond"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Kirjatüüp"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Paigutuse näidiku kirjatüübi perekond"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Kirjatüübi suurus"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Paigutuse näidiku kirjatüübi suurus"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Paigutuse näidiku kirjatüüp. See peaks olema vormingus \"[PEREKOND] [STIILI-VALIKUD] [SUURUS]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
-msgstr "Teksti värvus"
+msgstr "Teksti värv"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Paigutuse näidiku teksti värvus"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Paigutuse näidiku teksti värv. See peaks olema vormingus \"R G B\" (punane-roheline-sinine), näiteks \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
-msgstr "Taustavärvus"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Paigutuse näidiku taustavärvus"
+msgstr "Taustavärv"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Lubatud klaviatuurinäidiku pluginate nimekiri"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Paigutuse näidiku taustavärv. See peaks olema vormingus \"R G B\" (punane-roheline-sinine), näiteks \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Klaviatuuri paigutus"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Klaviatuurinäidiku pluginad"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktiivsed _pluginad:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Aktiivsete pluginate nimekiri"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Täiendavate pluginate aktiveerimine"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Valitud plugina deaktiveerimine"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Plugina tähtsuse suurendamine"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Plugina tähtsuse vähendamine"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Valitud plugina sätete määramine"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Dialoogi sulgemine"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Plugina lisamine"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "S_aadaolevad pluginad:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Kirjeldus puudub."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Abiteabe faili pole võimalik avada"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Tõrge MateConf'i lähtestamisel: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Klaviatuurinäidiku pluginad"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Paigaldatud pluginate lubamine ja keelamine"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/eu.po b/po/eu.po
index 375d418..7c7d5bc 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,34 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Asier Iturralde Sarasola <[email protected]>, 2012.
-# Iñaki Larrañaga Murgoitio <[email protected]>, 2008, 2009, 2010.
+# Asier Iturralde Sarasola <[email protected]>, 2012
+# Iñaki Larrañaga Murgoitio <[email protected]>, 2008, 2009, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
-"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2012-07-01 16:15+0000\n"
-"Last-Translator: Asier Iturralde Sarasola <[email protected]>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/MATE/language/eu/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Basque (http://www.transifex.com/mate/MATE/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Errorea gertatu da irudi bat kargatzean: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Errorea XKB hasieratzean"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,250 +36,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Teklatuaren \"%s\" diseinua\nCopyright-a &#169; X.Org Fundazioa eta XKeyboardConfig-en laguntzaileak\nLizentziari buruz jakiteko ikusi paketearen metadatuak"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "\"%s\" teklatu-diseinua"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "\"%s\" diseinua"
 msgstr[1] "\"%s\" diseinuak"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "\"%s\" aukera"
 msgstr[1] "\"%s\" aukerak"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "\"%s\" modeloa, %s eta %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "diseinurik ez"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "aukerarik ez"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Teklatu modeloa"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "teklatu modeloa"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Teklatuaren diseinua"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "teklatuaren diseinua"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Teklatuaren aukerak"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Teklatua eguneratzeko kudeatzaileak"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Script bilduma teklatuaren egoera birkargatzean exekutatzeko. Erabilgarria xmodmap-en oinarritutako doiketak berriro aplikatzeko."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap fitxategien zerrenda"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME direktorioko 'modmap' fitxategi erabilgarrien zerrenda."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Talde lehenetsia (leihoa sortzean esleitutakoa)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Mantendu eta kudeatu taldeak leihoko bereiztuta"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Gorde/Leheneratu adierazleak diseinu-taldeekin batera"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Erakutsi diseinuen izenak talde-izenen ordez"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Erakutsi diseinuen izenak taldeen izenen ordez (hainbat diseinu onartzen duen XFree bertsioan soilik)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Kargatu konfigurazioko elementu gehigarriak"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Kargatu diseinu eta aukera exotikoak (oso gutxi erabilitakoak)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Kendu \"Xen sysconfig-a aldatuta\" abisuaren mezua"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Teklatuaren aurrebista, X desplazamendua"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Teklatuaren aurrebista, Y desplazamendua"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Teklatuaren aurrebista, zabalera"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Teklatuaren aurrebista, altuera"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Bigarren mailako taldeak"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Erakutsi banderak miniaplikazioan"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Erakutsi banderak miniaplikazioan uneko diseinua adierazteko"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Letra-tipoen familia"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Letra-tipoen familia diseinuaren adierazlearentzako"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Letra-tamaina"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Letra-tamaina diseinuaren adierazlearentzako"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Aurreko planoaren kolorea"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Aurreko planoaren kolorea diseinuaren adierazlearentzako"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Atzeko planoaren kolorea"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Atzeko planoaren kolorea diseinuaren adierazlearentzako"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Gaitutako 'Teklatu-adierazlearen plugin'-en zerrenda"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Teklatu-diseinua"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Teklatu-adierazlearen pluginak"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Plugin aktiboak:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Plugin aktiboen zerrenda"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Aktibatu plugin gehiago"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desaktibatu hautatutako plugina"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Handiagotu pluginaren lehentasuna"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Gutxiagotu pluginaren lehentasuna"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Konfiguratu hautatutako plugina"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Itxi elkarrizketa-koadroa"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Gehitu plugina"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Plugin _erabilgarriak:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Azalpenik ez."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Ezin da laguntzako fitxategia ireki"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Huts egin du MateConf hasieratzean: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Teklatu-adierazlearen pluginak"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Gaitu/desgaitu instalatutako pluginak"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/fr.po b/po/fr.po
index 32a33b1..bbad9ca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,30 +4,31 @@
 # 
 # Translators:
 # Laurent Coudeur <[email protected]>, 2009
+# yoplait <[email protected]>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-10-05 12:52+0000\n"
-"Last-Translator: mauron\n"
-"Language-Team: French (http://www.transifex.com/projects/p/MATE/language/fr/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-28 11:43+0000\n"
+"Last-Translator: yoplait <[email protected]>\n"
+"Language-Team: French (http://www.transifex.com/mate/MATE/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Une erreur s'est produite en chargeant une image : %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Erreur d'initialisation XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -35,250 +36,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Agencement de clavier « %s »\nCopyright &#169; X.Org Foundation et contributeurs XKeyboardConfig\nLes détails de licence se trouvent dans les méta-données du paquet."
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Agencement de clavier « %s »"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "agencement « %s »"
 msgstr[1] "agencements « %s »"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "option « %s »"
 msgstr[1] "options « %s »"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modèle « %s », %s et %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "aucun agencement"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "aucune option"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modèle de clavier"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "modèle de clavier"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Agencement de clavier"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "agencement de clavier"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Options de clavier"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Gestionnaires de mise à jour de claviers"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Un ensemble de scripts à exécuter à chaque rechargement de l'état du clavier. Utile pour réappliquer des ajustements basés sur xmodmap."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "liste de fichiers modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Une liste de fichiers modmap disponibles dans le répertoire $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Groupe par défaut, attribué lors de la création d'une fenêtre"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Gère et maintient des groupes distincts par fenêtre"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Enregistre et restaure les indicateurs avec les groupes d'agencements"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Affiche les noms d'agencement au lieu des noms de groupe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Affiche les noms d'agencement au lieu des noms de groupe (uniquement pour les versions de XFree prenant en charge les agencements multiples)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Charger les objets de configuration supplémentaires"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Charger les agencements et options rarement utilisés"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Supprime le message d'avertisssement « sysconfig X modifée »"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Autoriser la désactivation de l'icône d'indication du clavier"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Afficher l'indicateur des leds du clavier"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "L'aperçu du clavier, décalage X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "L'aperçu du clavier, décalage Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "L'aperçu du clavier, largeur"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "L'aperçu du clavier, hauteur"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Groupes secondaires"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Affiche les drapeaux dans l'applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Affiche des drapeaux dans l'applet pour indiquer l'agencement actuel"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "La police de caractères"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "La police"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "La police de caractères pour l'indicateur d'agencement"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "La taille de police"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "La taille de police pour l'indicateur d'agencement"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "La police pour l'indicateur d'agencement. Cela doit être dans le format \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "La couleur de premier plan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "La couleur de premier plan pour l'indicateur d'agencement"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "La couleur de premier plan pour l'indicateur d'agencement. Cela doit être au format \"R G B\", par exemple \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "La couleur d'arrière-plan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "La couleur d'arrière-plan pour l'indicateur d'agencement"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La liste des greffons activés de l'Indicateur de claviers"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "La couleur d'arrière-plan pour l'indicateur d'agencement. Cela doit être au format \"R G B\", par exemple \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Agencement de clavier"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Greffons de l'Indicateur de claviers"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Greffons actifs :"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Liste des greffons actifs"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activer plus de greffons"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Désactive le greffon sélectionné"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Augmente la priorité du greffon"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Diminue la priorité du greffon"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configure le greffon sélectionné"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Ferme la boîte de dialogue"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Ajouter un greffon"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Greffons _disponibles :"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Aucune description."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Impossible d'ouvrir le fichier d'aide"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "L'initialisation de MateConf a échoué : %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Greffons de l'Indicateur de claviers"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Active ou désactive les greffons installés"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/ga.po b/po/ga.po
index 7be53e5..9dc567c 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,42 +1,50 @@
-# Cornish translations for libmatekbd package.
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# Seán de Búrca <[email protected]>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Seán de Búrca <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-20 07:38-0600\n"
-"PO-Revision-Date: 2009-08-20 08:06-0600\n"
-"Last-Translator: Seán de Búrca <[email protected]>\n"
-"Language-Team: Irish <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Irish (http://www.transifex.com/mate/MATE/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "Tharla earráid agus íomhá á luchtú: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "Earrád túsaithe XKB"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Leagan amach méarchláir \"%s\"\n"
-"Cóipcheart &#169; Rannpháirtithe X.Org Foundation agus XKeyboardConfig"
+msgstr "Leagan amach méarchláir \"%s\"\nCóipcheart &#169; Rannpháirtithe X.Org Foundation agus XKeyboardConfig"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "Earrád túsaithe XKB"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "Tharla earráid agus íomhá á luchtú: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -46,7 +54,7 @@ msgstr[2] "leaganacha amach \"%s\""
 msgstr[3] "leaganacha amach \"%s\""
 msgstr[4] "leaganacha amach \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -56,202 +64,158 @@ msgstr[2] "roghanna \"%s\""
 msgstr[3] "roghanna \"%s\""
 msgstr[4] "roghanna \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "samhail \"%s\", %s agus %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "gan leagan amach"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "gan roghanna"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Samhail mhéarchláir"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "samhail mhéarchláir"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Leagan amach méarchláir"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "leagan amach méarchláir"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Roghanna méarchláir"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Láimhseálaithe Nuashonrú Méarchláir"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Bailiúchán scripteanna le rith aon uair a athluchtaíodh staid an "
-"mhéarchláir. Úsáideach le haghaidh athchur i bfheidhm coigeartuithe xmodmap-"
-"bhunaithe"
+msgstr "Bailiúchán scripteanna le rith aon uair a athluchtaíodh staid an mhéarchláir. Úsáideach le haghaidh athchur i bfheidhm coigeartuithe xmodmap-bhunaithe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "liosta comhaid modmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Liosta comhaid modmap le fáil sa chomhadlann $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grúpa réamhshocraithe, sanntar ag cruthú fuinneoige"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Coinnigh agus bainistigh grúpa ar leith do gach fuinneog"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Láimhseálaithe Nuashonrú Méarchláir"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Leagan amach méarchláir"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Samhail mhéarchláir"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Roghanna méarchláir"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr ""
-"Luchtaigh leaganacha amach agus roghanna coimhthíoch úsáidte go hannamh"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Luchtaigh míreanna cumraíochta breise"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Sábháil/athchóirigh táscairí in éineacht le grúpaí leaganacha amach"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Grúpaí tánaisteacha"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "Taispeáin brataí san fheidhmchláirín"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-"Taispeáin brataí san fheidhmchláirín chun an leagan amach reatha a chur in "
-"iúl"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Taispeáin ainmneacha leagain amach in ionad ainmneacha grúpa"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Taispeáin ainmneacha leagain amach in ionad ainmneacha grúpa (do leaganacha "
-"XFree a thacaíonn le leaganacha amach iomadúla amháin)"
+msgstr "Taispeáin ainmneacha leagain amach in ionad ainmneacha grúpa (do leaganacha XFree a thacaíonn le leaganacha amach iomadúla amháin)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Luchtaigh míreanna cumraíochta breise"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Luchtaigh leaganacha amach agus roghanna coimhthíoch úsáidte go hannamh"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Ceil an teachtaireachta rabhaidh \"Athraíodh sysconfig X\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Réamhamharc an Mhéarchláir, fritháireamh X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Réamhamharc an Mhéarchláir, fritháireamh Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "Réamhamharc an Mhéarchláir, airde"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Réamhamharc an Mhéarchláir, leithead"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Liosta na mbreiseán Táscaire Mhéarchláir cumasaithe"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "leagan amach méarchláir"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "samhail mhéarchláir"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "liosta comhaid modmap"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Gníomhachtaigh tuilleadh breiseán"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Breiseáin gníomhacha:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Dún an dialóg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Cumraigh an breiseán roghnaithe"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Díghníomhachtaigh an breiseán roghnaithe"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Laghdaigh tosaíocht an bhreiseáin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Méadaigh tosaíocht an bhreiseáin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Breiseáin Táscaire Méarchláir"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Réamhamharc an Mhéarchláir, airde"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Liosta na mbreiseán gníomhacha"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Grúpaí tánaisteacha"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Cuir Breiseán Leis"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Breiseáin le _fáil:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Gan chur síos."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Ní féidir comhad cabhrach a oscailt"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Theip ar thúsú MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Cumasaigh/díchumasaigh breiseáin suiteáilte"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Breiseáin Táscaire Mhéarchláir"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Tástáil Táscaire Mhéarchláir (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Táscaire:"
diff --git a/po/gl.po b/po/gl.po
index 5f1daf4..8fc2801 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,38 +1,38 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Antón Méixome <[email protected]>, 2010.
-# Antón Méixome <[email protected]>, 2009.
-# Fran Diéguez <[email protected]>, 2009, 2010.
-# Ignacio Casal Quinteiro <[email protected]>, 2007, 2008.
-# Mancomún - Centro de Referencia e Servizos de Software Libre <[email protected]>, 2009.
-#  <[email protected]>, 2013.
+# Antón Méixome <[email protected]>, 2010
+# Antón Méixome <[email protected]>, 2009
+# Fran Diéguez <[email protected]>, 2009, 2010
+# Ignacio Casal Quinteiro <[email protected]>, 2007, 2008
+# Mancomún - Centro de Referencia e Servizos de Software Libre <[email protected]>, 2009
+# Miguel Anxo Bouzada <[email protected]>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
-"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-03-31 07:19+0000\n"
-"Last-Translator: mbouzada <[email protected]>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/MATE/language/gl/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Galician (http://www.transifex.com/mate/MATE/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"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Produciuse un erro ao cargar unha imaxe: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Produciuse un erro de inicialización do XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -40,250 +40,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Disposición do teclado «%s»\nDereitos de autor &#169; X.Org Foundation e colaboradores do XKeyboardConfig\nPara a licenza vaia aos metadatos do paquete"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Descoñecida"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Disposición do teclado «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "disposición «%s»"
 msgstr[1] "disposicións «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opción «%s»"
 msgstr[1] "opcións «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelo «%s», %s e %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "sen disposición"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "sen opcións"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modelo do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "modelo de teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Disposición do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "disposición do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opcións do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Manipuladores de actualización do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Unha colección de scripts para executar cando se recargue o estado do teclado. É útil para reaplicar axustes baseados en xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "lista de ficheiros modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Unha lista de ficheiros modmap dispoñíbeis no directorio $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grupo predeterminado asignado durante a creación da xanela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Conservar e xestionar grupos separados por xanela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Gardar/restaurar os indicadores xunto cos grupos de disposición"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Amosar os nomes da disposición no canto dos nomes de grupo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Amosar os nomes de disposición no canto dos nomes de grupo (só para versións de XFree que permitan múltiples disposicións)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Cargar elementos de configuración adicionais"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Cargar opcións e disposicións pouco usadas ou exóticas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprime a mensaxe de aviso «X sysconfig changed»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "A vista previa do teclado, desprazamento X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "A vista previa do teclado, desprazamento Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "A vista previa do teclado, largura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "A vista previa do teclado, altura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupos secundarios"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Amosar as marcas no miniaplicativo"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Amosar as marcas no miniaplicativo para indicar a disposición actual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "A familia do tipo de letra"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "A familia do tipo de letra para o indicador de disposición"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "O tamaño do tipo de letra"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "O tamaño do tipo de letra para o indicador de disposición"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "A cor de primeiro plano"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "A cor de primeiro plano para o indicador de disposición"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "A cor de fondo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "A cor de fondo para o indicador de disposición"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "A lista de engadidos do indicador de teclados activados"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Disposición do teclado"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Engadidos do indicador de teclado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Engadidos activos:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "A lista de engadidos activos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activar máis engadidos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desactivar o engadido seleccionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Aumentar a prioridade do engadido"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Reducir a prioridade do engadido"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configurar o engadido seleccionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Pechar a caixa de diálogo"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Engadir engadido"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Engadidos _dispoñíbeis:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Sen descrición."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Non é posíbel abrir o ficheiro de axuda"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Produciuse un fallo ao iniciar MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Engadidos do indicador de teclado"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Activar ou desactivar os engadidos instalados"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/gu.po b/po/gu.po
index f5af01c..ea79669 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,250 +1,216 @@
-# translation of libmatekbd.master.gu.po to Gujarati
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
-# Ankit Patel <[email protected]>, 2007.
-# Sweta Kothari <[email protected]>, 2008, 2009.
+# 
+# Translators:
+# Ankit Patel <[email protected]>, 2007
+# sweta <[email protected]>, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master.gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-09-09 12:55+0530\n"
-"Last-Translator: Sweta Kothari <[email protected]>\n"
-"Language-Team: Gujarati\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Gujarati (http://www.transifex.com/mate/MATE/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"\n"
-"\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "ચિત્ર લાવવામાં ભૂલ હતી: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB આરંભ કરવામાં ભૂલ"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"કિબોર્ડ લેઆઉટ \"%s\"\n"
-"સર્વાધિકાર &#169; X.Org ફાઉન્ડેશન અનો XKeyboardConfig સહાયકારક\n"
-"પેકેજ મેટાડેટા જોવા લાઇસેંસદેવા માટેa"
+msgstr "કિબોર્ડ લેઆઉટ \"%s\"\nસર્વાધિકાર &#169; X.Org ફાઉન્ડેશન અનો XKeyboardConfig સહાયકારક\nપેકેજ મેટાડેટા જોવા લાઇસેંસદેવા માટેa"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB આરંભ કરવામાં ભૂલ"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "ચિત્ર લાવવામાં ભૂલ હતી: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "લેઆઉટ \"%s\""
 msgstr[1] "લેઆઉટો \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "વિકલ્પ \"%s\""
 msgstr[1] "વિકલ્પો \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "મોડેલ \"%s\", %s અને %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "કોઈ લેઆઉટ નથી"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "કોઈ વિકલ્પો નથી"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "કીબોર્ડ મોડેલ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "કીબોર્ડ મોડેલ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "કીબોર્ડ લેઆઉટ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "કીબોર્ડ લેઆઉટ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "કીબોર્ડ વિકલ્પો"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "કીબોર્ડ સુધારા નિયંત્રકો"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"જ્યારેપણ કીબોર્ડ પરિસ્થિતિ પુનઃલવાય ત્યારે ચલાવવાની સ્ક્રિપ્ટોનો સમૂહ. xmodmap આધારિત "
-"સંતુલનો પુનઃ-લાગુ પાડવા માટે ઉપયોગી"
+msgstr "જ્યારેપણ કીબોર્ડ પરિસ્થિતિ પુનઃલવાય ત્યારે ચલાવવાની સ્ક્રિપ્ટોનો સમૂહ. xmodmap આધારિત સંતુલનો પુનઃ-લાગુ પાડવા માટે ઉપયોગી"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ફાઈલ યાદી"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME ડિરેક્ટરીમાં ઉપલબ્ધ modmap ફાઈલોની યાદી."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "મૂળભૂત જૂથ, વિન્ડો બનાવટ પર સોંપાયેલ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "વિન્ડો પ્રતિ અલગ જૂથ જાળવો અને વ્યવસ્થા કરો"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "કીબોર્ડ સુધારા નિયંત્રકો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "કીબોર્ડ લેઆઉટ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "કીબોર્ડ મોડેલ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "કીબોર્ડ વિકલ્પો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "વિલાયતી, ઓછુ વપરાયેલ દેખાવો અને વિકલ્પોને લોડ કરો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "વધારાની રૂપરેખાંકન વસ્તુને લોડ કરો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "લેઆઉટ જૂથો સાથે સૂચકો એકસાથે સંગ્રહો/પુનઃજાળવો"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "ગૌણ જૂથો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "એપ્લેટમાં ફ્લેગો બતાવો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "વર્તમાન લેઆઉટ સૂચવવા માટે એપ્લેટમાં ફ્લેગો બતાવો"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "જૂથ નામોની જગ્યાએ લેઆઉટ નામો બતાવો"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "જૂથ નામોની જગ્યાએ લેઆઉટ નામો બતાવો (XFree આધાર આપતા ઘણાબધા લેઆઉટોની આવૃત્તિઓ માટે જ)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "વધારાની રૂપરેખાંકન વસ્તુને લોડ કરો"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "વિલાયતી, ઓછુ વપરાયેલ દેખાવો અને વિકલ્પોને લોડ કરો"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig બદલાયેલ\" ચેતવણી સંદેશો સંકોચો"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "કીબોર્ડ પૂર્વદર્શન, X ઓફસેટ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "કીબોર્ડ પૂર્વદર્શન, Y ઓફસેટ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "કીબોર્ડ પૂર્વદર્શન, ઊંચાઈ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "કીબોર્ડ પૂર્વદર્શન, પહોળાઈ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "સક્રિય કરેલ કીબોર્ડ સૂચક પ્લગઈનોની યાદી"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "કીબોર્ડ લેઆઉટ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "કીબોર્ડ મોડેલ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap ફાઈલ યાદી"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "વધુ પ્લગઈનો સક્રિયકૃત કરો"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "સક્રિય પ્લગઈનો (_p):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "સંવાદ બંધ કરો"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "પસંદ કરેલ પ્લગઈન રૂપરેખાંકિત કરો"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "પસંદ કરેલ પ્લગઈન અસક્રિય કરો"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "પ્લગઈન પ્રાધાન્ય ઘટાડો"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "પ્લગઈન પ્રાધાન્ય વધારો"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "કીબોર્ડ સૂચક પ્લગઈનો"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "કીબોર્ડ પૂર્વદર્શન, ઊંચાઈ"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "સક્રિય પ્લગઈનોની યાદી"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "ગૌણ જૂથો"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "પ્લગઈન ઉમેરો"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "ઉપલબ્ધ પ્લગઈનો (_A):"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "કોઈ વર્ણન નથી."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "મદદ ફાઇલને ખોલવામાં અસમર્થ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf નો આરંભ કરવામાં નિષ્ફળ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "સ્થાપિત પ્લગઈનો સક્રિય/નિષ્ક્રિય કરો"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "કીબોર્ડ સૂચક પ્લગઈનો"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "કીબોર્ડ સૂચક ચકાસણી (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "સૂચક:"
-
diff --git a/po/he.po b/po/he.po
index 553e8ad..9f3c3a2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,312 +1,215 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Yair Hershkovitz  <[email protected]>, 2008.
-#
+# 
+# Translators:
+# Yair Hershkovitz  <[email protected]>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: 1\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-29 18:42+0300\n"
-"PO-Revision-Date: 2010-05-29 18:46+0200\n"
-"Last-Translator: Yaron Shahrabani <[email protected]>\n"
-"Language-Team: he\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Hebrew (http://www.transifex.com/mate/MATE/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:312
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "ארעה שגיאה בטעינת תמונה: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:643
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "שגיאה באתחול XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"פריסת מקלדת \"%s\"\n"
-"כל הזכויות שמורות &#169; קרן X.Org ותורמי XKeyboardConfig\n"
-"למידע על אודות הרישוי ניתן לעיין בקבצים המצורפים לחבילה"
+msgstr "פריסת מקלדת \"%s\"\nכל הזכויות שמורות &#169; קרן X.Org ותורמי XKeyboardConfig\nלמידע על אודות הרישוי ניתן לעיין בקבצים המצורפים לחבילה"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "פריסת המקלדת \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "פריסה \"%s\""
 msgstr[1] "פריסות \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "אפשרות \"%s\""
 msgstr[1] "אפשרויות \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "דגם \"%s\", %s ו־%s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "אין פריסה"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "אין אפשרויות"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Keyboard model"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "keyboard model"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Keyboard layout"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "keyboard layout"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Keyboard options"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Keyboard Update Handlers"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"A collection of scripts to run whenever the keyboard state is reloaded. "
-"Useful for re-applying xmodmap based adjustments"
+msgstr "A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap file list"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "A list of modmap files available in the $HOME directory."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Default group, assigned on window creation"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Keep and manage separate group per window"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Keyboard Update Handlers"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Keyboard layout"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Keyboard model"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Keyboard options"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Load exotic, rarely used layouts and options"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Load extra configuration items"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Save/restore indicators together with layout groups"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Secondary groups"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Show flags in the applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Show flags in the applet to indicate the current layout"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Show layout names instead of group names"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Show layout names instead of group names (only for versions of XFree "
-"supporting multiple layouts)"
+msgstr "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Load extra configuration items"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Load exotic, rarely used layouts and options"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suppress the \"X sysconfig changed\" warning message"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "The Keyboard Preview, X offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "The Keyboard Preview, Y offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "The Keyboard Preview, height"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "The Keyboard Preview, width"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "The background color"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "The background color for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "The font family"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "The Keyboard Preview, height"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "The font family for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Secondary groups"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "The font size"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "The foreground color"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "The foreground color for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "The list of enabled Keyboard Indicator plugins"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "keyboard layout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "keyboard model"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "The background color"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap file list"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "פריסת מקלדת"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "הפעלת תוספים נוספים"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "תוספים _פעילים:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "סגירת תיבת הדו־שיח"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "הגדרת את התוסף הנבחר"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "כיבוי התוסף הנבחר"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "הקטנת עדיפות התוסף"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "הגדלת עדיפות התוסף"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "תוספי מחוון מקלדת"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "רשימת התוספים הפעילים"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "הוספת תוסף"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "תוספים _זמינים:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "אין תיאור."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "לא ניתן לפתוח את קובץ העזרה"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "ארע כשל בהפעלת MateConf:‏ %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "הפעלה/כיבוי של תוספים מותקנים"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "תוספי מחוון מקלדת"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "בדיקת מחוון מקלדת (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "מחוון:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
diff --git a/po/hi.po b/po/hi.po
index a569df6..f841fa0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,26 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-03-08 16:28+0000\n"
-"Last-Translator: Sadgamaya <[email protected]>\n"
-"Language-Team: Hindi (http://www.transifex.com/projects/p/MATE/language/hi/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Hindi (http://www.transifex.com/mate/MATE/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "छवि लोड करने में त्रुटि थी: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB आरंभीकरण त्रुटि"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +37,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Keyboard layout \"%s\"\nCopyright &#169; X.Org Foundation and XKeyboardConfig contributors\nFor licensing see package metadata"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "कुंजीपटल अभिन्यास \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "लेआउट \"%s\""
 msgstr[1] "लेआउट \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "विकल्प \"%s\""
 msgstr[1] "विकल्प \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "मॉडल \"%s\", %s और %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "कोई लेआउट नहीं"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "कोई विकल्प नहीं"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "कुंजीपटल मॉडल"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "कुंजीपटल मॉडल"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "कुंजीपटल अभिन्यास"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "कुंजीपटल अभिन्यास"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "कुंजीपटल विकल्प"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "कुंजीपटल अपडेट नियंत्रक"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "जबभी कुंजीपटल स्थिति फिर लोड होती है स्क्रिप्ट का एक संग्रह चलाने के लिये"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap फाइल सूची"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME निर्देशिका में उपलब्ध मोडमैप फाइल की सूची."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "मूलभूत समूह विंडो निर्माण पर नियत"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "प्रति विंडो अलग समूह रखे व प्रबंधित करें"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "लेआउट समूह के साथ संकेतक सहेजें/पुनर्भंडारित करें"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "समूह नाम के बजाय लेआउट नाम दिखायें"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "समूह नाम के बजाय लेआउट नाम दिखायें (सिर्फ XFree समर्थित बहुल लेआउट के संस्करण के लिये)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "अतिरिक्त विन्यास मद लोड करें"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "अनोखा और कभी कभी प्रयुक्त लेआउट व विकल्प लोड करें"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\" चेतावनी संदेश दबायें"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "कुंजीपटल पूर्वावलोकन, X offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "कुंजीपटल पूर्वावलोकन ऊँचाई, Y offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "कुंजीपटल पूर्वावलोकन चौड़ाई"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "कुंजीपटल पूर्वावलोकन ऊँचाई"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "सहायक समूह"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "ध्वज में एप्लेट देखें"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "वर्तमान अभिन्यास को सूचित करने हेतु एप्लेट में ध्वज दिखाएँ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "फ़ॉन्ट परिवार"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "अभिन्यास सूचक हेतु फ़ॉन्ट परिवार"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "फ़ॉन्ट आकार"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "अभिन्यास सूचक हेतु फ़ॉन्ट आकार"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "अग्रभूमि रंग"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "अभिन्यास सूचक हेतु अग्रभूमि रंग"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "पृष्ठभूमि रंग"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "अभिन्यास सूचक हेतु पृष्ठभूमि रंग"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "कुंजीपटल सूचक प्लगइन्स सक्रिय किये हुये की सूची"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "कुंजीपटल अभिन्यास"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "कीबोर्ड सूचक प्लगिन"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "सक्रिय प्लगिनः (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "सक्रिय प्लगिन की सूची"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "अधिक प्लगिन सक्रिय करें"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "चयनित प्लगिन निष्क्रिय करें"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "प्लगिन प्राथमिकता बढ़ाएँ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "प्लगिन प्राथमिकता घटाएँ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "चयनित प्लगिन विन्यस्त करें"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "संवाद बन्द करें"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "प्लगिन जोड़ें"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "उपलब्ध प्लगिनः (_A)"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "कोई वर्णन नहीं."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "मदद फाइल खोलने में असमर्थ"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "जी-कॉन्फ़ प्रारंभ करने में असफल: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "कीबोर्ड सूचक प्लगिन"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "संस्थापित प्लगिन सक्रिय/निष्क्रिय करें"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/hr.po b/po/hr.po
index 587c3ad..8ebfe6c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,26 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-05-24 07:23+0000\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-11 00:51+0000\n"
 "Last-Translator: Mislav E. Lukšić <[email protected]>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/MATE/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/mate/MATE/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Došlo je do neispravnosti pri učitavanju slike: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Neispravnost u započinjanju XKB-a"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,16 +36,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Raspored tipkovnice \"%s\"\nAutorska prava &#169; pridonositelji za Zakladu X.Org i XKeyboardConfig\nZa postupanje s dozvolom vidi paketne metapodatke"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Raspored tipkovnice \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -53,7 +53,7 @@ msgstr[0] "raspored \"%s\""
 msgstr[1] "rasporeda \"%s\""
 msgstr[2] "rasporeda \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -61,227 +61,153 @@ msgstr[0] "mogućnost \"%s\""
 msgstr[1] "mogućnosti \"%s\""
 msgstr[2] "mogućnosti \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s i %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "nema rasporeda"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "nema mogućnosti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Model tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "model tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Raspored tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "raspored tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Mogućnosti tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Upravljači obnove tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Zbirka naredbenih datoteka koje se pokreću uvijek kada je stanje tipkovnice ponovno učitano. Korisno za ponovljenu primjenu ugađanja kojih je osnova xmodmap."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "popis datoteka postupovne mape"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Popis datoteka postupovne mape dostupnih u direktoriju $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Zadana skupina, pridružena pri stvaranju prozora"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Drži i upravljaj odijeljenom skupinom po prozoru"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Spremi/obnovi pokazivače zajedno s rasporednim skupinama"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Prikaži nazive rasporeda umjesto naziva skupina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Prikaži nazive rasporeda umjesto skupnih naziva (samo za XFree inačice s podrškom za višestruke rasporede)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Učitaj dodatne postavne stavke"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Učitaj neuobičajene, rijetko korištene rasporede i mogućnosti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Spriječi upozoravajuću poruku \"X sysconfig changed\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Dopusti onemogućiti sličicu pokazivača tipkovnice u traci"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Prikaži pokazivača stanja tipkovničkih dioda"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Pregled tipkovnice, pomak osi X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Pregled tipkovnice, pomak osi Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Pregled tipkovnice, širina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Pregled tipkovnice, visina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Sporedne skupine"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Prikaži oznake stanja u programčiću"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Prikaži oznake stanja u programčiću za pokazivanje trenutnog rasporeda"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Obitelj pisma"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Pismo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Obitelj pisma za pokazivač rasporeda"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Veličina pisma"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Veličina pisma za pokazivač rasporeda"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Pismo za pokazivač rasporeda. Ovo treba biti u obliku \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Osnovna boja"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Osnovna boja za pokazivač rasporeda"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Osnovna boja za pokazivač rasporeda. Ovo treba biti u obliku \"R G B\", primjerice \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Pozadinska boja"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Pozadinska boja za pokazivač rasporeda"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Popis omogućenih priključaka pokazivača tipkovnice"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Pozadinska boja za pokazivač rasporeda. Ovo treba biti u obliku \"R G B\", primjerice \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Raspored tipkovnice"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Priključci pokazivača tipkovnice"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Djelatni _priključci:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Popis djelatnih priključaka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Pokreni još priključaka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Zaustavi odabrani priključak"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Povisi prvenstvo priključka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Snizi prvenstvo priključka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Postavi odabrani priključak"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Zatvori dijaloški okvir"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Dodaj priključak"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Dostupni priključci:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Nema opisa."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nije moguće otvoriti datoteku pomoći"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Neuspjelo započinjanje MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Priključci pokazivača tipkovnice"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Omogući/onemogući ugrađene priključke"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/hu.po b/po/hu.po
index 21c0e0e..4c86ff6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,300 +1,215 @@
-# Hungarian translation of libmatekbd
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-#
-# Gabor Kelemen <kelemeng at mate dot hu>, 2007, 2008, 2009, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gabor Kelemen <kelemeng at mate dot hu>, 2007, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd master\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-31 01:12+0200\n"
-"PO-Revision-Date: 2010-08-31 01:12+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at mate dot hu>\n"
-"Language-Team: Hungarian <mate at fsf dot hu>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-10 18:52+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Hungarian (http://www.transifex.com/mate/MATE/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "hiba történt egy kép betöltése során: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-előkészítési hiba"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"„%s” billentyűzetkiosztás\n"
-"Copyright &#169; X.Org Foundation és az XKeyboardConfig közreműködői\n"
-"Licencelési információkért tekintse meg a csomag metaadatait."
+msgstr "„%s” billentyűzetkiosztás\nCopyright &#169; X.Org Foundation és az XKeyboardConfig közreműködői\nLicencelési információkért tekintse meg a csomag metaadatait."
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "„%s” billentyűzetkiosztás"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "„%s” kiosztás"
 msgstr[1] "„%s” kiosztás"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "„%s” beállítás"
 msgstr[1] "„%s” beállítás"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "„%s” típus, %s és %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "nincs kiosztás"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "nincsenek beállítások"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Billentyűzetmodell"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "billentyűzetmodell"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Billentyűzetkiosztás"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "billentyűzetkiosztás"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Billentyűzet beállításai"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Billentyűzetfrissítés-kezelők"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Parancsfájlok gyűjteménye, amelyeket a billentyűzet állapotának minden "
-"újratöltésekor le kell futtatni. Az xmodmap-alapú beállítások "
-"újraalkalmazásakor hasznos."
+msgstr "Parancsfájlok gyűjteménye, amelyeket a billentyűzet állapotának minden újratöltésekor le kell futtatni. Az xmodmap-alapú beállítások újraalkalmazásakor hasznos."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap fájlok listája"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "A $HOME könyvtárban elérhető modmap fájlok listája."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Az ablak létrehozásához hozzárendelt alapértelmezett csoport"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Külön csoport fenntartása és kezelése minden ablakhoz"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Billentyűzetfrissítés-kezelők"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Billentyűzetkiosztás"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Billentyűzetmodell"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Billentyűzet beállításai"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Egzotikus, ritkán használt kiosztások és beállítások betöltése"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Kiegészítő beállítási elemek betöltése"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Jelzők mentése/visszaállítása a kiosztáscsoportokkal együtt"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Másodlagos csoportok"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Zászlók megjelenítése a kisalkalmazásban"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-"Zászlók megjelenítése a kisalkalmazásban a jelenlegi billentyűzetkiosztás "
-"jelzésére"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Kiosztásnevek mutatása csoportnevek helyett"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Kiosztásnevek mutatása csoportnevek helyett (csak az XFree több kiosztást "
-"támogató verzióihoz)"
+msgstr "Kiosztásnevek mutatása csoportnevek helyett (csak az XFree több kiosztást támogató verzióihoz)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Kiegészítő beállítási elemek betöltése"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Egzotikus, ritkán használt kiosztások és beállítások betöltése"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
+msgstr "A „Megváltoztak az X rendszerbeállításai” figyelmeztető üzenet elhallgattatása"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
 msgstr ""
-"A „Megváltoztak az X rendszerbeállításai” figyelmeztető üzenet "
-"elhallgattatása"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "A billentyűzet előnézete, X eltolás"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "A billentyűzet előnézete, Y eltolás"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "A billentyűzet előnézete, magasság"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "A billentyűzet előnézete, szélesség"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "A háttérszín"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "A kiosztásjelző háttérszíne"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "A betűkészlet-család"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "A billentyűzet előnézete, magasság"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "A kiosztásjelző betűkészlet-családja"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Másodlagos csoportok"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "A betűméret"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "A kiosztásjelző betűmérete"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Az előtérszín"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "A kiosztásjelző előtérszíne"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Az engedélyezett Billentyűzetjelző bővítmények listája"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "billentyűzetkiosztás"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "billentyűzetmodell"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "A háttérszín"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap fájlok listája"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Billentyűzetkiosztás"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "További bővítmények aktiválása"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "A_ktív bővítmények:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "A párbeszédablak bezárása"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "A kijelölt bővítmény beállítása"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "A kijelölt bővítmény letiltása"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "A bővítmény prioritásának csökkentése"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "A bővítmény prioritásának növelése"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Billentyűzetjelző bővítmények"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Az aktív bővítmények listája"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Bővítmény hozzáadása"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Elérhető bővítmények:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Nincs leírás."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "A súgófájl nem nyitható meg"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Nem sikerült a MateConf előkészítése: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Telepített bővítmények engedélyezése/letiltása"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Billentyűzetjelző bővítmények"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Billentyűzetjelző teszt (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Jelző:"
diff --git a/po/hy.po b/po/hy.po
new file mode 100644
index 0000000..63049e7
--- /dev/null
+++ b/po/hy.po
@@ -0,0 +1,215 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Siranush <[email protected]>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-25 15:08+0000\n"
+"Last-Translator: Siranush <[email protected]>\n"
+"Language-Team: Armenian (http://www.transifex.com/mate/MATE/language/hy/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "Պատկերի բեռնման ժամանակ տեղի է  ունեցել սխալ: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB սկզբնարժեքավորման սխալ"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
+#, c-format
+msgid ""
+"Keyboard layout \"%s\"\n"
+"Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
+"For licensing see package metadata"
+msgstr "Ստեղնաշարի դասավորություն \"%s\"\nՀեղինակային իրավունք &#169; X.Org Հիմնադրամ և XKeyboardConfig ջակիցներ\nԼիցենզավորման համար տես մետատվյալների փաթեթը"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr "Անհայտ"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
+#, c-format
+msgid "Keyboard Layout \"%s\""
+msgstr "Ստեղնաշարի Դասավորություն \"%s\""
+
+#: ../libmatekbd/matekbd-keyboard-config.c:719
+#, c-format
+msgid "layout \"%s\""
+msgid_plural "layouts \"%s\""
+msgstr[0] "Դասավորություն \"%s\""
+msgstr[1] "Դասավորություններ \"%s\""
+
+#: ../libmatekbd/matekbd-keyboard-config.c:737
+#, c-format
+msgid "option \"%s\""
+msgid_plural "options \"%s\""
+msgstr[0] "տարբերակ \"%s\""
+msgstr[1] "տարբերակներ \"%s\""
+
+#: ../libmatekbd/matekbd-keyboard-config.c:745
+#, c-format
+msgid "model \"%s\", %s and %s"
+msgstr "մոդել \"%s\", %s և %s"
+
+#: ../libmatekbd/matekbd-keyboard-config.c:746
+msgid "no layout"
+msgstr "նախագիծ չկա"
+
+#: ../libmatekbd/matekbd-keyboard-config.c:747
+msgid "no options"
+msgstr "ընտրանքներ չկան"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Ստեղնաշարի մոդելը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "ստեղնաշարի մոդել"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Ստեղնաշարի դասավորություն"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "ստեղնաշարի դասավորություն"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Ստեղնաշարի տարբերակները"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Ստեղնաշարը Թարմացնել Մշակման ծրագրով"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ֆայլի ցանկ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
+msgstr "modmap ֆայլերի ցանկը հասանելի է $Սկիզբ տեղեկատուին."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
+msgid "Save/restore indicators together with layout groups"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
+msgid "Show layout names instead of group names"
+msgstr "Խմբի անունները փոխարեն ցույց տալ անունների դասավորությունը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Բեռնելու լրացուցիչ կոնֆիգուրացիայի տարրեր"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Բեռնելու էկզոտիկ, հազվադեպ գտագործված դասավորություն  և տարբերակներ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
+msgid "Suppress the \"X sysconfig changed\" warning message"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Թույլատրիր ստեղնաշարին ցուցիչի սկուտեղի պատկերակը արգելափակել"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Ցույց տուր ստեղնաշարի leds ցուցանիշը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
+msgid "The Keyboard Preview, X offset"
+msgstr "Ստեղնաշարի նախնական դիտում, X հավասարակշռում"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
+msgid "The Keyboard Preview, Y offset"
+msgstr "Ստեղնաշարի նախնական դիտում, Y հավասարակշռում"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
+msgid "The Keyboard Preview, width"
+msgstr "Ստեղնաշարի նախնական դիտում, լայնությունը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Ստեղնաշարի նախնական դիտում, բարձրությունը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Երկրորդական խմբեր"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Տառատեսակը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Դասավորությունը ցուցանիշի տառատեսակ։Սա պետք է լինի\"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\" ձևաչափում։"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr "Առաջնահերթային գույնը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Դասավորության ցուցանիշի առաջնային գույնը.Սա պետք է լինի է «R G B» ձևաչափով, օրինակ, «255 0 0»."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Ֆոնի գույնը"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Դասավորության ցուցանիշի ֆոնի գույնը.Սա պետք է լինի է «R G B» ձևաչափով, օրինակ, «255 0 0»."
+
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr "Ստեղնաշարի Դասավորություն"
+
+#: ../test/matekbd-indicator-test.c:55
+#, c-format
+msgid "Keyboard Indicator Test (%s)"
+msgstr "Ստեղնաշարի ցուցիչ թեստը (%s)"
+
+#: ../test/matekbd-indicator-test.c:63
+msgid "Indicator:"
+msgstr "Ցուցանիշ:"
diff --git a/po/id.po b/po/id.po
index 68441a5..25b074a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,297 +1,215 @@
-# Indonesian translation for libmatekbd.
-# Copyright (C) 2010 libmatekbd's COPYRIGHT HOLDER
-# This file is distributed under the same license as the libmatekbd package.
-# alfaridi <[email protected]>, 2010.
-# Dichi Al Faridi <[email protected]>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dichi Al Faridi <[email protected]>, 2010
+# Dichi Al Faridi <[email protected]>, 2010
+# Willy Sudiarto Raharjo <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-08-04 03:52+0000\n"
-"PO-Revision-Date: 2010-08-09 20:02+0700\n"
-"Last-Translator: Andika Triwidada <[email protected]>\n"
-"Language-Team: MATE Indonesian Translation Team <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-11-01 11:59+0000\n"
+"Last-Translator: Willy Sudiarto Raharjo <[email protected]>\n"
+"Language-Team: Indonesian (http://www.transifex.com/mate/MATE/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.5.2\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: Indonesia\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Ada galat saat memuat suatu gambar: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Kesalahan inisialisasi XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Tata letak papan tik \"%s\" \n"
-"Hak cipta &#169; X.Org Foundation dan kontributor XKeyboardConfig\n"
-"Untuk lisensi lihat metadata paket"
+msgstr "Tata letak papan tik \"%s\" \nHak cipta &#169; X.Org Foundation dan kontributor XKeyboardConfig\nUntuk lisensi lihat metadata paket"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Tata Letak Papan Tik \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "tata letak \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opsi \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\",%s dan%s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "tidak ada tata letak"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "tidak ada opsi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Model papan tik"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "model papan tik"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Tata letak papan tik"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "tata letak papan tik"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Opsi papan tik"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Keyboard Update Handlers"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Kumpulan skrip untuk dijalankan setiap kali keadaan papan tik dimuat ulang. "
-"Berguna untuk kembali menerapkan penyesuaian berdasarkan xmodmap"
+msgstr "Kumpulan skrip untuk dijalankan setiap kali keadaan papan tik dimuat ulang. Berguna untuk kembali menerapkan penyesuaian berdasarkan xmodmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "daftar berkas modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Daftar berkas modmap yang tersedia pada direktori $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grup bawaan, ditetapkan pada penciptaan jendela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Menjaga dan mengelola kelompok terpisah per jendela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Keyboard Update Handlers"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Tata letak papan tik"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Model papan tik"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Opsi papan tik"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Muat opsi dan tata letak yang eksotis dan jarang dipakai"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Muat butir konfigurasi tambahan"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Simpan/kembalikan indikator bersama-sama dengan kelompok tata letak"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Kelompok sekunder"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Tunjukkan flag di applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Tampilkan flag di applet untuk menunjukkan tata letak saat ini"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Tampilkan nama tata letak, bukan nama grup"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Tampilkan nama tata letak, bukan nama grup (hanya untuk versi XFree yang "
-"mendukung tata letak berganda)"
+msgstr "Tampilkan nama tata letak, bukan nama grup (hanya untuk versi XFree yang mendukung tata letak berganda)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Muat butir konfigurasi tambahan"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Muat opsi dan tata letak yang eksotis dan jarang dipakai"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Redam pesan peringatan \"X sysconfig changed\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Ijinkan menonaktifkan ikon indikator keyboard"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Tampilkan lampu indikator keyboard"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Pratilik Papan Tik, ofset X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Pratilik Papan Tik, ofset Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Pratilik Papan Tik, tinggi"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Pratilik Papan Tik, lebar"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Warna latar"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Warna latar belakang untuk indikator tata letak"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Keluarga fonta"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Pratilik Papan Tik, tinggi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Keluarga fonta untuk indikator tata letak"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Kelompok sekunder"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Ukuran fonta"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Font"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Ukuran fonta untuk indikator tata letak"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Font untuk indikator layout. Harus dalam format \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Warna latar depan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Warna latar depan untuk indikator tata letak"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Daftar plugin Indikator Papan Tik yang diaktifkan"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "tata letak papan tik"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Warna foreground untuk indikator layout. Harus dalam format \"R G B\", misalnya \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "model papan tik"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Warna latar"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "daftar berkas modmap"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Warna background untuk indikator layout. Harus dalam format \"R G B\", misalnya \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Tata Letak Papan Tik"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktifkan lebih banyak plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Plugin aktif:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Tutup dialog"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Mengkonfigurasi plugin dipilih"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Nonaktifkan plugin yang dipilih"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Penurunan prioritas plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Penaikan prioritas plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Plugin Indikator Papan Tik"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Daftar plugin yang aktif"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Tambahkan Plugin"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Plugin Tersedi_a:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Tidak ada deskripsi."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Tidak dapat membuka berkas bantuan"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Gagal init mateconf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Mengaktifkan/menonaktifkan plugin terpasang"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Plugin Indikator Papan Tik"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Uji Indikator Papan Tik (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikator:"
diff --git a/po/it.po b/po/it.po
index 4dd1c3a..ca1d521 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,302 +1,215 @@
-# Italian translation of libmatekbd.
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc
-# This file is distributed under the same license as the libmatekbd package.
-# Luca Ferretti <[email protected]>, 2007-2008.
-#
-# Based on Italian translation for mate-control-center 2.16
-#
-# Milo Casagrande <[email protected]>, 2009, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Milo Casagrande <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-04 19:55+0200\n"
-"PO-Revision-Date: 2010-09-04 19:55+0200\n"
-"Last-Translator: Milo Casagrande <[email protected]>\n"
-"Language-Team: Italian <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Italian (http://www.transifex.com/mate/MATE/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Si è verificato un errore nel caricare un'immagine: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:720 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Errore di inizializzazione di XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Disposizione di tastiera «%s»\n"
-"Copyright &#169; X.Org Foundation e collaboratori di XKeyboardConfig\n"
-"Per la licenza consultare i metadati del pacchetto"
+msgstr "Disposizione di tastiera «%s»\nCopyright &#169; X.Org Foundation e collaboratori di XKeyboardConfig\nPer la licenza consultare i metadati del pacchetto"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Disposizione tastiera «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "disposizione «%s»"
 msgstr[1] "disposizioni «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opzione «%s»"
 msgstr[1] "opzioni «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modello «%s», %s e %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "nessuna disposizione"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "nessuna opzione"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Modello tastiera"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "Modello tastiera"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Disposizione tastiera"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "Disposizione tastiera"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Opzioni tastiera"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Gestori aggiornamento tastiera"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Una raccolta di script da eseguire quando lo stato della tastiera viene "
-"ricaricato. Utile per ri-applicare regolazioni basate su xmodmap"
+msgstr "Una raccolta di script da eseguire quando lo stato della tastiera viene ricaricato. Utile per ri-applicare regolazioni basate su xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "Elenco file modmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Un elenco di file modmap disponibili nella directory $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Gruppo predefinito, assegnato alla creazione della finestra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Mantiene e gestisce gruppi separati per finestra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Gestori aggiornamento tastiera"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Disposizione tastiera"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Modello tastiera"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Opzioni tastiera"
-
-# MATE-2-28
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Carica disposizioni e opzioni usate raramente"
-
-# MATE-2-28
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Carica elementi di configurazione extra"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Salva/Ripristina gli indicatori assieme ai gruppi di disposizioni"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Gruppo secondario"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Mostra bandiere nell'applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Mostra le bandiere nell'applet per indicare la disposizione corrente"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Mostra i nomi di disposizione invece dei nomi di gruppo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Mostra i nomi di disposizione invece dei nomi di gruppo (solo per versioni "
-"di XFree che supportano disposizioni multiple)"
+msgstr "Mostra i nomi di disposizione invece dei nomi di gruppo (solo per versioni di XFree che supportano disposizioni multiple)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Carica elementi di configurazione extra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Carica disposizioni e opzioni usate raramente"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
+msgstr "Sopprime il messaggio di avvertimento \"configurazione di sistema di X cambiata\""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
 msgstr ""
-"Sopprime il messaggio di avvertimento \"configurazione di sistema di X "
-"cambiata\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "L'anteprima di tastiera, offset orizzontale"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "L'anteprima di tastiera, offset verticale"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "L'anteprima di tastiera, altezza"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "L'anteprima di tastiera, larghezza"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Il colore di sfondo"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Il colore di sfondo per il selettore della disposizione"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "La famiglia del carattere"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "L'anteprima di tastiera, altezza"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "La famiglia del carattere per l'indicatore della disposizione"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Gruppo secondario"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "La dimensione del carattere"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "La dimensione del carattere per l'indicatore della disposizione"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Il colore di primo piano"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Il colore di primo piano per l'indicatore della disposizione"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La lista dei plugin di Indicatore tastiera abilitati"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "Disposizione tastiera"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "Modello tastiera"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Il colore di sfondo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "Elenco file modmap"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Disposizione tastiera"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Attivare altri plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Plugin attivi:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Chiude il dialogo"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Configura il plugin selezionato"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Disattiva il plugin selezionato"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Decrementa la priorità del plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Incrementa la priorità del plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Plugin di Indicatore tastera"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "L'elenco dei plugin attivi"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Aggiunta plugin"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Plugin _disponibili:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Nessuna descrizione."
-
-# MATE-2-24
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Impossibile aprire il file del manuale"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Inizializzazione di MateConf fallita: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Abilita/Disabilita i plugin installati"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Plugin di Indicatore tastiera"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Test indicatore tastiera (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indicatore:"
diff --git a/po/ja.po b/po/ja.po
index dc80cc1..50a32da 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,297 +1,214 @@
-# libmatekbd ja.po.
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the 'libmatekbd' package.
-# Takeshi AIHANA <[email protected]>, 2007,2008.
-# Takayuki KUSANO <[email protected]>, 2009-2010.
-# Hideki Yamane (Debian-JP) <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Hideki Yamane <[email protected]>, 2010
+# Takeshi AIHANA <[email protected]>, 2007, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-09-17 20:48+0000\n"
-"PO-Revision-Date: 2010-08-23 00:59+0900\n"
-"Last-Translator: Hideki Yamane (Debian-JP) <[email protected]>\n"
-"Language-Team: Japanese <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Japanese (http://www.transifex.com/mate/MATE/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "イメージを読み込む際にエラーが発生しました: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:720 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB の初期化エラー"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"キーボードのレイアウト \"%s\"\n"
-"Copyright &#169; X.Org Foundation と XKeyboardConfig の貢献者\n"
-"ライセンスに関してはパッケージ内のメタデータを参照のこと"
+msgstr "キーボードのレイアウト \"%s\"\nCopyright &#169; X.Org Foundation と XKeyboardConfig の貢献者\nライセンスに関してはパッケージ内のメタデータを参照のこと"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "キーボードのレイアウト \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "レイアウト \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "オプション \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "型式 \"%s\"、%s と %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "レイアウトなし"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "オプションなし"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "キーボードの型式"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "現在利用しているキーボードの型式です。"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "キーボードのレイアウト"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "現在利用しているキーボードのレイアウトです。"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "キーボードのオプション"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "キーボードの更新ハンドラ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"キーボードの状態が変更された時に実行するスクリプト集です。これらのスクリプト"
-"は xmodmap による調整結果をもう一度適用する際に便利です。"
+msgstr "キーボードの状態が変更された時に実行するスクリプト集です。これらのスクリプトは xmodmap による調整結果をもう一度適用する際に便利です。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ファイルの並び"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME フォルダで利用可能な modmap ファイルの並びです。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "(ウィンドウの生成時に割り当てられる) デフォルトのグループ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ウィンドウ毎に別々のグループで管理する"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "キーボードの更新ハンドラ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "キーボードのレイアウト"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "キーボードの型式"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "キーボードのオプション"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "変わった、めったに使われないレイアウトやオプションを読み込む"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "追加の(extra)設定アイテムを読み込む"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "保存/復帰のインジケータをレイアウトのグループにまとめる"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "二番目のグループ"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "アプレットの中に国旗を表示するかどうか"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-"アプレットの中に現在のキーボード・レイアウトを表す国旗を表示するかどうかで"
-"す。"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "グループ名ではなくレイアウト名を表示する"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"グループ名ではなくレイアウト名を表示します (複数のレイアウトを同時にサポート"
-"できる XFree のバージョンのみ利用できます)。"
+msgstr "グループ名ではなくレイアウト名を表示します (複数のレイアウトを同時にサポートできる XFree のバージョンのみ利用できます)。"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "追加の(extra)設定アイテムを読み込む"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "変わった、めったに使われないレイアウトやオプションを読み込む"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"Xのシステム規模の設定変更\" に対する警告メッセージを表示しない"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "キーボード・プレビューを表示する位置 (X座標)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "キーボード・プレビューを表示する位置 (Y座標)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "キーボード・プレビューの高さ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "キーボード・プレビューの幅"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "背景色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "レイアウト・インジケータの背景色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "フォントファミリ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "キーボード・プレビューの高さ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "レイアウト・インジケータのフォントファミリ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "二番目のグループ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "フォントサイズ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "レイアウト・インジケータのフォントサイズ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "前景色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "レイアウト・インジケータの前景色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "利用可能なキーボード表示器のプラグインのリスト"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "現在利用しているキーボードのレイアウトです。"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "現在利用しているキーボードの型式です。"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "背景色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap ファイルの並び"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "キーボードのレイアウト"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "プラグインを追加します"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "有効なプラグイン(_P):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "このダイアログを閉じます"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "選択したプラグインを設定します"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "選択したプラグインを削除して無効にします"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "プラグインの優先度を下げます"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "プラグインの優先度を上げます"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "キーボード・インジケータのプラグイン"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "有効になっているプラグインの一覧です"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "プラグインの追加"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "利用可能なプラグイン(_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "説明なし"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "ヘルプを表示できません"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf の初期化に失敗しました: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "インストール済みのプラグインを設定します"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "キーボード・インジケータのプラグイン"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "キーボード・インジケータのテスト (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "インジケータ:"
diff --git a/po/ka.po b/po/ka.po
index 649833d..e0d8141 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,233 +1,213 @@
-# translation of ka.po to Georgian
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Vladimer Sichinava ვლადიმერ სიჭინავა <[email protected]>, 2007.
+# 
+# Translators:
+# Vladimer Sichinava ვლადიმერ სიჭინავა <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: ka\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-16 15:30+0200\n"
-"PO-Revision-Date: 2007-09-16 16:10+0200\n"
-"Last-Translator: Vladimer Sichinava ვლადიმერ სიჭინავა <[email protected]>\n"
-"Language-Team: Georgian <http://mail.gnome.org/mailman/listinfo/mate-ge-list>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Georgian (http://www.transifex.com/mate/MATE/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:618
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "შეცდომა პიქტოგრამის ჩატვირთვისას: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-ს ინიციალიზაციის შეცდომა"
 
-#: ../libmatekbd/matekbd-indicator-config.c:163
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "შეცდომა პიქტოგრამის ჩატვირთვისას: %s"
+msgid ""
+"Keyboard layout \"%s\"\n"
+"Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
+"For licensing see package metadata"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
+#, c-format
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:798
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "განლაგება \"%s\""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:815
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "პარამეტრი \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:823
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "მოდელი \"%s\", %s და %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:824
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "არავითარი განლაგება"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:825
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "არავითარი პარამეტრები"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
-msgid "A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"სკრიპტების კოლექცია, რომელიც გამოიყენება კლავიატურის ხელახალი გამართვისას. "
-"გამოიყენება xmodmap-ში ცვლილების შეტანისას"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "A list of modmap files available in the $HOME directory."
-msgstr "modmap ფაილების სია $HOME დასტაში."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "Default group, assigned on window creation"
-msgstr "ნაგულისხმევი ჯგუფი, ფანჯრის შექმნისას"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "Keep and manage separate group per window"
-msgstr "ფანჯრების მიხედვით, სხვადასხვა ჯგუფების მხარდაჭერა დამახსოვრება"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "კლავიატურის მოდელი"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "კლავიატურის განახლება"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "კლავიატურის მოდელი"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "კლავიატურის განლაგება"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "კლავიატურის მოდელი"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "კლავიატურის განლაგება"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "კლავიატურის პარამეტრები"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Keyboard settings in mateconf will be overridden from the system ASAP (deprecated)"
-msgstr "კლავიატურის mateconf პარამეტრების მაგივრად ASAP-ის გამოყენება (მოძველებულია)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "კლავიატურის განახლება"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Save/restore indicators together with layout groups"
-msgstr "ინდიკატორების ჯგუფთან ერთად შენახვა/აღდგენა"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr "სკრიპტების კოლექცია, რომელიც გამოიყენება კლავიატურის ხელახალი გამართვისას. გამოიყენება xmodmap-ში ცვლილების შეტანისას"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Secondary groups"
-msgstr "მეორადი ჯგუფები"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ფაილების სია"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
+msgstr "modmap ფაილების სია $HOME დასტაში."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
+msgstr "ნაგულისხმევი ჯგუფი, ფანჯრის შექმნისას"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet"
-msgstr "დროშის ჩვენება"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
+msgstr "ფანჯრების მიხედვით, სხვადასხვა ჯგუფების მხარდაჭერა დამახსოვრება"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "განლაგების აღსაღნიშნად ქვეყნის დროშების გამოჩენა"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
+msgid "Save/restore indicators together with layout groups"
+msgstr "ინდიკატორების ჯგუფთან ერთად შენახვა/აღდგენა"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "ჯგუფის სახელების მაგივრად სახელწოდებების ჩვენება"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
-msgid "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
 msgstr "განლაგებების ჯგუფის სახელების მაგივრად სახელწოდებების ჩვენება (მხოლოდ იმ XFree ვერსიებისთვის, რომელთაც მულტი განლაგებების მხარდაჭერა გააჩნიათ)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "გაფრთხილების შეტყობინება \"X სისტემური კონფოგურაცია შეიცვალა\" მოშორება"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "გადავხედოთ კლავიატურას, X ღერძზე"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "გადავხედოთ კლავიატურას, Y ღერძზე"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
-msgid "The Keyboard Preview, height"
-msgstr "გადავხედოთ კლავიატურას, სიმაღლე"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "გადავხედოთ კლავიატურას, სიგანე"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "კლავიატურის ინდიკატორში აქტიური მოდულების სია"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "Very soon, keyboard settings in mateconf will be overridden (from the system configuration) This key has been deprecated since MATE 2.12, please unset the model, layouts and options keys to get the default system configuration."
-msgstr ""
-"მალე mateconf-ის კლავიატურის პარამეტრები სისტემურზე შეიცვლება. მოცემული გასაღები "
-"მოძველებულად ითვლება MATE 2.12 ვერსიის დროიდან. სისტემური კონფიგურაციის "
-"გამოსაყენებლად გთხოვთ მოაშოროთ კლავიატურის მოდელი, განლაგებები და კლავიატურის პრამეტრები."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "კლავიატურის განლაგება"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "კლავიატურის მოდელი"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap ფაილების სია"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
-msgstr "მოდულების ჩართვა"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
-msgstr "აქტიური _მოდულები:"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
-msgstr "მოდულის დამატება"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
-msgstr "დიალოგის დახურვა"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
-msgstr "არჩეული მოდულის გამართვა"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
-msgstr "არჩეული მოდულის გათიშვა"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
-msgstr "მოდულის პრიორიტეტის შემცირება"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "გადავხედოთ კლავიატურას, სიმაღლე"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr "მოდულის პრიორიტეტის გაზრდა"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "მეორადი ჯგუფები"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
-msgstr "კლავიატურის ინდიკატორის მოდულები"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
-msgstr "აქტიური მოდულების სია"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
-msgstr "ხელ_მისაწვდომი მოდული:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:117
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "არავითარი აღწერილობა."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:326
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "ვერ მოხერხდა ინიცირება – MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "დაყენებული მოდულების ჩართვა/გამორთვა"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "კლავიატურის ინდიკატორის მოდულები"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:59
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "კლავიატურის ინდიკატორის ტესტი (%s)"
 
-#: ../test/matekbd-indicator-test.c:68
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "ინდიკატორი:"
-
diff --git a/po/kn.po b/po/kn.po
index b4d21a6..11246c1 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,249 +1,213 @@
-# translation of libmatekbd.master.kn.po to Kannada
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Shankar Prasad <[email protected]>, 2009.
+# 
+# Translators:
+# shankar <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master.kn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-09-20 13:57+0530\n"
-"Last-Translator: Shankar Prasad <[email protected]>\n"
-"Language-Team: Kannada <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Kannada (http://www.transifex.com/mate/MATE/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"ಕೀಲಿ ಮಣೆ ವಿನ್ಯಾಸ \"%s\"\n"
-"ಹಕ್ಕು &#169; X.Org ಫೌಂಡೇಶನ್ ಹಾಗು XKeyboardConfig ಸಹಾಯಕರು\n"
-"ಲೈಸೆನ್ಸಿಂಗ್ ಬಗೆಗಿನ ಮಾಹಿತಿಗಾಗಿ ಪ್ಯಾಕೇಜಿನ ಮೆಟಾಡಾಟವನ್ನು ನೋಡಿ"
+msgstr "ಕೀಲಿ ಮಣೆ ವಿನ್ಯಾಸ \"%s\"\nಹಕ್ಕು &#169; X.Org ಫೌಂಡೇಶನ್ ಹಾಗು XKeyboardConfig ಸಹಾಯಕರು\nಲೈಸೆನ್ಸಿಂಗ್ ಬಗೆಗಿನ ಮಾಹಿತಿಗಾಗಿ ಪ್ಯಾಕೇಜಿನ ಮೆಟಾಡಾಟವನ್ನು ನೋಡಿ"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
-msgstr[0] "ವಿನ್ಯಾಸ \"%s\""
-msgstr[1] "ವಿನ್ಯಾಸಗಳು \"%s\""
+msgstr[0] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
-msgstr[0] "ಆಯ್ಕೆ \"%s\""
-msgstr[1] "ಆಯ್ಕೆಗಳು \"%s\""
+msgstr[0] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "ಮಾದರಿ \"%s\", %s ಹಾಗು %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ಯಾವುದೆ ವಿನ್ಯಾಸವಿಲ್ಲ"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ಯಾವುದೆ ಆಯ್ಕೆ ಇಲ್ಲ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "ಕೀಲಮಣೆ ಮಾದರಿ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "ಕೀಲಮಣೆ ಮಾದರಿ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "ಕೀಲಮಣೆ ವಿನ್ಯಾಸ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "ಕೀಲಮಣೆ ವಿನ್ಯಾಸ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "ಕೀಲಮಣೆ ಆಯ್ಕೆಗಳು"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "ಕೀಲಿಮಣೆ ಅಪ್‌ಡೇಟ್ ಹ್ಯಾಂಡ್ಲರ್"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"ಕೀಲಿಮಣೆಯನ್ನು ಮರಳಿ ಲೋಡ್ ಮಾಡಿದಾಗ ಚಲಾಯಿಸಬೇಕಿರುವ ಸ್ಕ್ರಿಪ್ಟುಗಳು. xmodmap ಆಧರಿತವಾದ "
-"ಸರಿಪಡಿಸುವಿಕೆಗಳನ್ನು ಮರಳಿ ಅನ್ವಯಿಸಲು ಸಹಕಾರಿಯಾಗುತ್ತದೆ"
+msgstr "ಕೀಲಿಮಣೆಯನ್ನು ಮರಳಿ ಲೋಡ್ ಮಾಡಿದಾಗ ಚಲಾಯಿಸಬೇಕಿರುವ ಸ್ಕ್ರಿಪ್ಟುಗಳು. xmodmap ಆಧರಿತವಾದ ಸರಿಪಡಿಸುವಿಕೆಗಳನ್ನು ಮರಳಿ ಅನ್ವಯಿಸಲು ಸಹಕಾರಿಯಾಗುತ್ತದೆ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ಕಡತದ ಪಟ್ಟಿ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME ಕೋಶದಲ್ಲಿ ಲಭ್ಯವಿರುವ modmap ಕಡತಗಳ ಒಂದು ಪಟ್ಟಿ."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಗುಂಪು, ವಿಂಡೋ ನಿರ್ಮಾಣದಲ್ಲಿ ನಿಯೋಜಿಸಲಾಗಿದೆ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ಪ್ರತಿ ವಿಂಡೋಗಾಗಿ ಪ್ರತ್ಯೇಕ ಗುಂಪನ್ನು ಇರಿಸಿಕೊಳ್ಳಿ ಹಾಗು ನಿರ್ವಹಿಸಿ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "ಕೀಲಿಮಣೆ ಅಪ್‌ಡೇಟ್ ಹ್ಯಾಂಡ್ಲರ್"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "ಕೀಲಮಣೆ ವಿನ್ಯಾಸ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "ಕೀಲಮಣೆ ಮಾದರಿ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "ಕೀಲಮಣೆ ಆಯ್ಕೆಗಳು"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "ನವೀನ, ವಿರಳವಾಗಿ ಬಳಸಲಾದ ಲೇಔಟ್‌ಗಳನ್ನು ಹಾಗು ಆಯ್ಕೆಗಳನ್ನು ಲೋಡ್ ಮಾಡು"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "ಹೆಚ್ಚಿನ ಸಂರಚನಾ ಅಂಶಗಳನ್ನು ಲೋಡ್ ಮಾಡಿ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "ವಿನ್ಯಾಸ ಗುಂಪುಗಳೊಂದಿಗೆ ಸೂಚಕಗಳನ್ನು ಉಳಿಸು/ಮರಳಿ ಸ್ಥಾಪಿಸಿ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "ಅಪ್ರಮುಖವಾದ ಗುಂಪುಗಳು"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "ಆಪ್ಲೆಟ್‌ನಲ್ಲಿ ಗುರುತನ್ನು ತೋರಿಸು"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "ಪ್ರಸಕ್ತ ವಿನ್ಯಾಸವನ್ನು ಸೂಚಿಸಲು ಆಪ್ಲೆಟ್‌ನಲ್ಲಿ ಗುರುತನ್ನು ತೋರಿಸು"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "ಗುಂಪಿನ ಹೆಸರುಗಳ ಬದಲು ವಿನ್ಯಾಸದ ಹೆಸರುಗಳನ್ನು ತೋರಿಸು"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"ಗುಂಪಿನ ಹೆಸರುಗಳ ಬದಲು ವಿನ್ಯಾಸದ ಹೆಸರುಗಳನ್ನು ತೋರಿಸು (ಕೇವಲ XFree ಬೆಂಬಲವಿರುವ ಅನೇಕ "
-"ವಿನ್ಯಾಸಗಳಿಗಾಗಿನ ಆವೃತ್ತಿಗಾಗಿ ಮಾತ್ರ)"
+msgstr "ಗುಂಪಿನ ಹೆಸರುಗಳ ಬದಲು ವಿನ್ಯಾಸದ ಹೆಸರುಗಳನ್ನು ತೋರಿಸು (ಕೇವಲ XFree ಬೆಂಬಲವಿರುವ ಅನೇಕ ವಿನ್ಯಾಸಗಳಿಗಾಗಿನ ಆವೃತ್ತಿಗಾಗಿ ಮಾತ್ರ)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "ಹೆಚ್ಚಿನ ಸಂರಚನಾ ಅಂಶಗಳನ್ನು ಲೋಡ್ ಮಾಡಿ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "ನವೀನ, ವಿರಳವಾಗಿ ಬಳಸಲಾದ ಲೇಔಟ್‌ಗಳನ್ನು ಹಾಗು ಆಯ್ಕೆಗಳನ್ನು ಲೋಡ್ ಮಾಡು"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr " \"X sysconfig changed\" ಎಚ್ಚರಿಕೆ ಸಂದೇಶವನ್ನು ತಡೆಹಿಡಿ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "ಕೀಲಿಮಣೆ ಮುನ್ನೋಟ, X ಆಫ್‌ಸೆಟ್"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "ಕೀಲಿಮಣೆ ಮುನ್ನೋಟ, Y ಆಫ್‌ಸೆಟ್"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "ಕೀಲಿಮಣೆ ಮುನ್ನೋಟ, ಎತ್ತರ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "ಕೀಲಿಮಣೆ ಮುನ್ನೋಟ, ಅಗಲ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "ಶಕ್ತಗೊಳಿಸಲಾದ ಕೀಲಿಮಣೆ ಸೂಚಕ ಪ್ಲಗ್‌ಇನ್‌ಗಳ ಪಟ್ಟಿ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "ಕೀಲಮಣೆ ವಿನ್ಯಾಸ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "ಕೀಲಮಣೆ ಮಾದರಿ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap ಕಡತದ ಪಟ್ಟಿ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "ಇನ್ನಷ್ಟು ಪ್ಲಗ್‌ ಇನ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "ಸಕ್ರಿಯ ಪ್ಲಗ್‌ಇನ್‌ಗಳು(_p):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ಸಂವಾದವನ್ನು ಮುಚ್ಚು"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಪ್ಲಗ್‌ಇನ್ ಅನ್ನು ಸಂರಚಿಸು"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಪ್ಲಗ್‌ಇನ್ ಅನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "ಪ್ಲಗ್‌ಇನ್ ಆದ್ಯತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡು"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "ಪ್ಲಗ್‌ಇನ್ ಆದ್ಯತೆಯನ್ನು ಹೆಚ್ಚು ಮಾಡು"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "ಕೀಲಿಮಣೆ ಸೂಚಕ ಪ್ಲಗ್‌ಇನ್‌ಗಳು"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "ಕೀಲಿಮಣೆ ಮುನ್ನೋಟ, ಎತ್ತರ"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "ಸಕ್ರಿಯ ಪ್ಲಗ್‌ಇನ್‌ಗಳ ಪಟ್ಟಿ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "ಅಪ್ರಮುಖವಾದ ಗುಂಪುಗಳು"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "ಪ್ಲಗ್‌ಇನ್‌ ಅನ್ನು ಸೇರಿಸು"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "ಲಭ್ಯವಿರುವ ಪ್ಲಗ್‌ಇನ್‌ಗಳು(_A):"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "ಯಾವುದೆ ವಿವರಣೆ ಇಲ್ಲ."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "ನೆರವಿನ ಕಡತವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf ಅನ್ನು init ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ಲಗ್‌ಇನ್‌ಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು/ಅಶಕ್ತಗೊಳಿಸು"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "ಕೀಲಿಮಣೆ ಸೂಚಕ ಪ್ಲಗ್‌ಇನ್‌ಗಳು"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "ಕೀಲಿಮಣೆ ಸೂಚಕ ಪರೀಕ್ಷೆ (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "ಸೂಚಕ:"
-
diff --git a/po/ko.po b/po/ko.po
index 2cec638..fea62c3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,30 +4,31 @@
 # 
 # Translators:
 # Changwoo Ryu <[email protected]>, 2007-2010
+# 박정규(Jung Kyu Park) <[email protected]>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-02-27 14:13+0000\n"
-"Last-Translator: Darkcircle <[email protected]>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/MATE/language/ko/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-27 21:36+0000\n"
+"Last-Translator: 박정규(Jung Kyu Park) <[email protected]>\n"
+"Language-Team: Korean (http://www.transifex.com/mate/MATE/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "그림을 읽어들이는 데 오류가 발생했습니다: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB 초기화 오류"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -35,248 +36,174 @@ msgid ""
 "For licensing see package metadata"
 msgstr "키보드 배치 \"%s\"\nCopyright &#169; X.Org Foundation and XKeyboardConfig contributors\nFor licensing see package metadata"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "\"%s\" 키보드 배치"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "배치 \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "옵션 \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "모델 \"%s\", %s 및 %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "배치 없음"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "옵션 없음"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "키보드 모델"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "키보드 모델"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "키보드 배치"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "키보드 배치"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "키보드 옵션"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "키보드 업데이트 핸들러"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "키보드 상태를 다시 읽어들였을 때마다 실행할 스크립트 모음. xmodmap 기반으로 조정하는 부분을 다시 적용할 때 좋습니다."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap 파일 목록"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME 디렉터리에 사용할 수 있는 modmap 파일의 목록."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "기본 그룹, 창을 만들 때 할당"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "창마다 별도의 그룹을 유지 및 관리"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "알림 기능을 키보드 배치 그룹과 같이 저장/복구"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "그룹 이름이 아니라 키보드 배치 이름 표시"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "그룹 이름 대신에 키보드 배치 이름을 표시(키보드 배치 여러 개 동시 사용을 지원하는 XFree 버전의 경우에만 해당)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "추가 설정 항목 읽어들이기"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "거의 사용하지 않는 희한한 키보드 배치와 옵션 읽어들이기"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X 시스템 설정 바뀜\" 경고 메시지 표시하지 않기"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "키보드 표시기 트레이 아이콘 사용 불가 허용하기 "
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "키보드 LED 표시기 보이기"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "키보드 미리 보기, 가로 오프셋"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "키보드 미리 보기, 세로 오프셋"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "키보드 미리 보기, 너비"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "키보드 미리 보기, 높이"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "다른 그룹"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "애플릿에 깃발 표시"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "애플릿에 현재 키보드 배치를 나타내는 깃발 표시"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "글꼴 계열"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "글꼴"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "키보드 배치 창의 글꼴 계열"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "글꼴 크기"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "키보드 배치 창의 글꼴 크기"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "레이아웃 표시기에 사용할 글꼴. \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\" format 규정을 준수해야 합니다."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "전경 색"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "키보드 배치 창의 글꼴 전경 색"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "레이아웃 표시기 전경에 사용될 색. \"R G B\" format, for example \"255 0 0\" 규정을 준수해야 합니다."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "배경 색"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "키보드 배치 창의 배경 색"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "사용 중인 키보드 알림 플러그인 목록"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "레이아웃 표시기 배경에 사용될 색. \"R G B\" format, for example \"255 0 0\" 규정을 준수해야 합니다."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "키보드 배치"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "키보드 알림 플러그인"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "활성화한 플러그인(_P):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "활성화한 플러그인 목록"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "다른 플러그인 활성화"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "선택한 플러그인 활성화 해제"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "플러그인 우선 순위 높이기"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "플러그인 우선 순위 낮추기"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "선택한 플러그인 설정"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "대화 창 닫기"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "플러그인 추가"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "사용 가능한 플러그인(_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "설명 없음."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "도움말 파일을 열 수 없습니다"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf 초기화가 실패했습니다: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "키보드 알림 플러그인"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "설치한 플러그인 사용/해제"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/ky.po b/po/ky.po
index b1ed6b3..562718c 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -1,34 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # chingis, 2013
 # chingis, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
-"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-05-07 20:48+0000\n"
-"Last-Translator: chingis\n"
-"Language-Team: Kirgyz (http://www.transifex.com/projects/p/MATE/language/ky/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Kyrgyz (http://www.transifex.com/mate/MATE/language/ky/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr ""
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB'нин инициалдаштыруу катасы"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,248 +36,174 @@ msgid ""
 "For licensing see package metadata"
 msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Белгисиз"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "модели \"%s\", %s жана %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "раскладка жок"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "параметрлер жок"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Клавиатура модели"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "клавиатура модели"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Клавиатура раскладкасы"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "клавиатура раскладкасы"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap файл тизмеси"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr ""
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr ""
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Арип үй-бүлөсү"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Шрифт өлчөмү"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Алдыңкы пландын түсү"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Фон түсү"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Клавиатура раскладкасы"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Клавиатура индикаторунун плагиндери"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Активдүү _плагиндер:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Активдүү плагиндердин тизмеси"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Дагы плагиндерди күйгүзүү"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Тандалган плагинди өчүрүү"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Плагиндин приоритетин чоңойтуу"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Плагиндин приоритетин кичирейтүү"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Тандалган плагинди ырастоо"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Диалогду жабуу"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Плагинди кошуу"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Жеткиликтүү плагиндер:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Баяндамасы жок."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Жардам файлын ачуу оңунан чыккан жок."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr ""
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Клавиатура индикаторунун плагиндери"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Орнотулган плагиндерди күйгүзүү/өчүрүү"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/lt.po b/po/lt.po
index 57d3901..708132c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,30 +6,31 @@
 # Džiugas Grėbliūnas <[email protected]>, 2014
 # Gintautas Miliauskas <[email protected]>, 2007, 2008
 # brennus <[email protected]>, 2014
+# Moo, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-09-21 21:05+0000\n"
-"Last-Translator: Džiugas Grėbliūnas <[email protected]>\n"
-"Language-Team: Lithuanian (http://www.transifex.com/projects/p/MATE/language/lt/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-21 18:15+0000\n"
+"Last-Translator: Moo\n"
+"Language-Team: Lithuanian (http://www.transifex.com/mate/MATE/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Įvyko klaida įkeliant paveikslėlį: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB inicializavimo klaida"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,16 +38,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Klaviatūros išdėstymas \"%s\"\nAutorinės teisės &#169; X.Org Foundation ir XKeyboardConfig kontributoriai\nLicencija paketo metaduomenyse"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Klaviatūros išdėstymas \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -54,7 +55,7 @@ msgstr[0] "išdėstymas \"%s\""
 msgstr[1] "išdėstymai \"%s\""
 msgstr[2] "išdėstymai \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -62,227 +63,153 @@ msgstr[0] "parinktis \"%s\""
 msgstr[1] "parinktys \"%s\""
 msgstr[2] "parinktys \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelis \"%s\", %s ir %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "nėra išdėstymo"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "nėra parinkčių"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Klaviatūros modelis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "klaviatūros modelis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Klaviatūros išdėstymas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "klaviatūros išdėstymas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Klaviatūros parinktys"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Klaviatūros atnaujinimo valdikliai"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Scenarijų, įvykdomų klaviatūros būsenai pasikeitus, rinkinys. Naudingas xmodmap pagrįstiems pataisymams."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap failų sąrašas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Modmap failų $HOME aplanke sąrašas."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Standartinė grupė, priskiriama naujiems langams"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Valdyti grupes kiekvienam langui atskirai"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Įrašymo/skaitymo indikatoriai kartu su išdėstymo grupėmis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Rodyti išdėstymų vardus vietoje grupių vardų"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Rodyti išdėstymų vardus vietoje grupių vardų (tik XFree versijoms, palaikančioms kelis išdėstymus)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Įkelti papildomus konfigūracijos elementus"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Įkelti retus išdėstymus ir parinktis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Išjungti \"X sistemos konfigūracija pasikeitė\" įspėjimo pranešimą"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Klaviatūros vaizdas, X poslinkis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Klaviatūros vaizdas, Y poslinkis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Klaviatūros vaizdas, plotis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Klaviatūros vaizdas, aukštis"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Antrinės grupės"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Rodyti savybes įtaise"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Rodyti savybes, rodančias pasirinktą išdėstymą, įtaise"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Šrifto šeima"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Išdėstymo indikatoriaus šrifto šeima"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Šrifto dydis"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Šriftas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Išdėstymo indikatoriaus šrifto dydis"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Priekinio plano spalva"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Išdėstymo indikatoriaus priekinio plano spalva"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Fono spalva"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Išdėstymo indikatoriaus fono spalva"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Įjungtų klaviatūros indikatoriaus įskiepių sąrašas"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Klaviatūros išdėstymas"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Klaviatūros indikatoriaus įskiepiai"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktyvūs į_skiepiai:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Aktyvių įskiepių sąrašas"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Įjungti daugiau įskiepių"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Atjungti pažymėtą įskiepį"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Padidinti įskiepio prioritetą"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Sumažinti įskiepio prioritetą"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Konfigūruoti pasirinktą įskiepį"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Užverti dialogą"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Pridėti įskiepį"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Įs_kiepiai:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Aprašymo nėra."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nepavyko atverti žinyno failo"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Nepavyko paleisti MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Klaviatūros indikatoriaus įskiepiai"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Įjungti/išjungti įdiegtus įskiepius"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/lv.po b/po/lv.po
index 4410155..c5608cc 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,46 +1,52 @@
-# translation of lv.po to Latvian
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Raivis Dejus <[email protected]>, 2009.
-# Peteris Krisjanis <[email protected]>, 2010.
+# 
+# Translators:
+# Imants Liepiņš <[email protected]>, 2012
+# Pēteris Krišjānis <[email protected]>, 2010
+# Raivis Dejus <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-04-21 21:03+0000\n"
-"PO-Revision-Date: 2010-04-26 11:57+0300\n"
-"Last-Translator: Peteris Krisjanis <[email protected]>\n"
-"Language-Team: Latviešu <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Latvian (http://www.transifex.com/mate/MATE/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:311
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Gadījās kļūda ielādējot attēlu: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:639
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB inicializācijas kļūda"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2403
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Tastatūras izkārtojums \"%s\"\n"
-"Autortiesības &#169; X.Org Fonds un XKeyboardConfig komanda\n"
-"Licences informācija pieejama pakotnes metadatos"
+msgstr "Tastatūras izkārtojums \"%s\"\nAutortiesības &#169; X.Org Fonds un XKeyboardConfig komanda\nLicences informācija pieejama pakotnes metadatos"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr "Nezināms"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
+#, c-format
+msgid "Keyboard Layout \"%s\""
+msgstr "Tastatūras izkārtojums \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:754
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -48,7 +54,7 @@ msgstr[0] "izkārtojums \"%s\""
 msgstr[1] "izkārtojumi \"%s\""
 msgstr[2] "izkārtojumi \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:773
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -56,233 +62,158 @@ msgstr[0] "iespēja \"%s\""
 msgstr[1] "iespējas \"%s\""
 msgstr[2] "iespējas \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelis \"%s\", %s un %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:782
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "nav izkārtojuma"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:783
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "nav iespēju"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Tastatūras modelis"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "tastatūras modelis"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Tastatūras izkārtojums"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "tastatūras izkārtojums"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Tastatūras iespējas"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Tastatūras atjauninājumu apdarinātāji"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Skriptu kolekcija palaišanai kad vien tastatūras stāvoklis ir pārlādēts. "
-"Noderīgs xmodmap bāzētu iestatījumu pārlikšanai"
+msgstr "Skriptu kolekcija palaišanai kad vien tastatūras stāvoklis ir pārlādēts. Noderīgs xmodmap bāzētu iestatījumu pārlikšanai"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap failu saraksts"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME direktorijā pieejamo modmap failu saraksts."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Noklusētā grupa, ko piesaista loga veidošanai"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Uzturēt un pārvaldīt atsevišķas grupas katram logam"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Tastatūras atjauninājumu apdarinātāji"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Tastatūras izkārtojums"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Tastatūras modelis"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Tastatūras iespējas"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Ielādēt eksotiskus, reti izmantotus izkārtojumus un opcijas"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Ielādēt papildus konfigurācijas vienības"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Saglabāt/atjaunot indikatorus kopā ar izkārtojuma grupām"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Sekundārās grupas"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Rādīt karogus sīklietotnē"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Rādīt karogus sīklietotnē, lai norādītu pašreizējo izkārtojumu"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Grupu nosaukumu vietā rādīt izkārtojumu nosaukumus"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Grupu nosaukumu vietā rādīt izkārtojumu nosaukumus (XFree versijām, kas "
-"uztur vairākus izkārtojumus)"
+msgstr "Grupu nosaukumu vietā rādīt izkārtojumu nosaukumus (XFree versijām, kas uztur vairākus izkārtojumus)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Ielādēt papildus konfigurācijas vienības"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Ielādēt eksotiskus, reti izmantotus izkārtojumus un opcijas"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Aizliegt \"X sysconfig changed\" brīdinājuma paziņojumu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Tastatūras priekšskatījums, X nobīde"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Tastatūras priekšskatījums, Y nobīde"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Tastatūras priekšskatījums, augstums"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Tastatūras priekšskatījums, platums"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Fona krāsa"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Izkārtojuma indikatora fona krāsa"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Fonta ģimene"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Tastatūras priekšskatījums, augstums"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Izkārtojuma indikatora fonta ģimene"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekundārās grupas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Fonta izmērs"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Izkārtojuma indikatora fonta izmērs"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Priekšplāna krāsa"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Izkārtojuma indikatora priekšplāna krāsa"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Tastatūras indikatora aktivizēto spraudņu saraksts"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "tastatūras izkārtojums"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "tastatūras modelis"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap failu saraksts"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktivizēt vairāk spraudņus"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktīvie s_praudņi:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Aizvērt logu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Konfigurēt izvēlēto spraudni"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deaktivizēt izvēlēto spraudni"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Samazināt spraudņa prioritāti"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Palielināt spraudņa prioritāti"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Tastatūras indikatora spraudņi"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Aktīvo spraudņu saraksts"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Pievienot spraudni"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Pieej_amie spraudņi:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Nav apraksta."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Neizdevās atvērt palīdzības failu"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Neizdevās inicializēt MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Fona krāsa"
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Aktivizēt/deaktivizēt instalētos spraudņus"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Tastatūras indikatora spraudņi"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr "Tastatūras izkārtojums"
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Tastatūras indikatora pārbaude (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikators:"
-
diff --git a/po/mai.po b/po/mai.po
index 5d49ae8..f8912e7 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -1,245 +1,215 @@
-# translation of libmatekbd.master.po to Maithili
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Sangeeta Kumari <[email protected]>, 2009.
+# 
+# Translators:
+# Sangeeta Kumari <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-09-10 14:56+0000\n"
-"PO-Revision-Date: 2009-09-11 20:48+0530\n"
-"Last-Translator: Sangeeta Kumari <[email protected]>\n"
-"Language-Team: Maithili <maithili.sf.net>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Maithili (http://www.transifex.com/mate/MATE/language/mai/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: mai\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
-msgid ""
-"Keyboard layout \"%s\"\n"
-"Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
-"For licensing see package metadata"
+msgid "There was an error loading an image: %s"
 msgstr ""
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
+#, c-format
+msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
+msgstr "Keyboard layout \"%s\"\nCopyright &#169; X.Org Foundation and XKeyboardConfig contributors\nFor licensing see package metadata"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
 msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
+msgid "Keyboard Layout \"%s\""
 msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "लेआउट \"%s\""
 msgstr[1] "लेआउट \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "विकल्प \"%s\""
 msgstr[1] "विकल्प \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "मॉडल \"%s\", %s आओर %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "कोनो लेआउट नहि"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "कोनो विकल्प नहि"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
-msgid ""
-"A collection of scripts to run whenever the keyboard state is reloaded. "
-"Useful for re-applying xmodmap based adjustments"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "A list of modmap files available in the $HOME directory."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "Default group, assigned on window creation"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "Keep and manage separate group per window"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "द्वितीयक समूह"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "एप्लेटमे फ्लैग देखाबू"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "वर्तमान लेआउटकेँ सूचित करब लेल एप्लेटमे फ्लैग देखाबू"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
-msgid "Suppress the \"X sysconfig changed\" warning message"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
-msgid "The Keyboard Preview, X offset"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
-msgid "The Keyboard Preview, Y offset"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
+msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "The Keyboard Preview, width"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "कीबोर्ड सूचक प्लगिन सक्रिय कएल गेल क' सूची"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
+msgid "The Keyboard Preview, X offset"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
+msgid "The Keyboard Preview, Y offset"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
+msgid "The Keyboard Preview, width"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "बेसी प्लगिन सक्रिय करू"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "सक्रिय प्लगिनः (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "समाद बन्न करू"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "चयनित प्लगिन विन्यस्त करू"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "चयनित प्लगिन निष्क्रिय करू"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "प्लगिन प्राथमिकता घटाबू"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "प्लगिन प्राथमिकता बढ़ाउ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "कीबोर्ड सूचक प्लगिन"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "सक्रिय प्लगिन क' सूची"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "द्वितीयक समूह"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "प्लगिन जोड़ू"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "उपलब्ध प्लगिनः (_A)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "कोनो वर्णन नहि."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "जी-कॉन्फ़ प्रारंभ करबामे असफल: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "संस्थापित प्लगिन सक्रिय/निष्क्रिय करू"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "कीबोर्ड सूचक प्लगिन"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "कीबोर्ड सूचक जाँच (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "सूचक: "
-
diff --git a/po/mk.po b/po/mk.po
index 4d4c05f..d3c7dd1 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,262 +1,216 @@
-# translation of mk.po to Macedonian
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Jovan Naumovski <[email protected]>, 2007.
-# Arangel Angov <[email protected]>, 2008.
+# 
+# Translators:
+# Arangel Angov <[email protected]>, 2008
+# Jovan Naumovski <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mk\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-14 19:56+0000\n"
-"PO-Revision-Date: 2008-02-23 19:47+0100\n"
-"Last-Translator: Arangel Angov <[email protected]>\n"
-"Language-Team: Macedonian <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Macedonian (http://www.transifex.com/mate/MATE/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2383
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "Имаше грешка во вчитувањето на слика: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "Грешка во иницијализацијата на XKB"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Распоред на тастатура \"%s\"\n"
-"Авторски права &#169; X.Org Foundation и придонесувачите во XKeyboardConfig\n"
-"За лиценцата проверете ги мета податоците за пакетот"
+msgstr "Распоред на тастатура \"%s\"\nАвторски права &#169; X.Org Foundation и придонесувачите во XKeyboardConfig\nЗа лиценцата проверете ги мета податоците за пакетот"
 
-#: ../libmatekbd/matekbd-indicator.c:617
-msgid "XKB initialization error"
-msgstr "Грешка во иницијализацијата на XKB"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "Имаше грешка во вчитувањето на слика: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:751
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
-msgstr[0] "распореди „%s“"
-msgstr[1] "распореди „%s“"
-msgstr[2] "распореди „%s“"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:770
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
-msgstr[0] "опција „%s“"
-msgstr[1] "опции „%s“"
-msgstr[2] "опции „%s“"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:778
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "модел „%s“, %s и %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "нема изглед"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "нема опции"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Модел на тастатура"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "модел на тастатура"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Распоред на тастатаура"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "распоред на тастатура"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Опции на тастатура"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Справувачи за ажурирање на тастатура"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Колекција од скрипти која ќе се изврши кога одново ќе се вчита состојбата на "
-"тастатурата. Корисно за повторно применување на прилагодувањата базирани "
-"наxmodmap"
+msgstr "Колекција од скрипти која ќе се изврши кога одново ќе се вчита состојбата на тастатурата. Корисно за повторно применување на прилагодувањата базирани наxmodmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "листа со modmap датотеки"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Листа на modmap датотеки достапни во $HOME директориумот."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Стандардна група, назначена за креирање на прозорци"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Чувај и управувај со посебна група по прозорец"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Справувачи за ажурирање на тастатура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Распоред на тастатаура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Модел на тастатура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Опции на тастатура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Зачувај/врати ги индикаторите заедно со групите за распоред"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Secondary groups"
-msgstr "Секундарни групи"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Show flags in the applet"
-msgstr "Покажи знамиња во аплетот"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Покажи знамиња во аплетот за означување ан тековниот распоред"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Покажи ги имињата на распоредот наместо имињата на групите"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
+msgstr "Покажи ги имињата на распоредот, наместо имињата на групите (само за верзии на XFree кои поддржуваат повеќе распореди)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
 msgstr ""
-"Покажи ги имињата на распоредот, наместо имињата на групите (само за верзии "
-"на XFree кои поддржуваат повеќе распореди)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Не ја покажувај пораката за предупредување „X sysconfig changed“"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Преглед на тастатурата, X оска"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Преглед на тастатурата, Y оска"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
-msgid "The Keyboard Preview, height"
-msgstr "Преглед на тастатурата, висина"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Преглед на тастатурата, широчина"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Листата на овозможени приклучоци за индикатор на тастатура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "keyboard layout"
-msgstr "распоред на тастатура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "keyboard model"
-msgstr "модел на тастатура"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "modmap file list"
-msgstr "листа со modmap датотеки"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
-msgstr "Активирај уште приклучоци"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
-msgstr "Активни _приклучоци:"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
-msgstr "Додај приклучок"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
-msgstr "Затвори го дијалог прозорецот"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
-msgstr "Конфигурирај го избраниот приклучок"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
-msgstr "Деактивирај го избраниот приклучок"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
-msgstr "Намали го приоритетот на приклучокот"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr "Зголеми го приоритетот на приклучокот"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Преглед на тастатурата, висина"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
-msgstr "Приклучоци за индикатор на тастатура"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Секундарни групи"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
-msgstr "Листата со активни приклучоци"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
-msgstr "_Достапни приклучоци:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:120
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Нема опис."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:254
-msgid "Unable to open help file"
-msgstr "Не можам да ја отворам датотеката со помош"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:354
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Не можам да го иницијализирам MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Овозможи/оневозможи инсталирани приклучоци"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Приклучоци за индикатор на тастатура"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:59
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Тест за индикаторот на тастатурата (%s)"
 
-#: ../test/matekbd-indicator-test.c:68
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Индикатор:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Поставувањата за тастатурата во mateconf ќе бидат надминати од системските, "
-#~ "што е можно поскоро (застарени)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Наскоро поставувањата на тастатурата ќе бидат надминати (од системската "
-#~ "конфигурација). Овој клуч беше запоставен дури од MATE 2.12 и Ве молам, "
-#~ "не ги поставувајте клучевите за моделот, распоредите и опциите за да ја "
-#~ "добиете стандардната системска конфигурација."
diff --git a/po/ml.po b/po/ml.po
index a5fb857..916aea5 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,249 +1,216 @@
-# translation of libmatekbd.master.ml.po to
-# Copyright (C) 2008 THE libmatekbd'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the libmatekbd package.
-# Santhosh Thottingal <[email protected]>, 2008.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Hari Vishnu <[email protected]>, 2008
+# Santhosh Thottingal <[email protected]>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master.ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-09-12 20:39+0530\n"
-"Last-Translator: \n"
-"Language-Team:  <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Malayalam (http://www.transifex.com/mate/MATE/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "ചിത്രം  %s ലോഡ് ചെയ്യുന്നതില്‍ പിശകു് പറ്റി"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB തുടങ്ങുന്നതില്‍ പിശകു്"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"കീബോര്‍ഡ് വിന്യാസം \"%s\"\n"
-"Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
-"For licensing see package metadata"
+msgstr "കീബോര്‍ഡ് വിന്യാസം \"%s\"\nCopyright &#169; X.Org Foundation and XKeyboardConfig contributors\nFor licensing see package metadata"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB തുടങ്ങുന്നതില്‍ പിശകു്"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "ചിത്രം  %s ലോഡ് ചെയ്യുന്നതില്‍ പിശകു് പറ്റി"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "വിന്യാസം \"%s\""
 msgstr[1] "വിന്യാസങ്ങള്‍ \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "ഐച്ഛികം \"%s\""
 msgstr[1] "ഐച്ഛികങ്ങള്‍ \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "മോഡല്‍ \"%s\", %s and %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "വിന്യാസം ലഭ്യമല്ല"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ഐച്ഛികങ്ങളില്ല"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "കീബോര്‍ഡ് മോഡല്‍"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "കീബോര്‍ഡ് മോഡല്‍"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "കീബോര്‍ഡ് വിന്യാസം"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "കീബോര്‍ഡ് വിന്യാസം"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "കീബോര്‍ഡ് ഐച്ഛികങ്ങള്‍"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "കീബോര്‍ഡ് അപ്ഡേറ്റ് ഹാന്‍ഡ്ലേഴ്സ്"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"കീബോര്‍ഡ് സ്ഥിതി റീലോഡ് ചെയ്യുംബോള്‍ പ്രവര്‍ത്തിപ്പിക്കേണ്ട സ്ക്രിപ്റ്റുകളുടെ പട്ടിക. xmodmap-ഇനെ "
-"അടിസ്ഥാനമാക്കിയുള്ള മാറ്റങ്ങള്‍ വീണ്ടും വരുത്താന്‍ സഹായകരമാണു്‌"
+msgstr "കീബോര്‍ഡ് സ്ഥിതി റീലോഡ് ചെയ്യുംബോള്‍ പ്രവര്‍ത്തിപ്പിക്കേണ്ട സ്ക്രിപ്റ്റുകളുടെ പട്ടിക. xmodmap-ഇനെ അടിസ്ഥാനമാക്കിയുള്ള മാറ്റങ്ങള്‍ വീണ്ടും വരുത്താന്‍ സഹായകരമാണു്‌"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "മോഡ്മാപ്പ് ഫയല്‍ പട്ടിക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME തട്ടിലെ മോഡ്മാപ്പ് ഫയലുകളുടെ പട്ടിക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "സ്വതേയുള്ള ഗ്രൂപ്പ്, ജാലകനിര്‍മ്മിതിയുടെ സമയത്തു് കൊടുത്തതു്"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ഓരോ ജാലകത്തിനും വെവ്വേറെ ഗ്രൂപ്പ് പാലിയ്ക്കുക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "കീബോര്‍ഡ് അപ്ഡേറ്റ് ഹാന്‍ഡ്ലേഴ്സ്"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "കീബോര്‍ഡ് വിന്യാസം"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "കീബോര്‍ഡ് മോഡല്‍"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "കീബോര്‍ഡ് ഐച്ഛികങ്ങള്‍"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "അപൂര്‍വമായുപയോഗിക്കുന്ന ശൈലികളും ഉപാധികളും ലഭ്യമാക്കുക"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "അധികമായ ക്രമീകരണ വസ്തുക്കള്‍ ലഭ്യമാക്കുക"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "വിന്യാസ കൂട്ടങ്ങള്‍ക്കൊപ്പം സൂചികകള്‍ സൂക്ഷിക്കുക/തിരികെ കൊണ്ടു വരുക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "ദ്വിതീയ ഗ്രൂപ്പുകള്‍"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "ലഘുപ്രയോഗത്തില്‍ പതാകകള്‍ കാണിയ്ക്കുക"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "ഇപ്പോളത്തെ വിന്യാസം കാണീയ്ക്കാന്‍  ലഘുപ്രയോഗത്തില്‍ പതാകകള്‍ കാണിയ്ക്കുക"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "ഗ്രൂപ്പ് പേരിനുപകരം വിന്യാസത്തിന്റെ പേരു് കാണിയ്ക്കുക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"കൂട്ട പേരുകള്‍ക്കു പകരം വിന്യാസം പേരു്‌ ഉപയോഗിക്കുക (ഒന്നിലേറെ വിന്യാസങ്ങള്‍ താങ്ങുന്ന XFree-യുടെ "
-"പതിപ്പുകള്‍ക്കു്‌ മാത്രം)"
+msgstr "കൂട്ട പേരുകള്‍ക്കു പകരം വിന്യാസം പേരു്‌ ഉപയോഗിക്കുക (ഒന്നിലേറെ വിന്യാസങ്ങള്‍ താങ്ങുന്ന XFree-യുടെ പതിപ്പുകള്‍ക്കു്‌ മാത്രം)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "അധികമായ ക്രമീകരണ വസ്തുക്കള്‍ ലഭ്യമാക്കുക"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "അപൂര്‍വമായുപയോഗിക്കുന്ന ശൈലികളും ഉപാധികളും ലഭ്യമാക്കുക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\"  മുന്നറിയിപ്പു സന്ദേശങ്ങള്‍ അടക്കിവെയ്ക്കുക"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "കീബോര്‍ഡ് തിരനോട്ടം, X offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "കീബോര്‍ഡ് തിരനോട്ടം, Y offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "കീബോര്‍ഡ് തിരനോട്ടം, ഉയരം"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "കീബോര്‍ഡ് തിരനോട്ടം, വീതി"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "കീബോര്‍ഡ് സൂചക പ്ലഗ്ഗിനുകളുടെ ലിസ്റ്റ്"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "കീബോര്‍ഡ് വിന്യാസം"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "കീബോര്‍ഡ് മോഡല്‍"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "മോഡ്മാപ്പ് ഫയല്‍ പട്ടിക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "കൂടുതല്‍ പ്ലഗ്ഗിനുകള്‍ സജ്ജമാക്കുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_പ്ലഗ്ഗിനുകള്‍ സജ്ജമാക്കുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ചെറുജാലകം അടയ്ക്കുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "തെരഞ്ഞെടുത്ത പ്ലഗ്ഗിന്‍ സജ്ജീകരിയ്ക്കുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "തെരഞ്ഞെടുത്ത പ്ലഗ്ഗിന്‍ വേണ്ടെന്നുവെയ്ക്കുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "പ്ലഗ്ഗിന്‍ പ്രയോറിറ്റി കുറയ്ക്കുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "പ്ലഗ്ഗിന്‍ പ്രയോറിറ്റി കൂട്ടുക"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "കീബോര്‍ഡ് സൂചക പ്ലഗ്ഗിനുകള്‍ "
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "കീബോര്‍ഡ് തിരനോട്ടം, ഉയരം"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "സജ്ജമായ പ്ലഗ്ഗിനുകളുടെ പട്ടിക"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "ദ്വിതീയ ഗ്രൂപ്പുകള്‍"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "പ്ലഗ്ഗിന്‍ ചേര്‍ക്കുക"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "ലഭ്യമായ പ്ലഗ്ഗിനുകള്‍"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "വിവരണമില്ല"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "സഹായ ഫയല്‍ തുറക്കാന്‍ കഴിയുന്നില്ല"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "തുടങ്ങാന്‍ സാധിച്ചില്ല ജി-കോണ്‍ഫ് :  %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ഇന്‍സ്റ്റാള്‍ ചെയ്ത സംയോജകങ്ങള്‍ പ്രാവര്‍ത്തികം/അപ്രാവര്‍ത്തികം ആക്കുക"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "കീബോര്‍ഡ് സൂചക പ്ലഗ്ഗിനുകള്‍ "
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "കീബോര്‍ഡ് സൂചക പരീക്ഷണം (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "സൂചകം"
-
diff --git a/po/mr.po b/po/mr.po
index 48557c1..c8f4186 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,26 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-06-01 05:13+0000\n"
-"Last-Translator: Vaibhav S Dalvi <[email protected]>\n"
-"Language-Team: Marathi (http://www.transifex.com/projects/p/MATE/language/mr/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Marathi (http://www.transifex.com/mate/MATE/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "प्रतिमा दाखल करतेवेळी त्रुटी: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB सुरू करतेवेळी त्रुटी"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +37,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "कळफलक मांडणी \"%s\"\nसर्वहक्काधीकर &#169; X.Org Foundation व XKeyboardConfig सहमभागी\nसंकुल मेटामाहिती करीता परवाना पहा"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "कळफलक मांडणी \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "मांडणी \"%s\""
 msgstr[1] "मांडणी \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "पर्याय \"%s\""
 msgstr[1] "पर्याय \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "प्रारूप \"%s\", %s व %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "मांडणी नाही"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "पर्याय नाही"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "कळफलक मॉडेल"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "कळफलक प्रारूप"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "कळफलक मांडणी"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "कळफलक मांडणी"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "कळफलक पर्याय"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "कळफलक अद्ययावत हातळणी"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "कळफलक स्थिती पुनःदाखल केल्यास चालविण्याजोगी लिपींचा संच. xmodmap आधारीत तडजोड पुनःवापरणी करीता फायदेशीर ठरते"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap फाइल यादी"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "modmap फाइलीची यादी $HOME संचयीकेमध्ये उपलब्ध आहे."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "चौकट निर्माण केल्यावर मुलभूत गटाची, नेमणूक केली जाते"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "प्रत्येक चौकटीकरीता स्वतंत्र गट ठेवा व नियंत्रीत करा"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "मांडणी गटासह सूचक संचयन/पुनःसंचयन करा"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "गटातील नावं ऐवजी मांडणीतील नावं दर्शवा"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "गटातील नावं ऐवजी मांडणीतील नावं दर्शवा (फक्त XFree बहु मांडणी समर्थीत आवृत्तीं करीता)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "अगाऊ संरचना घटके लोड करा"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "एक्जॉटीक, क्वचीत वापरलेली मांडणी व पर्याय लोड करा"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig बदलले\" सावधानता संदेश दुर्लक्ष करा"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "कळफलक पूर्वदृश्य, X ऑफसेट"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "कळफलक पूर्वदृश्य, Y ऑफसेट"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "कळफलक पूर्वदृश्य, रुंदी"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "कळफलक पूर्वदृश्य, उंची"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "दुय्यम गट"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "ऐपलेट मधील बाबी दर्शवा"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "सद्य मांडणी सूचीत करण्यासाठी ऐपलेटमधील बाबी दर्शवा"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "फॉन्ट परिवार"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "फॉन्ट आकार"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "शिर्षकाचे पृष्ठभूमी रंग"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "पार्श्वभूमी रंग"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "उपलब्ध कळफलक सूचक प्लगईनची यादी"
-
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "कळफलक मांडणी"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "कलफलक सूचक प्लगईन"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "सक्रीय प्लगईन (_p):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "सक्रीय प्लगईनची यादी"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "अधिक प्लगईन सक्रीय करा"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "निवडलेले प्लगईन सक्रीय करू नका"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "प्लगईनचे प्राधान्य वाढवा"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "प्लगईनचे प्राधान्य कमी करा"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "निवडलेल्या प्लगईनची संयोजन करा"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "संवाद बंद करा"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "प्लगईन जोडा"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "उपलब्ध प्लगईन (_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "वर्णन नाही."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "मदत फाइल उघडण्यास अपयशी"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf सुरू करण्यास अपयशी: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "कळफलक सूचक प्लगईन"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "प्रतिष्ठापीत प्लगईन कार्यान्वीत/अकार्यान्वीत करा"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/ms.po b/po/ms.po
index 35d1523..a3e6db2 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,32 +3,32 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# abuyop <[email protected]>, 2013
+# abuyop <[email protected]>, 2013,2015
 # Puretech <[email protected]>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2013-08-13 03:10+0000\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-30 21:29+0000\n"
 "Last-Translator: abuyop <[email protected]>\n"
-"Language-Team: Malay (http://www.transifex.com/projects/p/MATE/language/ms/)\n"
+"Language-Team: Malay (http://www.transifex.com/mate/MATE/language/ms/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Terdapat ralat memuatkan imej: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Ralat pengawalan XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,248 +36,174 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Bentangan papan kekunci \"%s\"\nHakcipta &#169; penyumbang X.Org Foundation dan XKeyboardConfig\nUntuk pelesenan lihat data meta pakej"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Bentangan Papan Kekunci \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "bentangan \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "pilihan \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s dan %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "tiada bentangan"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "tiada pilihan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Model papan kekunci"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "model papan kekunci"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Bentangan papan kekunci"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "bentangan papan kekunci"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Pilihan papan kekunci"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Pengendali Kemaskini Papan Kekunci"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Koleksi skrip untuk dijalankan bila keadaan papan kekunci dimuat semula. Berguna untuk melaksanakan semula pelarasan berasaskan xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "senarai fail modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Senarai fail modmap yang terdapat dalam direktori $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Kumpulan lalai, diumpuk pada penciptaan tetingkap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Jaga dan urus kumpulan berasingan per tetingkap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Simpan/pulih penunjuk bersama-sama dengan kumpulan bentangan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Tunjuk bentangan selain dari nama kumpulan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Tunjuk nama bentangan selain dari nama kumpulan (hanya untuk versi XFree yang menyokong bentangan berbilang)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Muatkan item konfigurasi tambahan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Muatkan bentangan dan pilihan eksotik dan yang jarang digunakan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Paksa mesej amaran  \"X sysconfig changed\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Benar pelumpuhan ikon talam penunjuk papan kekunci"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Tunjuk penunjuk led papan kekunci"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Pratonton Papan Kekunci, ofset X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Pratonton Papan Kekunci, ofset Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Pratonton Papan Kekunci, lebar"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Pratonton Papan Kekunci, tinggi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Kumpulan sekunder"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Tunjuk bendera pada applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Tunjuk bendera dalam aplet untuk menunjukkan bentangan semasa"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Keluarga fon"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Fon"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Keluarga fon untuk penunjuk bentangan"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Saiz fon"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Saiz fon untuk penunjuk bentangan"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Fon untuk penunjuk bentangan. Ia seharusnya dalam format \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Warna latar hadapan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Warna latar hadapan untuk penunjuk bentangan"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Warna latar hadapan penunjuk bentangan. Ia seharusnya dalam format \"R G B\", sebagai contoh \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Warna latar belakang"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Warna latar belakang untuk penunjuk bentangan"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Senarai pemalam Penunjuk Papan Kekunci dibenarkan"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Warna latar belakang penunjuk bentangan. Ia seharusnya dalam format \"R G B\", sebagai contoh \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Bentangan Papan Kekunci"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Pemalam Pemalam Papan Kekunci"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Pemalam _aktif:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Senarai pemalam aktif"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Aktifkan lagi pemalam"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Nyahaktifkan pemalam terpilih"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Tingkatkan keutamaan pemalam"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Kurangkan keutamaan pemalam"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Konfigur pemalam terpilih"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Tutup dialog"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Tambah Pemalam"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Pemalam tersedia:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Tiada keterangan."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Tidak boleh buka fail bantuan"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Gagal untuk awalkan MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Pemalam Penunjuk papan kekunci"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Benar/lumpuhkan pemalam terpasang"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/nb.po b/po/nb.po
index 77a0ff6..ab087f0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,294 +1,215 @@
-# Norwegian translation of libmatekbd (bokmål dialect).
-# Copyright (C) 1999-2005 Free Software Foundation, Inc.
-# Kjartan Maraas <[email protected]>, 1999-2010.
-# Terance Edward Sola <[email protected]>, 2005.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Terance Edward Sola <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd 2.29.x\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-01 21:13+0200\n"
-"PO-Revision-Date: 2010-06-01 21:13+0200\n"
-"Last-Translator: Kjartan Maraas <[email protected]>\n"
-"Language-Team: Norwegian Bokmal <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/mate/MATE/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:312
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Det oppsto en feil under lasting av bilde: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:643
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Feil ved initiering av XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Tastaturutforming «%s»\n"
-"Opphavsrett &#169; X.Org Foundation og XKeyboardConfig-bidragsyterene\n"
-"For lisensdata se pakkens metadata"
+msgstr "Tastaturutforming «%s»\nOpphavsrett &#169; X.Org Foundation og XKeyboardConfig-bidragsyterene\nFor lisensdata se pakkens metadata"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Tastaturutforming «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "utforming «%s»"
 msgstr[1] "utforminger «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "alternativ «%s»"
 msgstr[1] "alternativer «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modell «%s», %s og %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ingen utforming"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ingen alternativer"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Tastaturmodell"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "tastaturmodell"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Tastaturutforming"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "tastaturutforming"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Alternativer for tastatur"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Tastaturoppdatering"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"En samling skript som kjøres når tastaturtilstanden skal lastes på nytt. "
-"Nyttig for å legge inn xmodmap-baserte justeringer på nytt"
+msgstr "En samling skript som kjøres når tastaturtilstanden skal lastes på nytt. Nyttig for å legge inn xmodmap-baserte justeringer på nytt"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "liste over modmap-filer"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "En liste over modmap-filer som finnes i katalogen $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Forvalgt gruppe, tildelt ved oppretting av vindu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Behold og håndter separate grupper per vindu"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Tastaturoppdatering"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Tastaturutforming"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Tastaturmodell"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Alternativer for tastatur"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Last eksotiske og lite brukte utforminger og alternativer"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Last ekstra konfigurasjonsoppføringer"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Lagre/gjenopprett indikatorer sammen med utformingsgrupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Sekundære grupper"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Vis flagg i panelprogrammet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Vis flagg for å indikere aktiv utforming i panelprogrammet"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Vis navn på utforming i stedet for gruppenavn"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Vis navn på utforming i stedet for gruppenavn (kun for versjoner av XFree "
-"som støtter flere utforminger)"
+msgstr "Vis navn på utforming i stedet for gruppenavn (kun for versjoner av XFree som støtter flere utforminger)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Last ekstra konfigurasjonsoppføringer"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Last eksotiske og lite brukte utforminger og alternativer"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Ikke vis advarsel om «X konfigurasjonen er endret»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Forhåndsvisning av tastatur, X-avstand"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Forhåndsvisning av tastatur, Y-avstand"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Forhåndsvisning av tastatur, høyde"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Forhåndsvisning av tastatur, bredde"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Bakgrunnsfarge"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Bakgrunnsfarge for tastaturutformingsindikator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Skriftfamilie"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Forhåndsvisning av tastatur, høyde"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Skriftfamilie for utformingsindikator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekundære grupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Skriftstørrelse"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Skriftstørrelse for utformingsindikator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Forgrunnsfarge"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Forgrunnsfarge for utformingsindikator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Liste med aktiverte tillegg for tastaturindikator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "tastaturutforming"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "tastaturmodell"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Bakgrunnsfarge"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "liste over modmap-filer"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Tastaturutforming"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktiver flere tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktiver tille_gg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Lukk dialogen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Konfigurer valgt tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deaktiver valgt tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Sett lavere prioritet for tillegget"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Sett høyere prioritet for tillegget"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Tillegg for tastaturindikator"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Liste med aktive tillegg"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Legg til tillegg"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Tilgjengelige tillegg:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Ingen beskrivelse."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Kan ikke åpne hjelpfil"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Klarte ikke å starte MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Aktiver/deaktiver installerte tillegg"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Tillegg for tastaturindikator"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Test av tastaturindikator (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikator:"
diff --git a/po/nl.po b/po/nl.po
index b1f7ba8..fdc46bf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,315 +1,215 @@
-# Dutch translation for libmatekbd
-#
-# This file is distributed under the same license as the libmatekbd package.
-#
-# Wouter Bolsterlee <[email protected]>, 2007–2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Stef Pletinck <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-24 18:39+0200\n"
-"PO-Revision-Date: 2010-09-24 18:39+0200\n"
-"Last-Translator: Wouter Bolsterlee <[email protected]>\n"
-"Language-Team: Dutch <[email protected]>\n"
-"Language: nl\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-11 17:50+0000\n"
+"Last-Translator: Stef Pletinck <[email protected]>\n"
+"Language-Team: Dutch (http://www.transifex.com/mate/MATE/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Probleem bij laden van afbeelding: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:720 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-initalisatiefout"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Toetsenbordindeling ‘%s’\n"
-"Copyright © X.org Foundation en XKeyboardConfig-medewerkers\n"
-"Zie de metadata van het pakket voor licensievoorwaarden."
+msgstr "Toetsenbordindeling ‘%s’\nCopyright © X.org Foundation en XKeyboardConfig-medewerkers\nZie de metadata van het pakket voor licensievoorwaarden."
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Toetsenbordindeling ‘%s’"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "indeling ‘%s’"
 msgstr[1] "indelingen ‘%s’"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "optie ‘%s’"
 msgstr[1] "opties ‘%s’"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model ‘%s’, ‘%s’ en ‘%s’"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "geen indeling"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "geen opties"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Toetsenbordmodel"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "toetsenbordmodel"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Toetsenbordindeling"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "toetsenbordindeling"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Toetsenbordopties"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Afhandelaars voor toetsenbord-updates"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Een verzameling scripts die uitgevoerd worden als de keyboardinstellingen "
-"opnieuw geladen worden. Dit is bruikbaar om bijvoorbeeld xmodmap-gebaseerde "
-"aanpassingen opnieuw uit te laten voeren."
+msgstr "Een verzameling scripts die uitgevoerd worden als de keyboardinstellingen opnieuw geladen worden. Dit is bruikbaar om bijvoorbeeld xmodmap-gebaseerde aanpassingen opnieuw uit te laten voeren."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "Lijst van modmap-bestanden"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Lijst van modmap-bestanden beschikbaar in de $HOME-map."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Standaardgroep, toegewezen bij aanmaken van vensters"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Aparte groep per venster bijhouden"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Afhandelaars voor toetsenbord-updates"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Toetsenbordindeling"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Toetsenbordmodel"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Toetsenbordopties"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Exotische, zelden gebruikte layouts en opties laden"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Extea configuratie-items laden"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Onthouden/laden van indicatoren tegelijk met indelingsgroepen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Secundaire groepen"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Vlaggen tonen in het applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Vlaggen in het applet tonen om de huidige indeling aan te geven"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Indelingsnaam tonen in plaats van groepnaam"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Indelingsnaam tonen in plaats van groepnaam (alleen voor versies van XFree "
-"die meerdere indelingen ondersteuenen)"
+msgstr "Indelingsnaam tonen in plaats van groepnaam (alleen voor versies van XFree die meerdere indelingen ondersteuenen)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Extea configuratie-items laden"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Exotische, zelden gebruikte layouts en opties laden"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Het bericht ‘X sysconfig gewijzigd’ onderdrukken"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Uitschakelen van toetsenbordpictogram in systeemvak toestaan"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Toon indicator van toetsenbordlampjes"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Toetsenbordvoorbeeld, X-afstand"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Toetsenbordvoorbeeld, Y-afstand"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Toetsenbordvoorbeeld, hoogte"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Toetsenbordvoorbeeld, breedte"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "De achtergrondkleur"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "De achtergrondkleur van de indelingsindicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "De letterfamilie"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Toetsenbordvoorbeeld, hoogte"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "De letterfamilie van de indelingsindicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Secundaire groepen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "De lettergrootte"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Het lettertype"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "De lettergrootte van de indelingsindicator"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Het lettertype voor de layout-indicator. Dit moet in het \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\" formaat."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "De voorgrondkleur"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "The foreground color for the layout indicator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Lijst van ingeschakelde plug-ins voor toetsenbordindicatie"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "toetsenbordindeling"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Voorgrondkleur voor de layout-indicator. Dit moet in het \"R G B\"-formaat zijn, bijvoorbeeld \"255 0 0\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "toetsenbordmodel"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "De achtergrondkleur"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "Lijst van modmap-bestanden"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Achtergrondkleur voor de layout-indicator. Dit moet in het \"R G B\"-formaat zijn, bijvoorbeeld \"255 0 0\""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Toetsenbordindeling"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Meer plug-ins inschakelen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Ingeschakelde _plug-ins:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Venster sluiten"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Geselecteerde plug-in instellen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Geselecteerde plugin uitschakelen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Prioriteit van plug-in verlagen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Prioriteit van plug-in verhogen"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Plug-ins voor toetsenbordindicatie"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Lijst van ingeschakelde plug-ins"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Plug-in toevogen"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Beschikbare plug-ins:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Geen beschrijving."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Kon hulpbestand niet openen"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Kon Gconf niet initaliseren: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Geïnstalleerde plug-ins in- of uitschakelen"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Plug-ins voor toetsenbordindicatie"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Toetsenbordindicatietest (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indicator:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Toetsenbordinstellingen in mateconf zullen zo snel mogelijk overschreven "
-#~ "worden door het systeem (achterhaald)."
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Toetsenbordinstellingen vanuit Gconf zullen zeer binnenkort overschreven "
-#~ "worden door de systeeminstellingen. Deze sleutel is al achterhaald sinds "
-#~ "Mate 2.12, dus gaarne het model, de indelingen en de opties verwijderen "
-#~ "om de systeeminstellingen te gebruiken."
diff --git a/po/nn.po b/po/nn.po
index fdb5481..1b54b95 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,256 +1,216 @@
-# Norwegian translation of control-center (nynorsk dialect).
-# Copyright (C) 1999-2005 Free Software Foundation, Inc.
-# Kjartan Maraas <[email protected]>, 1999-2006.
-# Terance Edward Sola <[email protected]>, 2005.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Eskild Hustvedt <[email protected]>, 2007, 2008
-#
+# Terance Edward Sola <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd 2.15.x\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-04 13:39+0200\n"
-"PO-Revision-Date: 2008-04-04 13:40+0200\n"
-"Last-Translator: Eskild Hustvedt <[email protected]>\n"
-"Language-Team: Norwegian Nynorsk <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.com/mate/MATE/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2380
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "Det oppsto ein feil under lasting av bilete: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "Feil ved klargjering av XKB"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr "Tastaturutforming «%s»\n"
-"Copyright &#169; X.Org foundation og XKeyboardConfig bidragsytarar\n"
-"For lisensinformasjon sjå metadata om pakka."
+msgstr "Tastaturutforming «%s»\nCopyright &#169; X.Org foundation og XKeyboardConfig bidragsytarar\nFor lisensinformasjon sjå metadata om pakka."
 
-#: ../libmatekbd/matekbd-indicator.c:617
-msgid "XKB initialization error"
-msgstr "Feil ved klargjering av XKB"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "Det oppsto ein feil under lasting av bilete: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:796
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "utforming «%s»"
 msgstr[1] "utformingar «%s»"
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:813
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "alternativ «%s»"
 msgstr[1] "alternativ «%s»"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:821
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modell «%s», %s og %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:822
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "inga utforming"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:823
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "inga alternativ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Tastaturmodell"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "tastaturmodell"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Tastaturutforming"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "tastaturutforming"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Alternativ for tastatur"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Tastaturoppdatering"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Ein samling skript som køyrast når tastaturtilstanden skal lastas på nytt. "
-"Nyttig for å leggja inn xmodmap-baserte justeringar på nytt"
+msgstr "Ein samling skript som køyrast når tastaturtilstanden skal lastas på nytt. Nyttig for å leggja inn xmodmap-baserte justeringar på nytt"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "liste over modmap-filer"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Ei liste over modmap-filer som finst i mappa $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Forvald gruppe, tildelt ved oppretting av vindauge"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Behald og handter separate grupper per vindauge"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Tastaturoppdatering"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Tastaturutforming"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Tastaturmodell"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Alternativ for tastatur"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid ""
-"Keyboard settings in mateconf will be overridden from the system ASAP "
-"(deprecated)"
-msgstr "Tastaturinnstillingar i mateconf overstyrast frå systemet ASAP. (Utfases)"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Lagre/gjenopprett indikatorar saman med utformingsgrupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Secondary groups"
-msgstr "Sekundære grupper"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet"
-msgstr "Vis flagg i panelprogrammet"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Vis flagg for å indikere aktiv utforming i panelprogrammet"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Vis namn på utforming i staden for gruppenamn"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
+msgstr "Vis namn på utforming i staden for gruppenamn (berre for versjonar av XFree som støttar fleire utformingar)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
 msgstr ""
-"Vis namn på utforming i staden for gruppenamn (berre for versjonar av XFree "
-"som støttar fleire utformingar)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Ikkje vis advarsel om «X oppsettet er endret»"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Førehandsvising av tastatur, X-avstand"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Førehandsvising av tastatur, Y-avstand"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
+msgid "The Keyboard Preview, width"
+msgstr "Førehandsvising av tastatur, breidd"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Førehandsvising av tastatur, storleik"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, width"
-msgstr "Førehandsvising av tastatur, breidd"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekundære grupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Liste med tillegg for tastaturindikatoren som er slått på."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
 msgid ""
-"Very soon, keyboard settings in mateconf will be overridden (from the system "
-"configuration) This key has been deprecated since MATE 2.12, please unset "
-"the model, layouts and options keys to get the default system configuration."
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
-"Tastaturinnstillingar i mateconf vil verta overstyrt frå systemoppsettet i nær "
-"framtid. Denne nøkkelen er under utfasing frå MATE 2.12. Vennligst fjern "
-"verdiene for modell, utforming og alternative tastar for å ta i bruk forvald "
-"systemkonfigurasjon."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "tastaturutforming"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "tastaturmodell"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "liste over modmap-filer"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
-msgstr "Slå på fleire tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
-msgstr "Slå på tille_gg"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
-msgstr "Legg til tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
-msgstr "Lukk dialogen"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
-msgstr "Set opp vald tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
-msgstr "Slå av vald tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
-msgstr "Set lågare prioritet for tillegget"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr "Set høgare prioritet for tillegget"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
-msgstr "Tillegg for tastaturindikator"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
-msgstr "Liste med aktive tillegg"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
-msgstr "_Tilgjengelege tillegg:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:122
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Inga skildring."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:343
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Klarte ikkje å starta MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Slå av/på installerte tillegg"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Tillegg for tastaturindikator"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:59
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Test av tastaturindikator (%s)"
 
-#: ../test/matekbd-indicator-test.c:68
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikator:"
diff --git a/po/oc.po b/po/oc.po
index ec025a4..b96c91d 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,23 +1,32 @@
-# Translation of oc.po to Occitan
-# Occitan translation of libmatekbd.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-#
-# Yannig Marchegay (Kokoyaya) <[email protected]>, 2006-2008
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: oc\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-07 10:22+0100\n"
-"PO-Revision-Date: 2007-11-20 14:32+0100\n"
-"Last-Translator: Yannig Marchegay (Kokoyaya) <[email protected]>\n"
-"Language-Team: Occitan <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/mate/MATE/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2380
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr ""
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -25,222 +34,181 @@ msgid ""
 "For licensing see package metadata"
 msgstr ""
 
-#: ../libmatekbd/matekbd-indicator.c:617
-msgid "XKB initialization error"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
 msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
+msgid "Keyboard Layout \"%s\""
 msgstr ""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:796
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: The count is related to the number of options. The %s
-#. * format specifier should not be modified, left "as is".
-#: ../libmatekbd/matekbd-keyboard-config.c:813
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opcion \"%s\""
 msgstr[1] "opcions \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:821
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modèl \"%s\", %s e %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:822
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:823
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "pas cap d'opcions"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
-msgid ""
-"A collection of scripts to run whenever the keyboard state is reloaded. "
-"Useful for re-applying xmodmap based adjustments"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "A list of modmap files available in the $HOME directory."
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "Default group, assigned on window creation"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "Keep and manage separate group per window"
-msgstr ""
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Modèl del clavièr"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr ""
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "modèl del clavièr"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Dispausicion del clavièr"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Modèl del clavièr"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opcions del clavièr"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid ""
-"Keyboard settings in mateconf will be overridden from the system ASAP "
-"(deprecated)"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Save/restore indicators together with layout groups"
-msgstr ""
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Secondary groups"
-msgstr "Grops segondaris"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet"
-msgstr "Visualizar las bandièras dins l'applet"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Visualizar las bandièras dins l'applet per indicar lo clavièr actiu"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show layout names instead of group names"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
-"Show layout names instead of group names (only for versions of XFree "
-"supporting multiple layouts)"
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Suppress the \"X sysconfig changed\" warning message"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
-msgid "The Keyboard Preview, X offset"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
-msgid "The Keyboard Preview, Y offset"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
-msgid "The Keyboard Preview, height"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, width"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
+msgid "Save/restore indicators together with layout groups"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "La lista dels ajustons abilitats per l'indicador de clavièr"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
+msgid "Show layout names instead of group names"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
-"Very soon, keyboard settings in mateconf will be overridden (from the system "
-"configuration) This key has been deprecated since MATE 2.12, please unset "
-"the model, layouts and options keys to get the default system configuration."
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
 msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "modèl del clavièr"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
+msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
+msgid "The Keyboard Preview, X offset"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
+msgid "The Keyboard Preview, Y offset"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
+msgid "The Keyboard Preview, width"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr ""
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Grops segondaris"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:122
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Pas cap de descripcion."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:344
-#, c-format
-msgid "Failed to init MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
 msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
 msgstr ""
 
-#: ../test/matekbd-indicator-test.c:59
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr ""
 
-#: ../test/matekbd-indicator-test.c:68
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr ""
diff --git a/po/or.po b/po/or.po
index bdc9df6..caf5907 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1,253 +1,216 @@
-# translation of libmatekbd.master.or.po to Oriya
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Subhransu Behera <[email protected]>, 2007.
-# Manoj Kumar Giri <[email protected]>, 2009.
+# 
+# Translators:
+# Manoj Kumar Giri <[email protected]>, 2009
+# Subhransu Behera <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master.or\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-09-17 17:18+0530\n"
-"Last-Translator: Manoj Kumar Giri <[email protected]>\n"
-"Language-Team: Oriya <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Oriya (http://www.transifex.com/mate/MATE/language/or/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
-"\n"
-"\n"
-"\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: or\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "ଗୋଟିଏ ପ୍ରତିଛବି ଧାରଣ କରିବା ସମୟରେ ଗୋଟିଏ ତୃଟି ଘଟିଲା: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB ପ୍ରାରମ୍ଭିକରଣ ତୃଟି"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"କିବୋର୍ଡ ସଂରଚନା \"%s\"\n"
-"Copyright &#169; X.Org ପ୍ରତିଷ୍ଠାନ ଏବଂ XKeyboardConfig ସହଯୋଗୀମାନେ\n"
-"ଅନୁମତି ପତ୍ର ପାଇଁ ପ୍ୟାକେଜ ଅଧିତଥ୍ୟ ଦେଖନ୍ତୁ"
+msgstr "କିବୋର୍ଡ ସଂରଚନା \"%s\"\nCopyright &#169; X.Org ପ୍ରତିଷ୍ଠାନ ଏବଂ XKeyboardConfig ସହଯୋଗୀମାନେ\nଅନୁମତି ପତ୍ର ପାଇଁ ପ୍ୟାକେଜ ଅଧିତଥ୍ୟ ଦେଖନ୍ତୁ"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB ପ୍ରାରମ୍ଭିକରଣ ତୃଟି"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "ଗୋଟିଏ ପ୍ରତିଛବି ଧାରଣ କରିବା ସମୟରେ ଗୋଟିଏ ତୃଟି ଘଟିଲା: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "\"%s\" ବିନ୍ଯାସ"
 msgstr[1] "\"%s\" ବିନ୍ଯାସ"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "\"%s\" ବିକଳ୍ପ"
 msgstr[1] "\"%s\" ବିକଳ୍ପ"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "\"%s\", %s ଏବଂ %s ନମୁନା"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "କୌଣସି ବିନ୍ଯାସ ନାହିଁ"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "କୌଣସି ବିକଳ୍ପ ନାହିଁ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "କି-ବୋର୍ଡ ନମୁନା"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "କି-ବୋର୍ଡ ନମୁନା"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "କି-ବୋର୍ଡ ବିନ୍ଯାସ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "କି-ବୋର୍ଡ ବିନ୍ଯାସ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "କି-ବୋର୍ଡ ବିକଳ୍ପ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "କି-ବୋର୍ଡ ଅଦ୍ଯତନ ନିୟନ୍ତ୍ରକ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"କି-ବୋର୍ଡ ଅବସ୍ଥାକୁ ପୁନର୍ଧାରଣ କରିବା ସମୟରେ ଚଳାଯିବା ସ୍କ୍ରିପ୍ଟ ମାନଙ୍କର ସଂଗ୍ରହ। xmodmap ଆଧାରିତ "
-"ନିୟନ୍ତ୍ରଣ ମାନଙ୍କୁ ପୁନର୍ବାର ପ୍ରୟୋଗ କରିବା ପାଇଁ ଲାଭଦାୟକ ଅଟେ।"
+msgstr "କି-ବୋର୍ଡ ଅବସ୍ଥାକୁ ପୁନର୍ଧାରଣ କରିବା ସମୟରେ ଚଳାଯିବା ସ୍କ୍ରିପ୍ଟ ମାନଙ୍କର ସଂଗ୍ରହ। xmodmap ଆଧାରିତ ନିୟନ୍ତ୍ରଣ ମାନଙ୍କୁ ପୁନର୍ବାର ପ୍ରୟୋଗ କରିବା ପାଇଁ ଲାଭଦାୟକ ଅଟେ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ଫାଇଲ ତାଲିକା"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME ଡିରେକ୍ଟୋରିରେ modmap ଫାଇଲ ମାନଙ୍କର ଗୋଟିଏ ତାଲିକା ଉପଲବ୍ଧ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "ୱିଣ୍ଡୋ ପ୍ରସ୍ତୁତି ସମୟରେ ନ୍ଯସ୍ତ କରାଯାଇଥିବା ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସମୂହ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ୱିଣ୍ଡୋ ପ୍ରତି ଅଲଗା ସମୂହ ରଖନ୍ତୁ ଏବଂ ପରାଚାଳନା କରନ୍ତୁ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "କି-ବୋର୍ଡ ଅଦ୍ଯତନ ନିୟନ୍ତ୍ରକ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "କି-ବୋର୍ଡ ବିନ୍ଯାସ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "କି-ବୋର୍ଡ ନମୁନା"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "କି-ବୋର୍ଡ ବିକଳ୍ପ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "ଆକର୍ଷକ, ଅତିକମ ବ୍ୟବହାର ହେଉଥିବା ସଂରଚନା ଏବଂ ବିକଳ୍ପଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "ଅତିରିକ୍ତ ସଂରଚନା ବସ୍ତୁଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "ବିନ୍ଯାସ ସମୂହ ମାନଙ୍କ ସହିତ ସୂଚକ ମାନଙ୍କୁ ଏକତ୍ର ସଂରକ୍ଷଣ/ପୁନଃସ୍ଥାପନ କରନ୍ତୁ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "ଦ୍ବିତୀୟକ ସମୂହ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "ଆପ୍ଲେଟରେ ବିଶେଷ ସୂଚକ ମାନଙ୍କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "ପ୍ରଚଳିତ ବିନ୍ଯାସକୁ ସୂଚୀତ କରିବା ପାଇଁ ଆପ୍ଲେଟରେ ବିଶେଷ ସୂଚକ ମାନଙ୍କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "ସମୂହ ନାମ ମାନଙ୍କ ପରିବର୍ତ୍ତେ ବିନ୍ଯାସ ନାମ ମାନଙ୍କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"ସମୂହ ନାମ ମାନଙ୍କ ପରିବର୍ତ୍ତେ ବିନ୍ଯାସ ନାମ ମାନଙ୍କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ (କେବଳ ଏକାଧିକ ବିନ୍ଯାସ ମାନଙ୍କୁ "
-"ସମର୍ଥନ କରୁଥିବା XFree ସଂସ୍କରଣ ମାନଙ୍କ ପାଇଁ)"
+msgstr "ସମୂହ ନାମ ମାନଙ୍କ ପରିବର୍ତ୍ତେ ବିନ୍ଯାସ ନାମ ମାନଙ୍କୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ (କେବଳ ଏକାଧିକ ବିନ୍ଯାସ ମାନଙ୍କୁ ସମର୍ଥନ କରୁଥିବା XFree ସଂସ୍କରଣ ମାନଙ୍କ ପାଇଁ)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "ଅତିରିକ୍ତ ସଂରଚନା ବସ୍ତୁଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "ଆକର୍ଷକ, ଅତିକମ ବ୍ୟବହାର ହେଉଥିବା ସଂରଚନା ଏବଂ ବିକଳ୍ପଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig ପରିବର୍ତ୍ତିତ\" ଚେତାବନୀ ସନ୍ଦେଶକୁ ଅବରୋଧ କରନ୍ତୁ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "କି-ବୋର୍ଡ ପୂର୍ବାବଲୋକନ, ଏକ୍ସ ଅଫସେଟ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "କି-ବୋର୍ଡ ପୂର୍ବାବଲୋକନ, ୱାଇ ଅଫସେଟ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "କି-ବୋର୍ଡ ପୂର୍ବାବଲୋକନ, ଉଚ୍ଚତା"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "କି-ବୋର୍ଡ ପୂର୍ବାବଲୋକନ, ଓସାର"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "ସକ୍ରିୟ କରାଯାଇଥିବା କି-ବୋର୍ଡ ସୂଚକ ପ୍ଲଗଇନ ମାନଙ୍କର ତାଲିକା"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "କି-ବୋର୍ଡ ବିନ୍ଯାସ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "କି-ବୋର୍ଡ ନମୁନା"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap ଫାଇଲ ତାଲିକା"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "ଅଧିକ ପ୍ଲଗଇନ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "ସକ୍ରିୟ ପ୍ଲଗଇନ ଗୁଡିକ (_p):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ସଂଳାପକୁ ବନ୍ଦ କରନ୍ତୁ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "ଚୟିତ ପ୍ଲଗଇନକୁ ବିନ୍ୟାସ କରନ୍ତୁ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "ଚୟିତ ପ୍ଲଗଇନକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "ପ୍ଲଗଇନ ଅଗ୍ରାଧିକାରକୁ ହ୍ରାସ କରନ୍ତୁ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "ପ୍ଲଗଇନ ଅଗ୍ରାଧିକାରକୁ ବୃଦ୍ଧି କରନ୍ତୁ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "କି-ବୋର୍ଡ ସୂଚକ ପ୍ଲଗଇନ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "କି-ବୋର୍ଡ ପୂର୍ବାବଲୋକନ, ଉଚ୍ଚତା"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "ସକ୍ରିୟ ପ୍ଲଗଇନ ମାନଙ୍କର ତାଲିକା"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "ଦ୍ବିତୀୟକ ସମୂହ"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "ପ୍ଲଗଇନ ଯୋଗ କରନ୍ତୁ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "ଉପଲବ୍ଧ ପ୍ଲଗଇନ (_A):"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "କୌଣସି ବର୍ଣ୍ଣନା ନାହିଁ।"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "ସହାୟତା ଫାଇଲ ଖୋଲିବାରେ ଅସମର୍ଥ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "init MateConf କରିବାରେ ବିଫଳ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ସ୍ଥାପିତ ପ୍ଲଗଇନ ମାନଙ୍କୁ ସକ୍ରିୟ/ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "କି-ବୋର୍ଡ ସୂଚକ ପ୍ଲଗଇନ"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "କି-ବୋର୍ଡ ସୂଚକ ପରୀକ୍ଷଣ (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "ସୂଚକ: "
-
diff --git a/po/pa.po b/po/pa.po
index 542b63a..418736a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,297 +1,215 @@
-# translation of libmatekbd.HEAD.po to Punjabi
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# A S Alam <[email protected]>, 2007, 2009, 2010.
+# 
+# Translators:
+# A S Alam <[email protected]>, 2007, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-05-26 22:36+0000\n"
-"PO-Revision-Date: 2010-08-04 14:51+0530\n"
-"Last-Translator: A S Alam <[email protected]>\n"
-"Language-Team: Punjabi/Panjabi <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/mate/MATE/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:312
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "ਇੱਕ ਚਿੱਤਰ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:643
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB ਸ਼ੁਰੂਆਤ ਗਲਤੀ"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"ਕੀਬੋਰਡ ਲੇਆਉਟ \"%s\"\n"
-"Copyright &#169; X.Org ਫਾਊਂਡੇਸ਼ਨ ਅਤੇ XKeyboardConfig ਯੋਗਦਾਨੀ\n"
-"ਲਾਈਸੈਂਸ ਲਈ ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਵੇਖੋ"
+msgstr "ਕੀਬੋਰਡ ਲੇਆਉਟ \"%s\"\nCopyright &#169; X.Org ਫਾਊਂਡੇਸ਼ਨ ਅਤੇ XKeyboardConfig ਯੋਗਦਾਨੀ\nਲਾਈਸੈਂਸ ਲਈ ਪੈਕੇਜ ਮੇਟਾਡਾਟਾ ਵੇਖੋ"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-#| msgid "Keyboard layout"
 msgid "Keyboard Layout \"%s\""
 msgstr "ਕੀ-ਬੋਰਡ ਲੇਆਉਟ \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "ਲੇਆਉਟ \"%s\""
 msgstr[1] "\"%s\" ਲੇਆਉਟ"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "ਚੋਣ \"%s\""
 msgstr[1] "ਚੋਣਾਂ \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "ਮਾਡਲ \"%s\", %s ਅਤੇ %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ਲੇਆਉਟ ਨਹੀਂ"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ਕੋਈ ਚੋਣ ਨਹੀਂ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "ਕੀ-ਬੋਰਡ ਮਾਡਲ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "ਕੀ-ਬੋਰਡ ਮਾਡਲ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "ਕੀ-ਬੋਰਡ ਚੋਣਾਂ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "ਕੀ-ਬੋਰਡ ਅੱਪਡੇਟ ਹੈਂਲਡਰ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"ਚਲਾਉਣ ਲਈ ਸਕ੍ਰਿਪਟਾਂ ਦਾ ਭੰਡਾਰ ਹੈ, ਜੋ ਕਿ ਕੀ-ਬੋਰਡ ਹਾਲਤ ਮੁੜ-ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਚੱਲਦੀਆਂ ਹਨ। "
-"xmodmap ਆਧਾਰ ਬਦਲਾਅ ਮੁੜ-ਲਾਗੂ ਕਰਨ ਦੌਰਾਨ ਲਾਭਦਾਇਕ ਹੈ।"
+msgstr "ਚਲਾਉਣ ਲਈ ਸਕ੍ਰਿਪਟਾਂ ਦਾ ਭੰਡਾਰ ਹੈ, ਜੋ ਕਿ ਕੀ-ਬੋਰਡ ਹਾਲਤ ਮੁੜ-ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਚੱਲਦੀਆਂ ਹਨ। xmodmap ਆਧਾਰ ਬਦਲਾਅ ਮੁੜ-ਲਾਗੂ ਕਰਨ ਦੌਰਾਨ ਲਾਭਦਾਇਕ ਹੈ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ਫਾਇਲ ਲਿਸਟ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਉਪਲੱਬਧ modmap ਫਾਇਲਾਂ ਦੀ ਲਿਸਟ ਹੈ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "ਡਿਫਾਲਟ ਗਰੁੱਪ, ਜੋ ਕਿ ਵਿੰਡੋ ਨਿਰਮਾਣ ਲਈ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ਹਰੇਕ ਵਿੰਡੋ ਲਈ ਵੱਖਰਾ ਗਰੁੱਪ ਰੱਖਦਾ ਅਤੇ ਪਰਬੰਧ ਕਰਦਾ ਹੈ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "ਕੀ-ਬੋਰਡ ਅੱਪਡੇਟ ਹੈਂਲਡਰ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "ਕੀ-ਬੋਰਡ ਮਾਡਲ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "ਕੀ-ਬੋਰਡ ਚੋਣਾਂ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "ਪੁਰਾਣੇ, ਘੱਟ ਵਰਤੇ ਜਾਂਦੇ ਲੇਆਉਟ ਅਤੇ ਚੋਣਾਂ ਲੋਡ ਕਰੋ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "ਵਾਧੂ ਸੰਰਚਨਾ ਆਈਟਮਾਂ ਲੋਡ ਕਰੋ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "ਲੇਆਉਟ ਗਰੁੱਪਾਂ ਨਾਲ ਇੰਡੀਕੇਟਰ ਸੰਭਾਲੋ/ਰੀ-ਸਟੋਰ ਕਰੋ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "ਸੈਕੰਡਰੀ ਗਰੁੱਪ"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "ਐਪਲਿਟ ਵਿੱਚ ਝੰਡੇ ਵੇਖੋ"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "ਮੌਜੂਦਾ ਲੇਆਉਟ ਨੂੰ ਵੇਖਾਉਦੇ ਝੰਡੇ ਐਪਲਿਟ ਵਿੱਚ ਵੇਖੋ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "ਗਰੁੱਪ ਨਾਂ ਦੀ ਬਜਾਏ ਲੇਆਉਟ ਨਾਂ ਵੇਖਾਓ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "ਗਰੁੱਪ ਨਾਂ ਦੀ ਬਜਾਏ ਲੇਆਉਟ ਨਾਂ ਵੇਖੋ (XFree ਵਲੋਂ ਸਹਾਇਕ ਬਹੁ ਲੇਆਉਟ ਦੇ ਵਰਜਨ ਲਈ ਹੀ)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "ਵਾਧੂ ਸੰਰਚਨਾ ਆਈਟਮਾਂ ਲੋਡ ਕਰੋ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "ਪੁਰਾਣੇ, ਘੱਟ ਵਰਤੇ ਜਾਂਦੇ ਲੇਆਉਟ ਅਤੇ ਚੋਣਾਂ ਲੋਡ ਕਰੋ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed (X sysconfig ਬਦਲੀ)\" ਚੇਤਾਵਨੀ ਸੁਨੇਹਾ ਦਬਾਉ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "ਕੀ-ਬੋਰਡ ਝਲਕ, X ਆਫਸੈੱਟ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "ਕੀ-ਬੋਰਡ ਝਲਕ, Y ਆਫਸੈਟ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "ਕੀ-ਬੋਰਡ ਝਲਕ, ਉਚਾਈ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "ਕੀ-ਬੋਰਡ ਝਲਕ, ਚੌੜਾਈ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "ਲੇਆਉਟ ਇੰਡੀਕੇਟਰ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "ਫੋਂਟ ਫੈਮਲੀ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "ਕੀ-ਬੋਰਡ ਝਲਕ, ਉਚਾਈ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "ਲੇਆਉਟ ਇੰਡੀਕੇਟਰ ਲਈ ਫੋਂਟ ਫੈਮਲੀ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "ਸੈਕੰਡਰੀ ਗਰੁੱਪ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "ਫੋਂਟ ਸਾਈਜ਼"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "ਲੇਆਉਟ ਇੰਡੀਕੇਟਰ ਲਈ ਫੋਂਟ ਸਾਈਜ਼"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "ਫਾਰਗਰਾਊਂਡ ਰੰਗ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "ਲੇਆਉਟ ਇੰਡੀਕੇਟਰ ਲਈ ਫਾਰਗਰਾਊਂਡ ਰੰਗ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "ਚਾਲੂ ਕੀ-ਬੋਰਡ ਇੰਡੀਕੇਟਰ ਪਲੱਗਇਨ ਦੀ ਲਿਸਟ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "ਕੀ-ਬੋਰਡ ਮਾਡਲ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap ਫਾਇਲ ਲਿਸਟ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
-#| msgid "Keyboard layout"
 msgid "Keyboard Layout"
 msgstr "ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "ਸਰਗਰਮ ਹੋਰ ਪਲੱਗਇਨਾਂ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "ਸਰਗਰਮ ਪਲੱਗਇਨ(_p):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ਡਾਈਲਾਗ ਬੰਦ ਕਰੋ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "ਚੁਣੀ ਪਲੱਗਇਨ ਦੀ ਸੰਰਚਨਾ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "ਚੁਣੀ ਪਲੱਗਇਨ ਨਾ-ਸਰਗਰਮ ਕਰੋ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "ਪਲੱਗਇਨ ਤਰਜੀਹ ਘਟਾਓ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "ਪਲੱਗਇਨ ਤਰਜੀਹ ਵਧਾਓ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "ਕੀ-ਬੋਰਡ ਇੰਡੀਕੇਟਰ ਪਲੱਗਇਨ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "ਸਰਗਰਮ ਪਲੱਗਇਨਾਂ ਦੀ ਲਿਸਟ"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "ਪਲੱਗਇਨ ਸ਼ਾਮਲ"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "ਉਪਲੱਬਧ ਪਲੱਗਇਨ(_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ ਹੈ।"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ਇੰਸਟਾਲ ਕੀਤੀਆਂ ਪਲੱਗਇਨ ਚਾਲੂ/ਬੰਦ"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "ਕੀ-ਬੋਰਡ ਇੰਡੀਕੇਟਰ ਪਲੱਗਇਨ"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "ਕੀ-ਬੋਰਡ ਇੰਡੀਕੇਟਰ ਟੈਸਟ (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "ਇੰਡੀਕੇਟਰ:"
-
diff --git a/po/pl.po b/po/pl.po
index e75fa4e..4e04a8c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,55 +1,50 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# [email protected]
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Jan Bońkowski <[email protected]>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-07 19:01+0200\n"
-"PO-Revision-Date: 2010-09-07 19:00+0100\n"
-"Last-Translator: Tomasz Dominikowski <[email protected]>\n"
-"Language-Team: Polish <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-29 07:01+0000\n"
+"Last-Translator: Jan Bońkowski <[email protected]>\n"
+"Language-Team: Polish (http://www.transifex.com/mate/MATE/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Wystąpił błąd podczas wczytywania obrazu: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:720 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Błąd inicjacji XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Układ klawiatury \"%s\"\n"
-"Copyright &#169; X.Org Foundation oraz współtwórcy XKeyboardConfig\n"
-"Zasady licencji znajdują się w metadanych pakietu"
+msgstr "Układ klawiatury \"%s\"\nCopyright &#169; X.Org Foundation oraz współtwórcy XKeyboardConfig\nZasady licencji znajdują się w metadanych pakietu"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Układ klawiatury \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -57,7 +52,7 @@ msgstr[0] "układ \"%s\""
 msgstr[1] "układy \"%s\""
 msgstr[2] "układy \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -65,236 +60,158 @@ msgstr[0] "opcja \"%s\""
 msgstr[1] "opcje \"%s\""
 msgstr[2] "opcje \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s i %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "brak układu"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "brak opcji"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Model klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "model klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Układ klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "układ klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Opcje klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Uchwyty aktualizacji klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Zbiór skryptów uruchamianych przy każdym ponownym wczytaniu stanu "
-"klawiatury. Przydatne do ponownego wprowadzania ustawień xmodmap"
+msgstr "Zbiór skryptów uruchamianych przy każdym ponownym wczytaniu stanu klawiatury. Przydatne do ponownego wprowadzania ustawień xmodmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "lista plików modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Lista dostępnych plików modmap z katalogu $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Domyślna grupa, ustawiana przy tworzeniu okna"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Przechowywanie i zarządzanie grupami, oddzielnymi dla każdego z okien"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Uchwyty aktualizacji klawiatury"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Układ klawiatury"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Model klawiatury"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Opcje klawiatury"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Wczytanie egzotycznych, rzadko używanych układów i opcji"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Wczytanie dodatkowych elementów konfiguracji"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Zapisywanie/przywracanie wskaźników razem z grupami układów"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Grupy drugorzędne"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Wyświetlanie flag w aplecie"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Wyświetlanie flag w aplecie, w celu wskazania bieżącego układu"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Wyświetlanie nazw układów zamiast nazw grup"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Wyświetlanie nazw układów zamiast nazw grup (ma zastosowanie tylko do wersji "
-"XFree obsługujących wiele układów)"
+msgstr "Wyświetlanie nazw układów zamiast nazw grup (ma zastosowanie tylko do wersji XFree obsługujących wiele układów)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Wczytanie dodatkowych elementów konfiguracji"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Wczytanie egzotycznych, rzadko używanych układów i opcji"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Powstrzymywanie komunikatu ostrzegawczego \"X sysconfig changed\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Zezwól na blokadę ikony wskaźnika klawiatury na pasku"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Pokaż wskaźnik diod klawiatury"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Przesunięcie X podglądu klawiatury"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Przesunięcie Y podglądu klawiatury"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Wysokość podglądu klawiatury"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Szerokość podglądu klawiatury"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Kolor tła"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Kolor tła wskaźnika układu"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Rodzina czcionek"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Wysokość podglądu klawiatury"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Rodzina czcionek wskaźnika układu"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Grupy drugorzędne"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Rozmiar czcionki"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Czcionka"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Rozmiar czcionki wskaźnika układu"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Czcionka dla wskaźnika układu. Prawidłowy format to \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Kolor pierwszoplanowy"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Kolor pierwszoplanowy wskaźnika układu"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Lista włączonych wtyczek wskaźnika klawiatury"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "układ klawiatury"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Kolor pierwszoplanowy dla wskaźnika układu. Prawidłowy format to \"R G B\", przykładowo \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "model klawiatury"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Kolor tła"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "lista plików modmap"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Kolor tła dla wskaźnika układu. Prawidłowy format to \"R G B\", przykładowo \"255 0 0\"."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Układ klawiatury"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Włącza kolejne wtyczki"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Włączone wtyczki:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Zamyka okno dialogowe"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Ustawienia zaznaczonej wtyczki"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Wyłącza zaznaczoną wtyczkę"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Zmniejsza priorytet wtyczki"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Zwiększa priorytet wtyczki"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Wtyczki wskaźnika klawiatury"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Lista włączonych wtyczek"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Dodanie wtyczki"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Dostępne wtyczki:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Brak opisu."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nie można otworzyć pliku pomocy"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Nie można zainicjować MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Włącza/wyłącza zainstalowane wtyczki"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Wtyczki wskaźnika klawiatury"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Test wskaźnika klawiatury (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Wskaźnik:"
diff --git a/po/pt.po b/po/pt.po
index 0149b8e..e06f74b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,33 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Carlos Moreira <[email protected]>, 2014
+# crolidge, 2014-2015
 # Duarte Loreto <[email protected]>, 2007-2010
 # Sérgio Marques <[email protected]>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-05-27 13:44+0000\n"
-"Last-Translator: Carlos Moreira <[email protected]>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/MATE/language/pt/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-07 22:03+0000\n"
+"Last-Translator: crolidge\n"
+"Language-Team: Portuguese (http://www.transifex.com/mate/MATE/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Ocorreu um erro ao carregar a imagem: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Erro de inicialização do XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +37,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Esquema de teclado \"%s\"\nDireitos de autor &#169; X.Org Foundation e os colaboradores do XKeyboardConfig\nPara ver a licença, consulte os dados do pacote"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Esquema de teclado \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "esquema \"%s\""
 msgstr[1] "esquemas \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opção \"%s\""
 msgstr[1] "opções \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelo \"%s\", %s e %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "sem esquema"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "sem opções"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modelo do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "modelo do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Esquema do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "esquema do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opções do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Gestores de atualização do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Uma coleção de scripts a executar sempre que o estado do teclado for recarregado. Útil para aplicar ajustamentos baseados no xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "lista de ficheiros modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Uma lista de ficheiros modmap disponíveis no diretório $HOME"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grupo pré-definido, atribuido ao criar a janela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Manter e gerir grupos distintos por janela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Gravar/restaurar indicadores com os grupos de esquemas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Mostrar nomes de esquemas em vez dos nomes de grupos"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Mostrar nomes de esquemas em vez dos nomes de grupos (só para versões do XFree com suporte a diversos esquemas)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Carregar itens extra de configuração"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Carregar esquemas e opções exóticas e raramente usadas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprimir mensagem de aviso \"sysconfig do X alterada\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Pemitir desativar o ícone de bandeja indicador do teclado"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Mostrar indicador de leds do teclado"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "A antevisão de teclado, posição X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "A antevisão de teclado, posição Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "A antevisão de teclado, largura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "A antevisão de teclado, altura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupos secundários"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Mostrar bandeiras na bandeja"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Mostrar bandeiras na applet para indicar o esquema atual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "A família do tipo de letra"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "O tipo de letra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "A família do tipo de letra do indicador de esquema"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "O tamanho do tipo de letra"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "O tamanho do tipo de letra para o indicador do esquema"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "A cor principal"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "A cor principal do indicador do esquema"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "A cor de fundo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "A cor de fundo do indicador do esquema"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "A lista de plugins ativos do indicador de teclado"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Esquema do teclado"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Plugins do indicador de teclado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Plugins ativos:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "A lista de plugins ativos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Ativar mais plugins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desativar plugin selecionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Aumentar prioridade do plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Reduzir prioridade do plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configurar plugin selecionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Fechar caixa de diálogo"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Adicionar plugin"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Plugins _disponíveis:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Sem descrição."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Incapaz de abrir o ficheiro de ajuda"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Falha ao iniciar MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Plugins do indicador de teclado"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Ativar/desativar plugins instalados"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 392b9cb..fd2c29c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,32 +4,33 @@
 # 
 # Translators:
 # Fábio Nogueira <[email protected]>, 2008
-# Pygmalion, 2014
+# Gilberto Coutinho <[email protected]>, 2015
+# Marcus Vinícius Marques, 2014
 # Washington Lins <[email protected]>, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-02-20 21:30+0000\n"
-"Last-Translator: Pygmalion\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/MATE/language/pt_BR/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-08 00:35+0000\n"
+"Last-Translator: Gilberto Coutinho <[email protected]>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/mate/MATE/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Houve um erro ao carregar uma imagem: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Erro de inicialização do XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,250 +38,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Disposição de teclado \"%s\"\nCopyright &#169; X.Org Foundation e colaboradores do XKeyboardConfig\nPara a licença, veja os metadados do pacote"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Disposição de teclado \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "disposição \"%s\""
 msgstr[1] "disposições \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opção \"%s\""
 msgstr[1] "opções \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modelo \"%s\", %s e %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "sem disposição"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "sem opções"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modelo do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "modelo do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Disposição do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "disposição do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opções do teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Manipuladores de Atualização do Teclado"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Uma coleção de scripts para executar quando o estado do teclado for recarregado. Útil para reaplicar ajustes baseados no xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "lista de arquivos modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Uma lista de arquivos modmap disponíveis no diretório $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grupo padrão, designado durante a criação da janela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Manter e gerenciar grupo separado por janela"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Salvar/restaurar indicadores com grupos de disposição"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Mostrar nomes de disposição em vez de grupos"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Mostra nomes de disposição (\"layout\") em vez de nomes de grupo (apenas para versões do XFree com suporte a múltiplas disposições)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Carregar itens de configuração extra"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Carregar opções e disposições exóticas, raramente usadas"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprimir a mensagem de aviso \"sysconfig do X mudou\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Permitir desabilitar o ícone do teclado na bandeja"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Mostrar LED's indicadores do teclado"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Visualização do Teclado, deslocamento X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Visualização do Teclado, deslocamento Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Visualização do Teclado, largura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Visualização do Teclado, altura"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupos secundários"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Mostrar bandeiras no miniaplicativo"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Mostrar bandeiras no miniaplicativo para indicar a disposição atual"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "A família da fonte"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "A fonte"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "A família da fonte para o indicador de disposição"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "O tamanho da fonte"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "O tamanho da fonte para o indicador de disposição"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "A fonte para o indicador do layout. Ela deve ser no formato \"[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "A cor do primeiro plano"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "A cor do primeiro plano para o indicador de disposição"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "A cor do primeiro plano para o indicador do layout. Ela deve ser no formato \"R G B\", por exemplo \"255 0 0\"."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "A cor do plano de fundo"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "A cor do plano de fundo para o indicador de disposição"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "A lista de plug-ins Indicadores de Teclado habilitados"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "A cor de fundo para o indicador do layout. Ela deve ser no formato \"R G B\", por exemplo \"255 0 0\""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Disposição do Teclado"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Plug-ins Indicadores de Teclado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Plug-ins ativos:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "A lista de plug-ins ativos"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Ativar mais plug-ins"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Desativar o plug-in selecionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Aumentar a prioridade do plug-in"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Diminuir a prioridade do plug-in"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configurar o plug-in selecionado"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Fechar a caixa de diálogo"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Adicionar Plug-in"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Plug-ins _disponíveis:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Sem descrição."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Não foi possível abrir arquivo de ajuda"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Falha ao iniciar MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Plug-ins Indicadores de Teclado"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Habilitar/desabilitar plug-ins instalados"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/ro.po b/po/ro.po
index 9cef1ab..b4c4fa4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10,26 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2015-03-18 13:05+0000\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-20 23:06+0000\n"
 "Last-Translator: Daniel <[email protected]>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/MATE/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/mate/MATE/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "S-a produs o eroare la încărcarea unei imagini: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Eroare inițializare XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,16 +37,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Aranjament tastatură „%s”\nDrepturi de autor &#169; Fundația X.Org și colaboratorii XKeyboardConfig\nPentru licențiere consultați metadatele pachetului"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Aranjament tastatură „%s”"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -54,7 +54,7 @@ msgstr[0] "aranjament „%s”"
 msgstr[1] "aranjamente „%s”"
 msgstr[2] "aranjamente „%s”"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -62,227 +62,153 @@ msgstr[0] "opțiune „%s”"
 msgstr[1] "opțiuni „%s”"
 msgstr[2] "opțiuni „%s”"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model „%s”, %s și %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "fără aranjament"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "fără opțiuni"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Model tastatură"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "model tastatură"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Aranjament tastatură"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "aranjament tastatură"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opțiuni tastatură"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Operator actualizare tastatură"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "O colecție de scripturi de rulat ori de câte ori starea tastaturii este reîncărcată. Folositor pentru aplicarea de corecții bazate pe xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "listă fișier modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "O listă de fișiere modmap disponibile în dosarul $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
-msgstr "Grup implicit, atribuit la creearea ferestrei"
+msgstr "Grup implicit, atribuit la crearea ferestrei"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Păstrează și administrează grupuri separate per fereastră"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Salvează/restarurează indicatorii împreună cu grupurile de aranjamente"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Afișare nume aranjament în locul numelui grupurilor"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Afișare nume aranjament în locul numelui grupurilor (doar pentru versiuni de XFree ce suportă aranjamente multiple)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Încarcă elemente suplimentare de configurare"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Încarcă aranjamentele și opțiunile exotice ori rar folosite"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Suprimă mesajul de avertizare „Modicare X sysconfig”"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Permite dezactivarea indicatorului tastatură din panou"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Arată indicator leduri tastatură"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Previzualizare tastatură, decalaj X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Previzualizare tastatură, decalaj Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Previzualizare tastatură, lățime"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Previzualizare tastatură, înălțime"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupuri secundare"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Afișare steaguri în miniaplicație"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Afișare steaguri în miniaplicație pentru a indica aranjamentul curent"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Familia fontului"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Fontul"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Familia fontului indicatorului de aranjament"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Dimensiunea fontului"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Dimensiunea fontului indicatorului de aranjament"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Culoarea de prim-plan"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Culoarea de prim-plan a indicatorului de aranjament"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Culoarea de fundal"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Culoarea de fundal a indicatorului de aranjament"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Lista modulelor Indicator tastatură, activate "
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Aranjament tastatură"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Module Indicator tastatură"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Module active:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Lista modulelor active"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Activează mai multe module"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Dezactivare modul selectat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Crește prioritatea modulului"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Scade prioritatatea modulului"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Configurare modul selectat"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Închide dialogul"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Adaugă modul"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Module disponibile:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Fără descriere."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nu s-a putut deschide fișierul de ajutor"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Nu s-a putut inițializa GCong: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Module Indicator tastatură"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Activare/dezactivare module instalate"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/si.po b/po/si.po
index 0b2b530..f49a54a 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1,244 +1,215 @@
-# translation of libmatekbd.si.po to Sinhala
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Danishka Navin <[email protected]>, 2007.
+# 
+# Translators:
+# Danishka Navin <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.si\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-27 03:53+0100\n"
-"PO-Revision-Date: 2007-05-25 11:47+0530\n"
-"Last-Translator: Danishka Navin <[email protected]>\n"
-"Language-Team: Sinhala <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Sinhala (http://www.transifex.com/mate/MATE/language/si/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: si\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
 
-#: ../libmatekbd/matekbd-indicator.c:618
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "පිළිඹිබුව පුරණයෙදි දෝෂයක් තිබුනි: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB ආරම්භන දෝෂය"
 
-#: ../libmatekbd/matekbd-indicator-config.c:164
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "පිළිඹිබුව පුරණයෙදි දෝෂයක් තිබුනි: %s"
+msgid ""
+"Keyboard layout \"%s\"\n"
+"Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
+"For licensing see package metadata"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
+#, c-format
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:795
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "සැලසුම \"%s\""
 msgstr[1] "සැලසුම් \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:814
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "විකල්පය \"%s\""
 msgstr[1] "විකල්ප \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:822
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "ආකෘතිය \"%s\", %s සහ %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:823
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "සැලසුම නැත"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:824
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "විකල්ප නැත"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "යතුරු පුවරුවෙ ආකෘතිය"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "යතුරු පුවරුවෙ ආකෘතිය"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "යතුරු පුවරුවෙ සැලසුම"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "යතුරු පුවරුවෙ සැලසුම"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "යතුරු පුවරුවෙ විකල්ප"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "යතුරු පුවරුවෙ නවීකරණය පාලනයන්"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"යතුරු පුවරුවෙ ස්වභාවය කිනම් හො අවස්තාවක ප්‍රථියෙදුනා,වුවිට ක්‍රියාත්මක වන ඛෙත එකතුවක්. "
-"xmodmap මත පදනම්වු වෙනස්කිරිම් නැවත යෙදිම සඳහා ප්‍රයොජනවත්වෙයි"
+msgstr "යතුරු පුවරුවෙ ස්වභාවය කිනම් හො අවස්තාවක ප්‍රථියෙදුනා,වුවිට ක්‍රියාත්මක වන ඛෙත එකතුවක්. xmodmap මත පදනම්වු වෙනස්කිරිම් නැවත යෙදිම සඳහා ප්‍රයොජනවත්වෙයි"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap ගොනු ලැයිස්තුව"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME නාමාවලිය තුල ඇති modmap ගොනු ලැයිස්තුව."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "කවුළුව නිර්මාණය විමෙදි, සාමාන්‍ය සමුහය යොමුකරන්න"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "එක් කවුළුවකට වෙන් වු සමුහය බැගින් තබාන්න සහ පාලනය කරන්න"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "යතුරු පුවරුවෙ නවීකරණය පාලනයන්"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "යතුරු පුවරුවෙ සැලසුම"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "යතුරු පුවරුවෙ ආකෘතිය"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "යතුරු පුවරුවෙ විකල්ප"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid ""
-"Keyboard settings in mateconf will be overridden from the system ASAP "
-"(deprecated)"
-msgstr ""
-" mateconf තුලවු යතුරු පුවරුවෙ සැලසුම් හැකි ඉක්මනින් පද්ධතිය මගින් ප්‍රතිරචනය වෙයි"
-"(විරුද්ධත්වය පළකරන්න)"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "සැලසුම් සමුහ සමඟ දර්ශක සුරකින්න/නැවත පිහිටුවන්න"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Secondary groups"
-msgstr "ද්විතීක සමුහ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet"
-msgstr "ඇප්ලට් එක තුල සංඥාවන් දක්වන්න"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "දැනට ඇති සැලසුම දැක්විමට ඇප්ලට් එක තුල සංඥාවන් දක්වන්න"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "සමුහ නම් වෙනුවට සැලසුම් නම් පෙන්වන්න"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
+msgstr "සමුහ නම් වෙනුවට සැලසුම් නම් පෙන්වන්න (බහු සැලසුම් සහය ලබාදෙන XFree වෙළුම් සඳහා පමණි)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
 msgstr ""
-"සමුහ නම් වෙනුවට සැලසුම් නම් පෙන්වන්න (බහු සැලසුම් සහය ලබාදෙන XFree "
-"වෙළුම් සඳහා පමණි)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig වෙනස්විය\" අවවාදාත්මක පනිවිඩය යටපත් කරන්න"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "යතුරු පුවරුවෙ පෙර දැක්ම,  X සමතල"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "යතුරු පුවරුවෙ පෙර දැක්ම, Y සමතල"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
+msgid "The Keyboard Preview, width"
+msgstr "යතුරු පුවරුවෙ පෙර දැක්ම, පළල"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "යතුරු පුවරුවෙ පෙර දැක්ම, උස"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, width"
-msgstr "යතුරු පුවරුවෙ පෙර දැක්ම, පළල"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "ද්විතීක සමුහ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "සක්‍රිය යතුරු පුවරුව දර්ශක ප්ලගින්ස් ලැයිස්තුව"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
 msgid ""
-"Very soon, keyboard settings in mateconf will be overridden (from the system "
-"configuration) This key has been deprecated since MATE 2.12, please unset "
-"the model, layouts and options keys to get the default system configuration."
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
 msgstr ""
-"mateconf තුලවු යතුරු පුවරුවෙ සැලසුම් හැකි ඉක්මනින් ප්‍රතිරචනයවෙයි (පද්ධති අකෘතියෙන්) "
-"මෙම යතුර MATE 2.12 සිට එකඟව නැත, සාමාන්‍ය පද්ධති අකෘතිය ලබාගැනි සඳහා "
-"කරුණාකර ආදර්ශක, ආකෘති සහ විකල්ප යතුරු නොසකසන්න."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "යතුරු පුවරුවෙ සැලසුම"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "යතුරු පුවරුවෙ ආකෘතිය"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap ගොනු ලැයිස්තුව"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
-msgstr "බොහෝ ක්‍රියාකාරි ප්ලගින්"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
-msgstr "ක්‍රියාකාරි ප්ලගින්: (_p)"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
-msgstr "ප්ලගින් එක් කරන්න"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
-msgstr "සංවාද කොටුව වසන්න"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
-msgstr "තොරාගත් ප්ලගින් එක සුසර කරන්න"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
-msgstr "තොරාගත් ප්ලගින් එක නිෂ්ක්‍රිය කරන්න"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
-msgstr "ප්ලගින් ප්‍රමුඛතාව අඩු කරන්න"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr "ප්ලගින් ප්‍රමුඛතාව වැඩි කරන්න"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
-msgstr "යතුරු පුවරුව දර්ශක ප්ලගින්ස්"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
-msgstr "ක්‍රියාකාරි ප්ලගින් ලැයිස්තුව"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
-msgstr "බාවිතයට ඇති ප්ලගින්ස්: (_A)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:117
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "විස්තරය නැත."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:326
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "init MateConf: %s අසමත්විය\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "ස්ථාපිත ප්ලගින් සක්‍රිය/නිෂ්ක්‍රිය කරන්න"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "යතුරු පුවරුවෙ දර්ශකය ප්ලගින්ස්"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:61
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "යතුරු පුවරුවෙ දර්ශකය පරික්‍ෂාව (%s)"
 
-#: ../test/matekbd-indicator-test.c:70
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "දර්ශකය:"
-
diff --git a/po/sk.po b/po/sk.po
index 94fb28d..231bab6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,31 +5,31 @@
 # Translators:
 # Ján Ďanovský <[email protected]>, 2014
 # Roman Mátyus <[email protected]>, 2010
-# tibbi <[email protected]>, 2014
+# Tibor Kaputa <[email protected]>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-02-20 23:33+0000\n"
-"Last-Translator: Ján Ďanovský <[email protected]>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/MATE/language/sk/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Slovak (http://www.transifex.com/mate/MATE/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Nastala chyba pri načítaní obrázku: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Chyba inicializácie XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -37,16 +37,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Rozloženie klávesnice „%s“\nCopyright &#169; X.Org Foundation a prispievajúci k XKeyboardConfig\nLicencovanie si pozrite v metadátach balíka"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Rozloženie klávesnice „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -54,7 +54,7 @@ msgstr[0] "rozloženie „%s“"
 msgstr[1] "rozloženia „%s“"
 msgstr[2] "rozložení „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -62,227 +62,153 @@ msgstr[0] "možnosť „%s“"
 msgstr[1] "možnosti „%s“"
 msgstr[2] "možnosti „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model „%s“, %s a %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "bez rozloženia"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "bez možností"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Model klávesnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "model klávesnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Rozloženie klávesnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "rozloženie klávesnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Možnosti klávesnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Obsluhy aktualizácie klávesnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Skupina skriptov určená na spustenie vždy, keď dôjde k opätovnému načítaniu stavu klávesnice. Je to užitočné na opakované použitie zmien v „xmodmap“"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "zoznam súborov „modmap“"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Zoznam súborov „modmap“ v priečinku $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Predvolená skupina, priradená pri vytvorení okna"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Udržiavať a spravovať samostatnú skupinu pre každé okno"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Ukladať/obnovovať indikátory spoločne so skupinami rozloženia"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Zobraziť názvy rozložení namiesto názvov skupín"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Zobraziť názvy rozložení namiesto názvov skupín (iba u verzií XFree podporujúcich viacnásobné rozloženia)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Nahrať prídavné položky nastavenia"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Načítať exotické, zriedka používané rozloženia a možnosti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Potlačiť varovnú správu o „zmene systémového nastavenia X“"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Náhľad klávesnice, posun X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Náhľad klávesnice, posun Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Náhľad klávesnice, šírka"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Náhľad klávesnice, výška"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Sekundárne skupiny"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Zobraziť zástavy v aplete"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Zobraziť zástavy v aplete označujúce aktuálne rozloženie"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Rodina písma"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Rodina písma pre indikátor rozloženia"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Veľkosť písma"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Veľkosť písma pre indikátor rozloženia"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Farba popredia"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Farba popredia pre indikátor rozloženia"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Farba pozadia"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Farba pozadia pre indikátor rozloženia"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Zoznam povolených zásuvných modulov Indikátora klávesnice"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Rozloženie klávesnice"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Zásuvné moduly Indikátora klávesnice"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktívne zásuvné _moduly:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Zoznam aktívnych zásuvných modulov"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Aktivovať viac zásuvných modulov"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Deaktivovať vybraný zásuvný modul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Zvýšiť prioritu zásuvného modulu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Znížiť prioritu zásuvného modulu"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Nastaviť vybraný zásuvný modul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Zavrieť dialógové okno"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Pridať zásuvný modul"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Dostupné zásuvné moduly:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Bez popisu."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Nepodarilo sa otvoriť súbor pomocníka"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Nepodarilo sa inicializovať MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Zásuvné moduly Indikátora klávesnice"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Povoliť/zakázať inštalované zásuvné moduly"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/sl.po b/po/sl.po
index b783153..390c4ad 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,31 +3,31 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# jierro <[email protected]>, 2013
+# Damir Jerovšek <[email protected]>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-02-19 18:41+0000\n"
-"Last-Translator: jierro <[email protected]>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/MATE/language/sl/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Slovenian (http://www.transifex.com/mate/MATE/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Med nalaganjem slike je prišlo do napake: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Napaka med začenjanjem XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -35,16 +35,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Razporeditev tipk \"%s\"\nAvtorske pravice &#169; razvijalci X.Org Foundation in XKeyboardConfig\nZa dovoljenja si oglejte metapodatke paketa"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Razporeditev tipk \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -53,7 +53,7 @@ msgstr[1] "razpored \"%s\""
 msgstr[2] "razporeda \"%s\""
 msgstr[3] "razporeditve \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -62,227 +62,153 @@ msgstr[1] "možnost \"%s\""
 msgstr[2] "možnosti \"%s\""
 msgstr[3] "možnosti \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s in %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ni razporeditve"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ni možnosti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Model tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "model tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Razporeditev tipk"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "razporeditev tipk"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Možnosti tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Ročniki posodobitev tipkovnice"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Zbirka skript za izvajanje ob ponovnem nalaganju stanja tipkovnice. Uporabno za ponovno uveljavljanje prilagoditev, temelječih na xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "seznam datotek modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Seznam datotek modmap, razpoložljivih v mapi $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Privzeta skupina, dodeljena pri ustvarjenju okna"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Ohrani in upravljaj ločene skupine po oknih"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Shrani/povrni kazalnike skupaj s skupinami razporeditev"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Pokaži imena razporeditev namesto imen skupin"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Pokaži imena razporeditev namesto imen skupin (samo za različice XFree, ki podpirajo različne razporeditve)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Naloži dodatne nastavitvene predmete"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Nalaganje posebnih, redko uporabljenih razporeditev in možnosti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Prepreči opozorilo \"X sysconfig je spremenjen\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Predogled tipkovnice, odmik X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Predogled tipkovnice, odmik Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Predogled tipkovnice, širina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Predogled tipkovnice, višina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Drugotne skupine"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Pokaži zastavice v apletu"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Pokaži zastavice v apletu za prikaz trenutne razporeditve"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Družina pisave"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Družina pisave za kazalnik razporeditve"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Velikost pisave"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Velikost pisave za kazalnik razporeditve"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Barva ospredja"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Barva ospredja za kazalnik razporeditve"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Barva ozadja"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Barva ozadja za kazalnik razporeditve"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Seznam omogočenih vstavkov kazalnika tipkovnice"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Razporeditev tipk"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Vstavki kazalnika tipkovnice"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Dejavni _vstavki:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Seznam dejavnih vstavkov"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Omogoči več vstavkov"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Onemogoči izbran vstavek"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Povečaj prednost vstavka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Zmanjšaj prednost vstavka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Nastavitev izbranega vstavka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Zapri pogovorno okno"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Dodaj vstavek"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Razpoložljivi vstavki:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Brez opisa."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Ni mogoče odpreti datoteke pomoči"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Začenjanje programa MateConf je spodletelo: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Vstavki kazalnika tipkovnice"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Omogoči/onemogoči nameščene vstavke"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/sq.po b/po/sq.po
index 05ad657..0907d79 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,32 +3,32 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ard1t <[email protected]>, 2014
+# Ardit Dani <[email protected]>, 2014
 # Laurent Dhima <[email protected]>, 2007, 2008
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-01-16 14:31+0000\n"
-"Last-Translator: ard1t <[email protected]>\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/MATE/language/sq/)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Albanian (http://www.transifex.com/mate/MATE/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "U verifikua një gabim gjatë ngarkimit të një figure: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Gabim i nisjes së XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,250 +36,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Planimetria e tastierës «%s»\nCopyright &#169; X.Org Foundation e bashkpunëtorëve të XKeyboardConfig\nPër liçensën shiko metadata e paketit"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "i panjohur"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Planimetria e tastierës \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "planimetria \"%s\""
 msgstr[1] "planimetritë \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "opsioni \"%s\""
 msgstr[1] "opsionet \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modeli \"%s\", %s dhe %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "asnjë planimetri"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "asnjë opsion"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Modeli i tastierës"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "Modeli i tastierës"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Planimetria e tastierës"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "Planimetria e tastierës"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Opsionet e tastierës"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Trajtues rifreskimi tastiere"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Një përmbledhje script/esh për t'u përdorur kur gjendja e tastierës ringarkohet. E nevojshme për të ri-aplikuar rregullime bazë tek xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "Lista e file modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Një listë me file modmap në dispozicion në directory $HOME."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Grupi i prezgjedhur, caktuar kur krijohet dritarja"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Mban dhe manazhon grupe të veçantë për dritare"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Ruaj/rikthe treguesit së bashku me grupet e planimetrive"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Shfaq emrat e planimetrive në vend të emrave të grupit"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Shfaq emrat e planimetrive në vend të emrave të grupit (vetëm për versionet e XFree që suportojnë më shumë se një planimetri)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Ngarko artikuj shtesë të konfigurimit"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Ngarko ekzotike, planet e përdorura rrallë dhe opsionet"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Blloko mesazhin paralajmërues \"konfigurimi i sistemit X është ndryshuar\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Pamja e parë e tastierës, offset horizontal"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Pamja e parë e tastierës, offset vertikal"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Pamja e parë e tastierës, gjerësia"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Pamja e parë e tastierës, lartësia"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Grupe dytësorë"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Shfaq flamuj në applet"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Shfaq flamuj në applet për të treguar planimetrinë në përdorim"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Familja e gërmave"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Familja e gërmave për planin indikues"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Madhësia e gërmave"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Madhësia e gërmave për planimetrine indikuese"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Ngjyra e planit parë"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Ngjyra e planit parë për planimetrine indikuese"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Ngjyra e sfondit"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Ngjyra e sfondit për planimetrinë indikuese"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Lista e plugin të Treguesi i tastierës aktivë"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Planimetria e tastierës"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Plugin e treguesit të tastierës"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_Plugin aktivë:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Lista e plugin aktivë"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Aktivizo plugin të tjerë"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Çaktivizo plugin e zgjedhur"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Rrit prioritetin e plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Ul prioritetin e plugin"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Konfiguro plugin e zgjedhur"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Mbyll dritaren e dialogut"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Shto plugin"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "Plugin në _dispozicion:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Asnjë përshkrim."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "E pamundur hapja e file të ndihmës"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Gabim gjatë nisjes së MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Plugin e treguesit të tastierës"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Aktivizo/çaktivizo plugin e instaluar"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/sr.po b/po/sr.po
index 21e0471..f55636a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,26 +11,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2014-11-28 20:24+0000\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-10-09 08:02+0000\n"
 "Last-Translator: Мирослав Николић <[email protected]>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/MATE/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/mate/MATE/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sr\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"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Дошло је до грешке учитавања слике: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Грешка покретања ИксКБ-а"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -38,16 +38,16 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Распоред тастатуре „%s“\nАуторска права &#169; Х.Орг Фондација и доприносиоци Подешавања Х тастатуре\nЗа услове лиценцирања погледајте метаподатке пакета"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Распоред тастатуре „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
@@ -55,7 +55,7 @@ msgstr[0] "распоред „%s“"
 msgstr[1] "распореди „%s“"
 msgstr[2] "распореди „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
@@ -63,227 +63,153 @@ msgstr[0] "опција „%s“"
 msgstr[1] "опције „%s“"
 msgstr[2] "опције „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "модел „%s“, „%s“ и „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "нема распореда"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "нема опција"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Модел тастатуре"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "модел тастатуре"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Распоред тастатуре"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "распоред тастатуре"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Опције тастатуре"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Руковаоци освежавањем тастатуре"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Скуп скрипти за покретање кад год се измени стање тастатуре. Корисно за поновно укључивање дотеривања на основу „xmodmap“-а"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "списак модмап датотека"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Списак модмап датотека доступних у „$HOME“ директоријуму."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Основна група, додељена приликом прављења прозора"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Држи и ради са одвојеном групом по прозору"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Чува/враћа показатеље заједно са групама распореда"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Приказује називе распореда уместо назива група"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Приказује називе распореда уместо назива група (само за издања ИксФриа која подржавају више распореда)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Учитава додатне ставке за подешавање"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Учитава необичне, ретко коришћење распореде и опције"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Потискује упозорење „измењена системска подешавања Икса“"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "Омогућава искључивање иконице показивача тастатуре у фиоци"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "Приказује диодни показивач тастатуре"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Преглед тастатуре, водоравни померај"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Преглед тастатуре, усправни померај"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Преглед тастатуре, ширина"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Преглед тастатуре, висина"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "Секундарне групе"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Приказује заставице у програмчету"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Приказује заставице у програмчету које ће указивати на тренутни распоред"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Породица слова"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "Словни лик"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Породица слова у показивачу распореда тастатуре"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Величина слова"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Величина слова у показивачу распореда тастатуре"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "Словни лик показивача распореда. Ово треба бити у запису „[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]“."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Боја слова"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Боја слова у показивачу распореда тастатуре"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Боја слова показивача распореда. Треба бити у „Ц З П“ запису, на пример „255 0 0“."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Боја позадине"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Боја позадине у показивачу распореда тастатуре"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Списак укључених прикључака показивача тастатуре"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "Боја позадине показивача распореда. Треба бити у „Ц З П“ запису, на пример „255 0 0“."
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Распоред тастатуре"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Прикључци показивача тастатуре"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Укључени _прикључци:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Списак радних прикључака"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Покрени још прикључака"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Искључи изабрани прикључак"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Повећај хитност прикључка"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Смањи хитност прикључка"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Подеси изабрани прикључак"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Затвори ово прозорче"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Додај прикључак"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Доступни прикључци:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Нема описа."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Не могу да отворим датотеку помоћи"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Не могу да покренем Мејтова подешавања: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Прикључци показивача тастатуре"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Укључите/искључите инсталиране прикључке"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/[email protected] b/po/[email protected]
index 7fcabcb..afc7dec 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,322 +1,218 @@
-# Serbian translation of mate-control-center
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007.
-#
-# This file is distributed under the same license as the mate-control-center package.
-# Miloš Popović <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006, 2007
+# Miloš Popović <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-05-26 22:36+0000\n"
-"PO-Revision-Date: 2010-08-22 00:23+0200\n"
-"Last-Translator: Miloš Popović <[email protected]>\n"
-"Language-Team: Serbian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/mate/MATE/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:312
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Dogodila se greška prilikom učitavanja slike: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:643
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "Ne mogu da pokrenem XKB"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Raspored tastature „%s“\n"
-"Autorska prava &#169; X.Org Foundation i XKeyboardConfig priložnici\n"
-"Za uslove licenciranja pogledajte meta podatke paketa"
+msgstr "Raspored tastature „%s“\nAutorska prava &#169; X.Org Foundation i XKeyboardConfig priložnici\nZa uslove licenciranja pogledajte meta podatke paketa"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-#| msgid "Keyboard layout"
 msgid "Keyboard Layout \"%s\""
 msgstr "Raspored tastature „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
-msgstr[0] "Raspored „%s“"
-msgstr[1] "Rasporedi „%s“"
-msgstr[2] "Rasporedi „%s“"
-msgstr[3] "Raspored „%s“"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
-msgstr[0] "Opcija „%s“"
-msgstr[1] "Opcije „%s“"
-msgstr[2] "Opcije „%s“"
-msgstr[3] "Opcija „%s“"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model „%s“, „%s“ i „%s“"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "nema rasporeda"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "nema opcija"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Model tastature"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "model tastature"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Raspored tastature"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "raspored tastature"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Opcije tastature"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Baratanje osvežavanjem tastature:"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Skup skripti za pokretanje kad god se izmeni stanje tastature. Korisno za "
-"ponovno uključivanje xmodmap izmena"
+msgstr "Skup skripti za pokretanje kad god se izmeni stanje tastature. Korisno za ponovno uključivanje xmodmap izmena"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "spisak modmap datoteka"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Spisak modmap datoteka dostupnih u $HOME direktorijumu."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Podrazumevana grupa, dodeljena po pravljenju prozora"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Drži i radi sa odvojenom grupom po prozoru"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Baratanje osvežavanjem tastature:"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Raspored tastature"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Model tastature"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Opcije tastature"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Učitava čudne, retko korišćenje rasporede i opcije"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Učitava dodatne stavke za podešavanje"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Sačuvaj/vrati pokazatelje zajedno sa grupama rasporeda"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Sekungarne grupe"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Prikaži zastavice u programčetu"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr ""
-"Prikaži zastavice u programčetu kako koje će ukazivati na trenutni raspored"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Prikaži nazive rasporeda umesto imena grupa"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"Prikaži nazive rasporeda umesto imena grupa (samo za XFree izdanja koja "
-"podržavaju više rasporeda)"
+msgstr "Prikaži nazive rasporeda umesto imena grupa (samo za XFree izdanja koja podržavaju više rasporeda)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Učitava dodatne stavke za podešavanje"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Učitava čudne, retko korišćenje rasporede i opcije"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Sakrij upozorenje „izmenjena sistemska podešavanja Iksa“"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Pregled tastature, X pomeraj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Pregled tastature, Y pomeraj"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Pregled tastature, visina"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Pregled tastature, širina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Boja pozadine"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Boja pozadine u pokazivaču rasporeda tastature"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Font"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Pregled tastature, visina"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Font u pokazivaču rasporeda tastature"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekungarne grupe"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Veličina fonta"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Veličina finta u pokazivaču rasporeda tastature"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Boja fonta"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Boja fonta u pokazivaču rasporeda tastature"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Lista omogućenih dodataka pokazivača tastature"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "raspored tastature"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "model tastature"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Boja pozadine"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "spisak modmap datoteka"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
-#| msgid "Keyboard layout"
 msgid "Keyboard Layout"
 msgstr "Raspored tastature"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Uključi još dodataka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Uključeni dodaci:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Zatvori ovo prozorče"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Podesi izabrani dodatak"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Isključi izabrani dodatak"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Smanji prioritet dodatka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Povećaj prioritet dodatka"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Dodatak pokazivača tastature"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Lista dostupnih dodataka"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Dodaj dodatak"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Dostupni dodaci:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Nema opisa"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Ne mogu da otvorim datoteku pomoći"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Ne mogu da pokrenem MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Omogući/onemogući instalirani dodatak"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Dodaci pokazivača tastature"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Proba pokazivača tastature (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Pokazivač:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Podešavanja tastature u GKonfu će ubrzo biti prevaziđena od strane sistema "
-#~ "(zastarelo)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Podešavanja tastature u GKonfu će ubrzo biti prevaziđena (iz podešavanja "
-#~ "sistema)  Ovaj ključ je zastareo počevši od Gnoma 2.12, izbacite postavke "
-#~ "modela, rasporeda i opcija da biste dobili podrazumevano podešavanje "
-#~ "sistema."
diff --git a/po/sv.po b/po/sv.po
index a8343ec..e8f8a92 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,306 +1,215 @@
-# Swedish translation for libmatekbd.
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# Daniel Nylander <[email protected]>, 2007, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Daniel Nylander <[email protected]>, 2007, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-26 23:07+0200\n"
-"PO-Revision-Date: 2010-07-26 23:08+0100\n"
-"Last-Translator: Daniel Nylander <[email protected]>\n"
-"Language-Team: Swedish <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Swedish (http://www.transifex.com/mate/MATE/language/sv/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119
-#: ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Det inträffade ett fel vid inläsning av en bild: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735
-#: ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB-initieringsfel"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Tangentbordslayouten \"%s\"\n"
-"Copyright &#169; X.Org Foundation och XKeyboardConfig-bidragsgivarna\n"
-"Se paketets metadata för licensiering"
+msgstr "Tangentbordslayouten \"%s\"\nCopyright &#169; X.Org Foundation och XKeyboardConfig-bidragsgivarna\nSe paketets metadata för licensiering"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "Tangentbordslayout \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "layout \"%s\""
 msgstr[1] "layouter \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "alternativ \"%s\""
 msgstr[1] "alternativ \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "modell \"%s\", %s och %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ingen layout"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "inga alternativ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
-msgid "A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments"
-msgstr "En samling skript att köra när tangentbordstillståndet läses om. Användbart för att återtillämpa xmodmap-baserade justeringar"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
-msgid "A list of modmap files available in the $HOME directory."
-msgstr "En lista över modmap-filer tillgängliga i $HOME-katalogen."
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
-msgid "Default group, assigned on window creation"
-msgstr "Standardgrupp, tilldelade för fönsterskapande"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
-msgid "Keep and manage separate group per window"
-msgstr "Behåll och hantera separat grupp per fönster"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Tangentbordsmodell"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Tangentbordsuppdateringshanterare"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "tangentbordsmodell"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Tangentbordslayout"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Tangentbordsmodell"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "tangentbordslayout"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Tangentbordsalternativ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "Läs in exotiska, sällan använda layouter och alternativ"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Tangentbordsuppdateringshanterare"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "Läs in extra konfigurationsobjekt"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
+msgid ""
+"A collection of scripts to run whenever the keyboard state is reloaded. "
+"Useful for re-applying xmodmap based adjustments"
+msgstr "En samling skript att köra när tangentbordstillståndet läses om. Användbart för att återtillämpa xmodmap-baserade justeringar"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Save/restore indicators together with layout groups"
-msgstr "Spara/återställ indikatorer tillsammans med layoutgrupper"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "fillista för modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "Sekundära grupper"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
+msgid "A list of modmap files available in the $HOME directory."
+msgstr "En lista över modmap-filer tillgängliga i $HOME-katalogen."
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "Visa flaggor i panelprogrammet"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
+msgid "Default group, assigned on window creation"
+msgstr "Standardgrupp, tilldelade för fönsterskapande"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Visa flaggor i panelprogrammet för att indikera aktuell layout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
+msgid "Keep and manage separate group per window"
+msgstr "Behåll och hantera separat grupp per fönster"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
+msgid "Save/restore indicators together with layout groups"
+msgstr "Spara/återställ indikatorer tillsammans med layoutgrupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Visa layoutnamn istället för gruppnamn"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
-msgid "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
+msgid ""
+"Show layout names instead of group names (only for versions of XFree "
+"supporting multiple layouts)"
 msgstr "Visa layoutnamn istället för gruppnamn (endast för versioner av XFree som har stöd för flera layouter)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "Läs in extra konfigurationsobjekt"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "Läs in exotiska, sällan använda layouter och alternativ"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Visa inte varningsmeddelandet \"X sysconfig changed\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Tangentbordsförhandsvisning, X-position"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Tangentbordsförhandsvisning, Y-position"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "Tangentbordsförhandsvisning, höjd"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Tangentbordsförhandsvisning, bredd"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "Bakgrundsfärgen"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "Bakgrundsfärgen för layoutindikatorn"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "Typsnittsfamiljen"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Tangentbordsförhandsvisning, höjd"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "Typsnittsfamiljen för layoutindikatorn"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Sekundära grupper"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "Typsnittsstorleken"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "Typsnittsstorleken för layoutindikatorn"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Förgrundsfärgen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "Förgrundsfärgen för layoutindikatorn"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Listan över aktiverade insticksmoduler för tangentbordsindikator"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "tangentbordslayout"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "tangentbordsmodell"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "Bakgrundsfärgen"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "fillista för modmap"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Tangentbordslayout"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "Aktivera fler insticksmoduler"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Aktiva _insticksmoduler:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "Stäng dialogrutan"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "Konfigurera markerad insticksmodul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Inaktivera markerad insticksmodul"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "Sänk insticksmodulens prioritet"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "Öka insticksmodulens prioritet"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "Insticksmoduler för tangentbordsindikator"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "Listan över aktiva insticksmoduler"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Lägg till insticksmodul"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Tillgängliga insticksmoduler:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Ingen beskrivning."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Kunde inte öppna hjälpfilen"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Misslyckades med att initera MateConf: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Aktivera/inaktivera installerade insticksmoduler"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Insticksmoduler för tangentbordsindikator"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Tangentbordsindikatortest (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Indikator:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Tangentbordsinställningar i mateconf kommer att åsidosättas från systemet så "
-#~ "snart som möjligt (föråldrad)"
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Mycket snart kommer tangentbordsinställningar i mateconf att åsidosättas "
-#~ "(från systemkonfigurationen) Den här nyckeln har varit föråldrad sedan "
-#~ "MATE 2.12, avmarkera nycklarna för modell, layouter och alternativ för "
-#~ "att få standardsystemkonfigurationen."
-
diff --git a/po/ta.po b/po/ta.po
index bed3cca..174933a 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,302 +1,217 @@
-# translation of libmatekbd.master.ta.po to Tamil
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.Vasudevan <[email protected]>, 2007, 2010.
-# I. Felix <[email protected]>, 2008, 2009.
-# Dr,T,Vasudevan <[email protected]>, 2010.
+# 
+# Translators:
+# Dr,T,Vasudevan <[email protected]>, 2010
+# Dr.T.Vasudevan <[email protected]>, 2007, 2010
+# I. Felix <[email protected]>, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master.ta\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-24 20:06+0530\n"
-"PO-Revision-Date: 2010-07-24 20:07+0530\n"
-"Last-Translator: Dr.T.Vasudevan <[email protected]>\n"
-"Language-Team: Tamil <<[email protected]>>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Tamil (http://www.transifex.com/mate/MATE/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"X-Generator: Lokalize 1.0\n"
-
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "ஒரு பிம்பத்தை ஏற்றுவதில் பிழை ஏற்பட்டது: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB துவக்கப் பிழை"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"விசைப்பலகை அமைப்பு \"%s\"\n"
-"பதிப்புரிமை &#169; X.Org Foundation மற்றும் XKeyboardConfig contributors\n"
-"உரிமத்திற்கு தொகுப்பு metadataவை பார்க்கவும்"
+msgstr "விசைப்பலகை அமைப்பு \"%s\"\nபதிப்புரிமை &#169; X.Org Foundation மற்றும் XKeyboardConfig contributors\nஉரிமத்திற்கு தொகுப்பு metadataவை பார்க்கவும்"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "விசைப்பலகை அமைப்பு \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "அமைப்பு \"%s\""
 msgstr[1] "அமைப்புகள் \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "விருப்பம் \"%s\""
 msgstr[1] "விருப்பங்கள் \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "மாதிரி \"%s\", %s மற்றும் %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "அமைப்பு இல்லை"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "விருப்பங்கள் இல்லை"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "விசைப்பலகை மாதிரி"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "விசைப்பலகை மாதிரி"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "விசைப்பலகை அமைப்பு"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "விசைப்பலகை அமைப்பு"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "விசைப்பலகை விருப்பங்கள்"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "விசைப்பலகை மேம்பாடு கையாளிகள்"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"ஒரு தொகுப்பு ஸ்கிரிப்ட்கள், விசைப்பலகை நிலையை மீட்டு ஏற்றும் போதெல்லாம் இயக்க. எக்ஸ்மாட்மாப் "
-"அடிப்படையான சரிசெய்தல்களை மீண்டும் பயன்படுத்த உபயோகமாகும்."
+msgstr "ஒரு தொகுப்பு ஸ்கிரிப்ட்கள், விசைப்பலகை நிலையை மீட்டு ஏற்றும் போதெல்லாம் இயக்க. எக்ஸ்மாட்மாப் அடிப்படையான சரிசெய்தல்களை மீண்டும் பயன்படுத்த உபயோகமாகும்."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap கோப்பு பட்டியல்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME அடைவிலுள்ள modmap கோப்புகளின் பட்டியல்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "முன்னிருப்பு குழு, சாளரம் உருவாக்கும் போது வழங்கப்பட்டது"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ஒரு சாளரத்திற்கு தனி குழுவினை வைத்து மேலாண்மை செய்யவும்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "விசைப்பலகை மேம்பாடு கையாளிகள்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "விசைப்பலகை அமைப்பு"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "விசைப்பலகை மாதிரி"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "விசைப்பலகை விருப்பங்கள்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "அரிதாக பயன்படுத்தப்பட்ட அமைப்புகள் மற்றும் விருப்பங்களை ஏற்று"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "கூடுதல் கட்டமைப்பு உருப்படிகளை ஏற்று"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "சேமி /மீட்டெடு சுட்டிகள் அமைப்பு குழுக்களுடன்."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "இரண்டாம் நிலை குழுக்கள்"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "கொடிகளை குறும்பயனில் காட்டு"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "தற்போதைய அமைப்பை கொடி கூடிய குறும்பயனில் காண்பிக்கவும்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "குழுப்பெயர்களுக்கு பதில் அமைப்பு பெயர்களைக் காட்டுக."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"குழுப்பெயர்களுக்கு பதில் அமைப்பு பெயர்களைக் காட்டுக. (பல அமைப்புகளை ஆதரிக்கும் எக்ஸ் ஃப்ரீ "
-"பதிப்புகளுக்கு மட்டும்)"
+msgstr "குழுப்பெயர்களுக்கு பதில் அமைப்பு பெயர்களைக் காட்டுக. (பல அமைப்புகளை ஆதரிக்கும் எக்ஸ் ஃப்ரீ பதிப்புகளுக்கு மட்டும்)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "கூடுதல் கட்டமைப்பு உருப்படிகளை ஏற்று"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "அரிதாக பயன்படுத்தப்பட்ட அமைப்புகள் மற்றும் விருப்பங்களை ஏற்று"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig changed\"  எச்சரிக்கை செய்திகளை அடக்குக."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "விசைப்பலகை முன்பார்வை, X offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "விசைப்பலகை முன்பார்வை, Y offset"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "விசைப்பலகை முன்பார்வை, உயரம்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "விசைப்பலகை முன்பார்வை, அகலம்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "பின்னணி வண்ணம்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "விசைப்பலகை அமைவு காட்டிக்கு பின்னணி வண்ணம்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "எழுத்துரு குடும்பம்"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "விசைப்பலகை முன்பார்வை, உயரம்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "விசைப்பலகை அமைவு காட்டிக்கு எழுத்துரு குடும்பம்"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "இரண்டாம் நிலை குழுக்கள்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "எழுத்துரு அளவு"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "விசைப்பலகை அமைவு காட்டிக்கு எழுத்துரு அளவு"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "முன்னணி வண்ணம்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "விசைப்பலகை அமைவு காட்டிக்கு முன்னணி வண்ணம்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "செயல்படுத்திய விசைப்பலகையை சுட்டும் சொருகிகளின் பட்டியல்"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "விசைப்பலகை அமைப்பு"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "விசைப்பலகை மாதிரி"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "பின்னணி வண்ணம்"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap கோப்பு பட்டியல்"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "விசைப்பலகை அமைப்பு"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "மேலும் பல சொருகிகளை செயல் படுத்துக"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "இயங்கும் _ச சொருகிகள்"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "உரையாடலை மூடு"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "தேர்ந்தெடுத்த சொருகியை வடிவமை"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "தேர்வுசெய்த சொருகியை செயல்நீக்கு"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "சொருகியின் முன்னுரிமையை குறை"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "சொருகியின் முன்னுரிமையை அதிகரி"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "விசைப்பலகையை சுட்டும் சொருகிகள்"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "செயலில் உள்ள சொருகிகளின் பட்டியல்"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "சொருகிகளை சேர்"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_கிடைக்கப்படும் சொருகிகள்:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "விளக்கம் இல்லை"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "உதவி கோப்பினை திறக்க முடியவில்லை"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "ஜிகான்ஃப் ஐ துவக்குதல் தோல்வியுற்றது: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "அமைக்கப்பட்ட சொருகிகளை செயல்படுத்து/ செயல் நீக்கு"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "விசைப்பலகையை உணர்த்தும் சொருகி"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "விசைப்பலகை உணர்த்துனர் சோதனை (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "சுட்டி:"
-
diff --git a/po/te.po b/po/te.po
index 3d70236..6b19e59 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,250 +1,215 @@
-# translation of libmatekbd.master.te.po to Telugu
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Krishna Babu K <[email protected]>, 2008, 2009.
+# 
+# Translators:
+# Krishnababu Krothapalli <[email protected]>, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-08-16 20:00+0000\n"
-"PO-Revision-Date: 2009-09-17 19:07+0530\n"
-"Last-Translator: Krishna Babu K <[email protected]>\n"
-"Language-Team: Telugu <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Telugu (http://www.transifex.com/mate/MATE/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
-"\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2376
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "చిత్రమును నింపుటకు అక్కడ ఒక్క దోషం ఉంది: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "XKB సిద్దీకరణ దోషం"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"కీబోర్డు వాస్తు \"%s\"\n"
-"కాపీరైట్ &#169; X.Org వ్యవస్థాపన మరియు Xకీబోర్డుఆకృతీకరణ సహాయకులు\n"
-"లైసెన్సింగ్ కొరకు ప్యాకేజి మెటాడాటా ను చూడండి"
+msgstr "కీబోర్డు వాస్తు \"%s\"\nకాపీరైట్ &#169; X.Org వ్యవస్థాపన మరియు Xకీబోర్డుఆకృతీకరణ సహాయకులు\nలైసెన్సింగ్ కొరకు ప్యాకేజి మెటాడాటా ను చూడండి"
 
-#: ../libmatekbd/matekbd-indicator.c:611
-msgid "XKB initialization error"
-msgstr "XKB సిద్దీకరణ దోషం"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "చిత్రమును నింపుటకు అక్కడ ఒక్క దోషం ఉంది: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "వాస్తు \"%s\""
 msgstr[1] "వాస్తు \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "ఐచ్చికం \"%s\""
 msgstr[1] "ఐచ్చికం \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "నమూనా \"%s\", %s మరియు %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ఏ వాస్తులేదు"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ఏ ఐచ్చికాలులేవు"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "కీబోర్డు నమూనా"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "కీబోర్డు నమూనా"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "కీబోర్డు వాస్తు"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "కీబోర్డు వాస్తు"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "కీబోర్డు ఐచ్చికాలు"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "కీబోర్డు నవీకరణ సంభాలికలు"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"కీబోర్డు స్థితి తిరిగినింప బడినప్పుడు నడువవలిసిన లిపిల యొక్క సంపుటం. xmodmap ఆధారిత సర్దుబాట్లను "
-"తిరిగి-ఆపాదించుటకు ఉపయోగం"
+msgstr "కీబోర్డు స్థితి తిరిగినింప బడినప్పుడు నడువవలిసిన లిపిల యొక్క సంపుటం. xmodmap ఆధారిత సర్దుబాట్లను తిరిగి-ఆపాదించుటకు ఉపయోగం"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap దస్త్రం జాబీతా"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "$HOME సంచయం నందు అందుబాటులో ఉన్న modmap దస్త్రాల యొక్క జాబితా."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "అప్రమేయ సమూహం, విండో సృష్టీకరణనందు అప్పగించబడింది"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "ప్రత్యేక సమూహాన్ని విండోకు నిర్వహించు మరియు ఉంచు"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "కీబోర్డు నవీకరణ సంభాలికలు"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "కీబోర్డు వాస్తు"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "కీబోర్డు నమూనా"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "కీబోర్డు ఐచ్చికాలు"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "అసాధారణమైన, అరుదుగా వుపయోగించు నమూనాలను మరియు ఐచ్చికాలను లోడుచేయుము"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "అదనపు ఆకృతీకరణ అంశములను లోడుచేయుము"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "వాస్తు సమూహాలతో సంయుక్తంగా దాయు/తిరిగినిల్వఉంచు సూచికలు"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "రెండవ సమూహాలు"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "ఆప్లెట్ నందు ప్లాగ్సను చూపుము"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "ప్రస్తుత వాస్తును సూచించుటకు ఆప్లెట్ నందు ప్లాగ్స్ ను చూపుము"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "సమూహనామాల బదులుగా వాస్తునామాలను చూపుము"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
-msgstr ""
-"సమూహనామాల బదులుగా వాస్తునామాలను చూపుము (XFree మద్దతిచ్చు బహుళ వాస్తుల యొక్క వర్షన్‌ల కొరకు "
-"మాత్రమే)"
+msgstr "సమూహనామాల బదులుగా వాస్తునామాలను చూపుము (XFree మద్దతిచ్చు బహుళ వాస్తుల యొక్క వర్షన్‌ల కొరకు మాత్రమే)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "అదనపు ఆకృతీకరణ అంశములను లోడుచేయుము"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "అసాధారణమైన, అరుదుగా వుపయోగించు నమూనాలను మరియు ఐచ్చికాలను లోడుచేయుము"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X సిస్టమ్ఆకృతీకరణ మార్చబడింది\" హెచ్చరిక సందేశం కుదించుము"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "కీబోర్డు ఉపదర్శనం, X ఆఫ్‌సెట్"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "కీబోర్డు ఉపదర్శనం, Y ఆఫ్‌సెట్"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "కీబోర్డు ఉపదర్శనం, ఎత్తు"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "కీబోర్డు ఉపదర్శనం, వెడల్పు"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "చేతనపరిచిన కీబోర్డు సూచిక ప్లగ్ఇన్ల యొక్క జాబితా"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "keyboard layout"
-msgstr "కీబోర్డు వాస్తు"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "keyboard model"
-msgstr "కీబోర్డు నమూనా"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "modmap file list"
-msgstr "modmap దస్త్రం జాబీతా"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "ఎక్కువ ప్లగ్ఇన్ల ను చేతనంచేయుము"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "ప్లగ్ఇన్ల ను చేతనంచేయుము(_p):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "డైలాగ్ ను మూయుము"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "ఎంపికచేసిన ప్లగ్ఇన్ ను ఆకృతీకరించుము"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "ఎంపికచేసిన ప్లగ్ఇన్ ను క్రియాహీనం చేయుము"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "ప్లగ్ఇన్ ప్రాముఖ్యతను తగ్గించుము"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "ప్లగ్ఇన్ ప్రాముఖ్యత ను పెంచుము"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "కీబోర్డు సూచిక ప్లగ్ఇన్లు"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "కీబోర్డు ఉపదర్శనం, ఎత్తు"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "క్రియాశీల ప్లగ్ఇన్ల యొక్క జాబితా"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "రెండవ సమూహాలు"
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "ప్లగ్ఇన్ జతచేయుము"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "అందుబాటులో ఉన్న ప్లగ్ఇన్లు(_A):"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "ఏ వివరణలేదు."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "సహాయపు దస్త్రాన్ని తెరువలేదు"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf ను సిద్దముచేయుటలో విఫలమైంది: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "సంస్థాపించిన ప్లగ్ఇన్లను చేతనం/అచేతనం చేయుము"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "కీబోర్డు సూచిక ప్లగ్ఇన్లు"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "కీబోర్డు సూచిక పరిశీలన (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "సూచిక:"
-
diff --git a/po/th.po b/po/th.po
index a471c82..3170626 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,292 +1,213 @@
-# Thai translation of libmatekbd.
-# Copyright (C) 2007-2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-# aka.ape <[email protected]>, 2007.
-# Theppitak Karoonboonyanan <[email protected]>, 2007-2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# aka.ape <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2009-12-21 21:47+0000\n"
-"PO-Revision-Date: 2010-01-02 13:00+0700\n"
-"Last-Translator:  Theppitak Karoonboonyanan <[email protected]>\n"
-"Language-Team: Thai <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Thai (http://www.transifex.com/mate/MATE/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2391
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "มีข้อผิดพลาดขณะโหลดภาพ: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "เกิดข้อผิดพลาดกับการเริ่มต้น XKB"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
+msgstr "ผังแป้นพิมพ์ \"%s\"\nสงวนลิขสิทธิ์ &#169; X.Org Foundation และผู้ร่วมสมทบงานกับ XKeyboardConfig\nดูสัญญาอนุญาตได้จากข้อมูลกำกับแพกเกจ"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
 msgstr ""
-"ผังแป้นพิมพ์ \"%s\"\n"
-"สงวนลิขสิทธิ์ &#169; X.Org Foundation และผู้ร่วมสมทบงานกับ XKeyboardConfig\n"
-"ดูสัญญาอนุญาตได้จากข้อมูลกำกับแพกเกจ"
 
-#: ../libmatekbd/matekbd-indicator.c:119
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "มีข้อผิดพลาดขณะโหลดภาพ: %s"
-
-#: ../libmatekbd/matekbd-indicator.c:706
-msgid "XKB initialization error"
-msgstr "เกิดข้อผิดพลาดกับการเริ่มต้น XKB"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:752
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "ผัง \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:771
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "ตัวเลือก \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "รุ่น \"%s\", %s และ %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "ไม่ระบุผังแป้นพิมพ์"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:781
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "ไม่ระบุตัวเลือก"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "รุ่นแป้นพิมพ์"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "รุ่นแป้นพิมพ์"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "ผังแป้นพิมพ์"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "ผังแป้นพิมพ์"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "ตัวเลือกแป้นพิมพ์"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "เครื่องมือจัดการปรับข้อมูลแป้นพิมพ์"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"รวมชุดสคริปต์สำหรับทำงานเมื่อโหลดสถานะแป้นพิมพ์ขึ้นใหม่ "
-"มีประโยชน์สำหรับการปรับเปลี่ยนข้อมูลโดยใช้ xmodmap"
+msgstr "รวมชุดสคริปต์สำหรับทำงานเมื่อโหลดสถานะแป้นพิมพ์ขึ้นใหม่ มีประโยชน์สำหรับการปรับเปลี่ยนข้อมูลโดยใช้ xmodmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "รายการแฟ้ม modmap"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "รายการแฟ้มของ modmap ที่มีในไดเรกทอรี $HOME"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "กลุ่มปริยาย สำหรับกำหนดตอนสร้างหน้าต่าง"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "จำและจัดการภาษาแยกตามหน้าต่าง"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "เครื่องมือจัดการปรับข้อมูลแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "ผังแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "รุ่นแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "ตัวเลือกแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "โหลดผังแป้นพิมพ์และตัวเลือกแปลกๆ ที่ไม่ค่อยได้ใช้"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "โหลดรายการค่าตั้งพิเศษเพิ่มเติม"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "บันทึก/เรียกคืน ตัวบ่งชี้พร้อมกับภาษาแป้นพิมพ์ด้วย"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "กลุ่มสำรอง"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
-msgid "Show flags in the applet"
-msgstr "แสดงสถานะในแอพเพล็ต"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "แสดงสถานะในแอพเพล็ตเพื่อบ่งชึ้ผังปัจจุบัน"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "แสดงชื่อผังแทนชื่อภาษา"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "แสดงชื่อผังแทนชื่อภาษา (สำหรับ XFree รุ่นที่รองรับการใช้หลายผังพร้อมกันเท่านั้น)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "โหลดรายการค่าตั้งพิเศษเพิ่มเติม"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "โหลดผังแป้นพิมพ์และตัวเลือกแปลกๆ ที่ไม่ค่อยได้ใช้"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "งดใช้ข้อความเตือน \"ค่าตั้งระบบ X มีการเปลี่ยนแปลง\""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "การแสดงตัวอย่างแป้นพิมพ์, ตำแหน่งในแนวนอน"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "การแสดงตัวอย่างแป้นพิมพ์, ตำแหน่งในแนวตั้ง"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The Keyboard Preview, height"
-msgstr "การแสดงตัวอย่างแป้นพิมพ์, ความสูง"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "การแสดงตัวอย่างแป้นพิมพ์, ความกว้าง"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The background color"
-msgstr "สีพื้นหลัง"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "The background color for the layout indicator"
-msgstr "สีพื้นหลังของตัวบอกภาษาแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The font family"
-msgstr "แบบอักษร"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "การแสดงตัวอย่างแป้นพิมพ์, ความสูง"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The font family for the layout indicator"
-msgstr "แบบอักษรสำหรับตัวบอกภาษาแป้นพิมพ์"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "กลุ่มสำรอง"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font size"
-msgstr "ขนาดตัวอักษร"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font size for the layout indicator"
-msgstr "ขนาดตัวอักษรสำหรับตัวบอกภาษาแป้นพิมพ์"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "สีตัวอักษร"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The foreground color for the layout indicator"
-msgstr "สีตัวอักษรสำหรับตัวบอกภาษาแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "รายการปลั๊กอินที่ใช้ของแอพเพล็ตแสดงผังแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "keyboard layout"
-msgstr "ผังแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "keyboard model"
-msgstr "รุ่นแป้นพิมพ์"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "modmap file list"
-msgstr "รายการแฟ้ม modmap"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "เปิดใช้ปลั๊กอินเพิ่มเติม"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "_ปลั๊กอินที่เปิดใช้:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "ปิดกล่องโต้ตอบ"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "ตั้งค่าปลั๊กอินที่เลือก"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "เลิกใช้ปลั๊กอินที่เลือก"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "ลดลำดับความสำคัญปลั๊กอิน"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "เพิ่มลำดับความสำคัญปลั๊กอิน"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "ปลั๊กอินแอพเพล็ตแสดงภาษาแป้นพิมพ์"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "รายการปลั๊กอินที่ใช้งาน"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "เพิ่มปลั๊กอิน"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "ปลั๊กอิน_ที่มี:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "ไม่มีคำอธิบาย"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "ไม่สามารถเปิดแฟ้มวิธีใช้"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "เริ่ม MateConf ไม่สำเร็จ: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "สีพื้นหลัง"
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "เปิด/ปิดการใช้ปลั๊กอิน"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "ปลั๊กอินแอพเพล็ตแสดงภาษาแป้นพิมพ์"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "ทดสอบแอพเพล็ตแสดงภาษาแป้นพิมพ์ (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "ตัวบ่งชี้:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr "การตั้งค่าแป้นพิมพ์ใน mateconf จะถูกแทนที่ด้วยค่าของระบบทันทีที่เป็นไปได้ (เลิกใช้แล้ว)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "อีกไม่นาน การตั้งค่าแป้นพิมพ์ใน mateconf จะถูกแทนที่ (โดยการกำหนดค่าในระบบ) "
-#~ "ค่าเหล่านี้เลิกใช้แล้วตั้งแต่ MATE 2.12 โปรดยกเลิกค่าของ รุ่น ผัง และตัวเลือก ของแป้นพิมพ์ "
-#~ "เพื่อใช้ค่าปริยายของระบบ"
diff --git a/po/tr.po b/po/tr.po
index 8391135..50a25a8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,34 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Baris Cicek <[email protected]>, 2008, 2009.
-#   <[email protected]>, 2012.
+# Baris Cicek <[email protected]>, 2008, 2009
+# mauron, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
-"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
-"POT-Creation-Date: 2012-06-29 12:49+0200\n"
-"PO-Revision-Date: 2012-07-02 20:45+0000\n"
-"Last-Translator: mauron <[email protected]>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/MATE/language/tr/)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Turkish (http://www.transifex.com/mate/MATE/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../libmatekbd/matekbd-indicator.c:120 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "Resim yüklenirken hata oluştu: %s"
 
-#: ../libmatekbd/matekbd-indicator.c:729 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB başlatma hatası"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2423
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
@@ -36,248 +36,176 @@ msgid ""
 "For licensing see package metadata"
 msgstr "Klavye düzeni \"%s\"\nTelif Hakkı &#169; X.Org Vakfı ve XKeyboardConfig katkıda bulunanları\nLisans bilgileri için paket temel bilgisine bakın"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2510
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2555
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "\"%s\" Klavye Düzeni"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "düzen \"%s\""
+msgstr[1] "düzen \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "seçenek \"%s\""
+msgstr[1] "seçenek \"%s\""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "model \"%s\", %s ve %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "düzen yok"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "seçenek yok"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
 msgid "Keyboard model"
 msgstr "Klavye modeli"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
 msgid "keyboard model"
 msgstr "klavye modeli"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
 msgid "Keyboard layout"
 msgstr "Klavye düzeni"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
 msgid "keyboard layout"
 msgstr "klavye düzeni"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
 msgid "Keyboard options"
 msgstr "Klavye seçenekleri"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
 msgid "Keyboard Update Handlers"
 msgstr "Klavye Güncelleme İşleyicileri"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "Klavye durumu tekrar yüklendiğinde çalıştırılacak betikler. xmodmap temelli düzenlemeleri tekrar uygulamak için faydalıdır"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
 msgid "modmap file list"
 msgstr "modmap dosya listesi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
-msgstr "$HOME dizininde mevcut olan modmap dosyslarının bir listesi."
+msgstr "$HOME dizininde mevcut olan modmap dosyalarının bir listesi."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Öntanımlı grup, pencere oluşturulurken atanır"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Her pencere için ayrı grup tut ve yönet"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Düzen grupları ile birlikte belirteçleri de kaydet/yükle"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Grup isimleri yerine düzen isimlerini göster"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "Grup isimleri yerine düzen isimlerini göster (sadece çoklu düzen destekleyen XFree sürümleri için)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
 msgid "Load extra configuration items"
 msgstr "Ek yapılandırma öğelerini yükle"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
 msgid "Load exotic, rarely used layouts and options"
 msgstr "Egzotik, çok nadir kullanılan düzenleri ve seçenekleri yükle"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "\"X sysconfig değişti\" uyarı mesajlarını durdur"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Klavye Önizlemesi, X ofseti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Klavye Önizlemesi, Y ofseti"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Klavye Önizlemesi, genişlik"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
 msgid "The Keyboard Preview, height"
 msgstr "Klavye Önizlemesi, yükseklik"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
 msgid "Secondary groups"
 msgstr "İkincil gruplar"
 
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "Show flags in the applet"
-msgstr "Uygulamacıkta bayrakları göster"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Mevcut düzeni belirtmek için uygulamacıkta bayrakları göster"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family"
-msgstr "Yazı tipi ailesi"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font family for the layout indicator"
-msgstr "Düzen göstergesi için yazı tipi ailesi"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size"
-msgstr "Yazı tipi boyutu"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
-msgid "The font size for the layout indicator"
-msgstr "Düzen göstergesi için yazı tipi boyutu"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "Ön plan rengi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The foreground color for the layout indicator"
-msgstr "Düzen göstergesi için ön plan rengi"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
 msgid "The background color"
 msgstr "Arka plan rengi"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "The background color for the layout indicator"
-msgstr "Düzen göstergesi için arka plan rengi"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Etkin Klavye Belirteç eklentilerinin listesi"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "Klavye Düzeni"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Keyboard Indicator Plugins"
-msgstr "Klavye Belirteç Eklentileri"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "Etkin _eklentiler:"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "The list of active plugins"
-msgstr "Etkin eklentilerin listesi"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Activate more plugins"
-msgstr "Daha fazla eklenti etkinleştir"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "Seçili eklentiyi etkinsizleştir"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Increase the plugin priority"
-msgstr "Eklenti önceliğini arttır"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Decrease the plugin priority"
-msgstr "Eklenti önceliğini azalt"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Configure the selected plugin"
-msgstr "Seçili eklentiyi yapılandır"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "Close the dialog"
-msgstr "Pencereyi kapat"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "Eklenti Ekle"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "_Kullanılabilir eklentiler:"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Tanım yok."
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "Yardım dosyası açılamadı"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:379
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "MateConf başlatılırken başarısız olundu: %s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Keyboard Indicator plugins"
-msgstr "Klavye Belirteç eklentileri"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Enable/disable installed plugins"
-msgstr "Kurulu eklentileri etkinleştir/kapat"
-
 #: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
diff --git a/po/vi.po b/po/vi.po
index b9d1cd5..2b961f0 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,254 +1,212 @@
-# Vietnamese translation for LibMateKBD.
-# Copyright © 2008 Mate i18n Project for Vietnamese.
-# Clytie Siddall <[email protected]>, 2007-2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-14 19:56+0000\n"
-"PO-Revision-Date: 2008-09-02 15:32+0700\n"
-"Last-Translator: Clytie Siddall <[email protected]>\n"
-"Language-Team: Vietnamese <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Vietnamese (http://www.transifex.com/mate/MATE/language/vi/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2383
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
+#, c-format
+msgid "There was an error loading an image: %s"
+msgstr "Gặp lỗi khi nạp ảnh: %s"
+
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
+msgid "XKB initialization error"
+msgstr "Lỗi sơ khởi XKB"
+
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"Bố trí bàn phím « %s »\n"
-"Tác giả © Tổ chức X.Org và nhóm đóng góp XKeyboardConfig\n"
-"Xem siêu dữ liệu của gói để tìm điều kiện giấy phép"
+msgstr "Bố trí bàn phím « %s »\nTác giả © Tổ chức X.Org và nhóm đóng góp XKeyboardConfig\nXem siêu dữ liệu của gói để tìm điều kiện giấy phép"
 
-#: ../libmatekbd/matekbd-indicator.c:617
-msgid "XKB initialization error"
-msgstr "Lỗi sơ khởi XKB"
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
+msgid "Unknown"
+msgstr ""
 
-#: ../libmatekbd/matekbd-indicator-config.c:161
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
-msgid "There was an error loading an image: %s"
-msgstr "Gặp lỗi khi nạp ảnh: %s"
+msgid "Keyboard Layout \"%s\""
+msgstr ""
 
-#: ../libmatekbd/matekbd-keyboard-config.c:751
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "bố trí « %s »"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:770
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "tùy chọn « %s »"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:778
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "mô hình « %s », %s và %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:779
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "không có bố trí"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:780
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "không có tùy chọn"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "Mô hình bàn phím"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "mô hình bàn phím"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "Bố trí bàn phím"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "bố trí bàn phím"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "Tùy chọn bàn phím"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "Bộ xử lý cập nhật bàn phím"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
-msgstr ""
-"Một tập hợp các văn lệnh cần chạy khi nào nạp lại tình trạng bàn phím. Có "
-"ích để áp dụng lại sự điều chỉnh dựa vào xmodmap."
+msgstr "Một tập hợp các văn lệnh cần chạy khi nào nạp lại tình trạng bàn phím. Có ích để áp dụng lại sự điều chỉnh dựa vào xmodmap."
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "danh sách tập tin modmap"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "Danh sách các tập tin modmap nằm trong thư mục « $HOME »."
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "Nhóm mặc định, được gán khi tạo cửa sổ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "Giữ và quản lý một nhóm riêng cho mỗi cửa sổ"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "Bộ xử lý cập nhật bàn phím"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "Bố trí bàn phím"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "Mô hình bàn phím"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "Tùy chọn bàn phím"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "Lưu/phục hồi các chỉ thị cùng với nhóm bố trí"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Secondary groups"
-msgstr "Nhóm phụ"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
-msgid "Show flags in the applet"
-msgstr "Hiển thị cờ trong tiểu dụng"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "Hiển thị cờ trong tiểu dụng để ngụ ý bố trí đang dùng"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:13
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "Hiển thị tên bố trí thay cho tên nhóm"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
+msgstr "Hiển thị tên bố trí thay cho tên nhóm (chỉ cho phiên bản XFree có hỗ trợ nhiều bố trí)"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
 msgstr ""
-"Hiển thị tên bố trí thay cho tên nhóm (chỉ cho phiên bản XFree có hỗ trợ "
-"nhiều bố trí)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:15
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "Thu hồi thông điệp cảnh báo « Cấu hình hệ thống X bị thay đổi »"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "Bộ xem thử bàn phím, bù X"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "Bộ xem thử bàn phím, bù Y"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
-msgid "The Keyboard Preview, height"
-msgstr "Ô xem thử bàn phím, bề cao"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "Ô xem thử bàn phím, bề rộng"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "Danh sách các phần bổ sung Chỉ thị Bàn phím đã bật"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
-msgid "keyboard layout"
-msgstr "bố trí bàn phím"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "keyboard model"
-msgstr "mô hình bàn phím"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
-msgid "modmap file list"
-msgstr "danh sách tập tin modmap"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:1
-msgid "Activate more plugins"
-msgstr "Bật phần bổ sung thêm"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:2
-msgid "Active _plugins:"
-msgstr "_Phần bổ sung đã bật:"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:3
-msgid "Add Plugin"
-msgstr "Thêm phần bổ sung"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:4
-msgid "Close the dialog"
-msgstr "Đóng hộp thoại"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:5
-msgid "Configure the selected plugin"
-msgstr "Cấu hình phần bổ sung đã chọn"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:6
-msgid "Deactivate selected plugin"
-msgstr "Tắt phần bổ sung đã chọn"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:7
-msgid "Decrease the plugin priority"
-msgstr "Giảm mức ưu tiên của phần bổ sung"
-
-#: ../capplet/matekbd-indicator-plugins.glade.h:8
-msgid "Increase the plugin priority"
-msgstr "Tăng mức ưu tiên của phần bổ sung"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "Ô xem thử bàn phím, bề cao"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:9
-msgid "Keyboard Indicator Plugins"
-msgstr "Phần bổ sung Chỉ thị Bàn phím"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "Nhóm phụ"
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:10
-msgid "The list of active plugins"
-msgstr "Danh sách các phần bổ sung hoạt động"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins.glade.h:11
-msgid "_Available plugins:"
-msgstr "Phần bổ sung _sẵn sàng:"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:120
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "Không có mô tả."
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
+msgid "The foreground color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:254
-msgid "Unable to open help file"
-msgstr "Không thể mở tập tin trợ giúp"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.c:354
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "Lỗi sơ khởi MateConf: %s\n"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "Bật/tắt phần bổ sung đã cài đặt"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "Phần bổ sung chỉ thị bàn phím"
+#: ../libmatekbd/show-layout.ui.h:1
+msgid "Keyboard Layout"
+msgstr ""
 
-#: ../test/matekbd-indicator-test.c:59
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "Thử Chỉ thị Bàn phím (%s)"
 
-#: ../test/matekbd-indicator-test.c:68
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "Chỉ thị:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr ""
-#~ "Thiết lập bàn phím trong MateConf sẽ bị ghi đè từ hệ thống càng sớm càng có "
-#~ "thể (bị phản đối)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "Thiết lập bàn phím trong MateConf sắp bị ghi đè (từ cấu hình hệ thống). Khoá "
-#~ "này bị phản đối kể từ MATE 2.12: hãy bỏ đặt mô hình, các bố trí và phím "
-#~ "tùy chọn đều để trở về cấu hình hệ thống mặc định."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fcc3c2c..bafc275 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,306 +1,214 @@
-# Chinese translations for libmatekbd package
-# libmatekbd 软件包的简体中文翻译.
-# Copyright (C) 2007, 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libmatekbd package.
-#  <[email protected]>, 2007.
-# YunQiang Su <[email protected]>, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# YunQiang Su <[email protected]>, 2010
+#  <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libmatekbd&component=general\n"
-"POT-Creation-Date: 2010-07-21 11:35+0000\n"
-"PO-Revision-Date: 2010-07-23 20:46+0800\n"
-"Last-Translator: YunQiang Su <[email protected]>\n"
-"Language-Team: Chinese (simplified) <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/mate/MATE/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "加载图片出错：%s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB 初始化出错"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2412
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"键盘布局“%s”\n"
-"版权所有&#169 X.Org 基金会及 XKeyboardConfig 贡献者\n"
-"许可请查看软件包元数据"
+msgstr "键盘布局“%s”\n版权所有&#169 X.Org 基金会及 XKeyboardConfig 贡献者\n许可请查看软件包元数据"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2499
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2544
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "键盘布局“%s”"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "布局“%s”"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "选项“%s”"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "型号“%s”，%s 和 %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "无布局"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "无选项"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "键盘型号"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "键盘型号"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "键盘布局"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "键盘布局"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "键盘选项"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "键盘升级处理器"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "键盘状态重载时需运行的一组脚本。在重新应用基于 xmodmap 的调节时有用"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap 文件列表"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "在 $HOME 目录中的可用的 modmap 文件的一个列表。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "窗口创建时赋予的默认的组"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "为每个窗口保持和管理单独的组"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "键盘升级处理器"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "键盘布局"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "键盘型号"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "键盘选项"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "部分加载，仅使用布局和选项"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "加载额外配置条目"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "与布局分组一起保存/恢复指示器"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "次组"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "在面板小程序中显示标记"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "在面板小程序中显示指示当前布局的标记"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "显示布局名称而不是组名称"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "显示布局名称而不是组名称(只针对支持多种布局的 XFree 版本)"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "加载额外配置条目"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "部分加载，仅使用布局和选项"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "禁止“X sysconfig changed”警告消息"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "键盘预览，X 偏移量"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "键盘预览，Y 偏移量"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "键盘预览，高度"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "键盘预览，宽度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "背景颜色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "布局指示器的背景颜色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "字体族"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "键盘预览，高度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "布局指示器的字体族"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "次组"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "字体大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "布局指示器的字体大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "前景色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "布局指示器的前景色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "已激活的键盘指示器插件的列表"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "键盘布局"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "键盘型号"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "背景颜色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap 文件列表"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "键盘布局"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "激活更多插件"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "激活插件(_P)："
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "关闭对话框"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "配置选中插件"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "禁用选中插件"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "降低插件优先级"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "提高插件优先级"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "键盘指示器插件"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "已激活插件列表"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "添加插件"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "可用插件(_A)："
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "无描述。"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "无法打开帮助文件"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "初始化 MateConf 失败：%s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "启用/禁用已安装的插件"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "键盘指示器插件"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "键盘指示器测试(%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "指示器："
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr "mateconf 中的键盘设置将会被系统 ASAP 覆盖 (已废弃)"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "不久后，mateconf 中的键盘设置将会被系统设置所覆盖。此键自 MATE 2.12 开始就已"
-#~ "经被废弃。请清除型号(model)、布局(layout)和选项(option)键以获得系统默认设"
-#~ "置。"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 85fe39f..07d50b9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,303 +1,213 @@
-# Chinese (Hong Kong) translation of libmatekbd
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Chao-Hsiung Liao <[email protected]>, 2008, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chao-Hsiung Liao <[email protected]>, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd 2.31.5\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-21 20:58+0800\n"
-"PO-Revision-Date: 2010-08-21 20:58+0800\n"
-"Last-Translator: Chao-Hsiung Liao <[email protected]>\n"
-"Language-Team: Chinese (Hong Kong) <[email protected]>\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-06 18:41+0000\n"
+"Last-Translator: infirit <[email protected]>\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/mate/MATE/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
+"Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.4.0\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "讀取圖片時發生錯誤：%s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB 初始化錯誤"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"鍵盤配置「%s」\n"
-"版權所有 &#169; X.Org 基金會及 XKeyboardConfig 貢獻者\n"
-"要了解授權請查閱套件中繼資料"
+msgstr "鍵盤配置「%s」\n版權所有 &#169; X.Org 基金會及 XKeyboardConfig 貢獻者\n要了解授權請查閱套件中繼資料"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "鍵盤配置「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "配置「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "選項「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "型號「%s」，%s 與 %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "沒有配置"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "沒有選項"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "鍵盤型號"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "鍵盤型號"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "鍵盤配置"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "鍵盤配置"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "鍵盤選項"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "鍵盤更新處理程式"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "鍵盤狀態重新載入時執行的命令稿。對重新套用基於 xmodmap 調整很有幫助"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap 檔案清單"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "在 $HOME 目錄中可用的 modmap 檔案清單。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "預設的羣組，在視窗建立時分配"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "保持並管理每個視窗中個別的羣組"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "鍵盤更新處理程式"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "鍵盤配置"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "鍵盤型號"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "鍵盤選項"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "載入外來的，很少使用的配置和選項"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "載入額外的組態項目"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "儲存/還原指示器及配置羣俎"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "第二羣組"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "在面板程式中顯示國旗"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "在面板程式以國旗來表示鍵盤的配置"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "顯示配置名稱來代替羣組名稱"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "顯示配置名稱來代替羣組名稱（只用在支援多重配置的 XFree）"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "載入額外的組態項目"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "載入外來的，很少使用的配置和選項"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "封鎖「X sysconfig 改變」警示言訊息"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr ""
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "鍵盤預覽，X 位移"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "鍵盤預覽，Y 位移"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "鍵盤預覽，高度"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "鍵盤預覽，闊度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "背景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "鍵盤配置指示器的背景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "字族"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "鍵盤預覽，高度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "鍵盤配置指示器的字族"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "第二羣組"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "字型大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "鍵盤配置指示器的字型大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "前景顏色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "鍵盤配置指示器的前景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "啟用的鍵盤指示器外掛程式清單"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "鍵盤配置"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "鍵盤型號"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "背景顏色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap 檔案清單"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr ""
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "鍵盤配置"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "使用更多外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "使用的外掛程式(_P):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "關閉這個對話盒"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "設定選定的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "停止使用選定的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "降低外掛程式優先權"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "提高外掛程式優先權"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "鍵盤指示器外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "使用中外掛程式清單"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "加入外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "可用的外掛程式(_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "沒有描述。"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "無法開啟求助檔案"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "初始化 MateConf 失敗：%s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "啟用/停用已安裝的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "鍵盤指示器外掛程式"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "鍵盤指示器測試 (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "指示器:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr "在 mateconf 中的鍵盤設定值會儘快被系統設定值覆蓋 (不贊成))"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "很快的，mateconf 中的鍵盤設定值就會被覆蓋 （依據系統設定）這個設定鍵自 MATE "
-#~ "2.12 後已不建議使用，請取消該型號、配置及選擇鍵的設定以取得預設的系統組"
-#~ "態。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index babfa5d..8a4cdfe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,303 +1,215 @@
-# Chinese (Taiwan) translation of libmatekbd
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Chao-Hsiung Liao <[email protected]>, 2008, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Chao-Hsiung Liao <[email protected]>, 2008-2009
+# Jeff Huang <[email protected]>, 2015
+# 趙惟倫 <[email protected]>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: libmatekbd 2.31.5\n"
+"Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-21 20:58+0800\n"
-"PO-Revision-Date: 2010-08-20 13:51+0800\n"
-"Last-Translator: Chao-Hsiung Liao <[email protected]>\n"
-"Language-Team: Chinese (traditional)\n"
+"POT-Creation-Date: 2015-09-09 12:55+0200\n"
+"PO-Revision-Date: 2015-09-07 09:35+0000\n"
+"Last-Translator: Jeff Huang <[email protected]>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/mate/MATE/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.4.0\n"
 
-#: ../libmatekbd/matekbd-indicator.c:119 ../libmatekbd/matekbd-status.c:323
+#: ../libmatekbd/matekbd-indicator.c:116 ../libmatekbd/matekbd-status.c:310
 #, c-format
 msgid "There was an error loading an image: %s"
 msgstr "讀取圖片時發生錯誤：%s"
 
-#: ../libmatekbd/matekbd-indicator.c:735 ../libmatekbd/matekbd-status.c:656
+#: ../libmatekbd/matekbd-indicator.c:699 ../libmatekbd/matekbd-status.c:645
 msgid "XKB initialization error"
 msgstr "XKB 初始化錯誤"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2413
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2460
 #, c-format
 msgid ""
 "Keyboard layout \"%s\"\n"
 "Copyright &#169; X.Org Foundation and XKeyboardConfig contributors\n"
 "For licensing see package metadata"
-msgstr ""
-"鍵盤配置「%s」\n"
-"版權所有 &#169; X.Org 基金會及 XKeyboardConfig 貢獻者\n"
-"要了解授權請查閱套件中繼資料"
+msgstr "鍵盤配置「%s」\n版權所有 &#169; X.Org 基金會及 XKeyboardConfig 貢獻者\n要了解授權請查閱套件中繼資料"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2500
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2542
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libmatekbd/matekbd-keyboard-drawing.c:2545
+#: ../libmatekbd/matekbd-keyboard-drawing.c:2587
 #, c-format
 msgid "Keyboard Layout \"%s\""
 msgstr "鍵盤配置「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:757
+#: ../libmatekbd/matekbd-keyboard-config.c:719
 #, c-format
 msgid "layout \"%s\""
 msgid_plural "layouts \"%s\""
 msgstr[0] "配置「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:776
+#: ../libmatekbd/matekbd-keyboard-config.c:737
 #, c-format
 msgid "option \"%s\""
 msgid_plural "options \"%s\""
 msgstr[0] "選項「%s」"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:784
+#: ../libmatekbd/matekbd-keyboard-config.c:745
 #, c-format
 msgid "model \"%s\", %s and %s"
 msgstr "型號「%s」，%s 與 %s"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:785
+#: ../libmatekbd/matekbd-keyboard-config.c:746
 msgid "no layout"
 msgstr "沒有配置"
 
-#: ../libmatekbd/matekbd-keyboard-config.c:786
+#: ../libmatekbd/matekbd-keyboard-config.c:747
 msgid "no options"
 msgstr "沒有選項"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:1
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:1
+msgid "Keyboard model"
+msgstr "鍵盤型號"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:2
+msgid "keyboard model"
+msgstr "鍵盤型號"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:3
+msgid "Keyboard layout"
+msgstr "鍵盤配置"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:4
+msgid "keyboard layout"
+msgstr "鍵盤配置"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:5
+msgid "Keyboard options"
+msgstr "鍵盤選項"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:6
+msgid "Keyboard Update Handlers"
+msgstr "鍵盤更新處理程式"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:7
 msgid ""
 "A collection of scripts to run whenever the keyboard state is reloaded. "
 "Useful for re-applying xmodmap based adjustments"
 msgstr "鍵盤狀態重新載入時執行的命令稿。對重新套用基於 xmodmap 調整很有幫助"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:2
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:8
+msgid "modmap file list"
+msgstr "modmap 檔案清單"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:9
 msgid "A list of modmap files available in the $HOME directory."
 msgstr "在 $HOME 目錄中可用的 modmap 檔案清單。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:3
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:10
 msgid "Default group, assigned on window creation"
 msgstr "預設的群組，在視窗建立時分配"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:4
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:11
 msgid "Keep and manage separate group per window"
 msgstr "保持並管理每個視窗中個別的群組"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:5
-msgid "Keyboard Update Handlers"
-msgstr "鍵盤更新處理程式"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:6
-msgid "Keyboard layout"
-msgstr "鍵盤配置"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:7
-msgid "Keyboard model"
-msgstr "鍵盤型號"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:8
-msgid "Keyboard options"
-msgstr "鍵盤選項"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:9
-msgid "Load exotic, rarely used layouts and options"
-msgstr "載入外來的，很少使用的配置和選項"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:10
-msgid "Load extra configuration items"
-msgstr "載入額外的組態項目"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:11
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:12
 msgid "Save/restore indicators together with layout groups"
 msgstr "儲存/還原指示器及配置群俎"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:12
-msgid "Secondary groups"
-msgstr "第二群組"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:14
-msgid "Show flags in the applet"
-msgstr "在面板程式中顯示國旗"
-
-#. TRANSLATORS: real national flags
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:16
-msgid "Show flags in the applet to indicate the current layout"
-msgstr "在面板程式以國旗來表示鍵盤的配置"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:17
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:13
 msgid "Show layout names instead of group names"
 msgstr "顯示配置名稱來代替群組名稱"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:18
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:14
 msgid ""
 "Show layout names instead of group names (only for versions of XFree "
 "supporting multiple layouts)"
 msgstr "顯示配置名稱來代替群組名稱（只用在支援多重配置的 XFree）"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:19
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:15
+msgid "Load extra configuration items"
+msgstr "載入額外的組態項目"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:16
+msgid "Load exotic, rarely used layouts and options"
+msgstr "載入外來的，很少使用的配置和選項"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:17
 msgid "Suppress the \"X sysconfig changed\" warning message"
 msgstr "封鎖「X sysconfig 改變」警示言訊息"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:20
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:18
+msgid "Allow to disable the keyboard indicator tray icon"
+msgstr "允許停用鍵盤指示器系統匣圖示"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:19
+msgid "Show keyboard leds indicator"
+msgstr "顯示鍵盤 LED 燈指示器"
+
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:20
 msgid "The Keyboard Preview, X offset"
 msgstr "鍵盤預覽，X 位移"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:21
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:21
 msgid "The Keyboard Preview, Y offset"
 msgstr "鍵盤預覽，Y 位移"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:22
-msgid "The Keyboard Preview, height"
-msgstr "鍵盤預覽，高度"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:23
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:22
 msgid "The Keyboard Preview, width"
 msgstr "鍵盤預覽，寬度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:24
-msgid "The background color"
-msgstr "背景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:25
-msgid "The background color for the layout indicator"
-msgstr "鍵盤配置指示器的背景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:26
-msgid "The font family"
-msgstr "字族"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:23
+msgid "The Keyboard Preview, height"
+msgstr "鍵盤預覽，高度"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:27
-msgid "The font family for the layout indicator"
-msgstr "鍵盤配置指示器的字族"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:24
+msgid "Secondary groups"
+msgstr "第二群組"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:28
-msgid "The font size"
-msgstr "字型大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:25
+msgid "The font"
+msgstr "字型"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:29
-msgid "The font size for the layout indicator"
-msgstr "鍵盤配置指示器的字型大小"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:26
+msgid ""
+"The font for the layout indicator. This should be in \"[FAMILY-LIST] [STYLE-"
+"OPTIONS] [SIZE]\" format."
+msgstr "佈局指示器的字型。這應該為「[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]」格式。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:30
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:27
 msgid "The foreground color"
 msgstr "前景顏色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:31
-msgid "The foreground color for the layout indicator"
-msgstr "鍵盤配置指示器的前景顏色"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:32
-msgid "The list of enabled Keyboard Indicator plugins"
-msgstr "啟用的鍵盤指示器外掛程式清單"
-
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:33
-msgid "keyboard layout"
-msgstr "鍵盤配置"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:28
+msgid ""
+"The foreground color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "佈局指示器的前景顏色。這應該是「R G B」格式，例如「255 0 0」。"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:34
-msgid "keyboard model"
-msgstr "鍵盤型號"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:29
+msgid "The background color"
+msgstr "背景顏色"
 
-#: ../libmatekbd/desktop_mate_peripherals_keyboard_xkb.schemas.in.h:35
-msgid "modmap file list"
-msgstr "modmap 檔案清單"
+#: ../libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.h:30
+msgid ""
+"The background color for the layout indicator. This should be in \"R G B\" "
+"format, for example \"255 0 0\"."
+msgstr "佈局指示器的背景顏色。這應該是「R G B」格式，例如「255 0 0」。"
 
 #: ../libmatekbd/show-layout.ui.h:1
 msgid "Keyboard Layout"
 msgstr "鍵盤配置"
 
-#: ../capplet/matekbd-indicator-plugins.ui.h:1
-msgid "Activate more plugins"
-msgstr "使用更多外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:2
-msgid "Active _plugins:"
-msgstr "使用的外掛程式(_P):"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:3
-msgid "Close the dialog"
-msgstr "關閉這個對話盒"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:4
-msgid "Configure the selected plugin"
-msgstr "設定選定的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:5
-msgid "Deactivate selected plugin"
-msgstr "停止使用選定的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:6
-msgid "Decrease the plugin priority"
-msgstr "降低外掛程式優先權"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:7
-msgid "Increase the plugin priority"
-msgstr "提高外掛程式優先權"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:8
-msgid "Keyboard Indicator Plugins"
-msgstr "鍵盤指示器外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins.ui.h:9
-msgid "The list of active plugins"
-msgstr "使用中外掛程式清單"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:1
-msgid "Add Plugin"
-msgstr "加入外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins_add.ui.h:2
-msgid "_Available plugins:"
-msgstr "可用的外掛程式(_A):"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:118
-#: ../capplet/matekbd-indicator-plugins-add.c:106
-msgid "No description."
-msgstr "沒有描述。"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:256
-msgid "Unable to open help file"
-msgstr "無法開啟求助檔案"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.c:372
-#, c-format
-msgid "Failed to init MateConf: %s\n"
-msgstr "初始化 MateConf 失敗：%s\n"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:1
-msgid "Enable/disable installed plugins"
-msgstr "啟用/停用已安裝的外掛程式"
-
-#: ../capplet/matekbd-indicator-plugins-capplet.desktop.in.in.h:2
-msgid "Keyboard Indicator plugins"
-msgstr "鍵盤指示器外掛程式"
-
-#: ../test/matekbd-indicator-test.c:57
+#: ../test/matekbd-indicator-test.c:55
 #, c-format
 msgid "Keyboard Indicator Test (%s)"
 msgstr "鍵盤指示器測試 (%s)"
 
-#: ../test/matekbd-indicator-test.c:66
+#: ../test/matekbd-indicator-test.c:63
 msgid "Indicator:"
 msgstr "指示器:"
-
-#~ msgid ""
-#~ "Keyboard settings in mateconf will be overridden from the system ASAP "
-#~ "(deprecated)"
-#~ msgstr "在 mateconf 中的鍵盤設定值會儘快被系統設定值覆蓋 (不贊成))"
-
-#~ msgid ""
-#~ "Very soon, keyboard settings in mateconf will be overridden (from the system "
-#~ "configuration) This key has been deprecated since MATE 2.12, please "
-#~ "unset the model, layouts and options keys to get the default system "
-#~ "configuration."
-#~ msgstr ""
-#~ "很快的，mateconf 中的鍵盤設定值就會被覆蓋 （依據系統設定）這個設定鍵自 MATE "
-#~ "2.12 後已不建議使用，請取消該型號、配置及選擇鍵的設定以取得預設的系統組"
-#~ "態。"