Merge lp:~tintou/switchboard-plug-keyboard/translate into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Corentin Noël]

Translate the Option Panel

[lp:~tintou/switchboard-plug-keyboard/translate]

235. By Corentin Noël on 2014-10-04

Forgot to append an item.

=== removed file 'data/options.txt'
--- data/options.txt	2013-02-05 15:55:12 +0000
+++ data/options.txt	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-#Key(s) to change layout:grp:true
-Right Alt (while pressed):grp:switch
-Left Alt (while pressed):grp:lswitch
-Left Win (while pressed):grp:lwin_switch
-Right Win (while pressed):grp:rwin_switch
-Any Win key (while pressed):grp:win_switch
-Caps Lock (while pressed), Alt+Caps Lock does the original capslock action:grp:caps_switch
-Right Ctrl (while pressed):grp:rctrl_switch
-Right Alt:grp:toggle
-Left Alt:grp:lalt_toggle
-Caps Lock:grp:caps_toggle
-Shift+Caps Lock:grp:shift_caps_toggle
-Caps Lock (to first layout), Shift+Caps Lock (to last layout):grp:shift_caps_switch
-Left Win (to first layout), Right Win/Menu (to last layout):grp:win_menu_switch
-Left Ctrl (to first layout), Right Ctrl (to last layout):grp:lctrl_rctrl_switch
-Alt+Caps Lock:grp:alt_caps_toggle
-Both Shift keys together:grp:shifts_toggle
-Both Alt keys together:grp:alts_toggle
-Both Ctrl keys together:grp:ctrls_toggle
-Ctrl+Shift:grp:ctrl_shift_toggle
-Left Ctrl+Left Shift:grp:lctrl_lshift_toggle
-Right Ctrl+Right Shift:grp:rctrl_rshift_toggle
-Alt+Ctrl:grp:ctrl_alt_toggle
-Alt+Shift:grp:alt_shift_toggle
-Left Alt+Left Shift:grp:lalt_lshift_toggle
-Alt+Space:grp:alt_space_toggle
-Menu:grp:menu_toggle
-Left Win:grp:lwin_toggle
-Right Win:grp:rwin_toggle
-Left Shift:grp:lshift_toggle
-Right Shift:grp:rshift_toggle
-Left Ctrl:grp:lctrl_toggle
-Right Ctrl:grp:rctrl_toggle
-Scroll Lock:grp:sclk_toggle
-LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout):grp:lctrl_lwin_rctrl_menu
-#Key to choose 3rd level:lv3:true
-Right Ctrl:lv3:switch
-Menu:lv3:menu_switch
-Any Win key:lv3:win_switch
-Left Win:lv3:lwin_switch
-Right Win:lv3:rwin_switch
-Any Alt key:lv3:alt_switch
-Left Alt:lv3:lalt_switch
-Right Alt:lv3:ralt_switch
-Right Alt, Shift+Right Alt key is Multi_Key:lv3:ralt_switch_multikey
-Right Alt key never chooses 3rd level:lv3:ralt_alt
-Enter on keypad:lv3:enter_switch
-Caps Lock:lv3:caps_switch
-Backslash:lv3:bksl_switch
-<Less/Greater>:lv3:lsgt_switch
-Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser:lv3:caps_switch_latch
-Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser:lv3:bksl_switch_latch
-<Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser:lv3:lsgt_switch_latch
-#Ctrl key position:ctrl:true
-Caps Lock as Ctrl:ctrl:nocaps
-Left Ctrl as Meta:ctrl:lctrl_meta
-Swap Ctrl and Caps Lock:ctrl:swapcaps
-At left of 'A':ctrl:ac_ctrl
-At bottom left:ctrl:aa_ctrl
-Right Ctrl as Right Alt:ctrl:rctrl_ralt
-Menu as Right Ctrl:ctrl:menu_rctrl
-Right Alt as Right Ctrl:ctrl:ctrl_ralt
-#Use keyboard LED to show alternative layout:grp_led:true
-Num Lock:grp_led:num
-Caps Lock:grp_led:caps
-Scroll Lock:grp_led:scroll
-#Numeric keypad layout selection:keypad:false
-Legacy:keypad:legacy
-Unicode additions (arrows and math operators):keypad:oss
-Unicode additions (arrows and math operators). Math operators on default level:keypad:future
-Legacy Wang 724:keypad:legacy_wang
-Wang 724 keypad with Unicode additions (arrows and math operators):keypad:oss_wang
-Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level:keypad:future_wang
-Hexadecimal:keypad:hex
-ATM/phone-style:keypad:atm
-#Numeric keypad delete key behaviour:kpdl:false
-Legacy key with dot:kpdl:dot
-Legacy key with comma:kpdl:comma
-Four-level key with dot:kpdl:dotoss
-Four-level key with dot, latin-9 restriction:kpdl:dotoss_latin9
-Four-level key with comma:kpdl:commaoss
-Four-level key with momayyez:kpdl:momayyezoss
-Four-level key with abstract separators:kpdl:kposs
-Semi-colon on third level:kpdl:semi
-#Caps Lock key behavior:caps:false
-Caps Lock uses internal capitalization. Shift "pauses" Caps Lock:caps:internal
-Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock:caps:internal_nocancel
-Caps Lock acts as Shift with locking. Shift "pauses" Caps Lock:caps:shift
-Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock:caps:shift_nocancel
-Caps Lock toggles normal capitalization of alphabetic characters:caps:capslock
-Make Caps Lock an additional Num Lock:caps:numlock
-Swap ESC and Caps Lock:caps:swapescape
-Make Caps Lock an additional ESC:caps:escape
-Make Caps Lock an additional Backspace:caps:backspace
-Make Caps Lock an additional Super:caps:super
-Make Caps Lock an additional Hyper:caps:hyper
-Caps Lock toggles Shift so all keys are affected:caps:shiftlock
-Caps Lock is disabled:caps:none
-Make Caps Lock an additional Control but keep the Caps_Lock keysym:caps:ctrl_modifier
-#Alt/Win key behavior:altwin:false
-Add the standard behavior to Menu key:altwin:menu
-Alt and Meta are on Alt keys:altwin:meta_alt
-Control is mapped to Win keys (and the usual Ctrl keys):altwin:ctrl_win
-Control is mapped to Alt keys, Alt is mapped to Win keys:altwin:ctrl_alt_win
-Meta is mapped to Win keys:altwin:meta_win
-Meta is mapped to Left Win:altwin:left_meta_win
-Hyper is mapped to Win-keys:altwin:hyper_win
-Alt is mapped to Right Win, Super to Menu:altwin:alt_super_win
-Left Alt is swapped with Left Win:altwin:swap_lalt_lwin
-#Compose key position:Compose key:true
-Right Alt:compose:ralt
-Left Win:compose:lwin
-Right Win:compose:rwin
-Menu:compose:menu
-Left Ctrl:compose:lctrl
-Right Ctrl:compose:rctrl
-Caps Lock:compose:caps
-<Less/Greater>:compose:102
-Pause:compose:paus
-PrtSc:compose:prsc
-Scroll Lock:compose:sclk
-#Miscellaneous compatibility options:compat:true
-Default numeric keypad keys:numpad:pc
-Numeric keypad keys always enter digits (as in Mac OS):numpad:mac
-Shift with numeric keypad keys works as in MS Windows:numpad:microsoft
-Shift does not cancel Num Lock, chooses 3rd level instead:numpad:shift3
-Special keys (Ctrl+Alt+<key>) handled in a server:srvrkeys:none
-Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock):apple:alupckeys
-Shift cancels Caps Lock:shift:breaks_caps
-Enable extra typographic characters:misc:typo
-Both Shift-Keys together toggle Caps Lock:shift:both_capslock
-Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates:shift:both_capslock_cancel
-Both Shift-Keys together toggle ShiftLock:shift:both_shiftlock
-Toggle PointerKeys with Shift + NumLock.:keypad:pointerkeys
-Allow breaking grabs with keyboard actions (warning: security risk):grab:break_actions
-#Adding currency signs to certain keys:eurosign:true
-Euro on E:eurosign:e
-Euro on 2:eurosign:2
-Euro on 4:eurosign:4
-Euro on 5:eurosign:5
-Rupee on 4:rupeesign:4
-#Key to choose 5th level:lv5:true
-<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser:lv5:lsgt_switch_lock
-Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser:lv5:ralt_switch_lock
-Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser:lv5:lwin_switch_lock
-Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser:lv5:rwin_switch_lock
-#Using space key to input non-breakable space character:nbsp:false
-Usual space at any level:nbsp:none
-Non-breakable space character at second level:nbsp:level2
-Non-breakable space character at third level:nbsp:level3
-Non-breakable space character at third level, nothing at fourth level:nbsp:level3s
-Non-breakable space character at third level, thin non-breakable space character at fourth level:nbsp:level3n
-Non-breakable space character at fourth level:nbsp:level4
-Non-breakable space character at fourth level, thin non-breakable space character at sixth level:nbsp:level4n
-Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift):nbsp:level4nl
-Zero-width non-joiner character at second level:nbsp:zwnj2
-Zero-width non-joiner character at second level, zero-width joiner character at third level:nbsp:zwnj2zwj3
-Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level:nbsp:zwnj2zwj3nb4
-Zero-width non-joiner character at second level, non-breakable space character at third level:nbsp:zwnj2nb3
-Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level:nbsp:zwnj2nb3s
-Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level:nbsp:zwnj2nb3zwj4
-Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level:nbsp:zwnj2nb3nnb4
-Zero-width non-joiner character at third level, zero-width joiner at fourth level:nbsp:zwnj3zwj4
-#Japanese keyboard options:japan:true
-Kana Lock key is locking:japan:kana_lock
-NICOLA-F style Backspace:japan:nicola_f_bs
-Make Zenkaku Hankaku an additional ESC:japan:hztg_escape
-#Adding Esperanto circumflexes (supersigno):esperanto:false
-To the corresponding key in a Qwerty keyboard.:esperanto:qwerty
-To the corresponding key in a Dvorak keyboard.:esperanto:dvorak
-#Key sequence to kill the X server:terminate:true
-Control + Alt + Backspace:terminate:ctrl_alt_bksp

=== removed file 'data/shortcuts.xml'
--- data/shortcuts.xml	2013-05-20 18:14:25 +0000
+++ data/shortcuts.xml	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-<shortcuts>
-    
-    <schemas>
-        <schema name="org.gnome.desktop.wm.keybindings" abbr="WM"/>
-        <schema name="org.gnome.mutter.keybindings" abbr="MUTTER"/>
-        <schema name="org.pantheon.desktop.gala.keybindings" abbr="GALA"/>
-        <schema name="org.gnome.settings-daemon.plugins.media-keys" abbr="MEDIA"/>
-    </schemas>
-
-    <section name="Windows">
-        <shortcut schema="WM" key="close" action="Close"/>
-        <shortcut schema="WM" key="lower" action="Lower"/>
-        <shortcut schema="WM" key="toggle-maximized" action="Toggle Maximized"/>
-        <shortcut schema="WM" key="minimize" action="Minimize"/>
-        <shortcut schema="WM" key="maximize" action="Maximize"/>
-        <shortcut schema="WM" key="unmaximize" action="Unmaximize"/>
-        <shortcut schema="MUTTER" key="toggle-tiled-left" action="Tile Left"/>
-        <shortcut schema="MUTTER" key="toggle-tiled-right" action="Tile Right"/>
-        <shortcut schema="WM" key="toggle-fullscreen" action="Toggle Fullscreen"/>
-        <shortcut schema="WM" key="toggle-shaded" action="Toggle Shaded"/>
-        <shortcut schema="WM" key="toggle-on-all-workspaces" action="Toggle on all Workspaces"/>
-        <shortcut schema="WM" key="toggle-above" action="Toggle always on Top"/>
-        <shortcut schema="WM" key="switch-windows" action="Switch Windows"/>
-        <shortcut schema="WM" key="switch-windows-backward" action="Switch Windows backwards"/>
-        <shortcut schema="GALA" key="expose-windows" action="Expose Windows"/>
-        <shortcut schema="GALA" key="expose-all-windows" action="Expose all Windows"/>
-    </section>
-    
-    <section name="Workspaces">
-        <shortcut schema="WM" key="show-desktop" action="Show Workspace Switcher"/>
-        <shortcut schema="GALA" key="switch-to-workspace-first" action="Switch to first"/>
-        <shortcut schema="GALA" key="switch-to-workspace-last" action="Switch to new"/>
-        <shortcut schema="WM" key="switch-to-workspace-1" action="Switch to workspace 1"/>
-        <shortcut schema="WM" key="switch-to-workspace-2" action="Switch to workspace 2"/>
-        <shortcut schema="WM" key="switch-to-workspace-3" action="Switch to workspace 3"/>
-        <shortcut schema="WM" key="switch-to-workspace-4" action="Switch to workspace 4"/>
-        <shortcut schema="WM" key="switch-to-workspace-5" action="Switch to workspace 5"/>
-        <shortcut schema="WM" key="switch-to-workspace-6" action="Switch to workspace 6"/>
-        <shortcut schema="WM" key="switch-to-workspace-7" action="Switch to workspace 7"/>
-        <shortcut schema="WM" key="switch-to-workspace-8" action="Switch to workspace 8"/>
-        <shortcut schema="WM" key="switch-to-workspace-9" action="Switch to workspace 9"/>
-        <shortcut schema="WM" key="switch-to-workspace-left" action="Switch to left"/>
-        <shortcut schema="WM" key="switch-to-workspace-right" action="Switch to right"/>
-        <shortcut schema="WM" key="move-to-workspace-1" action="Move to workspace 1"/>
-        <shortcut schema="WM" key="move-to-workspace-2" action="Move to workspace 2"/>
-        <shortcut schema="WM" key="move-to-workspace-3" action="Move to workspace 3"/>
-        <shortcut schema="WM" key="move-to-workspace-4" action="Move to workspace 4"/>
-        <shortcut schema="WM" key="move-to-workspace-5" action="Move to workspace 5"/>
-        <shortcut schema="WM" key="move-to-workspace-6" action="Move to workspace 6"/>
-        <shortcut schema="WM" key="move-to-workspace-7" action="Move to workspace 7"/>
-        <shortcut schema="WM" key="move-to-workspace-8" action="Move to workspace 8"/>
-        <shortcut schema="WM" key="move-to-workspace-9" action="Move to workspace 9"/>
-        <shortcut schema="WM" key="move-to-workspace-left" action="Move to left"/>
-        <shortcut schema="WM" key="move-to-workspace-right" action="Move to right"/>
-    </section>
-    
-    <section name="Screenshots">
-        <shortcut schema="MEDIA" key="screenshot" action="Take a Screenshot"/>
-        <shortcut schema="MEDIA" key="screenshot-clip" action="Save Screenshot to Clipboard"/>
-        <shortcut schema="MEDIA" key="window-screenshot" action="Take a Screenshot of a Window"/>
-        <shortcut schema="MEDIA" key="window-screenshot-clip" action="Save Window-Screenshot to Clipboard"/>
-        <shortcut schema="MEDIA" key="area-screenshot" action="Take a Screenshot of an Area"/>
-        <shortcut schema="MEDIA" key="area-screenshot-clip" action="Save Area-Screenshot to Clipboard"/>
-    </section>
-    
-    <section name="Applications">
-        <shortcut schema="MEDIA" key="calculator" action="Calculator"/>
-        <shortcut schema="MEDIA" key="email" action="Email"/>
-        <shortcut schema="MEDIA" key="help" action="Help"/>
-        <shortcut schema="MEDIA" key="home" action="Home Folder"/>
-        <shortcut schema="MEDIA" key="search" action="File Search"/>
-        <shortcut schema="MEDIA" key="terminal" action="Terminal"/>
-        <shortcut schema="MEDIA" key="www" action="Internet Browser"/>
-    </section>
-    
-    <section name="Media">
-        <shortcut schema="MEDIA" key="volume-up" action="Volume Up"/>
-        <shortcut schema="MEDIA" key="volume-down" action="Volume Down"/>
-        <shortcut schema="MEDIA" key="volume-mute" action="Mute"/>
-        <shortcut schema="MEDIA" key="media" action="Launch Media Player"/>
-        <shortcut schema="MEDIA" key="play" action="Play"/>
-        <shortcut schema="MEDIA" key="pause" action="Pause"/>
-        <shortcut schema="MEDIA" key="stop" action="Stop"/>
-        <shortcut schema="MEDIA" key="previous" action="Previous Track"/>
-        <shortcut schema="MEDIA" key="next" action="Next Track"/>
-        <shortcut schema="MEDIA" key="eject" action="Eject"/>
-    </section>
-    
-    <section name="Universal Access">
-        <shortcut schema="MEDIA" key="decrease-text-size" action="Decrease Text Size"/>
-        <shortcut schema="MEDIA" key="increase-text-size" action="Increase Text Size"/>
-        <shortcut schema="MEDIA" key="magnifier" action="Toggle Magnifier"/>
-        <shortcut schema="MEDIA" key="magnifier-zoom-in" action="Magnifier Zoom in"/>
-        <shortcut schema="MEDIA" key="magnifier-zoom-out" action="Magnifier Zoom out"/>
-        <shortcut schema="MEDIA" key="on-screen-keyboard" action="Toggle On Screen Keyboard"/>
-        <shortcut schema="MEDIA" key="screenreader" action="Toggle Screenreader"/>
-        <shortcut schema="MEDIA" key="toggle-contrast" action="Toggle High Contrast"/>
-    </section>
-
-</shortcuts>

=== modified file 'src/Pages/Layout/display.vala'
--- src/Pages/Layout/display.vala	2014-08-10 17:57:01 +0000
+++ src/Pages/Layout/display.vala	2014-10-04 23:26:26 +0000
@@ -27,7 +27,6 @@
             tree.insert_column_with_attributes (-1, null, cell, "text", 0);
             tree.headers_visible = false;
             tree.expand = true;
-            rebuild_list ();
 
             var scroll = new Gtk.ScrolledWindow(null, null);
             scroll.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
@@ -113,6 +112,8 @@
                     return;
                 update_cursor ();
             });
+
+            rebuild_list ();
             update_cursor ();
         }
 

=== modified file 'src/Pages/Options/option_handler.vala'
--- src/Pages/Options/option_handler.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Options/option_handler.vala	2014-10-04 23:26:26 +0000
@@ -1,161 +1,299 @@
-namespace Pantheon.Keyboard.Options
-{
+namespace Pantheon.Keyboard.Options {
+	public class Item : GLib.Object {
+		public string label { public get; private set; }
+		public string option { public get; private set; }
+		public bool multiple_selection { public get; private set; }
+		public HashTable<string, string> table { public get; private set; }
+
+		public Item (string label, string option, bool multiple_selection) {
+			table = new HashTable<string, string> (str_hash, str_equal);
+			this.label = label;
+			this.option = option;
+			this.multiple_selection = multiple_selection;
+
+			if (multiple_selection == false) {
+				table.@set (_("None"), "");
+			}
+		}
+
+		public new void @set (string key, string value) {
+			table.@set (key, value);
+		}
+	}
+
 	// class that parses the layout file, provides lists of languages and
 	// options, and converts between layout names and their gsettings codes	
-	class OptionHandler : GLib.Object
-	{
-		Group[]  groups;
-	
-		private string[] names;
-		private string[] codes;
-		private bool[] multiple_selection;
-		
-		public int length {
-			get {return names.length;}
-		}
-		
-		public OptionHandler ()
-		{
-			foreach (var l in parse_groups ())
-			{
-				var parts = l.split(":", 3);
-			
-				if (parts[0] == null || parts[1] == null || parts[2] == null)
-				{
-					warning ("Line \"%s\" has wrong format. Will be ignored.", l);
-					continue;
-				}
-			
-				names += parts[0];
-				codes += parts[1];
-				
-				var multi = bool.parse(parts[2]);
-				multiple_selection += multi;
-				
-				groups += new Group (parse_options (l), multi);
-			}
-		}
-		
+	class OptionHandler : GLib.Object {
+		List<Item> items;
+
+		public uint length {
+			get {return items.length ();}
+		}
+
+		public OptionHandler () {
+			generate_items ();
+		}
+
 		public string[] get_groups () {
+			string[] names = null;
+			foreach (var item in items) {
+				names += item.label;
+			}
+
 			return names;
 		}
-		
+
 		public string[] get_options (uint index) {
-			return groups[index].names;
+			string[] options = null;
+			var opts = items.nth_data (index).table.get_keys ();
+			foreach (var option in opts) {
+				options += option;
+			}
+
+			return options;
 		}
-		
+
 		public bool get_multiple_selection (uint index) {
-			return multiple_selection[index];
-		}
-		
-		public string? get_code (uint l, uint v) {
-			return codes[l] + "\t" + groups[l].codes[v];
-		}
-		
-		public string get_name (uint l, uint v) {
-			return groups[l].names[v];
-		}
-		
-		public bool from_code (string code, out uint l, out uint v)
-		{
-			var parts = code.split("\t", 2);
-			
+			return items.nth_data (index).multiple_selection;
+		}
+
+		public string? get_code (uint index, uint v) {
+			var item = items.nth (index).data;
+			return item.option + "\t" + item.table.get_values ().nth_data (v);
+		}
+
+		public string get_name (uint index, uint v) {
+			return items.nth_data (index).table.get_keys ().nth_data (v);
+		}
+
+		public bool from_code (string code, out uint l, out uint v) {
+			var parts = code.split ("\t", 2);
 			l = v = 0;
-			
-			if (parts[0] == null) return false;
-			
-			while (codes[l] != parts[0])
-				if (++l > length)
-					return false;
-			
-			if (parts[1] == null) return true;
-			
-			while (groups[l].codes[v] != parts[1])
-				if (v++ > groups[l].codes.length)
-					return false;
-			
-			return true;
-		}
-
-		// private class that contains the options of one language
-		private class Group : GLib.Object
-		{
-			public string[] names;
-			public string[] codes;
-
-			public Group (string[] options, bool multi)
-			{
-				if (!multi) {
-					names += _("None");
-					codes += "";
-				}
-				
-				foreach (var v in options) {
-					var parts = v.split(":", 2);
-					names += parts[0];
-					codes += parts[1];
-				}
-			}
-		}
-
-		// private functions to parse the files
-		private string[]? parse_groups ()
-		{
-			string[] return_val = null;
-	
-			var file = File.new_for_path (Build.PKGDATADIR + "/options.txt");
-
-			if (!file.query_exists ()) {
-				warning ("File '%s' doesn't exist.\n", file.get_path ());
-				return return_val;
-			}
-
-			try {
-				var dis = new DataInputStream (file.read ());
-	
-				string line;
-	
-				while ((line = dis.read_line (null)) != null)
-					if( "#" in line )
-						return_val += line.replace ("#", "");
-						
-			} catch (Error e) {
-				error ("%s", e.message);
-			}
-	
-			return return_val;
-		}
-
-		private string[]? parse_options (string language)
-		{
-			string[] return_val = null;
-	
-			var file = File.new_for_path (Build.PKGDATADIR + "/options.txt");
-
-			if (!file.query_exists ()) {
-				warning ("File '%s' doesn't exist.\n", file.get_path ());
-				return null;
-			}
-
-			try {
-				var dis = new DataInputStream (file.read ());
-	
-				string line;
-	
-				while ((line = dis.read_line (null)) != null) {
-					if (line == "#"+language) {
-						while ((line = dis.read_line (null)) != null) {
-							if( "#" in line ) break;
-							return_val += line;
+			if (parts[0] == null || parts[1] == null)
+				return false;
+
+			foreach (var item in items) {
+				v = 0;
+				if (item.option == parts[0]) {
+					foreach (var val in item.table.get_values ()) {
+						if (val == parts[1]) {
+							return true;
 						}
-						break;
+
+						v++;
 					}
 				}
-			} catch (Error e) {
-				error ("%s", e.message);
+				l++;
 			}
 
-			return return_val;
+			return false;
+		}
+
+		private void generate_items () {
+			items = new List<Item> ();
+			var item = new Item (_("Key(s) to change layout"), "grp", true);
+			item.set (_("Right Alt (while pressed)"), "grp:switch");
+			item.set (_("Left Alt (while pressed)"), "grp:lswitch");
+			item.set (_("Left Win (while pressed)"), "grp:lwin_switch");
+			item.set (_("Right Win (while pressed)"), "grp:rwin_switch");
+			item.set (_("Any Win key (while pressed)"), "grp:win_switch");
+			item.set (_("Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"), "grp:caps_switch");
+			item.set (_("Right Ctrl (while pressed)"), "grp:rctrl_switch");
+			item.set (_("Right Alt"), "grp:toggle");
+			item.set (_("Left Alt"), "grp:lalt_toggle");
+			item.set (_("Caps Lock"), "grp:caps_toggle");
+			item.set (_("Shift+Caps Lock"), "grp:shift_caps_toggle");
+			item.set (_("Caps Lock (to first layout), Shift+Caps Lock (to last layout)"), "grp:shift_caps_switch");
+			item.set (_("Left Win (to first layout), Right Win/Menu (to last layout)"), "grp:win_menu_switch");
+			item.set (_("Left Ctrl (to first layout), Right Ctrl (to last layout)"), "grp:lctrl_rctrl_switch");
+			item.set (_("Alt+Caps Lock"), "grp:alt_caps_toggle");
+			item.set (_("Both Shift keys together"), "grp:shifts_toggle");
+			item.set (_("Both Alt keys together"), "grp:alts_toggle");
+			item.set (_("Both Ctrl keys together"), "grp:ctrls_toggle");
+			item.set (_("Ctrl+Shift"), "grp:ctrl_shift_toggle");
+			item.set (_("Left Ctrl+Left Shift"), "grp:lctrl_lshift_toggle");
+			item.set (_("Right Ctrl+Right Shift"), "grp:rctrl_rshift_toggle");
+			item.set (_("Alt+Ctrl"), "grp:ctrl_alt_toggle");
+			item.set (_("Alt+Shift"), "grp:alt_shift_toggle");
+			item.set (_("Left Alt+Left Shift"), "grp:lalt_lshift_toggle");
+			item.set (_("Alt+Space"), "grp:alt_space_toggle");
+			item.set (_("Menu"), "grp:menu_toggle");
+			item.set (_("Left Win"), "grp:lwin_toggle");
+			item.set (_("Right Win"), "grp:rwin_toggle");
+			item.set (_("Left Shift"), "grp:lshift_toggle");
+			item.set (_("Right Shift"), "grp:rshift_toggle");
+			item.set (_("Left Ctrl"), "grp:lctrl_toggle");
+			item.set (_("Right Ctrl"), "grp:rctrl_toggle");
+			item.set (_("Scroll Lock"), "grp:sclk_toggle");
+			item.set (_("Left Ctrl+Left Win (to first layout), Right Ctrl+Menu (to second layout)"), "grp:lctrl_lwin_rctrl_menu");
+			items.append (item);
+
+			item = new Item (_("Key to choose 3rd level"), "lv3", true);
+			item.set (_("Right Ctrl"), "lv3:switch");
+			item.set (_("Menu"), "lv3:menu_switch");
+			item.set (_("Any Win key"), "lv3:win_switch");
+			item.set (_("Left Win"), "lv3:lwin_switch");
+			item.set (_("Right Win"), "lv3:rwin_switch");
+			item.set (_("Any Alt key"), "lv3:alt_switch");
+			item.set (_("Left Alt"), "lv3:lalt_switch");
+			item.set (_("Right Alt"), "lv3:ralt_switch");
+			item.set (_("Right Alt, Shift+Right Alt key is Multi_Key"), "lv3:ralt_switch_multikey");
+			item.set (_("Right Alt key never chooses 3rd level"), "lv3:ralt_alt");
+			item.set (_("Enter on keypad"), "lv3:enter_switch");
+			item.set (_("Caps Lock"), "lv3:caps_switch");
+			item.set (_("Backslash"), "lv3:bksl_switch");
+			item.set (_("<Less/Greater>"), "lv3:lsgt_switch");
+			item.set (_("Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"), "lv3:caps_switch_latch");
+			item.set (_("Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"), "lv3:bksl_switch_latch");
+			item.set (_("<Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser"), "lv3:lsgt_switch_latch");
+			items.append (item);
+
+			item = new Item (_("Ctrl key position"), "ctrl", true);
+			item.set (_("Caps Lock as Ctrl"), "ctrl:nocaps");
+			item.set (_("Left Ctrl as Meta"), "ctrl:lctrl_meta");
+			item.set (_("Swap Ctrl and Caps Lock"), "ctrl:swapcaps");
+			item.set (_("At left of 'A'"), "ctrl:ac_ctrl");
+			item.set (_("At bottom left"), "ctrl:aa_ctrl");
+			item.set (_("Right Ctrl as Right Alt"), "ctrl:rctrl_ralt");
+			item.set (_("Menu as Right Ctrl"), "ctrl:menu_rctrl");
+			item.set (_("Right Alt as Right Ctrl"), "ctrl:ctrl_ralt");
+			items.append (item);
+
+			item = new Item (_("Use keyboard LED to show alternative layout"), "grp_led", true);
+			item.set (_("Num Lock"), "grp_led:num");
+			item.set (_("Caps Lock"), "grp_led:caps");
+			item.set (_("Scroll Lock"), "grp_led:scroll");
+			items.append (item);
+
+			item = new Item (_("Numeric keypad layout selection"), "keypad", false);
+			item.set (_("Legacy"), "keypad:legacy");
+			item.set (_("Unicode additions (arrows and math operators)"), "keypad:oss");
+			item.set (_("Unicode additions (arrows and math operators). Math operators on default level"), "keypad:future");
+			item.set (_("Legacy Wang 724"), "keypad:legacy_wang");
+			item.set (_("Wang 724 keypad with Unicode additions (arrows and math operators)"), "keypad:oss_wang");
+			item.set (_("Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level"), "keypad:future_wang");
+			item.set (_("Hexadecimal"), "keypad:hex");
+			item.set (_("ATM/phone-style"), "keypad:atm");
+			items.append (item);
+
+			item = new Item (_("Numeric keypad delete key behaviour"), "kpdl", false);
+			item.set (_("Legacy key with dot"), "kpdl:dot");
+			item.set (_("Legacy key with comma"), "kpdl:comma");
+			item.set (_("Four-level key with dot"), "kpdl:dotoss");
+			item.set (_("Four-level key with dot, latin-9 restriction"), "kpdl:dotoss_latin9");
+			item.set (_("Four-level key with comma"), "kpdl:commaoss");
+			item.set (_("Four-level key with momayyez"), "kpdl:momayyezoss");
+			item.set (_("Four-level key with abstract separators"), "kpdl:kposs");
+			item.set (_("Semi-colon on third level"), "kpdl:semi");
+			items.append (item);
+
+			item = new Item (_("Caps Lock key behavior"), "caps", false);
+			item.set (_("Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"), "caps:internal");
+			item.set (_("Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"), "caps:internal_nocancel");
+			item.set (_("Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"), "caps:shift");
+			item.set (_("Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"), "caps:shift_nocancel");
+			item.set (_("Caps Lock toggles normal capitalization of alphabetic characters"), "caps:capslock");
+			item.set (_("Make Caps Lock an additional Num Lock"), "caps:numlock");
+			item.set (_("Swap ESC and Caps Lock"), "caps:swapescape");
+			item.set (_("Make Caps Lock an additional ESC"), "caps:escape");
+			item.set (_("Make Caps Lock an additional Backspace"), "caps:backspace");
+			item.set (_("Make Caps Lock an additional Super"), "caps:super");
+			item.set (_("Make Caps Lock an additional Hyper"), "caps:hyper");
+			item.set (_("Caps Lock toggles Shift so all keys are affected"), "caps:shiftlock");
+			item.set (_("Caps Lock is disabled"), "caps:none");
+			item.set (_("Make Caps Lock an additional Control but keep the Caps_Lock keysym"), "caps:ctrl_modifier");
+			items.append (item);
+
+			item = new Item (_("Alt/Win key behavior"), "altwin", false);
+			item.set (_("Add the standard behavior to Menu key"), "compose:menu");
+			item.set (_("Alt and Meta are on Alt keys"), "compose:meta_alt");
+			item.set (_("Control is mapped to Win keys (and the usual Ctrl keys)"), "compose:ctrl_win");
+			item.set (_("Control is mapped to Alt keys, Alt is mapped to Win keys"), "compose:ctrl_alt_win");
+			item.set (_("Meta is mapped to Win keys"), "compose:meta_win");
+			item.set (_("Meta is mapped to Left Win"), "compose:left_meta_win");
+			item.set (_("Hyper is mapped to Win-keys"), "compose:hyper_win");
+			item.set (_("Alt is mapped to Right Win, Super to Menu"), "compose:alt_super_win");
+			item.set (_("Left Alt is swapped with Left Win"), "compose:swap_lalt_lwin");
+			items.append (item);
+
+			item = new Item (_("Compose key position"), "Compose key", true);
+			item.set (_("Right Alt"), "compose:ralt");
+			item.set (_("Left Win"), "compose:lwin");
+			item.set (_("Right Win"), "compose:rwin");
+			item.set (_("Menu"), "compose:menu");
+			item.set (_("Left Ctrl"), "compose:lctrl");
+			item.set (_("Right Ctrl"), "compose:rctrl");
+			item.set (_("Caps Lock"), "compose:caps");
+			item.set (_("<Less/Greater>"), "compose:102");
+			item.set (_("Pause"), "compose:paus");
+			item.set (_("PrtSc"), "compose:prsc");
+			item.set (_("Scroll Lock"), "compose:sclk");
+			items.append (item);
+
+			item = new Item (_("Miscellaneous compatibility options"), "compat", true);
+			item.set (_("Default numeric keypad keys"), "numpad:pc");
+			item.set (_("Numeric keypad keys always enter digits (as in Mac OS)"), "numpad:mac");
+			item.set (_("Shift with numeric keypad keys works as in MS Windows"), "numpad:microsoft");
+			item.set (_("Shift does not cancel Num Lock, chooses 3rd level instead"), "numpad:shift3");
+			item.set (_("Special keys (Ctrl+Alt+<key>) handled in a server"), "srvrkeys:none");
+			item.set (_("Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)"), "apple:alupckeys");
+			item.set (_("Shift cancels Caps Lock"), "shift:breaks_caps");
+			item.set (_("Enable extra typographic characters"), "misc:typo");
+			item.set (_("Both Shift-Keys together toggle Caps Lock"), "shift:both_capslock");
+			item.set (_("Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"), "shift:both_capslock_cancel");
+			item.set (_("Both Shift-Keys together toggle ShiftLock"), "shift:both_shiftlock");
+			item.set (_("Toggle PointerKeys with Shift + NumLock"), "keypad:pointerkeys");
+			item.set (_("Allow breaking grabs with keyboard actions (warning: security risk)"), "grab:break_actions");
+			items.append (item);
+
+			item = new Item (_("Adding currency signs to certain keys"), "eurosign", true);
+			item.set (_("Euro on E"), "eurosign:e");
+			item.set (_("Euro on 2"), "eurosign:2");
+			item.set (_("Euro on 4"), "eurosign:4");
+			item.set (_("Euro on 5"), "eurosign:5");
+			item.set (_("Rupee on 4"), "rupeesign:4");
+			items.append (item);
+
+			item = new Item (_("Key to choose 5th level"), "lv5", true);
+			item.set (_("<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:lalt_switch_lock");
+			item.set (_("Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:ralt_switch_lock");
+			item.set (_("Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:lwin_switch_lock");
+			item.set (_("Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:rwin_switch_lock");
+			items.append (item);
+
+			item = new Item (_("Using space key to input non-breakable space character"), "nbsp", false);
+			item.set (_("Usual space at any level"), "nbsp:none");
+			item.set (_("Non-breakable space character at second level"), "nbsp:level2");
+			item.set (_("Non-breakable space character at third level"), "nbsp:level3");
+			item.set (_("Non-breakable space character at third level, nothing at fourth leve"), "nbsp:level3s");
+			item.set (_("Non-breakable space character at third level, thin non-breakable space character at fourth level"), "nbsp:level3n");
+			item.set (_("Non-breakable space character at fourth level"), "nbsp:level4");
+			item.set (_("Non-breakable space character at fourth level, thin non-breakable space character at sixth level"), "nbsp:level4n");
+			item.set (_("Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"), "nbsp:level4nl");
+			item.set (_("Zero-width non-joiner character at second level"), "nbsp:zwnj2");
+			item.set (_("Zero-width non-joiner character at second level, zero-width joiner character at third level"), "nbsp:zwnj2zwj3");
+			item.set (_("Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"), "zwnj2zwj3nb4");
+			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level"), "nbsp:zwnj2nb3");
+			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"), "nbsp:zwnj2nb3s");
+			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"), "nbsp:zwnj2nb3zwj4");
+			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level"), "nbsp:zwnj2nb3nnb4");
+			item.set (_("Zero-width non-joiner character at third level, zero-width joiner at fourth level"), "nbsp:zwnj3zwj4");
+			items.append (item);
+
+			item = new Item (_("Japanese keyboard options"), "japan", true);
+			item.set (_("Kana Lock key is locking"), "japan:kana_lock");
+			item.set (_("NICOLA-F style Backspace"), "japan:nicola_f_bs");
+			item.set (_("Make Zenkaku Hankaku an additional ESC"), "japan:hztg_escape");
+			items.append (item);
+
+			item = new Item (_("Adding Esperanto circumflexes (supersigno)"), "esperanto", false);
+			item.set (_("To the corresponding key in a Qwerty keyboard"), "esperanto:qwerty");
+			item.set (_("To the corresponding key in a Dvorak keyboard"), "esperanto:dvorak");
+			items.append (item);
+
+			item = new Item (_("Key sequence to kill the X server"), "terminate", true);
+			item.set (_("Control + Alt + Backspace"), "terminate:ctrl_alt_bksp");
+			items.append (item);
 		}
 	}
 }
\ No newline at end of file

=== modified file 'src/Pages/Shortcuts/shortcut.vala'
--- src/Pages/Shortcuts/shortcut.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Shortcuts/shortcut.vala	2014-10-04 23:26:26 +0000
@@ -47,7 +47,7 @@
 			if ((modifiers & Gdk.ModifierType.SUPER_MASK) > 0)
 			    tmp += "⌘" + SEPARATOR;
 			if ((modifiers & Gdk.ModifierType.CONTROL_MASK) > 0)
-			    tmp += "Ctrl" + SEPARATOR;
+			    tmp += _("Ctrl") + SEPARATOR;
 			if ((modifiers & Gdk.ModifierType.MOD1_MASK) > 0)
 			    tmp += "⎇" + SEPARATOR;
 			if ((modifiers & Gdk.ModifierType.MOD2_MASK) > 0)