Merge remote-tracking branch 'upstream/master'

46 files changed, 1 insertions, 410 deletions

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index cf7e67c..46c1f19 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -6,12 +6,6 @@
   <string name="title_host_editor">Redigeer Gasheer</string>
   <string name="title_help">Hulp</string>
   <string name="title_colors">Kleure</string>
-  <string name="resolve_connect">Verbind</string>
-  <string name="menu_insert">Voeg Gasheer by</string>
-  <string name="menu_delete">Verwyder Gasheer</string>
-  <string name="menu_preferences">Voorkeure</string>
-  <string name="help_about">Aangaande ConnectBot</string>
-  <string name="help_keyboard">Sleutelbord</string>
   <string name="pubkey_generate">Genereer</string>
   <string name="pubkey_delete">Verwyder sleutel</string>
   <string name="pubkey_gather_entropy">Versamel Ewekansigheid</string>
@@ -37,5 +31,4 @@
   <string name="prompt_type">Tipe:</string>
   <string name="prompt_password_can_be_blank">Nota: wagwoord kan leeg gelos word</string>
   <string name="list_format_error">Use the format %1$s</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8a8e130..c1b8809 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -7,13 +7,7 @@
   <string name="title_host_editor">تعديل مخدم</string>
   <string name="title_help">مساعدة</string>
   <string name="title_colors">الألوان</string>
-  <string name="resolve_connect">اتصل</string>
-  <string name="menu_insert">اضافة مخدم</string>
-  <string name="menu_delete">حذف مخدم</string>
-  <string name="menu_preferences">التفضيلات</string>
   <string name="help_intro">الرجاء اختار من الاسفل من اجل معلومات اكثر عن هذا الموضوع</string>
-  <string name="help_about">حول البرنامج</string>
-  <string name="help_keyboard">لوحة المفاتيح</string>
   <string name="pubkey_generate">توليد</string>
   <string name="pubkey_delete">حذف المفتاح</string>
   <string name="pubkey_touch_hint">للتاكد من العشوائية خلال توليد المفتاح , حرك اصبعك بشكل عشوائي فوق المربع في الاسفل</string>
@@ -31,7 +25,6 @@
   <string name="list_format_error">Use the format %1$s</string>
   <string name="no">ﻻ</string>
   <string name="yes">نعم</string>
-  <string name="exceptions_submit_message">الظاهر بان البرنامج واجه مشكلة في اخر جلسة عمل. هل ترغب بارسال تقرير لمطورين البرنامج؟</string>
   <string name="menu_colors_reset">إعادة ضبط</string>
   <string name="app_is_running">البرنامج يعمل</string>
   <string name="color_red">أحمر</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 1646a69..fc4bffa 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -3,5 +3,4 @@
   <string name="pubkey_list_empty">Tap Menu to create\nor import key pairs.</string>
   <string name="portforward_list_empty">Tap Menu to create\nport forwards.</string>
   <string name="list_format_error">Use the format %1$s</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 097cb5e..9baeabd 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -7,12 +7,6 @@
   <string name="title_host_editor">Редактиране на хост</string>
   <string name="title_help">Помощ</string>
   <string name="title_colors">Цветове</string>
-  <string name="resolve_connect">Свързване</string>
-  <string name="menu_insert">Добавяне на хост</string>
-  <string name="menu_delete">Изтрий хост</string>
-  <string name="menu_preferences">Предпочитания</string>
-  <string name="help_about">Относно ConnectBot</string>
-  <string name="help_keyboard">Клавиатура</string>
   <string name="pubkey_generate">Генериране</string>
   <string name="pubkey_delete">Клавиш Delete</string>
   <string name="pubkey_copy_private">Копира частния ключ</string>
@@ -42,7 +36,6 @@
   <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>
@@ -54,5 +47,4 @@
   <string name="console_menu_portforwards">Пренасочване на портове</string>
   <string name="list_format_error">Use the format %1$s</string>
   <string name="list_host_disconnect">Прекъсване на връзката</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1d55856..c1c4735 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Ajuda</string>
   <string name="title_colors">Colors</string>
   <string name="title_color_picker">Trieu un color</string>
-  <string name="resolve_connect">Connecta</string>
-  <string name="resolve_entropy">Recull Entropia</string>
-  <string name="menu_insert">Afegeix servidor</string>
-  <string name="menu_delete">Elimina servidor</string>
-  <string name="menu_preferences">Preferències</string>
   <string name="help_intro">Si us plau, esculli un tema per a més informació en aquest assumpte en particular</string>
-  <string name="help_about">Sobre ConnectBot</string>
-  <string name="help_keyboard">Teclat</string>
   <string name="pubkey_generate">Genera</string>
   <string name="pubkey_delete">Elimina la clau</string>
   <string name="pubkey_gather_entropy">Recull Entropia</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">La targeta SD no es troba present!</string>
   <string name="button_add">Afegeix</string>
   <string name="button_change">Canvia</string>
-  <string name="button_generate">Genera clau</string>
   <string name="button_resize">Redimensiona</string>
   <string name="alert_disconnect_msg">Connexió perduda</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -138,9 +130,7 @@
   <string name="portforward_remote">Remot</string>
   <string name="portforward_dynamic">Dinàmic (SOCKS)</string>
   <string name="portforward_pos">Crea redireccionament de ports</string>
-  <string name="portforward_done">Redireccionament creat correctament</string>
   <string name="portforward_problem">Problemes creant el redireccionament de ports, potser s\'usen ports per sota del 1024 o el port és en ús actualment?</string>
-  <string name="hint_userhost">usuari\@servidor</string>
   <string name="list_format_error">Usa el format %1$s</string>
   <string name="format_username">Usuari</string>
   <string name="format_hostname">servidor</string>
@@ -192,7 +182,6 @@
   <string name="no">No</string>
   <string name="with_confirmation">Amb confirmació</string>
   <string name="yes">Sí</string>
-  <string name="exceptions_submit_message">Sembla que ConnectBot ha tingut un problema l\'últim cop que s\'ha iniciat. Enviar la informació de l\'error als desenvolupadors de ConnectBot?</string>
   <string name="menu_colors_reset">Reinicia</string>
   <string name="app_is_running">El ConnectBot està en marxa</string>
   <string name="color_red">vermell</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 42ee1f7..4a5cc9a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Upravit hostitele</string>
   <string name="title_help">Nápověda</string>
   <string name="title_colors">Barvy</string>
-  <string name="resolve_connect">Připojit</string>
-  <string name="resolve_entropy">Získat entropii</string>
-  <string name="menu_insert">Přidat hostitele</string>
-  <string name="menu_delete">Smazat hostitele</string>
-  <string name="menu_preferences">Nastavení</string>
   <string name="help_intro">Prosím, vyberte následující téma pro více informací na daný subjekt.</string>
-  <string name="help_about">O aplikaci ConnectBot</string>
-  <string name="help_keyboard">Klávesnice</string>
   <string name="pubkey_generate">Vygenerovat</string>
   <string name="pubkey_delete">Smazat klíč</string>
   <string name="pubkey_gather_entropy">Získávání entropie</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">Není vložena SD karta!</string>
   <string name="button_add">Přidat</string>
   <string name="button_change">Změnit</string>
-  <string name="button_generate">Generovat klíč</string>
   <string name="button_resize">Změnit velikost</string>
   <string name="alert_disconnect_msg">Spojení ztraceno</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -134,8 +126,6 @@
   <string name="portforward_remote">Vzdálený</string>
   <string name="portforward_dynamic">Dynamický (SOCKS)</string>
   <string name="portforward_pos">Vytvořit přesměrování portu</string>
-  <string name="portforward_done">Přesměrování portu úspěšně vytvořeno</string>
-  <string name="hint_userhost">user\@hostname</string>
   <string name="list_format_error">Použijte formát %1$s</string>
   <string name="format_username">uživatelské jméno</string>
   <string name="format_hostname">jméno hosta</string>
@@ -178,7 +168,6 @@
   <string name="no">Ne</string>
   <string name="with_confirmation">S potvrzením</string>
   <string name="yes">Ano</string>
-  <string name="exceptions_submit_message">Vypadá to že měl ConnectBot problém když naposledy běžel. Odeslat hlášení o chybě vývojářům ConnectBota?</string>
   <string name="menu_colors_reset">Obnovit</string>
   <string name="app_is_running">ConnectBot běží</string>
   <string name="color_red">červená</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 9163a54..5a7edc0 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Rediger vært</string>
   <string name="title_help">Hjælp</string>
   <string name="title_colors">Farver</string>
-  <string name="resolve_connect">Tilslut</string>
-  <string name="resolve_entropy">Indsamler entropi</string>
-  <string name="menu_insert">Tilføj vært</string>
-  <string name="menu_delete">Fjern vært</string>
-  <string name="menu_preferences">Egenskaber</string>
   <string name="help_intro">Vælg et emne nedenfor for yderligere information.</string>
-  <string name="help_about">Om ConnectBot</string>
-  <string name="help_keyboard">Tastatur</string>
   <string name="pubkey_generate">Opret</string>
   <string name="pubkey_delete">Slet nøgle</string>
   <string name="pubkey_gather_entropy">Indsamler entropi</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">SD-kort er ikke sat i!</string>
   <string name="button_add">Tilføj</string>
   <string name="button_change">Ændre</string>
-  <string name="button_generate">Opret nøgle</string>
   <string name="button_resize">Ændre størrelse</string>
   <string name="alert_disconnect_msg">Forbindelse tabt</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Fjern</string>
   <string name="portforward_dynamic">Dynamisk (SOCKS)</string>
   <string name="portforward_pos">Opret port-videresendelse</string>
-  <string name="portforward_done">Port-videresendelse oprettet</string>
   <string name="portforward_problem">Der opstod problemer ved oprettelsen af port-videresendelse. Måske bruger du en port lavere end 1025, eller en port som allerede er i brug.</string>
-  <string name="hint_userhost">brugernavn\@vært</string>
   <string name="list_format_error">Anvend formatet %1$s</string>
   <string name="format_username">brugernavn</string>
   <string name="format_hostname">værtsnavn</string>
@@ -190,7 +180,6 @@
   <string name="no">Nej</string>
   <string name="with_confirmation">Med godkendelse</string>
   <string name="yes">Ja</string>
-  <string name="exceptions_submit_message">ConnectBot havde tilsyneladende problemer sidste gang det blev brugt. Send fejlrapport til ConnectBot udviklerne?</string>
   <string name="menu_colors_reset">Nulstil</string>
   <string name="app_is_running">ConnectBot kører</string>
   <string name="color_red">rød</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 14ed4c7..0e027aa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Hilfe</string>
   <string name="title_colors">Farben</string>
   <string name="title_color_picker">Farbe wählen</string>
-  <string name="resolve_connect">Verbinden</string>
-  <string name="resolve_entropy">Sammle Entropie</string>
-  <string name="menu_insert">Host hinzufügen</string>
-  <string name="menu_delete">Host löschen</string>
-  <string name="menu_preferences">Einstellungen</string>
   <string name="help_intro">Für mehr Informationen wählen Sie eine Überschrift!</string>
-  <string name="help_about">Über ConnectBot</string>
-  <string name="help_keyboard">Tastatur</string>
   <string name="pubkey_generate">Erzeugen</string>
   <string name="pubkey_delete">Schlüssel löschen</string>
   <string name="pubkey_gather_entropy">Sammle Entropie</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">SD-Karte nicht eingesteckt!</string>
   <string name="button_add">Hinzufügen</string>
   <string name="button_change">Ändern</string>
-  <string name="button_generate">Schlüssel erzeugen</string>
   <string name="button_resize">Größe ändern</string>
   <string name="alert_disconnect_msg">Die Verbindung wurde getrennt.</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -138,9 +130,7 @@
   <string name="portforward_remote">Entfernt</string>
   <string name="portforward_dynamic">Dynamisch (SOCKS)</string>
   <string name="portforward_pos">Port-Weiterleitung anlegen</string>
-  <string name="portforward_done">Port-Weiterleitung angelegt.</string>
   <string name="portforward_problem">Konnte Port-Weiterleitung nicht anlegen. Verwenden Sie Ports kleiner als 1024, oder wird der Port bereits verwendet?</string>
-  <string name="hint_userhost">benutzer\@hostname</string>
   <string name="list_format_error">Benutze das Format %1$s</string>
   <string name="format_username">Benutzername</string>
   <string name="format_hostname">Hostname</string>
@@ -192,7 +182,6 @@
   <string name="no">Nein</string>
   <string name="with_confirmation">Mit Bestätigung</string>
   <string name="yes">Ja</string>
-  <string name="exceptions_submit_message">Scheinbar hatte ConnectBot Probleme bei der letzten Benutzung. Fehlermeldung an die ConnectBot übermitteln?</string>
   <string name="menu_colors_reset">Zurücksetzen</string>
   <string name="app_is_running">ConnectBot läuft</string>
   <string name="color_red">rot</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 5b0e837..13f66f5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2,5 +2,4 @@
 <resources>
   <string name="title_help">Βοήθεια</string>
   <string name="title_colors">Χρώματα</string>
-  <string name="resolve_connect">Σύνδεση</string>
 </resources>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index 534a588..c41a16c 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -6,5 +6,4 @@
   <string name="hostpref_color_title">Colour category</string>
   <string name="list_format_error">Use the format %1$s</string>
   <string name="list_menu_sortcolor">Sort by colour</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6ed169b..432357f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -11,14 +11,7 @@
   <string name="title_color_picker">Escoger un color</string>
   <string name="title_settings">Ajustes</string>
   <string name="title_pubkey_generate">Generar</string>
-  <string name="resolve_connect">Conectar</string>
-  <string name="resolve_entropy">Recolectar entropía</string>
-  <string name="menu_insert">Añadir equipo remoto</string>
-  <string name="menu_delete">Eliminar máquina</string>
-  <string name="menu_preferences">Configuración</string>
   <string name="help_intro">Por favor seleccione un tema a continuación para más información sobre una materia en particular.</string>
-  <string name="help_about">Acerca de ConnectBot</string>
-  <string name="help_keyboard">Teclado</string>
   <string name="terms_and_conditions">Términos y condiciones</string>
   <string name="keyboard_shortcuts">Atajos de teclado</string>
   <string name="increase_font_size">Aumentar el tamaño de letra</string>
@@ -70,7 +63,6 @@
   <string name="button_add">Añadir</string>
   <string name="button_cancel">Cancelar</string>
   <string name="button_change">Modificar</string>
-  <string name="button_generate">Generar clave</string>
   <string name="button_resize">Redimensionar</string>
   <string name="alert_disconnect_msg">Conexión perdida</string>
   <string name="msg_copyright">Todos los derechos reservados © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -158,9 +150,7 @@
   <string name="portforward_remote">Remoto</string>
   <string name="portforward_dynamic">Dinámicos (SOCKS)</string>
   <string name="portforward_pos">Crear reenvio de puerto</string>
-  <string name="portforward_done">Creacion satisfactoria del reenvio de puerto</string>
   <string name="portforward_problem">Problema al crear el puerto de reenvio, tal vez usted está usando puertos menores de 1024 o el puerto ya está siendo utilizado?</string>
-  <string name="hint_userhost">usuario\@equipo</string>
   <string name="list_format_error">Usar formato %1$s</string>
   <string name="format_username">Usuario</string>
   <string name="format_hostname">nombre del host</string>
@@ -216,7 +206,6 @@
   <string name="no">Denegar</string>
   <string name="with_confirmation">Con confirmación</string>
   <string name="yes">Sí</string>
-  <string name="exceptions_submit_message">Parece que ConnectBot tuvo un problema en su última ejecución. Enviar reporte de error a los desarrolladores de ConnectBot?</string>
   <string name="menu_colors_reset">Restablecer</string>
   <string name="app_is_running">ConnectBot está ejecutándose</string>
   <string name="color_red">rojo</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index edb4915..6104e7a 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Laguntza</string>
   <string name="title_colors">Koloreak</string>
   <string name="title_color_picker">Aukeratu kolorea</string>
-  <string name="resolve_connect">Konektatu</string>
-  <string name="resolve_entropy">Bildu entropia</string>
-  <string name="menu_insert">Gehitu ostalaria</string>
-  <string name="menu_delete">Ezabatu ostalaria</string>
-  <string name="menu_preferences">Hobespenak</string>
   <string name="help_intro">Mesedez, hautatu beheko gaietako bat informazio gehiago nahi izanez gero.</string>
-  <string name="help_about">ConnectBot-i buruz</string>
-  <string name="help_keyboard">Teklatua</string>
   <string name="terms_and_conditions">Baldintzak</string>
   <string name="keyboard_shortcuts">Laster-teklak</string>
   <string name="increase_font_size">Handiagotu letra-tamaina</string>
@@ -67,7 +60,6 @@
   <string name="alert_sdcard_absent">Ez da aurkitu SD txartelik!</string>
   <string name="button_add">Gehitu</string>
   <string name="button_change">Aldatu</string>
-  <string name="button_generate">Sortu gakoa</string>
   <string name="button_resize">Aldatu tamaina</string>
   <string name="alert_disconnect_msg">Konexioa galdu da</string>
   <string name="msg_copyright">Copyright-a © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -148,9 +140,7 @@
   <string name="portforward_remote">Urrunekoa</string>
   <string name="portforward_dynamic">Dinamikoa (SOCKS)</string>
   <string name="portforward_pos">Sortu ataka birbidalketa</string>
-  <string name="portforward_done">Ataka birbidalketa ongi sortu da</string>
   <string name="portforward_problem">Arazoa ataka birbidalketa sortzean, behar bada erabilitako ataka 1024 baino txikiagoa da edo dagoeneko erabiltzen den ataka bat da?</string>
-  <string name="hint_userhost">erabiltzailea\@ostalaria</string>
   <string name="list_format_error">Erabili %1$s formatua</string>
   <string name="format_username">erabiltzaile-izena</string>
   <string name="format_hostname">ostalaria</string>
@@ -205,7 +195,6 @@
   <string name="no">Ez</string>
   <string name="with_confirmation">Berrespenarekin</string>
   <string name="yes">Bai</string>
-  <string name="exceptions_submit_message">Dirudienez ConnectBot-ek arazo bat izan zuen azken exekuzioan. ConnectBot-en garatzaileei errore-txostena bidali?</string>
   <string name="menu_colors_reset">Berrezarri</string>
   <string name="app_is_running">ConnectBot martxan dago</string>
   <string name="color_red">gorria</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e67da3d..4ffd369 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Muokaa palvelinta</string>
   <string name="title_help">Ohje</string>
   <string name="title_colors">Värit</string>
-  <string name="resolve_connect">Yhdistä</string>
-  <string name="resolve_entropy">Satunnaisdatan keräys</string>
-  <string name="menu_insert">Lisää palvelin</string>
-  <string name="menu_delete">Poista palvelin</string>
-  <string name="menu_preferences">Asetukset</string>
   <string name="help_intro">Valitse alta aihe, josta haluat lisätietoja.</string>
-  <string name="help_about">Tietoja ConnectBotista</string>
-  <string name="help_keyboard">Näppäimistö</string>
   <string name="pubkey_generate">Luo</string>
   <string name="pubkey_delete">Poista avain</string>
   <string name="pubkey_gather_entropy">Kerätään satunnaisdataa</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">Laitteessa ei ole muistikorttia!</string>
   <string name="button_add">Lisää</string>
   <string name="button_change">Muokkaa</string>
-  <string name="button_generate">Luo avain</string>
   <string name="button_resize">Muuta kokoa</string>
   <string name="alert_disconnect_msg">Yhteys katkesi</string>
   <string name="msg_copyright">Tekijänoikeudet © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -135,9 +127,7 @@
   <string name="portforward_remote">Etä</string>
   <string name="portforward_dynamic">Dynaaminen (SOCKS)</string>
   <string name="portforward_pos">Luo porttiohjaus</string>
-  <string name="portforward_done">Porttiohjaus luotu onnistuneesti</string>
   <string name="portforward_problem">Ongelma luotaessa porttiohjausta. Ehkä käytät porttia joka on alle 1024 tai portti on jo käytössä?</string>
-  <string name="hint_userhost">tunnus\@palvelin</string>
   <string name="list_format_error">Käytä muotoa %1$s</string>
   <string name="format_username">käyttäjätunnus</string>
   <string name="format_hostname">palvelin</string>
@@ -189,7 +179,6 @@
   <string name="no">Ei</string>
   <string name="with_confirmation">Kysy varmistus</string>
   <string name="yes">Kyllä</string>
-  <string name="exceptions_submit_message">ConnectBotilla vaikutti olevan ongelmia kun sitä käytettiin edellisen kerran. Lähetetäänkö virheraportti ohjelman kehittäjille?</string>
   <string name="menu_colors_reset">Palauta</string>
   <string name="app_is_running">ConnectBot on käynnissä</string>
   <string name="color_red">punainen</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7acc678..1203926 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Aide</string>
   <string name="title_colors">Couleurs</string>
   <string name="title_color_picker">Choisissez une couleur</string>
-  <string name="resolve_connect">Connexion</string>
-  <string name="resolve_entropy">Générer de l\'entropie</string>
-  <string name="menu_insert">Ajouter un serveur</string>
-  <string name="menu_delete">Supprimer le serveur</string>
-  <string name="menu_preferences">Préférences</string>
   <string name="help_intro">Sélectionnez un sujet ci-dessous pour plus d\'informations.</string>
-  <string name="help_about">À propos de ConnectBot</string>
-  <string name="help_keyboard">Clavier</string>
   <string name="pubkey_generate">Générer</string>
   <string name="pubkey_delete">Supprimer la clé</string>
   <string name="pubkey_gather_entropy">Génération d\'entropie</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">Pas de carte SD dans le lecteur !</string>
   <string name="button_add">Ajouter</string>
   <string name="button_change">Changer</string>
-  <string name="button_generate">Générer une clé</string>
   <string name="button_resize">Retailler</string>
   <string name="alert_disconnect_msg">Connexion perdue</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -146,9 +138,7 @@
   <string name="portforward_remote">Distant</string>
   <string name="portforward_dynamic">Dynamique (SOCKS)</string>
   <string name="portforward_pos">Créer la redirection de port</string>
-  <string name="portforward_done">Redirection de port créée avec succès</string>
   <string name="portforward_problem">Problème de création de la redirection de port, peut-être utilisez-vous un port sous le 1024 ou un déjà utilisé ?</string>
-  <string name="hint_userhost">utilisateur\@serveur</string>
   <string name="list_format_error">Utilisez le format \"%1$s\"</string>
   <string name="format_username">utilisateur</string>
   <string name="format_hostname">nom d\'hôte</string>
@@ -200,7 +190,6 @@
   <string name="no">Non</string>
   <string name="with_confirmation">Après confirmation</string>
   <string name="yes">Oui</string>
-  <string name="exceptions_submit_message">Il semblerait que ConnectBot ait eu un problème lors de sa dernière utilisation. Voulez-vous envoyer un rapport d\'erreur aux développeurs de ConnectBot ?</string>
   <string name="menu_colors_reset">Réinitialiser</string>
   <string name="app_is_running">ConnectBot est en cours</string>
   <string name="color_red">rouge</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 8e3758d..6f6d803 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -7,14 +7,7 @@
   <string name="title_host_editor">Editar servidor</string>
   <string name="title_help">Axuda</string>
   <string name="title_colors">Cores</string>
-  <string name="resolve_connect">Conectar</string>
-  <string name="resolve_entropy">Xerar entropía</string>
-  <string name="menu_insert">Engadir un servidor</string>
-  <string name="menu_delete">Borrar servidor</string>
-  <string name="menu_preferences">Preferencias</string>
   <string name="help_intro">Seleccione un apartado dos seguintes para máis información dun tema particular</string>
-  <string name="help_about">Acerca de ConnectBot</string>
-  <string name="help_keyboard">Teclado</string>
   <string name="pubkey_generate">Xerar</string>
   <string name="pubkey_delete">Borrar a chave</string>
   <string name="pubkey_gather_entropy">Xerando Entropía</string>
@@ -55,7 +48,6 @@
   <string name="alert_sdcard_absent">¡A tarxeta SD non está inserida!</string>
   <string name="button_add">Engadir</string>
   <string name="button_change">Modificar</string>
-  <string name="button_generate">Xerar chave</string>
   <string name="button_resize">Redimensionar</string>
   <string name="alert_disconnect_msg">Conexión Perdida</string>
   <string name="msg_copyright">Todos os dereitos reservados © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -109,5 +101,4 @@
   <string name="console_menu_urlscan">Escanear URLs</string>
   <string name="portforward_remote">Remoto</string>
   <string name="list_format_error">Use the format %1$s</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index b40db2a..f56d309 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">עזרה</string>
   <string name="title_colors">צבעים</string>
   <string name="title_color_picker">בחירת צבע</string>
-  <string name="resolve_connect">התחברות</string>
-  <string name="resolve_entropy">נאסף גיבוב</string>
-  <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_keyboard">מקלדת</string>
   <string name="pubkey_generate">יצירה</string>
   <string name="pubkey_delete">מחיקת מפתח</string>
   <string name="pubkey_gather_entropy">נאסף גיבוב</string>
@@ -63,7 +56,6 @@
   <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>
@@ -137,9 +129,7 @@
   <string name="portforward_remote">מרוחק</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="hint_userhost">user\@hostname</string>
   <string name="list_format_error">יש להשתמש בצורה „%1$s“</string>
   <string name="format_username">username</string>
   <string name="format_hostname">hostname</string>
@@ -191,7 +181,6 @@
   <string name="no">לא</string>
   <string name="with_confirmation">עם אימות</string>
   <string name="yes">כן</string>
-  <string name="exceptions_submit_message">מתברר כי חלה תקלה ב־ConnectBot במהלך ההפעלה האחרונה. האם לשלוח את הדיווח למפתחים של ConnectBot?</string>
   <string name="menu_colors_reset">איפוס</string>
   <string name="app_is_running">ConnectBot פעיל</string>
   <string name="color_red">אדום</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 192bc0e..a81e9a1 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Uredi Računalo</string>
   <string name="title_help">Pomoć</string>
   <string name="title_colors">Boje</string>
-  <string name="resolve_connect">Spoji se</string>
-  <string name="resolve_entropy">Očitaj Entropiju</string>
-  <string name="menu_insert">Dodaj računalo</string>
-  <string name="menu_delete">Obriši računalo</string>
-  <string name="menu_preferences">Postavke</string>
   <string name="help_intro">Molim Vas za više informacija odaberite temu ispod.</string>
-  <string name="help_about">O ConnectBot-u</string>
-  <string name="help_keyboard">Tipkovnica</string>
   <string name="pubkey_generate">Stvori</string>
   <string name="pubkey_delete">Obriši ključ</string>
   <string name="pubkey_gather_entropy">Sakupljanje Entropije</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">SD kartica nije umetnuta!</string>
   <string name="button_add">Dodaj</string>
   <string name="button_change">Promijeni</string>
-  <string name="button_generate">Izradi ključ</string>
   <string name="button_resize">Promijeni veličinu</string>
   <string name="alert_disconnect_msg">Veza prekinuta</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d1c0f7c..dcdc4df 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Kiszolgáló szerkesztése</string>
   <string name="title_help">Súgó</string>
   <string name="title_colors">Színek</string>
-  <string name="resolve_connect">Csatlakozás</string>
-  <string name="resolve_entropy">Entrópia gyűjtés</string>
-  <string name="menu_insert">Kiszolgáló hozzáadása</string>
-  <string name="menu_delete">Kiszolgáló törlése</string>
-  <string name="menu_preferences">Beállítások</string>
   <string name="help_intro">Válaszon témakört az alábbiak közül egy adott téma részletes leírásához.</string>
-  <string name="help_about">A ConnectBot névjegye</string>
-  <string name="help_keyboard">Billentyűzet</string>
   <string name="pubkey_generate">Generálás</string>
   <string name="pubkey_delete">Kulcs törlése</string>
   <string name="pubkey_gather_entropy">Entrópia gyűjtés</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">Nincs SD kártya!</string>
   <string name="button_add">Hozzáadás</string>
   <string name="button_change">Módosítás</string>
-  <string name="button_generate">Kulcs generálása</string>
   <string name="button_resize">Átméretezés</string>
   <string name="alert_disconnect_msg">A kapcsolat megszakadt</string>
   <string name="msg_copyright">Minden jog fentartva © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Távoli</string>
   <string name="portforward_dynamic">Dinamikus (SOCKS)</string>
   <string name="portforward_pos">Port átirányítás létrehozása</string>
-  <string name="portforward_done">Sikeres port átirányítás</string>
   <string name="portforward_problem">Probléma a port átirányítás létrehozása során, 1024 alatti vagy már használatban lévő portot választott?</string>
-  <string name="hint_userhost">felhasználó\@gépnév</string>
   <string name="list_format_error">A %1$s formátum használata</string>
   <string name="format_username">felhasználónév</string>
   <string name="format_hostname">gépnév</string>
@@ -190,7 +180,6 @@
   <string name="no">Nem</string>
   <string name="with_confirmation">Csak beleegyezéssel</string>
   <string name="yes">Igen</string>
-  <string name="exceptions_submit_message">Úgy tűnik a ConnectBot a legutóbbi futtatáskor összeomlott. Elküldi a hibanaplót a ConnectBot fejleszőinek?</string>
   <string name="menu_colors_reset">Visszaállít</string>
   <string name="app_is_running">ConnectBot már fut</string>
   <string name="color_red">piros</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 3f65a82..ef14162 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_help">Bantuan</string>
   <string name="title_colors">Warna</string>
   <string name="title_color_picker">Pilih warna</string>
-  <string name="resolve_connect">Hubungi</string>
-  <string name="resolve_entropy">Kumpulkan entropy</string>
-  <string name="menu_insert">Tambahkan host</string>
-  <string name="menu_delete">Hapus Host</string>
-  <string name="menu_preferences">Kesukaan</string>
   <string name="help_intro">Silahkan pilih sebuah topik dibawah untuk informasi lebih lanjut di suatu subjek tertentu.</string>
-  <string name="help_about">Mengenai ConnectBot</string>
-  <string name="help_keyboard">Papan Ketik</string>
   <string name="pubkey_generate">Buat</string>
   <string name="pubkey_delete">Tombol Hapus</string>
   <string name="pubkey_gather_entropy">Kumpulkan Entropy</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">SD card belum dimasukan!</string>
   <string name="button_add">Tambahkan</string>
   <string name="button_change">Ubah</string>
-  <string name="button_generate">Buat Kunci</string>
   <string name="button_resize">Ubah ukuran</string>
   <string name="alert_disconnect_msg">Koneksi terputus</string>
   <string name="msg_copyright">Hak Cipta © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Remote</string>
   <string name="portforward_dynamic">Dinamis (SOCKS)</string>
   <string name="portforward_pos">Buat penerusan port</string>
-  <string name="portforward_done">Berhasil membuat penerusan port</string>
   <string name="portforward_problem">Masalah dalam membuat penerusan port, mungkin Anda menggunakan nomor port di bawah 1024 atau nomor port telah digunakan?</string>
-  <string name="hint_userhost">pengguna\@namahost</string>
   <string name="list_format_error">Gunakan bentuk \"%1$s\"</string>
   <string name="format_username">pengguna</string>
   <string name="format_hostname">namahost</string>
@@ -189,7 +179,6 @@
   <string name="no">Tidak</string>
   <string name="with_confirmation">Dengan konfirmasi</string>
   <string name="yes">Ya</string>
-  <string name="exceptions_submit_message">Sepertinya ConnectBot mengalami masalah saat berjalan sebelumnya. Kirim laporan galat ke para pengembang ConnectBot?</string>
   <string name="menu_colors_reset">Atur ulang</string>
   <string name="app_is_running">ConnectBot sedang berjalan</string>
   <string name="color_red">merah</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index f2f2b76..a85d187 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -7,14 +7,7 @@
   <string name="title_host_editor">Breyta þjónum</string>
   <string name="title_help">Hjálp</string>
   <string name="title_colors">Litir</string>
-  <string name="resolve_connect">Tengjast</string>
-  <string name="resolve_entropy">Safna bitum af handahófi</string>
-  <string name="menu_insert">Bæta við þjóni</string>
-  <string name="menu_delete">Eyða þjóni</string>
-  <string name="menu_preferences">Valmöguleikar</string>
   <string name="help_intro">Vinsamlegast veldu atriði hér að neðan til þess að fá nánari upplýsingar um það.</string>
-  <string name="help_about">Um ConnectBot</string>
-  <string name="help_keyboard">Lyklaborð</string>
   <string name="pubkey_generate">Búa til</string>
   <string name="pubkey_delete">Eyða lykli</string>
   <string name="pubkey_gather_entropy">Safna bitum af handahófi</string>
@@ -61,7 +54,6 @@
   <string name="alert_sdcard_absent">SD kort er ekki til staðar!</string>
   <string name="button_add">Bæta við</string>
   <string name="button_change">Breyta</string>
-  <string name="button_generate">Framkalla lykil</string>
   <string name="button_resize">Breyta stærð</string>
   <string name="alert_disconnect_msg">Tengingu tapað</string>
   <string name="msg_copyright">Allur réttur áskilinn © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -118,9 +110,7 @@
   <string name="button_no">Nei</string>
   <string name="portforward_dynamic">Breytilegt (SOCKS)</string>
   <string name="portforward_pos">Áframsenda port</string>
-  <string name="portforward_done">Áframsendi port farsællega</string>
   <string name="portforward_problem">Gat ekki áframsent portið, varstu að nota port minna en 1024? Eða er portið nú þegar áframsent?</string>
-  <string name="hint_userhost">notandi\@þjónn</string>
   <string name="format_username">notendanafn</string>
   <string name="format_hostname">þjónn</string>
   <string name="format_port">port</string>
@@ -157,7 +147,6 @@
   <string name="no">Nei</string>
   <string name="with_confirmation">Með staðfestingu</string>
   <string name="yes">Já</string>
-  <string name="exceptions_submit_message">Það lítur út fyrir að ConnectBot hafi verið í vandræðum síðast þegar það keyrði. Viltu senda villu greiningu á höfunda forritsins?</string>
   <string name="menu_colors_reset">Frumstilla</string>
   <string name="app_is_running">ConnectBot er í gangi</string>
   <string name="color_red">rauður</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 53824b7..3987cd6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Guida</string>
   <string name="title_colors">Colori</string>
   <string name="title_color_picker">Scelta colore</string>
-  <string name="resolve_connect">Connetti</string>
-  <string name="resolve_entropy">Raccolta disordinata</string>
-  <string name="menu_insert">Aggiungi connessione</string>
-  <string name="menu_delete">Elimina connessione</string>
-  <string name="menu_preferences">Preferenze</string>
   <string name="help_intro">Seleziona un argomento dalla lista per ottenere maggiori informazioni.</string>
-  <string name="help_about">Informazioni su ConnectBot</string>
-  <string name="help_keyboard">Tastiera</string>
   <string name="pubkey_generate">Genera</string>
   <string name="pubkey_delete">Elimina chiave</string>
   <string name="pubkey_gather_entropy">Raccolta entropia</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">Scheda SD non trovata!</string>
   <string name="button_add">Aggiungi</string>
   <string name="button_change">Modifica</string>
-  <string name="button_generate">Genera le chiavi</string>
   <string name="button_resize">Ridimensiona</string>
   <string name="alert_disconnect_msg">Connessione persa</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -138,9 +130,7 @@
   <string name="portforward_remote">Remota</string>
   <string name="portforward_dynamic">Dinamica (SOCKS)</string>
   <string name="portforward_pos">Crea inoltro porta</string>
-  <string name="portforward_done">Inoltro della porta impostato correttamente</string>
   <string name="portforward_problem">Problema configurando l\'inoltro della porta, forse si cerca di usare una porta più bassa di 1024 o la porta è già in uso?</string>
-  <string name="hint_userhost">utente\@host</string>
   <string name="list_format_error">Usa il formato %1$s</string>
   <string name="format_username">nome utente</string>
   <string name="format_hostname">nome host</string>
@@ -192,7 +182,6 @@
   <string name="no">No</string>
   <string name="with_confirmation">Richiedi conferma</string>
   <string name="yes">Sì</string>
-  <string name="exceptions_submit_message">Sembrerebbe che ConnectBot abbia avuto un problema durante l\'ultima esecuzione. Inviare una segnalazione d\'errore agli sviluppatori di ConnectBot?</string>
   <string name="menu_colors_reset">Reimposta</string>
   <string name="app_is_running">ConnectBot è in esecuzione</string>
   <string name="color_red">rosso</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2c2bdbb..212114b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -11,14 +11,7 @@
   <string name="title_color_picker">色の取得</string>
   <string name="title_settings">設定</string>
   <string name="title_pubkey_generate">生成</string>
-  <string name="resolve_connect">接続</string>
-  <string name="resolve_entropy">エントロピーの取得</string>
-  <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_keyboard">キーボード</string>
   <string name="terms_and_conditions">利用規約</string>
   <string name="keyboard_shortcuts">キーボードショートカット</string>
   <string name="increase_font_size">フォントサイズを大きくする</string>
@@ -70,7 +63,6 @@
   <string name="button_add">追加</string>
   <string name="button_cancel">キャンセル</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">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -158,9 +150,7 @@
   <string name="portforward_remote">リモート</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="hint_userhost">ユーザ\@ホスト名</string>
   <string name="list_format_error">%1$s 形式を使ってください</string>
   <string name="format_username">ユーザ名</string>
   <string name="format_hostname">ホスト名</string>
@@ -216,7 +206,6 @@
   <string name="no">いいえ</string>
   <string name="with_confirmation">確認が必要</string>
   <string name="yes">はい</string>
-  <string name="exceptions_submit_message">前回ConnectBot実行時に問題が発生したようです。ConnectBotの開発者にエラーレポートを送信しますか?</string>
   <string name="menu_colors_reset">リセット</string>
   <string name="app_is_running">ConnectBot起動中</string>
   <string name="color_red">赤</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index cc5b437..3745118 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -3,12 +3,6 @@
   <string name="title_host_editor">ჰოსტის შეცვლა</string>
   <string name="title_help">დახმარება</string>
   <string name="title_colors">ფერი</string>
-  <string name="resolve_connect">დაკავშირება</string>
-  <string name="menu_insert">ჰოსტის დამატება</string>
-  <string name="menu_delete">ჰოსტის წაშლა</string>
-  <string name="menu_preferences">პარამეტრები</string>
-  <string name="help_about">ConnectBot-ის შესახებ</string>
-  <string name="help_keyboard">კლავიატურა</string>
   <string name="pubkey_generate">გენერირება</string>
   <string name="pubkey_delete">გასაღების წაშლა</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 6305e9f..deda875 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -7,14 +7,7 @@
   <string name="title_host_editor">호스트 편집</string>
   <string name="title_help">도움말</string>
   <string name="title_colors">색상</string>
-  <string name="resolve_connect">접속</string>
-  <string name="resolve_entropy">엔트로피 수집</string>
-  <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_keyboard">키보드</string>
   <string name="pubkey_generate">생성</string>
   <string name="pubkey_delete">키 삭제</string>
   <string name="pubkey_gather_entropy">엔트로피 수집 중</string>
@@ -57,7 +50,6 @@
   <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="pref_emulation_category">터미널 에뮬레이션</string>
@@ -129,7 +121,6 @@
   <string name="portforward_remote">원격</string>
   <string name="portforward_dynamic">동적 (SOCKS)</string>
   <string name="portforward_pos">포트 포워딩 만들기</string>
-  <string name="portforward_done">포트 포워딩을 만드는 데 성공했습니다.</string>
   <string name="list_format_error">%1$s 형식을 사용</string>
   <string name="format_username">사용자 이름</string>
   <string name="format_hostname">호스트 이름</string>
@@ -168,7 +159,6 @@
   <string name="no">아니오</string>
   <string name="with_confirmation">확인 작업 수행</string>
   <string name="yes">예</string>
-  <string name="exceptions_submit_message">마지막으로 ConnectBot이 실행했을 때 문제가 있었던 것 같습니다. ConnectBot 개발자에 오류 보고서를 보내시겠습니까?</string>
   <string name="menu_colors_reset">초기화</string>
   <string name="app_is_running">ConnectBot 실행 중</string>
   <string name="color_red">빨간색</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 7b61c88..7458662 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -2,9 +2,7 @@
 <resources>
   <string name="title_help">Pagalba</string>
   <string name="title_colors">Spalvos</string>
-  <string name="resolve_connect">Prisijungti</string>
   <string name="pubkey_list_empty">Tap Menu to create\nor import key pairs.</string>
   <string name="portforward_list_empty">Tap Menu to create\nport forwards.</string>
   <string name="list_format_error">Use the format %1$s</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 5845f56..ac23408 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -2,5 +2,4 @@
 <resources>
   <string name="title_help">Pagalba</string>
   <string name="title_colors">Spalvos</string>
-  <string name="resolve_connect">Prisijungti</string>
 </resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index c6e0113..3116ab9 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -7,13 +7,7 @@
   <string name="title_host_editor">Промени хост</string>
   <string name="title_help">Помош</string>
   <string name="title_colors">Бои</string>
-  <string name="resolve_connect">Поврзи се</string>
-  <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_keyboard">Тастатура</string>
   <string name="pubkey_generate">Генерирај</string>
   <string name="pubkey_delete">Одстрани клуч</string>
   <string name="pubkey_generating">Се генерира пар на клучеви…</string>
@@ -53,7 +47,6 @@
   <string name="alert_sdcard_absent">СД картичката не е ставена!</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="pref_emulation_category">Емулација на терминал</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 78b3c49..8bb0566 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Rediger vert</string>
   <string name="title_help">Hjelp</string>
   <string name="title_colors">Farger</string>
-  <string name="resolve_connect">Koble til</string>
-  <string name="resolve_entropy">Samle entropi</string>
-  <string name="menu_insert">Legg til vert</string>
-  <string name="menu_delete">Slett vert</string>
-  <string name="menu_preferences">Innstillinger</string>
   <string name="help_intro">Velg en overskrift nedenfor for mer informasjon om et bestemt emne.</string>
-  <string name="help_about">Om ConnectBot</string>
-  <string name="help_keyboard">Tastatur</string>
   <string name="pubkey_generate">Generer</string>
   <string name="pubkey_delete">Slett nøkkel</string>
   <string name="pubkey_gather_entropy">Samler entropi</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">SD-kortet er ikke satt inn!</string>
   <string name="button_add">Legg til</string>
   <string name="button_change">Endre</string>
-  <string name="button_generate">Generer nøkkel</string>
   <string name="button_resize">Endre størrelse</string>
   <string name="alert_disconnect_msg">Mistet tilkobling</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Ekstern</string>
   <string name="portforward_dynamic">Dynamisk (SOCKS)</string>
   <string name="portforward_pos">Opprett portvideresending</string>
-  <string name="portforward_done">Vellykket oppretting av portvideresending</string>
   <string name="portforward_problem">Mislyktes å opprette portvideresending. Bruker du porter under 1024, eller er denne porten allerede tatt?</string>
-  <string name="hint_userhost">bruker\@vert</string>
   <string name="list_format_error">Use the format %1$s</string>
   <string name="format_username">brukernavn</string>
   <string name="format_hostname">vertsnavn</string>
@@ -190,7 +180,6 @@
   <string name="no">Nei</string>
   <string name="with_confirmation">Med bekreftelse</string>
   <string name="yes">Ja</string>
-  <string name="exceptions_submit_message">Det ser ut som ConnectBot hadde et problem forrige gang den kjørte. Vil du sende en feilrapport til utviklerne av ConnectBot?</string>
   <string name="menu_colors_reset">Tilbakestill</string>
   <string name="app_is_running">ConnectBot kjører</string>
   <string name="color_red">rød</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 251cdc0..cd54b08 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Host bewerken</string>
   <string name="title_help">Help</string>
   <string name="title_colors">Kleuren</string>
-  <string name="resolve_connect">Verbinden</string>
-  <string name="resolve_entropy">Verzamel Entropie</string>
-  <string name="menu_insert">Host Toevoegen</string>
-  <string name="menu_delete">Host verwijderen</string>
-  <string name="menu_preferences">Voorkeuren</string>
   <string name="help_intro">Selecteer hieronder een onderwerp voor meer informatie over een onderwerp.</string>
-  <string name="help_about">Over ConnectBot</string>
-  <string name="help_keyboard">Toetsenbord</string>
   <string name="pubkey_generate">Genereren</string>
   <string name="pubkey_delete">Sleutel verwijderen</string>
   <string name="pubkey_gather_entropy">Bezig met het verzamelen van Entropie</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">SD kaart niet aanwezig!</string>
   <string name="button_add">Voeg toe</string>
   <string name="button_change">Verander</string>
-  <string name="button_generate">Genereer sleutel</string>
   <string name="button_resize">Verander formaat</string>
   <string name="alert_disconnect_msg">Verbinding verloren</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Op afstand</string>
   <string name="portforward_dynamic">Dynamisch (SOCKS)</string>
   <string name="portforward_pos">Maak port forward</string>
-  <string name="portforward_done">Succesvol port forward gemaakt</string>
   <string name="portforward_problem">Probleem met het maken van een port forward, misschien gebruik je poort onder 1024 of is de poort al gebruikt?</string>
-  <string name="hint_userhost">gebruiker\@hostnaam</string>
   <string name="list_format_error">Gebruik het formaat %1$s</string>
   <string name="format_username">gebruiker</string>
   <string name="format_hostname">hostnaam</string>
@@ -190,7 +180,6 @@
   <string name="no">Nee</string>
   <string name="with_confirmation">Met toestemming</string>
   <string name="yes">Ja</string>
-  <string name="exceptions_submit_message">Het lijkt erop dat ConnectBot een probleem had de laatste keer dat het gebruikt werd. Wilt u een foutenrapport naar de ConnectBot ontwikkelaars sturen?</string>
   <string name="menu_colors_reset">Terug naar standaardinstellingen</string>
   <string name="app_is_running">ConnectBot werkt (Connecties zijn actief)</string>
   <string name="color_red">rood</string>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 4810c7e..c2c47df 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -6,14 +6,7 @@
   <string name="title_port_forwards_list">Redireccions de pòrts</string>
   <string name="title_host_editor">Modificar lo servidor</string>
   <string name="title_help">Ajuda</string>
-  <string name="resolve_connect">Connexion</string>
-  <string name="resolve_entropy">Generacion d\'aleatòri</string>
-  <string name="menu_insert">Apondre un servidor</string>
-  <string name="menu_delete">Supprimir lo servidor</string>
-  <string name="menu_preferences">Preferéncias</string>
   <string name="help_intro">Seleccionatz un subjècte çaijós per mai d\'entresenhas.</string>
-  <string name="help_about">A prepaus de ConnectBot</string>
-  <string name="help_keyboard">Clavièr</string>
   <string name="pubkey_generate">Generar</string>
   <string name="pubkey_delete">Suprimir la clau</string>
   <string name="pubkey_gather_entropy">Generacion d\'aleatòri</string>
@@ -37,7 +30,6 @@
   <string name="alert_wrong_password_msg">Marrit senhal</string>
   <string name="button_add">Apondre</string>
   <string name="button_change">Cambiar</string>
-  <string name="button_generate">Generar una clau</string>
   <string name="button_resize">Redimensionar</string>
   <string name="alert_disconnect_msg">Connexion perduda</string>
   <string name="pref_ui_category">Interfàcia d\'utilizaire</string>
@@ -74,7 +66,6 @@
   <string name="no">Non</string>
   <string name="with_confirmation">Aprèp confirmacion</string>
   <string name="yes">Òc</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
   <string name="menu_colors_reset">Reïnicializar</string>
   <string name="color_red">roge</string>
   <string name="color_green">verd</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e2e0c9d..7bf2d27 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Pomoc</string>
   <string name="title_colors">Kolory</string>
   <string name="title_color_picker">Wybór koloru</string>
-  <string name="resolve_connect">Połącz</string>
-  <string name="resolve_entropy">Zbierz dane losowe</string>
-  <string name="menu_insert">Dodaj host</string>
-  <string name="menu_delete">Usuń host</string>
-  <string name="menu_preferences">Ustawienia</string>
   <string name="help_intro">Proszę wybrać temat poniżej aby uzyskać więcej informacji na konkretny temat.</string>
-  <string name="help_about">O ConnectBot</string>
-  <string name="help_keyboard">Klawiatura</string>
   <string name="pubkey_generate">Wygeneruj</string>
   <string name="pubkey_delete">Usuń klucz</string>
   <string name="pubkey_gather_entropy">Zbieranie danych losowych</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">Brak karty SD</string>
   <string name="button_add">Dodaj</string>
   <string name="button_change">Zmień</string>
-  <string name="button_generate">Generuj klucz</string>
   <string name="button_resize">Zmień rozmiar</string>
   <string name="alert_disconnect_msg">Połączenie utracone</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -138,9 +130,7 @@
   <string name="portforward_remote">Zdalny</string>
   <string name="portforward_dynamic">Dynamiczny (SOCKS)</string>
   <string name="portforward_pos">Utwórz przekierowanie portu</string>
-  <string name="portforward_done">Pomyślnie utworzono przekierowanie portu</string>
   <string name="portforward_problem">Wystąpił problem podczas tworzenia przekierowania, być może użyłeś portu niższego niż 1024 lub port jest już używany?</string>
-  <string name="hint_userhost">użytkownik\@host</string>
   <string name="list_format_error">Proszę użyć formatu %1$s</string>
   <string name="format_username">Nazwa użytkownika</string>
   <string name="format_hostname">nazwa_hostu</string>
@@ -192,7 +182,6 @@
   <string name="no">Nie</string>
   <string name="with_confirmation">Z potwierdzeniem</string>
   <string name="yes">Tak</string>
-  <string name="exceptions_submit_message">ConnectBot miał prawdopodobnie problem podczas ostatniego uruchomienia. Wysłać raport o błędzie?</string>
   <string name="menu_colors_reset">Przywróć</string>
   <string name="app_is_running">ConnectBot jest uruchomiony</string>
   <string name="color_red">czerwony</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ae2477f..e078dff 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Ajuda</string>
   <string name="title_colors">Cores</string>
   <string name="title_color_picker">Escolha a cor</string>
-  <string name="resolve_connect">Conectar</string>
-  <string name="resolve_entropy">Sensibilidade</string>
-  <string name="menu_insert">Adicionar Host</string>
-  <string name="menu_delete">Apagar host</string>
-  <string name="menu_preferences">Preferências</string>
   <string name="help_intro">Escolha um dos tópicos abaixo para maiores informações</string>
-  <string name="help_about">Sobre o ConnectBot</string>
-  <string name="help_keyboard">Teclado</string>
   <string name="pubkey_generate">Gerar</string>
   <string name="pubkey_delete">Apagar chave</string>
   <string name="pubkey_gather_entropy">Ajustando sensibilidade</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">O cartão SD não está inserido!</string>
   <string name="button_add">Adicionar</string>
   <string name="button_change">Alterar</string>
-  <string name="button_generate">Gerar chave</string>
   <string name="button_resize">Redimensionar</string>
   <string name="alert_disconnect_msg">Conexão perdida</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -138,9 +130,7 @@
   <string name="portforward_remote">Remoto</string>
   <string name="portforward_dynamic">Dinâmico (SOCKS)</string>
   <string name="portforward_pos">Criar encaminhamento de porta</string>
-  <string name="portforward_done">Encaminhamento de porta criado com sucesso</string>
   <string name="portforward_problem">Problema na criação do redirecionamento de portas, talvez você esteja usando portas menores que 1024 ou a porta já esteja sendo usada.</string>
-  <string name="hint_userhost">usuario\@nome_do_host</string>
   <string name="list_format_error">Use o formato %1$s</string>
   <string name="format_username">usuário</string>
   <string name="format_hostname">nome do host</string>
@@ -192,7 +182,6 @@
   <string name="no">Não</string>
   <string name="with_confirmation">Com confirmação</string>
   <string name="yes">Sim</string>
-  <string name="exceptions_submit_message">Aparentemente o ConnectBot teve um problema na última execução. Deseja enviar relatório de erro aos desenvolvedores do aplicativo?</string>
   <string name="menu_colors_reset">Reiniciar</string>
   <string name="app_is_running">ConnectBot está executando</string>
   <string name="color_red">vermelho</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d8c0c91..e180fd2 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Editar a Máquina</string>
   <string name="title_help">Ajuda</string>
   <string name="title_colors">Cores</string>
-  <string name="resolve_connect">Ligar</string>
-  <string name="resolve_entropy">Gerar Entropia</string>
-  <string name="menu_insert">Adicionar uma Máquina</string>
-  <string name="menu_delete">Eliminar anfitrião</string>
-  <string name="menu_preferences">Preferências</string>
   <string name="help_intro">Selecione um tópico para mais informações sobre o assunto.</string>
-  <string name="help_about">Sobre ConnectBot</string>
-  <string name="help_keyboard">Teclado</string>
   <string name="pubkey_generate">Gerar</string>
   <string name="pubkey_delete">Apagar a chave</string>
   <string name="pubkey_gather_entropy">Recolhendo entropia</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">Cartão SD não parece estar inserido!</string>
   <string name="button_add">Adicionar</string>
   <string name="button_change">Alterar</string>
-  <string name="button_generate">Gerar Chave</string>
   <string name="button_resize">Redimensionar</string>
   <string name="alert_disconnect_msg">Ligação Perdida</string>
   <string name="msg_copyright">Direitos de Autor © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Remoto</string>
   <string name="portforward_dynamic">Dinamico (SOCKS)</string>
   <string name="portforward_pos">Criar redirecionamento de portas</string>
-  <string name="portforward_done">Redirecionamento de porta criado com sucesso</string>
   <string name="portforward_problem">Problema ao criar redirecionamento de porta, talvez esteja a usar portas abaixo de 1024 ou a porta já esteja em uso?</string>
-  <string name="hint_userhost">utilizador\@servidor</string>
   <string name="list_format_error">Use o formato %1$s</string>
   <string name="format_username">nome do utilizador</string>
   <string name="format_hostname">endereço</string>
@@ -190,7 +180,6 @@
   <string name="no">Não</string>
   <string name="with_confirmation">com confirmação</string>
   <string name="yes">Sim</string>
-  <string name="exceptions_submit_message">Aparentemente o ConnectBot teve um problema na ultima vez que foi executado. Enviar relatório de erros para os programadores do ConnectBot?</string>
   <string name="menu_colors_reset">Limpar</string>
   <string name="app_is_running">O ConnectBot esta a ser executado</string>
   <string name="color_red">vermelho</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 1d23677..61c499f 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Editare gazdă</string>
   <string name="title_help">Ajutor</string>
   <string name="title_colors">Culori</string>
-  <string name="resolve_connect">Conectează-te</string>
-  <string name="resolve_entropy">Genereaza sursă entropie</string>
-  <string name="menu_insert">Adaugă gazdă</string>
-  <string name="menu_delete">Sterge gazdă</string>
-  <string name="menu_preferences">Setări</string>
   <string name="help_intro">Selecteaza un subiect pentru a accesa mai multe informatii</string>
-  <string name="help_about">Despre ConnectBot</string>
-  <string name="help_keyboard">Tastatură</string>
   <string name="pubkey_generate">Generează</string>
   <string name="pubkey_delete">Șterge cheia</string>
   <string name="pubkey_gather_entropy">Genereaza sursa entropie</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1b14ad7..3630d4f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Изменить сервер</string>
   <string name="title_help">Помощь</string>
   <string name="title_colors">Настройка цветов</string>
-  <string name="resolve_connect">Подключиться</string>
-  <string name="resolve_entropy">Сбор случайных данных</string>
-  <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_keyboard">Клавиатура</string>
   <string name="pubkey_generate">Генерировать</string>
   <string name="pubkey_delete">Удалить ключ</string>
   <string name="pubkey_gather_entropy">Сбор случайной информации</string>
@@ -62,7 +55,6 @@
   <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">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -139,9 +131,7 @@
   <string name="portforward_remote">Удалённый</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="hint_userhost">пользователь\@имяхоста</string>
   <string name="list_format_error">Используйте формат %1$s</string>
   <string name="format_username">имя пользователя</string>
   <string name="format_hostname">имяхоста</string>
@@ -193,7 +183,6 @@
   <string name="no">Нет</string>
   <string name="with_confirmation">С подтверждением</string>
   <string name="yes">Да</string>
-  <string name="exceptions_submit_message">Возможно, при последнем запуске программы возникла проблема. Отправить разработчикам отчет об ошибке?</string>
   <string name="menu_colors_reset">Сбросить</string>
   <string name="app_is_running">ConnectBot запущен</string>
   <string name="color_red">красный</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index dd321d1..dab8d82 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Upraviť Hostiteľa</string>
   <string name="title_help">Nápoveda</string>
   <string name="title_colors">Farby</string>
-  <string name="resolve_connect">Pripojiť</string>
-  <string name="resolve_entropy">Získať entropiu</string>
-  <string name="menu_insert">Pridať hostiteľa</string>
-  <string name="menu_delete">Zmazať hostiteľa</string>
-  <string name="menu_preferences">Nastavenia</string>
   <string name="help_intro">Prosím, vyberte si tému pre viac informácií o danom subjekte.</string>
-  <string name="help_about">O programe ConnectBot</string>
-  <string name="help_keyboard">Klávesnica</string>
   <string name="pubkey_generate">Vygenerovať</string>
   <string name="pubkey_delete">Zmazať kľúč</string>
   <string name="pubkey_gather_entropy">Získavanie entropie</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">Nie je vložená SD karta!</string>
   <string name="button_add">Pridať</string>
   <string name="button_change">Zmeniť</string>
-  <string name="button_generate">Vygenerovať kľúč</string>
   <string name="button_resize">Zmeniť veľkosť</string>
   <string name="alert_disconnect_msg">Spojenie stratené</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Vzdialený</string>
   <string name="portforward_dynamic">Dynamický (SOCKS)</string>
   <string name="portforward_pos">Vytvoriť presmerovanie portu</string>
-  <string name="portforward_done">Premerovanie portu úspešne vytvorené</string>
   <string name="portforward_problem">Problém s vytvorením presmerovania portu, možno používate port menší ako 1024 alebo je už obsadený?</string>
-  <string name="hint_userhost">používateľské_meno\@hostiteľ</string>
   <string name="list_format_error">Použite formát \"%1$s\"</string>
   <string name="format_username">užívateľské meno</string>
   <string name="format_hostname">meno hostiteľa</string>
@@ -190,7 +180,6 @@
   <string name="no">Nie</string>
   <string name="with_confirmation">S potvrdením</string>
   <string name="yes">Áno</string>
-  <string name="exceptions_submit_message">Ostatné spustenie ConnectBot asi skončilo chybou. Zaslať chýbovú správu vývojárom ConnectBot?</string>
   <string name="menu_colors_reset">Pôvodné</string>
   <string name="app_is_running">ConnectBot je spustený</string>
   <string name="color_red">červená</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index b8eb7ea..e4a4c3b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Urejanje gostitelja</string>
   <string name="title_help">Pomoč</string>
   <string name="title_colors">Barve</string>
-  <string name="resolve_connect">Poveži</string>
-  <string name="resolve_entropy">Zberi entropijo</string>
-  <string name="menu_insert">Dodaj gostitelja</string>
-  <string name="menu_delete">Odstrani gostitelja</string>
-  <string name="menu_preferences">Možnosti</string>
   <string name="help_intro">Izberite temo spodaj za več informacij o določeni zadevi.</string>
-  <string name="help_about">O ConnectBotu</string>
-  <string name="help_keyboard">Tipkovnica</string>
   <string name="pubkey_generate">Ustvari</string>
   <string name="pubkey_delete">Izbriši ključ</string>
   <string name="pubkey_gather_entropy">Zbiranje entropije</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">Kartica SD ni vstavljena!</string>
   <string name="button_add">Dodaj</string>
   <string name="button_change">Spremeni</string>
-  <string name="button_generate">Ustvari ključ</string>
   <string name="button_resize">Spremeni velikost</string>
   <string name="alert_disconnect_msg">Povezava prekinjena</string>
   <string name="msg_copyright">Avtorske pravice © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -126,8 +118,6 @@
   <string name="portforward_local">Krajevno</string>
   <string name="portforward_remote">Oddaljeno</string>
   <string name="portforward_pos">Ustvari posredovanje vrat</string>
-  <string name="portforward_done">Uspešno ustvarjeno posredovanje vrat</string>
-  <string name="hint_userhost">uporabnik\@gostitelj</string>
   <string name="list_format_error">Uporabi vrsto %1$s</string>
   <string name="format_username">Uporabniško ime</string>
   <string name="format_hostname">ime gostitelja</string>
@@ -170,7 +160,6 @@
   <string name="no">Ne</string>
   <string name="with_confirmation">S potrditvijo</string>
   <string name="yes">Da</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
   <string name="menu_colors_reset">Ponastavi</string>
   <string name="app_is_running">ConnectBot je dejaven</string>
   <string name="color_red">rdeča</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 2504470..794c045 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Помоћ</string>
   <string name="title_colors">Боје</string>
   <string name="title_color_picker">Изаберите боју</string>
-  <string name="resolve_connect">Повежи</string>
-  <string name="resolve_entropy">Сакупи ентропију</string>
-  <string name="menu_insert">Додај домаћина</string>
-  <string name="menu_delete">Обриши домаћина</string>
-  <string name="menu_preferences">Поставке</string>
   <string name="help_intro">Изаберите тему испод за више информација о поједином предмету.</string>
-  <string name="help_about">О Конектботу</string>
-  <string name="help_keyboard">Тастатура</string>
   <string name="pubkey_generate">Генериши</string>
   <string name="pubkey_delete">Обриши кључ</string>
   <string name="pubkey_gather_entropy">Сакупљам ентропију</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">СД картица није уметнута!</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>
@@ -151,9 +143,7 @@
   <string name="portforward_remote">удаљени</string>
   <string name="portforward_dynamic">динамички (СОЦКС)</string>
   <string name="portforward_pos">Направи прослеђење порта</string>
-  <string name="portforward_done">Успешно направљено прослеђење порта</string>
   <string name="portforward_problem">Појавио се проблем при прављењу прослеђења порта. Можда користите портове испод 1024 или је порт већ у употреби?</string>
-  <string name="hint_userhost">korisnik\@domacin</string>
   <string name="list_format_error">Користи формат „%1$s“</string>
   <string name="format_username">korisnik</string>
   <string name="format_hostname">domacin</string>
@@ -206,7 +196,6 @@
   <string name="no">Не</string>
   <string name="with_confirmation">Тражи потврду</string>
   <string name="yes">Да</string>
-  <string name="exceptions_submit_message">"Чини се да је Конектбот имао проблем последњи пут кад је покренут.  Да пошаљем извештај о грешци програмерима?"</string>
   <string name="menu_colors_reset">Ресетуј</string>
   <string name="app_is_running">Конектбот је покренут</string>
   <string name="color_red">црвена</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d68673d..42af76e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -8,14 +8,7 @@
   <string name="title_host_editor">Redigera värddator</string>
   <string name="title_help">Hjälp</string>
   <string name="title_colors">Färger</string>
-  <string name="resolve_connect">Anslut</string>
-  <string name="resolve_entropy">Samla in entropi</string>
-  <string name="menu_insert">Lägg till värd</string>
-  <string name="menu_delete">Ta bort värd</string>
-  <string name="menu_preferences">Inställningar</string>
   <string name="help_intro">Var god välj ett ämne nedan som du skulle vilja ha mer information om.</string>
-  <string name="help_about">Om ConnectBot</string>
-  <string name="help_keyboard">Tangentbord</string>
   <string name="pubkey_generate">Generera</string>
   <string name="pubkey_delete">Ta bort nyckel</string>
   <string name="pubkey_gather_entropy">Samlar in entropi</string>
@@ -62,7 +55,6 @@
   <string name="alert_sdcard_absent">SD-kort ej isatt!</string>
   <string name="button_add">Lägg till</string>
   <string name="button_change">Ändra</string>
-  <string name="button_generate">Generera nyckel</string>
   <string name="button_resize">Ändra storlek</string>
   <string name="alert_disconnect_msg">Anslutningen förlorad</string>
   <string name="msg_copyright">Copyright © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -136,9 +128,7 @@
   <string name="portforward_remote">Fjärr</string>
   <string name="portforward_dynamic">Dynamisk (SOCKS)</string>
   <string name="portforward_pos">Skapa vidarebefodring av port</string>
-  <string name="portforward_done">Vidarebefodring av port skapad.</string>
   <string name="portforward_problem">Lyckades inte att skapa en vidarebefodring av port, är den under 1024 eller används den kanske?</string>
-  <string name="hint_userhost">användarnamn\@värdnamn</string>
   <string name="list_format_error">Använd formatet %1$s</string>
   <string name="format_username">användarnamn</string>
   <string name="format_hostname">värdnamn</string>
@@ -190,7 +180,6 @@
   <string name="no">Nej</string>
   <string name="with_confirmation">Med bekräftelse</string>
   <string name="yes">Ja</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
   <string name="menu_colors_reset">Återställ</string>
   <string name="app_is_running">ConnectBot är igång</string>
   <string name="color_red">röd</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d4db960..cabccad 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">Yardım</string>
   <string name="title_colors">Renkler</string>
   <string name="title_color_picker">Bir renk seç</string>
-  <string name="resolve_connect">Bağlan</string>
-  <string name="resolve_entropy">Rastgele girdi topla</string>
-  <string name="menu_insert">Host ekle</string>
-  <string name="menu_delete">Host\'u sil</string>
-  <string name="menu_preferences">Seçenekler</string>
   <string name="help_intro">Özel bir konu hakkinda daha fazla bilgi için lütfen aşağıdaki ilgili konuyu seçiniz.</string>
-  <string name="help_about">ConnectBot Hakkında</string>
-  <string name="help_keyboard">Klavye</string>
   <string name="pubkey_generate">Oluştur</string>
   <string name="pubkey_delete">Anahtarı Sil</string>
   <string name="pubkey_gather_entropy">Entropi Toplanıyor</string>
@@ -63,7 +56,6 @@
   <string name="alert_sdcard_absent">SD kart takılmamış!</string>
   <string name="button_add">Ekle</string>
   <string name="button_change">Değiştir</string>
-  <string name="button_generate">Anahtar Üret</string>
   <string name="button_resize">Yeniden boyutlandır</string>
   <string name="alert_disconnect_msg">Bağlantı Kesildi</string>
   <string name="msg_copyright">Telif Hakkı © 2007-2008 Kenny Root http://the-b.org/, Jeffrey Sharkey http://jsharkey.org/</string>
@@ -138,9 +130,7 @@
   <string name="portforward_remote">Uzak</string>
   <string name="portforward_dynamic">Dinamik (SOCKS)</string>
   <string name="portforward_pos">Port yönlendirmesi oluştur</string>
-  <string name="portforward_done">Port yönlendirmesi başarıyla oluşturuldu</string>
   <string name="portforward_problem">Port yönlendirmesi oluşturmada hata oldu, port 1024 altı yada meşgul bir port kullanmakdan kaynaklanabilir</string>
-  <string name="hint_userhost">kullanici\@sunucuadi</string>
   <string name="list_format_error">%1$s formatında kullanın</string>
   <string name="format_username">kullanıcı adı</string>
   <string name="format_hostname">sunucu adı</string>
@@ -192,7 +182,6 @@
   <string name="no">Hayır</string>
   <string name="with_confirmation">teyitli</string>
   <string name="yes">Evet</string>
-  <string name="exceptions_submit_message">ConnectBot son çalıştırıldığında sorunla karşılaştı. Hata raporunu ConnectBot geliştiricilerine iletmek ister misiniz?</string>
   <string name="menu_colors_reset">Sıfırla</string>
   <string name="app_is_running">ConnectBot çalışıyor</string>
   <string name="color_red">kırmızı</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index fab2563..5421ef5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -7,13 +7,7 @@
   <string name="title_host_editor">Змінити вузол</string>
   <string name="title_help">Допомога</string>
   <string name="title_colors">Кольори</string>
-  <string name="resolve_connect">Підключитись</string>
-  <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_keyboard">Клавіатура</string>
   <string name="pubkey_generate">Генерувати</string>
   <string name="pubkey_delete">Вилучити ключ</string>
   <string name="pubkey_list_empty">Tap Menu to create\nor import key pairs.</string>
@@ -22,5 +16,4 @@
   <string name="pubkey_unlock">Розблокувати ключ</string>
   <string name="portforward_list_empty">Tap Menu to create\nport forwards.</string>
   <string name="list_format_error">Use the format %1$s</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index a9c64c2..93bb57a 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -3,9 +3,7 @@
   <string name="title_hosts_list">Máy chủ</string>
   <string name="title_help">Trợ giúp</string>
   <string name="title_colors">Màu sắc</string>
-  <string name="resolve_connect">Kết nối</string>
   <string name="pubkey_list_empty">Tap Menu to create\nor import key pairs.</string>
   <string name="portforward_list_empty">Tap Menu to create\nport forwards.</string>
   <string name="list_format_error">Use the format %1$s</string>
-  <string name="exceptions_submit_message">It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 32be755..1daebfe 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -11,14 +11,7 @@
   <string name="title_color_picker">选取一种颜色</string>
   <string name="title_settings">设置</string>
   <string name="title_pubkey_generate">生成</string>
-  <string name="resolve_connect">连接</string>
-  <string name="resolve_entropy">收集熵</string>
-  <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_keyboard">键盘</string>
   <string name="terms_and_conditions">条款与条件</string>
   <string name="keyboard_shortcuts">键盘快捷键</string>
   <string name="increase_font_size">增加字体大小</string>
@@ -70,7 +63,6 @@
   <string name="button_add">添加</string>
   <string name="button_cancel">取消</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>
@@ -158,9 +150,7 @@
   <string name="portforward_remote">远端</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="hint_userhost">用户名\@主机名</string>
   <string name="list_format_error">使用格式 \"%1$s\"</string>
   <string name="format_username">用户名</string>
   <string name="format_hostname">主机名</string>
@@ -216,7 +206,6 @@
   <string name="no">不</string>
   <string name="with_confirmation">需要确认</string>
   <string name="yes">确定</string>
-  <string name="exceptions_submit_message">ConnectBot 上次运行时出现异常，是否提交报告至 ConnectBot 开发者？</string>
   <string name="menu_colors_reset">重置</string>
   <string name="app_is_running">ConnectBot 正在运行</string>
   <string name="color_red">红色</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9632700..f7f4722 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,14 +9,7 @@
   <string name="title_help">說明</string>
   <string name="title_colors">顏色</string>
   <string name="title_color_picker">挑選顏色</string>
-  <string name="resolve_connect">連線</string>
-  <string name="resolve_entropy">收集用戶熵</string>
-  <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_keyboard">鍵盤</string>
   <string name="pubkey_generate">產生</string>
   <string name="pubkey_delete">刪除金鑰</string>
   <string name="pubkey_gather_entropy">正在收集用戶熵</string>
@@ -63,7 +56,6 @@
   <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>
@@ -151,9 +143,7 @@
   <string name="portforward_remote">遠端</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="hint_userhost">使用者名稱\@主機名稱</string>
   <string name="list_format_error">使用 %1$s 格式</string>
   <string name="format_username">使用者名稱</string>
   <string name="format_hostname">主機名稱</string>
@@ -206,7 +196,6 @@
   <string name="no">否</string>
   <string name="with_confirmation">已確認過</string>
   <string name="yes">是</string>
-  <string name="exceptions_submit_message">ConnectBot 在上次執行時出現異常。回報給 ConnectBot 開發者?</string>
   <string name="menu_colors_reset">重設</string>
   <string name="app_is_running">ConnectBot 執行中</string>
   <string name="color_red">紅</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d472353..824f664 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,17 +45,7 @@
 	<!-- Window title when generating a new pubkey. -->
 	<string name="title_pubkey_generate">Generate</string>
 
-	<string name="resolve_connect">"Connect"</string>
-	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
-	<string name="resolve_entropy">"Gather Entropy"</string>
-
-	<string name="menu_insert">"Add Host"</string>
-	<string name="menu_delete">"Delete Host"</string>
-	<string name="menu_preferences">"Preferences"</string>
-
 	<string name="help_intro">"Please select a topic below for more information on a particular subject."</string>
-	<string name="help_about">"About ConnectBot"</string>
-	<string name="help_keyboard">"Keyboard"</string>
 
 	<!-- Title for the help page with the terms & conditions of the app. -->
 	<string name="terms_and_conditions">"Terms &amp; Conditions"</string>
@@ -200,8 +190,6 @@
 	<string name="button_cancel">Cancel</string>
 	<!-- Change an existing item's (e.g., host or pubkey) details. -->
 	<string name="button_change">"Change"</string>
-	<!-- Button that begins the generation of a public key pair. -->
-	<string name="button_generate">"Generate Key"</string>
 	<!-- Button that resizes the screen to the user-specified dimensions. -->
 	<string name="button_resize">"Resize"</string>
 
@@ -431,12 +419,8 @@
 	<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
 	<string name="portforward_pos">"Create port forward"</string>
 
-	<string name="portforward_done">"Successfully created port forward"</string>
 	<string name="portforward_problem">"Problem creating port forward, maybe you're using ports under 1024 or port is already used?"</string>
 
-	<!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
-	<string name="hint_userhost">"user@hostname"</string>
-
 	<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
 	<string name="list_format_error">"Use the format \"%1$s\""</string>
 
@@ -544,9 +528,6 @@
 	<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
 	<string name="yes">"Yes"</string>
 
-	<!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
-	<string name="exceptions_submit_message">"It appears ConnectBot had a problem last time it ran.  Submit error report to ConnectBot developers?"</string>
-
 	<!-- Menu selection to reset colors to their defaults. -->
 	<string name="menu_colors_reset">"Reset"</string>
 
diff --git a/scripts/check-lint-count.bash b/scripts/check-lint-count.bash
index c02f70e..5247a9b 100755
--- a/scripts/check-lint-count.bash
+++ b/scripts/check-lint-count.bash
@@ -32,7 +32,7 @@ lint_results="$tmp_dir/lint.txt"
 hist_results="$tmp_dir/hist.txt"
 
 run_query() {
-  local xqilla_script='string-join(//issue/location/(concat("file=", @file, " line=", @line, " column=", @column, " reason=", ../@summary)), "&#10;")'
+  local xqilla_script='string-join(//issue/location/(concat("file=", @file, " line=", @line, " column=", @column, " message=", ../@message)), "&#10;")'
   xqilla -i "$1" <(echo "$xqilla_script") | sed "s,$PWD/,,g" > "$2"
 }