aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-zh-rCN/strings.xml
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-09-15 10:38:52 +0200
committerChristian S <christian@pix-art.de>2015-09-15 10:38:52 +0200
commiteb829eb307b69989ae4efdcb23cf2d8a28979b33 (patch)
tree18d56593e47e1db1e7775c2e7b35ed0325e68ed6 /src/main/res/values-zh-rCN/strings.xml
parent58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff)
parent183dad281c6d610b8a4cffa1f13c923a6e423355 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values-zh-rCN/strings.xml')
-rw-r--r--src/main/res/values-zh-rCN/strings.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 96f6189d8..5b65d7bf7 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -381,7 +381,6 @@
<string name="public_conference">公开访问的讨论组</string>
<string name="private_conference">私密,只有成员可以加入的讨论组</string>
<string name="conference_options">讨论组选项</string>
- <string name="members_only">私密(只对成员开放)</string>
<string name="non_anonymous">非匿名</string>
<string name="modified_conference_options">讨论组选项已修改!</string>
<string name="could_not_modify_conference_options">不能修改讨论组选项</string>