Merge branch 'dev' into imageupload-fixes

This commit is contained in:
Joshua M. Boniface
2019-01-20 00:13:38 -05:00
committed by GitHub
90 changed files with 2201 additions and 2830 deletions
@@ -31,7 +31,6 @@
"AsManyAsPossible": "As many as possible",
"Ascending": "Ascending",
"AspectRatio": "Aspect ratio",
"AttemptingWakeServer": "Attempting to wake server. Please wait...",
"AttributeNew": "New",
"AudioBitDepthNotSupported": "Audio bit depth not supported",
"AudioBitrateNotSupported": "Audio bitrate not supported",
@@ -53,7 +52,6 @@
"Books": "Books",
"Box": "Box",
"BoxRear": "Box (rear)",
"Browse": "Browse",
"BurnSubtitlesHelp": "Determines if the server should burn in subtitles when converting video depending on the subtitles format. Avoiding burning in subtitles will improve server performance. Select Auto to burn image based formats (e.g. VOBSUB, PGS, SUB/IDX, etc.) as well as certain ASS/SSA subtitles",
"ButtonCancel": "Cancel",
"ButtonGotIt": "Got It",
@@ -248,7 +246,6 @@
"HeaderMetadataSettings": "Metadata Settings",
"HeaderMusicQuality": "Music Quality",
"HeaderMyDevice": "My Device",
"HeaderMyDownloads": "My Downloads",
"HeaderMyMedia": "My Media",
"HeaderMyMediaSmall": "My Media (small)",
"HeaderNewRecording": "New Recording",
@@ -283,7 +280,6 @@
"HeaderVideoQuality": "Video Quality",
"HeaderVideoType": "Video Type",
"HeaderWaitingForWifi": "Waiting for Wifi",
"HeaderWakeServer": "Wake Server",
"HeaderYouSaid": "You Said...",
"Help": "Help",
"Hide": "Hide",
@@ -676,9 +672,6 @@
"ViewAlbum": "View album",
"ViewArtist": "View artist",
"VoiceInput": "Voice Input",
"WakeServer": "Wake server",
"WakeServerError": "Wake On LAN packets were sent to your server machine, but we're unable to connect to your Jellyfin Server. Your machine may need a little more time to wake, or Jellyfin Server may not be actively running on the machine.",
"WakeServerSuccess": "Success!",
"Watched": "Watched",
"Wednesday": "Wednesday",
"WifiRequiredToDownload": "A Wifi connection is required to continue downloading.",