93 files changed, 1797 insertions, 603 deletions

diff --git a/.bzrignore b/.bzrignore
index 8c441a49..d1af5121 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -29,6 +29,8 @@ libtool
 po/POTFILES
 po/stamp-it
 tests/config.vala
+tests/dconf-service
+tests/gvfs
 tests/indicator-keyboard-test
 tests/indicator-keyboard-test.trs
 tests/indicator-keyboard-tests
@@ -39,4 +41,4 @@ m4/libtool.m4
 m4/lt~obsolete.m4
 m4/ltoptions.m4
 m4/ltsugar.m4
-m4/ltversion.m4
\ No newline at end of file
+m4/ltversion.m4
diff --git a/MERGE-REVIEW b/MERGE-REVIEW
index 9f43fc0d..d77c0f10 100644
--- a/MERGE-REVIEW
+++ b/MERGE-REVIEW
@@ -12,8 +12,6 @@ and reviewers should ensure that they've done for a merge into the project.
 
  * Did the Jenkins build compile?  Pass?  Run unit tests successfully?
  * Are there appropriate tests to cover any new functionality?
- * If the description says this effects the phone profile:
-   * Run tests indicator-keyboard/unity8*
  * If the description says this effects the desktop profile:
    * Run tests indicator-keyboard/unity7*
 
diff --git a/README b/README
index e69de29b..2928a41c 100644
--- a/README
+++ b/README
@@ -0,0 +1,17 @@
+indicator-keyboard-icon-generator
+=================================
+
+To refresh the keyboard layout icons, I usually enter the data directory and
+run:
+
+./indicator-keyboard-icon-generator -i icon.svg.in -I icon-1.svg.in -o dark  -c '#dfdbd2'
+./indicator-keyboard-icon-generator -i icon.svg.in -I icon-1.svg.in -o light -c '#3c3c3c'
+('#dfdbd2' and '#3c3c3c' are the colours for the dark and light themes.)
+
+Then I just copy the files in the dark and light directories to
+ubuntu-mono-dark/status/22 and ubuntu-mono-light/status/22 in the ubuntu-themes
+source package.
+
+data/icon.svg.in and data/icon-1.svg.in are template files for the
+un-subscripted and subscripted icons. Parameters can be tweaked on the command
+line for the generator: './indicator-keyboard-icon-generator -?' for details.
diff --git a/data/Makefile.am b/data/Makefile.am
index ae1d9b0f..06ed4662 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -76,7 +76,10 @@ com.canonical.indicator.keyboard:
 	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop';             \
 	             echo '';                                                                 \
 	             echo '[desktop_greeter]';                                                \
-	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop';             \
+	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop_greeter';     \
+	             echo '';                                                                 \
+	             echo '[desktop_lockscreen]';                                             \
+	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop_lockscreen';  \
 	             echo '';                                                                 \
 	             echo '[ubiquity]';                                                       \
 	             echo 'ObjectPath=/com/canonical/indicator/keyboard/desktop') > $@.tmp && \
diff --git a/debian/changelog b/debian/changelog
index 16b76493..3b95b72c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,66 @@
+indicator-keyboard (0.0.0+14.04.20140410.1-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * If an IBus input source is active when the session is locked, switch
+    to another non-IBus one instead. (LP: #1301860)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 10 Apr 2014 16:49:00 +0000
+
+indicator-keyboard (0.0.0+14.04.20140410-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * Export separate menus for desktop and greeter. (LP: #1291962)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 10 Apr 2014 11:50:41 +0000
+
+indicator-keyboard (0.0.0+14.04.20140403.1-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * Document how to refresh indicator-keyboard's icons for the ubuntu-
+    mono themes.
+  * Refresh the menu and indicator when IBus is connected. (LP:
+    #1246537)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 03 Apr 2014 16:17:38 +0000
+
+indicator-keyboard (0.0.0+14.04.20140328.1-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * Use Ubuntu-specific IBus D-Bus API so that we don't have to replace
+    the old IBus panel service in order to inspect and activate IBus
+    engine properties. (LP: #1290881)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 28 Mar 2014 14:59:09 +0000
+
+indicator-keyboard (0.0.0+14.04.20140311-0ubuntu1) trusty; urgency=low
+
+  [ Lars Uebernickel ]
+  * Add desktop_lockscreen profile
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 11 Mar 2014 18:29:39 +0000
+
+indicator-keyboard (0.0.0+14.04.20140227.3-0ubuntu1) trusty; urgency=low
+
+  [ Sebastien Bacher ]
+  * Drop unity8 test description, that indicator is used on desktop only
+
+  [ William Hua ]
+  * Do not set org.gnome.desktop.input-sources.current when unchanged
+    (LP: #1256559). (LP: #1256559)
+  * Update icons when icon theme changes. (LP: #1237749)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 27 Feb 2014 19:38:10 +0000
+
+indicator-keyboard (0.0.0+14.04.20140220-0ubuntu1) trusty; urgency=low
+
+  [ William Hua ]
+  * Implement the IBus panel within the indicator.
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 20 Feb 2014 16:16:34 +0000
+
 indicator-keyboard (0.0.0+14.04.20140219.1-0ubuntu1) trusty; urgency=low
 
   [ CI bot ]
diff --git a/debian/control b/debian/control
index 4148227e..585af9c5 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Package: indicator-keyboard
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Breaks: ibus (<< 1.5.5-1ubuntu3),
 Description: Keyboard indicator
  This package contains the keyboard indicator, which should show as an icon in
  the top panel when using the Unity environment. It can be used to switch
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1d23aac8..c57725c1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,13 +2,19 @@ pkglibexec_PROGRAMS = indicator-keyboard-service
 
 AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
 AM_LDFLAGS = -lm
-AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
+AM_VALAFLAGS = --enable-experimental-non-null   \
+               --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-indicator_keyboard_service_SOURCES = main.vala          \
-                                     source.vala        \
-                                     common.vala        \
-                                     window-stack.vala  \
+indicator_keyboard_service_SOURCES = main.vala            \
+                                     source.vala          \
+                                     common.vala          \
+                                     ibus-menu.vala       \
+                                     ibus-panel.vala      \
+                                     indicator-menu.vala  \
+                                     keyboard-plugin.vala \
+                                     window-stack.vala    \
+                                     unity-session.vala   \
                                      unity-greeter.vala
 indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS)            \
                                        --pkg gee-1.0              \
diff --git a/lib/ibus-menu.vala b/lib/ibus-menu.vala
new file mode 100644
index 00000000..c0862ac3
--- /dev/null
+++ b/lib/ibus-menu.vala
@@ -0,0 +1,317 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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/>.
+ *
+ * Authors: William Hua <william.hua@canonical.com>
+ */
+
+public class Indicator.Keyboard.IBusMenu : MenuModel {
+
+	private static uint radio_counter = 0;
+
+	private IBus.PropList? properties;
+
+	private Menu menu;
+	private ActionMap? action_map;
+
+	private string? radio_name;
+	private SimpleAction? radio_action;
+	private Gee.HashMap<string, IBus.Property> radio_properties;
+
+	/* A list of the action names this menu registers. */
+	private Gee.LinkedList<string> names;
+
+	public IBusMenu (ActionMap? action_map = null, IBus.PropList? properties = null) {
+		menu = new Menu ();
+
+		menu.items_changed.connect ((position, removed, added) => {
+			items_changed (position, removed, added);
+		});
+
+		names = new Gee.LinkedList<string> ();
+		set_action_map (action_map);
+		set_properties (properties);
+	}
+
+	~IBusMenu () {
+		remove_actions ();
+	}
+
+	public signal void activate (IBus.Property property, IBus.PropState state);
+
+	private string get_action_name (string key) {
+		string name;
+
+		if (!action_name_is_valid (key)) {
+			var builder = new StringBuilder.sized (key.length + 1);
+
+			unichar letter = 0;
+			int index = 0;
+
+			while (key.get_next_char (ref index, out letter)) {
+				if (letter == '-' || letter == '.' || letter.isalnum ()) {
+					builder.append_unichar (letter);
+				} else {
+					builder.append_c ('-');
+				}
+			}
+
+			name = @"ibus-$(builder.str)";
+		} else {
+			name = @"ibus-$key";
+		}
+
+		/* Find an unused action name using a counter. */
+		if (action_map != null && (Action?) ((!) action_map).lookup_action (name) != null) {
+			var i = 0;
+			var unique_name = @"$name-$i";
+
+			while ((Action?) ((!) action_map).lookup_action (unique_name) != null) {
+				i++;
+				unique_name = @"$name-$i";
+			}
+
+			name = unique_name;
+		}
+
+		return name;
+	}
+
+	private string? get_label (IBus.Property property) {
+		string? label = null;
+
+		if ((IBus.Text?) property.label != null) {
+			label = property.label.text;
+		}
+
+		if (label == null && (IBus.Text?) property.symbol != null) {
+			label = property.symbol.text;
+		}
+
+		return label;
+	}
+
+	private void append_normal_property (IBus.Property property) {
+		if (property.prop_type == IBus.PropType.NORMAL) {
+			if ((string?) property.key != null) {
+				var name = get_action_name (property.key);
+
+				if (action_map != null) {
+					var action = new SimpleAction (name, null);
+					action.activate.connect ((parameter) => { activate (property, property.state); });
+					((!) action_map).add_action (action);
+					names.add (name);
+				}
+
+				menu.append (get_label (property), property.sensitive ? @"indicator.$name" : "-private-disabled");
+			}
+		}
+	}
+
+	private void append_toggle_property (IBus.Property property) {
+		if (property.prop_type == IBus.PropType.TOGGLE) {
+			if ((string?) property.key != null) {
+				var name = get_action_name (property.key);
+
+				if (action_map != null) {
+					var state = new Variant.boolean (property.state == IBus.PropState.CHECKED);
+					var action = new SimpleAction.stateful (name, null, state);
+
+					action.activate.connect ((parameter) => {
+						action.change_state (new Variant.boolean (!action.get_state ().get_boolean ()));
+					});
+
+					action.change_state.connect ((value) => {
+						if (value != null) {
+							action.set_state ((!) value);
+							activate (property, ((!) value).get_boolean () ? IBus.PropState.CHECKED : IBus.PropState.UNCHECKED);
+						}
+					});
+
+					((!) action_map).add_action (action);
+					names.add (name);
+				}
+
+				menu.append (get_label (property), property.sensitive ? @"indicator.$name" : "-private-disabled");
+			}
+		}
+	}
+
+	private void append_radio_property (IBus.Property property) {
+		if (property.prop_type == IBus.PropType.RADIO) {
+			if ((string?) property.key != null) {
+				/* Create a single action for all radio properties. */
+				if (action_map != null && radio_name == null) {
+					radio_counter++;
+					radio_name = @"-private-radio-$radio_counter";
+					radio_action = new SimpleAction.stateful ((!) radio_name, VariantType.STRING, new Variant.string (""));
+
+					((!) radio_action).activate.connect ((parameter) => {
+						((!) radio_action).change_state (parameter);
+					});
+
+					((!) radio_action).change_state.connect ((value) => {
+						if (value != null) {
+							var key = ((!) value).get_string ();
+
+							if (radio_properties.has_key (key)) {
+								((!) radio_action).set_state ((!) value);
+								activate (radio_properties[key], IBus.PropState.CHECKED);
+							}
+						}
+					});
+
+					((!) action_map).add_action ((!) radio_action);
+					names.add ((!) radio_name);
+				}
+
+				radio_properties[property.key] = property;
+
+				if (property.state == IBus.PropState.CHECKED) {
+					((!) radio_action).change_state (new Variant.string (property.key));
+				}
+
+				var item = new MenuItem (get_label (property), "-private-disabled");
+
+				if (property.sensitive) {
+					item.set_action_and_target_value (@"indicator.$((!) radio_name)", new Variant.string (property.key));
+				}
+
+				menu.append_item (item);
+			}
+		}
+	}
+
+	private void append_menu_property (IBus.Property property) {
+		if (property.prop_type == IBus.PropType.MENU) {
+			var submenu = new IBusMenu (action_map, ((!) property).sub_props);
+			submenu.activate.connect ((property, state) => { activate (property, state); });
+			menu.append_submenu (get_label (property), submenu);
+		}
+	}
+
+	private void append_property (IBus.Property? property) {
+		if (property != null && ((!) property).visible) {
+			switch (((!) property).prop_type) {
+			case IBus.PropType.NORMAL:
+				append_normal_property ((!) property);
+				break;
+
+			case IBus.PropType.TOGGLE:
+				append_toggle_property ((!) property);
+				break;
+
+			case IBus.PropType.RADIO:
+				append_radio_property ((!) property);
+				break;
+
+			case IBus.PropType.MENU:
+				append_menu_property ((!) property);
+				break;
+
+			case IBus.PropType.SEPARATOR:
+				break;
+			}
+		}
+	}
+
+	private void update_menu () {
+		/* Break reference cycle between action map and submenus. */
+		for (var i = 0; i < menu.get_n_items (); i++) {
+			var submenu = menu.get_item_link (i, Menu.LINK_SUBMENU) as IBusMenu;
+
+			if (submenu != null) {
+				((!) submenu).remove_actions ();
+			}
+		}
+
+		menu.remove_all ();
+
+		if (properties != null) {
+			for (var i = 0; i < ((!) properties).properties.length; i++) {
+				append_property (((!) properties).get (i));
+			}
+		}
+	}
+
+	private void remove_actions () {
+		radio_action = null;
+		radio_name = null;
+
+		if (action_map != null) {
+			foreach (var name in names) {
+				((!) action_map).remove_action (name);
+			}
+		}
+
+		names.clear ();
+	}
+
+	public void set_action_map (ActionMap? action_map) {
+		if (action_map != this.action_map) {
+			remove_actions ();
+			this.action_map = action_map;
+			update_menu ();
+		}
+	}
+
+	public void set_properties (IBus.PropList? properties) {
+		if (properties != this.properties) {
+			remove_actions ();
+			radio_properties = new Gee.HashMap<string, IBus.Property> ();
+			this.properties = properties;
+			update_menu ();
+		}
+	}
+
+	public void update_property (IBus.Property property) {
+		remove_actions ();
+		radio_properties = new Gee.HashMap<string, IBus.Property> ();
+		update_menu ();
+	}
+
+	/* Forward all menu model calls to our internal menu. */
+
+	public override Variant get_item_attribute_value (int item_index, string attribute, VariantType? expected_type) {
+		return menu.get_item_attribute_value (item_index, attribute, expected_type);
+	}
+
+	public override void get_item_attributes (int item_index, out HashTable<string, Variant>? attributes) {
+		menu.get_item_attributes (item_index, out attributes);
+	}
+
+	public override MenuModel get_item_link (int item_index, string link) {
+		return menu.get_item_link (item_index, link);
+	}
+
+	public override void get_item_links (int item_index, out HashTable<string, MenuModel>? links) {
+		menu.get_item_links (item_index, out links);
+	}
+
+	public override int get_n_items () {
+		return menu.get_n_items ();
+	}
+
+	public override bool is_mutable () {
+		return menu.is_mutable ();
+	}
+
+	public override MenuAttributeIter iterate_item_attributes (int item_index) {
+		return menu.iterate_item_attributes (item_index);
+	}
+
+	public override MenuLinkIter iterate_item_links (int item_index) {
+		return menu.iterate_item_links (item_index);
+	}
+}
diff --git a/lib/ibus-panel.vala b/lib/ibus-panel.vala
new file mode 100644
index 00000000..460b1eac
--- /dev/null
+++ b/lib/ibus-panel.vala
@@ -0,0 +1,26 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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/>.
+ *
+ * Authors: William Hua <william.hua@canonical.com>
+ */
+
+[DBus (name="com.canonical.IBus.Panel.Private")]
+public interface IBusPanel : Object {
+
+	public abstract void activate_property (string name, uint state) throws IOError;
+
+	public signal void properties_registered (Variant variant);
+	public signal void property_updated (Variant variant);
+}
diff --git a/lib/indicator-menu.vala b/lib/indicator-menu.vala
new file mode 100644
index 00000000..8e5661e2
--- /dev/null
+++ b/lib/indicator-menu.vala
@@ -0,0 +1,144 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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/>.
+ *
+ * Authors: William Hua <william.hua@canonical.com>
+ */
+
+public class Indicator.Keyboard.IndicatorMenu : MenuModel {
+
+	public enum Options {
+		NONE     = 0x0,
+		DCONF    = 0x1,
+		IBUS     = 0x2,
+		SETTINGS = 0x4
+	}
+
+	private Options options;
+
+	private Menu indicator_menu;
+	private Menu sources_section;
+	private IBusMenu properties_section;
+
+	public IndicatorMenu (ActionMap? action_map = null, Options options = Options.NONE) {
+		var submenu = new Menu ();
+
+		sources_section = new Menu ();
+		submenu.append_section (null, sources_section);
+
+		if ((options & Options.IBUS) != Options.NONE) {
+			properties_section = new IBusMenu (action_map);
+			properties_section.activate.connect ((property, state) => { activate (property, state); });
+			submenu.append_section (null, properties_section);
+		}
+
+		if ((options & Options.SETTINGS) != Options.NONE) {
+			var settings_section = new Menu ();
+			settings_section.append (_ ("Character Map"), "indicator.map");
+			settings_section.append (_ ("Keyboard Layout Chart"), "indicator.chart");
+			settings_section.append (_ ("Text Entry Settings..."), "indicator.settings");
+			submenu.append_section (null, settings_section);
+		}
+
+		var indicator = new MenuItem.submenu (null, submenu);
+		indicator.set_detailed_action ("indicator.indicator");
+		indicator.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root");
+
+		/* We need special mouse actions on the lock screen. */
+		if ((options & Options.DCONF) != Options.NONE) {
+			indicator.set_attribute ("x-canonical-secondary-action", "s", "indicator.next");
+			indicator.set_attribute ("x-canonical-scroll-action", "s", "indicator.scroll");
+		} else {
+			indicator.set_attribute ("x-canonical-secondary-action", "s", "indicator.locked_next");
+			indicator.set_attribute ("x-canonical-scroll-action", "s", "indicator.locked_scroll");
+		}
+
+		indicator_menu = new Menu ();
+		indicator_menu.append_item (indicator);
+
+		this.options = options;
+	}
+
+	public signal void activate (IBus.Property property, IBus.PropState state);
+
+	public void set_sources (Source[] sources) {
+		sources_section.remove_all ();
+
+		for (var i = 0; i < sources.length; i++) {
+			if (!sources[i].is_ibus || (options & Options.IBUS) != Options.NONE) {
+				string action;
+
+				if ((options & Options.DCONF) != Options.NONE) {
+					action = "indicator.current";
+				} else {
+					action = "indicator.active";
+				}
+
+				var item = new MenuItem (sources[i].name, action);
+
+				item.set_attribute (Menu.ATTRIBUTE_TARGET, "u", i);
+
+				if (sources[i].icon != null) {
+					item.set_icon ((!) sources[i].icon);
+				}
+
+				sources_section.append_item (item);
+			}
+		}
+	}
+
+	public void set_properties (IBus.PropList properties) {
+		if ((options & Options.IBUS) != Options.NONE) {
+			properties_section.set_properties (properties);
+		}
+	}
+
+	public void update_property (IBus.Property property) {
+		if ((options & Options.IBUS) != Options.NONE) {
+			properties_section.update_property (property);
+		}
+	}
+
+	public override bool is_mutable () {
+		return indicator_menu.is_mutable ();
+	}
+
+	public override int get_n_items () {
+		return indicator_menu.get_n_items ();
+	}
+
+	public override void get_item_attributes (int item_index, out HashTable<string, Variant>? attributes) {
+		indicator_menu.get_item_attributes (item_index, out attributes);
+	}
+
+	public override void get_item_links (int item_index, out HashTable<string, MenuModel>? links) {
+		indicator_menu.get_item_links (item_index, out links);
+	}
+
+	public override Variant get_item_attribute_value (int item_index, string attribute, VariantType? expected_type) {
+		return indicator_menu.get_item_attribute_value (item_index, attribute, expected_type);
+	}
+
+	public override MenuModel get_item_link (int item_index, string link) {
+		return indicator_menu.get_item_link (item_index, link);
+	}
+
+	public override MenuAttributeIter iterate_item_attributes (int item_index) {
+		return indicator_menu.iterate_item_attributes (item_index);
+	}
+
+	public override MenuLinkIter iterate_item_links (int item_index) {
+		return indicator_menu.iterate_item_links (item_index);
+	}
+}
diff --git a/lib/keyboard-plugin.vala b/lib/keyboard-plugin.vala
new file mode 100644
index 00000000..5ee8ea24
--- /dev/null
+++ b/lib/keyboard-plugin.vala
@@ -0,0 +1,23 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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/>.
+ *
+ * Authors: William Hua <william.hua@canonical.com>
+ */
+
+[DBus (name="com.canonical.SettingsDaemon.Keyboard.Private")]
+public interface KeyboardPlugin : Object {
+
+	public abstract void activate_input_source (uint index) throws IOError;
+}
diff --git a/lib/main.vala b/lib/main.vala
index 64dc86a5..8d39d757 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -19,8 +19,9 @@
 [DBus (name = "com.canonical.indicator.keyboard")]
 public class Indicator.Keyboard.Service : Object {
 
+	private static const uint PROPERTIES_DELAY = 250;
+
 	private static Service service;
-	private static IBus.Bus? ibus;
 
 	private bool force;
 	private bool use_gtk;
@@ -35,13 +36,22 @@ public class Indicator.Keyboard.Service : Object {
 	private Gee.HashMap<uint, uint>? window_sources;
 	private uint focused_window_id;
 
+	private IBus.Bus? ibus;
+	private IBusPanel? ibus_panel;
+	private ulong ibus_connected_id;
+	private uint panel_timeout;
+
 	private Source[]? sources;
 
 	private SimpleActionGroup? action_group;
 	private SimpleAction? indicator_action;
-	private MenuModel? menu_model;
-	private Menu? sources_menu;
+	private SimpleAction? active_action;
+	private IndicatorMenu? desktop_menu;
+	private IndicatorMenu? desktop_greeter_menu;
+	private IndicatorMenu? desktop_lockscreen_menu;
 
+	private KeyboardPlugin? keyboard_plugin;
+	private UnitySession? unity_session;
 	private UnityGreeter? unity_greeter;
 	private string? greeter_user;
 	private uint lightdm_current;
@@ -53,6 +63,34 @@ public class Indicator.Keyboard.Service : Object {
 
 		if (use_gtk) {
 			use_gtk = Gtk.init_check (ref args);
+
+			Gtk.IconTheme? icon_theme = Gtk.IconTheme.get_default ();
+
+			if (icon_theme != null) {
+				((!) icon_theme).changed.connect (() => {
+					if (sources != null) {
+						foreach (var source in (!) sources) {
+							source.icon = null;
+						}
+					}
+
+					if (desktop_menu != null) {
+						get_desktop_menu ().set_sources (get_sources ());
+					}
+
+					if (desktop_greeter_menu != null) {
+						get_desktop_greeter_menu ().set_sources (get_sources ());
+					}
+
+					if (desktop_lockscreen_menu != null) {
+						get_desktop_lockscreen_menu ().set_sources (get_sources ());
+					}
+
+					if (indicator_action != null) {
+						update_indicator_action ();
+					}
+				});
+			}
 		} else {
 			Gdk.init (ref args);
 		}
@@ -69,6 +107,18 @@ public class Indicator.Keyboard.Service : Object {
 			}
 		} else {
 			Bus.watch_name (BusType.SESSION,
+			                "org.gnome.SettingsDaemon.Keyboard",
+			                BusNameWatcherFlags.NONE,
+			                handle_keyboard_name_appeared,
+			                handle_keyboard_name_vanished);
+
+			Bus.watch_name (BusType.SESSION,
+			                "com.canonical.Unity",
+			                BusNameWatcherFlags.NONE,
+			                handle_unity_name_appeared,
+			                handle_unity_name_vanished);
+
+			Bus.watch_name (BusType.SESSION,
 			                "com.canonical.Unity.WindowStack",
 			                BusNameWatcherFlags.NONE,
 			                handle_window_stack_name_appeared,
@@ -96,16 +146,70 @@ public class Indicator.Keyboard.Service : Object {
 	}
 
 	[DBus (visible = false)]
-	private static IBus.Bus get_ibus () {
+	private IBus.Bus get_ibus () {
 		if (ibus == null) {
 			IBus.init ();
 			ibus = new IBus.Bus ();
+			((!) ibus).connected.connect (() => {
+				if (desktop_menu != null) {
+					get_desktop_menu ().set_sources (get_sources ());
+				}
+
+				if (desktop_greeter_menu != null) {
+					get_desktop_greeter_menu ().set_sources (get_sources ());
+				}
+
+				if (desktop_lockscreen_menu != null) {
+					get_desktop_lockscreen_menu ().set_sources (get_sources ());
+				}
+
+				if (indicator_action != null) {
+					update_indicator_action ();
+				}
+			});
 		}
 
 		return (!) ibus;
 	}
 
 	[DBus (visible = false)]
+	private IBusPanel? get_ibus_panel () {
+		if (ibus_panel == null && get_ibus ().is_connected ()) {
+			var connection = get_ibus ().get_connection ();
+			var name = "org.freedesktop.IBus.Panel";
+			var path = "/org/freedesktop/IBus/Panel";
+
+			try {
+				ibus_panel = connection.get_proxy_sync (name, path);
+
+				((!) ibus_panel).properties_registered.connect ((variant) => {
+					var properties = new IBus.PropList ();
+					properties.deserialize (variant);
+
+					if (properties is IBus.PropList) {
+						handle_properties_registered ((!) (properties as IBus.PropList));
+					}
+				});
+				((!) ibus_panel).property_updated.connect ((variant) => {
+					var type = IBus.PropType.NORMAL;
+					var state = IBus.PropState.INCONSISTENT;
+					var text = new IBus.Text.from_static_string ("");
+					var property = new IBus.Property ("", type, text, null, text, false, false, state, null);
+					property.deserialize (variant);
+
+					if (property is IBus.Property) {
+						handle_property_updated ((!) (property as IBus.Property));
+					}
+				});
+			} catch (IOError error) {
+				warning ("error: %s", error.message);
+			}
+		}
+
+		return ibus_panel;
+	}
+
+	[DBus (visible = false)]
 	public void up () {
 		if (loop == null) {
 			loop = new MainLoop ();
@@ -210,7 +314,7 @@ public class Indicator.Keyboard.Service : Object {
 		if (source != null) {
 			var array = source_settings.get_value ("sources");
 
-			for (int i = 0; i < array.n_children (); i++) {
+			for (var i = 0; i < array.n_children (); i++) {
 				unowned string type;
 				unowned string name;
 
@@ -507,16 +611,22 @@ public class Indicator.Keyboard.Service : Object {
 
 	[DBus (visible = false)]
 	private void handle_focused_window_changed (uint window_id, string app_id, uint stage) {
-		((!) window_sources)[focused_window_id] = source_settings.get_uint ("current");
+		var old_current = source_settings.get_uint ("current");
+
+		((!) window_sources)[focused_window_id] = old_current;
 
 		if (!(((!) window_sources).has_key (window_id))) {
 			var default_group = per_window_settings.get_int ("default-group");
 
-			if (default_group >= 0) {
+			if (default_group >= 0 && default_group != old_current) {
 				source_settings.set_uint ("current", (uint) default_group);
 			}
 		} else {
-			source_settings.set_uint ("current", ((!) window_sources)[window_id]);
+			var current = ((!) window_sources)[window_id];
+
+			if (current != old_current) {
+				source_settings.set_uint ("current", current);
+			}
 		}
 
 		focused_window_id = window_id;
@@ -543,6 +653,15 @@ public class Indicator.Keyboard.Service : Object {
 						break;
 					}
 				}
+
+				if (ibus_connected_id == 0 && sources[i].is_ibus) {
+					ibus_connected_id = get_ibus ().connected.connect (() => { get_ibus_panel (); });
+					get_ibus ().disconnected.connect (() => { ibus_panel = null; });
+
+					if (get_ibus ().is_connected ()) {
+						get_ibus_panel ();
+					}
+				}
 			}
 		}
 
@@ -550,21 +669,39 @@ public class Indicator.Keyboard.Service : Object {
 	}
 
 	[DBus (visible = false)]
-	private void update_indicator_action () {
-		var visible = indicator_settings.get_boolean ("visible");
-		var current = source_settings.get_uint ("current");
-		var sources = get_sources ();
+	private void handle_properties_registered (IBus.PropList list) {
+		if (panel_timeout > 0) {
+			GLib.Source.remove (panel_timeout);
+			panel_timeout = 0;
+		}
+
+		panel_timeout = Timeout.add (PROPERTIES_DELAY, () => {
+			get_desktop_menu ().set_properties (list);
+			panel_timeout = 0;
+			return false;
+		});
+	}
 
+	[DBus (visible = false)]
+	private void handle_property_updated (IBus.Property property) {
+		get_desktop_menu ().update_property (property);
+	}
+
+	[DBus (visible = false)]
+	private void update_indicator_action () {
 		Icon? icon = null;
 		string? name = null;
 
-		if (current < sources.length) {
-			icon = sources[current].icon;
-			name = sources[current].name;
+		var sources = get_sources ();
+		var active = get_active_action ().get_state ().get_uint32 ();
+
+		if (active < sources.length) {
+			icon = sources[active].icon;
+			name = sources[active].name;
 		}
 
 		var builder = new VariantBuilder (new VariantType ("a{sv}"));
-		builder.add ("{sv}", "visible", new Variant.boolean (visible));
+		builder.add ("{sv}", "visible", indicator_settings.get_value ("visible"));
 		if (name != null) {
 			var description = _ ("%s input source").printf ((!) name);
 			builder.add ("{sv}", "accessible-desc", new Variant.string (description));
@@ -588,6 +725,42 @@ public class Indicator.Keyboard.Service : Object {
 	}
 
 	[DBus (visible = false)]
+	private void handle_changed_active (Variant? value) {
+		if (value != null) {
+			((!) active_action).set_state ((!) value);
+			update_indicator_action ();
+
+			if (keyboard_plugin != null) {
+				try {
+					((!) keyboard_plugin).activate_input_source (((!) value).get_uint32 ());
+				} catch (IOError error) {
+					warning ("error: %s", error.message);
+				}
+			}
+		}
+	}
+
+	[DBus (visible = false)]
+	private void update_active_action () {
+		if (active_action != null) {
+			((!) active_action).set_state (source_settings.get_value ("current"));
+			update_indicator_action ();
+		}
+	}
+
+	[DBus (visible = false)]
+	private Action get_active_action () {
+		if (active_action == null) {
+			var current = source_settings.get_value ("current");
+			active_action = new SimpleAction.stateful ("active", VariantType.UINT32, current);
+			((!) active_action).activate.connect ((parameter) => { ((!) active_action).change_state (parameter); });
+			((!) active_action).change_state.connect (handle_changed_active);
+		}
+
+		return (!) active_action;
+	}
+
+	[DBus (visible = false)]
 	private void handle_middle_click (Variant? parameter) {
 		handle_scroll_wheel (new Variant.int32 (-1));
 	}
@@ -600,38 +773,98 @@ public class Indicator.Keyboard.Service : Object {
 			var length = (int) sources.n_children ();
 
 			if (length > 0) {
-				var offset = parameter.get_int32 () % length;
+				var offset = ((!) parameter).get_int32 () % length;
 				source_settings.set_uint ("current", (current + (length - offset)) % length);
 			}
 		}
 	}
 
 	[DBus (visible = false)]
+	private void handle_middle_click_when_locked (Variant? parameter) {
+		handle_scroll_wheel_when_locked (new Variant.int32 (-1));
+	}
+
+	[DBus (visible = false)]
+	private void handle_scroll_wheel_when_locked (Variant? parameter) {
+		if (parameter != null) {
+			var sources = get_sources ();
+			var non_ibus_length = 0;
+
+			/* Figure out how many non-IBus sources we have. */
+			foreach (var source in sources) {
+				if (!source.is_ibus) {
+					non_ibus_length++;
+				}
+			}
+
+			if (non_ibus_length > 1) {
+				var active_action = get_active_action ();
+				var active = active_action.state.get_uint32 ();
+				var offset = -((!) parameter).get_int32 () % non_ibus_length;
+
+				/* Make offset positive modulo non_ibus_length. */
+				if (offset < 0) {
+					offset += non_ibus_length;
+				}
+
+				/* We need to cycle through non-IBus sources only. */
+				while (offset > 0) {
+					do {
+						active = (active + 1) % sources.length;
+					} while (sources[active].is_ibus);
+
+					offset--;
+				}
+
+				active_action.change_state (new Variant.uint32 (active));
+			}
+		}
+	}
+
+	[DBus (visible = false)]
 	protected virtual SimpleActionGroup create_action_group (Action root_action) {
 		var group = new SimpleActionGroup ();
 
-		group.insert (root_action);
-		group.insert (source_settings.create_action ("current"));
+		/*
+		 * The 'current' action reflects the current setting in
+		 * GSettings and the 'active' action only exists to set the
+		 * active input source without persisting it.
+		 *
+		 * The lock screen menu uses the 'active' action while the
+		 * other menus instead persist the current input source.
+		 */
+
+		group.add_action (root_action);
+		group.add_action (get_active_action ());
+		group.add_action (source_settings.create_action ("current"));
 
 		var action = new SimpleAction ("next", null);
 		action.activate.connect (handle_middle_click);
-		group.insert (action);
+		group.add_action (action);
 
 		action = new SimpleAction ("scroll", VariantType.INT32);
 		action.activate.connect (handle_scroll_wheel);
-		group.insert (action);
+		group.add_action (action);
+
+		action = new SimpleAction ("locked_next", null);
+		action.activate.connect (handle_middle_click_when_locked);
+		group.add_action (action);
+
+		action = new SimpleAction ("locked_scroll", VariantType.INT32);
+		action.activate.connect (handle_scroll_wheel_when_locked);
+		group.add_action (action);
 
 		action = new SimpleAction ("map", null);
 		action.activate.connect (handle_activate_map);
-		group.insert (action);
+		group.add_action (action);
 
 		action = new SimpleAction ("chart", null);
 		action.activate.connect (handle_activate_chart);
-		group.insert (action);
+		group.add_action (action);
 
 		action = new SimpleAction ("settings", null);
 		action.activate.connect (handle_activate_settings);
-		group.insert (action);
+		group.add_action (action);
 
 		return group;
 	}
@@ -646,74 +879,52 @@ public class Indicator.Keyboard.Service : Object {
 	}
 
 	[DBus (visible = false)]
-	private void update_sources_menu () {
-		if (sources_menu != null) {
-			var menu = get_sources_menu ();
-
-			while (menu.get_n_items () > 0)
-				menu.remove (0);
-
-			var sources = get_sources ();
-
-			for (var i = 0; i < sources.length; i++) {
-				var item = new MenuItem (sources[i].name, "indicator.current");
-				item.set_attribute (Menu.ATTRIBUTE_TARGET, "u", i);
-
-				var icon = sources[i].icon;
-				if (icon != null) {
-					item.set_icon ((!) icon);
+	public IndicatorMenu get_desktop_menu () {
+		if (desktop_menu == null) {
+			var options = IndicatorMenu.Options.DCONF
+			            | IndicatorMenu.Options.IBUS
+			            | IndicatorMenu.Options.SETTINGS;
+
+			desktop_menu = new IndicatorMenu (get_action_group (), options);
+			((!) desktop_menu).set_sources (get_sources ());
+			((!) desktop_menu).activate.connect ((property, state) => {
+				var panel = get_ibus_panel ();
+
+				if (panel != null) {
+					try {
+						((!) panel).activate_property (property.key, state);
+					} catch (IOError error) {
+						warning ("error: %s", error.message);
+					}
 				}
-
-				menu.append_item (item);
-			}
-		} else {
-			get_sources_menu ();
-		}
-	}
-
-	[DBus (visible = false)]
-	private Menu get_sources_menu () {
-		if (sources_menu == null) {
-			sources_menu = new Menu ();
-			update_sources_menu ();
+			});
 		}
 
-		return (!) sources_menu;
+		return (!) desktop_menu;
 	}
 
 	[DBus (visible = false)]
-	protected virtual MenuModel create_menu_model (MenuModel section_menu) {
-		var menu = new Menu ();
-
-		var submenu = new Menu ();
+	public IndicatorMenu get_desktop_greeter_menu () {
+		if (desktop_greeter_menu == null) {
+			var options = IndicatorMenu.Options.DCONF;
 
-		submenu.append_section (null, section_menu);
-
-		if (!is_login_user ()) {
-			var section = new Menu ();
-			section.append (_ ("Character Map"), "indicator.map");
-			section.append (_ ("Keyboard Layout Chart"), "indicator.chart");
-			section.append (_ ("Text Entry Settings..."), "indicator.settings");
-			submenu.append_section (null, section);
+			desktop_greeter_menu = new IndicatorMenu (get_action_group (), options);
+			((!) desktop_greeter_menu).set_sources (get_sources ());
 		}
 
-		var indicator = new MenuItem.submenu ("x", submenu);
-		indicator.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root");
-		indicator.set_attribute ("x-canonical-secondary-action", "s", "indicator.next");
-		indicator.set_attribute ("x-canonical-scroll-action", "s", "indicator.scroll");
-		indicator.set_detailed_action ("indicator.indicator");
-		menu.append_item (indicator);
-
-		return menu;
+		return (!) desktop_greeter_menu;
 	}
 
 	[DBus (visible = false)]
-	public MenuModel get_menu_model () {
-		if (menu_model == null) {
-			menu_model = create_menu_model (get_sources_menu ());
+	public IndicatorMenu get_desktop_lockscreen_menu () {
+		if (desktop_lockscreen_menu == null) {
+			var options = IndicatorMenu.Options.NONE;
+
+			desktop_lockscreen_menu = new IndicatorMenu (get_action_group (), options);
+			((!) desktop_lockscreen_menu).set_sources (get_sources ());
 		}
 
-		return (!) menu_model;
+		return (!) desktop_lockscreen_menu;
 	}
 
 	[DBus (visible = false)]
@@ -724,6 +935,7 @@ public class Indicator.Keyboard.Service : Object {
 	[DBus (visible = false)]
 	private void handle_changed_current (string key) {
 		update_indicator_action ();
+		update_active_action ();
 		update_login_layout ();
 	}
 
@@ -731,7 +943,9 @@ public class Indicator.Keyboard.Service : Object {
 	private void handle_changed_sources (string key) {
 		sources = null;
 
-		update_sources_menu ();
+		get_desktop_menu ().set_sources (get_sources ());
+		get_desktop_greeter_menu ().set_sources (get_sources ());
+		get_desktop_lockscreen_menu ().set_sources (get_sources ());
 		update_indicator_action ();
 		update_login_layout ();
 	}
@@ -803,6 +1017,53 @@ public class Indicator.Keyboard.Service : Object {
 	}
 
 	[DBus (visible = false)]
+	private void handle_keyboard_name_appeared (DBusConnection connection, string name, string name_owner) {
+		try {
+			keyboard_plugin = Bus.get_proxy_sync (BusType.SESSION, name, "/org/gnome/SettingsDaemon/Keyboard");
+		} catch (IOError error) {
+			warning ("error: %s", error.message);
+		}
+	}
+
+	[DBus (visible = false)]
+	private void handle_keyboard_name_vanished (DBusConnection connection, string name) {
+		keyboard_plugin = null;
+	}
+
+	[DBus (visible = false)]
+	private void handle_unity_name_appeared (DBusConnection connection, string name, string name_owner) {
+		try {
+			unity_session = Bus.get_proxy_sync (BusType.SESSION, name, "/com/canonical/Unity/Session");
+			((!) unity_session).locked.connect (() => {
+				var sources = get_sources ();
+
+				if (sources.length > 0) {
+					var current = source_settings.get_uint ("current");
+
+					if (current < sources.length && sources[current].is_ibus) {
+						for (var i = 0; i < sources.length; i++) {
+							if (!sources[i].is_ibus) {
+								get_active_action ().change_state (new Variant.uint32 (i));
+								break;
+							}
+						}
+					}
+				}
+			});
+			((!) unity_session).unlocked.connect (() => {
+				get_active_action ().change_state (source_settings.get_value ("current"));
+			});
+		} catch (IOError error) {
+			warning ("error: %s", error.message);
+		}
+	}
+
+	[DBus (visible = false)]
+	private void handle_unity_name_vanished (DBusConnection connection, string name) {
+		unity_session = null;
+	}
+
+	[DBus (visible = false)]
 	private void handle_window_stack_name_appeared (DBusConnection connection, string name, string name_owner) {
 		try {
 			window_stack = Bus.get_proxy_sync (BusType.SESSION, name, "/com/canonical/Unity/WindowStack");
@@ -821,7 +1082,9 @@ public class Indicator.Keyboard.Service : Object {
 	private void handle_bus_acquired (DBusConnection connection, string name) {
 		try {
 			connection.export_action_group ("/com/canonical/indicator/keyboard", get_action_group ());
-			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop", get_menu_model ());
+			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop", get_desktop_menu ());
+			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop_greeter", get_desktop_greeter_menu ());
+			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop_lockscreen", get_desktop_lockscreen_menu ());
 		} catch (Error error) {
 			warning ("error: %s", error.message);
 		}
diff --git a/lib/source.vala b/lib/source.vala
index 3e38a86e..5fe7157d 100644
--- a/lib/source.vala
+++ b/lib/source.vala
@@ -51,7 +51,7 @@ public class Indicator.Keyboard.Source : Object {
 
 	public Icon? icon {
 		get { if (_icon == null) { _icon = _get_icon (); } return _icon; }
-		private set { _icon = value; }
+		set { _icon = value; }
 	}
 
 	public uint subscript {
@@ -69,6 +69,14 @@ public class Indicator.Keyboard.Source : Object {
 		construct set { _use_gtk = value; icon = null; }
 	}
 
+	public bool is_xkb {
+		get { return xkb != null; }
+	}
+
+	public bool is_ibus {
+		get { return ibus != null; }
+	}
+
 	public Source (Variant variant, bool use_gtk = false) {
 		Object (use_gtk: use_gtk);
 
@@ -416,16 +424,7 @@ public class Indicator.Keyboard.Source : Object {
 				Gtk.IconInfo? icon_info = icon_theme.lookup_icon (icon_name, 22, 0);
 
 				if (icon_info != null) {
-					string? file_name = ((!) icon_info).get_filename ();
-					var has_file_name = file_name != null && ((!) file_name).get_char () != '\0';
-
-					if (has_file_name) {
-						try {
-							icon = Icon.new_for_string ((!) file_name);
-						} catch (Error error) {
-							warning ("error: %s", error.message);
-						}
-					}
+					icon = new ThemedIcon (icon_name);
 				}
 			} else {
 				icon = new ThemedIcon (icon_name);
diff --git a/lib/unity-session.vala b/lib/unity-session.vala
new file mode 100644
index 00000000..04bf3349
--- /dev/null
+++ b/lib/unity-session.vala
@@ -0,0 +1,24 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * 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/>.
+ *
+ * Authors: William Hua <william.hua@canonical.com>
+ */
+
+[DBus (name="com.canonical.Unity.Session")]
+public interface UnitySession : Object {
+
+	public signal void locked ();
+	public signal void unlocked ();
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 14cf57e3..bcebe005 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,3 @@
 # List of source files which contain translatable strings.
 lib/main.vala
+lib/indicator-menu.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 57cc1d5d..cb832ddf 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,2 @@
 lib/main.c
+lib/indicator-menu.c
diff --git a/po/am.po b/po/am.po
index de0b8b82..4c3c332d 100644
--- a/po/am.po
+++ b/po/am.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s የማስገቢያ ምንጭ"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "የባህሪ ካርታ"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "የፊደል ገበታ እቅድ ካርታ"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "የ ጽሁፍ ማስገቢያ ማሰናጃዎች..."
diff --git a/po/ar.po b/po/ar.po
index b65e4abf..e874ada3 100644
--- a/po/ar.po
+++ b/po/ar.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "مصدر الإدخال %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "خريطة المحارف"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "رسمة تخطيط لوحة المفاتيح"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "إعدادات إدخال النص..."
diff --git a/po/ast.po b/po/ast.po
index 18141753..039ef7ae 100644
--- a/po/ast.po
+++ b/po/ast.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Orixe d'entrada %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa de caráuteres"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Distribución del tecláu"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Configuración d'entrada de testu…"
diff --git a/po/az.po b/po/az.po
index 650f2c47..d09254a2 100644
--- a/po/az.po
+++ b/po/az.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s giriş mənbəyi"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Simvol Xəritəsi"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Klaviatura Düzümü Qrafiki"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Mətn Daxiletmə Seçənəkləri..."
diff --git a/po/be.po b/po/be.po
index 90d41094..b2d62c9f 100644
--- a/po/be.po
+++ b/po/be.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s прылада для друку"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
-msgstr ""
+msgstr "Мапа сімвалаў"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "Паглядзець раскладку"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "Перавагi ўвода тэксту"
diff --git a/po/bg.po b/po/bg.po
index 3551c538..7a8e78be 100644
--- a/po/bg.po
+++ b/po/bg.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Входен източник %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Таблица със знаци"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Схема на клавиатурната подредба"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Параметри за въвеждане на текста..."
diff --git a/po/br.po b/po/br.po
index e05249fe..89e7d362 100644
--- a/po/br.po
+++ b/po/br.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s orin ar gasadenn"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Kartenn al letrennoù"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Neuz aozadur ar c'hlavier"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Arventennoù ar reiñ testennoù"
diff --git a/po/bs.po b/po/bs.po
index 0e931347..c8cf8553 100644
--- a/po/bs.po
+++ b/po/bs.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s ulazni izvor"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa znakova"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Crtež rasporeda tastature"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Postavke unosa teksta..."
diff --git a/po/ca.po b/po/ca.po
index be24b01c..9fdd9706 100644
--- a/po/ca.po
+++ b/po/ca.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Font d'entrada %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa de caràcters"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Disposició del teclat"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Paràmetres d'entrada de text…"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
new file mode 100644
index 00000000..7e211314
--- /dev/null
+++ b/po/ca@valencia.po
@@ -0,0 +1,35 @@
+# Catalan (Valencian) 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-04-12 06:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (Valencian) <ca@valencia@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr "Font d'entrada %s"
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr "Mapa de caràcters"
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr "Disposició del teclat"
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr "Paràmetres d'entrada de text…"
diff --git a/po/cs.po b/po/cs.po
index 38efa6bb..fed230b2 100644
--- a/po/cs.po
+++ b/po/cs.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s vstupní zdroj"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa znaků"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Mapa rozložení klávesnice"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Nastavení zadávání textu..."
diff --git a/po/cy.po b/po/cy.po
index c08aae38..67fab4cf 100644
--- a/po/cy.po
+++ b/po/cy.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "ffynhonell mewnbwn %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
-msgstr ""
+msgstr "Map Nodau"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "Siart Cynllun Bysellfwrdd"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "Gosodiadau Cofnodi Testun..."
diff --git a/po/da.po b/po/da.po
index f228de2c..027e7a87 100644
--- a/po/da.po
+++ b/po/da.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s-inputkilde"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Tegnoversigt"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Oversigt over tastaturlayout"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Indstillinger for tekstfelt..."
diff --git a/po/de.po b/po/de.po
index 85ba3a75..108ddeed 100644
--- a/po/de.po
+++ b/po/de.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s-Eingabequelle"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Zeichentabelle"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Abbild der Tastaturbelegung"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Texteingabe-Einstellungen …"
diff --git a/po/el.po b/po/el.po
index dc70a03f..3475a83c 100644
--- a/po/el.po
+++ b/po/el.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s πηγή εισόδου"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Καθορισμός χαρακτήρων"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Διάγραμμα διάταξης πληκτρολογίου"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Ρυθμίσεις εισαγωγής κειμένου..."
diff --git a/po/en_AU.po b/po/en_AU.po
index b2c4f191..9c08ced2 100644
--- a/po/en_AU.po
+++ b/po/en_AU.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s input source"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Character Map"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Keyboard Layout Chart"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Text Entry Settings..."
diff --git a/po/en_CA.po b/po/en_CA.po
index 8f58528e..b6c3374f 100644
--- a/po/en_CA.po
+++ b/po/en_CA.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s input source"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Character Map"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Keyboard Layout Chart"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Text Entry Settings..."
diff --git a/po/en_GB.po b/po/en_GB.po
index d683b490..a6ae0471 100644
--- a/po/en_GB.po
+++ b/po/en_GB.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s input source"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Character Map"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Keyboard Layout Chart"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Text Entry Settings..."
diff --git a/po/es.po b/po/es.po
index 6e7bb06a..964e538d 100644
--- a/po/es.po
+++ b/po/es.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: 2014-02-18 05:52+0000\n"
-"PO-Revision-Date: 2013-09-23 09:25+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-02-26 21:59+0000\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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr "Origen de entrada %s"
+msgstr "Fuente de entrada %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa de caracteres"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr "Distribución del teclado"
+msgstr "Gráfico de distribución del teclado"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Configuración de entrada de texto…"
diff --git a/po/et.po b/po/et.po
index 3e9a8bb5..f164bafd 100644
--- a/po/et.po
+++ b/po/et.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s sisendallikas"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Märgikaart"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Klaviatuuripaigutuse skeem"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Tekstisisestamise seaded..."
diff --git a/po/eu.po b/po/eu.po
index eeacf875..773df40c 100644
--- a/po/eu.po
+++ b/po/eu.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s sarrera-iturria"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Karaktere-mapa"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Teklatuaren diseinuaren mapa"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Testu-sarreraren ezarpenak"
diff --git a/po/fa.po b/po/fa.po
index 61bafa4f..bef725d0 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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s منبع ورودی"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "نقشه‌ی نویسه‌ها"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "نمودار چینش صفحه‌کلید"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "تنظیمات ورودی متن…"
diff --git a/po/fi.po b/po/fi.po
index c877d2b6..17df223b 100644
--- a/po/fi.po
+++ b/po/fi.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Syötelähde %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Merkkikartta"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Näppäimistön asettelu"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Tekstisyötteen asetukset..."
diff --git a/po/fr.po b/po/fr.po
index 366d9547..71d1d9ac 100644
--- a/po/fr.po
+++ b/po/fr.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr "Agencement : %s"
+msgstr "%s source d'entrée"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Table de caractères"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Représentation de l'agencement"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr "Paramètres d'agencement"
+msgstr "Paramètres de saisie de texte..."
diff --git a/po/fr_CA.po b/po/fr_CA.po
index fac58e86..97355f32 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+0000\n"
 "PO-Revision-Date: 2014-01-29 20:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French (Canada) <fr_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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s source d'entrée"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Table de caractères"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Affichage de l'agencement du clavier"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Paramètres de saisie de texte"
diff --git a/po/ga.po b/po/ga.po
new file mode 100644
index 00000000..22b98ea4
--- /dev/null
+++ b/po/ga.po
@@ -0,0 +1,35 @@
+# Irish 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-02-27 15:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Irish <ga@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr "%s foinse an ionchuir"
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr "Mapa Carachtar"
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr "Cairt Leagan Amach an an Méarchláir"
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr "Socruithe iontráil téacs"
diff --git a/po/gd.po b/po/gd.po
index feb7bf00..5efe3c1e 100644
--- a/po/gd.po
+++ b/po/gd.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Tùs ion-chur %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa nan caractaran"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Cairt co-dhealbhachd a' mheur-chlàir"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Roghainnean ion-chur teacsa..."
diff --git a/po/gl.po b/po/gl.po
index 0397bcdc..eb298273 100644
--- a/po/gl.po
+++ b/po/gl.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Orixe da entrada: %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa de caracteres"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Gráfica da disposición do teclado"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Configuración da entrada de texto..."
diff --git a/po/he.po b/po/he.po
index 45a0497a..4939a797 100644
--- a/po/he.po
+++ b/po/he.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "מקור קלט %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "מפת תווים"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "תרשים פריסת המקלדת"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "הגדרות הזנת טקסט…"
diff --git a/po/hi.po b/po/hi.po
index cf9e7eba..33dd30bb 100644
--- a/po/hi.po
+++ b/po/hi.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s निवेश स्त्रोत"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "अक्षर तालिका"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "कुंजीपट विन्यास तालिका"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "शब्द प्रविष्टि समायोजन..."
diff --git a/po/hu.po b/po/hu.po
index 92f1203f..41d99394 100644
--- a/po/hu.po
+++ b/po/hu.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s beviteli forrás"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Karaktertábla"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Billentyűzetkiosztás"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Szövegbeviteli beállítások…"
diff --git a/po/id.po b/po/id.po
index 93ca35ff..7df78b1b 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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s sumber masukan"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Peta Karakter"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Bagan Tata Letak Papan Ketik"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Pengaturan Pemasukan Teks"
diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot
index 34931572..52ce3b32 100644
--- a/po/indicator-keyboard.pot
+++ b/po/indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-27 16:28+0200\n"
+"POT-Creation-Date: 2014-04-05 11:53+1300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/main.vala:427
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr ""
 
-#: ../lib/main.vala:525
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/main.vala:526
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/main.vala:527
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr ""
diff --git a/po/is.po b/po/is.po
new file mode 100644
index 00000000..19456135
--- /dev/null
+++ b/po/is.po
@@ -0,0 +1,35 @@
+# Icelandic 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-05-17 18:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr "Stafatafla"
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr "Mynd af sniði lyklaborðs"
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr "Lyklaborðs stillingar..."
diff --git a/po/it.po b/po/it.po
index f21f7ee9..5471c493 100644
--- a/po/it.po
+++ b/po/it.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Sorgente di input %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Tabella caratteri"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Disposizione tastiera"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Impostazioni inserimento testo..."
diff --git a/po/ja.po b/po/ja.po
index 9546eef7..927edfc9 100644
--- a/po/ja.po
+++ b/po/ja.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s 入力ソース"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "文字マップ"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "キーボードレイアウト表"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "テキスト入力設定..."
diff --git a/po/km.po b/po/km.po
index 46be5290..2c96b8ac 100644
--- a/po/km.po
+++ b/po/km.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "ប្រភព​បញ្ចូល %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "ផែនទី​តួអក្សរ"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "តារាង​ប្លង់​ក្ដារចុច"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "ការ​កំណត់​ធាតុ​អត្ថបទ..."
diff --git a/po/kn.po b/po/kn.po
index 882b7f23..0e3aeab1 100644
--- a/po/kn.po
+++ b/po/kn.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr ""
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "ಅಕ್ಷರ ನಕ್ಷೆ"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "ಕೀಲಿಮಣೆ ವಿನ್ಯಾಸ ಪಟ್ಟಿ"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "ಪಠ್ಯ ನಮೂದಿಸುವ ಸಂಯೋಜನೆಗಳು ..."
diff --git a/po/ko.po b/po/ko.po
index 54fe1ee0..8771be50 100644
--- a/po/ko.po
+++ b/po/ko.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "입력 소스 %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "문자 표"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "키보드 배치 표"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "텍스트 입력창 설정..."
diff --git a/po/lt.po b/po/lt.po
index ecf1e907..3ab5b857 100644
--- a/po/lt.po
+++ b/po/lt.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s įvesties šaltinis"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Simbolių lentelė"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Klaviatūros klavišų išdėstymas"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Teksto įvedimo nustatymai..."
diff --git a/po/lv.po b/po/lv.po
index 19a94857..94f61422 100644
--- a/po/lv.po
+++ b/po/lv.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s ievades avots"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Rakstzīmju tabula"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Klaviatūras Izkārtojuma Tabula"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Teksta Ievades Iestatījumi..."
diff --git a/po/mg.po b/po/mg.po
new file mode 100644
index 00000000..aeeeb7cf
--- /dev/null
+++ b/po/mg.po
@@ -0,0 +1,35 @@
+# Malagasy 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-04-12 05:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malagasy <mg@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr "%s fango iditra"
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr "Tabilao famaritana ny fitendry"
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr "Parametatry ny fampidiran-tsoratra"
diff --git a/po/mhr.po b/po/mhr.po
index a9f5103d..6662e1b8 100644
--- a/po/mhr.po
+++ b/po/mhr.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr ""
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Ӱжвата-влак"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Полдышоҥа Радам График"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Текстым Келыштараш..."
diff --git a/po/mi.po b/po/mi.po
new file mode 100644
index 00000000..f61a7aec
--- /dev/null
+++ b/po/mi.po
@@ -0,0 +1,35 @@
+# Maori 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-05-19 20:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Maori <mi@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 38d3d03e..a9939912 100644
--- a/po/ml.po
+++ b/po/ml.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s ഇന്‍പുട്ട് ഉറവിടം"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "അക്ഷരങ്ങളുടെ പട്ടിക"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "കീബോഡ് ലേയൗട്ട് പട്ടിക"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "പദാവലി നല്‍കല്‍ സജ്ജീകരണങ്ങള്‍..."
diff --git a/po/mr.po b/po/mr.po
index acadce29..393a1c8a 100644
--- a/po/mr.po
+++ b/po/mr.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s मजकूर प्रवेशाचे उगम"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "अक्षर नकाशा"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "कळफलकाचा तक्ता"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "मजकूर प्रवेशाचे नेपथ्य"
diff --git a/po/ms.po b/po/ms.po
index ccb78c2a..9cb16014 100644
--- a/po/ms.po
+++ b/po/ms.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "% sumber input"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Peta Aksara"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Carta Bentanga Papan Kekunci"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Tetapan Masukan Teks..."
diff --git a/po/nb.po b/po/nb.po
index b0689900..403df6ca 100644
--- a/po/nb.po
+++ b/po/nb.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s inndatakilde"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Tegnkart"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Kart over tastaturoppsett"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Innstillinger for tekstskriving …"
diff --git a/po/ne.po b/po/ne.po
index 2f98abe5..6d611a73 100644
--- a/po/ne.po
+++ b/po/ne.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s इनपुट स्रोत"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "चरित्र नक्शा"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "कुञ्जीपाटी लेआउट चार्ट"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "पाठ प्रविष्टि सेटिङ ..."
diff --git a/po/nl.po b/po/nl.po
index 42c4e65b..a9a81542 100644
--- a/po/nl.po
+++ b/po/nl.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s invoerbron"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Tekens en symbolen"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Toetsenbordindelingoverzicht"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Tekstinvoerinstellingen…"
diff --git a/po/oc.po b/po/oc.po
index b454a214..b095c7bc 100644
--- a/po/oc.po
+++ b/po/oc.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Agençament : %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Taula de caractèrs"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Representacion de l'agençament"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Paramètres d'agençament"
diff --git a/po/pa.po b/po/pa.po
index e4025bd2..dfa68794 100644
--- a/po/pa.po
+++ b/po/pa.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+0000\n"
 "PO-Revision-Date: 2014-02-02 00:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Punjabi <pa@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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s ਇੰਪੁੱਟ ਗਲਤੀ"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "ਅੱਖਰ ਖਾਕਾ"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "ਕੀਬੋਰਡ ਖਾਕਾ ਚਾਰਟ"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "ਟੈਕਸਟ ਐਂਟਰੀ ਸੈਟਿੰਗ..."
diff --git a/po/pl.po b/po/pl.po
index b445683a..67e31506 100644
--- a/po/pl.po
+++ b/po/pl.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s metoda wprowadzania"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa znaków"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Tabela układów klawiatury"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Ustawienia wprowadzanie tekstu..."
diff --git a/po/pt.po b/po/pt.po
index c66be8df..25855e1b 100644
--- a/po/pt.po
+++ b/po/pt.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "fonte de entrada %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa de Caracteres"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Disposição do teclado"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Definições de entrada de texto..."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9c205741..50c675e3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+0000\n"
 "PO-Revision-Date: 2013-08-28 01:25+0000\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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "fonte de entrada %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa de caracteres"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Disposição do teclado"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Configurações de entrada de texto…"
diff --git a/po/ro.po b/po/ro.po
index 9da8b9db..f0c729ed 100644
--- a/po/ro.po
+++ b/po/ro.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s sursă de intrare"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
-msgstr ""
+msgstr "Hartă caractere"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr ""
+msgstr "Element grafic pentru harta de caractere"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr ""
+msgstr "Configurări introducere text..."
diff --git a/po/ru.po b/po/ru.po
index 87dbd52f..1cffed8b 100644
--- a/po/ru.po
+++ b/po/ru.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Источник ввода %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Таблица символов"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Схема раскладки клавиатуры"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Параметры ввода текста..."
diff --git a/po/sa.po b/po/sa.po
new file mode 100644
index 00000000..834a6919
--- /dev/null
+++ b/po/sa.po
@@ -0,0 +1,35 @@
+# Sanskrit 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-06-06 09:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Sanskrit <sa@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr "%s निवेशस्रोतः"
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr "अक्षरगणः"
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr "कीलफलकविधानम्"
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr "पाठ्यनिवेशसंरूपणम्..."
diff --git a/po/si.po b/po/si.po
index 5c883dc7..69ddbec4 100644
--- a/po/si.po
+++ b/po/si.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s ආදාන මූලාශ්‍රය"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 092a7393..e4850074 100644
--- a/po/sk.po
+++ b/po/sk.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "zdroj vstupu %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Mapa znakov"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Rozloženie klávesnice"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Nastavenia vstupu…"
diff --git a/po/sl.po b/po/sl.po
index 069fdf2a..7717d7ff 100644
--- a/po/sl.po
+++ b/po/sl.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s vir vnosa"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Preglednica znakov"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Prikaz razporeditve tipk"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Nastavitve vnosa besedila ..."
diff --git a/po/sq.po b/po/sq.po
index 2aa0b0d2..124abf94 100644
--- a/po/sq.po
+++ b/po/sq.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s burim hyrjeje"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Harta e Simboleve"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Harta e Daljes së Tastierës"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Parametrat e Hyrjes së Tekstit..."
diff --git a/po/sr.po b/po/sr.po
index 1fd0e2d6..62aacd95 100644
--- a/po/sr.po
+++ b/po/sr.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
-msgstr ""
+msgstr "%s извор уноса"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
-msgstr "Мапа карактера"
+msgstr "Таблица знакова"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr "Шаблон распореда тастатуре"
+msgstr "Графикон распореда тастатуре"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr "Подешавања уноса текста"
+msgstr "Подешавања уноса текста..."
diff --git a/po/sv.po b/po/sv.po
index 7b52d856..c35c5ac1 100644
--- a/po/sv.po
+++ b/po/sv.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s inmatningskälla"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
-msgstr "Teckentabell"
+msgstr "Teckenuppsättning"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
-msgstr "Teckentabell"
+msgstr "Tangentbordsschema"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Inställningar för textinmatning..."
diff --git a/po/szl.po b/po/szl.po
new file mode 100644
index 00000000..a4f305be
--- /dev/null
+++ b/po/szl.po
@@ -0,0 +1,35 @@
+# Silesian 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-03-05 16:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Silesian <szl@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 6f0abe1f..fc8e9d0a 100644
--- a/po/ta.po
+++ b/po/ta.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s உள்ளீடு மூலம்"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "எழுத்து வரைபடம்"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "விசைப்பலகை வரைபடம்"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "உரை நுழைவு அமைப்புகள்..."
diff --git a/po/tg.po b/po/tg.po
index 267a0dc2..c732048b 100644
--- a/po/tg.po
+++ b/po/tg.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Манбаи вуруди %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Тарҳбандии аломатҳо"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Аломатҳои тарҳбандии клавиатура"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Танзимоти вуруди матн..."
diff --git a/po/th.po b/po/th.po
new file mode 100644
index 00000000..e6dba8cd
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,35 @@
+# Thai 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-02-23 02:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8a234d73..8be87d39 100644
--- a/po/tr.po
+++ b/po/tr.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s girdi kaynağı"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Karakter Haritası"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Klavye Düzeni Şeması"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Metin Girdisi Ayarları..."
diff --git a/po/ug.po b/po/ug.po
index 6aa88c0d..ca0fc2b8 100644
--- a/po/ug.po
+++ b/po/ug.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s كىرگۈزۈش مەنبەسى"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "ھەرپ-بەلگە جەدۋىلى"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "ھەرپتاختا ئورۇنلاشتۇرۇش كۆرۈنۈشى"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "تېكىست كىرگۈزۈش تەڭشەكلىرى…"
diff --git a/po/uk.po b/po/uk.po
index 4a32116b..16ee673e 100644
--- a/po/uk.po
+++ b/po/uk.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "Джерело введення %s"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Таблиця символів"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Таблиця розкладки клавіатури"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Параметри введення тексту…"
diff --git a/po/uz.po b/po/uz.po
new file mode 100644
index 00000000..c4bdc2ec
--- /dev/null
+++ b/po/uz.po
@@ -0,0 +1,35 @@
+# Uzbek 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-06-19 06:41+0000\n"
+"PO-Revision-Date: 2014-04-20 13:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uzbek <uz@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-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
+
+#: ../lib/main.vala:706
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:48
+msgid "Character Map"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:49
+msgid "Keyboard Layout Chart"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:50
+msgid "Text Entry Settings..."
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
index a701bc71..f1209a3d 100644
--- a/po/vi.po
+++ b/po/vi.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s nguồn đầu vào"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "Sơ đồ kí tự"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "Biểu đồ Bố cục Bàn phím"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "Thiết đặt nhập văn bản..."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 19587807..bb8b819a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s 输入源"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "字符映射表"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "键盘布局图"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "文本输入设置..."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 215fd1c2..7feedb26 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s 輸入來源"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "字元對應表"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "鍵盤佈局圖"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
-msgstr "文本輸入設定..."
+msgstr "文字輸入設定..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b21faa8a..30f76dd2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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: 2014-02-18 05:52+0000\n"
+"POT-Creation-Date: 2014-06-19 06:41+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: 2014-02-19 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-20 06:06+0000\n"
+"X-Generator: Launchpad (build 17058)\n"
 
-#: ../lib/main.vala:569
+#: ../lib/main.vala:706
 #, c-format
 msgid "%s input source"
 msgstr "%s 輸入來源"
 
-#: ../lib/main.vala:694
+#: ../lib/indicator-menu.vala:48
 msgid "Character Map"
 msgstr "字元對應表"
 
-#: ../lib/main.vala:695
+#: ../lib/indicator-menu.vala:49
 msgid "Keyboard Layout Chart"
 msgstr "鍵盤配置圖"
 
-#: ../lib/main.vala:696
+#: ../lib/indicator-menu.vala:50
 msgid "Text Entry Settings..."
 msgstr "文字輸入設定..."
diff --git a/tests/manual b/tests/manual
index 9d94d5ec..67ee57da 100644
--- a/tests/manual
+++ b/tests/manual
@@ -13,12 +13,3 @@ Test-case indicator-keyboard/unity7-greeter-items-check
 		<dd>Ensure there are items in the menu</dd>
 </dl>
 
-Test-case indicator-keyboard/unity8-items-check
-<dl>
-	<dt>Login to a user session running Unity 8</dt>
-	<dt>Pull down the top panel until it sticks open</dt>
-	<dt>Navigate through the tabs until "Keyboard" is shown</dt>
-		<dd>Keyboard is at the top of the menu</dd>
-		<dd>The menu is populated with items</dd>
-</dl>
-