Merge trunk.

68 files changed, 1050 insertions, 763 deletions

diff --git a/debian/changelog b/debian/changelog
index 6bc47925..527b7bf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+indicator-keyboard (0.0.0+14.04.20131125-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * Enable middle click and mouse wheel scrolling. (LP: #887139)
+  * Add accountsservice.vapi (accountsservice no long ships it).
+
+  [ Allan LeSage ]
+  * Add gcov coverage tooling; use ./autogen.sh --enable-gcov and then
+    make coverage-html to see a report of what's covered. You can read
+    about the rationale in this old blog post:
+    http://qualityhour.wordpress.com/2012/01/29/test-coverage-tutorial-
+    for-cc-autotools-projects/ .
+
+  [ Lars Uebernickel ]
+  * Set the indicator's position according to
+    http://wiki.ubuntu.com/SystemComponents.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 185
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 25 Nov 2013 03:55:06 +0000
+
 indicator-keyboard (0.0.0+14.04.20131029.1-0ubuntu1) trusty; urgency=low
 
   [ Dmitrijs Ledkovs ]
diff --git a/po/am.po b/po/am.po
new file mode 100644
index 00000000..82c1e7aa
--- /dev/null
+++ b/po/am.po
@@ -0,0 +1,35 @@
+# Amharic translation for indicator-keyboard
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the indicator-keyboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: indicator-keyboard\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
+"PO-Revision-Date: 2014-01-18 22:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Amharic <am@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#: ../lib/main.vala:552
+#, c-format
+msgid "%s input source"
+msgstr "%s የማስገቢያ ምንጭ"
+
+#: ../lib/main.vala:677
+msgid "Character Map"
+msgstr "የባህሪ ካርታ"
+
+#: ../lib/main.vala:678
+msgid "Keyboard Layout Chart"
+msgstr "የፊደል ገበታ እቅድ ካርታ"
+
+#: ../lib/main.vala:679
+msgid "Text Entry Settings..."
+msgstr "የ ጽሁፍ ማስገቢያ ማሰናጃዎች..."
diff --git a/po/ar.po b/po/ar.po
index c0f51d05..96b4eeff 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-10 03:47+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ast.po b/po/ast.po
index bb8763c0..35d5a329 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-03 15:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/az.po b/po/az.po
index 8f878675..9498f12c 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-12 21:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/be.po b/po/be.po
index 26bc7a33..9f532b72 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-14 10:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Belarusian <be@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/bg.po b/po/bg.po
index a3e91508..e0ee555e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-11-13 14:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/br.po b/po/br.po
index 97bfbc8a..d25df7bb 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-11-07 15:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Breton <br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
@@ -28,8 +28,8 @@ msgstr "Kartenn al letrennoù"
 
 #: ../lib/main.vala:678
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "Neuz aozadur ar c'hlavier"
 
 #: ../lib/main.vala:679
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "Arventennoù ar reiñ testennoù"
diff --git a/po/bs.po b/po/bs.po
index 950f53fc..5d1c91f4 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 15:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ca.po b/po/ca.po
index 8c83acd0..7837f4ba 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-19 10:24+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index 5b794c2f..58ff7d11 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-08 06:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s vstupní zdroj"
 
 #: ../lib/main.vala:677
 msgid "Character Map"
diff --git a/po/cy.po b/po/cy.po
index aff7668d..a16529e5 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-08 00:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/da.po b/po/da.po
index 677c57e6..81a3eb48 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 10:32+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/de.po b/po/de.po
index 5f4a573e..9a36a8a9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 11:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/el.po b/po/el.po
index 25012f69..67d85b9c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 11:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/en_AU.po b/po/en_AU.po
index 7cae7321..d8360947 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-07 23:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/en_CA.po b/po/en_CA.po
index fb37495c..79f5807b 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-12 10:07+0000\n"
 "Last-Translator: William Hua <Unknown>\n"
 "Language-Team: English (Canada) <en_CA@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/en_GB.po b/po/en_GB.po
index f71c8949..e0eeb2c7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-29 15:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/es.po b/po/es.po
index dd737505..733c4b97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-23 09:25+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/et.po b/po/et.po
index 9a570d35..4805b566 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 15:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index 9a55e889..646b15d8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,20 +7,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-01 20:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s sarrera-iturria"
 
 #: ../lib/main.vala:677
 msgid "Character Map"
@@ -28,8 +28,8 @@ msgstr "Karaktere-mapa"
 
 #: ../lib/main.vala:678
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "Teklatuaren diseinuaren mapa"
 
 #: ../lib/main.vala:679
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "Testu-sarreraren ezarpenak"
diff --git a/po/fa.po b/po/fa.po
index dbb984c6..5ee3a7bc 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-11-01 05:30+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s منبع ورودی"
 
 #: ../lib/main.vala:677
 msgid "Character Map"
-msgstr ""
+msgstr "نقشه‌ی نویسه‌ها"
 
 #: ../lib/main.vala:678
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "نمودار چینش صفحه‌کلید"
 
 #: ../lib/main.vala:679
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "تنظیمات ورودی متن…"
diff --git a/po/fi.po b/po/fi.po
index 46f0bf11..5db93f7b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-03 09:43+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 0eba5894..90cfb5d5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-08-29 08:33+0000\n"
 "Last-Translator: Matthieu Baerts <matttbe@gmail.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/gd.po b/po/gd.po
index f2285d01..1f026169 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-30 10:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index c379c5cd..8a612cfc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-29 17:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/he.po b/po/he.po
index 1fe39135..1ac34f15 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-01 12:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/hi.po b/po/hi.po
index 3f8ae965..bce640ad 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 21:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 8736bc8f..17b3f630 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-04 18:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/id.po b/po/id.po
index 0bdbbb19..1d5ac662 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,29 +7,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-11-12 16:23+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s sumber masukan"
 
 #: ../lib/main.vala:677
 msgid "Character Map"
-msgstr ""
+msgstr "Peta Karakter"
 
 #: ../lib/main.vala:678
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "Bagan Tata Letak Papan Ketik"
 
 #: ../lib/main.vala:679
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "Pengaturan Pemasukan Teks"
diff --git a/po/it.po b/po/it.po
index 114511e5..4cc3325c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-12 11:02+0000\n"
 "Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index 2ac3908a..111150a6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-29 07:25+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/km.po b/po/km.po
index 904e9b43..56d47713 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-17 01:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Khmer <km@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/kn.po b/po/kn.po
index 775f6ef9..00a561a9 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-16 11:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kannada <kn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ko.po b/po/ko.po
index 1bbd4527..1dfe44cc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-01 10:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/lt.po b/po/lt.po
index ed879223..2a031ba6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-08-30 14:47+0000\n"
 "Last-Translator: Aurimas Fišeras <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/lv.po b/po/lv.po
index a44e71e3..3121328c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-03 15:03+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/mhr.po b/po/mhr.po
new file mode 100644
index 00000000..60f03e27
--- /dev/null
+++ b/po/mhr.po
@@ -0,0 +1,35 @@
+# Mari (Meadow) translation for indicator-keyboard
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the indicator-keyboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: indicator-keyboard\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
+"PO-Revision-Date: 2013-12-10 07:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mari (Meadow) <mhr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#: ../lib/main.vala:552
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/main.vala:677
+msgid "Character Map"
+msgstr "Ӱжвата-влак"
+
+#: ../lib/main.vala:678
+msgid "Keyboard Layout Chart"
+msgstr "Полдышоҥа Радам График"
+
+#: ../lib/main.vala:679
+msgid "Text Entry Settings..."
+msgstr "Текстым Келыштараш..."
diff --git a/po/ml.po b/po/ml.po
new file mode 100644
index 00000000..625838f5
--- /dev/null
+++ b/po/ml.po
@@ -0,0 +1,35 @@
+# Malayalam translation for indicator-keyboard
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the indicator-keyboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: indicator-keyboard\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
+"PO-Revision-Date: 2013-12-29 06:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malayalam <ml@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#: ../lib/main.vala:552
+#, c-format
+msgid "%s input source"
+msgstr "%s ഇന്‍പുട്ട് ഉറവിടം"
+
+#: ../lib/main.vala:677
+msgid "Character Map"
+msgstr "അക്ഷരങ്ങളുടെ പട്ടിക"
+
+#: ../lib/main.vala:678
+msgid "Keyboard Layout Chart"
+msgstr "കീബോഡ് ലേയൗട്ട് പട്ടിക"
+
+#: ../lib/main.vala:679
+msgid "Text Entry Settings..."
+msgstr "പദാവലി നല്‍കല്‍ സജ്ജീകരണങ്ങള്‍..."
diff --git a/po/mr.po b/po/mr.po
new file mode 100644
index 00000000..0e2126c8
--- /dev/null
+++ b/po/mr.po
@@ -0,0 +1,35 @@
+# Marathi translation for indicator-keyboard
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the indicator-keyboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: indicator-keyboard\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
+"PO-Revision-Date: 2014-01-07 01:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Marathi <mr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#: ../lib/main.vala:552
+#, c-format
+msgid "%s input source"
+msgstr "%s मजकूर प्रवेशाचे उगम"
+
+#: ../lib/main.vala:677
+msgid "Character Map"
+msgstr "अक्षर नकाशा"
+
+#: ../lib/main.vala:678
+msgid "Keyboard Layout Chart"
+msgstr "कळफलकाचा तक्ता"
+
+#: ../lib/main.vala:679
+msgid "Text Entry Settings..."
+msgstr "मजकूर प्रवेशाचे नेपथ्य"
diff --git a/po/ms.po b/po/ms.po
index 2ddc26a9..1d25c879 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 17:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index 9a56184c..b72adca5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-07 09:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ne.po b/po/ne.po
new file mode 100644
index 00000000..66b4e2f3
--- /dev/null
+++ b/po/ne.po
@@ -0,0 +1,35 @@
+# Nepali translation for indicator-keyboard
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the indicator-keyboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: indicator-keyboard\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
+"PO-Revision-Date: 2014-01-08 09:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Nepali <ne@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#: ../lib/main.vala:552
+#, c-format
+msgid "%s input source"
+msgstr "%s इनपुट स्रोत"
+
+#: ../lib/main.vala:677
+msgid "Character Map"
+msgstr "चरित्र नक्शा"
+
+#: ../lib/main.vala:678
+msgid "Keyboard Layout Chart"
+msgstr "कुञ्जीपाटी लेआउट चार्ट"
+
+#: ../lib/main.vala:679
+msgid "Text Entry Settings..."
+msgstr "पाठ प्रविष्टि सेटिङ ..."
diff --git a/po/nl.po b/po/nl.po
index ed870693..a6fb37a7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-30 07:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/oc.po b/po/oc.po
index 8a3b4ddc..f50a5c78 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-02 06:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index b0b622ce..32ee498b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-13 13:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index ffe49fe4..4db4be1a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-10 21:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2b943eb6..93c6dfd2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-08-28 01:25+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 39560658..a30b5ebc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-30 07:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 5e8010d8..5de3cae1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-12 22:02+0000\n"
 "Last-Translator: Igor Zubarev <igor.zubarev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/si.po b/po/si.po
index 5129fb84..92f930ff 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-31 17:57+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Sinhalese <si@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index 3cbd1efc..cda6c86f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-02 13:04+0000\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/sl.po b/po/sl.po
index 07993888..debedbb9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-27 18:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/sq.po b/po/sq.po
index 96730340..718a23ad 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 13:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/sr.po b/po/sr.po
index b55ef3d5..327e6b7d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-06-21 11:10+0000\n"
 "Last-Translator: Иван Благојевић <ivan_blagojevic@mail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index db5a7192..1d38d708 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-30 08:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ta.po b/po/ta.po
index fc471ba9..da7a2efb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-25 01:48+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/tg.po b/po/tg.po
index 8fc2f850..694518cf 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 14:41+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tajik <tg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index 9bfdad1f..66582aeb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-28 21:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/ug.po b/po/ug.po
index 1e19639d..0f2ad763 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-30 06:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index c8d9db88..03e8a29b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-09-27 17:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/vi.po b/po/vi.po
index 80bc7a23..7d1ce260 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-16 11:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a57fd427..29ce0b18 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-03 12:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/po/zh_HK.po b/po/zh_HK.po
new file mode 100644
index 00000000..b8246bcf
--- /dev/null
+++ b/po/zh_HK.po
@@ -0,0 +1,35 @@
+# Chinese (Hong Kong) translation for indicator-keyboard
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the indicator-keyboard package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: indicator-keyboard\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
+"PO-Revision-Date: 2014-01-26 14:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#: ../lib/main.vala:552
+#, c-format
+msgid "%s input source"
+msgstr "%s 輸入來源"
+
+#: ../lib/main.vala:677
+msgid "Character Map"
+msgstr "字元對應表"
+
+#: ../lib/main.vala:678
+msgid "Keyboard Layout Chart"
+msgstr "鍵盤佈局圖"
+
+#: ../lib/main.vala:679
+msgid "Text Entry Settings..."
+msgstr "文本輸入設定..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0d26e789..942ec876 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-keyboard\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-11-21 19:17+0000\n"
+"POT-Creation-Date: 2014-01-28 07:17+0000\n"
 "PO-Revision-Date: 2013-10-14 14:50+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:04+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-01-29 06:05+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #: ../lib/main.vala:552
 #, c-format
diff --git a/tests/Makefile.am b/tests/Makefile.am
index da083318..f3be1539 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,8 @@ AM_LDFLAGS = -lm
 AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-indicator_keyboard_tests_SOURCES = main.vala   \
+indicator_keyboard_tests_SOURCES = main.vala    \
+                                   fixture.vala \
                                    config.vala
 indicator_keyboard_tests_VALAFLAGS = $(AM_VALAFLAGS) \
                                      --pkg gio-2.0
diff --git a/tests/fixture.vala b/tests/fixture.vala
new file mode 100644
index 00000000..7adc434f
--- /dev/null
+++ b/tests/fixture.vala
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Michal Hruby <michal.hruby@canonical.com>
+ *
+ * This file is taken from libunity.
+ */
+
+/* A bit of magic to get proper-ish fixture support */
+public interface Fixture : Object
+{
+  class DelegateWrapper
+  {
+    TestDataFunc func;
+    public DelegateWrapper (owned TestDataFunc f) { func = (owned) f; }
+  }
+
+  public virtual void setup () {}
+  public virtual void teardown () {}
+
+  [CCode (has_target = false)]
+  public delegate void Callback<T> (T ptr);
+
+  private static List<DelegateWrapper> _tests;
+
+  public static unowned TestDataFunc create<F> (Callback<void*> cb)
+    requires (typeof (F).is_a (typeof (Fixture)))
+  {
+    TestDataFunc functor = () =>
+    {
+      var type = typeof (F);
+      var instance = Object.new (type) as Fixture;
+      instance.setup ();
+      cb (instance);
+      instance.teardown ();
+    };
+    unowned TestDataFunc copy = functor;
+    _tests.append (new DelegateWrapper ((owned) functor));
+    return copy;
+  }
+  public static unowned TestDataFunc create_static<F> (Callback<F> cb)
+  {
+    return create<F> ((Callback<void*>) cb);
+  }
+}
+
+public static bool run_with_timeout (MainLoop ml, uint timeout_ms = 5000)
+{
+  bool timeout_reached = false;
+  var t_id = Timeout.add (timeout_ms, () =>
+  {
+    timeout_reached = true;
+    debug ("Timeout reached");
+    ml.quit ();
+    return false;
+  });
+
+  ml.run ();
+
+  if (!timeout_reached) Source.remove (t_id);
+
+  return !timeout_reached;
+}
+
+/* calling this will ensure that the object was destroyed, but note that
+ * it needs to be called with the (owned) modifier */
+public static void ensure_destruction (owned Object obj)
+{
+  var ml = new MainLoop ();
+  bool destroyed = false;
+  obj.weak_ref (() => { destroyed = true; ml.quit (); });
+
+  obj = null;
+  if (!destroyed)
+  {
+    // wait a bit if there were async operations
+    assert (run_with_timeout (ml));
+  }
+}
+
+public class ErrorHandler
+{
+  public ErrorHandler ()
+  {
+    GLib.Test.log_set_fatal_handler (handle_fatal_func);
+  }
+
+  private bool handle_fatal_func (string? log_domain, LogLevelFlags flags,
+                                  string message)
+  {
+    return false;
+  }
+
+  private uint[] handler_ids;
+  private GenericArray<string?> handler_domains;
+
+  public void ignore_message (string? domain, LogLevelFlags flags)
+  {
+    handler_ids += Log.set_handler (domain, flags | LogLevelFlags.FLAG_FATAL,
+                                    () => {});
+    if (handler_domains == null)
+    {
+      handler_domains = new GenericArray<string?> ();
+    }
+    handler_domains.add (domain);
+  }
+
+  ~ErrorHandler ()
+  {
+    for(uint i = 0; i < handler_ids.length; i++)
+      Log.remove_handler (handler_domains[i], handler_ids[i]);
+  }
+}
diff --git a/tests/main.vala b/tests/main.vala
index 1a7833a2..d84de7ee 100644
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -20,6 +20,8 @@ const int TIMEOUT_S = 1;
 const int TIMEOUT_MS = 1000;
 const int LONG_TIMEOUT_S = 10;
 
+static string display;
+
 [DBus (name = "com.canonical.indicator.keyboard.test")]
 public class Service : Object {
 
@@ -42,676 +44,603 @@ public class Service : Object {
 	}
 }
 
-struct Fixture {
-	TestDBus? bus;
-	uint service_name;
-	DBusConnection? connection;
-	Service? service;
-	uint object_name;
-}
+public class Tests : Object, Fixture {
+
+	private TestDBus? _bus;
+	private uint _service_name;
+	private DBusConnection? _connection;
+	private Service? _service;
+	private uint _object_name;
+
+	public void start_service () {
+		if (_connection != null) {
+			try {
+				_service = new Service ();
+				_object_name = ((!) _connection).register_object ("/com/canonical/indicator/keyboard/test", _service);
+			} catch (IOError error) {
+				_connection = null;
+				_service = null;
+				_object_name = 0;
+
+				Test.message ("error: %s", error.message);
+				Test.fail ();
+			}
+		}
+	}
 
-static void start_service (Fixture *fixture) {
-	if (fixture.connection != null) {
-		try {
-			fixture.service = new Service ();
-			fixture.object_name = ((!) fixture.connection).register_object ("/com/canonical/indicator/keyboard/test", fixture.service);
-		} catch (IOError error) {
-			fixture.connection = null;
-			fixture.service = null;
-			fixture.object_name = 0;
+	public void setup () {
+		Environment.set_variable ("DCONF_PROFILE", DCONF_PROFILE, true);
+		Environment.set_variable ("DISPLAY", display, true);
+		Environment.set_variable ("LC_ALL", "C", true);
+
+		_bus = new TestDBus (TestDBusFlags.NONE);
+		((!) _bus).add_service_dir (SERVICE_DIR);
+		((!) _bus).up ();
+
+		var loop = new MainLoop (null, false);
+
+		_service_name = Bus.own_name (BusType.SESSION,
+		                              "com.canonical.indicator.keyboard.test",
+		                              BusNameOwnerFlags.ALLOW_REPLACEMENT | BusNameOwnerFlags.REPLACE,
+		                              (connection, name) => {
+		                                      if (loop.is_running ()) {
+		                                              _connection = connection;
+		                                              start_service ();
+		                                              loop.quit ();
+		                                      }
+		                              },
+		                              null,
+		                              (connection, name) => {
+		                                      if (loop.is_running ()) {
+		                                              _connection = null;
+		                                              _service = null;
+		                                              _object_name = 0;
+		                                              loop.quit ();
+		                                      }
+		                              });
+
+		loop.run ();
+
+		if (_connection == null) {
+			Test.message ("error: Unable to connect to com.canonical.indicator.keyboard.test.");
+			Test.fail ();
+		}
 
-			Test.message ("error: %s", error.message);
+		if (_object_name == 0) {
+			Test.message ("error: Test fixture not initialized.");
 			Test.fail ();
+			return;
 		}
 	}
-}
 
-static void begin_test (void *data) {
-	var fixture = (Fixture *) data;
+	public void teardown () {
+		if (_object_name != 0) {
+			((!) _connection).unregister_object (_object_name);
+			_object_name = 0;
+		}
 
-	fixture.bus = new TestDBus (TestDBusFlags.NONE);
-	((!) fixture.bus).add_service_dir (SERVICE_DIR);
-	((!) fixture.bus).up ();
+		if (_service_name != 0) {
+			Bus.unown_name (_service_name);
+			_service_name = 0;
+		}
 
-	var loop = new MainLoop (null, false);
+		_service = null;
+		_connection = null;
 
-	fixture.service_name = Bus.own_name (BusType.SESSION,
-	                                     "com.canonical.indicator.keyboard.test",
-	                                     BusNameOwnerFlags.ALLOW_REPLACEMENT | BusNameOwnerFlags.REPLACE,
-	                                     (connection, name) => {
-	                                         if (loop.is_running ()) {
-	                                             fixture.connection = connection;
+		if (_bus != null) {
+			((!) _bus).down ();
+			_bus = null;
+		}
+	}
 
-	                                             start_service (fixture);
+	public void test_activate_input_source () {
+		try {
+			var current = 0;
+			var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	                                             loop.quit ();
-	                                         }
-	                                     },
-	                                     null,
-	                                     (connection, name) => {
-	                                         if (loop.is_running ()) {
-	                                             fixture.connection = null;
-	                                             fixture.service = null;
-	                                             fixture.object_name = 0;
+		var action_group = DBusActionGroup.get ((!) _connection,
+		                                        "com.canonical.indicator.keyboard",
+		                                        "/com/canonical/indicator/keyboard");
+		action_group.list_actions ();
+		action_group.activate_action ("current", new Variant.uint32 (2));
 
-	                                             loop.quit ();
-	                                         }
-	                                     });
+		var loop = new MainLoop (null, false);
+		Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+		loop.run ();
 
-	loop.run ();
+		var state = action_group.get_action_state ("current");
+		var current = state.get_uint32 ();
+		stderr.printf ("current = %u\n", current);
+		assert (current == 2);
 
-	if (fixture.connection == null) {
-		Test.message ("error: Unable to connect to com.canonical.indicator.keyboard.test.");
-		Test.fail ();
+		try {
+			string output;
+			Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources current", out output);
+			stderr.printf ("output = \"%s\"\n", output);
+			assert (strcmp (output, "uint32 2\n") == 0);
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 	}
-}
 
-static void end_test (void *data) {
-	var fixture = (Fixture *) data;
+	public void test_activate_character_map () {
+		var action_group = DBusActionGroup.get ((!) _connection,
+		                                        "com.canonical.indicator.keyboard",
+		                                        "/com/canonical/indicator/keyboard");
+		var loop = new MainLoop (null, false);
+		var signal_name = ((!) _service).notify["command"].connect ((pspec) => {
+		        loop.quit ();
+		});
 
-	if (fixture.object_name != 0) {
-		((!) fixture.connection).unregister_object (fixture.object_name);
-		fixture.object_name = 0;
-	}
+		action_group.activate_action ("map", null);
 
-	if (fixture.service_name != 0) {
-		Bus.unown_name (fixture.service_name);
-		fixture.service_name = 0;
+		var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		((!) _service).disconnect (signal_name);
+
+		stderr.printf ("_service.command = \"%s\"\n", (!) ((!) _service).command);
+		assert (strcmp ((!) ((!) _service).command, "'gucharmap '") == 0);
 	}
 
-	fixture.service = null;
-	fixture.connection = null;
+	public void test_activate_keyboard_layout_chart () {
+		try {
+			var current = 1;
+			var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	if (fixture.bus != null) {
-		((!) fixture.bus).down ();
-		fixture.bus = null;
-	}
-}
+		var action_group = DBusActionGroup.get ((!) _connection,
+		                                        "com.canonical.indicator.keyboard",
+		                                        "/com/canonical/indicator/keyboard");
+		var loop = new MainLoop (null, false);
+		var signal_name = ((!) _service).notify["command"].connect ((pspec) => {
+		        loop.quit ();
+		});
 
-static void test_activate_input_source (void *data) {
-	var fixture = (Fixture *) data;
+		action_group.activate_action ("chart", null);
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+		var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		((!) _service).disconnect (signal_name);
 
-	try {
-		var current = 0;
-		var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
+		stderr.printf ("_service.command = \"%s\"\n", (!) ((!) _service).command);
+		assert (strcmp ((!) ((!) _service).command, "'gkbd-keyboard-display -l ca\teng'") == 0);
 	}
 
-	var action_group = DBusActionGroup.get ((!) fixture.connection,
-	                                        "com.canonical.indicator.keyboard",
-	                                        "/com/canonical/indicator/keyboard");
-	action_group.list_actions ();
-	action_group.activate_action ("current", new Variant.uint32 (2));
-
-	var loop = new MainLoop (null, false);
-	Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-
-	var state = action_group.get_action_state ("current");
-	var current = state.get_uint32 ();
-	stderr.printf ("current = %u\n", current);
-	assert (current == 2);
-
-	try {
-		string output;
-		Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources current", out output);
-		stderr.printf ("output = \"%s\"\n", output);
-		assert (strcmp (output, "uint32 2\n") == 0);
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
-}
+	public void test_activate_text_entry_settings () {
+		var action_group = DBusActionGroup.get ((!) _connection,
+		                                        "com.canonical.indicator.keyboard",
+		                                        "/com/canonical/indicator/keyboard");
+		var loop = new MainLoop (null, false);
+		var signal_name = ((!) _service).notify["command"].connect ((pspec) => {
+		        loop.quit ();
+		});
 
-static void test_activate_character_map (void *data) {
-	var fixture = (Fixture *) data;
+		action_group.activate_action ("settings", null);
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+		var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		((!) _service).disconnect (signal_name);
 
-	var action_group = DBusActionGroup.get ((!) fixture.connection,
-	                                        "com.canonical.indicator.keyboard",
-	                                        "/com/canonical/indicator/keyboard");
-	var loop = new MainLoop (null, false);
-	var signal_name = ((!) fixture.service).notify["command"].connect ((pspec) => {
-		loop.quit ();
-	});
+		stderr.printf ("_service.command = \"%s\"\n", (!) ((!) _service).command);
+		assert (strcmp ((!) ((!) _service).command, "'gnome-control-center region layouts'") == 0);
+	}
 
-	action_group.activate_action ("map", null);
+	public void test_migration () {
+		try {
+			var migrated = false;
+			var sources = "[('xkb', 'us')]";
+			var layouts = "['us', 'ca\teng', 'epo']";
+			Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	((!) fixture.service).disconnect (signal_name);
+		try {
+			var cancellable = new Cancellable ();
 
-	stderr.printf ("fixture.service.command = \"%s\"\n", (!) ((!) fixture.service).command);
-	assert (strcmp ((!) ((!) fixture.service).command, "'gucharmap '") == 0);
-}
+			var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return true; });
 
-static void test_activate_keyboard_layout_chart (void *data) {
-	var fixture = (Fixture *) data;
+			var dbus_proxy = new DBusProxy.sync ((!) _connection,
+			                                     DBusProxyFlags.NONE,
+			                                     null,
+			                                     "org.freedesktop.DBus",
+			                                     "/",
+			                                     "org.freedesktop.DBus",
+			                                     cancellable);
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+			Source.remove (source);
 
-	try {
-		var current = 1;
-		var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+			if (cancellable.is_cancelled ()) {
+				Test.message ("error: Unable to connect to org.freedesktop.DBus.");
+				Test.fail ();
+				return;
+			}
 
-	var action_group = DBusActionGroup.get ((!) fixture.connection,
-	                                        "com.canonical.indicator.keyboard",
-	                                        "/com/canonical/indicator/keyboard");
-	var loop = new MainLoop (null, false);
-	var signal_name = ((!) fixture.service).notify["command"].connect ((pspec) => {
-		loop.quit ();
-	});
+			dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
+		} catch (Error error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	action_group.activate_action ("chart", null);
+		var loop = new MainLoop (null, false);
+		Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+		loop.run ();
 
-	var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	((!) fixture.service).disconnect (signal_name);
+		try {
+			string sources;
+			Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources);
+			stderr.printf ("sources = \"%s\"\n", sources);
+			assert (strcmp (sources, "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo')]\n") == 0);
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
+	}
 
-	stderr.printf ("fixture.service.command = \"%s\"\n", (!) ((!) fixture.service).command);
-	assert (strcmp ((!) ((!) fixture.service).command, "'gkbd-keyboard-display -l ca\teng'") == 0);
-}
+	public void test_no_migration () {
+		try {
+			var migrated = true;
+			var sources = "[('xkb', 'us')]";
+			var layouts = "['us', 'ca\teng', 'epo']";
+			Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-static void test_activate_text_entry_settings (void *data) {
-	var fixture = (Fixture *) data;
+		try {
+			var cancellable = new Cancellable ();
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+			var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return true; });
 
-	var action_group = DBusActionGroup.get ((!) fixture.connection,
-	                                        "com.canonical.indicator.keyboard",
-	                                        "/com/canonical/indicator/keyboard");
-	var loop = new MainLoop (null, false);
-	var signal_name = ((!) fixture.service).notify["command"].connect ((pspec) => {
-		loop.quit ();
-	});
+			var dbus_proxy = new DBusProxy.sync ((!) _connection,
+			                                     DBusProxyFlags.NONE,
+			                                     null,
+			                                     "org.freedesktop.DBus",
+			                                     "/",
+			                                     "org.freedesktop.DBus",
+			                                     cancellable);
 
-	action_group.activate_action ("settings", null);
+			Source.remove (source);
 
-	var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	((!) fixture.service).disconnect (signal_name);
+			if (cancellable.is_cancelled ()) {
+				Test.message ("error: Unable to connect to org.freedesktop.DBus.");
+				Test.fail ();
+				return;
+			}
 
-	stderr.printf ("fixture.service.command = \"%s\"\n", (!) ((!) fixture.service).command);
-	assert (strcmp ((!) ((!) fixture.service).command, "'gnome-control-center region layouts'") == 0);
-}
+			dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
+		} catch (Error error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-static void test_migration (void *data) {
-	var fixture = (Fixture *) data;
+		var loop = new MainLoop (null, false);
+		Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
+		loop.run ();
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
+		try {
+			string sources;
+			Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources);
+			stderr.printf ("sources = \"%s\"\n", sources);
+			assert (strcmp (sources, "[('xkb', 'us')]\n") == 0);
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 	}
 
-	try {
-		var migrated = false;
-		var sources = "[('xkb', 'us')]";
-		var layouts = "['us', 'ca\teng', 'epo']";
-		Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+	public void test_update_visible () {
+		bool visible;
 
-	try {
-		var cancellable = new Cancellable ();
+		try {
+			visible = true;
+			Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-		var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; });
+		var action_group = DBusActionGroup.get ((!) _connection,
+		                                        "com.canonical.indicator.keyboard",
+		                                        "/com/canonical/indicator/keyboard");
+		var loop = new MainLoop (null, false);
+		var signal_name = action_group.action_added["indicator"].connect ((action) => {
+		        loop.quit ();
+		});
 
-		var dbus_proxy = new DBusProxy.sync ((!) fixture.connection,
-		                                     DBusProxyFlags.NONE,
-		                                     null,
-		                                     "org.freedesktop.DBus",
-		                                     "/",
-		                                     "org.freedesktop.DBus",
-		                                     cancellable);
+		action_group.list_actions ();
 
+		var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
 		Source.remove (source);
+		action_group.disconnect (signal_name);
 
-		if (cancellable.is_cancelled ()) {
-			Test.message ("error: Unable to connect to org.freedesktop.DBus.");
+		var state = action_group.get_action_state ("indicator");
+		assert (state.lookup ("visible", "b", out visible));
+		stderr.printf ("visible = %s\n", visible ? "true" : "false");
+		assert (visible);
+
+		loop = new MainLoop (null, false);
+		signal_name = action_group.action_state_changed["indicator"].connect ((action, state) => {
+		        loop.quit ();
+		});
+
+		try {
+			visible = false;
+			Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
 			Test.fail ();
 			return;
 		}
 
-		dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
-	} catch (Error error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		action_group.disconnect (signal_name);
 
-	var loop = new MainLoop (null, false);
-	Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-
-	try {
-		string sources;
-		Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources);
-		stderr.printf ("sources = \"%s\"\n", sources);
-		assert (strcmp (sources, "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo')]\n") == 0);
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
-}
+		state = action_group.get_action_state ("indicator");
+		assert (state.lookup ("visible", "b", out visible));
+		stderr.printf ("visible = %s\n", visible ? "true" : "false");
+		assert (!visible);
 
-static void test_no_migration (void *data) {
-	var fixture = (Fixture *) data;
+		loop = new MainLoop (null, false);
+		signal_name = action_group.action_state_changed["indicator"].connect ((action, state) => {
+		        loop.quit ();
+		});
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+		try {
+			visible = true;
+			Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	try {
-		var migrated = true;
-		var sources = "[('xkb', 'us')]";
-		var layouts = "['us', 'ca\teng', 'epo']";
-		Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard migrated $migrated");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.libgnomekbd.keyboard layouts \"$layouts\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		action_group.disconnect (signal_name);
 
-	try {
-		var cancellable = new Cancellable ();
+		state = action_group.get_action_state ("indicator");
+		assert (state.lookup ("visible", "b", out visible));
+		stderr.printf ("visible = %s\n", visible ? "true" : "false");
+		assert (visible);
+	}
 
-		var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { cancellable.cancel (); return false; });
+	public void test_update_input_source () {
+		try {
+			var current = 0;
+			var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-		var dbus_proxy = new DBusProxy.sync ((!) fixture.connection,
-		                                     DBusProxyFlags.NONE,
-		                                     null,
-		                                     "org.freedesktop.DBus",
-		                                     "/",
-		                                     "org.freedesktop.DBus",
-		                                     cancellable);
+		var action_group = DBusActionGroup.get ((!) _connection,
+		                                        "com.canonical.indicator.keyboard",
+		                                        "/com/canonical/indicator/keyboard");
+		var loop = new MainLoop (null, false);
+		var signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
+		        loop.quit ();
+		});
 
-		Source.remove (source);
+		action_group.list_actions ();
 
-		if (cancellable.is_cancelled ()) {
-			Test.message ("error: Unable to connect to org.freedesktop.DBus.");
+		try {
+			var current = 1;
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
 			Test.fail ();
 			return;
 		}
 
-		dbus_proxy.call_sync ("StartServiceByName", new Variant ("(su)", "com.canonical.indicator.keyboard", 0), DBusCallFlags.NONE, TIMEOUT_MS);
-	} catch (Error error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		action_group.disconnect (signal_name);
 
-	var loop = new MainLoop (null, false);
-	Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-
-	try {
-		string sources;
-		Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources sources", out sources);
-		stderr.printf ("sources = \"%s\"\n", sources);
-		assert (strcmp (sources, "[('xkb', 'us')]\n") == 0);
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
-}
+		var state = action_group.get_action_state ("current");
+		var current = state.get_uint32 ();
+		stderr.printf ("current = %u\n", current);
+		assert (current == 1);
 
-static void test_update_visible (void *data) {
-	var fixture = (Fixture *) data;
+		try {
+			string output;
+			Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources current", out output);
+			stderr.printf ("output = \"%s\"\n", output);
+			assert (strcmp (output, "uint32 1\n") == 0);
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+		loop = new MainLoop (null, false);
+		signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
+		        loop.quit ();
+		});
 
-	bool visible;
+		try {
+			current = 0;
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	try {
-		visible = true;
-		Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		action_group.disconnect (signal_name);
 
-	var action_group = DBusActionGroup.get ((!) fixture.connection,
-	                                        "com.canonical.indicator.keyboard",
-	                                        "/com/canonical/indicator/keyboard");
-	var loop = new MainLoop (null, false);
-	var signal_name = action_group.action_added["indicator"].connect ((action) => {
-		loop.quit ();
-	});
-
-	action_group.list_actions ();
-
-	var source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	action_group.disconnect (signal_name);
-
-	var state = action_group.get_action_state ("indicator");
-	assert (state.lookup ("visible", "b", out visible));
-	stderr.printf ("visible = %s\n", visible ? "true" : "false");
-	assert (visible);
-
-	loop = new MainLoop (null, false);
-	signal_name = action_group.action_state_changed["indicator"].connect ((action, state) => {
-		loop.quit ();
-	});
-
-	try {
-		visible = false;
-		Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		state = action_group.get_action_state ("current");
+		current = state.get_uint32 ();
+		stderr.printf ("current = %u\n", current);
+		assert (current == 0);
 
-	source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	action_group.disconnect (signal_name);
-
-	state = action_group.get_action_state ("indicator");
-	assert (state.lookup ("visible", "b", out visible));
-	stderr.printf ("visible = %s\n", visible ? "true" : "false");
-	assert (!visible);
-
-	loop = new MainLoop (null, false);
-	signal_name = action_group.action_state_changed["indicator"].connect ((action, state) => {
-		loop.quit ();
-	});
-
-	try {
-		visible = true;
-		Process.spawn_command_line_sync (@"gsettings set com.canonical.indicator.keyboard visible $visible");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
+		try {
+			string output;
+			Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources current", out output);
+			stderr.printf ("output = \"%s\"\n", output);
+			assert (strcmp (output, "uint32 0\n") == 0);
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 	}
 
-	source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	action_group.disconnect (signal_name);
+	public void test_update_input_sources () {
+		try {
+			var current = 0;
+			var sources = "[('xkb', 'us')]";
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
+		}
 
-	state = action_group.get_action_state ("indicator");
-	assert (state.lookup ("visible", "b", out visible));
-	stderr.printf ("visible = %s\n", visible ? "true" : "false");
-	assert (visible);
-}
+		var menu_model = DBusMenuModel.get ((!) _connection,
+		                                    "com.canonical.indicator.keyboard",
+		                                    "/com/canonical/indicator/keyboard/desktop");
+		var loop = new MainLoop (null, false);
+		var signal_name = menu_model.items_changed.connect ((position, removed, added) => {
+		        loop.quit ();
+		});
 
-static void test_update_input_source (void *data) {
-	var fixture = (Fixture *) data;
+		menu_model.get_n_items ();
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+		var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		menu_model.disconnect (signal_name);
 
-	try {
-		var current = 0;
-		var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		var menu = menu_model.get_item_link (0, Menu.LINK_SUBMENU);
+		loop = new MainLoop (null, false);
+		signal_name = menu.items_changed.connect ((position, removed, added) => {
+		        loop.quit ();
+		});
 
-	var action_group = DBusActionGroup.get ((!) fixture.connection,
-	                                        "com.canonical.indicator.keyboard",
-	                                        "/com/canonical/indicator/keyboard");
-	var loop = new MainLoop (null, false);
-	var signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
-		loop.quit ();
-	});
-
-	action_group.list_actions ();
-
-	try {
-		var current = 1;
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		menu.get_n_items ();
 
-	var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	action_group.disconnect (signal_name);
-
-	var state = action_group.get_action_state ("current");
-	var current = state.get_uint32 ();
-	stderr.printf ("current = %u\n", current);
-	assert (current == 1);
-
-	try {
-		string output;
-		Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources current", out output);
-		stderr.printf ("output = \"%s\"\n", output);
-		assert (strcmp (output, "uint32 1\n") == 0);
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		menu.disconnect (signal_name);
 
-	loop = new MainLoop (null, false);
-	signal_name = action_group.action_state_changed["current"].connect ((action, state) => {
-		loop.quit ();
-	});
-
-	try {
-		current = 0;
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		var section = menu.get_item_link (0, Menu.LINK_SECTION);
+		loop = new MainLoop (null, false);
+		signal_name = section.items_changed.connect ((position, removed, added) => {
+		        loop.quit ();
+		});
 
-	source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	action_group.disconnect (signal_name);
-
-	state = action_group.get_action_state ("current");
-	current = state.get_uint32 ();
-	stderr.printf ("current = %u\n", current);
-	assert (current == 0);
-
-	try {
-		string output;
-		Process.spawn_command_line_sync ("gsettings get org.gnome.desktop.input-sources current", out output);
-		stderr.printf ("output = \"%s\"\n", output);
-		assert (strcmp (output, "uint32 0\n") == 0);
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
-}
+		section.get_n_items ();
 
-static void test_update_input_sources (void *data) {
-	var fixture = (Fixture *) data;
+		source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		section.disconnect (signal_name);
 
-	if (fixture.object_name == 0) {
-		Test.message ("error: Test fixture not initialized.");
-		Test.fail ();
-		return;
-	}
+		string label;
 
-	try {
-		var current = 0;
-		var sources = "[('xkb', 'us')]";
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources current $current");
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
+		stderr.printf ("section.get_n_items () = %d\n", section.get_n_items ());
+		assert (section.get_n_items () == 1);
+		section.get_item_attribute (0, Menu.ATTRIBUTE_LABEL, "s", out label);
+		stderr.printf ("label = \"%s\"\n", label);
+		assert (strcmp (label, "English (US)") == 0);
 
-	var menu_model = DBusMenuModel.get ((!) fixture.connection,
-	                                    "com.canonical.indicator.keyboard",
-	                                    "/com/canonical/indicator/keyboard/desktop");
-	var loop = new MainLoop (null, false);
-	var signal_name = menu_model.items_changed.connect ((position, removed, added) => {
-		loop.quit ();
-	});
-
-	menu_model.get_n_items ();
-
-	var source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	menu_model.disconnect (signal_name);
-
-	var menu = menu_model.get_item_link (0, Menu.LINK_SUBMENU);
-	loop = new MainLoop (null, false);
-	signal_name = menu.items_changed.connect ((position, removed, added) => {
-		loop.quit ();
-	});
-
-	menu.get_n_items ();
-
-	source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	menu.disconnect (signal_name);
-
-	var section = menu.get_item_link (0, Menu.LINK_SECTION);
-	loop = new MainLoop (null, false);
-	signal_name = section.items_changed.connect ((position, removed, added) => {
-		loop.quit ();
-	});
-
-	section.get_n_items ();
-
-	source = Timeout.add_seconds (TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	section.disconnect (signal_name);
-
-	string label;
-
-	stderr.printf ("section.get_n_items () = %d\n", section.get_n_items ());
-	assert (section.get_n_items () == 1);
-	section.get_item_attribute (0, Menu.ATTRIBUTE_LABEL, "s", out label);
-	stderr.printf ("label = \"%s\"\n", label);
-	assert (strcmp (label, "English (US)") == 0);
-
-	loop = new MainLoop (null, false);
-	signal_name = section.items_changed.connect ((position, removed, added) => {
-		if (section.get_n_items () == 4) {
-			loop.quit ();
+		loop = new MainLoop (null, false);
+		signal_name = section.items_changed.connect ((position, removed, added) => {
+		        if (section.get_n_items () == 4) {
+		                loop.quit ();
+		        }
+		});
+
+		try {
+			var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
+			Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
+		} catch (SpawnError error) {
+			Test.message ("error: %s", error.message);
+			Test.fail ();
+			return;
 		}
-	});
-
-	try {
-		var sources = "[('xkb', 'us'), ('xkb', 'ca+eng'), ('xkb', 'epo'), ('ibus', 'pinyin')]";
-		Process.spawn_command_line_sync (@"gsettings set org.gnome.desktop.input-sources sources \"$sources\"");
-	} catch (SpawnError error) {
-		Test.message ("error: %s", error.message);
-		Test.fail ();
-		return;
-	}
 
-	source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return false; });
-	loop.run ();
-	Source.remove (source);
-	section.disconnect (signal_name);
-
-	stderr.printf ("section.get_n_items () = %d\n", section.get_n_items ());
-	assert (section.get_n_items () == 4);
-	section.get_item_attribute (0, Menu.ATTRIBUTE_LABEL, "s", out label);
-	stderr.printf ("label = \"%s\"\n", label);
-	assert (strcmp (label, "English (US)") == 0);
-	section.get_item_attribute (1, Menu.ATTRIBUTE_LABEL, "s", out label);
-	stderr.printf ("label = \"%s\"\n", label);
-	assert (strcmp (label, "English (Canada)") == 0);
-	section.get_item_attribute (2, Menu.ATTRIBUTE_LABEL, "s", out label);
-	stderr.printf ("label = \"%s\"\n", label);
-	assert (strcmp (label, "Esperanto") == 0);
-	section.get_item_attribute (3, Menu.ATTRIBUTE_LABEL, "s", out label);
-	stderr.printf ("label = \"%s\"\n", label);
-	assert (label.ascii_casecmp ("Pinyin") == 0);
+		source = Timeout.add_seconds (LONG_TIMEOUT_S, () => { loop.quit (); return true; });
+		loop.run ();
+		Source.remove (source);
+		section.disconnect (signal_name);
+
+		stderr.printf ("section.get_n_items () = %d\n", section.get_n_items ());
+		assert (section.get_n_items () == 4);
+		section.get_item_attribute (0, Menu.ATTRIBUTE_LABEL, "s", out label);
+		stderr.printf ("label = \"%s\"\n", label);
+		assert (strcmp (label, "English (US)") == 0);
+		section.get_item_attribute (1, Menu.ATTRIBUTE_LABEL, "s", out label);
+		stderr.printf ("label = \"%s\"\n", label);
+		assert (strcmp (label, "English (Canada)") == 0);
+		section.get_item_attribute (2, Menu.ATTRIBUTE_LABEL, "s", out label);
+		stderr.printf ("label = \"%s\"\n", label);
+		assert (strcmp (label, "Esperanto") == 0);
+		section.get_item_attribute (3, Menu.ATTRIBUTE_LABEL, "s", out label);
+		stderr.printf ("label = \"%s\"\n", label);
+		assert (label.ascii_casecmp ("Pinyin") == 0);
+	}
 }
 
 public int main (string[] args) {
-	Environment.set_variable ("DCONF_PROFILE", DCONF_PROFILE, true);
-	Environment.set_variable ("LC_ALL", "C", true);
-
-	Test.init (ref args, null);
-
-	var suite = new TestSuite ("indicator-keyboard");
-
-	suite.add (new TestCase ("activate-input-source", begin_test, test_activate_input_source, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("activate-character-map", begin_test, test_activate_character_map, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("activate-keyboard-layout-chart", begin_test, test_activate_keyboard_layout_chart, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("activate-text-entry-settings", begin_test, test_activate_text_entry_settings, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("migration", begin_test, test_migration, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("no-migration", begin_test, test_no_migration, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("update-visible", begin_test, test_update_visible, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("update-input-source", begin_test, test_update_input_source, end_test, sizeof (Fixture)));
-	suite.add (new TestCase ("update-input-sources", begin_test, test_update_input_sources, end_test, sizeof (Fixture)));
-
-	TestSuite.get_root ().add_suite (suite);
+	display = Environment.get_variable ("DISPLAY");
+
+	Test.init (ref args);
+
+	Test.add_data_func ("/indicator-keyboard-service/activate-input-source", Fixture.create<Tests> (Tests.test_activate_input_source));
+	Test.add_data_func ("/indicator-keyboard-service/activate-character-map", Fixture.create<Tests> (Tests.test_activate_character_map));
+	Test.add_data_func ("/indicator-keyboard-service/activate-keyboard-layout-chart", Fixture.create<Tests> (Tests.test_activate_keyboard_layout_chart));
+	Test.add_data_func ("/indicator-keyboard-service/activate-text-entry-settings", Fixture.create<Tests> (Tests.test_activate_text_entry_settings));
+	Test.add_data_func ("/indicator-keyboard-service/migration", Fixture.create<Tests> (Tests.test_migration));
+	Test.add_data_func ("/indicator-keyboard-service/no-migration", Fixture.create<Tests> (Tests.test_no_migration));
+	Test.add_data_func ("/indicator-keyboard-service/update-visible", Fixture.create<Tests> (Tests.test_update_visible));
+	Test.add_data_func ("/indicator-keyboard-service/update-input-source", Fixture.create<Tests> (Tests.test_update_input_source));
+	Test.add_data_func ("/indicator-keyboard-service/update-input-sources", Fixture.create<Tests> (Tests.test_update_input_sources));
 
 	return Test.run ();
 }