aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-zh-rCN/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-08-15 14:26:37 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-08-15 14:26:37 +0200
commit1f34fb742ceaa941f48ca858010961f834e3d1b8 (patch)
tree76ca87a93cc0cf12e6fc201d34c7e20ad5b510ca /src/main/res/values-zh-rCN/strings.xml
parent4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff)
parent32826ec29d28668b7f345ffcd45cd876dc980153 (diff)
Merge branch 'development'
Diffstat (limited to 'src/main/res/values-zh-rCN/strings.xml')
-rw-r--r--src/main/res/values-zh-rCN/strings.xml3
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 0d95ee18..7a67ffdd 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>
@@ -424,7 +422,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>