diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-12 22:22:20 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-12 22:22:20 -0400 |
| commit | c1360a1dc312938e77e52a509eb9186300bcb40d (patch) | |
| tree | 492b4d717a12b20a4649b2fbc48050430ea72d50 /Emby.Server.Implementations/Localization/Core/es.json | |
| parent | 9ad839c7766bd5d6121a10b2c306d6fef9666c52 (diff) | |
| parent | 32c118222647f121c0b17055c0ef158763c0b5d2 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Entities/User.cs
# Jellyfin.Data/ISavingChanges.cs
# Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
# Jellyfin.Server.Implementations/JellyfinDb.cs
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Model/Notifications/NotificationOptions.cs
# MediaBrowser.sln
Diffstat (limited to 'Emby.Server.Implementations/Localization/Core/es.json')
| -rw-r--r-- | Emby.Server.Implementations/Localization/Core/es.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json index de1baada8..e7bd3959b 100644 --- a/Emby.Server.Implementations/Localization/Core/es.json +++ b/Emby.Server.Implementations/Localization/Core/es.json @@ -71,7 +71,7 @@ "ScheduledTaskFailedWithName": "{0} falló", "ScheduledTaskStartedWithName": "{0} iniciada", "ServerNameNeedsToBeRestarted": "{0} necesita ser reiniciado", - "Shows": "Series", + "Shows": "Mostrar", "Songs": "Canciones", "StartupEmbyServerIsLoading": "Jellyfin Server se está cargando. Vuelve a intentarlo en breve.", "SubtitleDownloadFailureForItem": "Error al descargar subtítulos para {0}", |