Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/connectbot/HostListActivity.java
	app/src/main/java/org/connectbot/service/TerminalKeyListener.java

37 files changed, 115 insertions, 257 deletions

diff --git a/app/src/main/res/drawable-hdpi/notification_icon.png b/app/src/main/res/drawable-hdpi/notification_icon.png
index 518f990..ecc44a3 100644
--- a/app/src/main/res/drawable-hdpi/notification_icon.png
+++ b/app/src/main/res/drawable-hdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-mdpi/notification_icon.png b/app/src/main/res/drawable-mdpi/notification_icon.png
index 01f6dca..118d838 100644
--- a/app/src/main/res/drawable-mdpi/notification_icon.png
+++ b/app/src/main/res/drawable-mdpi/notification_icon.png
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index eb39739..3b9887f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -48,9 +48,6 @@
   <string name="alert_disconnect_msg">Връзката изгубена</string>
   <string name="msg_copyright">Запазени права © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
   <string name="list_keymode_none">Забраняване</string>
-  <string name="list_update_daily">Ежедневно</string>
-  <string name="list_update_weekly">Ежеседмично</string>
-  <string name="list_update_never">Никога</string>
   <string name="console_copy_done">Копирани %1$d байта в клипборда</string>
   <string name="console_menu_close">Затваряне</string>
   <string name="console_menu_copy">Копиране</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e68fdef..a2b511f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Amaga la barra d\'estat en consola</string>
   <string name="pref_memkeys_title">Recorda les claus en memòria</string>
   <string name="pref_memkeys_summary">Manté les claus descarregadesen memòria fins que el servei finalitzi</string>
-  <string name="pref_update_title">Comprova actualització</string>
-  <string name="pref_update_summary">Escull la freqüència màxima de comprovació d\'actualitzacions de ConnectBot</string>
   <string name="pref_conn_persist_title">Connexions persistents</string>
   <string name="pref_conn_persist_summary">Manté les connexions mentre l\'aplicació és en segon pla</string>
   <string name="pref_keymode_title">Drecera de carpetes</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Deshabilita</string>
   <string name="list_pubkeyids_none">No usis claus</string>
   <string name="list_pubkeyids_any">Fes servir qualsevol clau desbloquejada</string>
-  <string name="list_update_daily">Diàriament</string>
-  <string name="list_update_weekly">Setmanalment</string>
-  <string name="list_update_never">Mai</string>
   <string name="hostpref_nickname_title">Sobrenom</string>
   <string name="hostpref_color_title">Color de la categoria</string>
   <string name="hostpref_fontsize_title">Mida de la lletra (pt)</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a603f07..17682d4 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Skrýt stavový řádek když je zobrazena konzole</string>
   <string name="pref_memkeys_title">Uchovávat klíče v paměti</string>
   <string name="pref_memkeys_summary">Ponechat odemčené klíče v paměti dokud není ukončena služba na pozadí</string>
-  <string name="pref_update_title">Kontrolovat aktualizace</string>
-  <string name="pref_update_summary">Nastavit maximální frekvenci pro kontrolu aktualizací ConnectBota</string>
   <string name="pref_conn_persist_title">Trvalá spojení</string>
   <string name="pref_conn_persist_summary">Vynutit spojení i v pozadí</string>
   <string name="pref_keymode_title">Zkratky adresářů</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Vypnout</string>
   <string name="list_pubkeyids_none">Nepoužívat klíče</string>
   <string name="list_pubkeyids_any">Použít jakýkoliv odemčený klíč</string>
-  <string name="list_update_daily">Denně</string>
-  <string name="list_update_weekly">Týdně</string>
-  <string name="list_update_never">Nikdy</string>
   <string name="hostpref_nickname_title">Přezdívka</string>
   <string name="hostpref_color_title">Barevná kategorie</string>
   <string name="hostpref_fontsize_title">Velikost fontu (pt)</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 370d5d5..5d18c90 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Skjul statusbar i konsol</string>
   <string name="pref_memkeys_title">Husk nøgler i hukommelsen</string>
   <string name="pref_memkeys_summary">Gem oplåste nøgler i hukommelsen indtil baggrunds servicen er afsluttet</string>
-  <string name="pref_update_title">Opdaterings tjek</string>
-  <string name="pref_update_summary">Maksimal tid mellem check for opdateringer til ConnectBot</string>
   <string name="pref_conn_persist_title">Vedvarende forbindelser</string>
   <string name="pref_conn_persist_summary">Tving forbindelser til at være aktive i baggrunden</string>
   <string name="pref_keymode_title">Biblioteksgenveje</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Slå fra</string>
   <string name="list_pubkeyids_none">Brug ikke tasterne</string>
   <string name="list_pubkeyids_any">Anvend enhver ulåst nøgle</string>
-  <string name="list_update_daily">Dagligt</string>
-  <string name="list_update_weekly">Ugenligt</string>
-  <string name="list_update_never">Aldrig</string>
   <string name="hostpref_nickname_title">Kaldenavn</string>
   <string name="hostpref_color_title">Farvekategori</string>
   <string name="hostpref_fontsize_title">Skriftstørrelse (pt)</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3edcfaa..275a20c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Statuszeile in der Konsole verbergen</string>
   <string name="pref_memkeys_title">Schlüssel im Speicher behalten</string>
   <string name="pref_memkeys_summary">Entsperrte Schlüssel im Speicher halten, bis der Hintergrunddienst beendet wurde</string>
-  <string name="pref_update_title">Aktualisierungen suchen</string>
-  <string name="pref_update_summary">Die maximale Frequenz einstellen, mit der nach ConnectBot Aktualisierungen gesucht werden soll</string>
   <string name="pref_conn_persist_title">Persistente Verbindungen</string>
   <string name="pref_conn_persist_summary">Erhalte Verbindungen auch im Hintergrund</string>
   <string name="pref_keymode_title">Verzeichniskürzel</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Ausschalten</string>
   <string name="list_pubkeyids_none">Keine Schlüssel verwenden</string>
   <string name="list_pubkeyids_any">Beliebigen entsperrten Schlüssel verwenden</string>
-  <string name="list_update_daily">Täglich</string>
-  <string name="list_update_weekly">Wöchentlich</string>
-  <string name="list_update_never">Niemals</string>
   <string name="hostpref_nickname_title">Nutzername</string>
   <string name="hostpref_color_title">Farbkategorie</string>
   <string name="hostpref_fontsize_title">Fontgröße (pt)</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b7f6306..f85853a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Esconder barra de estatus cuando este en consola</string>
   <string name="pref_memkeys_title">Recordar claves en memoria</string>
   <string name="pref_memkeys_summary">Recordar claves en memoria hasta que el servicio en segundo plano termine</string>
-  <string name="pref_update_title">Revisar por actualizaciones</string>
-  <string name="pref_update_summary">Establecer la frequencia maxima para revisar actualizaciones de ConnectBot</string>
   <string name="pref_conn_persist_title">Conexiones persistentes</string>
   <string name="pref_conn_persist_summary">Mantener conexiones activas en segundo plano</string>
   <string name="pref_keymode_title">Secuencia de teclas para directorios</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Desactivar</string>
   <string name="list_pubkeyids_none">No usar teclas</string>
   <string name="list_pubkeyids_any">Utilizar cualquier clave desbloqueada</string>
-  <string name="list_update_daily">Diariamente</string>
-  <string name="list_update_weekly">Semanalmente</string>
-  <string name="list_update_never">Nunca</string>
   <string name="hostpref_nickname_title">Apodo</string>
   <string name="hostpref_color_title">Categoria de colores</string>
   <string name="hostpref_fontsize_title">Tamaño de la fuente (pt)</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 7701c10..7127425 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Ezkutatu egoera-barra kontsola erabiltzean</string>
   <string name="pref_memkeys_title">Gorde gakoak memorian</string>
   <string name="pref_memkeys_summary">Gogoratu desblokeatutako gakoak memorian zerbitzua amaitu arte</string>
-  <string name="pref_update_title">Eguneraketak begiratu</string>
-  <string name="pref_update_summary">ConnectBot-en eguneraketarik dagoen begiratzeko maiztasun maximoa finkatu</string>
   <string name="pref_conn_persist_title">Konexio iraunkorrak</string>
   <string name="pref_conn_persist_summary">Behartu konexioak aktibo mantentzera atzeko planoko daudenean</string>
   <string name="pref_keymode_title">Direktorien laster-teklak</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Desgaitu</string>
   <string name="list_pubkeyids_none">Ez erabili gakorik</string>
   <string name="list_pubkeyids_any">Erabili desblokeatutako edozein gako</string>
-  <string name="list_update_daily">Egunero</string>
-  <string name="list_update_weekly">Astero</string>
-  <string name="list_update_never">Inoiz ez</string>
   <string name="hostpref_nickname_title">Goitizena</string>
   <string name="hostpref_color_title">Kolore kategoria</string>
   <string name="hostpref_fontsize_title">Letra-tamaina (pt)</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index fae7213..fd61472 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Piilota ilmoitusalue konsolikäytössä</string>
   <string name="pref_memkeys_title">Pidä avaimet muistissa</string>
   <string name="pref_memkeys_summary">Pitää avatut avaimet muistissa kunnes taustapalvelu suljetaan</string>
-  <string name="pref_update_title">Päivitysten tarkistus</string>
-  <string name="pref_update_summary">Kuinka usein ConnectBot enintään tarkistaa päivitykset</string>
   <string name="pref_conn_persist_title">Ylläpidä yhteys</string>
   <string name="pref_conn_persist_summary">Pakottaa yhteyden pysymään aktiivisena ohjelman ollessa taustalla</string>
   <string name="pref_keymode_title">Pikanäppäimet</string>
@@ -103,9 +101,6 @@
   <string name="list_keymode_none">Pois käytöstä</string>
   <string name="list_pubkeyids_none">Älä käytä avaimia</string>
   <string name="list_pubkeyids_any">Käytä mitä tahansa avattua avainta</string>
-  <string name="list_update_daily">Päivittäin</string>
-  <string name="list_update_weekly">Viikoittain</string>
-  <string name="list_update_never">Ei koskaan</string>
   <string name="hostpref_nickname_title">Lempinimi</string>
   <string name="hostpref_color_title">Väri</string>
   <string name="hostpref_fontsize_title">Kirjasimen koko (pistettä)</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 38496d1..0c81acb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Cacher la barre de notifications lorsque la console est active</string>
   <string name="pref_memkeys_title">Garder les clés en mémoire</string>
   <string name="pref_memkeys_summary">Garder les clés débloquées en mémoire tant que le service tourne en arrière-plan</string>
-  <string name="pref_update_title">Vérifier les mises à jour</string>
-  <string name="pref_update_summary">Régler la fréquence de vérification pour les mises à jour de ConnectBot</string>
   <string name="pref_conn_persist_title">Connexions persistantes</string>
   <string name="pref_conn_persist_summary">Forcer les connexions à rester connectées en arrière-plan</string>
   <string name="pref_keymode_title">Raccourcis de navigation</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Désactivé</string>
   <string name="list_pubkeyids_none">Ne pas utiliser les clés publiques</string>
   <string name="list_pubkeyids_any">Utiliser une clé pour l\'authentification</string>
-  <string name="list_update_daily">Journalière</string>
-  <string name="list_update_weekly">Hebdomadaire</string>
-  <string name="list_update_never">Jamais</string>
   <string name="hostpref_nickname_title">Surnom</string>
   <string name="hostpref_color_title">Catégorie de couleur</string>
   <string name="hostpref_fontsize_title">Taille de police (pt)</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index c5ad54a..de8ff9f 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -72,8 +72,6 @@
   <string name="pref_fullscreen_summary">Esconder a barra de estado cando estea na consola</string>
   <string name="pref_memkeys_title">Recordar chaves en memoria</string>
   <string name="pref_memkeys_summary">Manter chaves desbloqueadas en memoria ata que o servicio de backend teña terminado</string>
-  <string name="pref_update_title">Comprobar actualizacións</string>
-  <string name="pref_update_summary">Establecer a frecuencia máxima para comprobar as actualizacións de ConnectBot</string>
   <string name="pref_conn_persist_title">Conexións persistentes</string>
   <string name="pref_conn_persist_summary">Manter conexións activas en segundo plano</string>
   <string name="pref_keymode_title">Atallos de teclado para directorios</string>
@@ -91,9 +89,6 @@
   <string name="list_keymode_none">Deshabilitar</string>
   <string name="list_pubkeyids_none">Non usar chaves</string>
   <string name="list_pubkeyids_any">Usar calquera chave desbloqueada</string>
-  <string name="list_update_daily">Diariamente</string>
-  <string name="list_update_weekly">Semanalmente</string>
-  <string name="list_update_never">Nunca</string>
   <string name="hostpref_fontsize_title">Tamaño da fonte (pt)</string>
   <string name="hostpref_postlogin_summary">Comandos a executar no servidor remoto unha vez autenticado</string>
   <string name="hostpref_compression_title">Compresión</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6cc1571..2c463b1 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">להסתיר את שורת המצב בעת השימוש במסוף</string>
   <string name="pref_memkeys_title">לשמור את המפתחות בזיכרון</string>
   <string name="pref_memkeys_summary">להשאיר את המפתחות לאחר השחרור בזיכרון עד ששירות המנגנון מושבת</string>
-  <string name="pref_update_title">בדיקת עדכון</string>
-  <string name="pref_update_summary">הגדרת התדירות המרבית לבדיקת עדכונים של ConnectBot</string>
   <string name="pref_conn_persist_title">חיבורים עיקשים</string>
   <string name="pref_conn_persist_summary">לשמור על החיבורים פעילים ברקע</string>
   <string name="pref_keymode_title">קיצורי ספריות</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">נטרול</string>
   <string name="list_pubkeyids_none">לא להשתמש במפתחות</string>
   <string name="list_pubkeyids_any">שימוש במפתח כלשהו שאינו נעול</string>
-  <string name="list_update_daily">יומי</string>
-  <string name="list_update_weekly">שבועי</string>
-  <string name="list_update_never">לעולם לא</string>
   <string name="hostpref_nickname_title">כינוי</string>
   <string name="hostpref_color_title">קטגוריית הצבע</string>
   <string name="hostpref_fontsize_title">גודל הגופן (נק׳)</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index d8d8988..a77179b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Sakrij statusnu liniju u konzoli</string>
   <string name="pref_memkeys_title">Zapamti ključeve u memoriji</string>
   <string name="pref_memkeys_summary">Čuvaj otključane ključeve u memoriji dok se ne zatvori pozadinski servis</string>
-  <string name="pref_update_title">Provjera nadogradnji</string>
-  <string name="pref_update_summary">Odredi učestalost za provjeru ConnectBot nadogradnji</string>
   <string name="pref_conn_persist_title">Održavaj konekcije</string>
   <string name="pref_conn_persist_summary">Prisili konekcije da ostanu spojene u pozadini</string>
   <string name="pref_keymode_title">Prečaci direktorija</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index f1c232d..c473d78 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Rejtett állapotsor a konzol használata során</string>
   <string name="pref_memkeys_title">Kulcsok megörzése a memóriában</string>
   <string name="pref_memkeys_summary">Tartsa nyitva a memóriában lévő kulcsokat amíg a háttérszolgáltatás meg nem szűnik</string>
-  <string name="pref_update_title">Frissítés ellenőrzése</string>
-  <string name="pref_update_summary">ConnectBot frissítés ellenőrzésének maximális gyakorisága</string>
   <string name="pref_conn_persist_title">Kapcsolatok fenntartása</string>
   <string name="pref_conn_persist_summary">A háttérben tartsa fenn a kapcsolatokat</string>
   <string name="pref_keymode_title">Könyvtár hivatkozások</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Tiltás</string>
   <string name="list_pubkeyids_none">Kulcsok használatának tiltása</string>
   <string name="list_pubkeyids_any">Bármely nyilvános kulcs használata</string>
-  <string name="list_update_daily">Naponta</string>
-  <string name="list_update_weekly">Hetente</string>
-  <string name="list_update_never">Soha</string>
   <string name="hostpref_nickname_title">Becenév</string>
   <string name="hostpref_color_title">Szín-kategória</string>
   <string name="hostpref_fontsize_title">Betűtipus mérete (pt)</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 3bd6a68..7e381c9 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -77,8 +77,6 @@
   <string name="pref_fullscreen_summary">Sembunyikan bar status ketika dalam konsol</string>
   <string name="pref_memkeys_title">Ingat kunci dalam memori</string>
   <string name="pref_memkeys_summary">Simpan kunci yang terbuka kedalam memori hingga layanan backend berakhir</string>
-  <string name="pref_update_title">Memeriksa pembaharuan</string>
-  <string name="pref_update_summary">Tentukan frekuensi maksimal untuk memeriksa pembaharuan pada ConnectBot</string>
   <string name="pref_conn_persist_title">Pertahankan koneksi</string>
   <string name="pref_conn_persist_summary">Paksa koneksi untuk tetap terhubung ketika bekerja di belakang layar</string>
   <string name="pref_keymode_title">Jalan pintas direktori</string>
@@ -102,9 +100,6 @@
   <string name="list_keymode_none">Tidak aktif</string>
   <string name="list_pubkeyids_none">Jangan gunakan kunci</string>
   <string name="list_pubkeyids_any">Gunakan kunci apapun yang tidak terkunci</string>
-  <string name="list_update_daily">Harian</string>
-  <string name="list_update_weekly">Mingguan</string>
-  <string name="list_update_never">Tidak pernah</string>
   <string name="hostpref_nickname_title">Nama panggilan</string>
   <string name="hostpref_color_title">Kategori warna</string>
   <string name="hostpref_fontsize_title">Ukuran huruf (pt)</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index abeaca0..a628f5b 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -73,8 +73,6 @@
   <string name="pref_fullscreen_summary">Fela stöðustiku þegar tenging er virk</string>
   <string name="pref_memkeys_title">Geyma lykla í minni</string>
   <string name="pref_memkeys_summary">Geyma ólæsta lykla í minni þangað til forritinu er lokað</string>
-  <string name="pref_update_title">Athuga með uppfærslu</string>
-  <string name="pref_update_summary">Velja hve oft ConnectBot leitar að uppfærslum</string>
   <string name="pref_conn_persist_title">Halda tengingum</string>
   <string name="pref_conn_persist_summary">Halda tengingum í gangi þegar þær eru í bakgrunni</string>
   <string name="pref_keymode_title">Orðabók</string>
@@ -97,9 +95,6 @@
   <string name="list_keymode_none">Afvirkja</string>
   <string name="list_pubkeyids_none">Ekki nota lykla</string>
   <string name="list_pubkeyids_any">Nota hvaða ólæsta lykil sem er</string>
-  <string name="list_update_daily">Daglega</string>
-  <string name="list_update_weekly">Vikulega</string>
-  <string name="list_update_never">Aldrei</string>
   <string name="hostpref_nickname_title">Gælunafn</string>
   <string name="hostpref_color_title">Lita flokk</string>
   <string name="hostpref_fontsize_title">Leturstærð (pt)</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0a95b01..43fa6ba 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Nascondi la barra di stato in console</string>
   <string name="pref_memkeys_title">Mantieni chiavi in memoria</string>
   <string name="pref_memkeys_summary">Mantiene le chiavi in memoria finché il servizio non viene terminato</string>
-  <string name="pref_update_title">Controlla aggiornamenti</string>
-  <string name="pref_update_summary">Imposta la frequenza massima per il controllo degli aggiornamenti</string>
   <string name="pref_conn_persist_title">Connessioni permanenti</string>
   <string name="pref_conn_persist_summary">Forza connessioni a rimanere collegate in sottofondo</string>
   <string name="pref_keymode_title">Scorciatoie directory</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Disabilita</string>
   <string name="list_pubkeyids_none">Non usare chiavi</string>
   <string name="list_pubkeyids_any">Usa qualsiasi chiave sbloccata</string>
-  <string name="list_update_daily">Ogni giorno</string>
-  <string name="list_update_weekly">Ogni settimana</string>
-  <string name="list_update_never">Mai</string>
   <string name="hostpref_nickname_title">Soprannome</string>
   <string name="hostpref_color_title">Categoria colore</string>
   <string name="hostpref_fontsize_title">Dimensione caratteri (pt)</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5edf28a..4ada41d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -76,8 +76,6 @@
   <string name="pref_fullscreen_summary">ステータスバーを隠蔽しコンソールとして利用</string>
   <string name="pref_memkeys_title">メモリに鍵を保持する</string>
   <string name="pref_memkeys_summary">バックエンドのサービスが終了しない限り、アンロックした鍵をメモリに保持します</string>
-  <string name="pref_update_title">更新を確認</string>
-  <string name="pref_update_summary">ConnectBotの更新をチェックする頻度を設定します</string>
   <string name="pref_conn_persist_title">持続的接続</string>
   <string name="pref_conn_persist_summary">バックグラウンドでの実行中に接続の持続を強制する</string>
   <string name="pref_keymode_title">ディレクトリのショートカット</string>
@@ -101,9 +99,6 @@
   <string name="list_keymode_none">無効</string>
   <string name="list_pubkeyids_none">公開鍵を使わない</string>
   <string name="list_pubkeyids_any">アンロックされた鍵のいずれかを使う</string>
-  <string name="list_update_daily">毎日</string>
-  <string name="list_update_weekly">毎週</string>
-  <string name="list_update_never">しない</string>
   <string name="hostpref_nickname_title">ニックネーム</string>
   <string name="hostpref_color_title">色の系統</string>
   <string name="hostpref_fontsize_title">フォントのサイズ (pt)</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9542d10..f62ffa0 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -73,8 +73,6 @@
   <string name="pref_fullscreen_summary">콘솔일 때 상태 표시줄을 숨김</string>
   <string name="pref_memkeys_title">메모리에 키를 기억</string>
   <string name="pref_memkeys_summary">백엔드 서비스가 종료되기 전까지 잠금이 풀린 키들을 메모리에 유지합니다</string>
-  <string name="pref_update_title">업데이트 검사</string>
-  <string name="pref_update_summary">ConnectBot 업데이트 확인 주기 설정</string>
   <string name="pref_conn_persist_title">접속 유지</string>
   <string name="pref_conn_persist_summary">백그라운드 동안에도 강제로 연결된 상태 유지</string>
   <string name="pref_keymode_title">디렉터리 바로 가기</string>
@@ -97,9 +95,6 @@
   <string name="list_keymode_none">사용 안 함</string>
   <string name="list_pubkeyids_none">키 사용 안함</string>
   <string name="list_pubkeyids_any">잠금키 사용</string>
-  <string name="list_update_daily">매일</string>
-  <string name="list_update_weekly">매주</string>
-  <string name="list_update_never">하지 않음</string>
   <string name="hostpref_nickname_title">닉네임</string>
   <string name="hostpref_color_title">색상 카테고리</string>
   <string name="hostpref_fontsize_title">글꼴 크기 (pt)</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 33c18c8..320d693 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -64,5 +64,4 @@
   <string name="pref_fullscreen_title">На цел екран</string>
   <string name="pref_fullscreen_summary">Сокриј ја статусната трака додека си во конзола</string>
   <string name="pref_memkeys_title">Запомни ги клучевите во меморија</string>
-  <string name="pref_update_title">Проверка на ажурирања</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 3a86729..6cc8d20 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Gjem statuslinje mens du er i konsoll</string>
   <string name="pref_memkeys_title">Lagre nøkler</string>
   <string name="pref_memkeys_summary">Husk opplåste nøkler helt til programmet avsluttes</string>
-  <string name="pref_update_title">Se etter oppdateringer</string>
-  <string name="pref_update_summary">Angi hyppigheten for å se etter oppdateringer til ConnectBot</string>
   <string name="pref_conn_persist_title">Oppretthold forbindelser</string>
   <string name="pref_conn_persist_summary">Oppretthold forbindelser selv når programmet kjører i bakgrunnen</string>
   <string name="pref_keymode_title">Hurtigtaster for mapper</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Deaktiver</string>
   <string name="list_pubkeyids_none">Ikke bruk nøkler</string>
   <string name="list_pubkeyids_any">Bruk en vilkårlig ulåst tast</string>
-  <string name="list_update_daily">Daglig</string>
-  <string name="list_update_weekly">Ukentlig</string>
-  <string name="list_update_never">Aldri</string>
   <string name="hostpref_nickname_title">Kallenavn</string>
   <string name="hostpref_color_title">Fargeinndeling</string>
   <string name="hostpref_fontsize_title">Skriftstørrelse (pt)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6339ac0..15e2827 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Verberg status balk terwijl in console</string>
   <string name="pref_memkeys_title">Onthoud sleutels in geheugen</string>
   <string name="pref_memkeys_summary">Houd ontgrendelde sleutels in geheugen tot achtergrond service is gestopt</string>
-  <string name="pref_update_title">Update controle</string>
-  <string name="pref_update_summary">Stel de maximale frequentie in om te controleren voor ConnectBot updates</string>
   <string name="pref_conn_persist_title">Behoud verbindingen</string>
   <string name="pref_conn_persist_summary">Forceer dat de verbindingen actief blijven op de achtergrond</string>
   <string name="pref_keymode_title">Folder snelkoppelingen</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Schakel uit</string>
   <string name="list_pubkeyids_none">Gebruik sleutels niet</string>
   <string name="list_pubkeyids_any">Gebruik een willekeurige ontgrendelde sleutel</string>
-  <string name="list_update_daily">Dagelijks</string>
-  <string name="list_update_weekly">Wekelijks</string>
-  <string name="list_update_never">Nooit</string>
   <string name="hostpref_nickname_title">Bijnaam</string>
   <string name="hostpref_color_title">Kleur catogorie</string>
   <string name="hostpref_fontsize_title">Lettergrootte</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 72c7df9..9dcad52 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -43,13 +43,9 @@
   <string name="alert_disconnect_msg">Connexion perduda</string>
   <string name="pref_ui_category">Interfàcia d\'utilizaire</string>
   <string name="pref_fullscreen_title">Ecran complet</string>
-  <string name="pref_update_title">Verificar las mesas a jorn</string>
   <string name="pref_conn_persist_title">Connexions persistentas</string>
   <string name="pref_keymode_title">Acorchis de navigacion</string>
   <string name="list_keymode_none">Desactivar</string>
-  <string name="list_update_daily">Cada jorn</string>
-  <string name="list_update_weekly">Cada setmana</string>
-  <string name="list_update_never">Pas jamai</string>
   <string name="hostpref_nickname_title">Escais</string>
   <string name="hostpref_encoding_title">Encodatge</string>
   <string name="hostpref_connection_category">Paramètre de connexion</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9e59d04..0dd77e7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Ukryj pasek statusu podczas pracy w konsoli</string>
   <string name="pref_memkeys_title">Zapamiętaj klucze w pamięci</string>
   <string name="pref_memkeys_summary">Trzymaj odblokowane klucze w pamięci dopóki usługa się nie rozłączy</string>
-  <string name="pref_update_title">Sprawdź aktualizacje</string>
-  <string name="pref_update_summary">Ustawienie częstości sprawdzania aktualizacji</string>
   <string name="pref_conn_persist_title">Utrzymuj połącznia</string>
   <string name="pref_conn_persist_summary">Wymuś utrzymanie połączeń, gdy aplikacja działa w tle</string>
   <string name="pref_keymode_title">Skróty klawiaturowe</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Wyłącz</string>
   <string name="list_pubkeyids_none">Nie używaj kluczy</string>
   <string name="list_pubkeyids_any">Użyj dowolnego odblokowanego klucza</string>
-  <string name="list_update_daily">Dziennie</string>
-  <string name="list_update_weekly">Tygodniowo</string>
-  <string name="list_update_never">Nigdy</string>
   <string name="hostpref_nickname_title">Nazwa skrócona</string>
   <string name="hostpref_color_title">Kolor kategorii</string>
   <string name="hostpref_fontsize_title">Rozmiar czcionki</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 491eb05..d0b745d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Ocultar a barra de estatus no modo terminal</string>
   <string name="pref_memkeys_title">Guardar as chaves em memória</string>
   <string name="pref_memkeys_summary">Manter chaves desbloqueadas na memória até que o serviço seja terminado</string>
-  <string name="pref_update_title">Procurar por atualizações</string>
-  <string name="pref_update_summary">Configurar frequencia para checar atualizações do ConnectBot</string>
   <string name="pref_conn_persist_title">Conexões persistentes</string>
   <string name="pref_conn_persist_summary">Forçar as conexões para que continuem conectadas mesmo em segundo plano</string>
   <string name="pref_keymode_title">Teclas de atalho</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Desabilitar</string>
   <string name="list_pubkeyids_none">Não usar chaves</string>
   <string name="list_pubkeyids_any">Usar qualquer chave pública</string>
-  <string name="list_update_daily">Diariamente</string>
-  <string name="list_update_weekly">Semanalmente</string>
-  <string name="list_update_never">Nunca</string>
   <string name="hostpref_nickname_title">Apelido</string>
   <string name="hostpref_color_title">Categoria de cor</string>
   <string name="hostpref_fontsize_title">Tamanho da fonte (pontos)</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c9a2081..8472cd6 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Esconder a barra de notificação quando estiver na consola</string>
   <string name="pref_memkeys_title">Lembrar chaves em memoria</string>
   <string name="pref_memkeys_summary">Manter chaves desbloqueadas em memória até ao serviço de fundo terminar</string>
-  <string name="pref_update_title">Verificar actualizações</string>
-  <string name="pref_update_summary">Definir a frequência máxima para verificar actualizações do ConnectBot</string>
   <string name="pref_conn_persist_title">Persistir ligações</string>
   <string name="pref_conn_persist_summary">Forçar ligações a ficarem ligadas quando em segundo plano</string>
   <string name="pref_keymode_title">Atalhos de directoria</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Desactivar</string>
   <string name="list_pubkeyids_none">Não usar teclas</string>
   <string name="list_pubkeyids_any">Usar qualquer tecla não bloqueada</string>
-  <string name="list_update_daily">Diariamente</string>
-  <string name="list_update_weekly">Semanalmente</string>
-  <string name="list_update_never">Nunca</string>
   <string name="hostpref_nickname_title">Alcunha</string>
   <string name="hostpref_color_title">Categoria de cor</string>
   <string name="hostpref_fontsize_title">Tamanho da fonte (pt)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6b6286a..cbcbe35 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Убирать область статуса во время работы с консолью</string>
   <string name="pref_memkeys_title">Запомнить ключи в памяти</string>
   <string name="pref_memkeys_summary">Держать ключи в памяти пока процессы работают</string>
-  <string name="pref_update_title">Проверка обновления</string>
-  <string name="pref_update_summary">Как часто проверять обновления для ConnectBot</string>
   <string name="pref_conn_persist_title">Постоянные соединения</string>
   <string name="pref_conn_persist_summary">Принудительно сохранять соединение в фоновом режиме.</string>
   <string name="pref_keymode_title">Ярлыки папок</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Отключить</string>
   <string name="list_pubkeyids_none">Не использовать ключи</string>
   <string name="list_pubkeyids_any">Использовать любую свободную клавишу</string>
-  <string name="list_update_daily">Ежедневно</string>
-  <string name="list_update_weekly">Еженедельно</string>
-  <string name="list_update_never">Никогда</string>
   <string name="hostpref_nickname_title">Псевдоним</string>
   <string name="hostpref_color_title">Цвет для категории</string>
   <string name="hostpref_fontsize_title">Размер шрифта</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index e107a36..944638c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Skryť stavový riadok, keď je zobrazená konzola</string>
   <string name="pref_memkeys_title">Zapamätať kľúče v pamäti</string>
   <string name="pref_memkeys_summary">Ponechať odomknuté kľúče v pamäti pokiaľ nie je ukončená služba na pozadí.</string>
-  <string name="pref_update_title">Kontrolovať aktualizácie</string>
-  <string name="pref_update_summary">Nastaviť maximálnu frekvenciu kontroly aktualizácií pre ConnectBot</string>
   <string name="pref_conn_persist_title">Perzistentné pripojenia</string>
   <string name="pref_conn_persist_summary">Vynútiť spojenie aj v pozadí</string>
   <string name="pref_keymode_title">Skratky adresárov</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Vypnúť</string>
   <string name="list_pubkeyids_none">Nepoužívať kľúče</string>
   <string name="list_pubkeyids_any">Použiť ktorýkoľvek odomknutý kľúč</string>
-  <string name="list_update_daily">Denne</string>
-  <string name="list_update_weekly">Týždenne</string>
-  <string name="list_update_never">Nikdy</string>
   <string name="hostpref_nickname_title">Prezývka</string>
   <string name="hostpref_color_title">Farebná kategória</string>
   <string name="hostpref_fontsize_title">Veľkosť písma (bodov)</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 649c473..bf1873f 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Skrij vrstico stanja, ko v konzoli</string>
   <string name="pref_memkeys_title">Zapomni ključe v spominu</string>
   <string name="pref_memkeys_summary">Hrani odklenjene ključe v spomnu dokler storitev v zaledju ni zaključena</string>
-  <string name="pref_update_title">Pregled posodobitev</string>
-  <string name="pref_update_summary">Nastavite največjo pogostost za preverjanje posodobitev za ConnectBota</string>
   <string name="pref_conn_persist_title">Obstojne povezave</string>
   <string name="pref_conn_persist_summary">Prisili povezave, da ostanejo povezane v ozadju</string>
   <string name="pref_keymode_title">Bližnjice mape</string>
@@ -101,9 +99,6 @@
   <string name="list_keymode_none">Onemogoči</string>
   <string name="list_pubkeyids_none">Ne uporabljaj ključev</string>
   <string name="list_pubkeyids_any">Uporabi kateregakoli odklenjenega ključa</string>
-  <string name="list_update_daily">Dnevno</string>
-  <string name="list_update_weekly">Tedensko</string>
-  <string name="list_update_never">Nikoli</string>
   <string name="hostpref_nickname_title">Vzdevek</string>
   <string name="hostpref_color_title">Barvna kategorija</string>
   <string name="hostpref_fontsize_title">Velikost pisave (pt)</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 42b9fa7..a6ff287 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Göm status medan konsol visas</string>
   <string name="pref_memkeys_title">Kom ihåg nycklar</string>
   <string name="pref_memkeys_summary">Behåll olåsta nycklar i minnet tills bakände-tjänst avslutas</string>
-  <string name="pref_update_title">Uppdateringskontroll</string>
-  <string name="pref_update_summary">Intervall för att söka efter ConnectBot-uppdateringar</string>
   <string name="pref_conn_persist_title">Kvarstående anslutningar</string>
   <string name="pref_conn_persist_summary">Tvinga anslutningar att fortsätta i bakgrunden</string>
   <string name="pref_keymode_title">Genvägar för katalog</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Avaktivera</string>
   <string name="list_pubkeyids_none">Använd inte knapparna</string>
   <string name="list_pubkeyids_any">Använd valfri olåst nyckel</string>
-  <string name="list_update_daily">Varje dag</string>
-  <string name="list_update_weekly">Varje vecka</string>
-  <string name="list_update_never">Aldrig</string>
   <string name="hostpref_nickname_title">Smeknamn</string>
   <string name="hostpref_color_title">Färgkategori</string>
   <string name="hostpref_fontsize_title">Teckenstorlek</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 91cc742..f49d800 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">Konsolda iken durum çubuğunu gizle</string>
   <string name="pref_memkeys_title">Anahtarları bellekte tut</string>
   <string name="pref_memkeys_summary">Kilidi açılmış anahtarları arkadaki hizmetler sonlanana kadar bellekte tut</string>
-  <string name="pref_update_title">Güncellemelere bak</string>
-  <string name="pref_update_summary">ConnectBot güncellemelerine bakmak için en fazla sıklığı ayarla</string>
   <string name="pref_conn_persist_title">Bağlantıları sürekli tut</string>
   <string name="pref_conn_persist_summary">Arkaplanda iken bağlantıları bağlı tutmaya zorla</string>
   <string name="pref_keymode_title">Dizin kısayolları</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">Devre Dışı Bırak</string>
   <string name="list_pubkeyids_none">Tuşları kullanma</string>
   <string name="list_pubkeyids_any">Herhangi bir tuşu kullan</string>
-  <string name="list_update_daily">Günlük</string>
-  <string name="list_update_weekly">Haftalık</string>
-  <string name="list_update_never">Asla</string>
   <string name="hostpref_nickname_title">Rumuz</string>
   <string name="hostpref_color_title">Renk kategorisi</string>
   <string name="hostpref_fontsize_title">Yazıtipi boyutu (pt)</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 42ec041..26a0914 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -79,8 +79,6 @@
   <string name="pref_fullscreen_summary">处于控制台时隐藏状态栏</string>
   <string name="pref_memkeys_title">在内存中记录密钥</string>
   <string name="pref_memkeys_summary">保留解锁的密匙于内存中直到后台服务停止</string>
-  <string name="pref_update_title">检查更新</string>
-  <string name="pref_update_summary">设置检查ConnectBot更新的最大频率</string>
   <string name="pref_conn_persist_title">保持联机</string>
   <string name="pref_conn_persist_summary">切换到后台时强制保持连接</string>
   <string name="pref_keymode_title">目录快捷方式</string>
@@ -104,9 +102,6 @@
   <string name="list_keymode_none">禁用</string>
   <string name="list_pubkeyids_none">不使用密匙</string>
   <string name="list_pubkeyids_any">使用解锁密匙</string>
-  <string name="list_update_daily">每天</string>
-  <string name="list_update_weekly">每周</string>
-  <string name="list_update_never">永不</string>
   <string name="hostpref_nickname_title">昵称</string>
   <string name="hostpref_color_title">颜色类型</string>
   <string name="hostpref_fontsize_title">字型大小 (pt)</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index bd79a68..91d18c8 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_desc">簡單、強大、開放原始碼的SSH用戶端</string>
-  <string name="service_desc">管理SSH連線及載入公鑰</string>
-  <string name="title_hosts_list">主機列表</string>
+  <string name="app_desc">簡單、強大、開放原始碼的SSH用戶端。</string>
+  <string name="service_desc">管理 SSH 連線及載入公鑰</string>
+  <string name="title_hosts_list">主機清單</string>
   <string name="title_pubkey_list">公鑰</string>
   <string name="title_port_forwards_list">連接埠轉址</string>
   <string name="title_host_editor">編輯主機資訊</string>
@@ -13,30 +13,30 @@
   <string name="menu_insert">新增主機</string>
   <string name="menu_delete">刪除主機</string>
   <string name="menu_preferences">設定</string>
-  <string name="help_intro">請在下面主題中選擇一個以查看更多內容。</string>
-  <string name="help_about">關於ConnectBot</string>
+  <string name="help_intro">請在下列選擇一個主題以查看更多內容。</string>
+  <string name="help_about">關於 ConnectBot</string>
   <string name="help_keyboard">鍵盤</string>
   <string name="pubkey_generate">產生</string>
   <string name="pubkey_import">匯入</string>
   <string name="pubkey_delete">刪除金鑰</string>
   <string name="pubkey_gather_entropy">正在收集用戶熵</string>
-  <string name="pubkey_touch_prompt">觸摸方框來收集隨機數：%1$d％完成</string>
+  <string name="pubkey_touch_prompt">觸摸此方框來收集隨機數：%1$d％完成</string>
   <string name="pubkey_touch_hint">由於金鑰產生的時候需要隨機資訊，請在下面的方框中隨意移動您的手指。</string>
-  <string name="pubkey_generating">正在產生金鑰對</string>
+  <string name="pubkey_generating">正在產生金鑰對...</string>
   <string name="pubkey_copy_private">複製私鑰</string>
   <string name="pubkey_copy_public">複製公鑰</string>
-  <string name="pubkey_list_empty">按「選單」鍵來建立\n或匯入金鑰對。</string>
+  <string name="pubkey_list_empty">按「選單」鍵來產生\n或匯入金鑰對。</string>
   <string name="pubkey_unknown_format">未知格式</string>
-  <string name="pubkey_change_password">更改密碼</string>
-  <string name="pubkey_list_pick">從/sdcard選擇</string>
-  <string name="pubkey_import_parse_problem">匯入私鑰的時候發生問題</string>
-  <string name="pubkey_unlock">未鎖定金鑰</string>
+  <string name="pubkey_change_password">變更密碼</string>
+  <string name="pubkey_list_pick">從 /sdcard 選擇</string>
+  <string name="pubkey_import_parse_problem">匯入私鑰時發生問題</string>
+  <string name="pubkey_unlock">解鎖金鑰</string>
   <string name="pubkey_failed_add">驗證失敗，錯誤的的金鑰密碼「%1$s」</string>
-  <string name="pubkey_memory_load">讀取到記憶體中</string>
-  <string name="pubkey_memory_unload">從記憶體中移除</string>
-  <string name="pubkey_load_on_start">在啟動的時候載入金鑰</string>
+  <string name="pubkey_memory_load">載入到記憶體中</string>
+  <string name="pubkey_memory_unload">從記憶體中卸載</string>
+  <string name="pubkey_load_on_start">啟動時載入金鑰</string>
   <string name="pubkey_confirm_use">使用前確認</string>
-  <string name="portforward_list_empty">按「選單」鍵來建立連接埠轉址</string>
+  <string name="portforward_list_empty">按「選單」鍵來產生\n連接埠轉址。</string>
   <string name="portforward_edit">編輯連接埠轉址</string>
   <string name="portforward_delete">刪除連接埠轉址</string>
   <string name="prompt_nickname">暱稱：</string>
@@ -47,12 +47,12 @@
   <string name="prompt_password">密碼：</string>
   <string name="prompt_again">(再輸入一遍密碼)</string>
   <string name="prompt_type">轉址類型：</string>
-  <string name="prompt_password_can_be_blank">注意：密碼可以為空</string>
-  <string name="prompt_bits">位數：</string>
+  <string name="prompt_password_can_be_blank">注意：密碼可以為空白</string>
+  <string name="prompt_bits">位元：</string>
   <string name="prompt_pubkey_password">公鑰「%1$s」的密碼</string>
-  <string name="prompt_allow_agent_to_use_key">允許遠端主機來\n使用金鑰 \'%1$s\'?</string>
-  <string name="host_verification_failure_warning_header">警告：遠端主機的鑑別已經變更！</string>
-  <string name="host_verification_failure_warning">可能某人正在做非善意的事情!\n可能有人正在側錄您的連線(中間攻擊法)\n但也許僅僅是主機金鑰已被變更，您確信如此?</string>
+  <string name="prompt_allow_agent_to_use_key">允許遠端主機\n使用金鑰 \'%1$s\'?</string>
+  <string name="host_verification_failure_warning_header">警告：遠端主機的識別已變更！</string>
+  <string name="host_verification_failure_warning">可能某人正在做非善意的事情!\n可能有人正在側錄您的連線(中間攻擊法)!\n但也許僅僅是主機金鑰已變更。</string>
   <string name="prompt_host_disconnected">主機已經中斷。\n是否關閉本次連線階段？</string>
   <string name="prompt_continue_connecting">是否要繼續連線？</string>
   <string name="host_authenticity_warning">主機「%1$s」的驗證無法建立</string>
@@ -60,37 +60,41 @@
   <string name="alert_passwords_do_not_match_msg">密碼不符！</string>
   <string name="alert_wrong_password_msg">錯誤的密碼！</string>
   <string name="alert_key_corrupted_msg">私鑰已經損壞！</string>
-  <string name="alert_sdcard_absent">沒有插入SD卡！</string>
+  <string name="alert_sdcard_absent">沒有插入 SD 卡！</string>
   <string name="button_add">新增</string>
   <string name="button_change">變更</string>
   <string name="button_generate">產生金鑰</string>
   <string name="button_resize">調整大小</string>
   <string name="alert_disconnect_msg">連線中斷</string>
-  <string name="msg_copyright">版權所有2007-2008 Kenny Root http://the-b.org/ , Jeffrey Sharkey http://jsharkey.org/</string>
+  <string name="msg_copyright">版權所有 2007-2008 Kenny Root http://the-b.org/ , Jeffrey Sharkey http://jsharkey.org/</string>
   <string name="pref_emulation_category">終端模擬器</string>
   <string name="pref_emulation_title">終端機類型</string>
-  <string name="pref_emulation_summary">設置使用PTY連接時的終端模式</string>
+  <string name="pref_emulation_summary">設置使用 PTY 連接時的終端模式</string>
   <string name="pref_scrollback_title">回溯記憶體大小</string>
   <string name="pref_scrollback_summary">在記憶體中為每個控制台保留的回溯緩衝大小</string>
   <string name="pref_ui_category">使用者介面</string>
   <string name="pref_rotation_title">螢幕旋轉模式</string>
-  <string name="pref_rotation_summary">當鍵盤視窗出現或隱藏時要如何改變螢幕顯示</string>
+  <string name="pref_rotation_summary">當鍵盤視窗出現或隱藏時要如何改變螢幕轉向</string>
   <string name="pref_fullscreen_title">全螢幕</string>
   <string name="pref_fullscreen_summary">當在控制台時隱藏狀態列</string>
+  <string name="pref_shiftfkeys_title">Shift+num 為功能鍵</string>
+  <string name="pref_shiftfkeys_summary">在硬體鍵盤上，shift 加數字鍵時傳送 F1-F10</string>
+  <string name="pref_ctrlfkeys_title">Ctrl+num 為功能鍵</string>
+  <string name="pref_ctrlfkeys_summary">在軟體鍵盤上，ctrl 加數字時傳送 F1-F10</string>
+  <string name="pref_volumefont_title">音量鍵更改字體大小</string>
+  <string name="pref_volumefont_summary">字體大小可以在每個主機設定內變更</string>
   <string name="pref_memkeys_title">將金鑰儲存在記憶體</string>
   <string name="pref_memkeys_summary">保持記憶體中的金鑰是解鎖狀態，直到背景服務結束</string>
-  <string name="pref_update_title">檢查更新</string>
-  <string name="pref_update_summary">將ConnectBot的檢查更新頻率設為最大</string>
   <string name="pref_conn_persist_title">保持連線</string>
   <string name="pref_conn_persist_summary">在背景執行時仍保持連線狀態</string>
   <string name="pref_keymode_title">快捷鍵</string>
-  <string name="pref_keymode_summary">選擇如何使用Alt來叫出\'/\'和用Shift呼叫Tab</string>
+  <string name="pref_keymode_summary">選擇如何使用 Alt 來叫出 \'/\' 和用 Shift 呼叫 Tab</string>
   <string name="pref_camera_title">照相快捷鍵</string>
   <string name="pref_camera_summary">選擇當照相按鈕按下時將要觸發的快捷鍵</string>
-  <string name="pref_keepalive_title">保持螢幕亮度</string>
-  <string name="pref_keepalive_summary">當在執行控制台時不關閉螢幕</string>
-  <string name="pref_wifilock_title">保持Wi-Fi連線</string>
-  <string name="pref_wifilock_summary">連線階段未結束前，避免Wi-Fi關閉</string>
+  <string name="pref_keepalive_title">保持螢幕喚醒</string>
+  <string name="pref_keepalive_summary">執行控制台時不關閉螢幕</string>
+  <string name="pref_wifilock_title">保持 Wi-Fi 連線</string>
+  <string name="pref_wifilock_summary">連線階段未結束前，避免 Wi-Fi 關閉</string>
   <string name="pref_bumpyarrows_title">觸覺方向鍵</string>
   <string name="pref_bumpyarrows_summary">當用軌跡球發出模擬方向鍵時振動; 對延遲連線特別有用</string>
   <string name="pref_bell_category">終端鈴聲</string>
@@ -103,25 +107,22 @@
   <string name="list_keymode_left">使用左側按鍵</string>
   <string name="list_keymode_none">停用</string>
   <string name="list_pubkeyids_none">不使用公鑰</string>
-  <string name="list_pubkeyids_any">使用解鎖金鑰</string>
-  <string name="list_update_daily">每天</string>
-  <string name="list_update_weekly">每週</string>
-  <string name="list_update_never">永不</string>
+  <string name="list_pubkeyids_any">使用任何解鎖金鑰</string>
   <string name="hostpref_nickname_title">暱稱</string>
   <string name="hostpref_color_title">顏色類型</string>
-  <string name="hostpref_fontsize_title">字型大小 (pt)</string>
+  <string name="hostpref_fontsize_title">字體大小 (pt)</string>
   <string name="hostpref_pubkeyid_title">使用公鑰驗證</string>
   <string name="hostpref_authagent_title">使用 SSH 認證</string>
   <string name="hostpref_postlogin_title">登入後自動執行</string>
   <string name="hostpref_postlogin_summary">每次驗證後在遠端伺服器上執行的命令</string>
   <string name="hostpref_compression_title">壓縮</string>
   <string name="hostpref_compression_summary">此選項對低速網路會有幫助</string>
-  <string name="hostpref_wantsession_title">開始Shell連線階段</string>
-  <string name="hostpref_wantsession_summary">僅僅連接埠轉址停用偏好設定</string>
+  <string name="hostpref_wantsession_title">開始 Shell 連線階段</string>
+  <string name="hostpref_wantsession_summary">停用本偏好設定來僅使用連接埠轉址</string>
   <string name="hostpref_stayconnected_title">保持連線</string>
   <string name="hostpref_stayconnected_summary">斷線後與主機重新連線</string>
-  <string name="hostpref_delkey_title">DEL鍵</string>
-  <string name="hostpref_delkey_summary">當DEL按下時觸發的按鍵</string>
+  <string name="hostpref_delkey_title">DEL 鍵</string>
+  <string name="hostpref_delkey_summary">當按下 DEL 時傳送按鍵碼</string>
   <string name="hostpref_encoding_title">編碼</string>
   <string name="hostpref_encoding_summary">主機的字元編碼</string>
   <string name="hostpref_connection_category">連線設定</string>
@@ -129,9 +130,9 @@
   <string name="hostpref_hostname_title">主機</string>
   <string name="hostpref_port_title">連接埠</string>
   <string name="bind_never">從未連線</string>
-  <string name="bind_minutes">已連接 %1$s 分鐘</string>
-  <string name="bind_hours">已連接 %1$s 小時</string>
-  <string name="bind_days">已連接 %1$s 天</string>
+  <string name="bind_minutes">%1$s 分鐘前連線</string>
+  <string name="bind_hours">%1$s 小時前連線</string>
+  <string name="bind_days">%1$s 天前連線</string>
   <string name="console_copy_done">複製 %1$d 位元組到剪貼簿</string>
   <string name="console_copy_start">滑動手指\n或使用軌跡球\n選擇要複製的區域</string>
   <string name="console_menu_close">關閉</string>
@@ -139,22 +140,22 @@
   <string name="console_menu_paste">貼上</string>
   <string name="console_menu_portforwards">連接埠轉址</string>
   <string name="console_menu_resize">字體大小</string>
-  <string name="console_menu_urlscan">URL掃描</string>
+  <string name="console_menu_urlscan">URL 掃描</string>
   <string name="button_yes">是</string>
   <string name="button_no">否</string>
   <string name="portforward_local">本機</string>
   <string name="portforward_remote">遠端</string>
-  <string name="portforward_dynamic">動態(SOCKS)</string>
+  <string name="portforward_dynamic">動態 (SOCKS)</string>
   <string name="portforward_pos">建立連接埠轉址</string>
   <string name="portforward_done">成功建立連接埠轉址</string>
-  <string name="portforward_problem">新增連接埠時發生問題，可能您使用1024以下的埠或是埠被佔用?</string>
+  <string name="portforward_problem">新增連接埠時發生問題，可能您正在使用 1024 以下的埠或是埠被佔用?</string>
   <string name="portforward_menu_add">新增連接埠轉址</string>
   <string name="hint_userhost">使用者名稱\@主機名稱</string>
-  <string name="list_format_error">使用%1$s格式</string>
+  <string name="list_format_error">使用 %1$s 格式</string>
   <string name="format_username">使用者名稱</string>
   <string name="format_hostname">主機名稱</string>
   <string name="format_port">連接埠</string>
-  <string name="list_menu_pubkeys">管理金鑰</string>
+  <string name="list_menu_pubkeys">管理公鑰</string>
   <string name="list_menu_sortcolor">按顏色排序</string>
   <string name="list_menu_sortname">按名字排序</string>
   <string name="list_menu_settings">設定</string>
@@ -174,13 +175,13 @@
   <string name="list_camera_none">無</string>
   <string name="list_delkey_backspace">退格</string>
   <string name="list_delkey_del">刪除</string>
-  <string name="delete_message">您確定要刪除 鑰 \'%1$s\'</string>
+  <string name="delete_message">您確定要刪除 \'%1$s\'</string>
   <string name="delete_pos">是，刪除</string>
   <string name="delete_neg">取消</string>
   <string name="wizard_agree">同意</string>
   <string name="wizard_next">下一步</string>
   <string name="wizard_back">返回</string>
-  <string name="terminal_no_hosts_connected">目前沒有已連接主機</string>
+  <string name="terminal_no_hosts_connected">目前沒有已連線主機</string>
   <string name="terminal_connecting">連接到 %1$s:%2$d，通過 %3$s</string>
   <string name="terminal_sucess">驗證主機 \'%1$s\' 金鑰： %2$s</string>
   <string name="terminal_failed">主機驗證失敗</string>
@@ -188,25 +189,25 @@
   <string name="terminal_using_c2s_algorithm">用戶端到伺服器算法：%1$s %2$s</string>
   <string name="terminal_using_algorithm">使用演算法：%1$s %2$s</string>
   <string name="terminal_auth">嘗試驗證</string>
-  <string name="terminal_auth_pass">嘗試 \'password\' 認證</string>
-  <string name="terminal_auth_pass_fail">認證方法 \'password\' 失敗</string>
-  <string name="terminal_auth_pubkey_any">嘗試 \'publickey\' 認證暨記憶體中任何公鑰</string>
+  <string name="terminal_auth_pass">嘗試 \'密碼\' 認證</string>
+  <string name="terminal_auth_pass_fail">認證方法 \'密碼\' 失敗</string>
+  <string name="terminal_auth_pubkey_any">嘗試 \'公鑰\' 認證暨記憶體中任何公鑰</string>
   <string name="terminal_auth_pubkey_invalid">所選擇的公鑰無法使用，請在主機編輯中嘗試重新選擇</string>
-  <string name="terminal_auth_pubkey_specific">嘗試 \'publickey\' 認證暨指定公鑰</string>
-  <string name="terminal_auth_pubkey_fail">認證方法 \'password\' 暨金鑰 \'%1$s\' 失敗</string>
-  <string name="terminal_auth_ki">嘗試 \'keyboard-interactive\' 認證</string>
+  <string name="terminal_auth_pubkey_specific">嘗試 \'公鑰\' 認證暨指定公鑰</string>
+  <string name="terminal_auth_pubkey_fail">認證方法 \'密碼\' 暨金鑰 \'%1$s\' 失敗</string>
+  <string name="terminal_auth_ki">正在嘗試 \'keyboard-interactive\' 認證</string>
   <string name="terminal_auth_ki_fail">認證方法 \'keyboard-interactive\' 失敗</string>
-  <string name="terminal_auth_fail">[您的主機不支援 \'password\' 或 \'keyboard-interactive\' 驗證機制。]</string>
-  <string name="terminal_no_session">因為主機的相關設置，不會啓動會話。</string>
+  <string name="terminal_auth_fail">[您的主機不支援 \'密碼\' 或 \'keyboard-interactive\' 驗證機制。]</string>
+  <string name="terminal_no_session">由於主機的相關設置，因此不會啓動連線階段。</string>
   <string name="terminal_enable_portfoward">啓用連接埠轉址：%1$s</string>
-  <string name="local_shell_unavailable">失敗！此手機本機Shell不可用。</string>
+  <string name="local_shell_unavailable">失敗！此手機 Shell 不可用。</string>
   <string name="notification_text">%1$s 需要您的注意。</string>
   <string name="no">否</string>
   <string name="with_confirmation">已確認過</string>
   <string name="yes">是</string>
-  <string name="exceptions_submit_message">ConnectBot在上次執行時出現異常。請回報給ConnectBot開發者?</string>
+  <string name="exceptions_submit_message">ConnectBot 在上次執行時出現異常。回報給 ConnectBot 開發者?</string>
   <string name="menu_colors_reset">重設</string>
-  <string name="app_is_running">ConnectBot執行中</string>
+  <string name="app_is_running">ConnectBot 執行中</string>
   <string name="color_red">紅</string>
   <string name="color_green">綠</string>
   <string name="color_blue">藍</string>
@@ -216,6 +217,6 @@
   <string name="image_description_connected">已連線。</string>
   <string name="image_description_key_is_locked">金鑰已鎖定。</string>
   <string name="image_description_toggle_control_character">切換控制字元</string>
-  <string name="image_description_send_escape_character">送出escape字元。</string>
+  <string name="image_description_send_escape_character">送出 Esc 字元。</string>
   <string name="image_description_show_keyboard">顯示鍵盤。</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index c9090ea..4721490 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -71,16 +71,16 @@
 		<item>gray</item>
 	</string-array>
 
-	<string-array name="list_update" translatable="false">
-		<item>@string/list_update_daily</item>
-		<item>@string/list_update_weekly</item>
-		<item>@string/list_update_never</item>
+	<string-array name="list_stickymodifiers" translatable="false">
+		<item>@string/no</item>
+		<item>@string/only_alt</item>
+		<item>@string/yes</item>
 	</string-array>
 
-	<string-array name="list_update_values" translatable="false">
-		<item>Daily</item>
-		<item>Weekly</item>
-		<item>Never</item>
+	<string-array name="list_stickymodifiers_values" translatable="false">
+		<item>no</item>
+		<item>alt</item>
+		<item>yes</item>
 	</string-array>
 
 	<string-array name="list_keymode" translatable="false">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4f2aa5..e634385 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -163,6 +163,9 @@
 	<!-- Summary for the full screen preference -->
 	<string name="pref_fullscreen_summary">"Hide status bar while in console"</string>
 
+	<!-- The category title for keyboard preferences -->
+	<string name="pref_keyboard_category">"Keyboard"</string>
+
 	<!-- Name for the shifted numbers are f-keys preference -->
 	<string name="pref_shiftfkeys_title">"Shift+num are F-keys"</string>
 	<!-- Summary for the shifted numbers are f-keys preference -->
@@ -183,11 +186,6 @@
 	<!-- Summary for the memorize keys preference -->
 	<string name="pref_memkeys_summary">"Keep unlocked keys in memory until backend service is terminated"</string>
 
-	<!-- Name for the update check preference -->
-	<string name="pref_update_title">"Update check"</string>
-	<!-- Summary for the update check preference -->
-	<string name="pref_update_summary">"Set the maximum frequency to check for ConnectBot updates"</string>
-
 	<!-- Name for the preference that forces the service to stay running in the background.-->
 	<string name="pref_conn_persist_title">"Persist connections"</string>
 	<!-- Summary for the preference that forces the service to stay running in the background. -->
@@ -198,6 +196,13 @@
 	<!-- Summary for the keyboard shortcuts preference -->
 	<string name="pref_keymode_summary">"Select how to use Alt for '/' and Shift for Tab"</string>
 
+	<!-- Name for the sticky modifiers preference -->
+	<string name="pref_stickymodifiers_title">"Sticky modifiers"</string>
+	<!-- Summary for the sticky modifiers preference -->
+	<string name="pref_stickymodifiers_summary">"Modifier keys remain enabled until another key is pressed"</string>
+
+	<string name="only_alt">"Only alt"</string>
+
 	<!-- Name for the camera shortcut usage preference -->
 	<string name="pref_camera_title">"Camera shortcut"</string>
 	<!-- Summary for the camera shortcut usage preference -->
@@ -247,13 +252,6 @@
 	<!-- Preference to use any pubkey to authenticate to this host. -->
 	<string name="list_pubkeyids_any">"Use any unlocked key"</string>
 
-	<!-- Frequency for which to check for program updates. -->
-	<string name="list_update_daily">"Daily"</string>
-	<!-- Frequency for which to check for program updates. -->
-	<string name="list_update_weekly">"Weekly"</string>
-	<!-- Frequency for which to check for program updates. -->
-	<string name="list_update_never">"Never"</string>
-
 	<!-- Host nickname field preference title -->
 	<string name="hostpref_nickname_title">"Nickname"</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6d64ce2..70bdb5b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -27,15 +27,6 @@
 		android:defaultValue="true"
 		/>
 
-	<ListPreference
-		android:key="update"
-		android:title="@string/pref_update_title"
-		android:summary="@string/pref_update_summary"
-		android:entries="@array/list_update"
-		android:entryValues="@array/list_update_values"
-		android:defaultValue="Daily"
-		/>
-
 	<CheckBoxPreference
 		android:key="connPersist"
 		android:title="@string/pref_conn_persist_title"
@@ -43,6 +34,13 @@
 		android:defaultValue="true"
 		/>
 
+	<CheckBoxPreference
+		android:key="wifilock"
+		android:title="@string/pref_wifilock_title"
+		android:summary="@string/pref_wifilock_summary"
+		android:defaultValue="true"
+		/>
+
 	<PreferenceCategory
 		android:title="@string/pref_emulation_category">
 
@@ -92,6 +90,24 @@
 			/>
 
 		<CheckBoxPreference
+			android:key="volumefont"
+			android:title="@string/pref_volumefont_title"
+			android:summary="@string/pref_volumefont_summary"
+			android:defaultValue="true"
+			/>
+
+		<CheckBoxPreference
+			android:key="keepalive"
+			android:title="@string/pref_keepalive_title"
+			android:summary="@string/pref_keepalive_summary"
+			android:defaultValue="true"
+			/>
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		android:title="@string/pref_keyboard_category">
+
+		<CheckBoxPreference
 			android:key="shiftfkeys"
 			android:title="@string/pref_shiftfkeys_title"
 			android:summary="@string/pref_shiftfkeys_summary"
@@ -105,11 +121,13 @@
 			android:defaultValue="false"
 			/>
 
-		<CheckBoxPreference
-			android:key="volumefont"
-			android:title="@string/pref_volumefont_title"
-			android:summary="@string/pref_volumefont_summary"
-			android:defaultValue="true"
+		<ListPreference
+			android:key="stickymodifiers"
+			android:title="@string/pref_stickymodifiers_title"
+			android:summary="@string/pref_stickymodifiers_summary"
+			android:entries="@array/list_stickymodifiers"
+			android:entryValues="@array/list_stickymodifiers_values"
+			android:defaultValue="no"
 			/>
 
 		<ListPreference
@@ -118,7 +136,7 @@
 			android:summary="@string/pref_keymode_summary"
 			android:entries="@array/list_keymode"
 			android:entryValues="@array/list_keymode_values"
-			android:defaultValue="Use right-side keys"
+			android:defaultValue="none"
 			/>
 
 		<ListPreference
@@ -131,20 +149,6 @@
 			/>
 
 		<CheckBoxPreference
-			android:key="keepalive"
-			android:title="@string/pref_keepalive_title"
-			android:summary="@string/pref_keepalive_summary"
-			android:defaultValue="true"
-			/>
-
-		<CheckBoxPreference
-			android:key="wifilock"
-			android:title="@string/pref_wifilock_title"
-			android:summary="@string/pref_wifilock_summary"
-			android:defaultValue="true"
-			/>
-
-		<CheckBoxPreference
 			android:key="bumpyarrows"
 			android:title="@string/pref_bumpyarrows_title"
 			android:summary="@string/pref_bumpyarrows_summary"