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-is/strings.xml | |
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-is/strings.xml')
-rw-r--r-- | app/src/main/res/values-is/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index abeaca0..a628f5b 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -73,8 +73,6 @@ <string name="pref_fullscreen_summary">Fela stöðustiku þegar tenging er virk</string> <string name="pref_memkeys_title">Geyma lykla í minni</string> <string name="pref_memkeys_summary">Geyma ólæsta lykla í minni þangað til forritinu er lokað</string> - <string name="pref_update_title">Athuga með uppfærslu</string> - <string name="pref_update_summary">Velja hve oft ConnectBot leitar að uppfærslum</string> <string name="pref_conn_persist_title">Halda tengingum</string> <string name="pref_conn_persist_summary">Halda tengingum í gangi þegar þær eru í bakgrunni</string> <string name="pref_keymode_title">Orðabók</string> @@ -97,9 +95,6 @@ <string name="list_keymode_none">Afvirkja</string> <string name="list_pubkeyids_none">Ekki nota lykla</string> <string name="list_pubkeyids_any">Nota hvaða ólæsta lykil sem er</string> - <string name="list_update_daily">Daglega</string> - <string name="list_update_weekly">Vikulega</string> - <string name="list_update_never">Aldrei</string> <string name="hostpref_nickname_title">Gælunafn</string> <string name="hostpref_color_title">Lita flokk</string> <string name="hostpref_fontsize_title">Leturstærð (pt)</string> |