removed jsq strings, modified MULTIDEVICE_PAIRING_MAX_RECOVERY text and comment

Signal/translations/bin/auto-genstrings

@@ -27,12 +27,6 @@ fi
 
 done
 
-JSQ_STRINGS_PATH="../JSQMessagesViewController/JSQMessagesViewController/Assets/JSQMessagesAssets.bundle/Base.lproj/JSQMessages.strings"
-if [ ! -f $JSQ_STRINGS_PATH ]; then
-  echo "[!] Error. Expected to find strings for JSQMessagesViewController at ${JSQ_STRINGS_PATH}"
-  exit 1
-fi
-
 # Now that we've check all our pre-conditions, proceed with the work.
 
 # Search directories for .m & .h files and collect string definitions with genstrings
@@ -58,14 +52,3 @@ echo "$OLDUTF8" | grep -Eo '^".*"' | \
 		if($2 ~ /"$/){$2 = $2";"}; \
 		print}' - <(echo "$NEWUTF8") > $STRINGFILE
 
-# Copy in strings from JSQMessagesViewController
-#
-# We have a wider array of translators than JSQ, and it's easier for our
-# translators to translate for us directly rather than to direct them to the
-# now defunct JSQMessagesView project.
-
-echo "Copying strings from JSQMessagesViewController"
-echo "
-// Strings Copied in from JSQMessagesViewController" >> $STRINGFILE
-cat $JSQ_STRINGS_PATH  | grep -v "^//" >> $STRINGFILE
-

Signal/translations/en.lproj/Localizable.strings

@@ -1322,11 +1322,11 @@
 /* notification title. Embeds {{caller's name or phone number}} */
 "MSGVIEW_MISSED_CALL_WITH_NAME" = "Missed call from %@.";
 
-/* No comment provided by engineer. */
+/* alert title: cannot link - reached max linked devices */
 "MULTIDEVICE_PAIRING_MAX_DESC" = "You can not pair any more devices.";
 
-/* No comment provided by engineer. */
-"MULTIDEVICE_PAIRING_MAX_RECOVERY" = "You have reached the maximum of devices you can currently pair with your account. Please remove a device or try again to pair it later.";
+/* alert body: cannot link - reached max linked devices */
+"MULTIDEVICE_PAIRING_MAX_RECOVERY" = "You have reached the maximum of devices you can currently link with your account. Please remove a device or try again to link it later.";
 
 /* An explanation of the consequences of muting a thread. */
 "MUTE_BEHAVIOR_EXPLANATION" = "You will not receive notifications for muted conversations.";
@@ -2347,20 +2347,3 @@
 
 /* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */
 "YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "You set disappearing message time to %@.";
-
-// Strings Copied in from JSQMessagesViewController
-
-
-"load_earlier_messages" = "Load Earlier Messages";
-
-"send" = "Send";
-
-"new_message" = "New Message";
-
-"text_message_accessibility_label" = "%@: %@";
-
-"media_message_accessibility_label" = "%@: media message";
-
-"accessory_button_accessibility_label" = "Share media";
-
-"new_message_received_accessibility_announcement" = "New message received";

SignalServiceKit/src/Network/API/TSNetworkManager.m

@@ -205,9 +205,9 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
               DDLogInfo(@"Multi-device pairing: %ld, %@, %@", (long)statusCode, networkError.debugDescription, request);
               failureBlock(task,
                            [self errorWithHTTPCode:statusCode
-                                       description:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_DESC", nil)
+                                       description:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_DESC", @"alert title: cannot link - reached max linked devices")
                                      failureReason:networkError.localizedFailureReason
-                                recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", nil)
+                                recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", @"alert body: cannot link - reached max linked devices")
                                      fallbackError:networkError]);
               break;
           }