aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/values-de/strings.xml9
-rw-r--r--src/main/res/values/strings.xml9
-rw-r--r--src/main/res/xml/preferences.xml100
3 files changed, 81 insertions, 37 deletions
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d514f08f..b762f420 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -639,4 +639,13 @@
<string name="pref_log_stanzas">Stanzas protokollieren</string>
<string name="contact_paused_typing">...macht eine Schreibpause</string>
<string name="is_typing">...schreibt</string>
+ <string name="pref_privacy_summary">Einstellungen zum Datenschutz</string>
+ <string name="pref_privacy">Datenschutz</string>
+ <string name="pref_privacy_security">Datenschutz &amp; Sicherheit</string>
+ <string name="pref_entity_time_summary">Sends your current time</string>
+ <string name="pref_entity_time">Send Entity Time</string>
+ <string name="pref_software_info_summary">Sends information about this client</string>
+ <string name="pref_software_info">Send client information</string>
+ <string name="pref_send_os_info_summary">Sends information about your android version</string>
+ <string name="pref_send_os_info">Send your android version</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2055c5de..0ab2c02c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -690,4 +690,13 @@
<string name="pref_log_stanzas">Log stanzas</string>
<string name="contact_paused_typing">...has stopped typing</string>
<string name="is_typing">...is writing</string>
+ <string name="pref_privacy_summary">Privacy Settings</string>
+ <string name="pref_privacy">Privacy</string>
+ <string name="pref_privacy_security">Privacy and Security</string>
+ <string name="pref_entity_time_summary">Sends your current time</string>
+ <string name="pref_entity_time">Send Entity Time</string>
+ <string name="pref_software_info_summary">Sends information about this client</string>
+ <string name="pref_software_info">Send client information</string>
+ <string name="pref_send_os_info_summary">Sends information about your android version</string>
+ <string name="pref_send_os_info">Send your android version</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 96be892e..4faf1df2 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -16,6 +16,17 @@
android:key="resource"
android:summary="@string/pref_xmpp_resource_summary"
android:title="@string/pref_xmpp_resource"/>
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="parse_emoticons"
+ android:summary="@string/pref_parse_emoticons_summary"
+ android:title="@string/pref_parse_emoticons"/>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_privacy_security">
+ <PreferenceScreen
+ android:summary="@string/pref_privacy_summary"
+ android:title="@string/pref_privacy">
+ <PreferenceCategory android:title="@string/pref_general">
<ListPreference
android:defaultValue="2"
android:entries="@array/confirm_strings"
@@ -31,9 +42,58 @@
android:title="@string/pref_chat_states"/>
<CheckBoxPreference
android:defaultValue="true"
- android:key="parse_emoticons"
- android:summary="@string/pref_parse_emoticons_summary"
- android:title="@string/pref_parse_emoticons"/>
+ android:key="send_entity_time"
+ android:summary="@string/pref_entity_time_summary"
+ android:title="@string/pref_entity_time"/>
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="send_software_info"
+ android:summary="@string/pref_software_info_summary"
+ android:title="@string/pref_software_info"/>
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="send_os_info"
+ android:dependency="send_software_info"
+ android:summary="@string/pref_send_os_info_summary"
+ android:title="@string/pref_send_os_info"/>
+ </PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_presence_settings">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="away_when_screen_off"
+ android:summary="@string/pref_away_when_screen_off_summary"
+ android:title="@string/pref_away_when_screen_off"/>
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="xa_on_silent_mode"
+ android:summary="@string/pref_xa_on_silent_mode_summary"
+ android:title="@string/pref_xa_on_silent_mode"/>
+ <CheckBoxPreference
+ android:dependency="xa_on_silent_mode"
+ android:defaultValue="false"
+ android:key="treat_vibrate_as_silent"
+ android:title="@string/pref_treat_vibrate_as_silent"
+ android:summary="@string/pref_treat_vibrate_as_silent_summary"/>
+ </PreferenceCategory>
+ </PreferenceScreen>
+ <PreferenceScreen android:title="@string/pref_security_settings">
+ <PreferenceCategory android:title="@string/pref_security_settings">
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dont_save_encrypted"
+ android:summary="@string/pref_dont_save_encrypted_summary"
+ android:title="@string/pref_dont_save_encrypted"/>
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="dont_trust_system_cas"
+ android:summary="@string/pref_dont_trust_system_cas_summary"
+ android:title="@string/pref_dont_trust_system_cas_title"/>
+ <Preference
+ android:key="remove_trusted_certificates"
+ android:summary="@string/pref_remove_trusted_certificates_summary"
+ android:title="@string/pref_remove_trusted_certificates_title"/>
+ </PreferenceCategory>
+ </PreferenceScreen>
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_file_transfer_category">
<PreferenceScreen
@@ -184,22 +244,6 @@
android:key="expert"
android:summary="@string/pref_expert_options_summary"
android:title="@string/pref_expert_options">
- <PreferenceCategory android:title="@string/pref_security_settings">
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="dont_save_encrypted"
- android:summary="@string/pref_dont_save_encrypted_summary"
- android:title="@string/pref_dont_save_encrypted"/>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="dont_trust_system_cas"
- android:summary="@string/pref_dont_trust_system_cas_summary"
- android:title="@string/pref_dont_trust_system_cas_title"/>
- <Preference
- android:key="remove_trusted_certificates"
- android:summary="@string/pref_remove_trusted_certificates_summary"
- android:title="@string/pref_remove_trusted_certificates_title"/>
- </PreferenceCategory>
<PreferenceCategory
android:key="connection_options"
android:title="@string/pref_connection_options">
@@ -221,24 +265,6 @@
android:summary="@string/pref_display_enter_key_summary"
android:title="@string/pref_display_enter_key"/>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/pref_presence_settings">
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="away_when_screen_off"
- android:summary="@string/pref_away_when_screen_off_summary"
- android:title="@string/pref_away_when_screen_off"/>
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="xa_on_silent_mode"
- android:summary="@string/pref_xa_on_silent_mode_summary"
- android:title="@string/pref_xa_on_silent_mode"/>
- <CheckBoxPreference
- android:dependency="xa_on_silent_mode"
- android:defaultValue="false"
- android:key="treat_vibrate_as_silent"
- android:title="@string/pref_treat_vibrate_as_silent"
- android:summary="@string/pref_treat_vibrate_as_silent_summary"/>
- </PreferenceCategory>
<PreferenceCategory android:key="other_expert_settings" android:title="@string/pref_expert_options_other">
<CheckBoxPreference
android:key="autojoin"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 22:36:53 +0000