abouttreesummaryrefslogcommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/values-cs/strings.xml3
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values-it/strings.xml3
-rw-r--r--res/values-lv/strings.xml3
-rw-r--r--res/values-pt/strings.xml3
-rw-r--r--res/values-ru/strings.xml3
-rw-r--r--res/values-tr/strings.xml3
-rw-r--r--res/values/arrays.xml16
-rw-r--r--res/values/attrs.xml3
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/xml/bone.xml2
-rw-r--r--res/xml/bottom_row.xml2
-rw-r--r--res/xml/neo2.xml2
-rw-r--r--res/xml/settings.xml4
14 files changed, 19 insertions, 35 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f6d5d20..e332475 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -12,8 +12,7 @@
<string name="pref_accents_e_none">Skrýt (univerzální) diakritická znaménka</string>
<string name="pref_autocapitalisation_title">Automatická kapitalizace</string>
<string name="pref_autocapitalisation_summary">Stiskne Shift na začátku věty</string>
- <string name="pref_programming_layout_title">Rozložení klávesnice pro programování</string>
- <string name="pref_programming_layout_none">Žádné</string>
+ <string name="pref_second_layout_none">Žádné</string>
<string name="pref_category_typing">Psaní</string>
<string name="pref_swipe_dist_title">Vzdálenost posunutí prstem</string>
<string name="pref_swipe_dist_summary">Jak daleko je třeba posunout prst pro napsaní znaku/diakritiky v rozích klávey (%s)</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 686766f..9b49e57 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,9 +14,8 @@
<string name="pref_show_numpad_never">Nie</string>
<string name="pref_show_numpad_landscape">Nur im Querformat</string>
<string name="pref_show_numpad_always">Immer</string>
- <string name="pref_programming_layout_title">Tastaturlayout zum Programmieren</string>
<string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
- <string name="pref_programming_layout_none">Keines</string>
+ <string name="pref_second_layout_none">Keines</string>
<string name="pref_category_typing">Tippen</string>
<string name="pref_autocapitalisation_title">Automatische Großschreibung</string>
<string name="pref_autocapitalisation_summary">Shift-Taste am Satzanfang aktivieren</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9228673..dd44bd9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -12,8 +12,7 @@
<string name="pref_accents_e_none">Nascondi accenti</string>
<string name="pref_autocapitalisation_title">Maiuscole Automatiche</string>
<string name="pref_autocapitalisation_summary">Premi Shift all\'inizio di una frase</string>
- <string name="pref_programming_layout_title">Layout tastiera per programmare</string>
- <string name="pref_programming_layout_none">Nessuno</string>
+ <string name="pref_second_layout_none">Nessuno</string>
<string name="pref_category_typing">Digitando</string>
<string name="pref_swipe_dist_title">Distanza swipe</string>
<string name="pref_swipe_dist_summary">Distanza dei caratteri negli angoli dei tasti (%s)</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3c9cad1..aa6356c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,8 +17,7 @@
<string name="pref_autocapitalisation_title">Automātiski lielie burti</string>
<string name="pref_autocapitalisation_summary">Piespiest Shift teikuma sākumā</string>
<string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
- <string name="pref_programming_layout_title">Tastatūras izkārtojums programmēšanai</string>
- <string name="pref_programming_layout_none">Neviens</string>
+ <string name="pref_second_layout_none">Neviens</string>
<string name="pref_category_typing">Rakstīšana</string>
<string name="pref_swipe_dist_title">Pavilkšanas attālums</string>
<string name="pref_swipe_dist_summary">Taustiņu stūros esošo rakstzīmju attālums (%s)</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1d05d07..f008079 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -12,8 +12,7 @@
<string name="pref_accents_e_none">Ocultar acentos</string>
<string name="pref_autocapitalisation_title">Maiusculização automática</string>
<string name="pref_autocapitalisation_summary">Aciona o shift no início de cada frase</string>
- <string name="pref_programming_layout_title">Layout do teclado para programação</string>
- <string name="pref_programming_layout_none">Nenhum</string>
+ <string name="pref_second_layout_none">Nenhum</string>
<string name="pref_category_typing">Digitação</string>
<string name="pref_swipe_dist_title">Distância a deslizar</string>
<string name="pref_swipe_dist_summary">Distância até acionar os cantos das teclas (%s)</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bc6c31d..a7a41f3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -9,8 +9,7 @@
<string name="pref_accents_e_all_installed">Показывать акценты для всех установленных языков</string>
<string name="pref_accents_e_selected">Показывать акценты только для выбранного языка</string>
<string name="pref_accents_e_none">Скрыть акценты</string>
- <string name="pref_programming_layout_title">Раскладка клавиатуры для программирования</string>
- <string name="pref_programming_layout_none">Нету</string>
+ <string name="pref_second_layout_none">Нету</string>
<string name="pref_category_typing">Печатание</string>
<string name="pref_swipe_dist_title">Расстояние пролистывания</string>
<string name="pref_swipe_dist_summary">Расстояние между символами в углах клавиш (%s)</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 59ca8ae..e858307 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -10,8 +10,7 @@
<string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
<string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
<string name="pref_accents_e_none">Aksanları gizle</string>
- <string name="pref_programming_layout_title">Programlama için klavye düzeni</string>
- <string name="pref_programming_layout_none">Hiçbiri</string>
+ <string name="pref_second_layout_none">Hiçbiri</string>
<string name="pref_category_typing">Yazma</string>
<string name="pref_swipe_dist_title">Kaydırma mesafesi</string>
<string name="pref_swipe_dist_summary">Tuşların köşelerindeki karakterlerin uzaklıkları (%s)</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 50c140e..17c4bd9 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="pref_layout_values">
- <item>system</item>
+ <item>none</item>
<item>azerty</item>
<item>qwerty</item>
<item>qwerty_pt</item>
@@ -28,7 +28,7 @@
<item>hindi</item>
</string-array>
<string-array name="pref_layout_entries">
- <item>@string/pref_layout_e_system</item>
+ <item>None</item>
<item>AZERTY</item>
<item>QWERTY</item>
<item>QWERTY (Brasileiro)</item>
@@ -54,18 +54,6 @@
<item>বাংলা</item>
<item>हिन्दी</item>
</string-array>
- <string-array name="pref_programming_layout_values">
- <item>none</item>
- <item>qwerty</item>
- <item>dvorak</item>
- <item>colemak</item>
- </string-array>
- <string-array name="pref_programming_layout_entries">
- <item>@string/pref_programming_layout_none</item>
- <item>QWERTY</item>
- <item>Dvorak</item>
- <item>Colemak</item>
- </string-array>
<string-array name="pref_accents_entries">
<item>@string/pref_accents_e_all_installed</item>
<item>@string/pref_accents_e_selected</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index b012a7c..693ef89 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -3,4 +3,7 @@
<declare-styleable name="ExtraKeyCheckBoxPreference">
<attr name="index" format="integer"/>
</declare-styleable>
+ <declare-styleable name="LayoutListPreference">
+ <attr name="defaultString" format="string"/>
+ </declare-styleable>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f7f3a8b..63c55ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,8 +18,8 @@
<string name="pref_autocapitalisation_title">Automatic capitalisation</string>
<string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string>
<string name="pref_extra_keys_title">Add keys to the keyboard</string>
- <string name="pref_programming_layout_title">Keyboard layout for programming</string>
- <string name="pref_programming_layout_none">None</string>
+ <string name="pref_second_layout_title">Secondary layout</string>
+ <string name="pref_second_layout_none">None</string>
<string name="pref_category_typing">Typing</string>
<string name="pref_swipe_dist_title">Swiping distance</string>
<string name="pref_swipe_dist_summary">Distance of characters in the corners of the keys (%s)</string>
diff --git a/res/xml/bone.xml b/res/xml/bone.xml
index d84622a..b6488ee 100644
--- a/res/xml/bone.xml
+++ b/res/xml/bone.xml
@@ -38,7 +38,7 @@
<row height="0.95">
<key width="1.8" key0="ctrl" key2="loc meta" key4="switch_numeric"/>
<key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
- <key width="4.0" key0="space" key1="switch_programming" key2="0" edgekeys="true"/>
+ <key width="4.0" key0="space" key1="switch_second" key2="0" edgekeys="true"/>
<key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
<key width="1.8" key0="enter" key3="action"/>
</row>
diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml
index bfd4e90..64673fc 100644
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -2,7 +2,7 @@
<row height="0.95">
<key width="1.8" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
<key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
- <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
+ <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
<key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
<key width="1.8" key0="enter" key2="action"/>
</row>
diff --git a/res/xml/neo2.xml b/res/xml/neo2.xml
index 96265f2..5bffb3c 100644
--- a/res/xml/neo2.xml
+++ b/res/xml/neo2.xml
@@ -41,7 +41,7 @@
<row height="0.95">
<key width="1.8" key0="ctrl" key2="loc meta" key4="switch_numeric"/>
<key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
- <key width="4.0" key0="space" key1="switch_programming" edgekeys="true"/>
+ <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
<key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
<key key0="j" key4=";"/>
<key width="1.8" key0="enter" key2="action"/>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 4920d6c..5d7f025 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/pref_category_layout">
- <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/>
+ <juloo.keyboard2.LayoutListPreference android:key="layout" android:title="@string/pref_layout_title" app:defaultString="@string/pref_layout_e_system"/>
+ <juloo.keyboard2.LayoutListPreference android:key="second_layout" android:title="@string/pref_second_layout_title" app:defaultString="@string/pref_second_layout_none"/>
<ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
<ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
- <ListPreference android:key="programming_layout" android:title="@string/pref_programming_layout_title" android:summary="%s" android:defaultValue="none" android:entries="@array/pref_programming_layout_entries" android:entryValues="@array/pref_programming_layout_values"/>
<PreferenceScreen android:title="@string/pref_extra_keys_title">
<juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>
<juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="1"/>
generated by ps-cgit (a fork of cgit), using a theme by hackitude