From 1b5c4f4ff49db687bb92ca39bf5eb825c83d8de0 Mon Sep 17 00:00:00 2001
From: alekcacko <alekcacko@gmail.com>
Date: Sat, 14 Jan 2017 19:26:23 +0100
Subject: [PATCH] Add Macedonian keyboard layout

---
 java/res/values-mk/donottranslate-keymap.xml  | 197 +++++++
 java/res/xml-mk/kbd_qwerty.xml                | 507 ++++++++++++++++++
 .../pckeyboard/InputLanguageSelection.java    |   8 +-
 3 files changed, 709 insertions(+), 3 deletions(-)
 create mode 100644 java/res/values-mk/donottranslate-keymap.xml
 create mode 100644 java/res/xml-mk/kbd_qwerty.xml

diff --git a/java/res/values-mk/donottranslate-keymap.xml b/java/res/values-mk/donottranslate-keymap.xml
new file mode 100644
index 000000000..301f52baa
--- /dev/null
+++ b/java/res/values-mk/donottranslate-keymap.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+**
+**
+** 5-row layout for Macedonian QWERTY.
+**
+** See http://code.google.com/p/hackerskeyboard/wiki/AddingNewLayouts for
+** more information.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="key_ae02_main">2</string>
+    <string name="key_ae02_shift">\"</string>
+    <string name="key_ae02_alt">2\"²⅔</string>
+    
+    <string name="key_ae06_main">6</string>
+    <string name="key_ae06_shift">&amp;</string>
+    <string name="key_ae06_alt">6&amp;↑↓←→</string>
+    
+    <string name="key_ae07_main">7</string>
+    <string name="key_ae07_shift">/</string>
+    <string name="key_ae07_alt">7/⅞♪</string>
+    
+    <string name="key_ae08_main">8</string>
+    <string name="key_ae08_shift">(</string>
+    <string name="key_ae08_alt">8(•★∞†‡</string>
+    
+    <string name="key_ae09_main">9</string>
+    <string name="key_ae09_shift">)</string>
+    <string name="key_ae09_alt">9)√</string>
+    
+    <string name="key_ae10_main">0</string>
+    <string name="key_ae10_shift">=</string>
+    <string name="key_ae10_alt">0=ⁿ°</string>
+    
+    <string name="key_ae11_main">\'</string>
+    <string name="key_ae11_shift">\?</string>
+    <string name="key_ae11_alt">\'\?—–</string>
+    
+    <string name="key_ae12_main">+</string>
+    <string name="key_ae12_shift">*</string>
+    <string name="key_ae12_alt">+*≈≠±×÷</string>
+
+
+    <string name="key_ad01_main">љ</string>
+    <string name="key_ad01_shift">Љ</string>
+    <string name="key_ad01_alt"></string>
+    
+    <string name="key_ad02_main">њ</string>
+    <string name="key_ad02_shift">Њ</string>
+    <string name="key_ad02_alt"></string>
+    
+    <string name="key_ad03_main">е</string>
+    <string name="key_ad03_shift">Е</string>
+    <string name="key_ad03_alt"></string>
+
+    <string name="key_ad04_main">р</string>
+    <string name="key_ad04_shift">Р</string>
+    <string name="key_ad04_alt"></string>
+    
+    <string name="key_ad05_main">т</string>
+    <string name="key_ad05_shift">Т</string>
+    <string name="key_ad05_alt"></string>
+    
+    <string name="key_ad06_main">ѕ</string>
+    <string name="key_ad06_shift">Ѕ</string>
+    <string name="key_ad06_alt"></string>
+
+    <string name="key_ad07_main">у</string>
+    <string name="key_ad07_shift">У</string>
+    <string name="key_ad07_alt"></string>
+    
+    <string name="key_ad08_main">и</string>
+    <string name="key_ad08_shift">И</string>
+    <string name="key_ad08_alt"></string>
+    
+    <string name="key_ad09_main">о</string>
+    <string name="key_ad09_shift">О</string>
+    <string name="key_ad09_alt"></string>
+    
+    <string name="key_ad10_main">п</string>
+    <string name="key_ad10_shift">П</string>
+    <string name="key_ad10_alt"></string>
+    
+    <string name="key_ad11_main">ш</string>
+    <string name="key_ad11_shift">Ш</string>
+    <string name="key_ad11_alt">[{</string>
+    
+    <string name="key_ad12_main">ѓ</string>
+    <string name="key_ad12_shift">Ѓ</string>
+    <string name="key_ad12_alt">]}</string>
+
+    
+    <string name="key_ac01_main">а</string>
+    <string name="key_ac01_shift">А</string>
+    <string name="key_ac01_alt"></string>
+
+    <string name="key_ac02_main">с</string>
+    <string name="key_ac02_shift">С</string>
+    <string name="key_ac02_alt"></string>
+
+    <string name="key_ac03_main">д</string>
+    <string name="key_ac03_shift">Д</string>
+    <string name="key_ac03_alt"></string>
+
+    <string name="key_ac04_main">ф</string>
+    <string name="key_ac04_shift">Ф</string>
+    <string name="key_ac04_alt"></string>
+
+    <string name="key_ac05_main">г</string>
+    <string name="key_ac05_shift">Г</string>
+    <string name="key_ac05_alt"></string>
+
+    <string name="key_ac06_main">х</string>
+    <string name="key_ac06_shift">Х</string>
+    <string name="key_ac06_alt"></string>
+
+    <string name="key_ac07_main">ј</string>
+    <string name="key_ac07_shift">Ј</string>
+    <string name="key_ac07_alt"></string>
+
+    <string name="key_ac08_main">к</string>
+    <string name="key_ac08_shift">К</string>
+    <string name="key_ac08_alt"></string>
+
+    <string name="key_ac09_main">л</string>
+    <string name="key_ac09_shift">Л</string>
+    <string name="key_ac09_alt"></string>
+
+    <string name="key_ac10_main">ч</string>
+    <string name="key_ac10_shift">Ч</string>
+    <string name="key_ac10_alt">;:</string>
+
+    <string name="key_ac11_main">ќ</string>
+    <string name="key_ac11_shift">Ќ</string>
+    <string name="key_ac11_alt">\'\"‘’“”</string>
+
+
+    <string name="key_lsgt_main"></string>
+    <string name="key_lsgt_shift"></string>
+    <string name="key_lsgt_alt"></string>
+
+    <string name="key_ab01_main">з</string>
+    <string name="key_ab01_shift">З</string>
+    <string name="key_ab01_alt"></string>
+
+    <string name="key_ab02_main">џ</string>
+    <string name="key_ab02_shift">Џ</string>
+    <string name="key_ab02_alt"></string>
+
+    <string name="key_ab03_main">ц</string>
+    <string name="key_ab03_shift">Ц</string>
+    <string name="key_ab03_alt"></string>
+
+    <string name="key_ab04_main">в</string>
+    <string name="key_ab04_shift">В</string>
+    <string name="key_ab04_alt"></string>
+
+    <string name="key_ab05_main">б</string>
+    <string name="key_ab05_shift">Б</string>
+    <string name="key_ab05_alt"></string>
+
+    <string name="key_ab06_main">н</string>
+    <string name="key_ab06_shift">Н</string>
+    <string name="key_ab06_alt"></string>
+
+    <string name="key_ab07_main">м</string>
+    <string name="key_ab07_shift">М</string>
+    <string name="key_ab07_alt"></string>
+
+    <string name="key_ab08_main">ж</string>
+    <string name="key_ab08_shift">Ж</string>
+    <string name="key_ab08_alt">,;&lt;≤«‹</string>
+
+    <string name="key_ab09_main">.</string>
+    <string name="key_ab09_shift">,</string>
+    <string name="key_ab09_alt">.:&gt;≥»›…</string>
+
+    <string name="key_ab10_main">-</string>
+    <string name="key_ab10_shift">_</string>
+    <string name="key_ab10_alt">-_/\?¿</string>
+</resources>
diff --git a/java/res/xml-mk/kbd_qwerty.xml b/java/res/xml-mk/kbd_qwerty.xml
new file mode 100644
index 000000000..57c4421ba
--- /dev/null
+++ b/java/res/xml-mk/kbd_qwerty.xml
@@ -0,0 +1,507 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- Macedonian keyboard layout, based on the X11 layout for Macedonian -->
+<Keyboard
+    xmlns:android="http://schemas.android.com/apk/res/org.pocketworkstation.pckeyboard"
+    android:keyWidth="8.79%p"
+    android:horizontalGap="0px"
+    android:verticalGap="@dimen/key_bottom_gap"
+>
+    <Row
+        android:rowEdgeFlags="top"
+    >
+        <Key
+            android:keyLabel="љ"
+            android:horizontalGap="1.69%p"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="1"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="њ"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="2" />
+        <Key
+            android:keyLabel="е"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="3" />
+        <Key
+            android:keyLabel="р"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="4" />
+        <Key
+            android:keyLabel="т"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="5" />
+        <Key
+            android:keyLabel="ѕ"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="6" />
+        <Key
+            android:keyLabel="у"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="7" />
+        <Key
+            android:keyLabel="и"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="8" />
+        <Key
+            android:keyLabel="о"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="9" />
+        <Key
+            android:keyLabel="п"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:popupCharacters="0" />
+        <Key
+            android:keyLabel="ш"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row>
+        <Key
+            android:keyLabel="а"
+            android:horizontalGap="1.69%p"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="с" />
+        <Key
+            android:keyLabel="д" />
+        <Key
+            android:keyLabel="ф" />
+        <Key
+            android:keyLabel="г" />
+        <Key
+            android:keyLabel="х" />
+        <Key
+            android:keyLabel="ј" />
+        <Key
+            android:keyLabel="к" />
+        <Key
+            android:keyLabel="л" />
+        <Key
+            android:keyLabel="ч" />
+        <Key
+            android:keyLabel="ќ"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row>
+        <Key
+            android:codes="@integer/key_shift"
+            android:keyIcon="@drawable/sym_keyboard_shift"
+            android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+            android:keyWidth="10.64%p"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:keyLabel="з" />
+        <Key
+            android:keyLabel="џ" />
+        <Key
+            android:keyLabel="ц" />
+        <Key
+            android:keyLabel="в" />
+        <Key
+            android:keyLabel="б" />
+        <Key
+            android:keyLabel="н" />
+        <Key
+            android:keyLabel="м" />
+        <Key
+            android:keyLabel="ѓ" />
+	<Key
+            android:keyLabel="ж" />
+        <Key
+            android:codes="@integer/key_delete"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+            android:keyWidth="10.64%p"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_normal"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_url"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_email"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_im"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="40%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel=":-)"
+            android:keyOutputText=":-) "
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_smileys"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_webentry"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_tab"
+            android:keyIcon="@drawable/sym_keyboard_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="20%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_normal_with_settings_key"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_url_with_settings_key"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_email_with_settings_key"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_im_with_settings_key"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel=":-)"
+            android:keyOutputText=":-) "
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_smileys"
+            android:keyWidth="25%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+    <Row
+        android:keyboardMode="@+id/mode_webentry_with_settings_key"
+        android:keyWidth="10%p"
+        android:rowEdgeFlags="bottom"
+    >
+        <Key
+            android:codes="@integer/key_symbol"
+            android:keyLabel="@string/label_symbol_key"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="left" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:keyIcon="@drawable/sym_keyboard_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_space"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:keyWidth="30%p"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_tab"
+            android:keyIcon="@drawable/sym_keyboard_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true" />
+        <Key
+            android:keyLabel="."
+            android:keyIcon="@drawable/hint_popup"
+            android:popupKeyboard="@xml/popup_punctuation"
+            android:isModifier="true" />
+        <Key
+            android:codes="@integer/key_return"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:keyWidth="15%p"
+            android:isModifier="true"
+            android:keyEdgeFlags="right" />
+    </Row>
+</Keyboard>
diff --git a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
index dfa361090..df9c719cc 100644
--- a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
+++ b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
@@ -71,7 +71,7 @@ public class InputLanguageSelection extends PreferenceActivity {
         "ar", "bg", "bg_ST", "ca", "cs", "cs_QY", "da", "de", "de_NE",
         "el", "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "es_US",
         "fa", "fi", "fr", "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "in",
-        "it", "iw", "ja", "ka", "ko", "lo", "lt", "lv", "nb", "nl", "pl",
+        "it", "iw", "ja", "ka", "ko", "lo", "lt", "mk", "lv", "nb", "nl", "pl",
         "pt", "pt_PT", "rm", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl",
         "sr", "sv", "ta", "th", "tl", "tr", "uk", "vi", "zh_CN", "zh_TW"
     };
@@ -80,14 +80,14 @@ public class InputLanguageSelection extends PreferenceActivity {
         "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el",
         "en", "en_CX", "en_DV", "en_GB", "es", "es_LA", "fa", "fi", "fr",
         "fr_CA", "he", "hr", "hu", "hu_QY", "hy", "it", "iw", "lo", "lt",
-        "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl",
+        "mk", "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY", "sl",
         "sr", "sv", "ta", "th", "tr", "uk"
     };
 
     private static final String[] KBD_4_ROW = {
         "ar", "bg", "bg_ST", "cs", "cs_QY", "da", "de", "de_NE", "el",
         "en", "en_CX", "en_DV", "es", "es_LA", "es_US", "fa", "fr", "fr_CA",
-        "he", "hr", "hu", "hu_QY", "iw", "nb", "ru", "ru_PH", "sk", "sk_QY",
+        "he", "hr", "hu", "hu_QY", "iw", "mk", "nb", "ru", "ru_PH", "sk", "sk_QY",
         "sl", "sr", "sv", "tr", "uk"
     };
 
@@ -108,6 +108,8 @@ private static String getLocaleName(Locale l) {
             return "Deutsch (Neo2)";
         } else if (lang.equals("hu") && country.equals("QY")) {
             return "Magyar (QWERTY)";
+        } else if (lang.equals("mk")) {
+            return "Македонски";
         } else if (lang.equals("sk") && country.equals("QY")) {
             return "Slovenčina (QWERTY)";
         } else if (lang.equals("ru") && country.equals("PH")) {