diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-07 23:08:57 +0200 |
| commit | 409fdd8596f217e6f4101064342273268425edfb (patch) | |
| tree | f3a50eb54c0e88bce33e34347f6dfe325917e089 /res/values | |
| parent | 449c2a544b48a2b9adf0df094eb1ac0d49531ebe (diff) | |
| parent | 5fe3f207d407543b13652c4a3c31bf8f9f9690a5 (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 75e2ee3a..1486b9bc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -103,9 +103,6 @@ <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</string> <string name="pref_notification_grace_period">Notification grace period</string> <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string> - <string name="pref_ui_options">UI Options</string> - <string name="pref_conference_name">Conference name</string> - <string name="pref_conference_name_summary">Use room’s subject to identify Conferences</string> <string name="pref_advanced_options">Advanced Options</string> <string name="pref_never_send_crash">Never send crash reports</string> <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string> @@ -173,7 +170,6 @@ <string name="contact_status_offline">offline</string> <string name="muc_details_conference">Conference</string> <string name="muc_details_other_members">Other Members</string> - <string name="share_with_active_conversations">Active Conversations</string> <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> |