Merge pull request #1 from MediaBrowser/master

Update to latest

1 files changed, 251 insertions, 15 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
index 51055f880..b6d5e50e5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -1,12 +1,4 @@
 {
-    "CreatePassword": "Create Password",
-    "OptionOff": "Off",
-    "OptionOn": "On",
-    "LabelAborted": "(Aborted by server shutdown)",
-    "MessagePleaseSelectItemsToGroup": "Please select two or more items to group together.",
-    "ButtonNextTrack": "Next Track",
-    "ButtonPreviousTrack": "Previous Track",
-    "HeaderMyLibrary": "My Library",
     "SettingsSaved": "Seting Disimpan",
     "AddUser": "Tambah Pengguna",
     "Users": "Para Pengguna",
@@ -46,7 +38,6 @@
     "LabelEpisode": "Episode",
     "LabelSeries": "Series",
     "LabelStopping": "Stopping",
-    "ButtonStop": "Stop",
     "LabelCancelled": "(cancelled)",
     "LabelFailed": "(failed)",
     "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
@@ -66,12 +57,15 @@
     "LabelUnknownLanguage": "Unknown language",
     "ButtonMute": "Mute",
     "ButtonUnmute": "Unmute",
+    "ButtonStop": "Stop",
+    "ButtonNextTrack": "Next Track",
     "ButtonPause": "Pause",
     "ButtonPlay": "Play",
     "ButtonEdit": "Edit",
     "ButtonQueue": "Queue",
-    "ButtonPlayTrailer": "PlayTrailer",
+    "ButtonPlayTrailer": "Play trailer",
     "ButtonPlaylist": "Playlist",
+    "ButtonPreviousTrack": "Previous Track",
     "LabelEnabled": "Enabled",
     "LabelDisabled": "Disabled",
     "ButtonMoreInformation": "More Information",
@@ -112,7 +106,6 @@
     "HeaderResetTuner": "Reset Tuner",
     "MessageConfirmResetTuner": "Are you sure you wish to reset this tuner? Any active players or recordings will be abruptly stopped.",
     "ButtonCancelSeries": "Cancel Series",
-    "LabelAllChannels": "All channels",
     "HeaderSeriesRecordings": "Series Recordings",
     "LabelAnytime": "Any time",
     "StatusRecording": "Recording",
@@ -130,7 +123,8 @@
     "HeaderMyViews": "My Views",
     "HeaderLibraryFolders": "Media Folders",
     "HeaderLatestMedia": "Latest Media",
-    "ButtonMore": "More...",
+    "ButtonMoreItems": "More...",
+    "ButtonMore": "More",
     "HeaderFavoriteMovies": "Favorite Movies",
     "HeaderFavoriteShows": "Favorite Shows",
     "HeaderFavoriteEpisodes": "Favorite Episodes",
@@ -142,7 +136,7 @@
     "HeaderSelectTranscodingPath": "Select Transcoding Temporary Path",
     "HeaderSelectImagesByNamePath": "Select Images By Name Path",
     "HeaderSelectMetadataPath": "Select Metadata Path",
-    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable. The location of this folder will directly impact server performance and should ideally be placed on a solid state drive.",
+    "HeaderSelectServerCachePathHelp": "Browse or enter the path to use for server cache files. The folder must be writeable.",
     "HeaderSelectTranscodingPathHelp": "Browse or enter the path to use for transcoding temporary files. The folder must be writeable.",
     "HeaderSelectImagesByNamePathHelp": "Browse or enter the path to your items by name folder. The folder must be writeable.",
     "HeaderSelectMetadataPathHelp": "Browse or enter the path you'd like to store metadata within. The folder must be writeable.",
@@ -185,7 +179,6 @@
     "LabelVideoCodec": "Video: {0}",
     "LabelRemoteAccessUrl": "Remote access: {0}",
     "LabelRunningOnPort": "Running on port {0}.",
-    "LabelRunningOnPorts": "Running on ports {0} and {1}.",
     "HeaderLatestFromChannel": "Latest from {0}",
     "ButtonDownload": "Download",
     "LabelUnknownLanaguage": "Unknown language",
@@ -193,5 +186,248 @@
     "MessageDownloadQueued": "The download has been queued.",
     "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
     "ButtonRemoteControl": "Remote Control",
-    "HeaderLatestTvRecordings": "Latest Recordings"
+    "HeaderLatestTvRecordings": "Latest Recordings",
+    "ButtonOk": "Ok",
+    "ButtonCancel": "Cancel",
+    "ButtonRefresh": "Refresh",
+    "LabelCurrentPath": "Current path:",
+    "HeaderSelectMediaPath": "Select Media 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",
+    "ButtonOpen": "Open",
+    "ButtonOpenInNewTab": "Open in new tab",
+    "ButtonShuffle": "Shuffle",
+    "ButtonInstantMix": "Instant mix",
+    "ButtonResume": "Resume",
+    "HeaderScenes": "Scenes",
+    "HeaderAudioTracks": "Audio Tracks",
+    "HeaderSubtitles": "Subtitles",
+    "HeaderVideoQuality": "Video Quality",
+    "MessageErrorPlayingVideo": "There was an error playing the video.",
+    "MessageEnsureOpenTuner": "Please ensure there is an open tuner availalble.",
+    "ButtonHome": "Home",
+    "ButtonDashboard": "Dashboard",
+    "ButtonReports": "Reports",
+    "ButtonMetadataManager": "Metadata Manager",
+    "HeaderTime": "Time",
+    "HeaderName": "Name",
+    "HeaderAlbum": "Album",
+    "HeaderAlbumArtist": "Album Artist",
+    "HeaderArtist": "Artist",
+    "LabelAddedOnDate": "Added {0}",
+    "ButtonStart": "Start",
+    "HeaderChannels": "Channels",
+    "HeaderMediaFolders": "Media Folders",
+    "HeaderBlockItemsWithNoRating": "Block items with no rating information:",
+    "OptionBlockOthers": "Others",
+    "OptionBlockTvShows": "TV Shows",
+    "OptionBlockTrailers": "Trailers",
+    "OptionBlockMusic": "Music",
+    "OptionBlockMovies": "Movies",
+    "OptionBlockBooks": "Books",
+    "OptionBlockGames": "Games",
+    "OptionBlockLiveTvPrograms": "Live TV Programs",
+    "OptionBlockLiveTvChannels": "Live TV Channels",
+    "OptionBlockChannelContent": "Internet Channel Content",
+    "ButtonRevoke": "Revoke",
+    "MessageConfirmRevokeApiKey": "Are you sure you wish to revoke this api key? The application's connection to Media Browser will be abruptly terminated.",
+    "HeaderConfirmRevokeApiKey": "Revoke Api Key",
+    "ValueContainer": "Container: {0}",
+    "ValueAudioCodec": "Audio Codec: {0}",
+    "ValueVideoCodec": "Video Codec: {0}",
+    "ValueCodec": "Codec: {0}",
+    "ValueConditions": "Conditions: {0}",
+    "LabelAll": "All",
+    "HeaderDeleteImage": "Delete Image",
+    "MessageFileNotFound": "File not found.",
+    "MessageFileReadError": "An error occurred reading this file.",
+    "ButtonNextPage": "Next Page",
+    "ButtonPreviousPage": "Previous Page",
+    "ButtonMoveLeft": "Move left",
+    "ButtonMoveRight": "Move right",
+    "ButtonBrowseOnlineImages": "Browse online images",
+    "HeaderDeleteItem": "Delete Item",
+    "ConfirmDeleteItem": "Are you sure you wish to delete this item from your library?",
+    "MessagePleaseEnterNameOrId": "Please enter a name or an external Id.",
+    "MessageValueNotCorrect": "The value entered is not correct. Please try again.",
+    "MessageItemSaved": "Item saved.",
+    "OptionEnded": "Ended",
+    "OptionContinuing": "Continuing",
+    "OptionOff": "Off",
+    "OptionOn": "On",
+    "HeaderFields": "Fields",
+    "HeaderFieldsHelp": "Slide a field to 'off' to lock it and prevent it's data from being changed.",
+    "HeaderLiveTV": "Live TV",
+    "MissingLocalTrailer": "Missing local trailer.",
+    "MissingPrimaryImage": "Missing primary image.",
+    "MissingBackdropImage": "Missing backdrop image.",
+    "MissingLogoImage": "Missing logo image.",
+    "MissingEpisode": "Missing episode.",
+    "OptionScreenshots": "Screenshots",
+    "OptionBackdrops": "Backdrops",
+    "OptionImages": "Images",
+    "OptionKeywords": "Keywords",
+    "OptionTags": "Tags",
+    "OptionStudios": "Studios",
+    "OptionName": "Name",
+    "OptionOverview": "Overview",
+    "OptionGenres": "Genres",
+    "OptionParentalRating": "Parental Rating",
+    "OptionPeople": "People",
+    "OptionRuntime": "Runtime",
+    "OptionProductionLocations": "Production Locations",
+    "OptionBirthLocation": "Birth Location",
+    "LabelAllChannels": "All channels",
+    "LabelLiveProgram": "LIVE",
+    "LabelNewProgram": "NEW",
+    "LabelPremiereProgram": "PREMIERE",
+    "LabelHDProgram": "HD",
+    "HeaderChangeFolderType": "Change Folder Type",
+    "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
+    "HeaderAlert": "Alert",
+    "MessagePleaseRestart": "Please restart to finish updating.",
+    "ButtonRestart": "Restart",
+    "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from the server.",
+    "ButtonHide": "Hide",
+    "MessageSettingsSaved": "Settings saved.",
+    "ButtonSignOut": "Sign Out",
+    "ButtonMyProfile": "My Profile",
+    "ButtonMyPreferences": "My Preferences",
+    "MessageBrowserDoesNotSupportWebSockets": "This browser does not support web sockets. For a better experience, try a newer browser such as Chrome, Firefox, IE10+, Safari (iOS) or Opera.",
+    "LabelInstallingPackage": "Installing {0}",
+    "LabelPackageInstallCompleted": "{0} installation completed.",
+    "LabelPackageInstallFailed": "{0} installation failed.",
+    "LabelPackageInstallCancelled": "{0} installation cancelled.",
+    "TabServer": "Server",
+    "TabUsers": "Users",
+    "TabLibrary": "Library",
+    "TabMetadata": "Metadata",
+    "TabDLNA": "DLNA",
+    "TabLiveTV": "Live TV",
+    "TabAutoOrganize": "Auto-Organize",
+    "TabPlugins": "Plugins",
+    "TabAdvanced": "Advanced",
+    "TabHelp": "Help",
+    "TabScheduledTasks": "Scheduled Tasks",
+    "ButtonFullscreen": "Fullscreen",
+    "ButtonAudioTracks": "Audio Tracks",
+    "ButtonSubtitles": "Subtitles",
+    "ButtonScenes": "Scenes",
+    "ButtonQuality": "Quality",
+    "HeaderNotifications": "Notifications",
+    "HeaderSelectPlayer": "Select Player:",
+    "ButtonSelect": "Select",
+    "ButtonNew": "New",
+    "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
+    "HeaderVideoError": "Video Error",
+    "ButtonAddToPlaylist": "Add to playlist",
+    "HeaderAddToPlaylist": "Add to Playlist",
+    "LabelName": "Name:",
+    "ButtonSubmit": "Submit",
+    "LabelSelectPlaylist": "Playlist:",
+    "OptionNewPlaylist": "New playlist...",
+    "MessageAddedToPlaylistSuccess": "Ok",
+    "ButtonViewSeriesRecording": "View series recording",
+    "ValueOriginalAirDate": "Original air date: {0}",
+    "ButtonRemoveFromPlaylist": "Remove from playlist",
+    "HeaderSpecials": "Specials",
+    "HeaderTrailers": "Trailers",
+    "HeaderAudio": "Audio",
+    "HeaderResolution": "Resolution",
+    "HeaderVideo": "Video",
+    "HeaderRuntime": "Runtime",
+    "HeaderCommunityRating": "Community rating",
+    "HeaderParentalRating": "Parental rating",
+    "HeaderReleaseDate": "Release date",
+    "HeaderDateAdded": "Date added",
+    "HeaderSeries": "Series",
+    "HeaderSeason": "Season",
+    "HeaderSeasonNumber": "Season number",
+    "HeaderNetwork": "Network",
+    "HeaderYear": "Year",
+    "HeaderGameSystem": "Game system",
+    "HeaderPlayers": "Players",
+    "HeaderEmbeddedImage": "Embedded image",
+    "HeaderTrack": "Track",
+    "HeaderDisc": "Disc",
+    "OptionMovies": "Movies",
+    "OptionCollections": "Collections",
+    "OptionSeries": "Series",
+    "OptionSeasons": "Seasons",
+    "OptionEpisodes": "Episodes",
+    "OptionGames": "Games",
+    "OptionGameSystems": "Game systems",
+    "OptionMusicArtists": "Music artists",
+    "OptionMusicAlbums": "Music albums",
+    "OptionMusicVideos": "Music videos",
+    "OptionSongs": "Songs",
+    "OptionHomeVideos": "Home videos",
+    "OptionBooks": "Books",
+    "OptionAdultVideos": "Adult videos",
+    "ButtonUp": "Up",
+    "ButtonDown": "Down",
+    "LabelMetadataReaders": "Metadata readers:",
+    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "LabelMetadataDownloaders": "Metadata downloaders:",
+    "LabelMetadataDownloadersHelp": "Enable and rank your preferred metadata downloaders in order of priority. Lower priority downloaders will only be used to fill in missing information.",
+    "LabelMetadataSavers": "Metadata savers:",
+    "LabelMetadataSaversHelp": "Choose the file formats to save your metadata to.",
+    "LabelImageFetchers": "Image fetchers:",
+    "LabelImageFetchersHelp": "Enable and rank your preferred image fetchers in order of priority.",
+    "ButtonQueueAllFromHere": "Queue all from here",
+    "ButtonPlayAllFromHere": "Play all from here",
+    "LabelDynamicExternalId": "{0} Id:",
+    "HeaderIdentify": "Identify Item",
+    "PersonTypePerson": "Person",
+    "LabelTitleDisplayOrder": "Title display order:",
+    "OptionSortName": "Sort name",
+    "OptionReleaseDate": "Release date",
+    "LabelSeasonNumber": "Season number:",
+    "LabelDiscNumber": "Disc number",
+    "LabelParentNumber": "Parent number",
+    "LabelEpisodeNumber": "Episode number:",
+    "LabelTrackNumber": "Track number:",
+    "LabelNumber": "Number:",
+    "LabelReleaseDate": "Release date:",
+    "LabelEndDate": "End date:",
+    "LabelYear": "Year:",
+    "LabelDateOfBirth": "Date of birth:",
+    "LabelBirthYear": "Birth year:",
+    "LabelDeathDate": "Death date:",
+    "HeaderRemoveMediaLocation": "Remove Media Location",
+    "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",
+    "HeaderRenameMediaFolder": "Rename Media Folder",
+    "LabelNewName": "New name:",
+    "HeaderAddMediaFolder": "Add Media Folder",
+    "HeaderAddMediaFolderHelp": "Name (Movies, Music, TV, etc):",
+    "HeaderRemoveMediaFolder": "Remove Media Folder",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
+    "ButtonRename": "Rename",
+    "ButtonChangeType": "Change type",
+    "HeaderMediaLocations": "Media Locations",
+    "LabelFolderTypeValue": "Folder type: {0}",
+    "LabelPathSubstitutionHelp": "Optional: Path substitution can map server paths to network shares that clients can access for direct playback.",
+    "FolderTypeMixed": "Mixed movies & tv",
+    "FolderTypeMovies": "Movies",
+    "FolderTypeMusic": "Music",
+    "FolderTypeAdultVideos": "Adult videos",
+    "FolderTypePhotos": "Photos",
+    "FolderTypeMusicVideos": "Music videos",
+    "FolderTypeHomeVideos": "Home videos",
+    "FolderTypeGames": "Games",
+    "FolderTypeBooks": "Books",
+    "FolderTypeTvShows": "TV shows",
+    "TabMovies": "Movies",
+    "TabSeries": "Series",
+    "TabEpisodes": "Episodes",
+    "TabTrailers": "Trailers",
+    "TabGames": "Games",
+    "TabAlbums": "Albums",
+    "TabSongs": "Songs",
+    "TabMusicVideos": "Music Videos",
+    "BirthPlaceValue": "Birth place: {0}",
+    "DeathDateValue": "Died: {0}",
+    "BirthDateValue": "Born: {0}"
 }
\ No newline at end of file