aboutsummaryrefslogtreecommitdiffstats
path: root/res/xml/preferences.xml
diff options
context:
space:
mode:
authorBeriain <beriain@bitmessage.ch>2014-05-12 17:09:32 +0200
committerBeriain <beriain@bitmessage.ch>2014-05-12 17:09:32 +0200
commit75f7695087355978a236a701283a86bacdd8a54c (patch)
tree516c1262b83a4a4ae5240a8451c10c79eb31584c /res/xml/preferences.xml
parent42c07bf4ae83a4bc51664fdf35f02b917b57baa4 (diff)
parent4be8280beb9c61e4a11b67b61617455dbe52b466 (diff)
Merge https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/xml/preferences.xml')
-rw-r--r--res/xml/preferences.xml44
1 files changed, 22 insertions, 22 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 6268350a..b1b560c6 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -10,69 +10,69 @@
/>
<ListPreference
android:key="resource"
- android:title="XMPP Resource"
- android:summary="The name this client identifies itself"
+ android:title="@string/pref_xmpp_resource"
+ android:summary="@string/pref_xmpp_resource_summary"
android:entries="@array/resources"
android:entryValues="@array/resources"
android:defaultValue="Mobile"/>
<ListPreference
android:key="auto_accept_file_size"
- android:title="Accept files"
- android:summary="Automatically accept files smaller than"
+ android:title="@string/pref_accept_files"
+ android:summary="@string/pref_accept_files_summary"
android:entries="@array/filesizes"
android:entryValues="@array/filesizes_values"
android:defaultValue="524288"/>
</PreferenceCategory>
<PreferenceCategory
- android:title="Notification Settings">
+ android:title="@string/pref_notification_settings">
<CheckBoxPreference
android:key="show_notification"
- android:title="Notification"
- android:summary="Notify when a new message arrives"
+ android:title="@string/pref_notifications"
+ android:summary="@string/pref_notifications_summary"
android:defaultValue="true"
/>
<CheckBoxPreference
android:key="vibrate_on_notification"
android:dependency="show_notification"
- android:title="Vibrate"
- android:summary="Also vibrate when a new message arrives"
+ android:title="@string/pref_vibrate"
+ android:summary="@string/pref_vibrate_summary"
android:defaultValue="true"/>
<RingtonePreference
android:key="notification_ringtone"
- android:title="Sound"
+ android:title="@string/pref_sound"
android:ringtoneType="notification"
android:dependency="show_notification"
- android:summary="Play ringtone with notification"
+ android:summary="@string/pref_sound_summary"
android:defaultValue="content://settings/system/notification_sound"/>
<CheckBoxPreference
android:key="notify_in_conversation_when_highlighted"
- android:title="Conference notification"
- android:summary="Always notify when a new conference message arrives instead of only when highlighted"/>
+ android:title="@string/pref_conference_notifications"
+ android:summary="@string/pref_conference_notifications_summary"/>
<CheckBoxPreference
android:key="notification_grace_period_after_carbon_received"
- android:title="Notification grace period"
- android:summary="Disable notifications for a short time after a carbon copy was received"
+ android:title="@string/pref_notification_grace_period"
+ android:summary="@string/pref_notification_grace_period_summary"
android:defaultValue="true"/>
</PreferenceCategory>
<PreferenceCategory
- android:title="UI Options">
+ android:title="@string/pref_ui_options">
<CheckBoxPreference
android:key="show_phone_selfcontact_picture"
- android:title="Use Phones self contact picture"
- android:summary="You may no longer be able to distinguish which account you are using in a conversation"
+ android:title="@string/pref_use_phone_self_picture"
+ android:summary="@string/pref_use_phone_sefl_picture_summary"
android:defaultValue="true"/>
<CheckBoxPreference
android:key="use_subject_in_muc"
- android:title="Conference Name"
- android:summary="Use room’s subject to identify Conferences"
+ android:title="@string/pref_conference_name"
+ android:summary="@string/pref_conference_name_summary"
android:defaultValue="true"/>
</PreferenceCategory>
<PreferenceCategory
android:title="Advanced Options">
<CheckBoxPreference
android:key="never_send"
- android:title="Never send crash reports"
- android:summary="By sending in stack traces you are helping the ongoing development of Conversations"
+ android:title="@string/pref_never_send_crash"
+ android:summary="@string/pref_never_send_crash_summary"
android:defaultValue="false"/>
</PreferenceCategory>
</PreferenceScreen>