Added support for a second alternate keyboard layout.

(Note: translations are broken for languages I do not know, sorry.)

packages/mediacenter/xbmc-addon-settings/config/default_settings.xml

@@ -25,4 +25,5 @@
     <setting id="WAKEUP_MUSICDBUPDATE" value="false" />
     <setting id="WAKEUP_VIDEODBUPDATE" value="false" />
     <setting id="X11_KEYMAP" value="us" />
+    <setting id="X11_KEYMAP2" value="" />
 </settings>

packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml

@@ -5,6 +5,7 @@
 	<string id="2000">Systeem</string>
 	<string id="2010">Toetsenbord</string>
 	<string id="2011">Toetsenbord layout</string>
+	<string id="2012">Toetsenbord layout #2</string>
 	<string id="2020">Systeem update</string>
 	<string id="2021">Systeem update</string>
 	<string id="2050">LCD/VFD Driver</string>

packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml

@@ -5,6 +5,7 @@
 	<string id="2000">System</string>
 	<string id="2010">Keyboard</string>
 	<string id="2011">Keyboard layout</string>
+	<string id="2012">Alternate keyboard layout (optional)</string>
 	<string id="2020">System Update</string>
 	<string id="2021">System Update</string>
 	<string id="2050">LCD/VFD</string>

packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml

@@ -5,6 +5,7 @@
 	<string id="2000">Système</string>
 	<string id="2010">Clavier</string>
 	<string id="2011">Clavier</string>
+	<string id="2012">Clavier alternatif (facultatif)</string>
 	<string id="2020">Mise à jour du système</string>
 	<string id="2021">Mise à jour du système</string>
 	<string id="2050">LCD/VFD</string>

packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml

@@ -5,6 +5,7 @@
 <string id="2000">System</string>
 <string id="2010">Tastatur</string>
 <string id="2011">Tastaturlayout</string>
+<string id="2012">Tastaturlayout #2</string>
 <string id="2020">System Aktualisierung</string>
 <string id="2021">System Aktualisierung</string>
 <string id="2050">LCD/VFD</string>

packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml

@@ -5,6 +5,7 @@
 	<string id="2000">System</string>
 	<string id="2010">Tastatur</string>
 	<string id="2011">Språklayout</string>
+        <string id="2012">Språklayout #2</string>
 	<string id="2020">Systemoppdateringer</string>
 	<string id="2021">Systemoppdateringer</string>
 	<string id="2050">LCD/VFD</string>

packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml

@@ -6,6 +6,7 @@
 		<setting label="2010" type="lsep"/>
 		<setting type="sep" />
 		<setting id="X11_KEYMAP" type="labelenum" label="2011" values="ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default="us"/>
+                <setting id="X11_KEYMAP2" type="labelenum" label="2012" values="|ad|af|al|am|ara|at|az|ba|bd|be|bg|br|bt|bw|by|ca|cd|ch|cn|cz|de|dk|ee|epo|es|et|fi|fo|fr|gb|gr|hr|hu|ie|il|in|iq|ir|is|it|jp|ke|kg|kh|kr|kz|la|latam|latin|lk|lt|lv|ma|mao|me|mk|ml|mm|mn|mt|mv|ng|nl|no|np|pc|pk|pl|pt|ro|rs|ru|se|si|sk|sn|sy|th|tj|tm|tr|tz|ua|us|uz|vn|za" sort="yes" default=""/>
 		<setting label="2020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="UPDATE_AUTO" type="labelenum" label="2021" values="no|manual|auto" sort="yes" default="manual" />

packages/x11/app/setxkbmap/init.d/72_keyboard

@@ -36,6 +36,10 @@
       wait_for_xorg
 
     # setup keymap
-      setxkbmap -display $DISPLAY $X11_KEYMAP
+      if [ -z $X11_KEYMAP2 ]; then
+        setxkbmap -display $DISPLAY $X11_KEYMAP;
+      else
+        setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
+      fi
   fi
 )&