diff options
| author | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-15 10:38:52 +0200 |
| commit | eb829eb307b69989ae4efdcb23cf2d8a28979b33 (patch) | |
| tree | 18d56593e47e1db1e7775c2e7b35ed0325e68ed6 /src/main/res/values/strings.xml | |
| parent | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (diff) | |
| parent | 183dad281c6d610b8a4cffa1f13c923a6e423355 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 4ed498179..3d6328518 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -440,8 +440,10 @@ <string name="public_conference">Publicly accessible conference</string> <string name="private_conference">Private, members only conference</string> <string name="conference_options">Conference options</string> - <string name="members_only">Private (Members only)</string> + <string name="members_only">Private, members only</string> <string name="non_anonymous">Non-anonymous</string> + <string name="moderated">Moderated</string> + <string name="you_are_not_participating">You are not participating</string> <string name="modified_conference_options">Modified conference options!</string> <string name="could_not_modify_conference_options">Could not modify conference options</string> <string name="never">Never</string> |