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 @@
+
+
+
+ 2
+ \"
+ 2\"²⅔
+
+ 6
+ &
+ 6&↑↓←→
+
+ 7
+ /
+ 7/⅞♪
+
+ 8
+ (
+ 8(•★∞†‡
+
+ 9
+ )
+ 9)√
+
+ 0
+ =
+ 0=ⁿ°
+
+ \'
+ \?
+ \'\?—–
+
+ +
+ *
+ +*≈≠±×÷
+
+
+ љ
+ Љ
+
+
+ њ
+ Њ
+
+
+ е
+ Е
+
+
+ р
+ Р
+
+
+ т
+ Т
+
+
+ ѕ
+ Ѕ
+
+
+ у
+ У
+
+
+ и
+ И
+
+
+ о
+ О
+
+
+ п
+ П
+
+
+ ш
+ Ш
+ [{
+
+ ѓ
+ Ѓ
+ ]}
+
+
+ а
+ А
+
+
+ с
+ С
+
+
+ д
+ Д
+
+
+ ф
+ Ф
+
+
+ г
+ Г
+
+
+ х
+ Х
+
+
+ ј
+ Ј
+
+
+ к
+ К
+
+
+ л
+ Л
+
+
+ ч
+ Ч
+ ;:
+
+ ќ
+ Ќ
+ \'\"‘’“”
+
+
+
+
+
+
+ з
+ З
+
+
+ џ
+ Џ
+
+
+ ц
+ Ц
+
+
+ в
+ В
+
+
+ б
+ Б
+
+
+ н
+ Н
+
+
+ м
+ М
+
+
+ ж
+ Ж
+ ,;<≤«‹
+
+ .
+ ,
+ .:>≥»›…
+
+ -
+ _
+ -_/\?¿
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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")) {