diff --git a/src/components/serverrestartdialog/serverrestartdialog.js b/src/components/serverrestartdialog/serverrestartdialog.js
index 02cb1af039..6c7e5b7386 100644
--- a/src/components/serverrestartdialog/serverrestartdialog.js
+++ b/src/components/serverrestartdialog/serverrestartdialog.js
@@ -90,7 +90,7 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
             dlg.classList.add('dialog-fullscreen-lowres');
         }
 
-        dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('RestartingServer');
+        dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('HeaderRestartingServer');
 
         dlg.querySelector('.text').innerHTML = globalize.translate('RestartPleaseWaitMessage');
 
diff --git a/src/controllers/dashboardgeneral.js b/src/controllers/dashboardgeneral.js
index ed3b000b12..6a3f80d3a2 100644
--- a/src/controllers/dashboardgeneral.js
+++ b/src/controllers/dashboardgeneral.js
@@ -2,6 +2,7 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
     "use strict";
 
     function loadPage(page, config, languageOptions, systemInfo) {
+        page.querySelector("#txtServerName").value = config.ServerName;
         if (systemInfo.CanLaunchWebBrowser) {
             page.querySelector("#fldRunWebAppAtStartup").classList.remove("hide");
         } else {
@@ -39,6 +40,7 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
         var form = this;
         $(form).parents(".page");
         return ApiClient.getServerConfiguration().then(function(config) {
+            config.ServerName = $("#txtServerName", form).val();
             config.UICulture = $("#selectLocalizationLanguage", form).val();
             config.CachePath = form.querySelector("#txtCachePath").value;
             config.MetadataPath = $("#txtMetadataPath", form).val();
diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js
index 2a70208131..5fb20f953c 100644
--- a/src/controllers/dashboardpage.js
+++ b/src/controllers/dashboardpage.js
@@ -10,31 +10,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
         }
     }
 
-    function onEditServerNameClick(evt) {
-        var page = dom.parentWithClass(this, "page");
-
-        require(["prompt"], function (prompt) {
-            prompt({
-                label: globalize.translate("LabelFriendlyServerName"),
-                description: globalize.translate("LabelFriendlyServerNameHelp"),
-                value: page.querySelector(".serverNameHeader").innerHTML,
-                confirmText: globalize.translate("ButtonSave")
-            }).then(function (value) {
-                loading.show();
-                ApiClient.getServerConfiguration().then(function (config) {
-                    config.ServerName = value;
-                    ApiClient.updateServerConfiguration(config).then(function () {
-                        page.querySelector(".serverNameHeader").innerHTML = value;
-                        loading.hide();
-                    });
-                });
-            });
-        });
-
-        evt.preventDefault();
-        return false;
-    }
-
     function showPlaybackInfo(btn, session) {
         require(["alert"], function (alert) {
             var showTranscodeReasons;
@@ -202,20 +177,13 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
 
     function reloadSystemInfo(view, apiClient) {
         apiClient.getSystemInfo().then(function (systemInfo) {
-            view.querySelector(".serverNameHeader").innerHTML = systemInfo.ServerName;
-            var localizedVersion = globalize.translate("LabelVersionNumber", systemInfo.Version);
+            view.querySelector("#serverName").innerHTML = globalize.translate("LabelServerName", systemInfo.ServerName);
 
+            var localizedVersion = globalize.translate("LabelVersionNumber", systemInfo.Version);
             if (systemInfo.SystemUpdateLevel && "Release" != systemInfo.SystemUpdateLevel) {
                 localizedVersion += " " + globalize.translate("Option" + systemInfo.SystemUpdateLevel).toLowerCase();
             }
-
-            if (systemInfo.CanSelfRestart) {
-                view.querySelector("#btnRestartServer").classList.remove("hide");
-            } else {
-                view.querySelector("#btnRestartServer").classList.add("hide");
-            }
-
-            view.querySelector("#appVersionNumber").innerHTML = localizedVersion;
+            view.querySelector("#versionNumber").innerHTML = localizedVersion;
 
             if (systemInfo.SupportsHttps) {
                 view.querySelector("#ports").innerHTML = globalize.translate("LabelRunningOnPorts", systemInfo.HttpServerPortNumber, systemInfo.HttpsPortNumber);
@@ -225,6 +193,12 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
 
             DashboardPage.renderUrls(view, systemInfo);
             DashboardPage.renderPaths(view, systemInfo);
+
+            if (systemInfo.CanSelfRestart) {
+                view.querySelector("#btnRestartServer").classList.remove("hide");
+            } else {
+                view.querySelector("#btnRestartServer").classList.add("hide");
+            }
         });
     }
 
@@ -842,7 +816,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
         }
 
         var serverId = ApiClient.serverId();
-        view.querySelector(".btnEditServerName").addEventListener("click", onEditServerNameClick);
         view.querySelector(".activeDevices").addEventListener("click", onActiveDevicesClick);
         view.addEventListener("viewshow", function () {
             var page = this;
diff --git a/src/dashboard.html b/src/dashboard.html
index 25f4278beb..90ee2580f2 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -3,15 +3,14 @@
         <div class="dashboardSections" style="padding-top:.5em;">
             <div class="dashboardColumn dashboardColumn-2-60 dashboardColumn-3-46">
                 <div class="dashboardSection" style="padding-left: 0;">
-                    <div class="flex align-items-center">
-                        <h3 class="serverNameHeader" style="margin: 0;"></h3>
-                        <button is="paper-icon-button-light" type="button" class="btnEditServerName" style="margin-left: .5em;">
-                            <i class="md-icon">mode_edit</i>
-                        </button>
-                    </div>
+                    <a is="emby-linkbutton" href="dashboardgeneral.html" class="button-flat sectionTitleTextButton">
+                        <h3>${TabServer}</h3>
+                        <i class="md-icon">&#xE5CC;</i>
+                    </a>
 
                     <div class="paperList" style="padding: 1em;">
-                        <p id="appVersionNumber"></p>
+                        <p id="serverName"></p>
+                        <p id="versionNumber"></p>
                         <p id="ports"></p>
                         <p class="localUrl"></p>
                         <p class="externalUrl"></p>
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index 94eeb23718..f41fc80d46 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -13,6 +13,10 @@
                 </div>
 
                 <div class="verticalSection">
+                    <div class="inputContainer">
+                        <input is="emby-input" type="text" id="txtServerName" label="${LabelServerName}" />
+                        <div class="fieldDescription">${LabelServerNameHelp}</div>
+                    </div>
                     <div class="selectContainer">
                         <select is="emby-select" id="selectLocalizationLanguage" label="${LabelPreferredDisplayLanguage}"></select>
                         <div class="fieldDescription">
diff --git a/src/strings/ar.json b/src/strings/ar.json
index d546d06dcf..d5abe0e578 100644
--- a/src/strings/ar.json
+++ b/src/strings/ar.json
@@ -405,7 +405,7 @@
     "LabelFormat": "الصيغة:",
     "LabelFriendlyName": "اسم مخصوص لك",
     "LabelFriendlyServerName": "اسم الخادم الميسر:",
-    "LabelFriendlyServerNameHelp": "هذا الاسم يسيتخدم للتعرف على الخادم. إن ترك خالٍ، فإن اسم الحاسوب سوف يستخدم.",
+    "LabelServerNameHelp": "هذا الاسم يسيتخدم للتعرف على الخادم. إن ترك خالٍ، فإن اسم الحاسوب سوف يستخدم.",
     "LabelGroupMoviesIntoCollections": "تجميع الأفلام إلى مجاميع",
     "LabelGroupMoviesIntoCollectionsHelp": "عند استعراض قوائم الأفلام، فإن الأفلام التي تنتمي إلى مجموعة واحدة ستظهر كعنصر جامع.",
     "LabelH264Crf": "قيمة CRF لتشفير H264:",
diff --git a/src/strings/ca.json b/src/strings/ca.json
index 2dcf301198..f175917e81 100644
--- a/src/strings/ca.json
+++ b/src/strings/ca.json
@@ -339,7 +339,7 @@
   "LabelFinish": "Finalitzar",
   "LabelFriendlyName": "Nom amistós",
   "LabelFriendlyServerName": "Nom amistós del servidor:",
-  "LabelFriendlyServerNameHelp": "El nom servirà per identificar aquest servidor. Si es deixa en blanc s'emprarà el nom de l'ordinador.",
+  "LabelServerNameHelp": "El nom servirà per identificar aquest servidor. Si es deixa en blanc s'emprarà el nom de l'ordinador.",
   "LabelGroupMoviesIntoCollections": "Agrupa pel·lícules a col·leccions",
   "LabelHomeScreenSectionValue": "Secció {0} de la pàgina d'inici:",
   "LabelHttpsPort": "Port local https:",
diff --git a/src/strings/cs.json b/src/strings/cs.json
index c1e265a7ec..cd5e55fcb9 100644
--- a/src/strings/cs.json
+++ b/src/strings/cs.json
@@ -541,7 +541,7 @@
     "LabelFormat": "Formát:",
     "LabelFriendlyName": "Přívětivý název",
     "LabelFriendlyServerName": "Název serveru:",
-    "LabelFriendlyServerNameHelp": "Toto jméno bude použito  jako identifikace serveru, ponecháte-li prázdné bude použit název počítače.",
+    "LabelServerNameHelp": "Toto jméno bude použito  jako identifikace serveru, ponecháte-li prázdné bude použit název počítače.",
     "LabelGroupMoviesIntoCollections": "Seskupit filmy do kolekcí.",
     "LabelGroupMoviesIntoCollectionsHelp": "Při zobrazení seznamů filmu, budou filmy patřící do kolekce, zobrazeny jako jedna položka.",
     "LabelH264Crf": "H264 kódování CRF:",
diff --git a/src/strings/da.json b/src/strings/da.json
index 47c3c5d094..c3fc4f224e 100644
--- a/src/strings/da.json
+++ b/src/strings/da.json
@@ -498,7 +498,7 @@
     "LabelForgotPasswordUsernameHelp": "Indtast dit brugernavn, hvis du kan huske det.",
     "LabelFriendlyName": "System venligt navn:",
     "LabelFriendlyServerName": "Nemt servernavn:",
-    "LabelFriendlyServerNameHelp": "Dette navn bruges til at identificere serveren. Hvis det ikke udfyldes, bruges computerens navn.",
+    "LabelServerNameHelp": "Dette navn bruges til at identificere serveren. Hvis det ikke udfyldes, bruges computerens navn.",
     "LabelGroupMoviesIntoCollections": "Grupper film i samlinger",
     "LabelGroupMoviesIntoCollectionsHelp": "Film i samlinger vil blive vist som en samlet enhed i filmlister.",
     "LabelH264Crf": "H264-kodning CRF:",
diff --git a/src/strings/de.json b/src/strings/de.json
index d1c3f4580a..334c0f507e 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -598,7 +598,7 @@
     "LabelForgotPasswordUsernameHelp": "Bitte gib deinen Benutzernamen ein, falls du dich daran erinnerst.",
     "LabelFriendlyName": "Benutzerfreundlicher Name:",
     "LabelFriendlyServerName": "Freundlicher Servername:",
-    "LabelFriendlyServerNameHelp": "Dieser Name wird benutzt um diesen Server zu identifizieren. Wenn leer gelassen, wird der Computername benutzt.",
+    "LabelServerNameHelp": "Dieser Name wird benutzt um diesen Server zu identifizieren. Wenn leer gelassen, wird der Computername benutzt.",
     "LabelGroupMoviesIntoCollections": "Gruppiere Filme in Collections",
     "LabelGroupMoviesIntoCollectionsHelp": "Wenn Filmlisten angezeigt werden, dann werden Filme, die zu einer Collection gehören, als ein gruppiertes Element angezeigt.",
     "LabelH264EncodingPreset": "H264 Encoding Voreinstellung:",
diff --git a/src/strings/el.json b/src/strings/el.json
index 86c9a0b57c..064e686d61 100644
--- a/src/strings/el.json
+++ b/src/strings/el.json
@@ -551,7 +551,7 @@
     "LabelFormat": "Φορμάτ:",
     "LabelFriendlyName": "Φιλικό όνομα",
     "LabelFriendlyServerName": "Όνομα διακομιστή:",
-    "LabelFriendlyServerNameHelp": "Αυτό το όνομα θα χρησιμοποιηθεί για την αναγνώριση αυτού του διακομιστή. Αν παραμείνει κενό, θα χρησιμοποιηθεί το όνομα του υπολογιστή.",
+    "LabelServerNameHelp": "Αυτό το όνομα θα χρησιμοποιηθεί για την αναγνώριση αυτού του διακομιστή. Αν παραμείνει κενό, θα χρησιμοποιηθεί το όνομα του υπολογιστή.",
     "LabelGroupMoviesIntoCollections": "Ομαδοποιήστε ταινίες σε συλλογές",
     "LabelGroupMoviesIntoCollectionsHelp": "Όταν προβάλλετε λίστες ταινιών, οι ταινίες που ανήκουν σε μια συλλογή θα εμφανίζονται ως ένα ομαδοποιημένο αντικείμενο.",
     "LabelHardwareAccelerationType": "Επιτάχυνση υλικού:",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 6bb916e375..561d1c8e79 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -644,7 +644,7 @@
     "LabelFormat": "Format:",
     "LabelFriendlyName": "Friendly name:",
     "LabelFriendlyServerName": "Friendly server name:",
-    "LabelFriendlyServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
+    "LabelServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
     "LabelGroupMoviesIntoCollections": "Group movies into collections",
     "LabelGroupMoviesIntoCollectionsHelp": "When displaying movie lists, movies belonging to a collection will be displayed as one grouped item.",
     "LabelH264Crf": "H264 encoding CRF:",
@@ -802,6 +802,7 @@
     "LabelSeriesRecordingPath": "Series recording path (optional):",
     "LabelServerHost": "Host:",
     "LabelServerHostHelp": "192.168.1.100 or https://myserver.com",
+    "LabelServerName": "Server Name: {0}",
     "LabelServerPort": "Port:",
     "LabelSimultaneousConnectionLimit": "Simultaneous stream limit:",
     "LabelSkin": "Skin:",
@@ -866,7 +867,7 @@
     "LabelValue": "Value:",
     "LabelVersion": "Version:",
     "LabelVersionInstalled": "{0} installed",
-    "LabelVersionNumber": "Version {0}",
+    "LabelVersionNumber": "Version: {0}",
     "LabelVideo": "Video:",
     "LabelWeb": "Web",
     "LabelXDlnaCap": "X-Dlna cap:",
diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json
index e2fedfbcc6..f97169e695 100644
--- a/src/strings/es-mx.json
+++ b/src/strings/es-mx.json
@@ -625,7 +625,7 @@
     "LabelFormat": "Formato:",
     "LabelFriendlyName": "Nombre amistoso:",
     "LabelFriendlyServerName": "Nombre amigable del servidor:",
-    "LabelFriendlyServerNameHelp": "Este nombre será usado para identificar este servidor. Si se deja en blanco, se usará el nombre de la computadora.",
+    "LabelServerNameHelp": "Este nombre será usado para identificar este servidor. Si se deja en blanco, se usará el nombre de la computadora.",
     "LabelGroupMoviesIntoCollections": "Agrupar películas en colecciones",
     "LabelGroupMoviesIntoCollectionsHelp": "Cuando se muestran listados de películas, las películas que pertenecen a una colección serán mostradas agrupadas en un solo ítem.",
     "LabelH264Crf": "CRF de codificación H264:",
diff --git a/src/strings/es.json b/src/strings/es.json
index 1eb8bd1425..d303394353 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -564,7 +564,7 @@
     "LabelFormat": "Formato:",
     "LabelFriendlyName": "Nombre amigable:",
     "LabelFriendlyServerName": "Nombre informal del servidor:",
-    "LabelFriendlyServerNameHelp": "Este nombre se podrá utilizar para identificar este servidor. Si se deja en blanco se usará el nombre del ordenador.",
+    "LabelServerNameHelp": "Este nombre se podrá utilizar para identificar este servidor. Si se deja en blanco se usará el nombre del ordenador.",
     "LabelGroupMoviesIntoCollections": "Agrupar películas en colecciones",
     "LabelGroupMoviesIntoCollectionsHelp": "Cuando se muestran las listas de películas, las películas pertenecientes a una colección se mostrarán como un elemento agrupado.",
     "LabelH264Crf": "H264 que codifica CRF:",
diff --git a/src/strings/fr.json b/src/strings/fr.json
index 288486f9b7..8cbd6f1f10 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -623,7 +623,7 @@
     "LabelFormat": "Format :",
     "LabelFriendlyName": "Nom d'affichage :",
     "LabelFriendlyServerName": "Surnom du serveur :",
-    "LabelFriendlyServerNameHelp": "Ce nom sera utilisé pour identifier le serveur. Sinon le nom d'ordinateur sera utilisé.",
+    "LabelServerNameHelp": "Ce nom sera utilisé pour identifier le serveur. Sinon le nom d'ordinateur sera utilisé.",
     "LabelGroupMoviesIntoCollections": "Grouper les films en collections",
     "LabelGroupMoviesIntoCollectionsHelp": "Dans l'affichage des listes de films, les films faisant partie d'une collection seront affichés comme un élément groupé.",
     "LabelH264Crf": "CRF d'encodage H264 :",
diff --git a/src/strings/he.json b/src/strings/he.json
index bc806a4387..16bf46af0e 100644
--- a/src/strings/he.json
+++ b/src/strings/he.json
@@ -204,7 +204,7 @@
     "LabelFailed": "נכשל",
     "LabelFinish": "סיים",
     "LabelFriendlyServerName": "שם שרת ידידותי:",
-    "LabelFriendlyServerNameHelp": "השם יתן לזיהוי השרת. אם מושאר ריק, שם השרת יהיה שם המחשב.",
+    "LabelServerNameHelp": "השם יתן לזיהוי השרת. אם מושאר ריק, שם השרת יהיה שם המחשב.",
     "LabelKeepUpTo": "שמור עד ל:",
     "LabelLanguage": "שפה:",
     "LabelLocalHttpServerPortNumber": "מספר פורט HTTP מקומי",
diff --git a/src/strings/hr.json b/src/strings/hr.json
index 1b311e536e..795caa0c47 100644
--- a/src/strings/hr.json
+++ b/src/strings/hr.json
@@ -441,7 +441,7 @@
     "LabelForgotPasswordUsernameHelp": "Unesite korisničko ime, ako se sjećate.",
     "LabelFriendlyName": "Prijateljsko ime",
     "LabelFriendlyServerName": "Prijateljsko ime servera:",
-    "LabelFriendlyServerNameHelp": "Ovo ime će se koristiti za identifikaciju servera. Ako ostavite prazno, ime računala će se koristi kao identifikator.",
+    "LabelServerNameHelp": "Ovo ime će se koristiti za identifikaciju servera. Ako ostavite prazno, ime računala će se koristi kao identifikator.",
     "LabelGroupMoviesIntoCollections": "Grupiraj filmove u kolekciju",
     "LabelGroupMoviesIntoCollectionsHelp": "Kada se prikazuje lista filmova, filmovi koji pripadaju kolekciji biti će prikazani kao jedna stavka.",
     "LabelH264Crf": "H264 kodiranje CRF:",
diff --git a/src/strings/hu.json b/src/strings/hu.json
index 8e0a17f3d1..13c4753171 100644
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@@ -922,7 +922,7 @@
     "LabelFont": "Betűtípus:",
     "LabelFormat": "Formátum:",
     "LabelFriendlyName": "Könnyen megjegyezhető név:",
-    "LabelFriendlyServerNameHelp": "Ez a név kerül a Szerver azonosítására. Ha üresen marad, a számítógép neve kerül felhasználásra.",
+    "LabelServerNameHelp": "Ez a név kerül a Szerver azonosítására. Ha üresen marad, a számítógép neve kerül felhasználásra.",
     "LabelGroupMoviesIntoCollectionsHelp": "A filmlisták megjelenítésekor a gyűjteményhez tartozó filmek egy csoportos elemként jelennek meg.",
     "LabelH264Crf": "H264 encoding CRF:",
     "LabelHomeNetworkQuality": "Otthoni hálózat minősége:",
diff --git a/src/strings/it.json b/src/strings/it.json
index 3888034e46..3f0b5e5c13 100644
--- a/src/strings/it.json
+++ b/src/strings/it.json
@@ -604,7 +604,7 @@
     "LabelFormat": "Formato:",
     "LabelFriendlyName": "Nome Condiviso:",
     "LabelFriendlyServerName": "Nome condiviso del server:",
-    "LabelFriendlyServerNameHelp": "Questo nome è usato per identificare il server sulla rete.Se lasciato vuoto verra usato il nome del pc",
+    "LabelServerNameHelp": "Questo nome è usato per identificare il server sulla rete.Se lasciato vuoto verra usato il nome del pc",
     "LabelGroupMoviesIntoCollections": "Raggruppa i film nelle collezioni",
     "LabelGroupMoviesIntoCollectionsHelp": "Quando si visualizzano le liste di film, quelli appartenenti ad una collezione saranno visualizzati come un elemento raggruppato.",
     "LabelH264Crf": "CRF di codifica H264:",
diff --git a/src/strings/kk.json b/src/strings/kk.json
index 4dbe2d78f0..d1c9a4745b 100644
--- a/src/strings/kk.json
+++ b/src/strings/kk.json
@@ -639,7 +639,7 @@
     "LabelFormat": "Pishim:",
     "LabelFriendlyName": "Túsinikti ataý:",
     "LabelFriendlyServerName": "Serverdiń ońaı aty:",
-    "LabelFriendlyServerNameHelp": "Bul ataý osy serverdi anyqtaý úshin paıdalanylady. Eger óris bos qaldyrylsa, kompúter aty paıdalanylady.",
+    "LabelServerNameHelp": "Bul ataý osy serverdi anyqtaý úshin paıdalanylady. Eger óris bos qaldyrylsa, kompúter aty paıdalanylady.",
     "LabelGroupMoviesIntoCollections": "Jıyntyqtar ishindegi fılmderdi toptastyrý",
     "LabelGroupMoviesIntoCollectionsHelp": "Fılm tizimderin beınelegen kezde jıyntyqqa kiretin fılmder toptalǵan biryńǵaı tarmaq bolyp kórsetiledi.",
     "LabelH264Crf": "H264 kodtaý CRF máni:",
diff --git a/src/strings/ko.json b/src/strings/ko.json
index 4b7a4e6213..3995d12854 100644
--- a/src/strings/ko.json
+++ b/src/strings/ko.json
@@ -352,7 +352,7 @@
     "LabelFormat": "형식:",
     "LabelFriendlyName": "별칭",
     "LabelFriendlyServerName": "알기쉬운 서버 이름:",
-    "LabelFriendlyServerNameHelp": "이 이름은 서버를 구분하는데 사용합니다. 비워두면 컴퓨터 이름을 사용합니다.",
+    "LabelServerNameHelp": "이 이름은 서버를 구분하는데 사용합니다. 비워두면 컴퓨터 이름을 사용합니다.",
     "LabelGroupMoviesIntoCollections": "컬렉션으로 영화 묶기",
     "LabelGroupMoviesIntoCollectionsHelp": "영화 목록을 표시할 때 컬렉션에 포함된 영화가 한 개로 묶여진 항목으로 보여줍니다.",
     "LabelHardwareAccelerationType": "하드웨어 가속:",
diff --git a/src/strings/lt-lt.json b/src/strings/lt-lt.json
index 6bf689f8b0..62e9b1117a 100644
--- a/src/strings/lt-lt.json
+++ b/src/strings/lt-lt.json
@@ -214,7 +214,7 @@
     "LabelFinish": "Baigti",
     "LabelFriendlyName": "Draugiškas pavadinimas:",
     "LabelFriendlyServerName": "Draugiškas serverio pavadinimas:",
-    "LabelFriendlyServerNameHelp": "Šis pavadinimas bus naudojamas serverio identifikavimui. Palikus tuščią bus naudojamas kompiuterio pavadinimas.",
+    "LabelServerNameHelp": "Šis pavadinimas bus naudojamas serverio identifikavimui. Palikus tuščią bus naudojamas kompiuterio pavadinimas.",
     "LabelGroupMoviesIntoCollections": "Grupuoti filmus į kolekcijas",
     "LabelGroupMoviesIntoCollectionsHelp": "Rodant filmų sąrašą filmai iš kolekcijos bus rodomi kaip vienas elementas.",
     "LabelHttpsPort": "Vietinis HTTPS porto numeris:",
diff --git a/src/strings/nb.json b/src/strings/nb.json
index f248109aa2..45c36cc0b7 100644
--- a/src/strings/nb.json
+++ b/src/strings/nb.json
@@ -502,7 +502,7 @@
     "LabelForgotPasswordUsernameHelp": "Skriv inn ditt brukernavn, hvis du husker det.",
     "LabelFriendlyName": "Vennlig navn",
     "LabelFriendlyServerName": "Vennlig server navn:",
-    "LabelFriendlyServerNameHelp": "Dette navnet vil bli brukt for å identifisere denne serveren. Hvis feltet er tomt, vil maskinens navn bli brukt.",
+    "LabelServerNameHelp": "Dette navnet vil bli brukt for å identifisere denne serveren. Hvis feltet er tomt, vil maskinens navn bli brukt.",
     "LabelGroupMoviesIntoCollections": "Gruppér filmer i samlinger",
     "LabelGroupMoviesIntoCollectionsHelp": "Ved visning av filmlister vil filmer som tilhører en samling bli vist som ett gruppeelement.",
     "LabelH264Crf": "H264 enkoding CRF:",
diff --git a/src/strings/nl.json b/src/strings/nl.json
index bdcf38efa9..837a4ac5fc 100644
--- a/src/strings/nl.json
+++ b/src/strings/nl.json
@@ -600,7 +600,7 @@
     "LabelFormat": "Formaat:",
     "LabelFriendlyName": "Gebruiksvriendelijke naam:",
     "LabelFriendlyServerName": "Aangepaste servernaam",
-    "LabelFriendlyServerNameHelp": "Deze naam wordt gebruikt om deze server te identificeren. Indien leeg gelaten, zal de naam van de computer worden gebruikt.",
+    "LabelServerNameHelp": "Deze naam wordt gebruikt om deze server te identificeren. Indien leeg gelaten, zal de naam van de computer worden gebruikt.",
     "LabelGroupMoviesIntoCollections": "Groepeer films in collecties",
     "LabelGroupMoviesIntoCollectionsHelp": "Bij de weergave van film lijsten, zullen films die tot een collectie behoren worden weergegeven als een gegroepeerd object.",
     "LabelH264EncodingPreset": "H264 codering preset:",
diff --git a/src/strings/pl.json b/src/strings/pl.json
index e7f380f42f..a041a32c6d 100644
--- a/src/strings/pl.json
+++ b/src/strings/pl.json
@@ -637,7 +637,7 @@
     "LabelForgotPasswordUsernameHelp": "Podaj nazwę użytkownika, jeśli pamiętasz.",
     "LabelFriendlyName": "Przyjazna nazwa:",
     "LabelFriendlyServerName": "Przyjazna nazwa serwera:",
-    "LabelFriendlyServerNameHelp": "Ta nazwa będzie użyta do identyfikacji serwera. Jeżeli zostawione puste, użyta będzie nazwa komputera.",
+    "LabelServerNameHelp": "Ta nazwa będzie użyta do identyfikacji serwera. Jeżeli zostawione puste, użyta będzie nazwa komputera.",
     "LabelGroupMoviesIntoCollections": "Grupuj filmy w kolekcje",
     "LabelGroupMoviesIntoCollectionsHelp": "Podczas wyświetlania listy filmów, filmy należące do kolekcji będą wyświetlone jako jedna zgrupowana pozycja.",
     "LabelH264Crf": "CRF kodowania H264:",
diff --git a/src/strings/pt-br.json b/src/strings/pt-br.json
index b71b3b8c0c..8a0a1c6b91 100644
--- a/src/strings/pt-br.json
+++ b/src/strings/pt-br.json
@@ -621,7 +621,7 @@
     "LabelFormat": "Formato:",
     "LabelFriendlyName": "Nome amigável:",
     "LabelFriendlyServerName": "Nome amigável do servidor:",
-    "LabelFriendlyServerNameHelp": "Este nome será usado para identificar este servidor. Se deixado em branco, será usado o nome do computador.",
+    "LabelServerNameHelp": "Este nome será usado para identificar este servidor. Se deixado em branco, será usado o nome do computador.",
     "LabelGroupMoviesIntoCollections": "Agrupar filmes em coletâneas",
     "LabelGroupMoviesIntoCollectionsHelp": "Ao exibir listas de filmes, filmes que pertençam a uma coletânea serão exibidos como um único item agrupado.",
     "LabelH264Crf": "CRF de codificação H264:",
diff --git a/src/strings/pt-pt.json b/src/strings/pt-pt.json
index 2638b1cab9..2879604c45 100644
--- a/src/strings/pt-pt.json
+++ b/src/strings/pt-pt.json
@@ -362,7 +362,7 @@
   "LabelFormat": "Formato:",
   "LabelFriendlyName": "Nome amigável",
   "LabelFriendlyServerName": "Nome amigável do servidor:",
-  "LabelFriendlyServerNameHelp": "Será usado este nome para identificar o servidor. Se não for preenchido, será usado o nome do computador.",
+  "LabelServerNameHelp": "Será usado este nome para identificar o servidor. Se não for preenchido, será usado o nome do computador.",
   "LabelGroupMoviesIntoCollections": "Agrupar filmes nas coleções",
   "LabelGroupMoviesIntoCollectionsHelp": "Ao exibir listas de filmes, filmes que pertençam a uma coleção serão exibidos como um único item agrupado.",
   "LabelHardwareAccelerationType": "Aceleração de hardware:",
diff --git a/src/strings/ru.json b/src/strings/ru.json
index b8f02a9b84..b308de0068 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -639,7 +639,7 @@
     "LabelFormat": "Формат:",
     "LabelFriendlyName": "Понятное имя:",
     "LabelFriendlyServerName": "Понятное имя сервера:",
-    "LabelFriendlyServerNameHelp": "Данное имя используется для распознавания данного сервера. Если не заполнять, то будет использовано имя компьютера.",
+    "LabelServerNameHelp": "Данное имя используется для распознавания данного сервера. Если не заполнять, то будет использовано имя компьютера.",
     "LabelGroupMoviesIntoCollections": "Группировать фильмы внутрь коллекций",
     "LabelGroupMoviesIntoCollectionsHelp": "При отображении списка фильмов, элементы, принадлежащие к одной коллекции будут отображаться как единый сгруппированный элемент.",
     "LabelH264Crf": "Значение CRF H264-кодирования:",
diff --git a/src/strings/sk.json b/src/strings/sk.json
index 66df365bd7..31d0e00d61 100644
--- a/src/strings/sk.json
+++ b/src/strings/sk.json
@@ -392,7 +392,7 @@
     "LabelForgotPasswordUsernameHelp": "Zadajte svoje používateľské meno, ak si ho pamätáte.",
     "LabelFormat": "Formát:",
     "LabelFriendlyServerName": "Názov servera:",
-    "LabelFriendlyServerNameHelp": "Toto meno bude použité na identifikáciu servera. Ak ostane prázdne, bude použitý názov počítača.",
+    "LabelServerNameHelp": "Toto meno bude použité na identifikáciu servera. Ak ostane prázdne, bude použitý názov počítača.",
     "LabelGroupMoviesIntoCollections": "Zoskupiť filmy do kolekcií.",
     "LabelGroupMoviesIntoCollectionsHelp": "Pri zobrazení zoznamu filmov budú filmy patriace do kolekcie zobrazené ako jedna zoskupená položka.",
     "LabelHardwareAccelerationType": "Hardvérová akcelerácia:",
diff --git a/src/strings/sv.json b/src/strings/sv.json
index 833ca4eb61..6c4aec02e7 100644
--- a/src/strings/sv.json
+++ b/src/strings/sv.json
@@ -591,7 +591,7 @@
     "LabelForgotPasswordUsernameHelp": "Skriv ditt användarnamn, om du kommer ihåg det.",
     "LabelFriendlyName": "Visningsnamn",
     "LabelFriendlyServerName": "Ditt önskade servernamn:",
-    "LabelFriendlyServerNameHelp": "Det här namnet används för att identifiera servern, om det lämnas tomt kommer datorns namn att användas.",
+    "LabelServerNameHelp": "Det här namnet används för att identifiera servern, om det lämnas tomt kommer datorns namn att användas.",
     "LabelGroupMoviesIntoCollections": "Gruppera filmer i samlingsboxar",
     "LabelGroupMoviesIntoCollectionsHelp": "I filmlistor visas filmer som ingår i en samlingsbox som ett enda objekt.",
     "LabelH264Crf": "H264-omkodning CRF:",
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 1ce9d7ba3b..179b4b7e42 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -599,7 +599,7 @@
     "LabelFormat": "格式：",
     "LabelFriendlyName": "好记的名称：",
     "LabelFriendlyServerName": "好记的服务器名称：",
-    "LabelFriendlyServerNameHelp": "此名称将用做服务器名，如果留空，将使用计算机名。",
+    "LabelServerNameHelp": "此名称将用做服务器名，如果留空，将使用计算机名。",
     "LabelGroupMoviesIntoCollections": "批量添加电影到收藏",
     "LabelGroupMoviesIntoCollectionsHelp": "显示电影列表时，属于一个收藏的电影将显示为一个分组。",
     "LabelH264Crf": "H264 编码速率控制",
diff --git a/src/strings/zh-hk.json b/src/strings/zh-hk.json
index d38b4728c4..40939c2376 100644
--- a/src/strings/zh-hk.json
+++ b/src/strings/zh-hk.json
@@ -124,7 +124,7 @@
     "LabelFanartApiKey": "個人 API 鎖匙：",
     "LabelFinish": "完成",
     "LabelFriendlyServerName": "友好伺服器名稱：",
-    "LabelFriendlyServerNameHelp": "名稱用於識辨伺服器。如果留空，將使用本機(伺服器)名稱。",
+    "LabelServerNameHelp": "名稱用於識辨伺服器。如果留空，將使用本機(伺服器)名稱。",
     "LabelHttpsPort": "本地 https 連接埠號碼：",
     "LabelHttpsPortHelp": "TCP 連接埠號碼應綁定到 Jellyfin https 伺服器。",
     "LabelImageFetchersHelp": "啟用媒體圖片獲取程式的優先次序",
diff --git a/src/strings/zh-tw.json b/src/strings/zh-tw.json
index a554177ac5..9cad4bfcf5 100644
--- a/src/strings/zh-tw.json
+++ b/src/strings/zh-tw.json
@@ -120,7 +120,7 @@
     "LabelEveryXMinutes": "每：",
     "LabelFinish": "完成",
     "LabelFriendlyServerName": "友好伺服器名稱：",
-    "LabelFriendlyServerNameHelp": "此名稱將用於標識伺服器。如果留空，計算機名稱將被使用。",
+    "LabelServerNameHelp": "此名稱將用於標識伺服器。如果留空，計算機名稱將被使用。",
     "LabelLanguage": "語言：",
     "LabelMaxBackdropsPerItem": "每個項目背景的最大數目：",
     "LabelMaxParentalRating": "最大允許的家長評級：",