diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-10 10:52:21 +0200 |
| commit | 15c05dc3c3dfe7eee82dac2f180e3505b503fe81 (patch) | |
| tree | 9a2152390f39c4a9c79490a0938f57fe728140f2 /res/values/strings.xml | |
| parent | ae3ff5757d5d6e6e4359ecdefb6e98a9bd69c4a1 (diff) | |
| parent | 331be08859d68fa6a034b39c674fd7bb929c4a5c (diff) | |
Merge branch 'development'
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 8d976dce..58af226b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -261,5 +261,9 @@ <string name="pref_expert_options_other">Other</string> <string name="pref_conference_name">Conference name</string> <string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string> + <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string> + <string name="conference_banned">You are banned from this conference</string> + <string name="conference_members_only">This conference is members only</string> + <string name="conference_kicked">You have been kicked from this conference</string> -</resources>
\ No newline at end of file +</resources> |