Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Server.Implementations/Connect/ConnectManager.cs

@@ -275,7 +275,7 @@ namespace MediaBrowser.Server.Implementations.Connect
 
         private string GetConnectUrl(string handler)
         {
-            return "http://mb3admin.com/test/connect/" + handler;
+            return "https://connect.mediabrowser.tv/service/" + handler;
         }
 
         public async Task LinkUser(string userId, string connectUsername)
@@ -293,12 +293,6 @@ namespace MediaBrowser.Server.Implementations.Connect
 
             var user = GetUser(userId);
 
-            // See if it's already been set.
-            if (string.Equals(connectUser.Id, user.ConnectUserId, StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
             if (!string.IsNullOrWhiteSpace(user.ConnectUserId))
             {
                 await RemoveLink(user, connectUser).ConfigureAwait(false);

MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json

@@ -453,5 +453,5 @@
     "MessageYouHaveAnActiveRecurringMembership": "You have an active {0} membership. You can upgrade your plan using the options below.",
     "ButtonDelete": "Delete",
     "HeaderMediaBrowserAccountAdded": "Media Browser Account Added",
-    "MessageMediaBrowserAccontAdded": "A Media Browser account has been added to this user. An email has been sent to the owner of the account. They will need to confirm the invitation by clicking a link within the email."
+    "MessageMediaBrowserAccontAdded": "A Media Browser account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email."
 }