diff options
author | Christian S. <kriztan@users.noreply.github.com> | 2015-08-03 19:11:14 +0200 |
---|---|---|
committer | Christian S. <kriztan@users.noreply.github.com> | 2015-08-03 19:11:14 +0200 |
commit | 582e570f5fc40c6413aef70fd147178bc3add32a (patch) | |
tree | fbbf6f45960b5c2b7a17b0a296cf30b17506972d /src/main/res/values-zh-rCN | |
parent | 2d1abca3022b0fe41fd4df72a85f5d1514e61ad8 (diff) | |
parent | 9b91d0bf75751b064bb601c8d3f65d40bc49fea4 (diff) |
Merge pull request #18 from siacs/development
copy commits
Diffstat (limited to 'src/main/res/values-zh-rCN')
-rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 95110d034..7803f5b27 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -105,8 +105,6 @@ <string name="pref_vibrate_summary">收到新消息时震动</string> <string name="pref_sound">声音</string> <string name="pref_sound_summary">收到新消息时的铃声</string> - <string name="pref_conference_notifications">讨论组通知</string> - <string name="pref_conference_notifications_summary">当有新的消息时总是通知而不是亮屏时才通知</string> <string name="pref_notification_grace_period">通知限期</string> <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string> <string name="pref_advanced_options">高级选项</string> @@ -426,7 +424,6 @@ <string name="received_location">位置已收到</string> <string name="title_undo_swipe_out_conversation">Conversation 已关闭</string> <string name="title_undo_swipe_out_muc">离开讨论组</string> - <string name="pref_certificate_options">证书选项</string> <string name="pref_dont_trust_system_cas_title">不相信系统 CA</string> <string name="pref_dont_trust_system_cas_summary">所有证书必须人工通过</string> <string name="pref_remove_trusted_certificates_title">移除证书</string> |