Merge pull request #1127 from MediaBrowser/dev

3.0.5641.5

1 files changed, 20 insertions, 9 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/uk.json b/MediaBrowser.Server.Implementations/Localization/Server/uk.json
index e601f076d..5308d88c5 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/uk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/uk.json
@@ -13,6 +13,7 @@
     "LabelShowLogWindow": "Show Log Window",
     "LabelPrevious": "\u041d\u0430\u0437\u0430\u0434",
     "LabelFinish": "Finish",
+    "FolderTypeMixed": "Mixed content",
     "LabelNext": "\u0412\u043f\u0435\u0440\u0435\u0434",
     "LabelYoureDone": "You're Done!",
     "WelcomeToProject": "Welcome to Emby!",
@@ -85,12 +86,11 @@
     "ButtonDonateWithPayPal": "Donate with PayPal",
     "OptionDetectArchiveFilesAsMedia": "Detect archive files as media",
     "OptionDetectArchiveFilesAsMediaHelp": "If enabled, files with .rar and .zip extensions will be detected as media files.",
-    "LabelEnterConnectUserName": "\u0406\u043c\u2019\u044f \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430 \u0430\u0431\u043e email:",
+    "LabelEnterConnectUserName": "Username or email:",
     "LabelEnterConnectUserNameHelp": "This is your Emby online account username or password.",
     "LabelEnableEnhancedMovies": "Enable enhanced movie displays",
     "LabelEnableEnhancedMoviesHelp": "When enabled, movies will be displayed as folders to include trailers, extras, cast & crew, and other related content.",
     "HeaderSyncJobInfo": "Sync Job",
-    "FolderTypeMixed": "Mixed content",
     "FolderTypeMovies": "\u0424\u0456\u043b\u044c\u043c\u0438",
     "FolderTypeMusic": "\u041c\u0443\u0437\u0438\u043a\u0430",
     "FolderTypeAdultVideos": "Adult videos",
@@ -287,7 +287,9 @@
     "OptionFileMetadataYearMismatch": "File\/Metadata Years Mismatched",
     "TabGeneral": "General",
     "TitleSupport": "Support",
+    "LabelSeasonNumber": "Season number",
     "TabLog": "Log",
+    "LabelEpisodeNumber": "Episode number",
     "TabAbout": "About",
     "TabSupporterKey": "Supporter Key",
     "TabBecomeSupporter": "Become a Supporter",
@@ -313,6 +315,9 @@
     "OptionAllowRemoteControlOthers": "Allow remote control of other users",
     "OptionAllowRemoteSharedDevices": "Allow remote control of shared devices",
     "OptionAllowRemoteSharedDevicesHelp": "Dlna devices are considered shared until a user begins controlling it.",
+    "OptionAllowLinkSharing": "Allow social media sharing",
+    "OptionAllowLinkSharingHelp": "Only web pages containing media information are shared. Media files are never shared publicly. Shares are time-limited and will expire based on your server sharing settings.",
+    "HeaderSharing": "Sharing",
     "HeaderRemoteControl": "Remote Control",
     "OptionMissingTmdbId": "Missing Tmdb Id",
     "OptionIsHD": "HD",
@@ -581,8 +586,6 @@
     "LabelSkipped": "Skipped",
     "HeaderEpisodeOrganization": "Episode Organization",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number:",
-    "LabelEpisodeNumber": "Episode number:",
     "LabelEndingEpisodeNumber": "Ending episode number:",
     "LabelEndingEpisodeNumberHelp": "Only required for multi-episode files",
     "HeaderSupportTheTeam": "Support the Emby Team",
@@ -870,6 +873,7 @@
     "HeaderTypeText": "Enter Text",
     "LabelTypeText": "Text",
     "HeaderSearchForSubtitles": "Search for Subtitles",
+    "ButtonMore": "More",
     "MessageNoSubtitleSearchResultsFound": "No search results founds.",
     "TabDisplay": "Display",
     "TabLanguages": "Languages",
@@ -900,7 +904,7 @@
     "HeaderLiveTv": "Live TV",
     "HeaderReports": "Reports",
     "HeaderMetadataManager": "Metadata Manager",
-    "HeaderPreferences": "Preferences",
+    "HeaderSettings": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
     "MessageLoadingChannels": "Loading channel content...",
     "MessageLoadingContent": "\u0417\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0435\u043d\u043d\u044f \u0437\u043c\u0456\u0441\u0442\u0443...",
     "ButtonMarkRead": "Mark Read",
@@ -1098,7 +1102,6 @@
     "OptionReportArtists": "Artists",
     "OptionReportAlbums": "Albums",
     "OptionReportAdultVideos": "Adult videos",
-    "ButtonMore": "More",
     "HeaderActivity": "Activity",
     "ScheduledTaskStartedWithName": "{0} started",
     "ScheduledTaskCancelledWithName": "{0} was cancelled",
@@ -1392,7 +1395,7 @@
     "HeaderUpcomingMovies": "Upcoming Movies",
     "HeaderUpcomingSports": "Upcoming Sports",
     "HeaderUpcomingPrograms": "Upcoming Programs",
-    "ButtonMoreItems": "More...",
+    "ButtonMoreItems": "More",
     "LabelShowLibraryTileNames": "Show library tile names",
     "LabelShowLibraryTileNamesHelp": "Determines if labels will be displayed underneath library tiles on the home page",
     "OptionEnableTranscodingThrottle": "Enable throttling",
@@ -1411,7 +1414,6 @@
     "OptionEnableFullSpeedConversion": "Enable full speed conversion",
     "OptionEnableFullSpeedConversionHelp": "By default, sync conversion is performed at a low speed to minimize resource consumption.",
     "HeaderPlaylists": "Playlists",
-    "HeaderSelectDate": "Select Date",
     "HeaderViewStyles": "View Styles",
     "LabelSelectViewStyles": "Enable enhanced presentations for:",
     "LabelSelectViewStylesHelp": "If enabled, views will be built with metadata to offer categories such as Suggestions, Latest, Genres, and more. If disabled, they'll be displayed with simple folders.",
@@ -1439,5 +1441,14 @@
     "ButtonUnlockGuide": "Unlock Guide",
     "LabelEnableFullScreen": "Enable fullscreen mode",
     "LabelEnableChromecastAc3Passthrough": "Enable Chromecast AC3 Passthrough",
-    "LabelSyncPath": "Synced content path:"
+    "LabelSyncPath": "Synced content path:",
+    "LabelEmail": "Email:",
+    "LabelUsername": "Username:",
+    "HeaderSignUp": "Sign Up",
+    "LabelPasswordConfirm": "Password (confirm):",
+    "ButtonAddServer": "Add Server",
+    "TabHomeScreen": "Home Screen",
+    "HeaderDisplay": "Display",
+    "HeaderNavigation": "Navigation",
+    "LegendTheseSettingsShared": "These settings are shared on all devices"
 }
\ No newline at end of file