Wording: Improve some strings in Privacy preferences

Closes #4907
Fixes #4651
// FREEBIE
This commit is contained in:
RiseT 2015-12-17 14:47:43 +01:00 committed by Moxie Marlinspike
parent ec53c6ab04
commit d238e2bbc5
2 changed files with 8 additions and 10 deletions

View File

@ -938,15 +938,13 @@
<string name="preferences__change_your_passphrase">Change your passphrase</string> <string name="preferences__change_your_passphrase">Change your passphrase</string>
<string name="preferences__enable_passphrase">Enable passphrase</string> <string name="preferences__enable_passphrase">Enable passphrase</string>
<string name="preferences__passphrase_summary">Passphrase %s</string> <string name="preferences__passphrase_summary">Passphrase %s</string>
<string name="preferences__enable_lock_screen_for_messages">Enable lock screen for messages</string> <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Lock Signal and message notifications with a passphrase</string>
<string name="preferences__screen_security">Screen security</string> <string name="preferences__screen_security">Screen security</string>
<string name="preferences__screen_security_summary">Screen security %s</string> <string name="preferences__screen_security_summary">Screen security %s</string>
<string name="preferences__disable_screen_security_to_allow_screen_shots">Block screenshots in the recents list and inside the app</string> <string name="preferences__disable_screen_security_to_allow_screen_shots">Block screenshots in the recents list and inside the app</string>
<string name="preferences__forget_passphrase_from_memory_after_some_interval">Forget passphrase from memory after some interval</string> <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Auto-lock Signal after a specified time interval of inactivity</string>
<string name="preferences__timeout_passphrase">Timeout passphrase</string> <string name="preferences__inactivity_timeout_passphrase">Inactivity timeout passphrase</string>
<string name="preferences__pref_timeout_interval_dialogtitle">Select passphrase timeout</string> <string name="preferences__inactivity_timeout_interval">Inactivity timeout interval</string>
<string name="preferences__pref_timeout_interval_title">Timeout interval</string>
<string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">The amount of time to wait before forgetting passphrase from memory</string>
<string name="preferences__notifications">Notifications</string> <string name="preferences__notifications">Notifications</string>
<string name="preferences__enable_message_notifications">Enable message notifications</string> <string name="preferences__enable_message_notifications">Enable message notifications</string>
<string name="preferences__led_color">LED color</string> <string name="preferences__led_color">LED color</string>

View File

@ -5,7 +5,7 @@
android:key="pref_enable_passphrase_temporary" android:key="pref_enable_passphrase_temporary"
android:defaultValue="true" android:defaultValue="true"
android:title="@string/preferences__enable_passphrase" android:title="@string/preferences__enable_passphrase"
android:summary="@string/preferences__enable_lock_screen_for_messages"/> android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase"/>
<Preference android:key="pref_change_passphrase" <Preference android:key="pref_change_passphrase"
android:title="@string/preferences__change_passphrase" android:title="@string/preferences__change_passphrase"
@ -14,11 +14,11 @@
<CheckBoxPreference android:defaultValue="false" <CheckBoxPreference android:defaultValue="false"
android:key="pref_timeout_passphrase" android:key="pref_timeout_passphrase"
android:title="@string/preferences__timeout_passphrase" android:title="@string/preferences__inactivity_timeout_passphrase"
android:summary="@string/preferences__forget_passphrase_from_memory_after_some_interval" android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
android:dependency="pref_enable_passphrase_temporary"/> android:dependency="pref_enable_passphrase_temporary"/>
<Preference android:title="@string/preferences__pref_timeout_interval_title" <Preference android:title="@string/preferences__inactivity_timeout_interval"
android:key="pref_timeout_interval" android:key="pref_timeout_interval"
android:dependency="pref_timeout_passphrase"/> android:dependency="pref_timeout_passphrase"/>