diff options
author | Kenny Root <kenny@the-b.org> | 2015-03-23 16:22:32 +0000 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-03-23 16:25:06 +0000 |
commit | f0ca96308b23643df1208acfe72015b46ae70067 (patch) | |
tree | 265bc747a3b5383075ecb12d99c3c89dcd5a2274 /app/src/main/res/values-id | |
parent | 89ee9588459755193dfff3df45f4494d53b25854 (diff) | |
parent | f129a9b52110ffafec4400e17d78881c50307d8a (diff) | |
download | connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.gz connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.bz2 connectbot-f0ca96308b23643df1208acfe72015b46ae70067.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/src/main/java/org/connectbot/HostListActivity.java
app/src/main/java/org/connectbot/service/TerminalKeyListener.java
Diffstat (limited to 'app/src/main/res/values-id')
-rw-r--r-- | app/src/main/res/values-id/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 3bd6a68..7e381c9 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -77,8 +77,6 @@ <string name="pref_fullscreen_summary">Sembunyikan bar status ketika dalam konsol</string> <string name="pref_memkeys_title">Ingat kunci dalam memori</string> <string name="pref_memkeys_summary">Simpan kunci yang terbuka kedalam memori hingga layanan backend berakhir</string> - <string name="pref_update_title">Memeriksa pembaharuan</string> - <string name="pref_update_summary">Tentukan frekuensi maksimal untuk memeriksa pembaharuan pada ConnectBot</string> <string name="pref_conn_persist_title">Pertahankan koneksi</string> <string name="pref_conn_persist_summary">Paksa koneksi untuk tetap terhubung ketika bekerja di belakang layar</string> <string name="pref_keymode_title">Jalan pintas direktori</string> @@ -102,9 +100,6 @@ <string name="list_keymode_none">Tidak aktif</string> <string name="list_pubkeyids_none">Jangan gunakan kunci</string> <string name="list_pubkeyids_any">Gunakan kunci apapun yang tidak terkunci</string> - <string name="list_update_daily">Harian</string> - <string name="list_update_weekly">Mingguan</string> - <string name="list_update_never">Tidak pernah</string> <string name="hostpref_nickname_title">Nama panggilan</string> <string name="hostpref_color_title">Kategori warna</string> <string name="hostpref_fontsize_title">Ukuran huruf (pt)</string> |