Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 58 insertions, 0 deletions

diff --git a/Emby.Server.Implementations/Localization/Core/cy.json b/Emby.Server.Implementations/Localization/Core/cy.json
new file mode 100644
index 000000000..7fc27e18a
--- /dev/null
+++ b/Emby.Server.Implementations/Localization/Core/cy.json
@@ -0,0 +1,58 @@
+{
+    "DeviceOnlineWithName": "Mae {0} wedi'i gysylltu",
+    "DeviceOfflineWithName": "Mae {0} wedi datgysylltu",
+    "Default": "Diofyn",
+    "Collections": "Casgliadau",
+    "ChapterNameValue": "Pennod {0}",
+    "Channels": "Sianeli",
+    "CameraImageUploadedFrom": "Mae delwedd camera newydd wedi'i lanlwytho o {0}",
+    "Books": "Llyfrau",
+    "AuthenticationSucceededWithUserName": "{0} wedi’i ddilysu’n llwyddiannus",
+    "Artists": "Artistiaid",
+    "AppDeviceValues": "Ap: {0}, Dyfais: {1}",
+    "Albums": "Albwmau",
+    "Genres": "Genres",
+    "Folders": "Ffolderi",
+    "Favorites": "Ffefrynnau",
+    "LabelRunningTimeValue": "Amser rhedeg: {0}",
+    "TaskOptimizeDatabase": "Cronfa ddata Optimeiddio",
+    "TaskRefreshChannels": "Adnewyddu Sianeli",
+    "TaskRefreshPeople": "Adnewyddu Pobl",
+    "TasksChannelsCategory": "Sianeli Internet",
+    "VersionNumber": "Fersiwn {0}",
+    "ScheduledTaskStartedWithName": "{0} wedi dechrau",
+    "ScheduledTaskFailedWithName": "{0} wedi methu",
+    "ProviderValue": "Darparwr: {0}",
+    "NotificationOptionInstallationFailed": "Fethu Gosod",
+    "NameSeasonUnknown": "Tymor Anhysbys",
+    "NameSeasonNumber": "Tymor {0}",
+    "MusicVideos": "Fideos Cerddoriaeth",
+    "MixedContent": "Cynnwys amrywiol",
+    "HomeVideos": "Fideos Cartref",
+    "HeaderNextUp": "Nesaf i Fyny",
+    "HeaderFavoriteArtists": "Ffefryn Artistiaid",
+    "HeaderFavoriteAlbums": "Ffefryn Albwmau",
+    "HeaderContinueWatching": "Parhewch i Wylio",
+    "TasksApplicationCategory": "Rhaglen",
+    "TasksLibraryCategory": "Llyfrgell",
+    "TasksMaintenanceCategory": "Cynnal a Chadw",
+    "System": "System",
+    "Plugin": "Ategyn",
+    "Music": "Cerddoriaeth",
+    "Latest": "Diweddaraf",
+    "Inherit": "Etifeddu",
+    "Forced": "Orfodi",
+    "Application": "Rhaglen",
+    "HeaderAlbumArtists": "Artistiaid albwm",
+    "Sync": "Cysoni",
+    "Songs": "Caneuon",
+    "Shows": "Rhaglenni",
+    "Playlists": "Rhestri Chwarae",
+    "Photos": "Lluniau",
+    "ValueSpecialEpisodeName": "Arbennig - {0}",
+    "Movies": "Ffilmiau",
+    "Undefined": "Heb ddiffiniad",
+    "TvShows": "Rhaglenni teledu",
+    "HeaderLiveTV": "Teledu Byw",
+    "User": "Defnyddiwr"
+}