ZCS-13867: Removed Modern Web Client code from Preferences tab and he…

…lpButton Dropdown
Zimbra · Feb 26, 2024 · bf258cd · bf258cd
1 parent c73ea1a
commit bf258cd
Show file tree

Hide file tree

Showing 45 changed files with 4 additions and 119 deletions.
diff --git a/WebRoot/js/zimbraMail/core/ZmZimbraMail.js b/WebRoot/js/zimbraMail/core/ZmZimbraMail.js
@@ -2390,13 +2390,6 @@ function(parent, parentElement, adminUrl) {
 		    mi.addSelectionListener(new AjxListener(null, ZmZimbraMail.adminLinkCallback, adminUrl));
 		}
 
-		if (appCtxt.get(ZmSetting.DISABLE_MODERN_CLIENT) !== true) {
-			mi = menu.createMenuItem("modernClientLink", {text: ZmMsg.modernClient});
-			mi.addSelectionListener(ZmZimbraMail.modernClientLinkCallback);
-		}
-
-		menu.createSeparator();
-
 		if (window.productHelpSupported && supportedHelps.indexOf("productHelp") !== -1) {
 			mi = menu.createMenuItem("documentation", {text: ZmMsg.productHelp});
 			mi.addSelectionListener(helpListener);
@@ -2903,21 +2896,6 @@ function(url) {
 	window.open(url);
 };
 
-/**
- * @private
- */
-ZmZimbraMail.modernClientLinkCallback =
-function() {
-	var urlParams = {
-		path: appContextPath,
-		qsArgs: {
-			client: "modern"
-		}
-	};
-	var url = AjxUtil.formatUrl(urlParams);
-	ZmZimbraMail.sendRedirect(url);	// will trigger onbeforeunload
-};
-
 /**
  * @private
  */

diff --git a/WebRoot/js/zimbraMail/prefs/ZmPreferencesApp.js b/WebRoot/js/zimbraMail/prefs/ZmPreferencesApp.js
@@ -304,7 +304,6 @@ ZmPreferencesApp.prototype._registerPrefs = function() {
 				ZmSetting.SHOW_SEARCH_STRING,
 				ZmSetting.SHOW_SELECTION_CHECKBOX,
 				ZmSetting.SKIN_NAME,
-				ZmSetting.CLIENT_TYPE,
 				ZmSetting.DEFAULT_TIMEZONE,
                 ZmSetting.DEFAULT_PRINTFONTSIZE,
 				ZmSetting.OFFLINE_IS_MAILTO_HANDLER,
@@ -509,16 +508,6 @@ ZmPreferencesApp.prototype._registerPrefs = function() {
 		ZmPref.registerPrefSection(id, sections[id]);
 	}
 
-	if (appCtxt.get(ZmSetting.DISABLE_MODERN_CLIENT) !== true) {
-		ZmPref.registerPref("CLIENT_TYPE", {
-			displayName:		ZmMsg.clientType,
-			displayContainer:	ZmPref.TYPE_RADIO_GROUP,
-			orientation:		ZmPref.ORIENT_VERTICAL,
-			displayOptions:     [ZmMsg.clientAdvanced, ZmMsg.clientModern],
-			options:            [ZmSetting.CLIENT_ADVANCED, ZmSetting.CLIENT_MODERN]
-		});
-	}
-
 	ZmPref.registerPref("COMPOSE_AS_FORMAT", {
 		displayName:		ZmMsg.composeUsing,
 		displayContainer:	ZmPref.TYPE_RADIO_GROUP,

diff --git a/WebRoot/js/zimbraMail/prefs/view/ZmPreferencesPage.js b/WebRoot/js/zimbraMail/prefs/view/ZmPreferencesPage.js
@@ -655,6 +655,7 @@ function(templateId, data) {
 	if (AjxTemplate.require(templateId)) {
 		this.getContentHtmlElement().innerHTML = AjxTemplate.expand(templateId, data);
 	}
+	appCtxt.notifyZimlets("onZmPreferencesPage_createPageHtml", [this, templateId]);
 };
 
 /**

diff --git a/WebRoot/js/zimbraMail/share/view/ZmPopupMenu.js b/WebRoot/js/zimbraMail/share/view/ZmPopupMenu.js
@@ -236,6 +236,6 @@ function() {
  * @return	{DwtMenuItem}	the separator menu item
  */
 ZmPopupMenu.prototype.createSeparator =
-function() {
-	new DwtMenuItem({parent:this, style:DwtMenuItem.SEPARATOR_STYLE});
+function(params) {
+	new DwtMenuItem({parent:this, style:DwtMenuItem.SEPARATOR_STYLE, index:params && params.index});
 };
diff --git a/WebRoot/messages/ZmMsg.properties b/WebRoot/messages/ZmMsg.properties
@@ -1644,7 +1644,6 @@ horizRule = Horizontal Rule
 htmlDocument = HTML
 hiliteObjects = Highlight objects.
 home = Home
-modernClient = Modern Web Client
 htmlEditorTitle = Zimbra rich text editor
 icon = Icon
 ics = ICS
@@ -1981,7 +1980,6 @@ loginHeader = Acme Corporation
 loginError = The username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current username and password
 loginAsDiff = Sign in as a different user
 loginOptions = Sign in
-loginLabel = Default Web App:
 logOff = Sign Out
 low = Low
 lowPriorityTooltip = This item has been marked as low priority

diff --git a/WebRoot/messages/ZmMsg_ar.properties b/WebRoot/messages/ZmMsg_ar.properties
@@ -1627,7 +1627,6 @@ horizRule = \u0645\u0633\u0637\u0631\u0629 \u0623\u0641\u0642\u064a\u0629
 htmlDocument = HTML
 hiliteObjects = \u062a\u0645\u064a\u064a\u0632 \u0627\u0644\u0643\u0627\u0626\u0646\u0627\u062a.\u200f
 home = \u0627\u0644\u0635\u0641\u062d\u0629 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629
-modernClient = \u0639\u0645\u064A\u0644 \u0648\u064A\u0628 \u0022Modern\u0022
 htmlEditorTitle = \u0645\u062d\u0631\u0631 rich text \u0645\u0646 Zimbra\u200f
 icon = \u0631\u0645\u0632
 ics = ICS
@@ -1967,7 +1966,6 @@ loginHeader = \u0634\u0631\u0643\u0629 \u0643\u0630\u0627
 loginError = \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0623\u0648 \u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 \u063a\u064a\u0631 \u0635\u062d\u064a\u062d\u0629. \u062a\u062d\u0642\u0642 \u0645\u0646 \u0639\u062f\u0645 \u062a\u0646\u0634\u064a\u0637 CAPS LOCK\u060c \u062b\u0645 \u0623\u0639\u062f \u0643\u062a\u0627\u0628\u0629 \u0627\u0633\u0645 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u0648\u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u0631\u0648\u0631 \u0627\u0644\u062d\u0627\u0644\u064a\u0629
 loginAsDiff = \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644 \u0643\u0645\u0633\u062a\u062e\u062f\u0645 \u0645\u062e\u062a\u0644\u0641
 loginOptions = \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644
-loginLabel = \u062A\u0637\u0628\u064A\u0642 \u0627\u0644\u0648\u064A\u0628 \u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A:
 logOff = \u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062e\u0631\u0648\u062c
 low = \u0645\u0646\u062e\u0641\u0636
 lowPriorityTooltip = \u062a\u0645 \u062a\u0639\u0644\u064a\u0645 \u0647\u0630\u0627 \u0627\u0644\u0639\u0646\u0635\u0631 \u0643\u0645\u0646\u062e\u0641\u0636 \u0627\u0644\u0623\u0648\u0644\u0648\u064a\u0629

diff --git a/WebRoot/messages/ZmMsg_ca.properties b/WebRoot/messages/ZmMsg_ca.properties
@@ -1643,7 +1643,6 @@ horizRule = Regle horitzontal
 htmlDocument = HTML
 hiliteObjects = Ressalteu objectes.
 home = Inici
-modernClient = Client web \u0027Modern\u0027
 htmlEditorTitle = Editor de text enriquit del Zimbra
 icon = Icona
 ics = ICS
@@ -1980,7 +1979,6 @@ loginHeader = Acme Corporation
 loginError = El nom d\u2019usuari o la contrasenya s\u00f3n incorrectes. Comproveu que no estigui activada la tecla BLOQ MAJ i torneu a introduir l\u2019ID d\u2019usuari i la contrasenya
 loginAsDiff = Inicia sessi\u00f3 com un altre usuari
 loginOptions = Inicia sessi\u00f3
-loginLabel = Aplicaci\u00F3 web per defecte:
 logOff = Tanca la sessi\u00f3
 low = Baixa
 lowPriorityTooltip = S\u2019ha marcat l\u2019element com de baixa prioritat

diff --git a/WebRoot/messages/ZmMsg_da.properties b/WebRoot/messages/ZmMsg_da.properties
@@ -1534,7 +1534,6 @@ horizRule = Vandret streg
 htmlDocument = HTML
 hiliteObjects = Fremh\u00e6v objekter.
 home = Hjem
-modernClient = \u0027Modern\u0027 Webklient
 htmlEditorTitle = Zimbra RTF-editor
 icon = Ikon
 ics = ICS
@@ -1845,7 +1844,6 @@ loginHeader = Acme Corporation
 loginError = Brugernavnet eller adgangskoden er forkert. Kontroll\u00e9r at CAPS LOCK ikke er sl\u00e5et til, og indtast derefter det/den aktuelle brugernavn og adgangskode
 loginAsDiff = Log ind som en anden bruger
 loginOptions = Log ind
-loginLabel = Standardweb-app:
 logOff = Log ud
 low = Lav
 lowPriorityTooltip = Dette element er blevet markeret som lav prioritet

diff --git a/WebRoot/messages/ZmMsg_de.properties b/WebRoot/messages/ZmMsg_de.properties
@@ -1595,7 +1595,6 @@ horizRule = Waagerechte Linie
 htmlDocument = HTML
 hiliteObjects = Objekte hervorheben.
 home = Privat
-modernClient = Webclient \u0027Modern\u0027
 htmlEditorTitle = Zimbra-Rich-Text-Editor
 icon = Symbol
 ics = ICS
@@ -1923,7 +1922,6 @@ loginHeader = ABC GmbH
 loginError = Der Nutzername oder das Passwort ist falsch. Pr\u00fcfen Sie, ob die Feststelltaste aktiviert ist und geben Sie dann Nutzernamen und Passwort erneut ein.
 loginAsDiff = Als anderen Nutzer anmelden
 loginOptions = Anmelden
-loginLabel = Standard-Webanwendung:
 logOff = Abmelden
 low = Niedrig
 lowPriorityTooltip = Dieses Objekt wurde durch niedrige Priorit\u00e4t gekennzeichnet.

diff --git a/WebRoot/messages/ZmMsg_en_AU.properties b/WebRoot/messages/ZmMsg_en_AU.properties
@@ -1926,7 +1926,6 @@ loginHeader = Acme Corporation
 loginError = The username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current username and password
 loginAsDiff = Sign in as a different user
 loginOptions = Sign in
-loginLabel = Default Web App:
 logOff = Sign Out
 low = Low
 lowPriorityTooltip = This item has been marked as low priority

diff --git a/WebRoot/messages/ZmMsg_en_GB.properties b/WebRoot/messages/ZmMsg_en_GB.properties
@@ -1810,7 +1810,6 @@ loginHeader = Acme Corporation
 loginError = The username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current username and password
 loginAsDiff = Log in as a different user
 loginOptions = Sign in
-loginLabel = Default Web App:
 logOff = Sign Out
 low = Low
 lowPriorityTooltip = This item has been marked as low priority

diff --git a/WebRoot/messages/ZmMsg_es.properties b/WebRoot/messages/ZmMsg_es.properties
@@ -1602,7 +1602,6 @@ horizRule = L\u00ednea horizontal
 htmlDocument = HTML
 hiliteObjects = Resaltar objetos.
 home = Particular
-modernClient = Cliente web \u0027Modern\u0027
 htmlEditorTitle = Editor de texto enriquecido de Zimbra
 icon = Icono
 ics = ICS
@@ -1925,7 +1924,6 @@ loginHeader = Acme Corporation
 loginError = El nombre de usuario o la contrase\u00f1a son incorrectos. Comprueba que no est\u00e9 activado el BLOQUEO MAY\u00daSCULAS y vuelve a introducir tu ID de usuario y contrase\u00f1a
 loginAsDiff = Iniciar sesi\u00f3n como otro usuario
 loginOptions = Iniciar sesi\u00f3n
-loginLabel = Aplicaci\u00F3n web predeterminada:
 logOff = Cerrar sesi\u00f3n
 low = Baja
 lowPriorityTooltip = Se ha se\u00f1alado el elemento como de baja prioridad

diff --git a/WebRoot/messages/ZmMsg_eu.properties b/WebRoot/messages/ZmMsg_eu.properties
@@ -1625,7 +1625,6 @@ horizRule = Lerro horizontala
 htmlDocument = HTML
 hiliteObjects = Nabarmendu objektuak.
 home = Hasiera
-modernClient = \u0027Modern\u0027 Web Bezeroa
 htmlEditorTitle = Zimbra testu aberastuko editorea
 icon = Ikonoa
 ics = ICS
@@ -1963,7 +1962,6 @@ loginHeader = Acme Corporation
 loginError = Erabiltzaile-izena edo pasahitza ez dira zuzenak. Egiaztatu BLOK MAIUS tekla ez dagoela aktibatuta eta idatzi berriro erabiltzaile-izena eta pasahitza.
 loginAsDiff = Hasi saioa beste erabiltzaile bat bezala
 loginOptions = Hasi saioa
-loginLabel = Web Aplikazio lehenetsia:
 logOff = Irten
 low = Txikia
 lowPriorityTooltip = Elementua lehentasun txikiko gisa markatu da

diff --git a/WebRoot/messages/ZmMsg_fr.properties b/WebRoot/messages/ZmMsg_fr.properties
@@ -1606,7 +1606,6 @@ horizRule = R\u00e8gle horizontale
 htmlDocument = HTML
 hiliteObjects = Contraster les objets.
 home = Priv\u00e9
-modernClient = Client Web \u00ABModern\u00BB
 htmlEditorTitle = \u00c9diteur de texte enrichi Zimbra 
 icon = Ic\u00f4ne
 ics = ICS
@@ -1934,7 +1933,6 @@ loginHeader = Acme Corporation
 loginError = Le nom d\u2019utilisateur ou le mot de passe est incorrect. V\u00e9rifiez que la touche Verr. Maj. n\u2019est pas activ\u00e9e et recommencez la saisie du nom d\u2019utilisateur et du mot de passe
 loginAsDiff = Se connecter avec un autre nom d\u2019utilisateur
 loginOptions = Connexion
-loginLabel = Application Web par d\u00E9faut:
 logOff = D\u00e9connexion
 low = Basse
 lowPriorityTooltip = Cet objet a \u00e9t\u00e9 affect\u00e9 d\u2019une basse priorit\u00e9.

diff --git a/WebRoot/messages/ZmMsg_fr_CA.properties b/WebRoot/messages/ZmMsg_fr_CA.properties
@@ -1633,7 +1633,6 @@ horizRule = R\u00e8gle horizontale
 htmlDocument = HTML
 hiliteObjects = Contraster les objets.
 home = Accueil
-modernClient = Client Web \u00ABModern\u00BB
 htmlEditorTitle = \u00c9diteur de texte riche Zimbra
 icon = Ic\u00f4ne
 ics = ICS
@@ -1972,7 +1971,6 @@ loginHeader = Acme Corporation
 loginError = Le nom d\u2019utilisateur ou le mot de passe est incorrect. V\u00e9rifiez que la touche Verr. Maj. n\u2019est pas activ\u00e9e et recommencez la saisie du nom d\u2019utilisateur et du mot de passe
 loginAsDiff = Se connecter avec un autre nom d\u2019utilisateur
 loginOptions = Connexion
-loginLabel = Application Web par d\u00E9faut:
 logOff = D\u00e9connexion
 low = Bas
 lowPriorityTooltip = Cet objet a \u00e9t\u00e9 marqu\u00e9 comme n\u2019\u00e9tant pas prioritaire.

diff --git a/WebRoot/messages/ZmMsg_fr_FR.properties b/WebRoot/messages/ZmMsg_fr_FR.properties
@@ -50,5 +50,4 @@ clientWhatsThisMessageWithoutTablet = <p><strong>Modern</strong><br> L\u0027appl
 	cette pr\u00E9f\u00E9rence dans Param\u00E8tres\u003E G\u00E9n\u00E9ral\u003E \
 	Version Zimbra. Dans \u0027Classic\u0027\u002c d\u00E9finissez-le dans \
 	Pr\u00E9f\u00E9rences\u003E G\u00E9n\u00E9ral\u003E Connexion.</p>
-    modernClient = Client Web \u00ABModern\u00BB
 filterErrorSieveScriptMaxSize = Limite de taille de filtre d\u00e9pass\u00e9e. Veuillez examiner le contenu du filtre et r\u00e9duire le nombre de param\u00e8tres
diff --git a/WebRoot/messages/ZmMsg_hi.properties b/WebRoot/messages/ZmMsg_hi.properties
@@ -1522,7 +1522,6 @@ horizRule = \u0915\u094d\u0937\u0948\u0924\u093f\u091c \u0930\u0947\u0916\u093e
 htmlDocument = HTML
 hiliteObjects = \u0911\u092c\u094d\u200d\u091c\u0947\u0915\u094d\u200d\u091f \u0939\u093e\u0908\u0932\u093e\u0907\u091f \u0915\u0930\u0947\u0902.
 home = \u0918\u0930
-modernClient =  \u0027Modern \u0027 \u0935\u0947\u092C \u0915\u094D\u0932\u093E\u0907\u0902\u091F
 htmlEditorTitle = Zimbra \u0930\u093f\u091a \u091f\u0947\u0915\u094d\u0938\u094d\u091f \u090f\u0921\u093f\u091f\u0930
 icon = \u091a\u093f\u0928\u094d\u0939
 ics = ICS
@@ -1832,7 +1831,6 @@ loginHeader = Acme \u0915\u0949\u0930\u094d\u092a\u094b\u0930\u0947\u0936\u0928
 loginError = \u092f\u0942\u091c\u093c\u0930\u0928\u093e\u092e \u0914\u0930 \u092a\u093e\u0938\u0935\u0930\u094d\u0921 \u0917\u093c\u0932\u0924 \u0939\u0948. \u0938\u0924\u094d\u200d\u092f\u093e\u092a\u093f\u0924 \u0915\u0930\u0947\u0902 \u0915\u093f CAPS LOCK \u091a\u093e\u0932\u0942 \u0928\u0939\u0940\u0902 \u0939\u0948, \u0914\u0930 \u092b\u093f\u0930 \u0935\u0930\u094d\u0924\u092e\u093e\u0928 \u092f\u0942\u091c\u093c\u0930\u0928\u093e\u092e \u0914\u0930 \u092a\u093e\u0938\u0935\u0930\u094d\u0921 \u092a\u0941\u0928: \u0932\u093f\u0916\u0947\u0902.
 loginAsDiff = \u090f\u0915 \u092d\u093f\u0928\u094d\u0928 \u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u0938\u093e\u0907\u0928 \u0907\u0928 \u0915\u0930\u0947\u0902
 loginOptions = \u0938\u093e\u0907\u0928 \u0907\u0928 \u0915\u0930\u0947\u0902
-loginLabel = \u0921\u093F\u092B\u093C\u0949\u0932\u094D\u091F \u0935\u0947\u092C \u0910\u092A:
 logOff = \u0938\u093e\u0907\u0928 \u0906\u0909\u091f \u0915\u0930\u0947\u0902
 low = \u0928\u093f\u092e\u094d\u0928
 lowPriorityTooltip = \u092f\u0939 \u0906\u0907\u091f\u092e \u0915\u092e \u092a\u094d\u0930\u093e\u0925\u092e\u093f\u0915\u0924\u093e \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u091a\u093f\u0939\u094d\u0928\u093f\u0924 \u0939\u094b \u091a\u0941\u0915\u093e \u0939\u0948

diff --git a/WebRoot/messages/ZmMsg_hr.properties b/WebRoot/messages/ZmMsg_hr.properties
@@ -1640,7 +1640,6 @@ horizRule = Horizontal Rule
 htmlDocument = HTML
 hiliteObjects = Ozna\u010Dite predmete.
 home = Home
-modernClient = Modern Web Client
 htmlEditorTitle = Zimbra rich text editor
 icon = Icon
 ics = ICS
@@ -1978,7 +1977,6 @@ loginError = Neispravni podaci za prijavu. Provjerite da li je CAPS LOCK uklju\u
 loginAsDiff = Sign in as a different user
 #loginOptions = Sign in
 loginOptions = Prijava
-loginLabel = Zadani klijent:
 logOff = Odjava
 low = Nizak
 lowPriorityTooltip = This item has been marked as low priority

diff --git a/WebRoot/messages/ZmMsg_hu.properties b/WebRoot/messages/ZmMsg_hu.properties
@@ -1615,7 +1615,6 @@ horizRule = V\u00edzszintes szab\u00e1ly
 htmlDocument = HTML
 hiliteObjects = Objektumok kiemel\u00e9se.
 home = Kezd\u0151lap
-modernClient =  \u0027Modern\u0027 webes kliens
 htmlEditorTitle = Zimbra rich text szerkeszt\u0151
 icon = Ikon
 ics = ICS
@@ -1954,7 +1953,6 @@ loginHeader = Acme Corporation
 loginError = Hib\u00e1s felhaszn\u00e1l\u00f3n\u00e9v vagy jelsz\u00f3. Gy\u0151z\u0151dj\u00f6n meg arr\u00f3l, hogy a CAPS LOCK nincs bekapcsolva, majd \u00edrja be \u00fajra a felhaszn\u00e1l\u00f3nevet \u00e9s a jelsz\u00f3t
 loginAsDiff = Bejelentkez\u00e9s m\u00e1sik felhaszn\u00e1l\u00f3k\u00e9nt
 loginOptions = Bejelentkez\u00e9s
-loginLabel = Alap\u00E9rtelmezett webalkalmaz\u00E1s:
 logOff = Kijelentkez\u00e9s
 low = Alacsony
 lowPriorityTooltip = Ez az elem alacsony priorit\u00e1s\u00fanak lett jel\u00f6lve

diff --git a/WebRoot/messages/ZmMsg_in.properties b/WebRoot/messages/ZmMsg_in.properties
@@ -1629,7 +1629,6 @@ horizRule = Aturan Horizontal
 htmlDocument = HTML
 hiliteObjects = Sorot objek.
 home = Beranda
-modernClient = Klien Web \u0027Modern\u0027
 htmlEditorTitle = Editor rich text Zimbra
 icon = Ikon
 ics = ICS
@@ -1968,7 +1967,6 @@ loginHeader = Acme Corporation
 loginError = Nama pengguna atau kata sandi salah. Pastikan CAPS LOCK tidak aktif, lalu ketik ulang nama pengguna dan kata sandi saat ini
 loginAsDiff = Masuk sebagai pengguna lain
 loginOptions = Masuk
-loginLabel = Aplikasi Web Default:
 logOff = Keluar
 low = Rendah
 lowPriorityTooltip = Item ini sudah ditandai sebagai prioritas rendah

diff --git a/WebRoot/messages/ZmMsg_it.properties b/WebRoot/messages/ZmMsg_it.properties
@@ -1536,7 +1536,6 @@ horizRule = Riga orizzontale
 htmlDocument = HTML
 hiliteObjects = Evidenzia oggetti
 home = Home
-modernClient = Client Web \u0027Modern\u0027
 htmlEditorTitle = Editor Rich Text Zimbra
 icon = Icona
 ics = ICS
@@ -1847,7 +1846,6 @@ loginHeader = Acme Corporation
 loginError = Il nome utente o la password sono errati. Verifica che non sia attivo il tasto Blocca maiuscole e digita di nuovo nome utente e password.
 loginAsDiff = Entra con un altro nome utente
 loginOptions = Accedi
-loginLabel = App Web predefinita:
 logOff = Esci
 low = Bassa
 lowPriorityTooltip = Questo elemento \u00e8 di bassa priorit\u00e0

diff --git a/WebRoot/messages/ZmMsg_iw.properties b/WebRoot/messages/ZmMsg_iw.properties
@@ -1611,7 +1611,6 @@ horizRule = \u05e1\u05e8\u05d2\u05dc \u05d0\u05d5\u05e4\u05e7\u05d9
 htmlDocument = HTML
 hiliteObjects = \u05d4\u05d3\u05d2\u05e9 \u05d0\u05d5\u05d1\u05d9\u05d9\u05e7\u05d8\u05d9\u05dd
 home = \u05d1\u05d9\u05ea
-modernClient = \u05DC\u05E7\u05D5\u05D7 \u05D0\u05D9\u05E0\u05D8\u05E8\u05E0\u05D8 \u0027Modern\u0027
 htmlEditorTitle = \u05e2\u05d5\u05e8\u05da \u05d8\u05e7\u05e1\u05d8 \u05e2\u05e9\u05d9\u05e8 \u05e9\u05dc Zimbra\u200f
 icon = \u05e1\u05de\u05dc
 ics = ICS
@@ -1949,7 +1948,6 @@ loginHeader = Acme Corporation
 loginError = \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05d0\u05d5 \u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05e9\u05d2\u05d5\u05d9\u05d9\u05dd. \u05d5\u05d3\u05d0 \u05e9-CAPS LOCK \u05dc\u05d0 \u05dc\u05d7\u05d5\u05e5, \u05d5\u05dc\u05d0\u05d7\u05e8 \u05de\u05db\u05df \u05d4\u05e7\u05dc\u05d3 \u05e9\u05d5\u05d1 \u05d0\u05ea \u05e9\u05dd \u05d4\u05de\u05e9\u05ea\u05de\u05e9 \u05d5\u05d4\u05e1\u05d9\u05e1\u05de\u05d4 \u05d4\u05e2\u05d3\u05db\u05e0\u05d9\u05d9\u05dd
 loginAsDiff = \u05d4\u05d9\u05db\u05e0\u05e1 \u05db\u05de\u05e9\u05ea\u05de\u05e9 \u05d0\u05d7\u05e8
 loginOptions = \u05db\u05e0\u05d9\u05e1\u05d4
-loginLabel = \u05D0\u05E4\u05DC\u05D9\u05E7\u05E6\u05D9\u05D9\u05EA \u05D0\u05D9\u05E0\u05D8\u05E8\u05E0\u05D8 \u05D1\u05E8\u05D9\u05E8\u05EA \u05DE\u05D7\u05D3\u05DC:
 logOff = \u05d9\u05e6\u05d9\u05d0\u05d4
 low = \u05e0\u05de\u05d5\u05da
 lowPriorityTooltip = \u05e4\u05e8\u05d9\u05d8 \u05d6\u05d4 \u05e1\u05d5\u05de\u05df \u05db\u05d1\u05e2\u05dc \u05e2\u05d3\u05d9\u05e4\u05d5\u05ea \u05e0\u05de\u05d5\u05db\u05d4

diff --git a/WebRoot/messages/ZmMsg_ja.properties b/WebRoot/messages/ZmMsg_ja.properties
@@ -1572,7 +1572,6 @@ horizRule = \u6c34\u5e73\u7dda
 htmlDocument = HTML
 hiliteObjects = URL\u3092\u30ea\u30f3\u30af\u3067\u8868\u793a
 home = \u81ea\u5b85
-modernClient = \u0027Modern\u0027 Web\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8
 htmlEditorTitle = Zimbra\u30ea\u30c3\u30c1\u30c6\u30ad\u30b9\u30c8\u30a8\u30c7\u30a3\u30bf
 icon = \u30a2\u30a4\u30b3\u30f3
 ics = ICS
@@ -1892,7 +1891,6 @@ loginHeader = Acme Corporation
 loginError = \u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002CAPS LOCK\u304c\u30aa\u30f3\u306b\u306a\u3063\u3066\u3044\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304b\u3089\u3001\u73fe\u5728\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u3068\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 loginAsDiff = \u5225\u306e\u30e6\u30fc\u30b6\u30fc\u3068\u3057\u3066\u30ed\u30b0\u30a4\u30f3
 loginOptions = \u30ed\u30b0\u30a4\u30f3
-loginLabel = \u30C7\u30D5\u30A9\u30EB\u30C8\u306EWeb\u30A2\u30D7\u30EA:
 logOff = \u30ed\u30b0\u30a2\u30a6\u30c8
 low = \u4f4e
 lowPriorityTooltip = \u3053\u306e\u30a2\u30a4\u30c6\u30e0\u306b\u306f\u4f4e\u512a\u5148\u5ea6\u306e\u30de\u30fc\u30af\u304c\u4ed8\u3044\u3066\u3044\u307e\u3059

diff --git a/WebRoot/messages/ZmMsg_ko.properties b/WebRoot/messages/ZmMsg_ko.properties
@@ -1586,7 +1586,6 @@ horizRule = \uac00\ub85c\uc904 \ub123\uae30
 htmlDocument = HTML
 hiliteObjects = \uac1c\uccb4 \uc120\ud0dd
 home = \uc9d1
-modernClient = \u0027Modern\u0027\uC6F9 \uD074\uB77C\uC774\uC5B8\uD2B8
 htmlEditorTitle = Zimbra \uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30
 icon = \uc544\uc774\ucf58
 ics = ICS
@@ -1911,7 +1910,6 @@ loginHeader = Acme Corporation
 loginError = \uc0ac\uc6a9\uc790 \uc774\ub984/\ube44\ubc00\ubc88\ud638\uac00 \ub9de\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. CAPS LOCK\uc774 \ucf1c\uc838\uc788\uc9c0 \uc54a\ub3c4\ub85d \ud655\uc778\ud558\uc2dc\uace0 \uc815\ud655\ud55c \uc0ac\uc6a9\uc790 \uc774\ub984\uacfc \ube44\ubc00\ubc88\ud638\ub97c \ub2e4\uc2dc \uc785\ub825\ud558\uc138\uc694.
 loginAsDiff = \ub2e4\ub978 \uc0ac\uc6a9\uc790\ub85c \ub85c\uadf8\uc778
 loginOptions = \ub85c\uadf8\uc778:
-loginLabel = \uAE30\uBCF8 \uC6F9 \uC571:
 logOff = \ub85c\uadf8\uc544\uc6c3
 low = \ub0ae\uc74c
 lowPriorityTooltip = \uc774 \ud56d\ubaa9\uc740 \ub0ae\uc740 \uc6b0\uc120\uc21c\uc704\ub85c \ud45c\uc2dc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.