commit b9ab7ddd3346f38c1ec962f6d2e8ce1d402130a7
author Eric Fischer <enf@google.com> Tue Aug 17 17:24:41 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 17 17:24:41 2010 -0700
tree 75efe166ae6150adec82bc18c672d2e5ca36d330
parent 540333635794ad9453a8127057a50acce17e462c
parent 1193da8ed2e3efa189123e01daa8884c8258ee4c

Merge "Import revised translations."

java/res/xml-nb/kbd_qwerty.xml

diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 554bb00..d2f0258 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -46,16 +46,16 @@
                 android:popupCharacters="ťþ"/>
         <Key android:codes="121" android:keyLabel="y"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="ýÿü"/>
+                android:popupCharacters="ýÿ"/>
         <Key android:codes="117" android:keyLabel="u"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="úùûū"/>
+                android:popupCharacters="üúùûū"/>
         <Key android:codes="105" android:keyLabel="i"
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="íìîï"/>
         <Key android:codes="111" android:keyLabel="o"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="óòôõ"/>
+                android:popupCharacters="öóòôõ"/>
         <Key android:codes="112" android:keyLabel="p"/>
         <Key android:keyLabel="å"
                 android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
@@ -64,7 +64,7 @@
     <Row>
         <Key android:codes="97" android:keyLabel="a"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="áàâąã"
+                android:popupCharacters="äáàâąã"
                 android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
         <Key android:codes="115" android:keyLabel="s"
                 android:popupKeyboard="@xml/kbd_popup_template"
@@ -82,10 +82,8 @@
                 android:popupCharacters="ł"/>
         <Key android:keyLabel="ø"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="öœ"/>
+                android:popupCharacters="œ"/>
         <Key android:keyLabel="æ"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="ä"
                 android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
     </Row>
 

java/res/xml-nb/kbd_qwerty_black.xml

diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index 9d4c52d..150ff7f 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -46,16 +46,16 @@
                 android:popupCharacters="ťþ"/>
         <Key android:codes="121" android:keyLabel="y"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="ýÿü"/>
+                android:popupCharacters="ýÿ"/>
         <Key android:codes="117" android:keyLabel="u"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="úùûū"/>
+                android:popupCharacters="üúùûū"/>
         <Key android:codes="105" android:keyLabel="i"
                 android:popupKeyboard="@xml/kbd_popup_template"
                 android:popupCharacters="íìîï"/>
         <Key android:codes="111" android:keyLabel="o"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="óòôõ"/>
+                android:popupCharacters="öóòôõ"/>
         <Key android:codes="112" android:keyLabel="p"/>
         <Key android:keyLabel="å"
                 android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
@@ -64,7 +64,7 @@
     <Row>
         <Key android:codes="97" android:keyLabel="a"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="áàâąã"
+                android:popupCharacters="äáàâąã"
                 android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
         <Key android:codes="115" android:keyLabel="s"
                 android:popupKeyboard="@xml/kbd_popup_template"
@@ -82,10 +82,8 @@
                 android:popupCharacters="ł"/>
         <Key android:keyLabel="ø"
                 android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="öœ"/>
+                android:popupCharacters="œ"/>
         <Key android:keyLabel="æ"
-                android:popupKeyboard="@xml/kbd_popup_template"
-                android:popupCharacters="ä"
                 android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
     </Row>