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-sv | |
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-sv')
-rw-r--r-- | app/src/main/res/values-sv/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 42b9fa7..a6ff287 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -79,8 +79,6 @@ <string name="pref_fullscreen_summary">Göm status medan konsol visas</string> <string name="pref_memkeys_title">Kom ihåg nycklar</string> <string name="pref_memkeys_summary">Behåll olåsta nycklar i minnet tills bakände-tjänst avslutas</string> - <string name="pref_update_title">Uppdateringskontroll</string> - <string name="pref_update_summary">Intervall för att söka efter ConnectBot-uppdateringar</string> <string name="pref_conn_persist_title">Kvarstående anslutningar</string> <string name="pref_conn_persist_summary">Tvinga anslutningar att fortsätta i bakgrunden</string> <string name="pref_keymode_title">Genvägar för katalog</string> @@ -104,9 +102,6 @@ <string name="list_keymode_none">Avaktivera</string> <string name="list_pubkeyids_none">Använd inte knapparna</string> <string name="list_pubkeyids_any">Använd valfri olåst nyckel</string> - <string name="list_update_daily">Varje dag</string> - <string name="list_update_weekly">Varje vecka</string> - <string name="list_update_never">Aldrig</string> <string name="hostpref_nickname_title">Smeknamn</string> <string name="hostpref_color_title">Färgkategori</string> <string name="hostpref_fontsize_title">Teckenstorlek</string> |