Merge branch 'master' into gradle-conversion

Change-Id: I4ea022cf42d3aea8e52d8e4fbd604575c109df1d

11 files changed, 52 insertions, 21 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1eb2220..a9422d7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">Host bearbeiten</string>
   <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>
@@ -207,8 +208,8 @@
   <string name="color_green">grün</string>
   <string name="color_blue">blau</string>
   <string name="color_gray">grau</string>
-  <string name="colors_fg">Schriftfarbe:</string>
-  <string name="color_bg">Hintergrundfarbe:</string>
+  <string name="colors_fg_label">SF: %1$d</string>
+  <string name="color_bg_label">HF: %1$d</string>
   <string name="image_description_connected">Verbunden.</string>
   <string name="image_description_key_is_locked">Schlüssel ist gesperrt.</string>
   <string name="image_description_toggle_control_character">Steuerzeichen umschalten</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ad2f276..86d7f29 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -214,8 +214,8 @@
   <string name="color_green">vert</string>
   <string name="color_blue">bleu</string>
   <string name="color_gray">gris</string>
-  <string name="colors_fg">PP :</string>
-  <string name="color_bg">AP :</string>
+  <string name="colors_fg_label">PP: %1$d</string>
+  <string name="color_bg_label">AP: %1$d</string>
   <string name="image_description_connected">Connecté</string>
   <string name="image_description_key_is_locked">Clef verrouillée</string>
   <string name="image_description_toggle_control_character">Activer/désactiver le caractère \"contrôle\"</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index ecb3ccc..9e55f47 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">עריכת מארח</string>
   <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>
@@ -206,8 +207,8 @@
   <string name="color_green">ירוק</string>
   <string name="color_blue">כחול</string>
   <string name="color_gray">אפור</string>
-  <string name="colors_fg">קדמה:</string>
-  <string name="color_bg">רקע:</string>
+  <string name="colors_fg_label">קדמה:%1$d</string>
+  <string name="color_bg_label">רקע:%1$d</string>
   <string name="image_description_connected">יש חיבור.</string>
   <string name="image_description_key_is_locked">המפתח נעול.</string>
   <string name="image_description_toggle_control_character">החלפת מצב תווי בקרה.</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 5e318f5..4e98a79 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -6,6 +6,8 @@
   <string name="title_pubkey_list">Kunci Publik</string>
   <string name="title_host_editor">Ubah Host</string>
   <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>
@@ -75,6 +77,7 @@
   <string name="pref_rotation_summary">Bagaimana mengubah rotasi ketika papan ketik menyembul masuk/keluar</string>
   <string name="pref_fullscreen_title">Layar penuh</string>
   <string name="pref_fullscreen_summary">Sembunyikan bar status ketika dalam konsol</string>
+  <string name="pref_keyboard_category">Papan tik</string>
   <string name="pref_memkeys_title">Ingat kunci dalam memori</string>
   <string name="pref_memkeys_summary">Simpan kunci yang terbuka kedalam memori hingga layanan backend berakhir</string>
   <string name="pref_conn_persist_title">Pertahankan koneksi</string>
@@ -118,6 +121,8 @@
   <string name="hostpref_encoding_summary">Karakter pengkodean untuk host</string>
   <string name="hostpref_connection_category">Konfigurasi koneksi</string>
   <string name="hostpref_username_title">Nama pengguna</string>
+  <string name="hostpref_hostname_title">Host</string>
+  <string name="hostpref_port_title">Port</string>
   <string name="bind_never">Tidak pernah terhubung</string>
   <string name="bind_minutes">%1$s menit yang lalu</string>
   <string name="bind_hours">%1$s jam yang lalu</string>
@@ -130,6 +135,8 @@
   <string name="console_menu_portforwards">Penerusan port</string>
   <string name="console_menu_resize">Paksakan ukuran</string>
   <string name="console_menu_urlscan">Pindai URL</string>
+  <string name="button_yes">Ya</string>
+  <string name="button_no">Tidak</string>
   <string name="portforward_local">Lokal</string>
   <string name="portforward_remote">Remote</string>
   <string name="portforward_dynamic">Dinamis (SOCKS)</string>
@@ -141,6 +148,7 @@
   <string name="list_format_error">Gunakan bentuk \"%1$s\"</string>
   <string name="format_username">pengguna</string>
   <string name="format_hostname">namahost</string>
+  <string name="format_port">Port</string>
   <string name="list_menu_pubkeys">Atur Pubkey</string>
   <string name="list_menu_sortcolor">Urutkan berdasarkan warna</string>
   <string name="list_menu_sortname">Urutkan berdasarkan nama</string>
@@ -155,7 +163,11 @@
   <string name="list_rotation_port">Paksakan bentuk tegak</string>
   <string name="list_rotation_auto">Otomatis</string>
   <string name="list_camera_ctrlaspace">Ctrl+A kemudian spasi</string>
+  <string name="list_camera_ctrla">Ctrl+A</string>
+  <string name="list_camera_esc">Esc</string>
   <string name="list_camera_none">Kosong</string>
+  <string name="list_delkey_backspace">Backspace</string>
+  <string name="list_delkey_del">Hapus</string>
   <string name="delete_message">Apakah anda yakin ingin menghapus %1$s?</string>
   <string name="delete_pos">Ya, hapus</string>
   <string name="delete_neg">Batal</string>
@@ -183,15 +195,18 @@
   <string name="terminal_enable_portfoward">Aktifkan port forward: %1$s</string>
   <string name="local_shell_unavailable">Gagal! Shell lokal tidak tersedia di telepon ini.</string>
   <string name="notification_text">%1$s memerlukan perhatian anda.</string>
+  <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>
   <string name="color_green">hijau</string>
   <string name="color_blue">biru</string>
   <string name="color_gray">abu-abu</string>
-  <string name="colors_fg">WD:</string>
-  <string name="color_bg">WB:</string>
+  <string name="colors_fg_label">WD: %1$d</string>
+  <string name="color_bg_label">WB: %1$d</string>
   <string name="image_description_connected">Tersambung.</string>
   <string name="image_description_key_is_locked">Pubkey terkunci.</string>
   <string name="image_description_toggle_control_character">Ubah-ubah karakter control.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f8c8062..0b4e29b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">Modifica connessione</string>
   <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>
@@ -77,6 +78,7 @@
   <string name="pref_rotation_summary">Come cambiare rotazione quando la tastiera esce/rientra</string>
   <string name="pref_fullscreen_title">Schermo intero</string>
   <string name="pref_fullscreen_summary">Nascondi la barra di stato in console</string>
+  <string name="pref_keyboard_category">Tastiera</string>
   <string name="pref_memkeys_title">Mantieni chiavi in memoria</string>
   <string name="pref_memkeys_summary">Mantiene le chiavi in memoria finché il servizio non viene terminato</string>
   <string name="pref_conn_persist_title">Connessioni permanenti</string>
@@ -206,7 +208,8 @@
   <string name="color_green">verde</string>
   <string name="color_blue">blu</string>
   <string name="color_gray">grigio</string>
-  <string name="color_bg">CS:</string>
+  <string name="colors_fg_label">CP: %1$d</string>
+  <string name="color_bg_label">CS: %1$d</string>
   <string name="image_description_connected">Connesso.</string>
   <string name="image_description_key_is_locked">La chiave e\' bloccata.</string>
   <string name="image_description_send_escape_character">Mandare un carattere escape.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f374e2d..21d4fdc 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">ホストを編集</string>
   <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>
@@ -79,6 +80,7 @@
   <string name="pref_titlebarhide_summary">タイトルバーとアクセスメニューを表示するにはコンソールをタップ</string>
   <string name="pref_fullscreen_title">全画面</string>
   <string name="pref_fullscreen_summary">ステータスバーを隠蔽しコンソールとして利用</string>
+  <string name="pref_keyboard_category">キーボード</string>
   <string name="pref_shiftfkeys_title">Shift+数字はFキー</string>
   <string name="pref_shiftfkeys_summary">ハードウェアキーボードで、shiftと数字キーでF1-F10を送信します</string>
   <string name="pref_ctrlfkeys_title">Ctrl+数字はFキー</string>
@@ -214,8 +216,8 @@
   <string name="color_green">緑</string>
   <string name="color_blue">青</string>
   <string name="color_gray">グレー</string>
-  <string name="colors_fg">FG:</string>
-  <string name="color_bg">BG:</string>
+  <string name="colors_fg_label">FG: %1$d</string>
+  <string name="color_bg_label">BG: %1$d</string>
   <string name="image_description_connected">接続しました。</string>
   <string name="image_description_key_is_locked">キーがロックされました。</string>
   <string name="image_description_toggle_control_character">コントロール文字を切り替えます。</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dd64905..7f320b0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">Edytuj host</string>
   <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>
@@ -77,6 +78,7 @@
   <string name="pref_rotation_summary">Sposób orientacji ekranu przy wysuniętej/wsuniętej klawiaturze</string>
   <string name="pref_fullscreen_title">Pełny ekran</string>
   <string name="pref_fullscreen_summary">Ukryj pasek statusu podczas pracy w konsoli</string>
+  <string name="pref_keyboard_category">Klawiatura</string>
   <string name="pref_memkeys_title">Zapamiętaj klucze w pamięci</string>
   <string name="pref_memkeys_summary">Trzymaj odblokowane klucze w pamięci dopóki usługa się nie rozłączy</string>
   <string name="pref_conn_persist_title">Utrzymuj połącznia</string>
@@ -206,8 +208,8 @@
   <string name="color_green">zielony</string>
   <string name="color_blue">niebieski</string>
   <string name="color_gray">szary</string>
-  <string name="colors_fg">FG:</string>
-  <string name="color_bg">BG:</string>
+  <string name="colors_fg_label">FG: %1$d</string>
+  <string name="color_bg_label">BG: %1$d</string>
   <string name="image_description_connected">Połączono</string>
   <string name="image_description_key_is_locked">Klucz zablokowany</string>
   <string name="image_description_toggle_control_character">Przełącz znak kontrolny</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index df33acf..79f5620 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">Edição de Host</string>
   <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>
@@ -77,6 +78,7 @@
   <string name="pref_rotation_summary">Como alterar a rotação da tela quando se conecta/desconecta um teclado</string>
   <string name="pref_fullscreen_title">Tela cheia</string>
   <string name="pref_fullscreen_summary">Ocultar a barra de estatus no modo terminal</string>
+  <string name="pref_keyboard_category">Teclado</string>
   <string name="pref_memkeys_title">Guardar as chaves em memória</string>
   <string name="pref_memkeys_summary">Manter chaves desbloqueadas na memória até que o serviço seja terminado</string>
   <string name="pref_conn_persist_title">Conexões persistentes</string>
@@ -206,8 +208,8 @@
   <string name="color_green">verde</string>
   <string name="color_blue">azul</string>
   <string name="color_gray">cinza</string>
-  <string name="colors_fg">PP:</string>
-  <string name="color_bg">SP:</string>
+  <string name="colors_fg_label">PP: %1$d</string>
+  <string name="color_bg_label">SP: %1$d</string>
   <string name="image_description_connected">Conectado.</string>
   <string name="image_description_key_is_locked">A chave está bloqueada.</string>
   <string name="image_description_send_escape_character">Enviar caractere de escape.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2554ea1..6e1527b 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">Host\'u Düzenle</string>
   <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>
@@ -77,6 +78,7 @@
   <string name="pref_rotation_summary">Klavye saklandığında/açıldığında dönüş nasıl değişir</string>
   <string name="pref_fullscreen_title">Tüm ekran</string>
   <string name="pref_fullscreen_summary">Konsolda iken durum çubuğunu gizle</string>
+  <string name="pref_keyboard_category">Klavye</string>
   <string name="pref_memkeys_title">Anahtarları bellekte tut</string>
   <string name="pref_memkeys_summary">Kilidi açılmış anahtarları arkadaki hizmetler sonlanana kadar bellekte tut</string>
   <string name="pref_conn_persist_title">Bağlantıları sürekli tut</string>
@@ -206,8 +208,8 @@
   <string name="color_green">yeşil</string>
   <string name="color_blue">mavi</string>
   <string name="color_gray">gri</string>
-  <string name="colors_fg">ÖR:</string>
-  <string name="color_bg">AR:</string>
+  <string name="colors_fg_label">ÖR: %1$d</string>
+  <string name="color_bg_label">AR: %1$d</string>
   <string name="image_description_connected">Bağlandı.</string>
   <string name="image_description_show_keyboard">Klavye göster.</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 b1aa96a..61fc9f5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">编辑主机</string>
   <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>
@@ -77,6 +78,7 @@
   <string name="pref_rotation_summary">当键盘打开或关闭时屏幕如何旋转(水平或竖直)</string>
   <string name="pref_fullscreen_title">全屏</string>
   <string name="pref_fullscreen_summary">处于控制台时隐藏状态栏</string>
+  <string name="pref_keyboard_category">键盘</string>
   <string name="pref_shiftfkeys_title">Shift+num(数字键) 作为 功能键</string>
   <string name="pref_shiftfkeys_summary">在硬件键盘上，数字键和 shift 键组合发送 F1-F10</string>
   <string name="pref_ctrlfkeys_title">Ctrl+num(数字键) 作为 功能键</string>
@@ -212,8 +214,8 @@
   <string name="color_green">绿色</string>
   <string name="color_blue">蓝色</string>
   <string name="color_gray">灰色</string>
-  <string name="colors_fg">前景色:</string>
-  <string name="color_bg">背景色:</string>
+  <string name="colors_fg_label">前景色：%1$d</string>
+  <string name="color_bg_label">背景色：%1$d</string>
   <string name="image_description_connected">已连接。</string>
   <string name="image_description_key_is_locked">密钥已锁。</string>
   <string name="image_description_toggle_control_character">切换控制字符。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 53891a4..bbfd6f0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -8,6 +8,7 @@
   <string name="title_host_editor">編輯主機資訊</string>
   <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>
@@ -216,8 +217,8 @@
   <string name="color_green">綠</string>
   <string name="color_blue">藍</string>
   <string name="color_gray">灰</string>
-  <string name="colors_fg">前景：</string>
-  <string name="color_bg">背景：</string>
+  <string name="colors_fg_label">前景：%1$d</string>
+  <string name="color_bg_label">背景：%1$d</string>
   <string name="image_description_connected">已連線。</string>
   <string name="image_description_key_is_locked">金鑰已鎖定。</string>
   <string name="image_description_toggle_control_character">切換控制字元</string>