Specify localized keys in each layouts

Each layouts can chose which key are localized instead of specifying it
globally for each key.

Important keys are no longer removed from layouts if the 'extra_keys'
mechanism is not working properly. This can happen if language tags
specified in method.xml don't match the user's language.

Removed some currency symbols from some layouts. They are all in the Fn
layer.

11 files changed, 65 insertions, 65 deletions

diff --git a/res/xml/azerty.xml b/res/xml/azerty.xml
index c081d56..0e3f073 100644
--- a/res/xml/azerty.xml
+++ b/res/xml/azerty.xml
@@ -14,13 +14,13 @@
   </row>
   <row>
     <key key0="q" key2="tab"/>
-    <key key0="s" key1="accent_ring" key3="ß"/>
+    <key key0="s" key1="loc accent_ring" key3="loc ß"/>
     <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f" key3="{" key4="}"/>
     <key key0="g" key3="[" key4="]"/>
     <key key0="h" key3="=" key4="+"/>
     <key key0="j" key1="accent_trema" key2="accent_circonflexe" key3="^"/>
-    <key key0="k" key2="€" key3="$" key4="£"/>
+    <key key0="k" key2="€" key3="$"/>
     <key key0="l" key2="%"/>
     <key key0="m" key3="*"/>
   </row>
@@ -31,7 +31,7 @@
     <key key0="c" key1="accent_cedille" key3="," key4="\?"/>
     <key key0="v" key3=";" key4="."/>
     <key key0="b" key3=":" key4="/"/>
-    <key key0="n" key1="accent_tilde" key2="§" key4="!"/>
+    <key key0="n" key1="loc accent_tilde" key2="§" key4="!"/>
     <key width="2.0" key0="backspace" key2="delete"/>
   </row>
 </keyboard>
diff --git a/res/xml/dvorak.xml b/res/xml/dvorak.xml
index 7f2cbe9..028daa6 100644
--- a/res/xml/dvorak.xml
+++ b/res/xml/dvorak.xml
@@ -2,32 +2,32 @@
 <keyboard>
   <row>
     <key key0="shift" width="1.5" key2="esc" key4="tab"/>
-    <key key0="p" key1="accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
-    <key key0="y" key1="accent_grave" key2="," key3="&gt;" key4="f12_placeholder"/>
-    <key key0="f" key4="€"/>
+    <key key0="p" key1="loc accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
+    <key key0="y" key1="loc accent_grave" key2="," key3="&gt;" key4="f12_placeholder"/>
+    <key key0="f" key4="loc €"/>
     <key key0="g" key2="\\" key3="|"/>
-    <key key0="c" key1="accent_trema" key2="accent_circonflexe" key3="{" key4="}"/>
+    <key key0="c" key1="loc accent_trema" key2="loc accent_circonflexe" key3="{" key4="}"/>
     <key key0="r" key3="[" key4="]"/>
-    <key key0="l" key2="=" key3="+" key4="£"/>
+    <key key0="l" key2="=" key3="+" key4="loc £"/>
     <key key0="backspace" key2="delete" width="1.5"/>
   </row>
   <row>
     <key key0="a" key2="1" key4="!"/>
-    <key key0="o" key1="accent_macron" key2="2" key3="\@" key4="accent_ogonek"/>
-    <key key0="e" key1="accent_caron" key2="3" key3="\#" key4="accent_dot_above"/>
-    <key key0="u" key2="4" key3="$" key4="accent_double_aigu"/>
+    <key key0="o" key1="loc accent_macron" key2="2" key3="\@" key4="loc accent_ogonek"/>
+    <key key0="e" key1="loc accent_caron" key2="3" key3="\#" key4="loc accent_dot_above"/>
+    <key key0="u" key2="4" key3="$" key4="loc accent_double_aigu"/>
     <key key0="i" key2="5" key3="%"/>
     <key key0="d" key2="6" key3="^"/>
     <key key0="h" key2="7" key3="&amp;"/>
     <key key0="t" key2="8" key3="*"/>
     <key key0="n" key2="9" key3="(" key4=")"/>
-    <key key0="s" key1="0" key3="ß"/>
+    <key key0="s" key1="0" key3="loc ß"/>
   </row>
   <row>
-    <key key0="q" shift="0.5" key1="accent_tilde" key2="`" key3="~"/>
-    <key key0="j" key1="accent_aigu" key2="'" key3="&quot;"/>
+    <key key0="q" shift="0.5" key1="loc accent_tilde" key2="`" key3="~"/>
+    <key key0="j" key1="loc accent_aigu" key2="'" key3="&quot;"/>
     <key key0="k" key2=";" key3=":"/>
-    <key key0="x" key1="accent_cedille"/>
+    <key key0="x" key1="loc accent_cedille"/>
     <key key0="b"/>
     <key key0="m" key2="/" key3="\?"/>
     <key key0="w"/>
diff --git a/res/xml/local_bgph1.xml b/res/xml/local_bgph1.xml
index 0d71527..7ed407a 100644
--- a/res/xml/local_bgph1.xml
+++ b/res/xml/local_bgph1.xml
@@ -9,28 +9,28 @@
     <key key0="ъ" key2="6" key3="^" key4="€"/>
     <key key0="у" key2="7" key3="&amp;" key4="§"/>
     <key key0="и" key2="8" key3="*"/>
-    <key key0="о" key1="accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="о" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
     <key key0="п" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="а" key1="tab" key2="`"/>
-    <key key0="с" key2="£"/>
-    <key key0="д" key1="accent_grave" key3="accent_aigu"/>
+    <key key0="с"/>
+    <key key0="д" key1="loc accent_grave" key3="loc accent_aigu"/>
     <key key0="ф"/>
-    <key key0="г" key1="accent_caron" key2="-" key3="_"/>
+    <key key0="г" key1="loc accent_caron" key2="-" key3="_"/>
     <key key0="х" key2="=" key3="+"/>
-    <key key0="й" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
+    <key key0="й" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
     <key key0="к" key2="ш" key3="[" key4="]"/>
     <key key0="л" key1="щ" key2="|" key3="\\" key4="ю"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
     <key key0="з"/>
-    <key key0="ь" key1="accent_ring" key3="ѝ"/>
-    <key key0="ц" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="ь" key1="loc accent_ring" key3="ѝ"/>
+    <key key0="ц" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="ж" key2="&gt;" key3=","/>
     <key key0="б" key2="\?" key3="/"/>
-    <key key0="н" key1="accent_tilde" key2=":" key3=";"/>
+    <key key0="н" key1="loc accent_tilde" key2=":" key3=";"/>
     <key key0="м" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
diff --git a/res/xml/neo2.xml b/res/xml/neo2.xml
index 7ff0be7..b3d36d2 100644
--- a/res/xml/neo2.xml
+++ b/res/xml/neo2.xml
@@ -14,17 +14,17 @@
     <key key0="ß" key1="-"/>
   </row>
   <row>
-    <key key0="u" key1="tab" key2="accent_circonflexe" key4="\\"/>
-    <key key0="i" key2="accent_caron" key4="/"/>
-    <key key0="a" key2="accent_dot_above" key4="{"/>
-    <key key0="e" key2="accent_macron" key4="}"/>
-    <key key0="o" key2="accent_trema" key4="*"/>
-    <key key0="s" key2="accent_tilde" key4="\?"/>
-    <key key0="n" key2="accent_cedille" key4="("/>
-    <key key0="r" key2="accent_grave" key4=")"/>
-    <key key0="t" key2="accent_aigu" key4="-"/>
-    <key key0="d" key2="accent_ring" key4=":"/>
-    <key key0="y" key2="accent_double_aigu" key3="\@"/>
+    <key key0="u" key1="tab" key2="loc accent_circonflexe" key4="\\"/>
+    <key key0="i" key2="loc accent_caron" key4="/"/>
+    <key key0="a" key2="loc accent_dot_above" key4="{"/>
+    <key key0="e" key2="loc accent_macron" key4="}"/>
+    <key key0="o" key2="loc accent_trema" key4="*"/>
+    <key key0="s" key2="loc accent_tilde" key4="\?"/>
+    <key key0="n" key2="loc accent_cedille" key4="("/>
+    <key key0="r" key2="loc accent_grave" key4=")"/>
+    <key key0="t" key2="loc accent_aigu" key4="-"/>
+    <key key0="d" key2="loc accent_ring" key4=":"/>
+    <key key0="y" key2="loc accent_double_aigu" key3="\@"/>
   </row>
   <row>
     <key width="1.5" key0="shift" key1="esc"/>
diff --git a/res/xml/qwerty.xml b/res/xml/qwerty.xml
index 4457bec..39df62e 100644
--- a/res/xml/qwerty.xml
+++ b/res/xml/qwerty.xml
@@ -3,34 +3,34 @@
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@"/>
-    <key key0="e" key1="!" key2="3" key3="\#" key4="€"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
     <key key0="r" key2="4" key3="$"/>
     <key key0="t" key2="5" key3="%"/>
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
-    <key key0="o" key1="accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
     <key key0="p" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`"/>
-    <key key0="s" key1="accent_ring" key3="ß" key4="accent_ogonek"/>
-    <key key0="d" key1="accent_grave" key2="£" key3="accent_aigu"/>
-    <key key0="f" key1="accent_dot_above"/>
-    <key key0="g" key1="accent_caron" key2="-" key3="_"/>
+    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
+    <key key0="f" key1="loc accent_dot_above"/>
+    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
     <key key0="h" key2="=" key3="+"/>
-    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
-    <key key0="k" key1="accent_double_aigu" key3="[" key4="]"/>
+    <key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
+    <key key0="k" key1="loc accent_double_aigu" key3="[" key4="]"/>
     <key key0="l" key2="|" key3="\\"/>
   </row>
   <row>
     <key width="1.5" key0="shift"/>
     <key key0="z"/>
     <key key0="x"/>
-    <key key0="c" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/"/>
-    <key key0="n" key1="accent_tilde" key2=":" key3=";"/>
+    <key key0="n" key1="loc accent_tilde" key2=":" key3=";"/>
     <key key0="m" key2="&quot;" key3="'"/>
     <key width="1.5" key0="backspace" key2="delete"/>
   </row>
diff --git a/res/xml/qwerty_es.xml b/res/xml/qwerty_es.xml
index 3695996..f83bb4a 100644
--- a/res/xml/qwerty_es.xml
+++ b/res/xml/qwerty_es.xml
@@ -9,17 +9,17 @@
     <key key0="y" key2="6" key3="^"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
-    <key key0="o" key1="accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
     <key key0="p" key1="0" key3="f11_placeholder" key4="f12_placeholder"/>
   </row>
   <row>
     <key key0="a" key2="tab" key4="`"/>
-    <key key0="s" key1="accent_ring" key2="¡" key3="ß"/>
-    <key key0="d" key1="accent_grave" key2="£" key3="accent_aigu"/>
+    <key key0="s" key1="loc accent_ring" key2="¡" key3="loc ß"/>
+    <key key0="d" key1="accent_grave" key3="accent_aigu"/>
     <key key0="f"/>
-    <key key0="g" key1="accent_caron" key2="-" key3="_"/>
+    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
     <key key0="h" key2="=" key3="+"/>
-    <key key0="j" key1="accent_trema" key2="accent_circonflexe" key4="}" key3="{"/>
+    <key key0="j" key1="accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
     <key key0="k" key3="[" key4="]"/>
     <key key0="l" key2="|" key3="\\"/>
     <key key0="ñ" key1="·" key3="ç" />
@@ -28,7 +28,7 @@
     <key width="1.5" key0="shift"/>
     <key key0="z"/>
     <key key0="x"/>
-    <key key0="c" key1="accent_cedille" key2="&lt;" key3="."/>
+    <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
     <key key0="v" key2="&gt;" key3=","/>
     <key key0="b" key2="\?" key3="/" key4="¿"/>
     <key key0="n" key1="accent_tilde" key2=":" key3=";"/>
diff --git a/res/xml/qwerty_ko.xml b/res/xml/qwerty_ko.xml
index b945147..482f342 100644
--- a/res/xml/qwerty_ko.xml
+++ b/res/xml/qwerty_ko.xml
@@ -3,7 +3,7 @@
   <row>
     <key key0="ㅂ" key2="1" key4="esc"/>
     <key key0="ㅈ" key1="~" key2="2" key3="\@"/>
-    <key key0="ㄷ" key1="!" key2="3" key3="\#" key4="€"/>
+    <key key0="ㄷ" key1="!" key2="3" key3="\#"/>
     <key key0="ㄱ" key2="4" key3="$"/>
     <key key0="ㅅ" key2="5" key3="%"/>
     <key key0="ㅛ" key2="6" key3="^"/>
@@ -14,8 +14,8 @@
   </row>
   <row>
     <key shift="0.5" key0="ㅁ" key1="tab" key2="`"/>
-    <key key0="ㄴ" key3="ß"/>
-    <key key0="ㅇ" key2="£"/>
+    <key key0="ㄴ" key3="loc ß"/>
+    <key key0="ㅇ"/>
     <key key0="ㄹ"/>
     <key key0="ㅎ" key2="-" key3="_"/>
     <key key0="ㅗ" key2="=" key3="+"/>
diff --git a/res/xml/qwerty_lv.xml b/res/xml/qwerty_lv.xml
index e9a1fc2..9d4db25 100644
--- a/res/xml/qwerty_lv.xml
+++ b/res/xml/qwerty_lv.xml
@@ -14,9 +14,9 @@
   </row>
   <row>
     <key shift="0.5" key0="a" key1="ā" key2="tab"/>
-    <key key0="s" key1="š" key3="ß" key4="accent_ogonek"/>
-    <key key0="d" key2="£"/>
-    <key key0="f" key1="accent_dot_above"/>
+    <key key0="s" key1="š" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="d"/>
+    <key key0="f" key1="loc accent_dot_above"/>
     <key key0="g" key1="ģ"/>
     <key key0="h" key2="accent_macron" key3="accent_caron" key4="accent_cedille"/>
     <key key0="j" key1="+" key2="=" key3="-" key4="_"/>
diff --git a/res/xml/qwerty_pt.xml b/res/xml/qwerty_pt.xml
index 40110da..6e5d28d 100644
--- a/res/xml/qwerty_pt.xml
+++ b/res/xml/qwerty_pt.xml
@@ -3,10 +3,10 @@
   <row>
     <key key0="q" key2="1" key4="esc"/>
     <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
-    <key key0="e" key1="£" key2="3" key3="\#" key4="€"/>
+    <key key0="e" key2="3" key3="\#" key4="€"/>
     <key key0="r" key2="4" key3="$" key4="f11_placeholder"/>
     <key key0="t" key2="5" key3="%" key4="f12_placeholder"/>
-    <key key0="y" key1="accent_caron" key2="6" key3="^" key4="accent_trema"/>
+    <key key0="y" key1="loc accent_caron" key2="6" key3="^" key4="loc accent_trema"/>
     <key key0="u" key2="7" key3="&amp;"/>
     <key key0="i" key2="8" key3="*"/>
     <key key0="o" key2="9" key3="(" key4=")"/>
@@ -14,9 +14,9 @@
   </row>
   <row>
     <key key0="a" key2="tab" key4="`"/>
-    <key key0="s" key1="'" key3="ß" key4="accent_cedille"/>
-    <key key0="d" key1="&quot;" key2="accent_ring"/>
-    <key key0="f" key2="accent_caron"/>
+    <key key0="s" key1="'" key3="loc ß" key4="accent_cedille"/>
+    <key key0="d" key1="&quot;" key2="loc accent_ring"/>
+    <key key0="f" key2="loc accent_caron"/>
     <key key0="g"/>
     <key key0="h"/>
     <key key0="j" key1="-" key2="=" key4="+" key3="_"/>
diff --git a/res/xml/qwerty_sv_se.xml b/res/xml/qwerty_sv_se.xml
index 15aa6ca..fe41134 100644
--- a/res/xml/qwerty_sv_se.xml
+++ b/res/xml/qwerty_sv_se.xml
@@ -15,9 +15,9 @@
   </row>
   <row>
     <key key0="a" key2="tab"/>
-    <key key0="s" key1="accent_ring" key2="accent_cedille" key3="ß" key4="accent_tilde"/>
-    <key key0="d" key1="accent_grave" key2="accent_caron" key3="accent_aigu"/>
-    <key key0="f" key1="accent_trema" key2="accent_circonflexe"/>
+    <key key0="s" key1="accent_ring" key2="loc accent_cedille" key3="loc ß" key4="loc accent_tilde"/>
+    <key key0="d" key1="loc accent_grave" key2="loc accent_caron" key3="accent_aigu"/>
+    <key key0="f" key1="accent_trema" key2="loc accent_circonflexe"/>
     <key key0="g"/>
     <key key0="h"/>
     <key key0="j" key1="{" key4="}"/>
diff --git a/res/xml/qwertz.xml b/res/xml/qwertz.xml
index 77d0fc5..ffa8d36 100644
--- a/res/xml/qwertz.xml
+++ b/res/xml/qwertz.xml
@@ -15,7 +15,7 @@
   <row>
     <key shift="0.5" key0="a" key1="tab" key2="`" key3="ä"/>
     <key key0="s" key3="ß"/>
-    <key key0="d" key2="£"/>
+    <key key0="d"/>
     <key key0="f" key1="~"/>
     <key key0="g" key3="-"/>
     <key key0="h" key3="+"/>