Merge remote-tracking branch 'upstream/master' into docker

1 files changed, 6 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 0611114e3..21c8ba889 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -74,7 +74,8 @@
     "ButtonMarkTheseRead": "Mark these read",
     "ButtonClose": "Close",
     "LabelAllPlaysSentToPlayer": "All plays will be sent to the selected player.",
-    "MessageInvalidUser": "Invalid user or password.",
+    "MessageInvalidUser": "Invalid username or password. Please try again.",
+    "HeaderLoginFailure": "Login Failure",
     "HeaderAllRecordings": "All Recordings",
     "RecommendationBecauseYouLike": "Because you like {0}",
     "RecommendationBecauseYouWatched": "Because you watched {0}",
@@ -612,5 +613,8 @@
     "LabelEnableCameraUploadForHelp": "Uploads will occur automatically in the background when signed into Media Browser.",
     "ErrorMessageStartHourGreaterThanEnd": "End time must be greater than the start time.",
     "ButtonLibraryAccess": "Library access",
-    "ButtonParentalControl":  "Parental control"
+    "ButtonParentalControl": "Parental control",
+    "HeaderInvitationSent": "Invitation Sent",
+    "MessageInvitationSentToUser":  "An email has been sent to {0}, inviting them to accept your sharing invitation.",
+    "MessageInvitationSentToNewUser":  "An email has been sent to {0} inviting them to sign up with Media Browser."
 }