Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser into upstream-master

1 files changed, 39 insertions, 5 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index f699ef62c..8fecda23b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -63,7 +63,14 @@
     "HeaderPlaybackSettings": "Ajustes de reproducci\u00f3n",
     "LabelAudioLanguagePreference": "Preferencia de idioma de audio",
     "LabelSubtitleLanguagePreference": "Preferencia de idioma de subtitulos",
-    "LabelDisplayForcedSubtitlesOnly": "Mostrar \u00fanicamente subtitulos forzados",
+    "OptionDefaultSubtitles": "Default",
+    "OptionOnlyForcedSubtitles": "Only forced subtitles",
+    "OptionAlwaysPlaySubtitles": "Always play subtitles",
+    "OptionNoSubtitles": "Sin subt\u00edtulos",
+    "OptionDefaultSubtitlesHelp": "Subtitles matching the language preference will be loaded when the audio is in a foreign language.",
+    "OptionOnlyForcedSubtitlesHelp": "Only subtitles marked as forced will be loaded.",
+    "OptionAlwaysPlaySubtitlesHelp": "Subtitles matching the language preference will be loaded regardless of the audio language.",
+    "OptionNoSubtitlesHelp": "Subtitles will not be loaded by default.",
     "TabProfiles": "Perfiles",
     "TabSecurity": "Seguridad",
     "ButtonAddUser": "Agregar Usuario",
@@ -161,6 +168,10 @@
     "OptionIso": "Iso",
     "Option3D": "3D",
     "LabelFeatures": "Caracter\u00edsticas",
+    "LabelService": "Service:",
+    "LabelStatus": "Status:",
+    "LabelVersion": "Version:",
+    "LabelLastResult": "Last result:",
     "OptionHasSubtitles": "Subt\u00edtulos",
     "OptionHasTrailer": "Trailer",
     "OptionHasThemeSong": "Banda sonora",
@@ -224,6 +235,8 @@
     "ButtonSearch": "Buscar",
     "ButtonGroupVersions": "Versiones de Grupo",
     "PismoMessage": "Usando Pismo File Mount a trav\u00e9s de una licencia donada.",
+    "TangibleSoftwareMessage": "Utilizing Tangible Solutions Java\/C# converters through a donated license.",
+    "HeaderCredits": "Credits",
     "PleaseSupportOtherProduces": "Por favor apoye otros productos gratuitos que utilizamos:",
     "VersionNumber": "Versi\u00f3n {0}",
     "TabPaths": "Ruta",
@@ -281,10 +294,13 @@
     "PasswordLocalhostMessage": "No se necesitan contrase\u00f1as al iniciar sesi\u00f3n desde localhost.",
     "TabGuide": "Gu\u00eda",
     "TabChannels": "Canales",
+    "TabCollections": "Collections",
     "HeaderChannels": "Canales",
     "TabRecordings": "Grabaciones",
     "TabScheduled": "Programado",
     "TabSeries": "Series",
+    "TabFavorites": "Favorites",
+    "TabMyLibrary": "My Library",
     "ButtonCancelRecording": "Cancelar grabaci\u00f3n",
     "HeaderPrePostPadding": "Pre\/post grabaci\u00f3n extra",
     "LabelPrePaddingMinutes": "Minutos previos extras:",
@@ -319,7 +335,7 @@
     "OptionAutomatic": "Auto",
     "LiveTvPluginRequired": "El servicio de TV en vivo es necesario para poder continuar.",
     "LiveTvPluginRequiredHelp": "Instale uno de los plugins disponibles, como Next Pvr o ServerVmc.",
-    "HeaderCustomizeOptionsPerMediaType": "Personalizar las opciones por tipo de medio",
+    "LabelCustomizeOptionsPerMediaType": "Customize for media type:",
     "OptionDownloadThumbImage": "Miniatura",
     "OptionDownloadMenuImage": "Men\u00fa",
     "OptionDownloadLogoImage": "Logo",
@@ -331,6 +347,7 @@
     "OptionDownloadPrimaryImage": "Principal",
     "HeaderFetchImages": "Buscar im\u00e1genes",
     "HeaderImageSettings": "Opciones de im\u00e1gen",
+    "TabOther": "Other",
     "LabelMaxBackdropsPerItem": "M\u00e1ximo n\u00famero de im\u00e1genes de fondo por \u00edtem:",
     "LabelMaxScreenshotsPerItem": "M\u00e1ximo n\u00famero de capturas de pantalla por \u00edtem:",
     "LabelMinBackdropDownloadWidth": "Anchura m\u00ednima de descarga de im\u00e1genes de fondo:",
@@ -561,6 +578,9 @@
     "NotificationOptionVideoPlayback": "Reproducci\u00f3n de video",
     "NotificationOptionAudioPlayback": "Reproducci\u00f3n de audio",
     "NotificationOptionGamePlayback": "Iniciar juegos",
+    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
     "NotificationOptionTaskFailed": "La tarea programada ha fallado",
     "NotificationOptionInstallationFailed": "Fallo en la instalaci\u00f3n",
     "NotificationOptionNewLibraryContent": "Nuevo contenido a\u00f1adido",
@@ -588,6 +608,7 @@
     "ButtonArrowRight": "Derecha",
     "ButtonBack": "Atr\u00e1s",
     "ButtonInfo": "Info",
+    "ButtonOsd": "On screen display",
     "ButtonPageUp": "P\u00e1gina arriba",
     "ButtonPageDown": "P\u00e1gina abajo",
     "PageAbbreviation": "PG",
@@ -616,7 +637,6 @@
     "ButtonVolumeDown": "Bajar volumen",
     "ButtonMute": "Silencio",
     "HeaderLatestMedia": "\u00daltimos medios",
-    "OptionNoSubtitles": "Sin subt\u00edtulos",
     "OptionSpecialFeatures": "Caracter\u00edsticas especiales",
     "HeaderCollections": "Colecciones",
     "HeaderMyLibrary": "Mi librer\u00eda",
@@ -704,12 +724,26 @@
     "TabSubtitles": "Subt\u00edtulos",
     "LabelOpenSubtitlesUsername": "Usuario de Open Subtitles:",
     "LabelOpenSubtitlesPassword": "Contrase\u00f1a de Open Subtitles:",
-    "LabelAudioLanguagePreferenceHelp": "Si est\u00e1 vac\u00edo, se seleccionar\u00e1 la pista de audio por defecto, sin importar el idioma.",
+    "LabelPlayDefaultAudioTrack": "Play default audio track regardless of language",
+    "LabelSubtitlePlaybackMode": "Subtitle mode:",
     "LabelDownloadLanguages": "Idiomas de descarga:",
     "ButtonRegister": "Registrar",
     "LabelSkipIfAudioTrackPresent": "Skip if the default audio track matches the download language",
     "LabelSkipIfAudioTrackPresentHelp": "Uncheck this to ensure all videos have subtitles, regardless of audio language.",
     "HeaderSendMessage": "Send Message",
     "ButtonSend": "Send",
-    "LabelMessageText": "Message text:"
+    "LabelMessageText": "Message text:",
+    "MessageNoAvailablePlugins": "No available plugins.",
+    "LabelDisplayPluginsFor": "Display plugins for:",
+    "PluginTabMediaBrowserClassic": "MB Classic",
+    "PluginTabMediaBrowserTheater": "MB Theater",
+    "TabOtherPlugins": "Others",
+    "LabelEpisodeName": "Episode name",
+    "LabelSeriesName": "Series name",
+    "ValueSeriesNamePeriod": "Series.name",
+    "ValueSeriesNameUnderscore": "Series_name",
+    "ValueEpisodeNamePeriod": "Episode.name",
+    "ValueEpisodeNameUnderscore": "Episode_name",
+    "HeaderTypeText": "Enter Text",
+    "LabelTypeText": "Text"
 }
\ No newline at end of file