Respond to CR.

7 years ago · 5b5ef7e0bf
parent ba557858e0
commit 5b5ef7e0bf
48 changed files with 63 additions and 63 deletions
--- a/Signal/src/ViewControllers/ContactViewController.swift
+++ b/Signal/src/ViewControllers/ContactViewController.swift
@ -273,7 +273,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
            stackView.axis = .horizontal
            stackView.distribution = .fillEqually
            stackView.addArrangedSubview(createCircleActionButton(text: NSLocalizedString("ACTION_SEND_MESSAGE",
-                                                                                          comment: "Label for 'sent message' button in contact view."),
+                                                                                          comment: "Label for 'send message' button in contact view."),
                                                                  imageName: "contact_view_message",
                                                                  actionBlock: { [weak self] in
                                                                    guard let strongSelf = self else { return }
@ -539,7 +539,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate {
        if let e164 = phoneNumber.tryToConvertToE164() {
            if contactShare.systemContactsWithSignalAccountPhoneNumbers(contactsManager).contains(e164) {
                actionSheet.addAction(UIAlertAction(title: NSLocalizedString("ACTION_SEND_MESSAGE",
-                                                                             comment: "Label for 'sent message' button in contact view."),
+                                                                             comment: "Label for 'send message' button in contact view."),
                                                    style: .default) { _ in
                                                        SignalApp.shared().presentConversation(forRecipientId: e164, action: .compose)
                })
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@ -134,7 +134,7 @@ NS_ASSUME_NONNULL_BEGIN
    return self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage;
 }

- (BOOL)shouldHavesendFailureBadge
+- (BOOL)shouldHaveSendFailureBadge
 {
    if (![self.viewItem.interaction isKindOfClass:[TSOutgoingMessage class]]) {
        return NO;
@ -170,7 +170,7 @@ NS_ASSUME_NONNULL_BEGIN
                                                      relation:NSLayoutRelationGreaterThanOrEqual],
        ]];
    } else {
-        if (self.shouldHavesendFailureBadge) {
+        if (self.shouldHaveSendFailureBadge) {
            self.sendFailureBadgeView = [UIImageView new];
            self.sendFailureBadgeView.image =
                [self.sendFailureBadge imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
@ -421,7 +421,7 @@ NS_ASSUME_NONNULL_BEGIN

    cellSize.height += self.dateHeaderHeight;

-    if (self.shouldHavesendFailureBadge) {
+    if (self.shouldHaveSendFailureBadge) {
        cellSize.width += self.sendFailureBadgeSize + self.sendFailureBadgeSpacing;
    }

--- a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
+++ b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
@ -58,14 +58,14 @@ public class MessageRecipientStatusUtils: NSObject {
        switch recipientState.state {
        case .failed:
            let shortStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED_SHORT", comment: "status message for failed messages")
-            let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment: "message footer for failed messages")
+            let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment: "status message for failed messages")
            return (status:.failed, shortStatusMessage:shortStatusMessage, longStatusMessage:longStatusMessage)
        case .sending:
            if outgoingMessage.hasAttachments() {
                assert(outgoingMessage.messageState == .sending)

                let statusMessage = NSLocalizedString("MESSAGE_STATUS_UPLOADING",
-                                                      comment: "message footer while attachment is uploading")
+                                                      comment: "status message while attachment is uploading")
                return (status:.uploading, shortStatusMessage:statusMessage, longStatusMessage:statusMessage)
            } else {
                assert(outgoingMessage.messageState == .sending)
@ -78,7 +78,7 @@ public class MessageRecipientStatusUtils: NSObject {
            if let readTimestamp = recipientState.readTimestamp {
                let timestampString = DateUtil.formatPastTimestampRelativeToNow(readTimestamp.uint64Value)
                let shortStatusMessage = timestampString
-                let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_READ", comment: "message footer for read messages").rtlSafeAppend(" ")
+                let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_READ", comment: "status message for read messages").rtlSafeAppend(" ")
                    .rtlSafeAppend(timestampString)
                return (status:.read, shortStatusMessage:shortStatusMessage, longStatusMessage:longStatusMessage)
            }
@ -92,7 +92,7 @@ public class MessageRecipientStatusUtils: NSObject {
            }
            let statusMessage =
                NSLocalizedString("MESSAGE_STATUS_SENT",
-                                  comment: "message footer for sent messages")
+                                  comment: "status message for sent messages")
            return (status:.sent, shortStatusMessage:statusMessage, longStatusMessage:statusMessage)
        case .skipped:
            let statusMessage = NSLocalizedString("MESSAGE_STATUS_RECIPIENT_SKIPPED",
@ -107,29 +107,29 @@ public class MessageRecipientStatusUtils: NSObject {
        switch outgoingMessage.messageState {
        case .failed:
            // Use the "long" version of this message here.
-            return (.failed, NSLocalizedString("MESSAGE_STATUS_FAILED", comment: "message footer for failed messages"))
+            return (.failed, NSLocalizedString("MESSAGE_STATUS_FAILED", comment: "status message for failed messages"))
        case .sending:
            if outgoingMessage.hasAttachments() {
                return (.uploading, NSLocalizedString("MESSAGE_STATUS_UPLOADING",
-                                         comment: "message footer while attachment is uploading"))
+                                         comment: "status message while attachment is uploading"))
            } else {
                return (.sending, NSLocalizedString("MESSAGE_STATUS_SENDING",
                                         comment: "message status while message is sending."))
            }
        case .sent:
            if outgoingMessage.readRecipientIds().count > 0 {
-                return (.read, NSLocalizedString("MESSAGE_STATUS_READ", comment: "message footer for read messages"))
+                return (.read, NSLocalizedString("MESSAGE_STATUS_READ", comment: "status message for read messages"))
            }
            if outgoingMessage.wasDeliveredToAnyRecipient {
                return (.delivered, NSLocalizedString("MESSAGE_STATUS_DELIVERED",
                                         comment: "message status for message delivered to their recipient."))
            }
            return (.sent, NSLocalizedString("MESSAGE_STATUS_SENT",
-                                     comment: "message footer for sent messages"))
+                                     comment: "status message for sent messages"))
        default:
            owsFail("\(self.logTag) Message has unexpected status: \(outgoingMessage.messageState).")
            return (.sent, NSLocalizedString("MESSAGE_STATUS_SENT",
-                                     comment: "message footer for sent messages"))
+                                     comment: "status message for sent messages"))
        }
    }

--- a/Signal/translations/ar.lproj/Localizable.strings
+++ b/Signal/translations/ar.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "ارسال دعوة";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "إرسال رسالة";

 /* Label for 'share contact' button. */
--- a/Signal/translations/az_AZ.lproj/Localizable.strings
+++ b/Signal/translations/az_AZ.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/bg.lproj/Localizable.strings
+++ b/Signal/translations/bg.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Покани във Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Изпрати Съобщение";

 /* Label for 'share contact' button. */
--- a/Signal/translations/bs.lproj/Localizable.strings
+++ b/Signal/translations/bs.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/ca.lproj/Localizable.strings
+++ b/Signal/translations/ca.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/cs.lproj/Localizable.strings
+++ b/Signal/translations/cs.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/da.lproj/Localizable.strings
+++ b/Signal/translations/da.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invitér til Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Besked";

 /* Label for 'share contact' button. */
--- a/Signal/translations/de.lproj/Localizable.strings
+++ b/Signal/translations/de.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Zu Signal einladen";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Nachricht senden";

 /* Label for 'share contact' button. */
--- a/Signal/translations/el_GR.lproj/Localizable.strings
+++ b/Signal/translations/el_GR.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view.
+/* Label for 'send message' button in contact view.
   Label for button that lets you send a message to a contact. */
 "ACTION_SEND_MESSAGE" = "Send Message";

@ -1206,13 +1206,13 @@
 /* message status for message delivered to their recipient. */
 "MESSAGE_STATUS_DELIVERED" = "Delivered";

-/* message footer for failed messages */
+/* status message for failed messages */
 "MESSAGE_STATUS_FAILED" = "Sending failed.";

 /* status message for failed messages */
 "MESSAGE_STATUS_FAILED_SHORT" = "Failed";

-/* message footer for read messages */
+/* status message for read messages */
 "MESSAGE_STATUS_READ" = "Read";

 /* message status if message delivery to a recipient is skipped. We skip delivering group messages to users who have left the group or unregistered their Signal account. */
@ -1224,10 +1224,10 @@
 /* message status while message is sending. */
 "MESSAGE_STATUS_SENDING" = "Sending...";

-/* message footer for sent messages */
+/* status message for sent messages */
 "MESSAGE_STATUS_SENT" = "Sent";

-/* message footer while attachment is uploading */
+/* status message while attachment is uploading */
 "MESSAGE_STATUS_UPLOADING" = "Uploading…";

 /* Indicates that one member of this group conversation is no longer verified. Embeds {{user's name or phone number}}. */
--- a/Signal/translations/es.lproj/Localizable.strings
+++ b/Signal/translations/es.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invitar a Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Enviar mensaje";

 /* Label for 'share contact' button. */
--- a/Signal/translations/et.lproj/Localizable.strings
+++ b/Signal/translations/et.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Kutsu Signalisse";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Saada sõnum";

 /* Label for 'share contact' button. */
--- a/Signal/translations/fa.lproj/Localizable.strings
+++ b/Signal/translations/fa.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "دعوت به سیگنال";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "ارسال پیام";

 /* Label for 'share contact' button. */
--- a/Signal/translations/fi.lproj/Localizable.strings
+++ b/Signal/translations/fi.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Kutsu Signaliin";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Lähetä viesti";

 /* Label for 'share contact' button. */
--- a/Signal/translations/fil.lproj/Localizable.strings
+++ b/Signal/translations/fil.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/fr.lproj/Localizable.strings
+++ b/Signal/translations/fr.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Inviter à Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Envoyer un message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/gl.lproj/Localizable.strings
+++ b/Signal/translations/gl.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/he.lproj/Localizable.strings
+++ b/Signal/translations/he.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "הזמן אל Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "שלח הודעה";

 /* Label for 'share contact' button. */
--- a/Signal/translations/hr.lproj/Localizable.strings
+++ b/Signal/translations/hr.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/hu.lproj/Localizable.strings
+++ b/Signal/translations/hu.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/id.lproj/Localizable.strings
+++ b/Signal/translations/id.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Undang gabung ke Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Kirim Pesan";

 /* Label for 'share contact' button. */
--- a/Signal/translations/it_IT.lproj/Localizable.strings
+++ b/Signal/translations/it_IT.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invita a Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Manda messaggio";

 /* Label for 'share contact' button. */
--- a/Signal/translations/ja_JP.lproj/Localizable.strings
+++ b/Signal/translations/ja_JP.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "招待する";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "メッセージ送信";

 /* Label for 'share contact' button. */
--- a/Signal/translations/km.lproj/Localizable.strings
+++ b/Signal/translations/km.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "អញ្ជើញចូលប្រើស៊ីហ្គណល";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "ផ្ញើសារ";

 /* Label for 'share contact' button. */
--- a/Signal/translations/ko_KR.lproj/Localizable.strings
+++ b/Signal/translations/ko_KR.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/lt.lproj/Localizable.strings
+++ b/Signal/translations/lt.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Pakviesti į Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Siųsti žinutę";

 /* Label for 'share contact' button. */
--- a/Signal/translations/lv.lproj/Localizable.strings
+++ b/Signal/translations/lv.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/mk.lproj/Localizable.strings
+++ b/Signal/translations/mk.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/my.lproj/Localizable.strings
+++ b/Signal/translations/my.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/nb_NO.lproj/Localizable.strings
+++ b/Signal/translations/nb_NO.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Inviter til Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send melding";

 /* Label for 'share contact' button. */
--- a/Signal/translations/nl.lproj/Localizable.strings
+++ b/Signal/translations/nl.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Nodig uit voor Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Stuur bericht";

 /* Label for 'share contact' button. */
--- a/Signal/translations/pl.lproj/Localizable.strings
+++ b/Signal/translations/pl.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Zaproś do Signala";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Wyślij wiadomość";

 /* Label for 'share contact' button. */
--- a/Signal/translations/pt_BR.lproj/Localizable.strings
+++ b/Signal/translations/pt_BR.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Convidar para o Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Enviar mensagem";

 /* Label for 'share contact' button. */
--- a/Signal/translations/pt_PT.lproj/Localizable.strings
+++ b/Signal/translations/pt_PT.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Convidar para o Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Enviar Mensagem";

 /* Label for 'share contact' button. */
--- a/Signal/translations/ro.lproj/Localizable.strings
+++ b/Signal/translations/ro.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invită pe Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Trimite mesaj";

 /* Label for 'share contact' button. */
--- a/Signal/translations/ru.lproj/Localizable.strings
+++ b/Signal/translations/ru.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Пригласить в Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Отправить сообщение";

 /* Label for 'share contact' button. */
--- a/Signal/translations/sl.lproj/Localizable.strings
+++ b/Signal/translations/sl.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Povabi k uporabi";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Pošlji sporočilo";

 /* Label for 'share contact' button. */
--- a/Signal/translations/sn.lproj/Localizable.strings
+++ b/Signal/translations/sn.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/sq.lproj/Localizable.strings
+++ b/Signal/translations/sq.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/sv_SE.lproj/Localizable.strings
+++ b/Signal/translations/sv_SE.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Bjud in till Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Skicka meddelande";

 /* Label for 'share contact' button. */
--- a/Signal/translations/th_TH.lproj/Localizable.strings
+++ b/Signal/translations/th_TH.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Invite to Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Send Message";

 /* Label for 'share contact' button. */
--- a/Signal/translations/tr_TR.lproj/Localizable.strings
+++ b/Signal/translations/tr_TR.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "Signal'e davet et";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "Mesaj Gönder";

 /* Label for 'share contact' button. */
--- a/Signal/translations/zh_CN.lproj/Localizable.strings
+++ b/Signal/translations/zh_CN.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "邀请其使用 Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "发送消息";

 /* Label for 'share contact' button. */
--- a/Signal/translations/zh_TW.lproj/Localizable.strings
+++ b/Signal/translations/zh_TW.lproj/Localizable.strings
@ -10,7 +10,7 @@
 /* Label for 'invite' button in contact view. */
 "ACTION_INVITE" = "邀請來使用 Signal";

-/* Label for 'sent message' button in contact view. */
+/* Label for 'send message' button in contact view. */
 "ACTION_SEND_MESSAGE" = "傳送訊息";

 /* Label for 'share contact' button. */
--- a/SignalMessaging/categories/UIColor+OWS.m
+++ b/SignalMessaging/categories/UIColor+OWS.m
@ -79,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN

 + (UIColor *)ows_destructiveRedColor
 {
-    return [UIColor colorWithRed:255.f / 255.f green:38.f / 255.f blue:31.f / 255.f alpha:1.0f];
+    return [UIColor colorWithRGBHex:0xF44336];
 }

 + (UIColor *)ows_errorMessageBorderColor