Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 51 insertions, 6 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 943daff5e..d5958358d 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -6,15 +6,20 @@
     "Administrator": "Administrator",
     "Password": "Password",
     "DeleteImage": "Delete Image",
+    "MessageThankYouForSupporting": "Thank you for supporting Media Browser.",
+    "MessagePleaseSupportMediaBrowser": "Please support Media Browser.",
     "DeleteImageConfirmation": "Are you sure you wish to delete this image?",
     "FileReadCancelled": "The file read has been canceled.",
     "FileNotFound": "File not found.",
     "FileReadError": "An error occurred while reading the file.",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
-    "PasswordResetHeader": "Password Reset",
+    "PasswordResetHeader": "Reset Password",
     "PasswordResetComplete": "The password has been reset.",
+    "PinCodeResetComplete": "The pin code has been reset.",
     "PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+    "PinCodeResetConfirmation": "Are you sure you wish to reset the pin code?",
+    "HeaderPinCodeReset": "Reset Pin Code",
     "PasswordSaved": "Password saved.",
     "PasswordMatchError": "Password and password confirmation must match.",
     "OptionRelease": "Official Release",
@@ -32,6 +37,7 @@
     "MessageKeyRemoved": "Thank you. Your supporter key has been removed.",
     "ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",
     "HeaderSearch": "Search",
+    "ValueDateCreated": "Date created: {0}",
     "LabelArtist": "Artist",
     "LabelMovie": "Movie",
     "LabelMusicVideo": "Music Video",
@@ -42,6 +48,27 @@
     "LabelFailed": "(failed)",
     "ButtonHelp": "Help",
     "ButtonSave": "Save",
+    "ButtonDownload": "Download",
+    "SyncJobStatusQueued": "Queued",
+    "SyncJobStatusConverting": "Converting",
+    "SyncJobStatusFailed": "Failed",
+    "SyncJobStatusCancelled": "Cancelled",
+    "SyncJobStatusCompleted": "Synced",
+    "SyncJobStatusReadyToTransfer": "Ready to Transfer",
+    "SyncJobStatusTransferring": "Transferring",
+    "SyncJobStatusCompletedWithError": "Synced with errors",
+    "SyncJobItemStatusReadyToTransfer": "Ready to Transfer",
+    "LabelCollection": "Collection",
+    "HeaderAddToCollection": "Add to Collection",
+    "NewCollectionNameExample": "Example: Star Wars Collection",
+    "OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
+    "LabelSelectCollection": "Select collection:",
+    "HeaderDevices": "Devices",
+    "ButtonScheduledTasks": "Scheduled tasks",
+    "MessageItemsAdded": "Items added",
+    "ButtonAddToCollection": "Add to collection",
+    "HeaderSelectCertificatePath": "Select Certificate Path",
+    "ConfirmMessageScheduledTaskButton": "This operation normally runs automatically as a scheduled task. It can also be run manually here. To configure the scheduled task, see:",
     "HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to premium plugins, internet channel content, and more. {0}Learn more{1}.",
     "HeaderWelcomeToMediaBrowserServerDashboard": "Welcome to the Media Browser Dashboard",
     "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
@@ -53,6 +80,10 @@
     "HeaderChannelAccess": "Channel Access",
     "HeaderDeviceAccess": "Device Access",
     "HeaderSelectDevices": "Select Devices",
+    "ButtonCancelItem": "Cancel item",
+    "ButtonQueueForRetry": "Queue for retry",
+    "ButtonReenable": "Re-enable",
+    "SyncJobItemStatusSyncedMarkForRemoval": "Marked for removal",
     "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
     "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",
     "HeaderDeleteTaskTrigger": "Delete Task Trigger",
@@ -64,10 +95,15 @@
     "LabelFree": "Free",
     "HeaderSelectAudio": "Select Audio",
     "HeaderSelectSubtitles": "Select Subtitles",
+    "ButtonMarkForRemoval": "Remove from device",
+    "ButtonUnmarkForRemoval": "Cancel removal from device",
+    "LabelSyncQualityHelp": "Use high quality for the maximum supported quality by the device. Medium and low quality will reduce the allowed bitrate. Original will sync the original file, regardless of whether the device is capable of playing it or not.",
     "LabelDefaultStream": "(Default)",
     "LabelForcedStream": "(Forced)",
     "LabelDefaultForcedStream": "(Default/Forced)",
     "LabelUnknownLanguage": "Unknown language",
+    "HeaderConfirmation": "Confirmation",
+    "MessageConfirmSyncJobItemCancellation": "Are you sure you wish to cancel this item?",
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
     "ButtonStop": "Stop",
@@ -183,6 +219,8 @@
     "MessageConfirmRestart": "Are you sure you wish to restart Media Browser Server?",
     "MessageConfirmShutdown": "Are you sure you wish to shutdown Media Browser Server?",
     "ButtonUpdateNow": "Update Now",
+    "ValueItemCount": "{0} item",
+    "ValueItemCountPlural": "{0} items",
     "NewVersionOfSomethingAvailable": "A new version of {0} is available!",
     "VersionXIsAvailableForDownload": "Version {0} is now available for download.",
     "LabelVersionNumber": "Version {0}",
@@ -191,8 +229,10 @@
     "LabelPlayMethodDirectPlay": "Direct Playing",
     "LabelAudioCodec": "Audio: {0}",
     "LabelVideoCodec": "Video: {0}",
+    "LabelLocalAccessUrl": "Local access: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
-    "LabelRunningOnPort": "Running on port {0}.",
+    "LabelRunningOnPort": "Running on http port {0}.",
+    "LabelRunningOnPorts": "Running on http port {0}, and https port {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -206,6 +246,7 @@
     "ButtonRefresh": "Refresh",
     "LabelCurrentPath": "Current path:",
     "HeaderSelectMediaPath": "Select Media Path",
+    "HeaderSelectPath": "Select Path",
     "ButtonNetwork": "Network",
     "MessageDirectoryPickerInstruction": "Network paths can be entered manually in the event the Network button fails to locate your devices. For example, {0} or {1}.",
     "HeaderMenu": "Menu",
@@ -216,6 +257,7 @@
     "ButtonResume": "Resume",
     "HeaderScenes": "Scenes",
     "HeaderAudioTracks": "Audio Tracks",
+    "HeaderLibraries": "Libraries",
     "LabelUnknownLanguage": "Unknown language",
     "HeaderSubtitles": "Subtitles",
     "HeaderVideoQuality": "Video Quality",
@@ -234,7 +276,7 @@
     "ButtonStart": "Start",
     "HeaderChannels": "Channels",
     "HeaderMediaFolders": "Media Folders",
-    "HeaderBlockItemsWithNoRating": "Block items with no rating information:",
+    "HeaderBlockItemsWithNoRating": "Block content with no rating information:",
     "OptionBlockOthers": "Others",
     "OptionBlockTvShows": "TV Shows",
     "OptionBlockTrailers": "Trailers",
@@ -589,6 +631,8 @@
     "MediaInfoStreamTypeEmbeddedImage": "Embedded Image",
     "MediaInfoRefFrames": "Ref frames",
     "TabPlayback": "Playback",
+    "TabNotifications": "Notifications",
+    "TabExpert": "Expert",
     "HeaderSelectCustomIntrosPath": "Select Custom Intros Path",
     "HeaderRateAndReview": "Rate and Review",
     "HeaderThankYou": "Thank You",
@@ -623,6 +667,7 @@
     "DashboardTourMobile": "The Media Browser dashboard works great on smartphones and tablets. Manage your server from the palm of your hand anytime, anywhere.",
     "MessageRefreshQueued": "Refresh queued",
     "TabDevices": "Devices",
+    "TabExtras": "Extras",
     "DeviceLastUsedByUserName": "Last used by {0}",
     "HeaderDeleteDevice": "Delete Device",
     "DeleteDeviceConfirmation": "Are you sure you wish to delete this device? It will reappear the next time a user signs in with it.",
@@ -649,7 +694,7 @@
     "MessageForgotPasswordFileCreated": "The following file has been created on your server and contains instructions on how to proceed:",
     "MessageForgotPasswordFileExpiration": "The reset pin will expire at {0}.",
     "MessageInvalidForgotPasswordPin": "An invalid or expired pin was entered. Please try again.",
-    "MessagePasswordResetForUsers": "Passwords have been reset for the following users:",
+    "MessagePasswordResetForUsers": "Passwords have been removed for the following users:",
     "HeaderInviteGuest": "Invite Guest",
     "ButtonLinkMyMediaBrowserAccount": "Link my account now",
     "MessageConnectAccountRequiredToInviteGuest": "In order to invite guests you need to first link your Media Browser account to this server.",
@@ -663,6 +708,7 @@
     "LabelSyncTo": "Sync to:",
     "LabelSyncJobName": "Sync job name:",
     "LabelQuality": "Quality:",
+    "OptionOriginal": "Original",
     "OptionHigh": "High",
     "OptionMedium": "Medium",
     "OptionLow": "Low",
@@ -682,6 +728,5 @@
     "SyncJobItemStatusSynced": "Synced",
     "SyncJobItemStatusFailed": "Failed",
     "SyncJobItemStatusRemovedFromDevice": "Removed from device",
-    "SyncJobItemStatusCancelled": "Cancelled",
-    "MessageJobItemHasNoActions": "d"
+    "SyncJobItemStatusCancelled": "Cancelled"
 }