Merge pull request #1127 from MediaBrowser/dev

3.0.5641.5

1 files changed, 16 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh-CN.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh-CN.json
index cbed3eaa9..fd7795dcb 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh-CN.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh-CN.json
@@ -38,7 +38,9 @@
     "HeaderSupportTheTeam": "Support the Emby Team",
     "TextEnjoyBonusFeatures": "\u4eab\u53d7\u5956\u52b1\u529f\u80fd",
     "TitleLiveTV": "\u7535\u89c6\u76f4\u64ad",
+    "ButtonCancelSyncJob": "Cancel sync job",
     "TitleSync": "\u540c\u6b65",
+    "HeaderSelectDate": "Select Date",
     "ButtonDonate": "\u6350\u8d60",
     "LabelRecurringDonationCanBeCancelledHelp": "\u5728\u60a8\u7684PayPal\u8d26\u6237\u5185\u4efb\u4f55\u65f6\u5019\u90fd\u53ef\u4ee5\u53d6\u6d88\u7ecf\u5e38\u6027\u6350\u8d60\u3002",
     "HeaderMyMedia": "My Media",
@@ -104,6 +106,7 @@
     "TitlePlugins": "Plugins",
     "ButtonTakeTheTourToSeeWhatsNew": "\u8fdb\u884c\u53c2\u89c2\uff0c\u770b\u770b\u6709\u4ec0\u4e48\u65b0\u4e1c\u897f",
     "MessageNoSyncJobsFound": "\u6ca1\u6709\u53d1\u73b0\u540c\u6b65\u4f5c\u4e1a\u3002\u4f7f\u7528Web\u754c\u9762\u4e2d\u7684\u540c\u6b65\u6309\u94ae\u6765\u521b\u5efa\u540c\u6b65\u4f5c\u4e1a\u3002",
+    "ButtonPlayTrailer": "Play trailer",
     "HeaderLibraryAccess": "Library Access",
     "HeaderChannelAccess": "Channel Access",
     "HeaderDeviceAccess": "\u8bbe\u5907\u8bbf\u95ee",
@@ -144,7 +147,6 @@
     "ButtonPlay": "\u64ad\u653e",
     "ButtonEdit": "\u7f16\u8f91",
     "ButtonQueue": "\u52a0\u5165\u961f\u5217",
-    "ButtonPlayTrailer": "\u64ad\u653e\u9884\u544a\u7247",
     "ButtonPlaylist": "\u64ad\u653e\u5217\u8868",
     "ButtonPreviousTrack": "\u4e0a\u4e00\u97f3\u8f68",
     "LabelEnabled": "\u5df2\u542f\u7528",
@@ -263,6 +265,7 @@
     "LabelPlayMethodTranscoding": "\u8f6c\u7801",
     "LabelPlayMethodDirectStream": "\u76f4\u63a5\u7528\u5a92\u4f53\u6d41",
     "LabelPlayMethodDirectPlay": "\u76f4\u63a5\u64ad\u653e",
+    "LabelEpisodeNumber": "Episode number:",
     "LabelAudioCodec": "\u97f3\u9891\uff1a {0}",
     "LabelVideoCodec": "\u89c6\u9891\uff1a{0}",
     "LabelLocalAccessUrl": "\u672c\u5730\u8bbf\u95ee\uff1a {0}",
@@ -308,6 +311,7 @@
     "HeaderArtist": "\u827a\u672f\u5bb6",
     "LabelAddedOnDate": "\u6dfb\u52a0 {0}",
     "ButtonStart": "\u5f00\u59cb",
+    "LabelSeasonNumber": "Season number:",
     "HeaderChannels": "\u9891\u9053",
     "HeaderMediaFolders": "\u5a92\u4f53\u6587\u4ef6\u5939",
     "HeaderBlockItemsWithNoRating": "Block content with no rating information:",
@@ -336,6 +340,7 @@
     "ButtonNextPage": "\u4e0b\u4e00\u9875",
     "ButtonPreviousPage": "\u524d\u4e00\u9875",
     "ButtonMoveLeft": "\u5de6\u79fb",
+    "OptionReleaseDate": "Release date",
     "ButtonMoveRight": "\u53f3\u79fb",
     "ButtonBrowseOnlineImages": "\u6d4f\u89c8\u5728\u7ebf\u56fe\u7247",
     "HeaderDeleteItem": "\u5220\u9664\u9879\u76ee",
@@ -478,11 +483,8 @@
     "PersonTypePerson": "\u4eba\u7269",
     "LabelTitleDisplayOrder": "\u6807\u9898\u663e\u793a\u7684\u987a\u5e8f\uff1a",
     "OptionSortName": "\u6392\u5e8f\u540d\u79f0",
-    "OptionReleaseDate": "\u53d1\u5e03\u65e5\u671f",
-    "LabelSeasonNumber": "\u591a\u5c11\u5b63\uff1a",
     "LabelDiscNumber": "\u5149\u76d8\u53f7",
     "LabelParentNumber": "\u6bcd\u5e26\u53f7",
-    "LabelEpisodeNumber": "\u591a\u5c11\u96c6\uff1a",
     "LabelTrackNumber": "\u97f3\u8f68\u53f7\u7801\uff1a",
     "LabelNumber": "\u7f16\u53f7\uff1a",
     "LabelReleaseDate": "\u53d1\u884c\u65e5\u671f\uff1a",
@@ -785,6 +787,7 @@
     "HeaderMedia": "Media",
     "ButtonInbox": "Inbox",
     "HeaderAdvanced": "\u9ad8\u7ea7",
+    "HeaderGroupVersions": "Group Versions",
     "HeaderSaySomethingLike": "Say Something Like...",
     "ButtonTryAgain": "Try Again",
     "HeaderYouSaid": "You Said...",
@@ -794,5 +797,13 @@
     "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.",
+    "HeaderShare": "Share",
+    "ButtonShareHelp": "Share a web page containing media information with social media. Media files are never shared publicly.",
+    "ButtonShare": "Share",
+    "HeaderConfirm": "Confirm"
 }
\ No newline at end of file