aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
diff options
context:
space:
mode:
authorTavares André <tavares_and@hotmail.com>2015-06-30 20:26:42 +0200
committerTavares André <tavares_and@hotmail.com>2015-06-30 20:26:42 +0200
commit27d6135493c778bddee6ad6e044ed167c6449d7d (patch)
tree4cf323758d3e9caf115c9627f8e6da7dd78c543f /MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
parent1e07dbec63bced51857e67b00941b91ca86a7f77 (diff)
parent86571a629764be30e6d2e671db9e87c42a72a7f4 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json')
-rw-r--r--MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json9
1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 954ed5f96..8bc244891 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -38,7 +38,9 @@
"HeaderSupportTheTeam": "Support the Emby Team",
"TextEnjoyBonusFeatures": "Enjoy Bonus Features",
"TitleLiveTV": "Live TV",
+ "ButtonCancelSyncJob": "Cancel sync job",
"TitleSync": "Sync",
+ "HeaderSelectDate": "Select Date",
"ButtonDonate": "Donate",
"LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.",
"HeaderMyMedia": "My Media",
@@ -795,6 +797,7 @@
"HeaderMedia": "Media",
"ButtonInbox": "Inbox",
"HeaderAdvanced": "Advanced",
+ "HeaderGroupVersions": "Group Versions",
"HeaderSaySomethingLike": "Say Something Like...",
"ButtonTryAgain": "Try Again",
"HeaderYouSaid": "You Said...",
@@ -804,5 +807,9 @@
"ButtonManageServer": "Manage Server",
"ButtonPreferences": "Preferences",
"ButtonViewArtist": "View artist",
- "ButtonViewAlbum": "View album"
+ "ButtonViewAlbum": "View album",
+ "ErrorMessagePasswordNotMatchConfirm": "The password and password confirmation must match.",
+ "ErrorMessageUsernameInUse": "The username is already in use. Please choose a new name and try again.",
+ "ErrorMessageEmailInUse": "The email address is already in use. Please enter a new email address and try again, or use the forgot password feature.",
+ "MessageThankYouForConnectSignUp": "Thank you for signing up for Emby Connect. An email will be sent to your address with instructions on how to confirm your new account. Please confirm the account and then return here to sign in."
}