From 5fc16c1d9381e4abf36d8947337677ceb555e34e Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 5 Jul 2018 10:08:42 -0400 Subject: [PATCH 1/5] Tweak message send failed indicator. --- .../Cells/OWSMessageFooterView.m | 51 ++++++++++++++----- .../translations/ar.lproj/Localizable.strings | 4 +- .../az_AZ.lproj/Localizable.strings | 4 +- .../translations/bg.lproj/Localizable.strings | 4 +- .../translations/bs.lproj/Localizable.strings | 4 +- .../translations/ca.lproj/Localizable.strings | 4 +- .../translations/cs.lproj/Localizable.strings | 4 +- .../translations/da.lproj/Localizable.strings | 4 +- .../translations/de.lproj/Localizable.strings | 4 +- .../el_GR.lproj/Localizable.strings | 4 +- .../translations/en.lproj/Localizable.strings | 14 +++-- .../translations/es.lproj/Localizable.strings | 4 +- .../translations/et.lproj/Localizable.strings | 4 +- .../translations/fa.lproj/Localizable.strings | 4 +- .../translations/fi.lproj/Localizable.strings | 4 +- .../fil.lproj/Localizable.strings | 4 +- .../translations/fr.lproj/Localizable.strings | 4 +- .../translations/gl.lproj/Localizable.strings | 4 +- .../translations/he.lproj/Localizable.strings | 4 +- .../translations/hr.lproj/Localizable.strings | 4 +- .../translations/hu.lproj/Localizable.strings | 4 +- .../translations/id.lproj/Localizable.strings | 4 +- .../it_IT.lproj/Localizable.strings | 4 +- .../ja_JP.lproj/Localizable.strings | 4 +- .../translations/km.lproj/Localizable.strings | 4 +- .../ko_KR.lproj/Localizable.strings | 4 +- .../translations/lt.lproj/Localizable.strings | 4 +- .../translations/lv.lproj/Localizable.strings | 4 +- .../translations/mk.lproj/Localizable.strings | 4 +- .../translations/my.lproj/Localizable.strings | 4 +- .../nb_NO.lproj/Localizable.strings | 4 +- .../translations/nl.lproj/Localizable.strings | 4 +- .../translations/pl.lproj/Localizable.strings | 4 +- .../pt_BR.lproj/Localizable.strings | 4 +- .../pt_PT.lproj/Localizable.strings | 4 +- .../translations/ro.lproj/Localizable.strings | 4 +- .../translations/ru.lproj/Localizable.strings | 4 +- .../translations/sl.lproj/Localizable.strings | 4 +- .../translations/sn.lproj/Localizable.strings | 4 +- .../translations/sq.lproj/Localizable.strings | 4 +- .../sv_SE.lproj/Localizable.strings | 4 +- .../th_TH.lproj/Localizable.strings | 4 +- .../tr_TR.lproj/Localizable.strings | 4 +- .../zh_CN.lproj/Localizable.strings | 4 +- .../zh_TW.lproj/Localizable.strings | 4 +- SignalServiceKit/src/Util/OWSError.m | 4 +- 46 files changed, 134 insertions(+), 107 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m index 8676723ad..75f6f6dfb 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageFooterView.m @@ -107,21 +107,24 @@ NS_ASSUME_NONNULL_BEGIN statusIndicatorImage = [UIImage imageNamed:@"message_status_delivered"]; break; case MessageReceiptStatusFailed: - // TODO: - statusIndicatorImage = [UIImage imageNamed:@"message_status_sending"]; + // No status indicator icon. break; } - OWSAssert(statusIndicatorImage); - OWSAssert(statusIndicatorImage.size.width <= self.maxImageWidth); - self.statusIndicatorImageView.image = - [statusIndicatorImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; - if (messageStatus == MessageReceiptStatusRead) { - self.statusIndicatorImageView.tintColor = [UIColor ows_signalBlueColor]; + if (statusIndicatorImage) { + OWSAssert(statusIndicatorImage.size.width <= self.maxImageWidth); + self.statusIndicatorImageView.image = + [statusIndicatorImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; + if (messageStatus == MessageReceiptStatusRead) { + self.statusIndicatorImageView.tintColor = [UIColor ows_signalBlueColor]; + } else { + self.statusIndicatorImageView.tintColor = textColor; + } + self.statusIndicatorImageView.hidden = NO; } else { - self.statusIndicatorImageView.tintColor = textColor; + self.statusIndicatorImageView.image = nil; + self.statusIndicatorImageView.hidden = YES; } - self.statusIndicatorImageView.hidden = NO; } else { self.statusIndicatorImageView.image = nil; self.statusIndicatorImageView.hidden = YES; @@ -141,13 +144,32 @@ NS_ASSUME_NONNULL_BEGIN [self.statusIndicatorImageView.layer addAnimation:animation forKey:@"animation"]; } +- (BOOL)isFailedOutgoingMessage:(ConversationViewItem *)viewItem +{ + OWSAssert(viewItem); + + if (viewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage) { + return NO; + } + + TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)viewItem.interaction; + MessageReceiptStatus messageStatus = + [MessageRecipientStatusUtils recipientStatusWithOutgoingMessage:outgoingMessage]; + return messageStatus == MessageReceiptStatusFailed; +} + - (void)configureLabelsWithConversationViewItem:(ConversationViewItem *)viewItem { OWSAssert(viewItem); [self configureFonts]; - self.timestampLabel.text = [DateUtil formatTimestampAsTimeShort:viewItem.interaction.timestamp]; + if ([self isFailedOutgoingMessage:viewItem]) { + self.timestampLabel.text + = NSLocalizedString(@"MESSAGE_STATUS_SEND_FAILED", @"Label indicating that a message failed to send."); + } else { + self.timestampLabel.text = [DateUtil formatTimestampAsTimeShort:viewItem.interaction.timestamp]; + } } - (CGSize)measureWithConversationViewItem:(ConversationViewItem *)viewItem @@ -158,10 +180,11 @@ NS_ASSUME_NONNULL_BEGIN CGSize result = CGSizeZero; result.height = MAX(self.timestampLabel.font.lineHeight, self.imageHeight); + result.width = [self.timestampLabel sizeThatFits:CGSizeZero].width; if (viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage) { - result.width = ([self.timestampLabel sizeThatFits:CGSizeZero].width + self.maxImageWidth + self.hSpacing); - } else { - result.width = [self.timestampLabel sizeThatFits:CGSizeZero].width; + if (![self isFailedOutgoingMessage:viewItem]) { + result.width += (self.maxImageWidth + self.hSpacing); + } } return CGSizeCeil(result); } diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index ca573c23e..913f87432 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "غير قادر على الارسال بسبب بيانات الخصوصية القديمة."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "لم ينجح بعث الرسالة لأن المستخدم محظور."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "لم ينجح بعث الرسالة لأن المستخدم محظور."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal غير قادر على الاتصال بالإنترنت. من فضلك حاول من شبكة WiFi أخرى أو استخدم بيانات الهاتف."; diff --git a/Signal/translations/az_AZ.lproj/Localizable.strings b/Signal/translations/az_AZ.lproj/Localizable.strings index 08136c13f..59409c639 100644 --- a/Signal/translations/az_AZ.lproj/Localizable.strings +++ b/Signal/translations/az_AZ.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal internetə qoşulmadı. Başqa WiFi şəbəkəsinə və ya mobil şəbəkəyə qoşulun."; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index a7691046d..a3923cb89 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Не може да се изпрати поради остаряли лични данни."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Съобщението не е изпратено защото сте блокирали потребителя."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Съобщението не е изпратено защото сте блокирали потребителя."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Неуспешен опит за прикачване."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Неуспешен опит за прикачване."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Сигнал не успя да се свърже с интернет. Моля, опитайте от друга WiFi мрежа или чрез използване на мобилни данни."; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 9e16030e4..27b744b1f 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nije moguće poslati zbog neažuiranih privatnih podatka."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nije u mogućnosti povezati se na internet. Molimo pokušajte sa drugom WiFi ili mobilnom mrežom."; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index ea90ecdb0..b61be568e 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "No s'ha pogut enviar degut a dades de privadesa obsoletes."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "No s'ha pogut enviar el missatge perquè heu blocat l'usuari."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "No s'ha pogut enviar el missatge perquè heu blocat l'usuari."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "El Signal no s'ha pogut connectar a Internet. Proveu des d'altra xarxa WiFi o utilitzeu dades mòbils."; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 3810e3525..88bcb36f1 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nemohu odeslat kvůli starým datům soukromí."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepodařilo se poslat zprávu, protože jste tohoto uživatele zablokoval(a)."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepodařilo se poslat zprávu, protože jste tohoto uživatele zablokoval(a)."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Chyba při zápisu přílohy."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Chyba při zápisu přílohy."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal se nemohl připojit k internetu. Zkuste jinou bezdrátovou síť, nebo mobilní data."; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 81a7c50bf..3dec802fa 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kunne ikke sende pga. gammel privatlivsdata."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende beskeden til brugeren fordi du har blokeret dem."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende beskeden til brugeren fordi du har blokeret dem."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kan ikke forbinde til internettet. Prøv et andet WIFI netværk eller benyt mobildata."; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 3a7d9bcb0..604bfeed7 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Senden nicht möglich aufgrund veralteter Schlüssel."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nachrichtenversand gescheitert, da du den Benutzer blockiert hast."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nachrichtenversand gescheitert, da du den Benutzer blockiert hast."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Senden gescheitert, da Fehler beim Schreiben des Anhangs."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Senden gescheitert, da Fehler beim Schreiben des Anhangs."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal konnte keine Verbindung zum Internet herstellen. Bitte versuche ein anderes WLAN-Netz oder verwende die mobile Datenverbindung."; diff --git a/Signal/translations/el_GR.lproj/Localizable.strings b/Signal/translations/el_GR.lproj/Localizable.strings index 106d25c73..702a3355e 100644 --- a/Signal/translations/el_GR.lproj/Localizable.strings +++ b/Signal/translations/el_GR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Αποτυχία αποστολής λόγω υπολειπόμενων δεδομένων ιδιωτικότητας."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Αποτυχία αποστολής μηνύματος στον χρήστη γιατί τον/την έχεις μπλοκάρει."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Αποτυχία αποστολής μηνύματος στον χρήστη γιατί τον/την έχεις μπλοκάρει."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Αποτυχία λόγω αποτυχίας εγγραφής συνημμένου."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Αποτυχία λόγω αποτυχίας εγγραφής συνημμένου."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Το Signal δεν μπόρεσε να συνδεθεί στο διαδίκτυο. Παρακαλώ προσπάθησε να συνδεθείς σε άλλο δίκτυο WiFi ή να χρησιμοποιήσεις τα δεδομένα της κινητής."; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 34780cb68..8a85bd8b9 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -10,7 +10,8 @@ /* Label for 'invite' button in contact view. */ "ACTION_INVITE" = "Invite to Signal"; -/* Label for 'sent message' button in contact view. */ +/* Label for 'sent message' button in contact view. + Label for button that lets you send a message to a contact. */ "ACTION_SEND_MESSAGE" = "Send Message"; /* Label for 'share contact' button. */ @@ -511,7 +512,7 @@ /* Navbar title when viewing settings for a 1-on-1 thread */ "CONVERSATION_SETTINGS_CONTACT_INFO_TITLE" = "Contact Info"; -/* Indicates that user's profile has been shared with a group. */ +/* Label for table cell which leads to picking a new conversation color */ "CONVERSATION_SETTINGS_CONVERSATION_COLOR" = "Color"; /* Navbar title when viewing settings for a group thread */ @@ -819,10 +820,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; @@ -1206,7 +1207,7 @@ "MESSAGE_STATUS_DELIVERED" = "Delivered"; /* message footer for failed messages */ -"MESSAGE_STATUS_FAILED" = "Sending failed. Tap for info."; +"MESSAGE_STATUS_FAILED" = "Sending failed."; /* status message for failed messages */ "MESSAGE_STATUS_FAILED_SHORT" = "Failed"; @@ -1217,6 +1218,9 @@ /* 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. */ "MESSAGE_STATUS_RECIPIENT_SKIPPED" = "Skipped"; +/* Label indicating that a message failed to send. */ +"MESSAGE_STATUS_SEND_FAILED" = "Send Failed"; + /* message status while message is sending. */ "MESSAGE_STATUS_SENDING" = "Sending..."; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index bbd2bdbfc..82222b77c 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Imposible enviar: Claves de cifrado obsoletas."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Fallo al enviar mensaje: Contactos bloqueados."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Fallo al enviar mensaje: Contactos bloqueados."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallo al enviar por problemas con el adjunto."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallo al enviar por problemas con el adjunto."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal no ha podido conectarse a internet. Prueba a conectarte desde otra red WiFi o usa la red de datos de tu operador."; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index a4198532b..1bae924fe 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Pole võimalik saata aegunud privaatsusandmete tõttu."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kasutajale sõnumi saatmine ei õnnestunud, sest sa oled ta blokeerinud."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kasutajale sõnumi saatmine ei õnnestunud, sest sa oled ta blokeerinud."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Ei õnnestunud manuse kirjutamise ebaõnnestumise tõttu."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Ei õnnestunud manuse kirjutamise ebaõnnestumise tõttu."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signalil ei õnnestunud Internetti ühenduda. Palun proovi mõnda teist WiFi-võrku või kasuta mobiilset andmesidet."; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index c4eb1679f..1b3d50b11 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "خطا در ارسال پیام به دلیل داده قدیمی."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "امکان ارسال پیام به کاربری که مسدود کرده‌اید وجود ندارد."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "امکان ارسال پیام به کاربری که مسدود کرده‌اید وجود ندارد."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "خطا در نوشتن ضمیمه."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "خطا در نوشتن ضمیمه."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "امکان برقراری ارتباط سیگنال با اینترنت وجود ندارد. لطفاً از یک شبکه‌ی بیسیم دیگر و یا از اینترنت سیم کارت خود استفاده کنید."; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index e8126d663..c2a4e9d4e 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Lähettäminen ei onnistu vanhentuneiden yksityisyystietojen vuoksi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Viestin lähettäminen ei onnistunut, koska olet estänyt kyseisen yhteystiedon."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Viestin lähettäminen ei onnistunut, koska olet estänyt kyseisen yhteystiedon."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Lähetys epäonnistui koska liitteen lisääminen epäonnistui."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Lähetys epäonnistui koska liitteen lisääminen epäonnistui."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal ei saanut yhteyttä internetiin. Yritä uudelleen toisesta WiFi-verkosta tai kokeile mobiiliyhteyttä."; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 142eb7b52..de7353707 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index a280d4f28..737473551 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Impossible d’envoyer en raison de données de confidentialité périmées."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Échec d’envoi du message, car vous avez bloqué cet utilisateur."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Échec d’envoi du message, car vous avez bloqué cet utilisateur."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Échec en raison d’un échec d’écriture de la pièce jointe."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Échec en raison d’un échec d’écriture de la pièce jointe."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal n’a pas pu se connecter à Internet. Veuillez essayer un autre réseau Wi-Fi ou utiliser les données mobiles."; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index cc59135cc..3978a07a2 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Non se puido enviar por mor duns datos de privacidade obsoletos."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Non se pode enviar a mensaxe porque bloqueaches o usuario."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Non se pode enviar a mensaxe porque bloqueaches o usuario."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Erro de escritura do ficheiro anexo."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Erro de escritura do ficheiro anexo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal non se pode conectar a internet. Procura conectarte a outra rede wifi ou utiliza os datos móbiles."; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index a24130633..93ceba631 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "לא היה ניתן לשלוח עקב נתוני פרטיות מיושנים."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "לא ניתן לשלוח הודעה מכיוון שהמשתמש חסום על ידך"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "לא ניתן לשלוח הודעה מכיוון שהמשתמש חסום על ידך"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "נכשל עקב כתיבת כושלת של צרופה."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "נכשל עקב כתיבת כושלת של צרופה."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal לא היה מסוגל להתחבר לאינטרנט. אנא נסה מרשת WiFi אחרת או השתמש בנתונים סלולריים."; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index b7c9223bb..686099573 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nije moguće poslati zbog neažuiranih privatnih podatka."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Nije uspjelo zbog neuspjelog pisanja privitka."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Nije uspjelo zbog neuspjelog pisanja privitka."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nije u mogućnosti povezati se na internet. Molimo pokušajte sa drugom WiFi ili mobilnom mrežom."; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 16cf3f787..738b5ffac 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index a6e65d3ae..8ecc36a8b 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Tak dapat mengirimkan karena privasi data buruk."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Gagal mengirim pesan ke pengguna karena Anda memblokir mereka."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Gagal mengirim pesan ke pengguna karena Anda memblokir mereka."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Gagal karena gagal menulis pada lampiran."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Gagal karena gagal menulis pada lampiran."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal tidak dapat terhubung dengan internet. Mohon mencoba dari jaringan Wifi lain atau gunakan koneksi mobile."; diff --git a/Signal/translations/it_IT.lproj/Localizable.strings b/Signal/translations/it_IT.lproj/Localizable.strings index 7b4b3b903..2a2a4aad6 100644 --- a/Signal/translations/it_IT.lproj/Localizable.strings +++ b/Signal/translations/it_IT.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Invio non riuscito a causa di informazioni sulla privacy scaduti."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Impossibile inviare un messaggio ad un utente bloccato."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Impossibile inviare un messaggio ad un utente bloccato."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallito a causa di un problema in scrittura."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallito a causa di un problema in scrittura."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal non è in grado di connettersi ad Internet. Riprovare da un'altra rete WiFi o tramite rete dati."; diff --git a/Signal/translations/ja_JP.lproj/Localizable.strings b/Signal/translations/ja_JP.lproj/Localizable.strings index 37d4323ab..b909a46ae 100644 --- a/Signal/translations/ja_JP.lproj/Localizable.strings +++ b/Signal/translations/ja_JP.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "プライバシー情報が古くて送信できません。"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "相手を拒否しているのでメッセージを送れませんでした"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "相手を拒否しているのでメッセージを送れませんでした"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "添付ファイルの書き込み失敗による送信失敗"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "添付ファイルの書き込み失敗による送信失敗"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "インターネットに接続できませんでした。Wi-Fiのネットワークを変えるか，モバイルデータ通信を使ってみてください。"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index f1f424874..a1bd9598b 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "មិនអាចផ្ញើដោយសារទិន្នន័យឯកជនចាស់ពេក។"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "បរាជ័យក្នុងការផ្ញើសារទៅអ្នកប្រើប្រាស់ ព្រោះអ្នកបានបិទពួកគេ។"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "បរាជ័យក្នុងការផ្ញើសារទៅអ្នកប្រើប្រាស់ ព្រោះអ្នកបានបិទពួកគេ។"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "បរាជ័យដោយសារមិនអាចដាក់ឯកសារភ្ជាប់។"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "បរាជ័យដោយសារមិនអាចដាក់ឯកសារភ្ជាប់។"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "ស៊ីហ្គណលមិនអាចតភ្ជាប់ទៅកាន់អ៊ីនធើណែត។ សូមព្យាយាមពីបណ្តាញ WiFi ផ្សេងទៀត ឬប្រើប្រាស់អ៊ីនធើណែតទូរសព្ទ។"; diff --git a/Signal/translations/ko_KR.lproj/Localizable.strings b/Signal/translations/ko_KR.lproj/Localizable.strings index a919df362..4366ab91a 100644 --- a/Signal/translations/ko_KR.lproj/Localizable.strings +++ b/Signal/translations/ko_KR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "시그널이 인터네트에 접속불가능. 다른 Wifi 네트워크나 모바일 데이터를 사용하세요."; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index bf77e085d..094b5d5d2 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nepavyko išsiųsti dėl pasenusiųjų privatumo duomenų."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepavyko išsiųsti naudotojui žinutės, kadangi jūs jį užblokavote."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepavyko išsiųsti naudotojui žinutės, kadangi jūs jį užblokavote."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Patyrė nesėkmę dėl nepavykusio įrašyti priedo."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Patyrė nesėkmę dėl nepavykusio įrašyti priedo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nepavyko prisijungti prie interneto. Prašome pabandyti iš kito bevielio (WiFi) tinklo arba naudoti mobiliuosius duomenis."; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 3353347df..1a06cb085 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index b0ceea84e..65ea3ca55 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Невозможно е испраќањето поради застоена приватност на податоци."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Неуспешно е да разговарате со корисникот , бидејќи го имате блокирано."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Неуспешно е да разговарате со корисникот , бидејќи го имате блокирано."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal не може да се поврзе на интернет. Ве молиме пробајте преку друга безжична мрежа или користете мобилен интенет."; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index a9309ca9f..cb0b6ced2 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "ကိုယ်ရေးအချက်အလက်များကြောင့် ပေးပို့နိုင်ခြင်းမရှိပါ။ "; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "သင်ဘလော့ထားသည့်အတွက် စာတိုပေးပို့နိုင်ခြင်းမရှိပါ။ "; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "သင်ဘလော့ထားသည့်အတွက် စာတိုပေးပို့နိုင်ခြင်းမရှိပါ။ "; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ပူးတွဲ ဖိုင်ချိတ်ခြင်း မအောင်မြင်ပါ။ "; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ပူးတွဲ ဖိုင်ချိတ်ခြင်း မအောင်မြင်ပါ။ "; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal ကအင်တာနက်မချိတ်နိုင်ပါ။ အခြားဝိုင်ယာလက်ကွန်ယက် သို့မဟုတ် ဖုန်းဒေတာကွန်ယက်သို့ချိတ်ဆက်၍ ကြိုးစားကြည့်ပါ။ "; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index 23c4071ef..bab6eb43a 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kan ikke sende på grunn av problemer med oppdatering av private data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende melding fordi kontakten er i blokkeringslisten din."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende melding fordi kontakten er i blokkeringslisten din."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Feilet fordi lagring av vedlegg feilet."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Feilet fordi lagring av vedlegg feilet."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal klarte ikke å koble seg til internett. Forsøk et annet trådløst nettverk, eller bruk mobildata."; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 604737918..5bfd20dda 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kan niet verzenden wegens verouderde privacygegevens."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Bericht verzenden mislukt omdat je de gebruiker hebt geblokkeerd."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Bericht verzenden mislukt omdat je de gebruiker hebt geblokkeerd."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Mislukt wegens mislukt opslaan van bijlage."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Mislukt wegens mislukt opslaan van bijlage."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kan geen verbinding maken met het internet. Probeer vanaf een ander wifinetwerk of gebruik mobiele data."; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 2f4a07be3..e7c31d528 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Wysyłanie wiadomości nie powiodło się ponieważ zablokowałeś/aś tego użytkownika."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Wysyłanie wiadomości nie powiodło się ponieważ zablokowałeś/aś tego użytkownika."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Błąd z powodu nieudanego zapisu załącznika."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Błąd z powodu nieudanego zapisu załącznika."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nie mógł połączyć się z internetem. Spróbuj użyć innej sieci WiFi lub danych komórkowych."; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index fd5bc8c8e..c881927c1 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Não é possível enviar devido a dados de privacidade obsoletos."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mensagem não enviada pois o usuário está bloqueado."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mensagem não enviada pois o usuário está bloqueado."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha ao gravar anexo."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha ao gravar anexo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "O Signal não pôde se conectar à Internet. Tente outra rede Wi-Fi ou utilize dados móveis."; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 9e3a41bce..82f8e16ba 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Incapaz de enviar."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Falhou a envio da mensagem para o utilizador porque o bloqueou anteriormente."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Falhou a envio da mensagem para o utilizador porque o bloqueou anteriormente."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha devido a falha a escrever o anexo."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha devido a falha a escrever o anexo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "O signal foi incapaz de se ligar à internet. Por favor tente desde outra rede Wifi ou utilizando a rede móvel."; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index dc123aa5c..3ea0dc7f3 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Trimiterea a eșuat din cauza datelor vechi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mesajul nu a fost trimis deoarece ai blocat acest utilizator."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mesajul nu a fost trimis deoarece ai blocat acest utilizator."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eșuat din cauza unei erori la salvarea atașamentului."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eșuat din cauza unei erori la salvarea atașamentului."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nu s-a putut conecta la internet. Te rog să incerci dintr-o altă rețea WiFi sau folosește datele mobile."; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index a118b2ebe..aadbf6d22 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Не удалось отправить в связи с неактуальными данными приватности"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Не удалось отправить сообщение пользователю, так как Вы заблокировали его."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Не удалось отправить сообщение пользователю, так как Вы заблокировали его."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Произошла ошибка во время прикрепления вложения."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Произошла ошибка во время прикрепления вложения."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Не удалось установить интернет-соединение. Пожалуйста, попробуйте соединиться через другую WiFi-сеть или используйте мобильный интернет."; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 9199d28cd..6a0a114dd 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Pošiljanje ni mogoče zaradi zastarelih podatkov o zasebnosti."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Sporočilo ni moglo biti poslano, ker je uporabnik blokiran."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Sporočilo ni moglo biti poslano, ker je uporabnik blokiran."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Pošiljanje neuspešno zaradi napake v zvezi s priponko."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Pošiljanje neuspešno zaradi napake v zvezi s priponko."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Aplikacija Signal nima dostopa do interneta. Poskusite znova iz drugega omrežja WiFi ali preko podatkovne povezave."; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 2e84d954d..5e098f515 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Yatadza kutumira pamusaka pedata rekuhwandisa ragarisa."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Yatadza kutumira tsamba kumushandisi nekuti wakamuvharira."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Yatadza kutumira tsamba kumushandisi nekuti wakamuvharira."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Yatadza nekuda kwekutadza kunyora chibatanidzwa."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Yatadza nekuda kwekutadza kunyora chibatanidzwa."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal yatadza kuhakira padandemutande. Tinokumbira kuti muedze kubva kumasaisai mamwe eWiFi kana kushandisa dhata yenharembozha."; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index cf4c6cd0c..328d6c213 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nuk mundi të lidhet në Internet. Ju lutemi provoni nga një rrjet tjetër WiFi apo rrjet celulari."; diff --git a/Signal/translations/sv_SE.lproj/Localizable.strings b/Signal/translations/sv_SE.lproj/Localizable.strings index 9cda68bc2..afcd25be7 100644 --- a/Signal/translations/sv_SE.lproj/Localizable.strings +++ b/Signal/translations/sv_SE.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kunden inte sända på grund av gammalt privacy-data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunde inte skicka meddelande eftersom du blockerat användaren"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunde inte skicka meddelande eftersom du blockerat användaren"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Misslyckades, skrivfel för bifogad fil."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Misslyckades, skrivfel för bifogad fil."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kunde inte nå ut på internet. Försök igen från ett annat trådlöst nätverk eller använd mobildata."; diff --git a/Signal/translations/th_TH.lproj/Localizable.strings b/Signal/translations/th_TH.lproj/Localizable.strings index 2216a82cb..269db28cb 100644 --- a/Signal/translations/th_TH.lproj/Localizable.strings +++ b/Signal/translations/th_TH.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "ไม่สามารถส่ง เนื่องจากข้อมูลส่วนบุคคลที่หมดอายุ"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "ส่งข้อความไปหาผู้ใช้ไม่สำเร็จ เนื่องจากคุณได้บล็อกเขา"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "ส่งข้อความไปหาผู้ใช้ไม่สำเร็จ เนื่องจากคุณได้บล็อกเขา"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ไม่สำเร็จ เนื่องจากไม่สามารถเขียนไฟล์แนบได้"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ไม่สำเร็จ เนื่องจากไม่สามารถเขียนไฟล์แนบได้"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal ไม่สามารถเชื่อมต่ออินเทอร์เน็ต โปรดลองเชื่อมต่อเครือข่าย WiFi อื่นหรือใช้งานข้อมูลโทรศัพท์มือถือ"; diff --git a/Signal/translations/tr_TR.lproj/Localizable.strings b/Signal/translations/tr_TR.lproj/Localizable.strings index 4666454ed..12ba63aa0 100644 --- a/Signal/translations/tr_TR.lproj/Localizable.strings +++ b/Signal/translations/tr_TR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Eski gizlilik ayarlarından dolayı gönderilemedi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Engellediğiniz için kullanıcıya mesaj gönderilemedi."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Engellediğiniz için kullanıcıya mesaj gönderilemedi."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eklenti yazımı başarısız olduğundan dolayı gönderilemedi."; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eklenti yazımı başarısız olduğundan dolayı gönderilemedi."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Sinyal internete bağlanamadı. Lütfen başka bir WiFi ağından deneyin veya mobil veri kullanın."; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index d70d7c531..f36cf4b94 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "由于隐私信息过时，无法发送。"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "无法向黑名单用户发送消息"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "无法向黑名单用户发送消息"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "因无法写附件而失败。"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "因无法写附件而失败。"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal 无法联网. 请尝试使用其它网络或者使用移动数据."; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index 0a020aef9..e467eb5db 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "無法傳送，因隱私資料太舊。"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "無法傳送訊息給此人，因為被你封鎖了。"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "無法傳送訊息給此人，因為被你封鎖了。"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "失敗，因附件寫入失敗。"; +"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "失敗，因附件寫入失敗。"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal 無法連結到網際網路。請改試其他的 WiFi 或行動網路。"; diff --git a/SignalServiceKit/src/Util/OWSError.m b/SignalServiceKit/src/Util/OWSError.m index 870958f53..cd2c6b347 100644 --- a/SignalServiceKit/src/Util/OWSError.m +++ b/SignalServiceKit/src/Util/OWSError.m @@ -60,14 +60,14 @@ NSError *OWSErrorMakeMessageSendDisabledDueToPreKeyUpdateFailuresError() NSError *OWSErrorMakeMessageSendFailedToBlockListError() { return OWSErrorWithCodeDescription(OWSErrorCodeMessageSendFailedToBlockList, - NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST", + NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST", @"Error message indicating that message send failed due to block list")); } NSError *OWSErrorMakeWriteAttachmentDataError() { return OWSErrorWithCodeDescription(OWSErrorCodeCouldNotWriteAttachmentData, - NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE", + NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE", @"Error message indicating that message send failed due to failed attachment write")); } From 19699fd45f6a3e961071db93f4f07975fd18ccba Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 5 Jul 2018 10:25:30 -0400 Subject: [PATCH 2/5] Tweak message send failed indicator. --- .../Contents.json | 6 +- .../error-20@1x.png | Bin 0 -> 365 bytes .../error-20@2x.png | Bin 0 -> 765 bytes .../error-20@3x.png | Bin 0 -> 1380 bytes .../message_send_failure@1x.png | Bin 1733 -> 0 bytes .../message_send_failure@2x.png | Bin 2428 -> 0 bytes .../message_send_failure@3x.png | Bin 3328 -> 0 bytes .../ConversationView/Cells/OWSMessageCell.m | 80 ++++++++++++++++-- SignalMessaging/categories/UIColor+OWS.m | 2 +- 9 files changed, 77 insertions(+), 11 deletions(-) rename Signal/Images.xcassets/{message_send_failure.imageset => message_send_failed.imageset}/Contents.json (64%) create mode 100644 Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png create mode 100644 Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png create mode 100644 Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png delete mode 100644 Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@1x.png delete mode 100644 Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@2x.png delete mode 100644 Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@3x.png diff --git a/Signal/Images.xcassets/message_send_failure.imageset/Contents.json b/Signal/Images.xcassets/message_send_failed.imageset/Contents.json similarity index 64% rename from Signal/Images.xcassets/message_send_failure.imageset/Contents.json rename to Signal/Images.xcassets/message_send_failed.imageset/Contents.json index c1ca74cf9..6bd09fe32 100644 --- a/Signal/Images.xcassets/message_send_failure.imageset/Contents.json +++ b/Signal/Images.xcassets/message_send_failed.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "message_send_failure@1x.png", + "filename" : "error-20@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "message_send_failure@2x.png", + "filename" : "error-20@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "message_send_failure@3x.png", + "filename" : "error-20@3x.png", "scale" : "3x" } ], diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png b/Signal/Images.xcassets/message_send_failed.imageset/error-20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..d385cefade3cd9370484ef8c604545f0e8e4fdeb GIT binary patch literal 365 zcmV-z0h0cSP)Px$CrLy>R5%f>l`(F@Fc?NrD=rbyTjUTO!@%D2pf2SONaYGl;RKzL*jgbvv$uWE zvLgYppfR8HP_V!Mi*fvi(WqZzhG(#ZEgU0WJLa68n>59>gI_qn3SJ{#JLa4oy;(gl zGY8Ed@C=Tf%Q5Hl=(VQL*M+@dc!X=xqc??~_+7da8vd&kYDSQo>wfqXaw}_@lRjBv ztr_7#`NUkE`;t@3gydwc88bJtfp1vDP+4n6V_*#}{J>CIyMfxk3cjFJp9ECB=cgpu zz&%V#LSpSx%nH4E;7iGBtu@0w4~>59*u3DAoVsJ9;qC|9(2~|$Q1377TF*e0-Zb`R zt_6cJe(2F_n6(#jV^io|USH`BF5O1=&OW(!81#aru9FXH&|knGjmlU^uSijZ00000 LNkvXXu0mjfCT^q0 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png b/Signal/Images.xcassets/message_send_failed.imageset/error-20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..391b7f3bc8f1cad3ab4abff9286b414c62ec7bb9 GIT binary patch literal 765 zcmVPx%w@E}nR9FesnY~KHKoo_eHj09sh3$fs-M+xS!D4S`YvlvTve=1_VWFU4qxcY_ zu(gnC1zQ!Y)bqu?;Tqj#X33uij+rEL&pkUcnaRY3WPWrM+84XxrlX3<*zr!~EAdgR z92?3o6i4D`B#9vwjnc6y#Y6E$j5SuQj|N(3mVzCrJc-3buex?A?uk8dOI(|fa!=$Q zb*Nj6M-%P2v7ktP>4)gW?{$vwvKR{L5<{%lLYo}qio%L&pNU>9)%mU%Ev6U)v1p{C z*CrP^gMi4n=mlJUb}KrMem`DL0&cuwY*eX zvMERJVY6tEH{qt?J^T-YO}E&r{GW93k0zZ}yQX{onRsfu!EwRMGFkH{7L@kn(u(2{hwACq)Ba}{GXX2mJ}^PBSL zz>NPSViPG#(uKGu_QWlb{Vb&16S+qnzkFFdnrN2-rXX6A9ls@*_lO2sXqFCE9F`!z vc83}zhFCO$G0&Q7;=F0}#jaS{zahQ=L)bKMt?Ijr00000NkvXXu0mjfd4p^` literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png b/Signal/Images.xcassets/message_send_failed.imageset/error-20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..35a740157fc7186c0bb146d79a56d300f43dcaf7 GIT binary patch literal 1380 zcmV-q1)KVbP)Px)9!W$&RA>d|n@?-hP!z?rh@w!sDI!=wX49=m!9`)rMsVp?k>WQ{^h;EsU!h1r zmm+m5f~DPwb>XHP$wHxsD7K)81wFr*4A0w}nM~%5GZ_z@CV7AEJtxU~`8Pd!WOz8G z(2L@NIG^*3meV=4II^E}SIeE8ue96}zlmdy(^7a_+z@|=ziN`cFGXSzbL`NTqIL17 zSl47(KVlM_93w{}1su&Xv9Zg^by=*9qcwXn7FWa@75jfuJI3fc@vF$#1&rqzu_ZFj zXT>UbtVZ`l#{ST8RT;jB-HzU#>es|2aZaoX+R}%<#ORg-4QLrE?kf6$SSDm!b=Sp{ z;-DY~v4~lg4=relj^m2BDwZWqRd-XYJ4DpA6vQNUDwgF(8ycg4am97fOZHji?BNsQ zut5%Tl?|s&)m5DXO0}}r2;`Z4t8ylre+_by+tY;BfsS<9Y5YuqnPEo-a-+dBjpkb5 z^zj1TSNT+}h;cii0WF@!z9%xKdv7*gj;lFJG&EV$Xs>+9;->gv180DDlB^qtsM245HNK|XhvZq>IdsVMY)YQhOEC$f%ota6u;2Wy6 zg8H5Sx+EaEjZaxDcoQw2T(nhc#iS~Wc~g-%IVg(-w5Fok6+>A} zpxNeFw+VQwU?1MMRTlf+I8jV1hO(GIGup#Ec+1|LOy!w)u058o7mEj4p;Oa7H8CFXItlWXM9Xl`vrbuTpdAlku59w+2=jLFk{IHtHok`i4O>S$9zx*p z6owZ?`-Jg4Y}wFt>j9687+!D;y>QB!R^)kD!0^0r!V9+UQM{WJxAI}VoZ$%Dry$-NPYSG;Y0vQfq_~w2>m@ThLH>GM;Rqkv3%$EFriC4@ z`<~&M#@OjC)OyJb@0xxsv)$xP>t&ZCeCS%$WQRt(y{X#q49}|5oaxxa&2tismk`;( zy`qxvF^cu2uvJ6X@nC)7HG4e#VJg?CXgKf?8pb1!!WlO7H>@1i3xGV`&==kdfR|)t z41*_s7M;Ibzpiz*nzw>>dkxM!7BA^|!Sz85-)p_m_C=8+9}DLd=#~lgP}`{~8)Oqt zuf+>NkOQrs6+Z@L*-wMQ)0*|0VS@LECAVs_cZAppw-65Qz;VF*bZM*)++7MUqzzkHa=xBfJU_1 z_?LSH=M$st#HUC*>-CEBFYD2UMyneyJ@Mat5ND6@a{;DuyT|xV#kc`YRwvpk|Ky=C zz>CN~;9vuLgjK2L0kUSKAPShIIO0?Fx3 zP-sM}{cO}v?5ypq{%(q%X)XhtJ~3}j6wU=X$mLyn(1u2|Mge=R?DQsCDsoF#+?#7P z8i+~kRP=T_WoR4t$STGmu!p_byAZOi`s*T(XM=(m#3E)9-!9QodxBEmN?^J#JFN;q zdup>LE{StuRnV3`^d&|S&s(CQ?@LeJQ;?gJ74g6L7XbO}Ako@}=pBJ!l#z>^BS%{b z)W?-jfNYSkzLEl1NlCV?QiN}Sf^&XRs)DJWiJpOy9hZWFf=y9MnpKdC8&o@x zXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3nOBlnp_^B%3^4>|j!SBB za#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXGvxn!lt}psJDO~)CbAv8|oS8W7C#ek%>ba zNCv02lw`QC3QCJ|z`lh!DTofLv}B zlvtVqp?aLEJ)DcB!IKxbi3!Y*k#El$DxXf)roCSOceir^Ix9Bw-tU ztg3B*X~D`jKP5A*(j~DZ)y~Mk(A>(0m3jaw$VpZgX98`jB`}JbrUi=vbFCd0P$#Seu;Y6B;{R3#1}1Y)7sn6_ z!L?J)dxr#y9DjcIdQX)J-@i9O}^=@zx7tumV&a1z4w;q>|qbOn)Q|8r}HO;_hDXl-S#%gole`l z{(`p9<UzA#W8yJ>i$oh76$yt>$_g6`1$u= z!w(O9E*x|8UUtxW`|Z1>R<6IkstIuT%;QVgeZYq~{m`4)i#l|fWX~$t&OW^JMoGlf z)ibuT>F8d{oS@fuJW2b(GV#eKmA*1>b$;zTwNLXwP>4CtO-1u>yJd}TDo=L`w6{#1 zq8Z>UA%9!-@^6XtEUmmJC(18WDP0ij8EBLw$a<4iB=gt*2(N>Ggucw1-g{`*f%Ky{ zzXvXQuKGleO+#m)jhugs){{29+Y{s-zRzBen*CshTj2GXQ~0%}dOcOVv+z>7S<9n+ z+{fNL@>^a!?}pir#l?DtFY{-ff6n6YCpoHu1fbJU&PHy;zar zT)%qJ{W{zaJ5OKa{HSyC@r`zee+~K`QMoP$6w3H-JZ+Z#@znY3)vgV4Jne_))!5k| svfwxuu4M7qI%-elr|-PL_dDQ(8>nLOboFyt=akR{0E7B$WB>pF diff --git a/Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@2x.png b/Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@2x.png deleted file mode 100644 index 1e540f14b570f59e90ccd819849bbccbc0294b7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2428 zcmZ`*3pkr+8xB?792!H5Iz<@PpPW=hM4X}ym9W$yYC0hw4N1PpflRfORh^2qTC_FH zYK(NuU+qduhG~mhf0xd-`q7iNL_>95%U}Bv*5-HVcU@oJ_r0I{exK)lzVH36~LLA6JF_>U1fD&_f5E}*~iV4t^0|*%iF^A0+5XA0CC4&IX6)+l! zP*Q|R?npW%1mOen0faMZ2MU8EX(12@BA*#gppkd2%Au7za=%c>BcRc#si~+`Clts} zKx189UC|gE8i#X)7>!yQx`&RgWMT!}`m1N2$u6QFVDksnY0mv39S`fx%2}wAj($HG?T}M__J|Kt32Lu90 zMsi-2sA6mR^ml1UP8iIpLKR)B2q5X{2)Lbym5CFch+e}{sX!6&;R6gI z$PWcUHc9D%qgW!GP%bM<)%dEEh*q2c(;Lx<5q?LNL{+?mSFO!w{-m!X}(#_Jw==_MZ z+O24ZtcgvHxj_}JNbkyK)2U-z*&SV%q(+Y4K*Y(qyw2q$+KETg9UPWmqH3yRifFk^ zga-F1y!o_!Wo2beI%&LYFg|sn?hjeYOQfK`zu%~mI#u=KXR}%3&pI(KE=EyF#@|MF zx3#sQvOJ2$4q;$zThbpKFYqKCJhC${5>qs2kGD9s>-*9L=ca82HU{n%#Z!6~aDDrr zN4CeupD!7dSHFQ*1l^uxvsiQ1?OlTlvW?jbFXxHbX11-*`tHwlvc^m9aY4|-P)Bph zt4QaNj>S){zviT7*c+x9F4iL8byDq}GmVWWE>81=I$8YJVFsP3X8ShyG-2#NqqRwBZ;IE!I zK8Qa;wb6gwwroXBSLwg&y7)%!-5cm-L$N*J z+|x!1I6DWQU>?NvQcRYPS4)M2gCp@8E_u=`O=aQfsQl{FWhr`^luswViEbsnpROOL#0eI`H9VJIXxdvRpc=AoL{p?Tn3DlK_F`3_Q+*Bkpke@aOE$C=Wn z9{BiQ1H8tytH$e>H&@w7c5chbEGoV9{p}|?71B76aX-zIDj8Id*y`7i(3KVp688K% z)7fZWNm(Y>@)}B@{v3YMj%nIdQ0X8z{vla$7kp%GdgXVh3^KPbEJ`BQ}!0 zd(6Hox7d!1$glZ19@v&uNR zo}HlNF4#ZnX)?Y^E-@_>T+zm18bYOc|D8!b_qfL+HeI^sN#c25pZw0DhX!U-`OjXT zy5$_cgeRy=eVOVV-FG|s>(E9Svli((**YX)b`4NJNgTN}S}z|08GY8@4ynsVsB=q> z^9kW^K53qKkv2?p!&MZ*TaLY{ysq|u^g7krfLM$ef0XOydzFE;r7w_eQ<^vY$LsUU zrn!ZIhCNMZx@*w8LqxeBTM4yXZ_1X-8bY7)z54t|ZRtNivL3azEtuB@0hH=0YhHK5&!@I diff --git a/Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@3x.png b/Signal/Images.xcassets/message_send_failure.imageset/message_send_failure@3x.png deleted file mode 100644 index 1413112271cb83876f42503962b73a17f5704404..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3328 zcmZ`+2Ut^Q7fz5FWrHF^0tf}cBm@+RNyH?|C zEE5Im2sWTalu8Rk6Npg3-@y`!ED`ii(6;kE{wHpB7pIEy@RFcir=x!lQ003ekzkr;JyOL#? z&1C;zRm!V~gaS*a0g~TF)Ig~^y6Tv~5uOJYzvD^$b2d_X_ z2`KYmFCQ?L#vp;WK^!44b2JDH1|u0Uu?Sz>-p_Q|3}qhAV$l&$Xi7>7B*g(jW5hx2 zot>SbFgO$r-zr0FWu{VDM9x+!)8f-2f31TfF{2q|I*UxBg5~QHqiAdv%G_Ko^!M>8 zP8K=#A0;aDb6Thw@9s+}YjYi^-|Ai*^{3|Uc`tPjhY)0ZrPBGC?QX+{$qOzDW zp8Z$lWVQX9_ru2%wT#XgG2up)bw-0i4Xaz!fNX(hP?O) zA2NrO7>py!O1hHAc3D_ob$m(0(h_M5KRPj*B#&%`vdZ)&dPOGW-(*%fRuN;O5lnW} z0a7$;)qcr#ZRPF95aXb$%t+{0(MZ|5fbgQlkYiJEL>37RhuJ$J>|qG_cJQYG%n1qo z0<$Utxd+Q25m_{bKaG}%Ude(YpMo7ApP8%upQ%WwypLA()u*OivC6s@4U%d8^#wqK z`1>i_0RUBoJ8rjsywX4!Inh5r@4obWa(_=x|J5@+TT~57EUkf^)jrxV7xQ6^miEl) zW8WSvhT<$r4c>91JPS-)tBzG^uQ{f3OqJNZep}*kJ!`PUH-6+m*sb^Pe;yRCyW3QL zXI`0vXS}4os!0DZ|1{-~eS`Pz?>P^5aBv6>3(I@I{NZU=S65=Gk;gf#MBCIfVsCJF zcQ*kqaCCOQSzlc}Tp3@gH`zQrK0YpLZ*O-8oGW}YGS#9S&lT_<5gL~grYsjU7XVk& zM@L7Cv}i|AHB;+%_*9mbrd9s-Dm}M0|Jm)VR^X*9!Im3_jag+woaxgiJHZu7ak(M_ z)YyV%#0VQ38_RdUZ6)UR_VmO?iMH5S+R= ze)ZyoQf+N5Tvt~&&yQx8>ZcZ`RpgrIjqyRHN;!7u+RK-npO(BB7u!EOvPNYvYd4M9 zp@Z3V!EOishW;S%hVJ*$^7Hx|+`PRjk5=5j{IlXFtkGzPRh##SfbHewwZUZcP0F@i z?E>Xzb=l?F!^@mS8^?q@dq3qSg`BVC@j*$>(DoJJAG zkLW~)-Q-Wu#8rednjLjK;U)`I`exekEzIudkN^L!$Kbd&_E&%_1zx zkSz(N8Z$c{;MPZC76-X4)d6Qz=JczuYm4aPY2T^LgpW5@kh!$cvn~F?(ZcHrOUDie zya~C%HE+PT@e_mx)|W*TpC#>F`p@*@W`Q$sC@r9RIu~t=gZOacckmv*RfMGt^V942 zEoazRNUFHFC9v5cWNvZLqPQLYMsZB~(?n+2=JA-mn}$*-U(uv!nKpO83H8=`{{(C) z_)6O{)UL{-36&V4RCKoBY?%RHHy!?1<@W&{QFhMB=Y@MT)%8wh_yKzHpx`3VT7k2q z;*D9M&=C}CZ;X)SHaN8_bq;#`X;skt(sasBnKi$7!3d@Rg}qtM-qYONoKCf54JCSc zc=WWkhQKZo?)>^4AMku&cZ{9C6~<5jKhO95^XICE4oboQe&3Mbk|e#Wsbji# zHwCP<5U9j=5hUGF_A?4@hu1ee=u{|>zG@vkW?mFV?RUpC?JRM9o6^7FcVdeqwhje+ z!rU342BN-;3)+$C7MGynxoDPy-md0cWxA&GZeC_~wB_P8ARO=7fey4vIaRD7z6N*J zwY8=ga~2efM7frEZ>PgeH(ErNoDGs4l1#qND96AKu?erhX{;cQy|WZ3jOCd4Wd|hy z{4IZkCur(Mnxy6XYvqeFFFSQqg?UX!C=$nVFf2%dLz9WEu@RTbxvc%Yv7cmAPuS>&a?85-NsHUe&dm zO==AXVJK%_OxxJ!Twhzz%p2Z$>h!qc7z^1C`l#R?8NWg6u&Qg;al&Gh=J6W#Gw^T8 z6Q>TM(;Kg9@Xn43^G}}u;or?%^zziweX;|#FN>`sRSNImoSPrs*WjeW7{X9k+Nyw#;Ou znv$>V%5{%aHFXTWvpa(`Y?jflI`V`b$g#P9a~HwEAfCPyeLwWBzv5lEk&19)f@bjG z#tod}+{PiyW6boomcV# z>F2t}YAVpEng2f2yZuMb?1Fz*G{tlxS-%%MX#{mjb8Kqniigcb*OL3wNVu4AC`KaC zlS&Iyf@aOr4r!OEj;bSLwp5VXjZ#~(Yea|xeSj=%xpi04_x6``Dv_RTv4?ywDv30X zFFHj{)d$)H6=a(CP;G``)@V<(+>;<|a(z29fMHzpqhgk7`0P_gel z+$;*Et){?0s_V5G4yMIwoO0S({cw|N_h3|TrAz39?iK*y?15k_=j?ydQ;JYVUyKd(6#5~po+&CCNrfrVA16}_=Swk%g*n|_VqL7 z#OESYQ;XhSdiOdU|6yHkE-slD7tz@*Dvo^T_PhvKrmW+b%3JQKjV&$E0q&m^V|oz5 z3nd!XL%w5MQqxrOYV^>vrfpu8AEYNWH~35fG3DDmBEI=^0OvF%t|%YU!U7U6ueYwpiRgOO%Rnl$SXc zeZmZ-qh(>!dvCjXSI*9k+b$dcMB!P)!6WpF8j){FE8#*05c}x8u1OynE&nHR--E|B IVj?sD2i78S`2YX_ diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index b6e43c341..9f0ced321 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -20,12 +20,15 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic) UIView *dateStrokeView; @property (nonatomic) UILabel *dateHeaderLabel; @property (nonatomic) AvatarImageView *avatarView; +@property (nonatomic, nullable) UIImageView *sendFailureBadgeView; @property (nonatomic, nullable) NSMutableArray *viewConstraints; @property (nonatomic) BOOL isPresentingMenuController; @end +#pragma mark - + @implementation OWSMessageCell // `[UIView init]` invokes `[self initWithFrame:...]`. @@ -131,6 +134,15 @@ NS_ASSUME_NONNULL_BEGIN return self.viewItem.interaction.interactionType == OWSInteractionType_OutgoingMessage; } +- (BOOL)shouldHavesendFailureBadge +{ + if (![self.viewItem.interaction isKindOfClass:[TSOutgoingMessage class]]) { + return NO; + } + TSOutgoingMessage *outgoingMessage = (TSOutgoingMessage *)self.viewItem.interaction; + return outgoingMessage.messageState == TSOutgoingMessageStateFailed; +} + #pragma mark - Load - (void)loadForDisplayWithTransaction:(YapDatabaseReadTransaction *)transaction @@ -158,13 +170,42 @@ NS_ASSUME_NONNULL_BEGIN relation:NSLayoutRelationGreaterThanOrEqual], ]]; } else { - [self.viewConstraints addObjectsFromArray:@[ - [self.messageBubbleView autoPinEdgeToSuperviewEdge:ALEdgeLeading - withInset:self.conversationStyle.gutterLeading - relation:NSLayoutRelationGreaterThanOrEqual], - [self.messageBubbleView autoPinEdgeToSuperviewEdge:ALEdgeTrailing - withInset:self.conversationStyle.gutterTrailing], - ]]; + if (self.shouldHavesendFailureBadge) { + self.sendFailureBadgeView = [UIImageView new]; + self.sendFailureBadgeView.image = + [self.sendFailureBadge imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]; + self.sendFailureBadgeView.tintColor = [UIColor ows_destructiveRedColor]; + [self.contentView addSubview:self.sendFailureBadgeView]; + + CGFloat sendFailureBadgeBottomMargin + = round(self.conversationStyle.lastTextLineAxis - self.sendFailureBadgeSize * 0.5f); + [self.viewConstraints addObjectsFromArray:@[ + [self.messageBubbleView autoPinEdgeToSuperviewEdge:ALEdgeLeading + withInset:self.conversationStyle.gutterLeading + relation:NSLayoutRelationGreaterThanOrEqual], + [self.sendFailureBadgeView autoPinLeadingToTrailingEdgeOfView:self.messageBubbleView + offset:self.sendFailureBadgeSpacing], + // V-align the "send failure" badge with the + // last line of the text (if any, or where it + // would be). + [self.messageBubbleView autoPinEdge:ALEdgeBottom + toEdge:ALEdgeBottom + ofView:self.sendFailureBadgeView + withOffset:sendFailureBadgeBottomMargin], + [self.sendFailureBadgeView autoPinEdgeToSuperviewEdge:ALEdgeTrailing + withInset:self.conversationStyle.gutterTrailing], + [self.sendFailureBadgeView autoSetDimension:ALDimensionWidth toSize:self.sendFailureBadgeSize], + [self.sendFailureBadgeView autoSetDimension:ALDimensionHeight toSize:self.sendFailureBadgeSize], + ]]; + } else { + [self.viewConstraints addObjectsFromArray:@[ + [self.messageBubbleView autoPinEdgeToSuperviewEdge:ALEdgeLeading + withInset:self.conversationStyle.gutterLeading + relation:NSLayoutRelationGreaterThanOrEqual], + [self.messageBubbleView autoPinEdgeToSuperviewEdge:ALEdgeTrailing + withInset:self.conversationStyle.gutterTrailing], + ]]; + } } [self updateDateHeader]; @@ -184,6 +225,24 @@ NS_ASSUME_NONNULL_BEGIN } } +- (UIImage *)sendFailureBadge +{ + UIImage *image = [UIImage imageNamed:@"message_send_failed"]; + OWSAssert(image); + OWSAssert(image.size.width == self.sendFailureBadgeSize && image.size.height == self.sendFailureBadgeSize); + return image; +} + +- (CGFloat)sendFailureBadgeSize +{ + return 20.f; +} + +- (CGFloat)sendFailureBadgeSpacing +{ + return 8.f; +} + // * If cell is visible, lazy-load (expensive) view contents. // * If cell is not visible, eagerly unload view contents. - (void)ensureMediaLoadState @@ -362,6 +421,10 @@ NS_ASSUME_NONNULL_BEGIN cellSize.height += self.dateHeaderHeight; + if (self.shouldHavesendFailureBadge) { + cellSize.width += self.sendFailureBadgeSize + self.sendFailureBadgeSpacing; + } + cellSize = CGSizeCeil(cellSize); return cellSize; @@ -404,6 +467,9 @@ NS_ASSUME_NONNULL_BEGIN self.avatarView.image = nil; [self.avatarView removeFromSuperview]; + [self.sendFailureBadgeView removeFromSuperview]; + self.sendFailureBadgeView = nil; + [self hideMenuControllerIfNecessary]; [[NSNotificationCenter defaultCenter] removeObserver:self]; diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m index d8447eb65..4b73dc74b 100644 --- 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:0.98639106750488281 green:0.10408364236354828 blue:0.33135244250297546 alpha:1.f]; + return [UIColor colorWithRed:255.f / 255.f green:38.f / 255.f blue:31.f / 255.f alpha:1.0f]; } + (UIColor *)ows_errorMessageBorderColor From dd078b106f5d15e0599c29321f6206fdc50e32b4 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 5 Jul 2018 10:28:47 -0400 Subject: [PATCH 3/5] Tweak message send failed indicator. --- .../src/ViewControllers/ConversationView/Cells/OWSMessageCell.m | 2 +- SignalMessaging/utils/ConversationStyle.swift | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index 9f0ced321..1c4f51070 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN ofView:self.sendFailureBadgeView withOffset:sendFailureBadgeBottomMargin], [self.sendFailureBadgeView autoPinEdgeToSuperviewEdge:ALEdgeTrailing - withInset:self.conversationStyle.gutterTrailing], + withInset:self.conversationStyle.errorGutterTrailing], [self.sendFailureBadgeView autoSetDimension:ALDimensionWidth toSize:self.sendFailureBadgeSize], [self.sendFailureBadgeView autoSetDimension:ALDimensionHeight toSize:self.sendFailureBadgeSize], ]]; diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift index 4ad89fa46..4f534d501 100644 --- a/SignalMessaging/utils/ConversationStyle.swift +++ b/SignalMessaging/utils/ConversationStyle.swift @@ -27,6 +27,7 @@ public class ConversationStyle: NSObject { // like "date headers" and "unread indicator". @objc public var fullWidthGutterLeading: CGFloat = 0 @objc public var fullWidthGutterTrailing: CGFloat = 0 + @objc public var errorGutterTrailing: CGFloat = 0 // viewWidth - (gutterLeading + gutterTrailing) @objc public var contentWidth: CGFloat = 0 @@ -87,6 +88,7 @@ public class ConversationStyle: NSObject { } fullWidthGutterLeading = gutterLeading fullWidthGutterTrailing = gutterTrailing + errorGutterTrailing = 16 contentWidth = viewWidth - (gutterLeading + gutterTrailing) From ba557858e0965949715366d10deae1f21bb6146c Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 5 Jul 2018 10:30:10 -0400 Subject: [PATCH 4/5] Tweak message send failed indicator. --- Signal/translations/ar.lproj/Localizable.strings | 4 ++-- Signal/translations/az_AZ.lproj/Localizable.strings | 4 ++-- Signal/translations/bg.lproj/Localizable.strings | 4 ++-- Signal/translations/bs.lproj/Localizable.strings | 4 ++-- Signal/translations/ca.lproj/Localizable.strings | 4 ++-- Signal/translations/cs.lproj/Localizable.strings | 4 ++-- Signal/translations/da.lproj/Localizable.strings | 4 ++-- Signal/translations/de.lproj/Localizable.strings | 4 ++-- Signal/translations/el_GR.lproj/Localizable.strings | 4 ++-- Signal/translations/en.lproj/Localizable.strings | 4 ++-- Signal/translations/es.lproj/Localizable.strings | 4 ++-- Signal/translations/et.lproj/Localizable.strings | 4 ++-- Signal/translations/fa.lproj/Localizable.strings | 4 ++-- Signal/translations/fi.lproj/Localizable.strings | 4 ++-- Signal/translations/fil.lproj/Localizable.strings | 4 ++-- Signal/translations/fr.lproj/Localizable.strings | 4 ++-- Signal/translations/gl.lproj/Localizable.strings | 4 ++-- Signal/translations/he.lproj/Localizable.strings | 4 ++-- Signal/translations/hr.lproj/Localizable.strings | 4 ++-- Signal/translations/hu.lproj/Localizable.strings | 4 ++-- Signal/translations/id.lproj/Localizable.strings | 4 ++-- Signal/translations/it_IT.lproj/Localizable.strings | 4 ++-- Signal/translations/ja_JP.lproj/Localizable.strings | 4 ++-- Signal/translations/km.lproj/Localizable.strings | 4 ++-- Signal/translations/ko_KR.lproj/Localizable.strings | 4 ++-- Signal/translations/lt.lproj/Localizable.strings | 4 ++-- Signal/translations/lv.lproj/Localizable.strings | 4 ++-- Signal/translations/mk.lproj/Localizable.strings | 4 ++-- Signal/translations/my.lproj/Localizable.strings | 4 ++-- Signal/translations/nb_NO.lproj/Localizable.strings | 4 ++-- Signal/translations/nl.lproj/Localizable.strings | 4 ++-- Signal/translations/pl.lproj/Localizable.strings | 4 ++-- Signal/translations/pt_BR.lproj/Localizable.strings | 4 ++-- Signal/translations/pt_PT.lproj/Localizable.strings | 4 ++-- Signal/translations/ro.lproj/Localizable.strings | 4 ++-- Signal/translations/ru.lproj/Localizable.strings | 4 ++-- Signal/translations/sl.lproj/Localizable.strings | 4 ++-- Signal/translations/sn.lproj/Localizable.strings | 4 ++-- Signal/translations/sq.lproj/Localizable.strings | 4 ++-- Signal/translations/sv_SE.lproj/Localizable.strings | 4 ++-- Signal/translations/th_TH.lproj/Localizable.strings | 4 ++-- Signal/translations/tr_TR.lproj/Localizable.strings | 4 ++-- Signal/translations/zh_CN.lproj/Localizable.strings | 4 ++-- Signal/translations/zh_TW.lproj/Localizable.strings | 4 ++-- SignalServiceKit/src/Util/OWSError.m | 4 ++-- 45 files changed, 90 insertions(+), 90 deletions(-) diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index 913f87432..ca573c23e 100644 --- a/Signal/translations/ar.lproj/Localizable.strings +++ b/Signal/translations/ar.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "غير قادر على الارسال بسبب بيانات الخصوصية القديمة."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "لم ينجح بعث الرسالة لأن المستخدم محظور."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "لم ينجح بعث الرسالة لأن المستخدم محظور."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal غير قادر على الاتصال بالإنترنت. من فضلك حاول من شبكة WiFi أخرى أو استخدم بيانات الهاتف."; diff --git a/Signal/translations/az_AZ.lproj/Localizable.strings b/Signal/translations/az_AZ.lproj/Localizable.strings index 59409c639..08136c13f 100644 --- a/Signal/translations/az_AZ.lproj/Localizable.strings +++ b/Signal/translations/az_AZ.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal internetə qoşulmadı. Başqa WiFi şəbəkəsinə və ya mobil şəbəkəyə qoşulun."; diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index a3923cb89..a7691046d 100644 --- a/Signal/translations/bg.lproj/Localizable.strings +++ b/Signal/translations/bg.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Не може да се изпрати поради остаряли лични данни."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Съобщението не е изпратено защото сте блокирали потребителя."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Съобщението не е изпратено защото сте блокирали потребителя."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Неуспешен опит за прикачване."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Неуспешен опит за прикачване."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Сигнал не успя да се свърже с интернет. Моля, опитайте от друга WiFi мрежа или чрез използване на мобилни данни."; diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 27b744b1f..9e16030e4 100644 --- a/Signal/translations/bs.lproj/Localizable.strings +++ b/Signal/translations/bs.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nije moguće poslati zbog neažuiranih privatnih podatka."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nije u mogućnosti povezati se na internet. Molimo pokušajte sa drugom WiFi ili mobilnom mrežom."; diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index b61be568e..ea90ecdb0 100644 --- a/Signal/translations/ca.lproj/Localizable.strings +++ b/Signal/translations/ca.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "No s'ha pogut enviar degut a dades de privadesa obsoletes."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "No s'ha pogut enviar el missatge perquè heu blocat l'usuari."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "No s'ha pogut enviar el missatge perquè heu blocat l'usuari."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "El Signal no s'ha pogut connectar a Internet. Proveu des d'altra xarxa WiFi o utilitzeu dades mòbils."; diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 88bcb36f1..3810e3525 100644 --- a/Signal/translations/cs.lproj/Localizable.strings +++ b/Signal/translations/cs.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nemohu odeslat kvůli starým datům soukromí."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepodařilo se poslat zprávu, protože jste tohoto uživatele zablokoval(a)."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepodařilo se poslat zprávu, protože jste tohoto uživatele zablokoval(a)."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Chyba při zápisu přílohy."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Chyba při zápisu přílohy."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal se nemohl připojit k internetu. Zkuste jinou bezdrátovou síť, nebo mobilní data."; diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 3dec802fa..81a7c50bf 100644 --- a/Signal/translations/da.lproj/Localizable.strings +++ b/Signal/translations/da.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kunne ikke sende pga. gammel privatlivsdata."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende beskeden til brugeren fordi du har blokeret dem."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende beskeden til brugeren fordi du har blokeret dem."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kan ikke forbinde til internettet. Prøv et andet WIFI netværk eller benyt mobildata."; diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 604bfeed7..3a7d9bcb0 100644 --- a/Signal/translations/de.lproj/Localizable.strings +++ b/Signal/translations/de.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Senden nicht möglich aufgrund veralteter Schlüssel."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nachrichtenversand gescheitert, da du den Benutzer blockiert hast."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nachrichtenversand gescheitert, da du den Benutzer blockiert hast."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Senden gescheitert, da Fehler beim Schreiben des Anhangs."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Senden gescheitert, da Fehler beim Schreiben des Anhangs."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal konnte keine Verbindung zum Internet herstellen. Bitte versuche ein anderes WLAN-Netz oder verwende die mobile Datenverbindung."; diff --git a/Signal/translations/el_GR.lproj/Localizable.strings b/Signal/translations/el_GR.lproj/Localizable.strings index 702a3355e..106d25c73 100644 --- a/Signal/translations/el_GR.lproj/Localizable.strings +++ b/Signal/translations/el_GR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Αποτυχία αποστολής λόγω υπολειπόμενων δεδομένων ιδιωτικότητας."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Αποτυχία αποστολής μηνύματος στον χρήστη γιατί τον/την έχεις μπλοκάρει."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Αποτυχία αποστολής μηνύματος στον χρήστη γιατί τον/την έχεις μπλοκάρει."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Αποτυχία λόγω αποτυχίας εγγραφής συνημμένου."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Αποτυχία λόγω αποτυχίας εγγραφής συνημμένου."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Το Signal δεν μπόρεσε να συνδεθεί στο διαδίκτυο. Παρακαλώ προσπάθησε να συνδεθείς σε άλλο δίκτυο WiFi ή να χρησιμοποιήσεις τα δεδομένα της κινητής."; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 8a85bd8b9..17f6e508d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -820,10 +820,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index 82222b77c..bbd2bdbfc 100644 --- a/Signal/translations/es.lproj/Localizable.strings +++ b/Signal/translations/es.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Imposible enviar: Claves de cifrado obsoletas."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Fallo al enviar mensaje: Contactos bloqueados."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Fallo al enviar mensaje: Contactos bloqueados."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallo al enviar por problemas con el adjunto."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallo al enviar por problemas con el adjunto."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal no ha podido conectarse a internet. Prueba a conectarte desde otra red WiFi o usa la red de datos de tu operador."; diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index 1bae924fe..a4198532b 100644 --- a/Signal/translations/et.lproj/Localizable.strings +++ b/Signal/translations/et.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Pole võimalik saata aegunud privaatsusandmete tõttu."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kasutajale sõnumi saatmine ei õnnestunud, sest sa oled ta blokeerinud."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kasutajale sõnumi saatmine ei õnnestunud, sest sa oled ta blokeerinud."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Ei õnnestunud manuse kirjutamise ebaõnnestumise tõttu."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Ei õnnestunud manuse kirjutamise ebaõnnestumise tõttu."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signalil ei õnnestunud Internetti ühenduda. Palun proovi mõnda teist WiFi-võrku või kasuta mobiilset andmesidet."; diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index 1b3d50b11..c4eb1679f 100644 --- a/Signal/translations/fa.lproj/Localizable.strings +++ b/Signal/translations/fa.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "خطا در ارسال پیام به دلیل داده قدیمی."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "امکان ارسال پیام به کاربری که مسدود کرده‌اید وجود ندارد."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "امکان ارسال پیام به کاربری که مسدود کرده‌اید وجود ندارد."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "خطا در نوشتن ضمیمه."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "خطا در نوشتن ضمیمه."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "امکان برقراری ارتباط سیگنال با اینترنت وجود ندارد. لطفاً از یک شبکه‌ی بیسیم دیگر و یا از اینترنت سیم کارت خود استفاده کنید."; diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index c2a4e9d4e..e8126d663 100644 --- a/Signal/translations/fi.lproj/Localizable.strings +++ b/Signal/translations/fi.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Lähettäminen ei onnistu vanhentuneiden yksityisyystietojen vuoksi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Viestin lähettäminen ei onnistunut, koska olet estänyt kyseisen yhteystiedon."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Viestin lähettäminen ei onnistunut, koska olet estänyt kyseisen yhteystiedon."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Lähetys epäonnistui koska liitteen lisääminen epäonnistui."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Lähetys epäonnistui koska liitteen lisääminen epäonnistui."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal ei saanut yhteyttä internetiin. Yritä uudelleen toisesta WiFi-verkosta tai kokeile mobiiliyhteyttä."; diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index de7353707..142eb7b52 100644 --- a/Signal/translations/fil.lproj/Localizable.strings +++ b/Signal/translations/fil.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index 737473551..a280d4f28 100644 --- a/Signal/translations/fr.lproj/Localizable.strings +++ b/Signal/translations/fr.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Impossible d’envoyer en raison de données de confidentialité périmées."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Échec d’envoi du message, car vous avez bloqué cet utilisateur."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Échec d’envoi du message, car vous avez bloqué cet utilisateur."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Échec en raison d’un échec d’écriture de la pièce jointe."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Échec en raison d’un échec d’écriture de la pièce jointe."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal n’a pas pu se connecter à Internet. Veuillez essayer un autre réseau Wi-Fi ou utiliser les données mobiles."; diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index 3978a07a2..cc59135cc 100644 --- a/Signal/translations/gl.lproj/Localizable.strings +++ b/Signal/translations/gl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Non se puido enviar por mor duns datos de privacidade obsoletos."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Non se pode enviar a mensaxe porque bloqueaches o usuario."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Non se pode enviar a mensaxe porque bloqueaches o usuario."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Erro de escritura do ficheiro anexo."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Erro de escritura do ficheiro anexo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal non se pode conectar a internet. Procura conectarte a outra rede wifi ou utiliza os datos móbiles."; diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index 93ceba631..a24130633 100644 --- a/Signal/translations/he.lproj/Localizable.strings +++ b/Signal/translations/he.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "לא היה ניתן לשלוח עקב נתוני פרטיות מיושנים."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "לא ניתן לשלוח הודעה מכיוון שהמשתמש חסום על ידך"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "לא ניתן לשלוח הודעה מכיוון שהמשתמש חסום על ידך"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "נכשל עקב כתיבת כושלת של צרופה."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "נכשל עקב כתיבת כושלת של צרופה."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal לא היה מסוגל להתחבר לאינטרנט. אנא נסה מרשת WiFi אחרת או השתמש בנתונים סלולריים."; diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index 686099573..b7c9223bb 100644 --- a/Signal/translations/hr.lproj/Localizable.strings +++ b/Signal/translations/hr.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nije moguće poslati zbog neažuiranih privatnih podatka."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Neuspješno slanje poruke korisniku jer ste ga blokirali."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Nije uspjelo zbog neuspjelog pisanja privitka."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Nije uspjelo zbog neuspjelog pisanja privitka."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nije u mogućnosti povezati se na internet. Molimo pokušajte sa drugom WiFi ili mobilnom mrežom."; diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 738b5ffac..16cf3f787 100644 --- a/Signal/translations/hu.lproj/Localizable.strings +++ b/Signal/translations/hu.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index 8ecc36a8b..a6e65d3ae 100644 --- a/Signal/translations/id.lproj/Localizable.strings +++ b/Signal/translations/id.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Tak dapat mengirimkan karena privasi data buruk."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Gagal mengirim pesan ke pengguna karena Anda memblokir mereka."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Gagal mengirim pesan ke pengguna karena Anda memblokir mereka."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Gagal karena gagal menulis pada lampiran."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Gagal karena gagal menulis pada lampiran."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal tidak dapat terhubung dengan internet. Mohon mencoba dari jaringan Wifi lain atau gunakan koneksi mobile."; diff --git a/Signal/translations/it_IT.lproj/Localizable.strings b/Signal/translations/it_IT.lproj/Localizable.strings index 2a2a4aad6..7b4b3b903 100644 --- a/Signal/translations/it_IT.lproj/Localizable.strings +++ b/Signal/translations/it_IT.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Invio non riuscito a causa di informazioni sulla privacy scaduti."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Impossibile inviare un messaggio ad un utente bloccato."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Impossibile inviare un messaggio ad un utente bloccato."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallito a causa di un problema in scrittura."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Fallito a causa di un problema in scrittura."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal non è in grado di connettersi ad Internet. Riprovare da un'altra rete WiFi o tramite rete dati."; diff --git a/Signal/translations/ja_JP.lproj/Localizable.strings b/Signal/translations/ja_JP.lproj/Localizable.strings index b909a46ae..37d4323ab 100644 --- a/Signal/translations/ja_JP.lproj/Localizable.strings +++ b/Signal/translations/ja_JP.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "プライバシー情報が古くて送信できません。"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "相手を拒否しているのでメッセージを送れませんでした"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "相手を拒否しているのでメッセージを送れませんでした"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "添付ファイルの書き込み失敗による送信失敗"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "添付ファイルの書き込み失敗による送信失敗"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "インターネットに接続できませんでした。Wi-Fiのネットワークを変えるか，モバイルデータ通信を使ってみてください。"; diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index a1bd9598b..f1f424874 100644 --- a/Signal/translations/km.lproj/Localizable.strings +++ b/Signal/translations/km.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "មិនអាចផ្ញើដោយសារទិន្នន័យឯកជនចាស់ពេក។"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "បរាជ័យក្នុងការផ្ញើសារទៅអ្នកប្រើប្រាស់ ព្រោះអ្នកបានបិទពួកគេ។"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "បរាជ័យក្នុងការផ្ញើសារទៅអ្នកប្រើប្រាស់ ព្រោះអ្នកបានបិទពួកគេ។"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "បរាជ័យដោយសារមិនអាចដាក់ឯកសារភ្ជាប់។"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "បរាជ័យដោយសារមិនអាចដាក់ឯកសារភ្ជាប់។"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "ស៊ីហ្គណលមិនអាចតភ្ជាប់ទៅកាន់អ៊ីនធើណែត។ សូមព្យាយាមពីបណ្តាញ WiFi ផ្សេងទៀត ឬប្រើប្រាស់អ៊ីនធើណែតទូរសព្ទ។"; diff --git a/Signal/translations/ko_KR.lproj/Localizable.strings b/Signal/translations/ko_KR.lproj/Localizable.strings index 4366ab91a..a919df362 100644 --- a/Signal/translations/ko_KR.lproj/Localizable.strings +++ b/Signal/translations/ko_KR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "시그널이 인터네트에 접속불가능. 다른 Wifi 네트워크나 모바일 데이터를 사용하세요."; diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index 094b5d5d2..bf77e085d 100644 --- a/Signal/translations/lt.lproj/Localizable.strings +++ b/Signal/translations/lt.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Nepavyko išsiųsti dėl pasenusiųjų privatumo duomenų."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepavyko išsiųsti naudotojui žinutės, kadangi jūs jį užblokavote."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Nepavyko išsiųsti naudotojui žinutės, kadangi jūs jį užblokavote."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Patyrė nesėkmę dėl nepavykusio įrašyti priedo."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Patyrė nesėkmę dėl nepavykusio įrašyti priedo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nepavyko prisijungti prie interneto. Prašome pabandyti iš kito bevielio (WiFi) tinklo arba naudoti mobiliuosius duomenis."; diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 1a06cb085..3353347df 100644 --- a/Signal/translations/lv.lproj/Localizable.strings +++ b/Signal/translations/lv.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal was unable to connect to the internet. Please try from another WiFi network or use mobile data."; diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index 65ea3ca55..b0ceea84e 100644 --- a/Signal/translations/mk.lproj/Localizable.strings +++ b/Signal/translations/mk.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Невозможно е испраќањето поради застоена приватност на податоци."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Неуспешно е да разговарате со корисникот , бидејќи го имате блокирано."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Неуспешно е да разговарате со корисникот , бидејќи го имате блокирано."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal не може да се поврзе на интернет. Ве молиме пробајте преку друга безжична мрежа или користете мобилен интенет."; diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index cb0b6ced2..a9309ca9f 100644 --- a/Signal/translations/my.lproj/Localizable.strings +++ b/Signal/translations/my.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "ကိုယ်ရေးအချက်အလက်များကြောင့် ပေးပို့နိုင်ခြင်းမရှိပါ။ "; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "သင်ဘလော့ထားသည့်အတွက် စာတိုပေးပို့နိုင်ခြင်းမရှိပါ။ "; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "သင်ဘလော့ထားသည့်အတွက် စာတိုပေးပို့နိုင်ခြင်းမရှိပါ။ "; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ပူးတွဲ ဖိုင်ချိတ်ခြင်း မအောင်မြင်ပါ။ "; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ပူးတွဲ ဖိုင်ချိတ်ခြင်း မအောင်မြင်ပါ။ "; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal ကအင်တာနက်မချိတ်နိုင်ပါ။ အခြားဝိုင်ယာလက်ကွန်ယက် သို့မဟုတ် ဖုန်းဒေတာကွန်ယက်သို့ချိတ်ဆက်၍ ကြိုးစားကြည့်ပါ။ "; diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index bab6eb43a..23c4071ef 100644 --- a/Signal/translations/nb_NO.lproj/Localizable.strings +++ b/Signal/translations/nb_NO.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kan ikke sende på grunn av problemer med oppdatering av private data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende melding fordi kontakten er i blokkeringslisten din."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunne ikke sende melding fordi kontakten er i blokkeringslisten din."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Feilet fordi lagring av vedlegg feilet."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Feilet fordi lagring av vedlegg feilet."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal klarte ikke å koble seg til internett. Forsøk et annet trådløst nettverk, eller bruk mobildata."; diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 5bfd20dda..604737918 100644 --- a/Signal/translations/nl.lproj/Localizable.strings +++ b/Signal/translations/nl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kan niet verzenden wegens verouderde privacygegevens."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Bericht verzenden mislukt omdat je de gebruiker hebt geblokkeerd."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Bericht verzenden mislukt omdat je de gebruiker hebt geblokkeerd."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Mislukt wegens mislukt opslaan van bijlage."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Mislukt wegens mislukt opslaan van bijlage."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kan geen verbinding maken met het internet. Probeer vanaf een ander wifinetwerk of gebruik mobiele data."; diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index e7c31d528..2f4a07be3 100644 --- a/Signal/translations/pl.lproj/Localizable.strings +++ b/Signal/translations/pl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Wysyłanie wiadomości nie powiodło się ponieważ zablokowałeś/aś tego użytkownika."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Wysyłanie wiadomości nie powiodło się ponieważ zablokowałeś/aś tego użytkownika."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Błąd z powodu nieudanego zapisu załącznika."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Błąd z powodu nieudanego zapisu załącznika."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nie mógł połączyć się z internetem. Spróbuj użyć innej sieci WiFi lub danych komórkowych."; diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index c881927c1..fd5bc8c8e 100644 --- a/Signal/translations/pt_BR.lproj/Localizable.strings +++ b/Signal/translations/pt_BR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Não é possível enviar devido a dados de privacidade obsoletos."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mensagem não enviada pois o usuário está bloqueado."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mensagem não enviada pois o usuário está bloqueado."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha ao gravar anexo."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha ao gravar anexo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "O Signal não pôde se conectar à Internet. Tente outra rede Wi-Fi ou utilize dados móveis."; diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 82f8e16ba..9e3a41bce 100644 --- a/Signal/translations/pt_PT.lproj/Localizable.strings +++ b/Signal/translations/pt_PT.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Incapaz de enviar."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Falhou a envio da mensagem para o utilizador porque o bloqueou anteriormente."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Falhou a envio da mensagem para o utilizador porque o bloqueou anteriormente."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha devido a falha a escrever o anexo."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Falha devido a falha a escrever o anexo."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "O signal foi incapaz de se ligar à internet. Por favor tente desde outra rede Wifi ou utilizando a rede móvel."; diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index 3ea0dc7f3..dc123aa5c 100644 --- a/Signal/translations/ro.lproj/Localizable.strings +++ b/Signal/translations/ro.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Trimiterea a eșuat din cauza datelor vechi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mesajul nu a fost trimis deoarece ai blocat acest utilizator."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Mesajul nu a fost trimis deoarece ai blocat acest utilizator."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eșuat din cauza unei erori la salvarea atașamentului."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eșuat din cauza unei erori la salvarea atașamentului."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nu s-a putut conecta la internet. Te rog să incerci dintr-o altă rețea WiFi sau folosește datele mobile."; diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index aadbf6d22..a118b2ebe 100644 --- a/Signal/translations/ru.lproj/Localizable.strings +++ b/Signal/translations/ru.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Не удалось отправить в связи с неактуальными данными приватности"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Не удалось отправить сообщение пользователю, так как Вы заблокировали его."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Не удалось отправить сообщение пользователю, так как Вы заблокировали его."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Произошла ошибка во время прикрепления вложения."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Произошла ошибка во время прикрепления вложения."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Не удалось установить интернет-соединение. Пожалуйста, попробуйте соединиться через другую WiFi-сеть или используйте мобильный интернет."; diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 6a0a114dd..9199d28cd 100644 --- a/Signal/translations/sl.lproj/Localizable.strings +++ b/Signal/translations/sl.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Pošiljanje ni mogoče zaradi zastarelih podatkov o zasebnosti."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Sporočilo ni moglo biti poslano, ker je uporabnik blokiran."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Sporočilo ni moglo biti poslano, ker je uporabnik blokiran."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Pošiljanje neuspešno zaradi napake v zvezi s priponko."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Pošiljanje neuspešno zaradi napake v zvezi s priponko."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Aplikacija Signal nima dostopa do interneta. Poskusite znova iz drugega omrežja WiFi ali preko podatkovne povezave."; diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 5e098f515..2e84d954d 100644 --- a/Signal/translations/sn.lproj/Localizable.strings +++ b/Signal/translations/sn.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Yatadza kutumira pamusaka pedata rekuhwandisa ragarisa."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Yatadza kutumira tsamba kumushandisi nekuti wakamuvharira."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Yatadza kutumira tsamba kumushandisi nekuti wakamuvharira."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Yatadza nekuda kwekutadza kunyora chibatanidzwa."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Yatadza nekuda kwekutadza kunyora chibatanidzwa."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal yatadza kuhakira padandemutande. Tinokumbira kuti muedze kubva kumasaisai mamwe eWiFi kana kushandisa dhata yenharembozha."; diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index 328d6c213..cf4c6cd0c 100644 --- a/Signal/translations/sq.lproj/Localizable.strings +++ b/Signal/translations/sq.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Unable to send due to stale privacy data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Failed to message user because you blocked them."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Failed due to failed attachment write."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal nuk mundi të lidhet në Internet. Ju lutemi provoni nga një rrjet tjetër WiFi apo rrjet celulari."; diff --git a/Signal/translations/sv_SE.lproj/Localizable.strings b/Signal/translations/sv_SE.lproj/Localizable.strings index afcd25be7..9cda68bc2 100644 --- a/Signal/translations/sv_SE.lproj/Localizable.strings +++ b/Signal/translations/sv_SE.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Kunden inte sända på grund av gammalt privacy-data."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunde inte skicka meddelande eftersom du blockerat användaren"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Kunde inte skicka meddelande eftersom du blockerat användaren"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Misslyckades, skrivfel för bifogad fil."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Misslyckades, skrivfel för bifogad fil."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal kunde inte nå ut på internet. Försök igen från ett annat trådlöst nätverk eller använd mobildata."; diff --git a/Signal/translations/th_TH.lproj/Localizable.strings b/Signal/translations/th_TH.lproj/Localizable.strings index 269db28cb..2216a82cb 100644 --- a/Signal/translations/th_TH.lproj/Localizable.strings +++ b/Signal/translations/th_TH.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "ไม่สามารถส่ง เนื่องจากข้อมูลส่วนบุคคลที่หมดอายุ"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "ส่งข้อความไปหาผู้ใช้ไม่สำเร็จ เนื่องจากคุณได้บล็อกเขา"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "ส่งข้อความไปหาผู้ใช้ไม่สำเร็จ เนื่องจากคุณได้บล็อกเขา"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ไม่สำเร็จ เนื่องจากไม่สามารถเขียนไฟล์แนบได้"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "ไม่สำเร็จ เนื่องจากไม่สามารถเขียนไฟล์แนบได้"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal ไม่สามารถเชื่อมต่ออินเทอร์เน็ต โปรดลองเชื่อมต่อเครือข่าย WiFi อื่นหรือใช้งานข้อมูลโทรศัพท์มือถือ"; diff --git a/Signal/translations/tr_TR.lproj/Localizable.strings b/Signal/translations/tr_TR.lproj/Localizable.strings index 12ba63aa0..4666454ed 100644 --- a/Signal/translations/tr_TR.lproj/Localizable.strings +++ b/Signal/translations/tr_TR.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "Eski gizlilik ayarlarından dolayı gönderilemedi."; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Engellediğiniz için kullanıcıya mesaj gönderilemedi."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "Engellediğiniz için kullanıcıya mesaj gönderilemedi."; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eklenti yazımı başarısız olduğundan dolayı gönderilemedi."; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "Eklenti yazımı başarısız olduğundan dolayı gönderilemedi."; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Sinyal internete bağlanamadı. Lütfen başka bir WiFi ağından deneyin veya mobil veri kullanın."; diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index f36cf4b94..d70d7c531 100644 --- a/Signal/translations/zh_CN.lproj/Localizable.strings +++ b/Signal/translations/zh_CN.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "由于隐私信息过时，无法发送。"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "无法向黑名单用户发送消息"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "无法向黑名单用户发送消息"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "因无法写附件而失败。"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "因无法写附件而失败。"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal 无法联网. 请尝试使用其它网络或者使用移动数据."; diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index e467eb5db..0a020aef9 100644 --- a/Signal/translations/zh_TW.lproj/Localizable.strings +++ b/Signal/translations/zh_TW.lproj/Localizable.strings @@ -819,10 +819,10 @@ "ERROR_DESCRIPTION_MESSAGE_SEND_DISABLED_PREKEY_UPDATE_FAILURES" = "無法傳送，因隱私資料太舊。"; /* Error message indicating that message send failed due to block list */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST" = "無法傳送訊息給此人，因為被你封鎖了。"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST" = "無法傳送訊息給此人，因為被你封鎖了。"; /* Error message indicating that message send failed due to failed attachment write */ -"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "失敗，因附件寫入失敗。"; +"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE" = "失敗，因附件寫入失敗。"; /* Generic error used whenever Signal can't contact the server */ "ERROR_DESCRIPTION_NO_INTERNET" = "Signal 無法連結到網際網路。請改試其他的 WiFi 或行動網路。"; diff --git a/SignalServiceKit/src/Util/OWSError.m b/SignalServiceKit/src/Util/OWSError.m index cd2c6b347..870958f53 100644 --- a/SignalServiceKit/src/Util/OWSError.m +++ b/SignalServiceKit/src/Util/OWSError.m @@ -60,14 +60,14 @@ NSError *OWSErrorMakeMessageSendDisabledDueToPreKeyUpdateFailuresError() NSError *OWSErrorMakeMessageSendFailedToBlockListError() { return OWSErrorWithCodeDescription(OWSErrorCodeMessageSendFailedToBlockList, - NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_BLOCK_LIST", + NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST", @"Error message indicating that message send failed due to block list")); } NSError *OWSErrorMakeWriteAttachmentDataError() { return OWSErrorWithCodeDescription(OWSErrorCodeCouldNotWriteAttachmentData, - NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_STATUS_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE", + NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_FAILED_ATTACHMENT_WRITE", @"Error message indicating that message send failed due to failed attachment write")); } From 5b5ef7e0bf59d1f0bbb502c41a0ad7d9e929d3d2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 5 Jul 2018 17:27:37 -0400 Subject: [PATCH 5/5] Respond to CR. --- .../ContactViewController.swift | 4 ++-- .../ConversationView/Cells/OWSMessageCell.m | 6 +++--- .../Utils/MessageRecipientStatusUtils.swift | 18 +++++++++--------- .../translations/ar.lproj/Localizable.strings | 2 +- .../az_AZ.lproj/Localizable.strings | 2 +- .../translations/bg.lproj/Localizable.strings | 2 +- .../translations/bs.lproj/Localizable.strings | 2 +- .../translations/ca.lproj/Localizable.strings | 2 +- .../translations/cs.lproj/Localizable.strings | 2 +- .../translations/da.lproj/Localizable.strings | 2 +- .../translations/de.lproj/Localizable.strings | 2 +- .../el_GR.lproj/Localizable.strings | 2 +- .../translations/en.lproj/Localizable.strings | 10 +++++----- .../translations/es.lproj/Localizable.strings | 2 +- .../translations/et.lproj/Localizable.strings | 2 +- .../translations/fa.lproj/Localizable.strings | 2 +- .../translations/fi.lproj/Localizable.strings | 2 +- .../translations/fil.lproj/Localizable.strings | 2 +- .../translations/fr.lproj/Localizable.strings | 2 +- .../translations/gl.lproj/Localizable.strings | 2 +- .../translations/he.lproj/Localizable.strings | 2 +- .../translations/hr.lproj/Localizable.strings | 2 +- .../translations/hu.lproj/Localizable.strings | 2 +- .../translations/id.lproj/Localizable.strings | 2 +- .../it_IT.lproj/Localizable.strings | 2 +- .../ja_JP.lproj/Localizable.strings | 2 +- .../translations/km.lproj/Localizable.strings | 2 +- .../ko_KR.lproj/Localizable.strings | 2 +- .../translations/lt.lproj/Localizable.strings | 2 +- .../translations/lv.lproj/Localizable.strings | 2 +- .../translations/mk.lproj/Localizable.strings | 2 +- .../translations/my.lproj/Localizable.strings | 2 +- .../nb_NO.lproj/Localizable.strings | 2 +- .../translations/nl.lproj/Localizable.strings | 2 +- .../translations/pl.lproj/Localizable.strings | 2 +- .../pt_BR.lproj/Localizable.strings | 2 +- .../pt_PT.lproj/Localizable.strings | 2 +- .../translations/ro.lproj/Localizable.strings | 2 +- .../translations/ru.lproj/Localizable.strings | 2 +- .../translations/sl.lproj/Localizable.strings | 2 +- .../translations/sn.lproj/Localizable.strings | 2 +- .../translations/sq.lproj/Localizable.strings | 2 +- .../sv_SE.lproj/Localizable.strings | 2 +- .../th_TH.lproj/Localizable.strings | 2 +- .../tr_TR.lproj/Localizable.strings | 2 +- .../zh_CN.lproj/Localizable.strings | 2 +- .../zh_TW.lproj/Localizable.strings | 2 +- SignalMessaging/categories/UIColor+OWS.m | 2 +- 48 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Signal/src/ViewControllers/ContactViewController.swift b/Signal/src/ViewControllers/ContactViewController.swift index 0b02147af..1f420462a 100644 --- 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) }) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index 1c4f51070..03bbc823b 100644 --- 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; } diff --git a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift index f465c1747..8db4071ba 100644 --- 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")) } } diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings index ca573c23e..af202f0e4 100644 --- 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. */ diff --git a/Signal/translations/az_AZ.lproj/Localizable.strings b/Signal/translations/az_AZ.lproj/Localizable.strings index 08136c13f..e2658a0ee 100644 --- 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. */ diff --git a/Signal/translations/bg.lproj/Localizable.strings b/Signal/translations/bg.lproj/Localizable.strings index a7691046d..a1a8295a6 100644 --- 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. */ diff --git a/Signal/translations/bs.lproj/Localizable.strings b/Signal/translations/bs.lproj/Localizable.strings index 9e16030e4..b4aaa00ed 100644 --- 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. */ diff --git a/Signal/translations/ca.lproj/Localizable.strings b/Signal/translations/ca.lproj/Localizable.strings index ea90ecdb0..41729b205 100644 --- 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. */ diff --git a/Signal/translations/cs.lproj/Localizable.strings b/Signal/translations/cs.lproj/Localizable.strings index 3810e3525..9cdbefaf8 100644 --- 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. */ diff --git a/Signal/translations/da.lproj/Localizable.strings b/Signal/translations/da.lproj/Localizable.strings index 81a7c50bf..ee708fd0e 100644 --- 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. */ diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings index 3a7d9bcb0..e567be6c1 100644 --- 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. */ diff --git a/Signal/translations/el_GR.lproj/Localizable.strings b/Signal/translations/el_GR.lproj/Localizable.strings index 106d25c73..6e675d0ed 100644 --- 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. */ diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 17f6e508d..1e6b7624e 100644 --- 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}}. */ diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings index bbd2bdbfc..49cdde423 100644 --- 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. */ diff --git a/Signal/translations/et.lproj/Localizable.strings b/Signal/translations/et.lproj/Localizable.strings index a4198532b..6b2282ba1 100644 --- 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. */ diff --git a/Signal/translations/fa.lproj/Localizable.strings b/Signal/translations/fa.lproj/Localizable.strings index c4eb1679f..be3e801d8 100644 --- 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. */ diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings index e8126d663..359046fe4 100644 --- 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. */ diff --git a/Signal/translations/fil.lproj/Localizable.strings b/Signal/translations/fil.lproj/Localizable.strings index 142eb7b52..56cbf59ca 100644 --- 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. */ diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings index a280d4f28..30ef46723 100644 --- 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. */ diff --git a/Signal/translations/gl.lproj/Localizable.strings b/Signal/translations/gl.lproj/Localizable.strings index cc59135cc..857f6c6f4 100644 --- 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. */ diff --git a/Signal/translations/he.lproj/Localizable.strings b/Signal/translations/he.lproj/Localizable.strings index a24130633..d49fd74ef 100644 --- 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. */ diff --git a/Signal/translations/hr.lproj/Localizable.strings b/Signal/translations/hr.lproj/Localizable.strings index b7c9223bb..5b3d4d0e9 100644 --- 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. */ diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings index 16cf3f787..390863906 100644 --- 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. */ diff --git a/Signal/translations/id.lproj/Localizable.strings b/Signal/translations/id.lproj/Localizable.strings index a6e65d3ae..178da0459 100644 --- 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. */ diff --git a/Signal/translations/it_IT.lproj/Localizable.strings b/Signal/translations/it_IT.lproj/Localizable.strings index 7b4b3b903..aeea75991 100644 --- 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. */ diff --git a/Signal/translations/ja_JP.lproj/Localizable.strings b/Signal/translations/ja_JP.lproj/Localizable.strings index 37d4323ab..de46fd7cf 100644 --- 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. */ diff --git a/Signal/translations/km.lproj/Localizable.strings b/Signal/translations/km.lproj/Localizable.strings index f1f424874..fe3690f8a 100644 --- 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. */ diff --git a/Signal/translations/ko_KR.lproj/Localizable.strings b/Signal/translations/ko_KR.lproj/Localizable.strings index a919df362..5183f708d 100644 --- 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. */ diff --git a/Signal/translations/lt.lproj/Localizable.strings b/Signal/translations/lt.lproj/Localizable.strings index bf77e085d..83dcd5440 100644 --- 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. */ diff --git a/Signal/translations/lv.lproj/Localizable.strings b/Signal/translations/lv.lproj/Localizable.strings index 3353347df..39ffddbff 100644 --- 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. */ diff --git a/Signal/translations/mk.lproj/Localizable.strings b/Signal/translations/mk.lproj/Localizable.strings index b0ceea84e..1aaec99fb 100644 --- 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. */ diff --git a/Signal/translations/my.lproj/Localizable.strings b/Signal/translations/my.lproj/Localizable.strings index a9309ca9f..f94594468 100644 --- 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. */ diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings index 23c4071ef..4873c8e27 100644 --- 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. */ diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings index 604737918..048b419d2 100644 --- 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. */ diff --git a/Signal/translations/pl.lproj/Localizable.strings b/Signal/translations/pl.lproj/Localizable.strings index 2f4a07be3..ac80d4aa8 100644 --- 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. */ diff --git a/Signal/translations/pt_BR.lproj/Localizable.strings b/Signal/translations/pt_BR.lproj/Localizable.strings index fd5bc8c8e..6caccbf38 100644 --- 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. */ diff --git a/Signal/translations/pt_PT.lproj/Localizable.strings b/Signal/translations/pt_PT.lproj/Localizable.strings index 9e3a41bce..38b0d3a93 100644 --- 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. */ diff --git a/Signal/translations/ro.lproj/Localizable.strings b/Signal/translations/ro.lproj/Localizable.strings index dc123aa5c..9cdb63750 100644 --- 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. */ diff --git a/Signal/translations/ru.lproj/Localizable.strings b/Signal/translations/ru.lproj/Localizable.strings index a118b2ebe..9ad28686c 100644 --- 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. */ diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings index 9199d28cd..baafe49e2 100644 --- 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. */ diff --git a/Signal/translations/sn.lproj/Localizable.strings b/Signal/translations/sn.lproj/Localizable.strings index 2e84d954d..1b9119d81 100644 --- 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. */ diff --git a/Signal/translations/sq.lproj/Localizable.strings b/Signal/translations/sq.lproj/Localizable.strings index cf4c6cd0c..889ec97da 100644 --- 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. */ diff --git a/Signal/translations/sv_SE.lproj/Localizable.strings b/Signal/translations/sv_SE.lproj/Localizable.strings index 9cda68bc2..06f48d985 100644 --- 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. */ diff --git a/Signal/translations/th_TH.lproj/Localizable.strings b/Signal/translations/th_TH.lproj/Localizable.strings index 2216a82cb..0fee817b7 100644 --- 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. */ diff --git a/Signal/translations/tr_TR.lproj/Localizable.strings b/Signal/translations/tr_TR.lproj/Localizable.strings index 4666454ed..3cff17bcc 100644 --- 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. */ diff --git a/Signal/translations/zh_CN.lproj/Localizable.strings b/Signal/translations/zh_CN.lproj/Localizable.strings index d70d7c531..316746f6b 100644 --- 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. */ diff --git a/Signal/translations/zh_TW.lproj/Localizable.strings b/Signal/translations/zh_TW.lproj/Localizable.strings index 0a020aef9..709edeafc 100644 --- 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. */ diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m index 4b73dc74b..37c1e8586 100644 --- 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