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-ca | |
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-ca')
-rw-r--r-- | app/src/main/res/values-ca/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index e68fdef..a2b511f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -79,8 +79,6 @@ <string name="pref_fullscreen_summary">Amaga la barra d\'estat en consola</string> <string name="pref_memkeys_title">Recorda les claus en memòria</string> <string name="pref_memkeys_summary">Manté les claus descarregadesen memòria fins que el servei finalitzi</string> - <string name="pref_update_title">Comprova actualització</string> - <string name="pref_update_summary">Escull la freqüència màxima de comprovació d\'actualitzacions de ConnectBot</string> <string name="pref_conn_persist_title">Connexions persistents</string> <string name="pref_conn_persist_summary">Manté les connexions mentre l\'aplicació és en segon pla</string> <string name="pref_keymode_title">Drecera de carpetes</string> @@ -104,9 +102,6 @@ <string name="list_keymode_none">Deshabilita</string> <string name="list_pubkeyids_none">No usis claus</string> <string name="list_pubkeyids_any">Fes servir qualsevol clau desbloquejada</string> - <string name="list_update_daily">Diàriament</string> - <string name="list_update_weekly">Setmanalment</string> - <string name="list_update_never">Mai</string> <string name="hostpref_nickname_title">Sobrenom</string> <string name="hostpref_color_title">Color de la categoria</string> <string name="hostpref_fontsize_title">Mida de la lletra (pt)</string> |