From 058585bf81b195b6c67f7b9e6d61eefcc6fd33f0 Mon Sep 17 00:00:00 2001 From: 2-4601 Date: Tue, 19 Jan 2016 19:54:31 +0200 Subject: [PATCH] Fix five strings Fixes - one ambiguous pronoun - one remaining reference of ambiguous 'lock screen' - three cases of 'click' -> 'tap' And gets rid of unnecessary line breaks in two strings. Closes #5095 // FREEBIE --- res/layout/prompt_apn_activity.xml | 2 +- res/values/strings.xml | 16 ++++++---------- .../database/model/SmsMessageRecord.java | 4 ++-- .../AppProtectionPreferenceFragment.java | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/res/layout/prompt_apn_activity.xml b/res/layout/prompt_apn_activity.xml index 14f4118c8..5590f7642 100644 --- a/res/layout/prompt_apn_activity.xml +++ b/res/layout/prompt_apn_activity.xml @@ -29,7 +29,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dip" - android:text="@string/prompt_mms_activity__to_send_media_and_group_messages_click_ok"/> + android:text="@string/prompt_mms_activity__to_send_media_and_group_messages_tap_ok"/> Delete Disable passphrase? - - Disable lock screen for messages? - + This will permanently unlock Signal and message notifications. Disable Unregistering Unregistering from Signal messages and calls... @@ -92,9 +90,9 @@ Expires: %s Not delivered View secure media? - This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to disk. Are you sure that you would like to do this? + This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to storage. Are you sure that you would like to do this? Error, received stale key exchange message. - Received key exchange message, click to process. + Received key exchange message, tap to process. %1$s has left the group. Tap for details Tap for unsecured fallback @@ -510,9 +508,7 @@ Received key exchange message for invalid protocol version. - - Received message with unknown identity key. Click to process and display. - + Received message with unknown identity key. Tap to process and display. Received updated but unknown identity information. Tap to validate identity. Secure session reset. Duplicate message. @@ -758,7 +754,7 @@ Signal requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations. - To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once. + To send media and group messages, tap \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once. BLOCKED @@ -1146,7 +1142,7 @@ Tap to make Signal your default SMS app. SET Import system SMS - Tap to copy your phone\'s SMS messages into its encrypted database. + Tap to copy your phone\'s SMS messages into Signal\'s encrypted database. IMPORT Enable Signal messages and calls Upgrade your communication experience. diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java index 107df9951..cdbd38d89 100644 --- a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java @@ -73,13 +73,13 @@ public class SmsMessageRecord extends MessageRecord { } else if (MmsSmsColumns.Types.isLegacyType(type)) { return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported)); } else if (isBundleKeyExchange()) { - return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process)); + return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_unknown_identity_key_tap_to_process)); } else if (isIdentityUpdate()) { return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_updated_but_unknown_identity_information)); } else if (isKeyExchange() && isOutgoing()) { return new SpannableString(""); } else if (isKeyExchange() && !isOutgoing()) { - return emphasisAdded(context.getString(R.string.ConversationItem_received_key_exchange_message_click_to_process)); + return emphasisAdded(context.getString(R.string.ConversationItem_received_key_exchange_message_tap_to_process)); } else if (SmsDatabase.Types.isDuplicateMessageType(type)) { return emphasisAdded(context.getString(R.string.SmsMessageRecord_duplicate_message)); } else if (SmsDatabase.Types.isDecryptInProgressType(type)) { diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index 444eb26e0..d3ea667ae 100644 --- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java @@ -138,7 +138,7 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment { if (((CheckBoxPreference)preference).isChecked()) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.ApplicationPreferencesActivity_disable_passphrase); - builder.setMessage(R.string.ApplicationPreferencesActivity_disable_lock_screen); + builder.setMessage(R.string.ApplicationPreferencesActivity_disable_passphrase_locking_of_signal_and_message_notifications); builder.setIconAttribute(R.attr.dialog_alert_icon); builder.setPositiveButton(R.string.ApplicationPreferencesActivity_disable, new DialogInterface.OnClickListener() { @Override