rework strings

This commit is contained in:
B. Petersen
2018-12-12 01:50:35 +01:00
parent 33f07b584b
commit defac037de
131 changed files with 905 additions and 1662 deletions
+7 -7
View File
@@ -6,31 +6,31 @@
android:key="preference_category_profile"/>
<Preference android:key="preference_category_notifications"
android:title="@string/preferences__notifications"
android:title="@string/pref_notifications"
android:icon="@drawable/ic_notifications_24dp"/>
<Preference android:key="preference_category_app_protection"
android:title="@string/preferences__privacy"
android:title="@string/pref_privacy"
android:icon="@drawable/ic_security_24dp"/>
<Preference android:key="preference_category_appearance"
android:title="@string/preferences__appearance"
android:title="@string/pref_appearance"
android:icon="@drawable/ic_brightness_6_24dp"/>
<Preference android:key="preference_category_chats"
android:title="@string/preferences__chats"
android:title="@string/pref_chats_and_media"
android:icon="@drawable/ic_forum_24dp"/>
<Preference android:key="preference_category_advanced"
android:title="@string/preferences__advanced"
android:title="@string/menu_advanced"
android:icon="@drawable/ic_advanced_24dp"/>
<Preference android:key="preference_category_invite"
android:title="@string/text_secure_normal__invite_friends"
android:title="@string/menu_invite"
android:icon="@drawable/ic_invite_24dp"/>
<Preference android:key="preference_category_help"
android:title="@string/text_secure_normal__help"
android:title="@string/menu_help"
android:icon="@drawable/ic_help_24dp"/>
</PreferenceScreen>
+8 -8
View File
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:key="media_download" android:title="@string/preferences_autocrypt">
<PreferenceCategory android:key="media_download" android:title="@string/autocrypt">
<Preference android:key="pref_send_autocrypt_setup_message"
android:title="@string/preferences_autocrypt__send_asm"/>
android:title="@string/autocrypt_send_asm_title"/>
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="true"
android:key="pref_prefer_e2ee"
android:title="@string/preferences_autocrypt__prefer_e2ee"/>
android:title="@string/autocrypt_prefer_e2ee"/>
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_divider_explain_autocrypt"/>
<PreferenceCategory android:key="media_download" android:title="@string/preferences_other">
<PreferenceCategory android:key="media_download" android:title="@string/pref_other">
<Preference android:key="pref_backup"
android:title="@string/preferences__backup"
android:summary="@string/preferences_chats__backup_chats_to_external_storage"/>
android:title="@string/pref_backup"
android:summary="@string/pref_backup_explain"/>
<Preference android:key="pref_manage_keys"
android:title="@string/preferences__manage_keys"/>
android:title="@string/pref_manage_keys"/>
<Preference android:key="pref_view_log"
android:title="@string/preferences__view_log"/>
android:title="@string/pref_view_log"/>
</PreferenceCategory>
</PreferenceScreen>
+17 -17
View File
@@ -1,63 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/preferences_app_protection__screen_lock">
<PreferenceCategory android:title="@string/screenlock_title">
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_android_screen_lock"
android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint"
android:title="@string/preferences_app_protection__screen_lock" />
android:summary="@string/screenlock_explain"
android:title="@string/screenlock_title" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_timeout_passphrase"
android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
android:title="@string/preferences__inactivity_timeout_passphrase" />
android:summary="@string/screenlock_inactivity_timeout_explain"
android:title="@string/screenlock_inactivity_timeout" />
<Preference
android:dependency="pref_timeout_passphrase"
android:key="pref_timeout_interval"
android:title="@string/preferences__inactivity_timeout_interval" />
android:title="@string/screenlock_inactivity_timeout_interval" />
<Preference
android:key="pref_change_passphrase"
android:summary="@string/preferences__change_your_passphrase"
android:title="@string/preferences__change_passphrase" />
android:summary="@string/pref_change_secret_explain"
android:title="@string/pref_change_secret" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_divider" />
<PreferenceCategory android:title="@string/preferences_app_protection__app_access">
<PreferenceCategory android:title="@string/pref_app_access">
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_screen_security"
android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots"
android:title="@string/preferences__screen_security" />
android:summary="@string/pref_screen_security_explain"
android:title="@string/pref_screen_security" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_incognito_keyboard"
android:summary="@string/preferences__request_keyboard_to_disable_personalized_learning"
android:title="@string/preferences__incognito_keyboard" />
android:summary="@string/pref_incognito_keyboard_explain"
android:title="@string/pref_incognito_keyboard" />
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_divider" />
<PreferenceCategory android:title="@string/preferences_app_protection__communication">
<PreferenceCategory android:title="@string/pref_communication">
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_read_receipts"
android:summary="@string/preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts"
android:title="@string/preferences__read_receipts" />
android:summary="@string/pref_read_receipts_explain"
android:title="@string/pref_read_receipts" />
<Preference
android:key="preference_category_blocked"
android:title="@string/preferences_app_protection__blocked_contacts" />
android:title="@string/pref_blocked_contacts" />
</PreferenceCategory>
+3 -3
View File
@@ -3,7 +3,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_theme"
android:title="@string/preferences__theme"
android:title="@string/pref_theme"
android:entries="@array/pref_theme_entries"
android:entryValues="@array/pref_theme_values"
android:defaultValue="light">
@@ -11,12 +11,12 @@
<org.thoughtcrime.securesms.preferences.widgets.SignalPreference
android:key="pref_chat_background"
android:title="@string/preferences__chat_background"
android:title="@string/pref_background"
/>
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_language"
android:title="@string/preferences__language"
android:title="@string/pref_language"
android:entries="@array/language_entries"
android:entryValues="@array/language_values"
android:defaultValue="zz"/>
+11 -12
View File
@@ -2,10 +2,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<PreferenceCategory android:title="@string/preferences_chats__chats">
<PreferenceCategory android:title="@string/pref_chats">
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_message_body_text_size"
android:title="@string/preferences_chats__message_text_size"
android:title="@string/pref_message_text_size"
android:entries="@array/pref_message_font_size_entries"
android:entryValues="@array/pref_message_font_size_values"
android:defaultValue="16">
@@ -14,34 +14,33 @@
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_system_emoji"
android:title="@string/preferences_advanced__use_system_emoji"
android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
android:title="@string/pref_use_system_emoji"
android:summary="@string/pref_use_system_emoji_explain" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_enter_sends"
android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
android:title="@string/preferences__pref_enter_sends_title"/>
android:summary="@string/pref_enter_sends_explain"
android:title="@string/pref_enter_sends"/>
</PreferenceCategory>
<PreferenceCategory android:layout="@layout/preference_divider"/>
<PreferenceCategory android:key="message_trimming" android:title="@string/preferences_chats__message_trimming">
<PreferenceCategory android:key="message_trimming" android:title="@string/pref_trim_headline">
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="false"
android:key="pref_trim_threads"
android:summary="@string/preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length"
android:title="@string/preferences__delete_old_messages" />
android:summary="@string/pref_trim_option_explain"
android:title="@string/pref_trim_option" />
<EditTextPreference android:defaultValue="500"
android:key="pref_trim_length"
android:title="@string/preferences__conversation_length_limit"
android:title="@string/pref_trim_length_limit"
android:inputType="number"
android:dependency="pref_trim_threads" />
<Preference android:key="pref_trim_now"
android:title="@string/preferences__trim_all_conversations_now"
android:summary="@string/preferences__scan_through_all_conversations_and_enforce_conversation_length_limits"
android:title="@string/pref_trim_now_button"
android:dependency="pref_trim_threads" />
</PreferenceCategory>
+10 -10
View File
@@ -2,17 +2,17 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/preferences_notifications__messages">
<PreferenceCategory android:title="@string/pref_messages">
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:key="pref_key_enable_notifications"
android:title="@string/preferences__notifications"
android:title="@string/pref_notifications"
android:defaultValue="true" />
<org.thoughtcrime.securesms.preferences.widgets.SignalPreference
android:dependency="pref_key_enable_notifications"
android:key="pref_key_ringtone"
android:title="@string/preferences__sound"
android:title="@string/pref_sound"
android:persistent="false"
android:defaultValue="content://settings/system/notification_sound" />
@@ -20,12 +20,12 @@
android:dependency="pref_key_enable_notifications"
android:key="pref_key_vibrate"
android:defaultValue="true"
android:title="@string/preferences__vibrate"/>
android:title="@string/pref_vibrate"/>
<org.thoughtcrime.securesms.preferences.widgets.LEDColorListPreference
android:key="pref_led_color"
android:defaultValue="blue"
android:title="@string/preferences__led_color"
android:title="@string/pref_led_color"
android:dependency="pref_key_enable_notifications"
android:entries="@array/pref_led_color_entries"
android:entryValues="@array/pref_led_color_values" />
@@ -33,28 +33,28 @@
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_led_blink"
android:defaultValue="500,2000"
android:title="@string/preferences__pref_led_blink_title"
android:title="@string/pref_led_pattern"
android:dependency="pref_led_color"
android:entries="@array/pref_led_blink_pattern_entries"
android:entryValues="@array/pref_led_blink_pattern_values" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:key="pref_key_inthread_notifications"
android:title="@string/preferences_notifications__in_chat_sounds"
android:title="@string/pref_in_chat_sounds"
android:dependency="pref_key_enable_notifications"
android:defaultValue="true" />
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_repeat_alerts"
android:defaultValue="0"
android:title="@string/preferences__repeat_alerts"
android:title="@string/pref_repeat_notify"
android:dependency="pref_key_enable_notifications"
android:entries="@array/pref_repeat_alerts_entries"
android:entryValues="@array/pref_repeat_alerts_values" />
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_notification_privacy"
android:title="@string/preferences_notifications__show"
android:title="@string/pref_notifications_show"
android:dependency="pref_key_enable_notifications"
android:defaultValue="all"
android:entries="@array/pref_notification_privacy_entries"
@@ -62,7 +62,7 @@
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:key="pref_notification_priority"
android:title="@string/preferences_notifications__priority"
android:title="@string/pref_notifications_priority"
android:dependency="pref_key_enable_notifications"
android:defaultValue="1"
android:entries="@array/pref_notification_priority_entries"
+8 -8
View File
@@ -2,10 +2,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:key="notification_settings" android:title="@string/recipient_preferences__chat_settings">
<PreferenceCategory android:key="notification_settings" android:title="@string/pref_chat_settings">
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:key="pref_key_recipient_mute"
android:title="@string/recipient_preferences__mute_conversation"
android:title="@string/menu_mute"
android:defaultValue="false"
android:disableDependentsState="true"
android:persistent="false" />
@@ -13,13 +13,13 @@
<org.thoughtcrime.securesms.preferences.widgets.SignalPreference
android:dependency="pref_key_recipient_mute"
android:key="pref_key_recipient_ringtone"
android:title="@string/recipient_preferences__notification_sound"
android:title="@string/pref_sound"
android:persistent="false"/>
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference
android:dependency="pref_key_recipient_mute"
android:key="pref_key_recipient_vibrate"
android:title="@string/recipient_preferences__vibrate"
android:title="@string/pref_vibrate"
android:entries="@array/recipient_vibrate_entries"
android:entryValues="@array/recipient_vibrate_values"
android:defaultValue="0"
@@ -30,22 +30,22 @@
<PreferenceCategory android:key="divider" android:layout="@layout/preference_divider"/>
<PreferenceCategory android:key="privacy_settings" android:title="@string/recipient_preferences__contact">
<PreferenceCategory android:key="privacy_settings" android:title="@string/contact">
<Preference android:key="pref_key_recipient_addr"
android:title="user@example.org"
android:persistent="false"/>
<Preference android:key="pref_key_recipient_edit_name"
android:title="@string/recipient_preferences__edit_name"
android:title="@string/menu_edit_name"
android:persistent="false"/>
<Preference android:key="pref_key_recipient_encryption_info"
android:title="@string/recipient_preferences__encryption_info"
android:title="@string/profile_encryption"
android:persistent="false"/>
<Preference android:key="pref_key_recipient_block"
android:title="@string/recipient_preferences__block"
android:title="@string/menu_block_contact"
android:persistent="false"/>
</PreferenceCategory>