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-zh-rCN | |
| 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-zh-rCN')
| -rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 42ec041..26a0914 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -79,8 +79,6 @@ <string name="pref_fullscreen_summary">处于控制台时隐藏状态栏</string> <string name="pref_memkeys_title">在内存中记录密钥</string> <string name="pref_memkeys_summary">保留解锁的密匙于内存中直到后台服务停止</string> - <string name="pref_update_title">检查更新</string> - <string name="pref_update_summary">设置检查ConnectBot更新的最大频率</string> <string name="pref_conn_persist_title">保持联机</string> <string name="pref_conn_persist_summary">切换到后台时强制保持连接</string> <string name="pref_keymode_title">目录快捷方式</string> @@ -104,9 +102,6 @@ <string name="list_keymode_none">禁用</string> <string name="list_pubkeyids_none">不使用密匙</string> <string name="list_pubkeyids_any">使用解锁密匙</string> - <string name="list_update_daily">每天</string> - <string name="list_update_weekly">每周</string> - <string name="list_update_never">永不</string> <string name="hostpref_nickname_title">昵称</string> <string name="hostpref_color_title">颜色类型</string> <string name="hostpref_fontsize_title">字型大小 (pt)</string> |