Merge branch 'master' into release-10.2.z

src/bower_components/emby-webcomponents/homesections/homesections.js

@@ -68,20 +68,6 @@ define(['connectionManager', 'cardBuilder', 'registrationServices', 'appSettings
 
             return Promise.all(promises).then(function () {
 
-                html = '';
-
-                var style = 'margin-top:4em;';
-
-                if (layoutManager.tv) {
-                    style += 'padding: 0 7.5%;';
-                }
-
-                html += '<div class="verticalSection padded-left padded-right customizeSection hide" style="' + style + '">';
-                html += '<a href="' + appRouter.getRouteUrl('settings') + '" is="emby-linkbutton" class="raised block"><span>' + globalize.translate('HeaderCustomizeHomeScreen') + '</span></a>';
-                html += '</div>';
-
-                elem.insertAdjacentHTML('beforeend', html);
-
                 return resume(elem, {
                     refresh: true,
                     returnPromise: false
@@ -125,9 +111,7 @@ define(['connectionManager', 'cardBuilder', 'registrationServices', 'appSettings
             promises.push(elems[i].resume(options));
         }
 
-        var promise = Promise.all(promises).then(function () {
-            elem.querySelector('.customizeSection').classList.remove('hide');
-        });
+        var promise = Promise.all(promises);
 
         if (!options || options.returnPromise !== false) {
             return promise;

src/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html

@@ -2,7 +2,7 @@
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
     <h3 class="formDialogHeaderTitle">${Subtitles}</h3>
 
-    <a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
+    <a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216115510/https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
 
 </div>
 <div class="formDialogContent smoothScrollY">

src/plugincatalog.html

@@ -7,7 +7,7 @@
 
                     <div class="selectContainer">
                         <select is="emby-select" id="selectSystem" label="${LabelDisplayPluginsFor}">
-                            <option value="Server">${HeaderEmbyServer}</option>
+                            <option value="Server">${HeaderJellyfinServer}</option>
                             <option value="MBClassic">${PluginTabAppClassic}</option>
                         </select>
                     </div>

src/strings/de.json

@@ -2239,4 +2239,4 @@
     "ValueStudios": "Studios: {0}",
     "ValueVideoCodec": "Videocodec: {0}",
     "ViewTypeTvShows": "TV"
-}
+}

src/strings/en-us.json

@@ -2265,4 +2265,4 @@
     "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.",
     "Yes": "Yes",
     "Yesterday": "Yesterday"
-}
+}

src/strings/es-mx.json

@@ -485,7 +485,6 @@
   "HeaderCreatePassword": "Crear Contraseña",
   "HeaderCredits": "Créditos",
   "HeaderCustomDlnaProfiles": "Perfiles Personalizados",
-  "HeaderCustomizeHomeScreen": "Personalizar la Pantalla de Inicio",
   "HeaderDashboardUserPassword": "Las contraseñas de usuario son manejadas dentro de las configuraciones personales de cada perfil de usuario.",
   "HeaderDate": "Fecha",
   "HeaderDateIssued": "Fecha de Emisión",

src/strings/fr.json

@@ -2264,4 +2264,4 @@
     "ValueOneAlbum": "1 album",
     "VersionNumber": "Version {0}",
     "ViewTypeTvShows": "Tv"
-}
+}

src/strings/hu.json

@@ -1570,4 +1570,4 @@
     "MessageFollowingFileWillBeMovedFrom": "A következő fájl áthelyezésre kerül innen:",
     "MessageForgotPasswordFileCreated": "A következő fájl jött létre a szerveren, ami utasításokat tartalmaz a folytatáshoz:",
     "OptionDateAddedFileTime": "Használja a fájl létrehozásának dátumát"
-}
+}

src/strings/kk.json

@@ -2257,4 +2257,4 @@
     "OptionResElement": "res elementi",
     "PlaybackSettings": "Oınatý parametrleri",
     "SubtitleSettings": "Sýbtıtrler parametrleri"
-}
+}

src/strings/nl.json

@@ -2085,4 +2085,4 @@
     "HeaderClients": "Clienten",
     "Art": "Afbeeldingen",
     "HeaderLiveTV": "Live TV"
-}
+}

src/strings/pl.json

@@ -496,7 +496,6 @@
   "HeaderCreatePassword": "Utwórz hasło:",
   "HeaderCredits": "Zasługi",
   "HeaderCustomDlnaProfiles": "Profile niestandardowe",
-  "HeaderCustomizeHomeScreen": "Dostosuj ekran startowy",
   "HeaderDashboardUserPassword": "Hasła użytkowników są zarządzane z osobistych ustawień profilu każdego z użytkowników.",
   "HeaderDate": "Data",
   "HeaderDateIssued": "Data wydania",

src/strings/pt-br.json

@@ -481,7 +481,6 @@
   "HeaderCreatePassword": "Criar Senha",
   "HeaderCredits": "Créditos",
   "HeaderCustomDlnaProfiles": "Personalizar Perfis",
-  "HeaderCustomizeHomeScreen": "Personalizar Tela Início",
   "HeaderDashboardUserPassword": "As senhas do usuário são gerenciadas dentro das preferências de cada perfil de usuário.",
   "HeaderDate": "Data",
   "HeaderDateIssued": "Data da Emissão",

src/strings/ru.json

@@ -2258,4 +2258,4 @@
     "PlaybackSettings": "Параметры воспроизведения",
     "SubtitleSettings": "Параметры субтитров",
     "OptionResElement": "res-элемент"
-}
+}

src/strings/sk.json

@@ -1439,4 +1439,4 @@
     "ButtonRevoke": "Odvolať",
     "ButtonSelectView": "Výber zobrazenia",
     "CancelRecording": "Zrušiť nahrávanie"
-}
+}