diff --git a/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/Contents.json b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/Contents.json new file mode 100644 index 000000000..3dec0220b --- /dev/null +++ b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "signal-possum-far-wclouds@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "signal-possum-far-wclouds@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "signal-possum-far-wclouds@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@1x.png b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@1x.png new file mode 100644 index 000000000..7fb553c93 Binary files /dev/null and b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@1x.png differ diff --git a/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@2x.png b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@2x.png new file mode 100644 index 000000000..f3c9cbe2f Binary files /dev/null and b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@2x.png differ diff --git a/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@3x.png b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@3x.png new file mode 100644 index 000000000..0f28c1d3c Binary files /dev/null and b/Signal/Images.xcassets/introductory_splash_custom_audio.imageset/signal-possum-far-wclouds@3x.png differ diff --git a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m index c57ed4b5d..f66ff9745 100644 --- a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m @@ -142,12 +142,13 @@ NS_ASSUME_NONNULL_BEGIN [alertController addAction:[OWSAlerts cancelAction]]; - UIAlertAction *deleteAction = - [UIAlertAction actionWithTitle:NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON", @"") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction *_Nonnull action) { - [self deleteThreadsAndMessages]; - }]; + UIAlertAction *deleteAction = [UIAlertAction + actionWithTitle:NSLocalizedString(@"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON", + @"Confirmation text for button which deletes all message, calling, attachments, etc.") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [self deleteThreadsAndMessages]; + }]; [alertController addAction:deleteAction]; [self presentViewController:alertController animated:true completion:nil]; diff --git a/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift b/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift index c4789133c..edf3bc739 100644 --- a/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift +++ b/Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift @@ -58,7 +58,7 @@ class ExperienceUpgradeFinder: NSObject { return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.introducingCustomNotificationAudio.rawValue, title: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_TITLE", comment: "Header for upgrade experience"), body: NSLocalizedString("UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION", comment: "Description for notification audio customization"), - image:#imageLiteral(resourceName: "introductory_splash_read_receipts")) + image:#imageLiteral(resourceName: "introductory_splash_custom_audio")) } // Keep these ordered by increasing uniqueId. diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 84ba8fe98..0d37bc14c 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1534,7 +1534,7 @@ "SETTINGS_CALLING_HIDES_IP_ADDRESS_PREFERENCE_TITLE_DETAIL" = "Relay all calls through the Signal server to avoid revealing your IP address to your contact. Enabling will reduce call quality."; /* No comment provided by engineer. */ -"SETTINGS_CLEAR_HISTORY" = "Clear History Logs"; +"SETTINGS_CLEAR_HISTORY" = "Clear Conversation History"; /* No comment provided by engineer. */ "SETTINGS_COPYRIGHT" = "Copyright Open Whisper Systems \n Licensed under the GPLv3"; @@ -1545,14 +1545,14 @@ /* Alert message before user confirms clearing history */ "SETTINGS_DELETE_HISTORYLOG_CONFIRMATION" = "Are you sure you want to delete all your history (messages, attachments, call history …) ? This action cannot be reverted."; -/* No comment provided by engineer. */ -"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "I'm sure."; +/* Confirmation text for button which deletes all message, calling, attachments, etc. */ +"SETTINGS_DELETE_HISTORYLOG_CONFIRMATION_BUTTON" = "Delete Everything"; /* No comment provided by engineer. */ "SETTINGS_HELP_HEADER" = "Help"; /* Section header */ -"SETTINGS_HISTORYLOG_TITLE" = "History Log"; +"SETTINGS_HISTORYLOG_TITLE" = "Clear Conversation History"; /* No comment provided by engineer. */ "SETTINGS_INFORMATION_HEADER" = "Information"; @@ -1582,10 +1582,10 @@ "SETTINGS_PRIVACY_CALLKIT_PRIVACY_TITLE" = "Show Caller's Name & Number"; /* Settings table section footer. */ -"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Disabling this will prevent calls from appearing in the \"Recents\" list in the iOS Phone app."; +"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_DESCRIPTION" = "Show calls in the \"Recents\" list in the iOS Phone app."; /* Short table cell label */ -"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE" = "System Call Logs"; +"SETTINGS_PRIVACY_CALLKIT_SYSTEM_CALL_LOG_PREFERENCE_TITLE" = "Show Calls in Recents"; /* Short table cell label */ "SETTINGS_PRIVACY_CALLKIT_TITLE" = "iOS Call Integration"; @@ -1786,7 +1786,7 @@ "UPGRADE_EXPERIENCE_CALLKIT_TITLE" = "Just Swipe to Answer"; /* Description for notification audio customization */ -"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "You can now specify default and per thread text tones. And calls now respect your system contact's ringtone."; +"UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_DESCRIPTION" = "You can now choose default and per-conversation notification sounds, and calls will respect the ringtone you've choosen for each system contact."; /* button label shown one time, after upgrade */ "UPGRADE_EXPERIENCE_INTRODUCING_NOTIFICATION_AUDIO_SETTINGS_BUTTON" = "Review Notification Settings";