abolish margin and use align

3 files changed, 60 insertions, 60 deletions

diff --git a/data/layouts/touch/ara.xml b/data/layouts/touch/ara.xml
index fc39a75..f8787ff 100644
--- a/data/layouts/touch/ara.xml
+++ b/data/layouts/touch/ara.xml
@@ -14,8 +14,8 @@
       <key name="Arabic_jeem"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="Arabic_sheen"/>
+    <row align="center">
+      <key name="Arabic_sheen"/>
       <key name="Arabic_seen"/>
       <key name="Arabic_yeh"/>
       <key name="Arabic_beh"/>
@@ -39,10 +39,10 @@
       <key name="Return" width="2.0"/>
     </row>
     <row>
-      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
-      <key name="Arabic_fathatan"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key align="left" name="Arabic_fathatan"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
   <level mode="locked" name="symbols1">
@@ -59,8 +59,8 @@
       <key name="Arabic_0"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="minus"/>
+    <row align="center">
+      <key name="minus"/>
       <key name="slash"/>
       <key name="colon"/>
       <key name="Arabic_semicolon"/>
@@ -84,10 +84,10 @@
       <key name="numbersign"/>
     </row>
     <row>
-      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key align="left" name="Caribou_Emoticons"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
   <level mode="locked" name="symbols2">
@@ -104,8 +104,8 @@
       <key name="underscore"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="less"/>
+    <row align="center">
+      <key name="less"/>
       <key name="greater"/>
       <key name="asterisk"/>
       <key name="semicolon"/>
@@ -129,10 +129,10 @@
       <key name="numbersign"/>
     </row>
     <row>
-      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key align="left" name="Caribou_Emoticons"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
 </layout>
diff --git a/data/layouts/touch/il.xml b/data/layouts/touch/il.xml
index 524040c..49f766b 100644
--- a/data/layouts/touch/il.xml
+++ b/data/layouts/touch/il.xml
@@ -14,8 +14,8 @@
       <key name="hebrew_pe"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="hebrew_shin"/>
+    <row align="center">
+      <key name="hebrew_shin"/>
       <key name="hebrew_dalet"/>
       <key name="hebrew_gimel"/>
       <key name="hebrew_kaph"/>
@@ -39,10 +39,10 @@
       <key name="Return" width="2.0"/>
     </row>
     <row>
-      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key name="Caribou_Symbols" align="left" toggle="symbols1" width="2.0"/>
+      <key name="Caribou_Emoticons" align="left"/>
+      <key name="space" width="5.0" align="left"/>
+      <key name="Caribou_Prefs" align="right"/>
     </row>
   </level>
   <level mode="locked" name="symbols1">
@@ -59,8 +59,8 @@
       <key name="0"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="minus"/>
+    <row align="right">
+      <key name="minus"/>
       <key name="slash"/>
       <key name="colon"/>
       <key name="semicolon"/>
@@ -84,10 +84,10 @@
       <key name="numbersign"/>
     </row>
     <row>
-      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key name="Caribou_Alpha" toggle="default" width="2.0" align="left"/>
+      <key name="Caribou_Emoticons" align="left"/>
+      <key name="space" width="5.0" align="left"/>
+      <key name="Caribou_Prefs" align="right"/>
     </row>
   </level>
   <level mode="locked" name="symbols2">
@@ -104,8 +104,8 @@
       <key name="underscore"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="less"/>
+    <row align="right">
+      <key name="less"/>
       <key name="greater"/>
       <key name="asterisk"/>
       <key name="semicolon"/>
@@ -129,10 +129,10 @@
       <key name="numbersign"/>
     </row>
     <row>
-      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key name="Caribou_Alpha" toggle="default" width="2.0" align="left"/>
+      <key name="Caribou_Emoticons" align="left"/>
+      <key name="space" width="5.0" align="left"/>
+      <key name="Caribou_Prefs" align="right"/>
     </row>
   </level>
 </layout>
diff --git a/data/layouts/touch/us.xml b/data/layouts/touch/us.xml
index 0a9aaca..559bb69 100644
--- a/data/layouts/touch/us.xml
+++ b/data/layouts/touch/us.xml
@@ -42,8 +42,8 @@
       <key name="p"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="a">
+    <row align="right">
+      <key name="a">
         <key name="a"/>
         <key name="agrave"/>
         <key name="aacute"/>
@@ -81,10 +81,10 @@
       <key name="question"/>
     </row>
     <row>
-      <key name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key align="left" name="Caribou_Emoticons"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
   <level mode="latched" name="level2">
@@ -129,8 +129,8 @@
       <key name="P"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="A">
+    <row align="right">
+      <key name="A">
         <key name="A"/>
         <key name="Agrave"/>
         <key name="Aacute"/>
@@ -168,10 +168,10 @@
       <key name="question"/>
     </row>
     <row>
-      <key name="Caribou_Symbols" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Symbols" toggle="symbols1" width="2.0"/>
+      <key align="left" name="Caribou_Emoticons"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
   <level mode="locked" name="symbols1">
@@ -188,8 +188,8 @@
       <key name="0"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="minus"/>
+    <row align="right">
+      <key name="minus"/>
       <key name="slash"/>
       <key name="colon"/>
       <key name="semicolon"/>
@@ -219,10 +219,10 @@
       <key name="numbersign"/>
     </row>
     <row>
-      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key align="left" name="Caribou_Emoticons"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
   <level mode="locked" name="symbols2">
@@ -239,8 +239,8 @@
       <key name="underscore"/>
       <key name="BackSpace"/>
     </row>
-    <row>
-      <key margin-left="0.5" name="less"/>
+    <row align="right">
+      <key align="right" name="less"/>
       <key name="greater"/>
       <key name="asterisk"/>
       <key name="semicolon"/>
@@ -264,10 +264,10 @@
       <key name="numbersign"/>
     </row>
     <row>
-      <key name="Caribou_Alpha" toggle="default" width="2.0"/>
-      <key name="Caribou_Emoticons"/>
-      <key name="space" width="5.0"/>
-      <key margin-left="2.0" name="Caribou_Prefs"/>
+      <key align="left" name="Caribou_Alpha" toggle="default" width="2.0"/>
+      <key align="left" name="Caribou_Emoticons"/>
+      <key align="left" name="space" width="5.0"/>
+      <key align="right" name="Caribou_Prefs"/>
     </row>
   </level>
 </layout>