aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorMichael <betheg@bitcloner.org>2014-09-07 15:58:59 +0200
committerMichael <betheg@bitcloner.org>2014-09-07 15:58:59 +0200
commitf4d86ecff38b4c9d8df97999fe3e252eb9a165af (patch)
tree8488b7006970cb68976e7f641fd8a18f9bbf08f9 /res/values/strings.xml
parent04665b59c8b96341ac050399aaf0654e2e4e3132 (diff)
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d5a75d5..2b14e74b 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>