Merge branch 'master' into 23.1

Gruntfile.js

@@ -39,6 +39,17 @@ module.exports = function (grunt) {
 			},
 			pixelegg: {
 				files: {
+					"pixelegg/css/fancy.min.css": [
+						"node_modules/flatpickr/dist/themes/light.css",
+						"vendor/bower-asset/diff2html/dist/diff2html.css",
+						"vendor/bower-asset/cropper/dist/cropper.min.css",
+						"api/templates/default/css/flags.css",
+						"api/templates/default/css/htmlarea.css",
+						"api/templates/default/etemplate2.css",
+						"pixelegg/css/fancy.css",
+						"api/templates/default/print.css",
+						"pixelegg/print.css"
+					],
 					"pixelegg/css/pixelegg.min.css": [
 						"node_modules/flatpickr/dist/themes/light.css",
 						"vendor/bower-asset/diff2html/dist/diff2html.css",

addressbook/inc/class.addressbook_ui.inc.php

@@ -2282,7 +2282,6 @@ class addressbook_ui extends addressbook_bo
 			unset($content['button']);
 			$content['private'] = (int) ($content['owner'] && substr($content['owner'],-1) == 'p');
 			$content['owner'] = (string) (int) $content['owner'];
-			$content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $content['cat_id_tree'] : $content['cat_id'];
 
 			switch($button)
 			{
@@ -2650,9 +2649,6 @@ class addressbook_ui extends addressbook_bo
 		// Registry has view_id as contact_id, so set it (custom fields uses it)
 		$content['contact_id'] = $content['id'];
 
-		// Avoid ID conflict with tree & selectboxes
-		$content['cat_id_tree'] = $content['cat_id'];
-
 		// how to display addresses
 		$content['addr_format']  = $this->addr_format_by_country($content['adr_one_countryname']);
 		$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
@@ -2805,7 +2801,7 @@ class addressbook_ui extends addressbook_bo
 		$preserve['old_owner'] = $content['owner'];
 		unset($preserve['jpegphoto'], $content['jpegphoto']);	// unused and messes up json encoding (not utf-8)
 		$this->tmpl->setElementAttribute('tabs', 'add_tabs', true);
-		$tabs =& $this->tmpl->getElementAttribute('tabs', 'extraTabs');
+		$tabs =& $this->tmpl->setElementAttribute('tabs', 'extraTabs');
 		if (($first_call = !isset($tabs)))
 		{
 			$tabs = array();
@@ -3161,7 +3157,6 @@ class addressbook_ui extends addressbook_bo
 		{
 			$content['cat_id'] = $this->categories->check_list(Acl::READ,$content['cat_id']);
 		}
-		$content['cat_id_tree'] = $content['cat_id'];
 
 		$content['view'] = true;
 		$content['link_to'] = array(
@@ -3356,9 +3351,6 @@ class addressbook_ui extends addressbook_bo
 	{
 		if(!empty($_content))
 		{
-
-			$_content['cat_id'] = $this->config['cat_tab'] === 'Tree' ? $_content['cat_id_tree'] : $_content['cat_id'];
-
 			$response = Api\Json\Response::get();
 
 			$query = Api\Cache::getSession('addressbook', 'index');
@@ -3408,8 +3400,6 @@ class addressbook_ui extends addressbook_bo
 		$this->tmpl->read('addressbook.edit');
 		$content = Api\Cache::getSession('addressbook', 'advanced_search');
 		$content['n_fn'] = $this->fullname($content);
-		// Avoid ID conflict with tree & selectboxes
-		$content['cat_id_tree'] = $content['cat_id'];
 
 		for($i = -23; $i<=23; $i++)
 		{

addressbook/js/app.ts

@@ -24,6 +24,10 @@ import {LitElement} from "lit";
 import {Et2SelectCountry} from "../../api/js/etemplate/Et2Select/Select/Et2SelectCountry";
 
 import {Et2SelectState} from "../../api/js/etemplate/Et2Select/Select/Et2SelectState";
+import type {EgwAction} from "../../api/js/egw_action/EgwAction";
+import {EgwActionObject} from "../../api/js/egw_action/EgwActionObject";
+import {Et2MergeDialog} from "../../api/js/etemplate/Et2Dialog/Et2MergeDialog";
+import {et2_createWidget} from "../../api/js/etemplate/et2_core_widget";
 
 /**
  * Object to call app.addressbook.openCRMview with
@@ -1166,47 +1170,59 @@ class AddressbookApp extends EgwApp
 		return emails;
 	}
 
+	/**
+	 * Ask the user for a target document to merge into
+	 *
+	 * Overridden from parent to add addressbook's options:
+	 * - save as infolog
+	 *
+	 * @returns {Promise<{document : string, pdf : boolean, mime : string}>}
+	 * @protected
+	 */
+	protected async _getMergeDocument(et2?, action? : EgwAction, selected? : EgwActionObject[]) : Promise<{
+		documents : { path : string; mime : string }[];
+		options : { [p : string] : string | boolean }
+	}>
+	{
+		const promise = super._getMergeDocument(et2, action, selected);
+
+		// Find dialog
+		const dialog = this.et2?.getDOMNode()?.querySelector('et2-merge-dialog') ?? document.body.querySelector('et2-merge-dialog');
+
+		// Add additional option UI by loading a template
+		const options = <Et2MergeDialog><unknown>et2_createWidget('template', {
+			application: this.appname,
+			id: this.appname + ".mail_merge_dialog",
+		}, dialog);
+		// Wait for template load
+		const wait = [];
+		options.loadingFinished(wait);
+		await Promise.all(wait);
+
+		// Get template values, add them in
+		const result = await promise;
+		result.options = {...this.et2.getInstanceManager().getValues(options), ...result.options};
+
+		return result;
+	}
+
 	/**
 	 * Merge the selected contacts into the target document.
 	 *
 	 * Normally we let the framework handle this, but in addressbook we want to
-	 * interfere and customize things a little to ask about saving to infolog.
+	 * interfere and customize things a little to save to infolog.
 	 *
 	 * @param {egwAction} action - The document they clicked
 	 * @param {egwActionObject[]} selected - Rows selected
 	 */
 	_mergeEmail(action, data)
 	{
-		// Special processing for email documents - ask about infolog
-		if(action && data && (data.id.length > 1 || data.select_all))
+		if(data.options.info_type)
 		{
-			const callback = (button, value) =>
-			{
-				if(button == Et2Dialog.OK_BUTTON)
-				{
-					if(value.infolog)
-					{
-						data.menuaction += '&to_app=infolog&info_type=' + value.info_type;
-					}
-					return super._mergeEmail(action, data);
-				}
-			};
-			let dialog = new Et2Dialog(this.egw);
-			dialog.transformAttributes({
-				callback: callback,
-				title: action.caption,
-				buttons: Et2Dialog.BUTTONS_OK_CANCEL,
-				type: Et2Dialog.QUESTION_MESSAGE,
-				template: egw.webserverUrl + '/addressbook/templates/default/mail_merge_dialog.xet',
-				value: {content: {info_type: 'email'}, sel_options: this.et2.getArrayMgr('sel_options').data}
-			});
-			document.body.appendChild(<LitElement><unknown>dialog);
-		}
-		else
-		{
-			// Normal processing for only one contact selected
-			return super._mergeEmail(action, data);
+			data.merge += '&to_app=infolog&info_type=' + data.options.info_type;
 		}
+		// Normal processing otherwise
+		return super._mergeEmail(action, data);
 	}
 
 	/**

addressbook/lang/egw_cs.lang

@@ -247,7 +247,6 @@ extra encodings	addressbook	cs	Zvláštní kódování
 extra private	addressbook	cs	Extra soukromé
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	cs	Nepodařilo se změnit %1 členů organizace (nedostatečná práva)!
 favorite phone	addressbook	cs	Oblíbený telefon
-favorites	addressbook	cs	Oblíbené
 fax	addressbook	cs	Fax
 fax (private)	addressbook	cs	Fax (soukromá)
 fax number	common	cs	Faxové číslo

addressbook/lang/egw_de.lang

@@ -160,7 +160,6 @@ custom	addressbook	de	Benutzerdefiniert
 custom etemplate for the contactform	addressbook	de	Eigenes eTemplate für das Kontaktformular
 custom fields	addressbook	de	Benutzerdefinierte Felder
 data exchange settings	addressbook	de	Einstellungen Datenaustausch
-debug output in browser	addressbook	de	Debug - Ausgabe in Browser
 default	addressbook	de	Standard
 default action on double-click	addressbook	de	Vorgabe beim Doppel-Klick einer Adresse
 default address format	addressbook	de	Vorgabe für Format der Adresse
@@ -248,7 +247,6 @@ extra encodings	addressbook	de	Extra encoding
 extra private	addressbook	de	Extra Privat
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	de	%1 Mitglied(er) der Organisation nicht geändert (fehlende Rechte)!
 favorite phone	addressbook	de	Bevorzugtes Telefon
-favorites	addressbook	de	Favoriten
 fax	addressbook	de	Fax
 fax (private)	addressbook	de	Fax privat
 fax number	common	de	Faxnummer
@@ -308,7 +306,6 @@ import from ldif, csv, or vcard	addressbook	de	Import von LDIF, CSV oder vCard
 import from outlook	addressbook	de	Aus Outlook importieren
 import multiple vcard	addressbook	de	Import mehrere vCards
 import next set	addressbook	de	Nächsten Satz importieren
-import_instructions	addressbook	de	In Netscape: Öffnen Sie das Adressbuch und wählen Sie <b>Exportieren</b> aus dem Datei Menü aus. Die Dateien werden im LDIF Format exportiert.<p> In Outlook wählen Sie den Ordner Kontakte aus, wählen Sie <b>Importieren und Exportieren...</p> aus dem <b>Datei</b> Menü aus und Exportieren Sie die Kontakte als eine CSV Datei.<p> In Palm Desktop 4.0 oder größer, öffnen Sie Ihr Adressbuch und wählen Sie <b>Export</b> aus dem Datei-Menü aus. Die Datei wird im vCard-Format exportiert.
 importer's personal	addressbook	de	Persönliche Adressbuch des Importierenden
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	de	Importiert Kontakte aus einer CSV Datei in Ihr Adressbuch. CSV bedeutet Komma getrennte Werte. Sie können in dem Reiter Einstellungen auch ein anderes Trennzeichen wählen.
 imports contacts into your addressbook from a vcard file.	addressbook	de	Importiert Kontakte in Ihr Adressbuch von einer vCard-Datei
@@ -372,7 +369,6 @@ name of current user, all other contact fields are valid too	addressbook	de	Name
 name, address	addressbook	de	Name, Adresse
 name, email, phone	addressbook	de	Name, E-Mail, Telefon
 new contact submitted by %1 at %2	addressbook	de	Neuer Kontakt eingetragen von %1 am %2
-new window opened to edit infolog for your selection	addressbook	de	Es wird ein neues Fenster zum Erstellen des InfoLog-Eintrags geöffnet
 next date	addressbook	de	Nächster Termin
 no categories selected	addressbook	de	Keine Kategorien ausgewählt
 no country selected	addressbook	de	Kein Land ausgewählt
@@ -442,14 +438,10 @@ select a source address to be used in geolocation routing system	addressbook	de
 select a view	addressbook	de	Eine Ansicht auswählen
 select addressbook type	addressbook	de	Typ des Adressbuchs auswählen
 select all	addressbook	de	Alles auswählen
-select an action or addressbook to move to	addressbook	de	Befehl oder Adressbuch zum Verschieben auswählen
-select an action or addressbook to move to...	addressbook	de	Befehl oder Adressbuch zum Verschieben auswählen...
 select an opened dialog	addressbook	de	Wählen Sie einen offenen Dialog
 select migration type	admin	de	Migrationstyp auswählen
 select multiple contacts for a further action	addressbook	de	Mehrere Adressen für weiteren Befehl auswählen
 select phone number as prefered way of contact	addressbook	de	Telefonnummer als präferierten Kontaktweg auswählen
-select the type of conversion	addressbook	de	Typ der Umwandlung auswählen
-select the type of conversion:	addressbook	de	Typ der Umwandlung auswählen:
 select where you want to store / retrieve contacts	admin	de	Auswählen wo Sie Adressen speichern möchten
 selected contacts	addressbook	de	Ausgewählte Kontakte
 send emailcopy to receiver	addressbook	de	Versendet eine Kopie der E-Mail zu dem Empfänger

addressbook/lang/egw_el.lang

@@ -159,7 +159,6 @@ custom	addressbook	el	Προσαρμογή
 custom etemplate for the contactform	addressbook	el	Προσαρμογή eΤαμπλέτας για τη φόρμα επαφών
 custom fields	addressbook	el	Προσαρμοσμένα πεδία
 data exchange settings	addressbook	el	Ρυθμίσεις ανταλλαγής δεδομένων
-debug output in browser	addressbook	el	Αποσφαλμάτωση εξαγωγής στο φυλλομετρητή
 default	addressbook	el	προκαθορισμένο
 default action on double-click	addressbook	el	Προεπιλεγμένη ενέργεια διπλού κλικ
 default address format	addressbook	el	Προκαθορισμένη μορφή διευθύνσεων
@@ -247,7 +246,6 @@ extra encodings	addressbook	el	Επιπλέον κωδικοποιήσεις
 extra private	addressbook	el	Επιπλέων προσωπικά
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	el	Απέτυχε η αλλαγή του-των μέλους(η) του %1 οργανισμού (ανεπαρκή δικαιώματα)!
 favorite phone	addressbook	el	Αγαπημένο τηλέφωνο
-favorites	addressbook	el	Αγαπημένα
 fax	addressbook	el	Fax
 fax (private)	addressbook	el	fax (προσ.)
 fax number	common	el	Αριθμός Fax
@@ -307,7 +305,6 @@ import from ldif, csv, or vcard	addressbook	el	Εισαγωγή από LDIF, CSV
 import from outlook	addressbook	el	Εισαγωγή από το Outlook
 import multiple vcard	addressbook	el	Εισαγωγή πολλαπλών vCard
 import next set	addressbook	el	Εισαγωγή επόμενου σετ
-import_instructions	addressbook	el	Στο Netscape, ανοίξτε την ατζέντα διευθύνσεων και επιλέξτε <b>Εξαγωγή</b> από το <b>Αρχείο</b>. Το εξαγώγιμο αρχείο θα είναι σε LDIF μορφή.<p>Ή, στο Outlook, επιλέξτε το φάκελο Eπαφών, επιλέξτε<b>Import and Export...</b> από το <b>File</b> menu και εξάγετε τις επαφές σας σε ένα CSV αρχείο.<p>Ή, στο Palm Desktop 4.0 ή μεγαλύτερο, επισκεφθείτε το βιβλίο διευθύνσεων σας και επιλέξτε <b>Export</b> από το <b>File</b> menu.Το εξαγώγιμο αρχείο θα ειναι σε vCard μορφή.
 importer's personal	addressbook	el	Προσωπικά του εισαγωγέα
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	el	Εισαγάγει επαφές στο βιβλίο διευθύνσεων από ένα αρχείο CSV ( 'Comma Separated Values'). Στις σχετικές ρυθμίσεις μπορείτε να επιλέξετε και χαρακτήρα διαχωρισμού.
 imports contacts into your addressbook from a vcard file.	addressbook	el	Εισαγάγει επαφές στο βιβλίο διευθύνσεων σας από ένα αρχείο vCard.
@@ -371,7 +368,6 @@ name of current user, all other contact fields are valid too	addressbook	el	Όν
 name, address	addressbook	el	Όνομα, Διεύθυνση
 name, email, phone	addressbook	el	Όνομα, email, τηλέφωνο
 new contact submitted by %1 at %2	addressbook	el	Νέα επαφή υπεβλήθει από %1 στις %2
-new window opened to edit infolog for your selection	addressbook	el	Νέο παράθυρο για την επεξεργασία του InfoLog.
 next date	addressbook	el	Επόμενη ημερομηνία
 no categories selected	addressbook	el	Δεν έχουν επιλεγεί κατηγορίες
 no country selected	addressbook	el	Δεν έχει επιλεγεί χώρα
@@ -441,14 +437,10 @@ select a source address to be used in geolocation routing system	addressbook	el
 select a view	addressbook	el	Επιλέξτε μία προβολή
 select addressbook type	addressbook	el	Επιλέξτε τύπο βιβλίου διευθύνσεων
 select all	addressbook	el	Επιλογή όλων
-select an action or addressbook to move to	addressbook	el	Επιλέξτε μία ενέργεια ή ένα βιβλίο διευθύνσεων για μετακίνηση σε αυτό
-select an action or addressbook to move to...	addressbook	el	Επιλέξτε μία ενέργεια ή ένα βιβλίο διευθύνσεων για μετακίνηση σε αυτό ...
 select an opened dialog	addressbook	el	Επιλέξτε ένα ανοικτό παράθυρο
 select migration type	admin	el	Επιλέξτε τύπο μετανάστευσης
 select multiple contacts for a further action	addressbook	el	Επιλέξτε πολλαπλές επαφές για περαιτέρω ενέργειες
 select phone number as prefered way of contact	addressbook	el	επιλέξτε τον αριθμό τηλεφώνου ως προτιμότερο τρόπο επικοινωνίας
-select the type of conversion	addressbook	el	Επιλέξτε τύπο μετατροπής
-select the type of conversion:	addressbook	el	Επιλέξτε τύπο μετατροπής:
 select where you want to store / retrieve contacts	admin	el	Επιλέξτε που θέλετε να αποθηκεύετε/ανακτάτε τις επαφές
 selected contacts	addressbook	el	επιλεγμένες επαφές
 send emailcopy to receiver	addressbook	el	Αποστολή αντιγράφου στον παραλήπτη

addressbook/lang/egw_en.lang

@@ -247,7 +247,6 @@ extra encodings	addressbook	en	Extra encodings
 extra private	addressbook	en	Extra private
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	en	Failed to change %1 organization member(s), insufficient rights!
 favorite phone	addressbook	en	Favorite phone
-favorites	addressbook	en	Favorites
 fax	addressbook	en	Fax
 fax (private)	addressbook	en	Fax (private)
 fax number	common	en	Fax number

addressbook/lang/egw_es-es.lang

@@ -246,7 +246,6 @@ extra encodings	addressbook	es-es	Codificaciones extra
 extra private	addressbook	es-es	Extra privado
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	es-es	Fallo al cambiar %1 miembros de la organización ¡No tiene privilegios suficientes!
 favorite phone	addressbook	es-es	Teléfono favorito
-favorites	addressbook	es-es	Favoritos
 fax	addressbook	es-es	Fax
 fax (private)	addressbook	es-es	Fax (privado)
 fax number	common	es-es	Número de fax

addressbook/lang/egw_fr.lang

@@ -159,7 +159,6 @@ custom	addressbook	fr	Personnalisé
 custom etemplate for the contactform	addressbook	fr	eTemplate personnalisé pour le formulaire contact
 custom fields	addressbook	fr	Champs personnalisés
 data exchange settings	addressbook	fr	Paramètres d'échange de données
-debug output in browser	addressbook	fr	Deboguer la sortie dans le navigateur
 default	addressbook	fr	Défaut
 default action on double-click	addressbook	fr	Action par défaut du double-clic
 default address format	addressbook	fr	Format de l'adresse par défaut
@@ -247,7 +246,6 @@ extra encodings	addressbook	fr	Encodage supplémentairess
 extra private	addressbook	fr	Extra privé
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	fr	Echec du changement des membres de l'organisation %1 (droits insufisants) !
 favorite phone	addressbook	fr	Téléphone favoris
-favorites	addressbook	fr	Favoris
 fax	addressbook	fr	Fax
 fax (private)	addressbook	fr	fax (privé)
 fax number	common	fr	Numéro de Fax
@@ -307,7 +305,6 @@ import from ldif, csv, or vcard	addressbook	fr	Importer depuis LDIF, CSV ou vCar
 import from outlook	addressbook	fr	Importer depuis Outlook
 import multiple vcard	addressbook	fr	Importation vCard Multiple
 import next set	addressbook	fr	Importer l'élément suivant
-import_instructions	addressbook	fr	Dans Netscape, ouvrir le carnet d´adresses et sélectionner <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera au format LDIF.<p>Ou, dans Outlook, sélectionner votre dossier des contacts, sélectionner <b>Importer et Exporter...</b> depuis le menu <b>Fichier</b> et exporter vos contacts, séparés par des virgules, dans un fichier texte (CSV). <p>Ou, dans Palm Desktop 4.0 ou supérieur, consulter votre carnet d´adresses et sélectionner <b>Exporter</b> depuis le menu <b>Fichier</b>. Le fichier exporté sera au format vCard.
 importer's personal	addressbook	fr	répertoire personnel de l'importeur
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	fr	Importer les contacts depuis un fichier CSV. CSV correspond à des valeurs séparées par des virgules. Dans les options, vous pouvez choisir d'autres séparateurs.
 imports contacts into your addressbook from a vcard file.	addressbook	fr	Importer les contacts vers votre carnet d'adresses depuis un fichier vCard.
@@ -371,7 +368,6 @@ name of current user, all other contact fields are valid too	addressbook	fr	Nom
 name, address	addressbook	fr	Nom, adresse
 name, email, phone	addressbook	fr	Nom, email, téléphone
 new contact submitted by %1 at %2	addressbook	fr	Nouveau contact soumis par %1 à %2.
-new window opened to edit infolog for your selection	addressbook	fr	Nouvelle fenêtre ouverte pour modifier un InfoLog.
 next date	addressbook	fr	Date de prochain contact
 no categories selected	addressbook	fr	Aucune catégorie sélectionnée
 no country selected	addressbook	fr	Aucun pays sélectionné
@@ -441,14 +437,10 @@ select a source address to be used in geolocation routing system	addressbook	fr
 select a view	addressbook	fr	Sélectionnez une vue
 select addressbook type	addressbook	fr	Sélectionnez un type de carnet d'adresse
 select all	addressbook	fr	Sélectionner tout
-select an action or addressbook to move to	addressbook	fr	Sélectionnez une action ou un carnet d'adresses à déplacer
-select an action or addressbook to move to...	addressbook	fr	Sélectionnez une action ou un carnet d'adresses à déplacer ...
 select an opened dialog	addressbook	fr	Sélectionner une boîte de dialogue ouverte
 select migration type	admin	fr	Sélectionnez un type de migration
 select multiple contacts for a further action	addressbook	fr	Sélectionner plusieurs contacts pour une même action
 select phone number as prefered way of contact	addressbook	fr	sélectionner le téléphone comme moyen de contact préféré
-select the type of conversion	addressbook	fr	Sélectionner le type de convertion
-select the type of conversion:	addressbook	fr	Sélectionner le type de convertion:
 select where you want to store / retrieve contacts	admin	fr	Sélectionnez où vous voulez stocker / récupérer les contacts
 selected contacts	addressbook	fr	contacts choisis
 send emailcopy to receiver	addressbook	fr	Envoyer une copie email au destinataire

addressbook/lang/egw_it.lang

@@ -160,7 +160,6 @@ custom	addressbook	it	Personalizzato
 custom etemplate for the contactform	addressbook	it	Template personalizzato per il modulo di contatto
 custom fields	addressbook	it	Campi Personalizzati
 data exchange settings	addressbook	it	Impostazioni di scambio dati
-debug output in browser	addressbook	it	Visualizza nel browser
 default	addressbook	it	Predefinito
 default action on double-click	addressbook	it	Azione predefinita al doppio click
 default address format	addressbook	it	Formato indirizzo predefinito
@@ -248,7 +247,6 @@ extra encodings	addressbook	it	Codifiche extra
 extra private	addressbook	it	Extra privato
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	it	Permessi insufficenti per modificare %1 membri dell'organizzazione!
 favorite phone	addressbook	it	Telefono preferito
-favorites	addressbook	it	Preferiti
 fax	addressbook	it	Fax
 fax (private)	addressbook	it	Fax (privato)
 fax number	common	it	Numero Fax
@@ -308,7 +306,6 @@ import from ldif, csv, or vcard	addressbook	it	Importa da LDIF, CSV, or vCard
 import from outlook	addressbook	it	Importa da Outlook
 import multiple vcard	addressbook	it	Importa Molteplici vCard
 import next set	addressbook	it	Import il prossimo set
-import_instructions	addressbook	it	In Netscape, apri la rubrica e seleziona <b>Esporta</b> dal menu <b>File</b>. Il file verrà esportato in formato LDIF.<p>O, in Outlook, seleziona la cartella Contatti , seleziona <b>Importa ed esporta...</b> dal menu <b>File</b> ed esporta i contatti nel formato testo separato da virgola (CSV). <p>O, in Palm Desktop 4.0 o superiore, apri l'agenda e seleziona <b>Esporta</b> dal menu <b>File</b>. Il file verrà esportato in formato vCard.
 importer's personal	addressbook	it	Personale dell'account importatore
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	it	Importa i contatti da file CSV. CSV sta per 'Comma Separated Values' ovvero valori separati da virgola. Nelle opzioni sarà possibile selezionare anche altri separatori.
 imports contacts into your addressbook from a vcard file.	addressbook	it	Importa contatti nella tua rubrica da un file vCard.
@@ -372,7 +369,6 @@ name of current user, all other contact fields are valid too	addressbook	it	Nome
 name, address	addressbook	it	Nome, Indirizzo
 name, email, phone	addressbook	it	Nome, e-mail, telefono
 new contact submitted by %1 at %2	addressbook	it	Nuovo contatto inviato da %1 alle %2
-new window opened to edit infolog for your selection	addressbook	it	Nuova finestra aperta per modificare la scheda di Attività
 next date	addressbook	it	Prossima data
 no categories selected	addressbook	it	Nessuna categoria selezionata
 no country selected	addressbook	it	Nessun paese selezionato
@@ -442,14 +438,10 @@ select a source address to be used in geolocation routing system	addressbook	it
 select a view	addressbook	it	Seleziona una vista
 select addressbook type	addressbook	it	Seleziona il tipo di rubrica
 select all	addressbook	it	Seleziona tutto
-select an action or addressbook to move to	addressbook	it	Seleziona una azione o una rubrica per lo spostamento
-select an action or addressbook to move to...	addressbook	it	Seleziona una azione o una rubrica per lo spostamento ...
 select an opened dialog	addressbook	it	Seleziona una finestra di dialogo aperta
 select migration type	admin	it	Seleziona tipo di migrazione
 select multiple contacts for a further action	addressbook	it	Seleziona contatti multipli per azioni ulteriori
 select phone number as prefered way of contact	addressbook	it	Seleziona il numero di telefono come modalità di contatto preferita
-select the type of conversion	addressbook	it	Seleziona il tipo di conversione
-select the type of conversion:	addressbook	it	Seleziona il tipo di conversione:
 select where you want to store / retrieve contacts	admin	it	Seleziona dove vuoi registrare / recuperare i contatti
 selected contacts	addressbook	it	Contatti selezionati
 send emailcopy to receiver	addressbook	it	Invia copia al destinatario

addressbook/lang/egw_pt-br.lang

@@ -216,7 +216,6 @@ extra	addressbook	pt-br	Extra
 extra encodings	addressbook	pt-br	Codificações extras
 failed to change %1 organisation member(s) (insufficent rights) !!!	addressbook	pt-br	Falha ao alterar %1 membro(s) da organização (direitos insuficientes)!
 favorite phone	addressbook	pt-br	Telefone favorito
-favorites	addressbook	pt-br	Favorito
 fax	addressbook	pt-br	Fax
 fax number	common	pt-br	Número do Fax
 field %1 has been added !	addressbook	pt-br	Campo %1 foi adicionado!
@@ -334,7 +333,6 @@ name of current user, all other contact fields are valid too	addressbook	pt-br	N
 name, address	addressbook	pt-br	Nome, Endereço
 name, email, phone	addressbook	pt-br	Nome, e-mail, telefone
 new contact submitted by %1 at %2	addressbook	pt-br	Novo contato informado por %1 em %2.
-new window opened to edit infolog for your selection	addressbook	pt-br	Nova janela aberta para editar sua seleção de Tarefas.
 next date	addressbook	pt-br	Próxima data
 no categories selected	addressbook	pt-br	nenhuma categoria selecionada
 no country selected	addressbook	pt-br	Nenhum país selecionado

addressbook/lang/egw_pt.lang

@@ -121,7 +121,6 @@ export from addressbook	addressbook	pt	Exportar do livro de endereços
 exports contacts from your addressbook into a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	pt	Exporta os contactos do livro de endereços para um ficheiro CSV. No separador de opções, também pode escolher outros separadores.
 extra	addressbook	pt	Extra
 favorite phone	addressbook	pt	Telefone favorito
-favorites	addressbook	pt	Favoritos
 fax	addressbook	pt	Fax
 fax number	common	pt	Número de fax
 field %1 has been added !	addressbook	pt	Campo %1 foi adicionado!
@@ -169,7 +168,6 @@ import from ldif, csv, or vcard	addressbook	pt	Importar de LDIF, CSV, ou vCard
 import from outlook	addressbook	pt	Importar do Outlook
 import multiple vcard	addressbook	pt	Importar vários vCard
 import next set	addressbook	pt	Importar o conjunto seguinte
-import_instructions	addressbook	pt	No Netscape, abra o Livro de endereços e seleccione <b>Exportar</b> do menu <b>Ficheiro</b>. O ficheiro exportado estará em formato LDIF.<p>No Outlook, seleccione a sua pasta de contactos, seleccione <br>Importar e Exportar...</b> do menu <b>Ficheiro</b> e exporte os seus contactos, separados por vírgulas, num ficheiro de texto (CSV).<br>No Palm Desktop 4.0 ou superior, visite o seu livro de endereços e seleccione <br>Exportar</b> do menu <b>Ficheiro</b>. O ficheiro exportado estará em formado vCard.
 importer's personal	addressbook	pt	Pessoal do importador
 imports contacts into your addressbook from a csv file. csv means 'comma separated values'. however in the options tab you can also choose other seperators.	addressbook	pt	Importa contactos para o livro de endereços a partir de um ficheiro CSV. No separador de opções, também pode escolher outros separadores.
 imports contacts into your addressbook from a vcard file.	addressbook	pt	Importa contactos para o seu livro de endereços a partir de um ficheiro vCard.

addressbook/templates/default/edit.xet

@@ -148,8 +148,7 @@
 			</columns>
 			<rows>
 				<row valign="top">
-                    <et2-tree-cat id="cat_id_tree" multiple="true" placeholder="Category"/>
-					<et2-select-cat  id="cat_id" width="100%" height="195" multiple="true" placeholder="Category"></et2-select-cat>
+					<et2-select-cat id="cat_id" multiple="true" placeholder="Category"></et2-select-cat>
 					<et2-description></et2-description>
 					<grid width="100%">
 						<columns>

addressbook/templates/default/images/accounts.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="m14 18h4v3h-4zm2 4h1l2 7-3 3-3-3 2-7zm8-14a8 8 0 0 1-8 8 8 8 0 0 1-8-8 8 8 0 0 1 8-8 8 8 0 0 1 8 8zm-4.4863 9.166c1.7e-4 1.2169 0.20298 5.982-1.0059 5.998 0.47857 1.5808 1.2001 3.7568 1.7578 4.7051 4.7904-0.2735 8.7344-0.88476 8.7344-0.88476l-3.25-8.1035s-2.7953-1.1474-6.2363-1.7148zm-7.0273 0.0234c-3.3306 0.57539-6.2363 1.6914-6.2363 1.6914l-3.25 8.1035s3.9208 0.6139 8.7344 0.88671c0.55783-0.94744 1.279-3.1254 1.7578-4.707-1.203-0.016-1.0079-4.7296-1.0059-5.9746z" fill="#62686a"/>
-</svg>

addressbook/templates/default/images/advanced-search.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path fill="#62686a" d="M11.813 9.56v2.204H9.231v2.698h2.582v2.583h2.699v-2.584h2.582v-2.697h-2.582V9.18h-2.699z"/><path d="m31.619 27.307-5.255-4.904c-.04-.037-.087-.054-.13-.083l-2.122-1.979a13.008 13.008 0 0 0 2.179-7.662C26.051 5.44 19.972-.232 12.716.007 5.457.247-.232 6.307.008 13.546c.24 7.237 6.318 12.91 13.577 12.67a13.07 13.07 0 0 0 6.176-1.783l2.504 2.338h.002l5.256 4.908a1.211 1.211 0 0 0 1.697-.056l2.458-2.624a1.196 1.196 0 0 0-.059-1.692zm-18.212-4.07C7.801 23.421 3.106 19.04 2.92 13.45 2.736 7.86 7.13 3.178 12.737 2.994c5.605-.185 10.302 4.196 10.487 9.787.184 5.59-4.21 10.27-9.817 10.455z" fill="#62686a"/><path fill="none" d="M14.958 29.125V54.75"/>
-</svg>

addressbook/templates/default/images/deleted.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="M22 12v13c0 .554-.446 1-1 1s-1-.446-1-1V12c0-.554.446-1 1-1s1 .446 1 1zm-5 0v13c0 .554-.446 1-1 1s-1-.446-1-1V12c0-.554.446-1 1-1s1 .446 1 1zm-5 0v13c0 .554-.446 1-1 1s-1-.446-1-1V12c0-.554.446-1 1-1s1 .446 1 1zM9.5 0C8.669 0 8 .669 8 1.5V5H3c-.831 0-1.5.669-1.5 1.5S2.169 8 3 8h1v21a3 3 0 0 0 3 3h18a3 3 0 0 0 3-3V8h1c.831 0 1.5-.669 1.5-1.5S29.831 5 29 5h-5V1.5c0-.831-.669-1.5-1.5-1.5zM11 3h10v2H11zM7 8h18v20a1 1 0 0 1-1 1H8a1 1 0 0 1-1-1z" fill="#62686a"/>
-</svg>

addressbook/templates/default/images/group.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="M16 0a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5zM7.895 2.053a4.21 4.21 0 1 0 0 8.421 4.211 4.211 0 0 0 2.71-1.03A6.96 6.96 0 0 1 9 5c0-.925.184-1.81.516-2.621a4.21 4.21 0 0 0-1.622-.326zm16.105 0a4.211 4.211 0 0 0-1.518.32c.333.813.517 1.7.517 2.627a6.96 6.96 0 0 1-1.648 4.492 4.21 4.21 0 0 0 2.648.983 4.21 4.21 0 1 0 0-8.422zM16 12c-2.498 0-5.528.15-7 1l1 8 3 1.951V31c.733.678 1.984 1 3 1s2.267-.322 3-1v-8.049L22 21l1-8c-1.473-.85-4.503-1-7-1zm-9.118.178C5.023 12.22 3.048 12.395 2 13l.841 6.736L5.37 21.38v6.78c.617.57 1.67.841 2.525.841s1.91-.27 2.527-.842V23.66l-2.29-1.49zm18.234.002-1.248 9.99-2.394 1.557v4.431c.617.571 1.67.842 2.525.842s1.908-.271 2.526-.842v-6.78l2.527-1.642.842-6.736c-1.028-.594-2.95-.774-4.778-.82z" fill="#62686a"/>
-</svg>

addressbook/templates/default/images/personal.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <path d="m16 12c-2.4973 0-5.5277 0.14994-7 1l1 8 3 1.9512v8.0488c0.73303 0.67797 1.9842 1 3 1s2.267-0.32203 3-1v-8.0488l3-1.9512 1-8c-1.4723-0.85006-4.5027-1-7-1zm5-7a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#62686a"/>
-</svg>

addressbook/templates/default/index.xet

@@ -23,6 +23,7 @@
 				<column width="50"/>
 				<column width="80" disabled="@no_event_column"/>
 				<column width="120"/>
+				<column width="120"/>
 			</columns>
 			<rows>
 				<row class="th">
@@ -99,9 +100,10 @@
 						<nextmatch-sortheader label="Created" id="contact_created" sortmode="DESC"/>
 						<nextmatch-sortheader label="Last modified" id="contact_modified" sortmode="DESC"/>
 					</et2-vbox>
+					<nextmatch-sortheader label="Username" id="account_lid" sortmode="ASC"/>
 				</row>
 				<row class="$row_cont[class] $row_cont[cat_id]" valign="top">
-					<et2-image  align="center" label="$row_cont[type_label]" src="$row_cont[type]" noLang="1"/>
+					<et2-image  align="center" label="$row_cont[type_label]" src="$row_cont[type]" noLang="1" style="font-size: 22px"/>
 					<et2-vbox  id="${row}[id]">
 						<et2-description  id="${row}[line1]" noLang="1"></et2-description>
 						<et2-description  id="${row}[line2]" noLang="1"></et2-description>
@@ -171,6 +173,7 @@
 						<et2-date-time  id="${row}[modified]" readonly="true" class="noBreak"></et2-date-time>
 						<et2-select-account  id="${row}[modifier]" readonly="true"></et2-select-account>
 					</et2-vbox>
+					<et2-description id="${row}[account_lid]"></et2-description>
 				</row>
 			</rows>
 		</grid>

addressbook/templates/default/mail_merge_dialog.xet

@@ -2,22 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="addressbook.mail_merge_dialog" template="" lang="" group="0" version="">
-		<grid>
-			<columns>
-				<column/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<et2-description  value="Do you want to send the message to all selected entries, WITHOUT further editing?"></et2-description>
-				</row>
-				<row>
-					<et2-hbox>
-						<et2-checkbox  id="infolog" label="Save as infolog"></et2-checkbox>
-						<et2-select  id="info_type"></et2-select>
-					</et2-hbox>
-				</row>
-			</rows>
-		</grid>
+        <et2-select id="info_type" emptyLabel="Save as infolog"></et2-select>
 	</template>
 </overlay>

admin/inc/class.admin_account.inc.php

@@ -69,6 +69,7 @@ class admin_account
 				$acl = new Acl($content['account_id']);
 				$acl->read_repository();
 				$account['anonymous'] = $acl->check('anonymous', 1, 'phpgwapi');
+				$account['hidden'] = $acl->check('hidden', 1, 'phpgwapi');
 				$account['changepassword'] = !$acl->check('nopasswordchange', 1, 'preferences');
 				$auth = new Api\Auth();
 				if (($account['account_lastpwd_change'] = $auth->getLastPwdChange($account['account_lid'])) === false)
@@ -116,7 +117,7 @@ class admin_account
 			// save old values to only trigger save, if one of the following values change (contact data get saved anyway)
 			$preserve = empty($content['id']) ? array() :
 				array('old_account' => array_intersect_key($account, array_flip(array(
-						'account_lid', 'account_status', 'account_groups', 'anonymous', 'changepassword',
+						'account_lid', 'account_status', 'account_groups', 'anonymous', 'hidden', 'changepassword',
 						'mustchangepassword', 'account_primary_group', 'homedirectory', 'loginshell',
 						'account_expires', 'account_firstname', 'account_lastname', 'account_email'))),
 						'deny_edit' => $deny_edit);
@@ -185,7 +186,7 @@ class admin_account
 			'account_groups',
 			// copy following fields to account
 			'account_lid',
-			'changepassword', 'anonymous', 'mustchangepassword',
+			'changepassword', 'anonymous', 'hidden', 'mustchangepassword',
 			'account_passwd', 'account_passwd_2',
 			'account_primary_group',
 			'account_expires', 'account_status',
@@ -215,6 +216,7 @@ class admin_account
 
 				case 'changepassword':	// boolean values: admin_cmd_edit_user understands '' as NOT set
 				case 'anonymous':
+				case 'hidden':
 				case 'mustchangepassword':
 					$account[$a_name] = (boolean)$content[$c_name];
 					break;

admin/inc/class.admin_categories.inc.php

@@ -128,7 +128,10 @@ class admin_categories
 				$readonlys['__ALL__'] = true;
 				$readonlys['button[cancel]'] = false;
 			}
-			$content['base_url'] = self::icon_url();
+			if (!empty($content['data']['icon']))
+			{
+				$content['data']['icon'] = preg_replace('/\.(png|svg|jpe?g|gif)$/i', '', $content['data']['icon']);
+			}
 		}
 		elseif ($content['button'] || $content['delete'])
 		{
@@ -258,12 +261,9 @@ class admin_categories
 		}
 		$content['msg'] = $msg;
 		if(!$content['appname']) $content['appname'] = $appname;
-		if($content['data']['icon'])
-		{
-			$content['icon_url'] = Api\Image::find('vfs',$content['data']['icon']) ?: self::icon_url($content['data']['icon']);
-		}
+		if (!$content['parent']) $content['parent'] = '';
 
-		$sel_options['icon'] = self::get_icons();
+		$sel_options['icon'] = self::get_icons($content['data']['icon']);
 		$sel_options['owner'] = array();
 
 		// User's category - add current value to be able to preserve owner
@@ -333,51 +333,61 @@ class admin_categories
 		),2);
 	}
 
-	/**
-	 * Return URL of an icon, or base url with trailing slash
-	 *
-	 * @param string $icon = '' filename
-	 * @return string url
-	 */
-	static function icon_url($icon='')
-	{
-		return $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$icon;
-	}
-
 	/**
 	 * Return icons from /api/images
 	 *
 	 * @return array filename => label
 	 */
-	static function get_icons()
+	static function get_icons(string $_icon=null)
 	{
-		$icons = array();
-		if (file_exists($image_dir=EGW_SERVER_ROOT.self::ICON_PATH) && ($dir = dir($image_dir)))
+		$stock_icon = false;
+		$icons = [];
+		foreach(Api\Image::map() as $app => $images)
 		{
-			$matches = null;
-			while(($file = $dir->read()))
+			if (!in_array($app, ['global', 'vfs'])) continue;
+
+			foreach($images as $image => $icon)
 			{
-				if (preg_match('/^(.*)\\.(png|gif|jpe?g)$/i',$file,$matches))
+				if ($app === 'vfs' || str_starts_with($image, 'images/'))
 				{
-					$icons[$file] = ucfirst($matches[1]);
+					if ($app !== 'vfs') $image = substr($image, 7);
+					$icons[] = ['value' => $image, 'label' => ucfirst($image), 'icon' => $icon];
+					if ($_icon === $image) $stock_icon = true;
 				}
 			}
-			$dir->close();
 		}
-
-		// Get custom icons
-		$map = Api\Image::map();
-		if(array_key_exists('vfs', $map))
+		// add arbitrary icons
+		if ($_icon && !$stock_icon && ($icon = Api\Image::find('vfs', $_icon)))
 		{
-			foreach($map['vfs'] as $name => $path)
-			{
-				$icons[$name] = $name;
-			}
+			$icons[] = ['value' => $_icon, 'label' => ucfirst($_icon), 'icon' => $icon];
 		}
-		asort($icons);
+		uasort($icons, static function ($a, $b) {
+			return strnatcasecmp($a['label'], $b['label']);
+		});
 		return $icons;
 	}
 
+	/**
+	 * Search bootstrap icons
+	 *
+	 * @param string $pattern
+	 * @throws Api\Json\Exception
+	 */
+	public function ajax_search(string $pattern)
+	{
+		$pattern = strtolower($pattern);
+		$icons = [];
+		foreach(Api\Image::map()['bootstrap'] ?? [] as $image => $icon)
+		{
+			if (strpos($image, $pattern) !== false)
+			{
+				$icons[] = ['value' => $image, 'label' => $image, 'icon' => $icon];
+			}
+			if (count($icons) > 100) break;
+		}
+		Api\Json\Response::get()->data($icons);
+	}
+
 	/**
 	 * query rows for the nextmatch widget
 	 *
@@ -430,7 +440,12 @@ class admin_categories
 				$row['level_spacer'] = str_repeat('    ',$row['level']);
 			}
 
-			if ($row['data']['icon']) $row['icon_url'] = Api\Image::find('vfs',$row['data']['icon']) ?: self::icon_url($row['data']['icon']);
+			if (!empty($row['data']['icon']))
+			{
+				$row['data']['icon'] = preg_replace('/\.(png|svg|jpe?g|gif)$/i', '', $row['data']['icon']);
+				$row['icon_url'] = Api\Image::find('', 'images/'.$row['data']['icon']) ?:
+					Api\Image::find('vfs', $row['data']['icon']);
+			}
 
 			$row['subs'] = $row['children'] ? count($row['children']) : 0;
 

admin/inc/class.admin_cmd_edit_user.inc.php

@@ -107,6 +107,7 @@ class admin_cmd_edit_user extends admin_cmd_change_pw
 		// automatic set anonymous flag for username "anonymous", to not allow to create anonymous user without it
 		$data['anonymous'] = ($data['account_lid'] ?: admin_cmd::$accounts->id2name($this->account)) === 'anonymous' ?
 			true : admin_cmd::parse_boolean($data['anonymous'],$this->account ? null : false);
+		$data['hidden'] = admin_cmd::parse_boolean($data['hidden'],null);
 
 		if ($data['mustchangepassword'] && $data['changepassword'])
 		{
@@ -187,6 +188,18 @@ class admin_cmd_edit_user extends admin_cmd_change_pw
 				admin_cmd::$acl->delete_repository('phpgwapi','anonymous',$data['account_id']);
 			}
 		}
+		if (isset($data['hidden']))
+		{
+			admin_cmd::_instanciate_acl();
+			if ($data['hidden'])
+			{
+				admin_cmd::$acl->add_repository('phpgwapi','hidden',$data['account_id'],1);
+			}
+			else
+			{
+				admin_cmd::$acl->delete_repository('phpgwapi','hidden',$data['account_id']);
+			}
+		}
 		if (!is_null($data['changepassword']))
 		{
 			if (!$data['changepassword'])
@@ -274,4 +287,4 @@ class admin_cmd_edit_user extends admin_cmd_change_pw
 		}
 		return admin_cmd::parse_date($str);
 	}
-}
+}

admin/inc/class.admin_egw_group_record.inc.php

@@ -37,10 +37,15 @@ class admin_egw_group_record implements importexport_iface_egw_record
 	public function __construct( $_identifier='' ) {
 		if(is_array($_identifier)) {
 			$this->identifier = $_identifier['account_id'];
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 		}
-		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
+		if($this->identifier)
+		{
+			$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
+		}
 	}
 
 	/**

admin/inc/class.admin_egw_user_record.inc.php

@@ -41,7 +41,10 @@ class admin_egw_user_record implements importexport_iface_egw_record
 		} else {
 			$this->identifier = $_identifier;
 		}
-		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
+		if($this->identifier)
+		{
+			$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
+		}
 	}
 
 	/**

admin/lang/egw_bg.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	bg	%1 токен %2.
 %1 user %2	admin	bg	%1 потребител %2
 (de)activate mail accounts	admin	bg	(де)активиране на имейл акаунти
+(default no, leave it off if you dont use it)	admin	bg	По подразбиране = Не, оставете го изключено, ако не го използвате
 (no subject)	admin	bg	(без тема)
 -  type	admin	bg	- вид
 1 year	admin	bg	1 година
@@ -132,7 +133,9 @@ group has been added	common	bg	Групата е добавена.
 group has been deleted	common	bg	Групата е била изтрита.
 group has been updated	common	bg	Групата е актуализирана.
 group hierarchy	admin	bg	Йерархия на групите
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	bg	Колко записа трябва да могат да експортират неадминистраторите. Празно = няма ограничение, Не = няма експорт
 html/plaintext	admin	bg	HTML/текст
+if different from email address	admin	bg	Ако е различен от имейл адреса
 internal name max. 64 chars	admin	bg	Вътрешно име макс. 64 символа
 invalid format, must end in a group of digits e.g. %1 or %2	admin	bg	Невалиден формат, трябва да завършва с група цифри, например %1 или %2
 last updated	admin	bg	Последна актуализация
@@ -141,6 +144,7 @@ manage mapping	admin	bg	Управление на съответствията
 modified	admin	bg	Редактирано
 month	admin	bg	Месец
 name of tab to create and show field in	admin	bg	Име на раздела, в който се създава и показва полето
+no limit	admin	bg	Без ограничение
 no matches found	admin	bg	Не са открити съвпадения
 oauth authentiction	admin	bg	Удостоверяване на OAuth
 offer to installing egroupware as mail-handler	admin	bg	Оферта за инсталиране на EGroupware като mail-handler
@@ -158,6 +162,7 @@ requested	admin	bg	Заявена
 select accounts for which the custom field should be visible	admin	bg	Изберете сметки, за които потребителското поле трябва да бъде само за четене.
 serial number	admin	bg	Сериен номер
 show groups in container based on	admin	bg	Показване на групите в контейнера въз основа на
+smtp only: to create only an smtp account	admin	bg	Създаване на акаунт само за SMTP без IMAP
 start	admin	bg	Старт
 translation	admin	bg	Превод
 two weeks	admin	bg	две седмици

admin/lang/egw_ca.lang

@@ -396,13 +396,7 @@ submit changes	admin	ca	Enviar canvis
 submit the search string	admin	ca	Enviar la cadena de recerca
 subtype	admin	ca	Subtipus
 switch it off, if users are randomly thrown out	admin	ca	apaga-ho, si els usuaris són rebutjats aleatoriament
-template selection	admin	ca	Selecció de plantilla
-text entry	admin	ca	Entrada de text
-that application name already exists.	admin	ca	Aquest nom d'aplicació ja existeix.
-that application order must be a number.	admin	ca	L'ordre de la aplicació ha de ser un nombre.
 that loginid has already been taken	admin	ca	Aquest nom d'usuari ja es fa servir
-that name has been used already	admin	ca	Aquest nom ja s'ha fet servir
-that server name has been used already !	admin	ca	Aquest nom de servidor ja s'ha fet servir
 the api is current	admin	ca	L'API ja està actualitzada
 the api requires an upgrade	admin	ca	L'API necessita actualitzacions
 the groups must include the primary group	admin	ca	Els grups han d'incloure el grup principal

admin/lang/egw_cs.lang

@@ -364,6 +364,7 @@ html/plaintext	admin	cs	HTML/Text
 icon	admin	cs	Ikona
 identity deleted	admin	cs	Identita odstraněna.
 idle	admin	cs	Nečinný
+if different from email address	admin	cs	Pokud se liší od e-mailové adresy
 if no acl records for user or any group the user is a member of	admin	cs	Pokud pro uživatele nebo žádnou ze skupin které je členem neexistují ACL záznamy
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	cs	Pokud používáte LDAP, chcete spravovat atributy pro domovský adresář a login shell?
 if using ssl or tls, you must have the php openssl extension loaded.	admin	cs	Pokud chcete používat SSL nebo TLS, musíte mít nahráno openssl rozšíření PHP.
@@ -479,6 +480,7 @@ no alternate email address	admin	cs	Bez alternativní e-mailové adresy
 no encryption	admin	cs	Bez šifrování
 no forwarding email address	admin	cs	Bez e-mailové adresy pro přeposílání
 no jobs in the database !!!	admin	cs	Žádné úlohy v databázi!
+no limit	admin	cs	Bez omezení
 no login history exists for this user	admin	cs	Pro tohoto uživatele neexistuje historie přihlášení!
 no matches found	admin	cs	Nenalezeny žádné záznamy!
 no message returned.	admin	cs	Žádná zpráva se nevrátila
@@ -608,6 +610,7 @@ site	admin	cs	Web
 skip imap	admin	cs	Vynechat IMAP
 skipping imap configuration!	admin	cs	Přeskočení konfigurace IMAP!
 smtp authentication	admin	cs	SMTP autentikace
+smtp only: to create only an smtp account	admin	cs	Vytvoření účtu pouze SMTP bez IMAP
 smtp options	admin	cs	Volby SMTP
 smtp server	admin	cs	Server SMTP
 smtp server name	admin	cs	Jméno SMTP serveru
@@ -638,14 +641,8 @@ submit to egroupware.org	admin	cs	Odeslat na egroupware.org
 subtype	admin	cs	Podtyp
 success	admin	cs	Podařilo se
 switch it off, if users are randomly thrown out	admin	cs	Vypněte, pokud jsou uživatelé náhodně vyhazováni
-template selection	admin	cs	Výběr šablony
 templates	admin	cs	Šablony
-text entry	admin	cs	Textový záznam
-that application name already exists.	admin	cs	Takové jméno aplikace již existuje.
-that application order must be a number.	admin	cs	Pořadí aplikace musí být číslo.
 that loginid has already been taken	admin	cs	Takové přihlašovací id už bylo použito.
-that name has been used already	admin	cs	Takový název už byl použit.
-that server name has been used already !	admin	cs	Takový název serveru už byl použit!
 the api is current	admin	cs	API je aktuální
 the api requires an upgrade	admin	cs	API vyžaduje aktualizaci
 the cumulated and anonymised data will be publically available:	admin	cs	Souhrnné anonymní údaje budou veřejně k dispozici na:

admin/lang/egw_da.lang

@@ -14,6 +14,7 @@
 %1 successful	admin	da	%1 vellykket
 %1 token %2.	admin	da	%1 token %2.
 (de)activate mail accounts	admin	da	(de)Aktiver mailkonti
+(default no, leave it off if you dont use it)	admin	da	Standard = Nej, lad den være slået fra, hvis du ikke bruger den
 (no subject)	admin	da	(ingen emne)
 1 year	admin	da	1 år
 2 month	admin	da	2 måneder
@@ -246,8 +247,10 @@ home screen message	admin	da	Startside besked
 host information	admin	da	Host information
 hour<br>(0-23)	admin	da	Timer<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	da	Hvor mange dage skal en notits blive i adgangsloggen, før den slettes (standard 90)
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	da	Hvor mange poster skal ikke-administratorer kunne eksportere? Tom = ingen grænse, Nej = ingen eksport
 how many minutes should an account or ip be blocked (default 1) ?	admin	da	Hvor mange minutter skal en konto eller IP låses (standard 30)
 icon	admin	da	Ikon
+if different from email address	admin	da	Hvis forskellig fra e-mailadresse
 if no acl records for user or any group the user is a member of	admin	da	Hvis ingen ACL journal for en bruger eller gruppe som brugeren er medlem af
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	da	Hvis LDAP bruges, vil du håndtere hjemmemapper og loginshells atributter?
 imap admin password	admin	da	IMAP admin adgangskode
@@ -331,6 +334,7 @@ no algorithms available	admin	da	Ingen algoritmer tilgængelig!
 no alternate email address	admin	da	Ingen alternativ e-mail adresse
 no forwarding email address	admin	da	Ingen viderestillet e-mail adresse
 no jobs in the database !!!	admin	da	Ingen jobs i databasen!
+no limit	admin	da	Ingen grænse
 no login history exists for this user	admin	da	Nogen login historie findes for denne bruger!
 no matches found	admin	da	Ingen resultater fundet!
 no permission to add groups	admin	da	Ingen rettigheder til at tilføje grupper!
@@ -415,6 +419,7 @@ sieve server port	admin	da	Sieve server port
 sieve settings	admin	da	Sieve indstillinger
 site	admin	da	Site
 smtp authentication	admin	da	SMTP-godkendelse
+smtp only: to create only an smtp account	admin	da	Opret kun SMTP-konto uden IMAP
 smtp options	admin	da	SMTP-indstillinger
 smtp server	admin	da	SMTP-server
 smtp server name	admin	da	SMTP server navn
@@ -434,13 +439,7 @@ start	admin	da	Start
 start testjob!	admin	da	Start testjob
 submit changes	admin	da	Gem ændringerne
 submit the search string	admin	da	Send søgningen
-template selection	admin	da	Vælg skabelon
-text entry	admin	da	Tekst indtastning
-that application name already exists.	admin	da	Applikations navnet findes allerede.
-that application order must be a number.	admin	da	Applikations rækkefølgenen skal være et nummer.
 that loginid has already been taken	admin	da	Det loginid er allerede brugt
-that name has been used already	admin	da	Det navn er allerede brugt
-that server name has been used already !	admin	da	Det servernavn er allerede brugt!
 the api is current	admin	da	API'en er den nyeste version
 the api requires an upgrade	admin	da	API'en behøver en opgradering
 the groups must include the primary group	admin	da	Grupperne skal indeholde en primær gruppe.

admin/lang/egw_de.lang

@@ -23,7 +23,6 @@
 %1 user %2	admin	de	%1 Benutzer %2
 (de)activate mail accounts	admin	de	E-Mail-Konten (de)aktivieren
 (default no, leave it off if you dont use it)	admin	de	(Vorgabe = Nein. Ausgeschaltet lassen, wenn nicht benutzt)
-(imapclass must support this feature by querying the corresponding config value and pass it as defaultquota to the imapserver)	admin	de	(Die IMAP Klasse muss dieses Verfahren unterstützen indem es den entsprechenden Konfigurationswert der Instanz ausliest und als Default Quota an den IMAP Server meldet.)
 (no subject)	admin	de	(Kein Betreff)
 -  type	admin	de	-Typ
 1 year	admin	de	1 Jahr
@@ -122,6 +121,7 @@ anonymous user	admin	de	Anonymer Benutzer
 anonymous user (not shown in list sessions)	admin	de	Anonymer Benutzer (wird bei 'Sitzungen anzeigen' nicht angezeigt).
 anonymous user does not exist!	admin	de	Anonymer Benutzer existiert NICHT!
 anonymous user has no run-rights for the application!	admin	de	Anonymer Benutzer hat KEINE Ausführungsrechte für die Anwendung!
+anonymous user. not shown in list sessions.	admin	de	Anonymer Benutzer. Wird nicht in der Liste der Sitzungen angezeigt.
 any application	admin	de	Jede Anwendung
 any group	admin	de	Jede Gruppe
 any user	admin	de	Jeder Benutzer
@@ -224,8 +224,8 @@ connection dropped by imap server.	admin	de	Verbindung von IMAP-Server beendet.
 connection is not secure! everyone can read eg. your credentials.	admin	de	Die Verbindung ist NICHT sicher! Jeder kann z. B. Ihr Passwort lesen.
 container	admin	de	Container
 continue	admin	de	Weiter
-cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)	admin	de	Cookie Domain<br>(Vorgabe 'leer' bedeutet den kompletten Domainnamen, für SiteMgr erlaubt z.B. ".domain.com" das gleiche Cookie für egw.domain.com und www.domain.com zu verwenden).
-cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	de	Cookie Pfad. Ermöglicht mehrere EGroupware-Sitzungen mit unterschiedlichen Verzeichnissen..
+cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)	admin	de	Cookie-Domain. (Vorgabe 'leer' bedeutet den kompletten Domainnamen, für SiteMgr erlaubt z.B. ".domain.com" das gleiche Cookie für egw.domain.com und www.domain.com zu verwenden).
+cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	de	Cookie-Pfad. Ermöglicht mehrere EGroupware-Sitzungen mit unterschiedlichen Verzeichnissen
 copy of	admin	de	Kopie von
 could not append message:	admin	de	Diese E-Mail lässt sich nicht anzeigen:
 could not complete request. reason given: %s	admin	de	Konnte Anfrage nicht beenden. Grund: %s
@@ -826,7 +826,7 @@ site	admin	de	Site
 skip imap	admin	de	IMAP auslassen
 skipping imap configuration!	admin	de	IMAP-Konfiguration ausgelassen!
 smtp authentication	admin	de	SMTP-Anmeldung
-smtp only: to create only an smtp account	admin	de	SMTP-only-Konto ohne IMAP anlegen
+smtp only: to create only an smtp account	admin	de	SMTP only: nur ein SMTP Konto anzulegen
 smtp options	admin	de	SMTP-Optionen
 smtp server	admin	de	SMTP-Server
 smtp server name	admin	de	SMTP-Server Name
@@ -861,14 +861,8 @@ successfull, but no refresh-token received!	admin	de	Erfolgreich, aber keine Ref
 switch back to standard identity to save account.	admin	de	Kehren Sie zur Standard-Identität zurück um das Konto zu speichern.
 switch back to standard identity to save other account data.	admin	de	Kehren Sie zur Standard-Identität zurück um andere Kontendaten zu speichern.
 switch it off, if users are randomly thrown out	admin	de	Schalten Sie es aus, wenn Benutzer immer wieder zufällig rausgeworfen werden
-template selection	admin	de	Auswahl der Benutzeroberfläche
 templates	admin	de	Vorlagen
-text entry	admin	de	Texteingabe
-that application name already exists.	admin	de	Diesen Anwendungsname gibt es bereits.
-that application order must be a number.	admin	de	Die Anwendungsreihenfolge muss eine Zahl sein.
 that loginid has already been taken	admin	de	Diese Login-ID ist bereits vergeben.
-that name has been used already	admin	de	Dieser Name wird bereits verwendet.
-that server name has been used already !	admin	de	Dieser Server-Name wird bereits verwendet!
 the api is current	admin	de	Das API ist aktuell
 the api requires an upgrade	admin	de	Das API benötigt ein Upgrade
 the cumulated and anonymised data will be publically available:	admin	de	Die kumulierten und anonymisierten Daten werden öffentlich verfügbar sein:
@@ -958,6 +952,7 @@ user csv import	admin	de	CSV-Import von Benutzern
 user data	common	de	Benutzerdaten
 user for smtp-authentication (leave it empty if no auth required)	admin	de	Benutzer für SMTP-Authentifizierung (leer lassen falls keine Authentifizierung nötig).
 user groups	admin	de	Benutzergruppen
+user hidden vom non-admins.	admin	de	Benutzer verborgen von nicht Administratoren.
 user-agent	admin	de	Browser
 userdata	admin	de	Benutzerkonto
 userid@domain eg. u1234@domain	admin	de	UserId@domain z.B. u1234@domain

admin/lang/egw_el.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	el	%1 token %2.
 %1 user %2	admin	el	%1 χρήστης %2
 (de)activate mail accounts	admin	el	(απο)ενεργοποίηση λογαριασμών αλληλογραφίας
+(default no, leave it off if you dont use it)	admin	el	Προεπιλογή = Όχι, αφήστε το απενεργοποιημένο αν δεν το χρησιμοποιείτε
 (no subject)	admin	el	(κανένα θέμα)
 -  type	admin	el	- τύπος
 1 year	admin	el	1 έτος
@@ -281,11 +282,13 @@ host information	admin	el	Πληροφορία
 hostname or ip	admin	el	Όνομα κεντρικού υπολογιστή ή IP
 hour<br>(0-23)	admin	el	Ωρα<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	el	Πόσες ημέρες πρέπει οι εισαγωγές να μένουν στην καταγραφή πρόσβασης, πρίν σβυστούν(προκαθορισμένο 90)
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	el	Πόσες καταχωρήσεις θα πρέπει να μπορούν να εξάγουν οι μη διαχειριστές. Empty = κανένα όριο, No = καμία εξαγωγή
 how many minutes should an account or ip be blocked (default 1) ?	admin	el	Πόσα λεπτά πρέπει ένας λογαριασμός ή IP να μπλοκαρίζεται (προκαθορισμένο 30)
 how should email addresses for new users be constructed?	admin	el	Πως θέλετε οι διευθύνσεις Email για τους νεόυς χρήστες να κατασκευάζονται
 html/plaintext	admin	el	HTML/text
 icon	admin	el	Εικόνα
 idle	admin	el	Aδρανής
+if different from email address	admin	el	Εάν είναι διαφορετικό από τη διεύθυνση ηλεκτρονικού ταχυδρομείου
 if no acl records for user or any group the user is a member of	admin	el	αν καμία εγγραφή ACL για χρήστη ή όποιας ομάδας είναι μέλος του
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	el	Αν χρησημοποιήτε LDAP, θέλετε να διαχειριστείτε τον αρχικό κατάλογο και τα χαρακτηριστικά κέλυφους εισαγωγής;
 if using ssl or tls, you must have the php openssl extension loaded.	admin	el	Αν χρησιμοποιείται SSL ή TLS, πρέπει να έχετε την PHP openssl επέκταση φορτωμένη.
@@ -359,6 +362,7 @@ no algorithms available	admin	el	δεν υπάρχουν διαθέσιμοι α
 no alternate email address	admin	el	δεν υπάρχει εναλλακτική διεύθυνση email
 no encryption	admin	el	Καμία κρυπτογράφηση
 no jobs in the database !!!	admin	el	Δέν υπάρχουν ενέργειες στην βάση δεδομένων!
+no limit	admin	el	Κανένα όριο
 no login history exists for this user	admin	el	Δεν υπάρχει ιστορικό εισόδου γι'αυτόν τον χρήστη!
 no matches found	admin	el	Δέν βρέθηκαν όμοια!
 no message returned.	admin	el	Δεν επεστράφη κάποιο μήνυμα
@@ -444,6 +448,7 @@ show phpinfo()	admin	el	Εμφάνηση phpinfo()
 show session ip address	admin	el	Εμφάνηση διεύθυνσης περιόδων IP
 sieve settings	admin	el	Ρυθμίσεις Sieve
 site	admin	el	Ιστιοσελίδα
+smtp only: to create only an smtp account	admin	el	Δημιουργία λογαριασμού μόνο SMTP χωρίς IMAP
 smtp settings	admin	el	Ρυθμίσεις SMTP
 soap	admin	el	SOAP
 sorry, that group name has already been taken.	admin	el	Συγνώμη, αυτό το όνομα ομάδας υπάρχει ήδη
@@ -460,13 +465,7 @@ submit changes	admin	el	Υποβολή Αλλαγών
 submit the search string	admin	el	Υποβολή του αλφαριθμητικού εύρεσης
 subtype	admin	el	Υποτύπος
 switch it off, if users are randomly thrown out	admin	el	απενεργοποίηση, αν οι χρήστες "πετάγονται έξω" τυχαία
-template selection	admin	el	Επιλογή φόρμας
-text entry	admin	el	Είσοδος κειμένου
-that application name already exists.	admin	el	Το όνομα της εφαρμογής ισχύει ήδη.
-that application order must be a number.	admin	el	Αυτή η σειρά εφαρμογής πρέπει να είναι αριθμός.
 that loginid has already been taken	admin	el	Αυτή η Ταυτότητα εισαγωγής είναι καταχωρημένη απο άλλον.
-that name has been used already	admin	el	Αυτό το όνομα χρησιμοποιήται ήδη.
-that server name has been used already !	admin	el	Το όνομα του server χρησιμοποιήται ήδη!
 the api is current	admin	el	Το API χρησιμοποιήται αυτη τη στιγμή
 the api requires an upgrade	admin	el	Το API απαιτεί αναβάθμηση
 the groups must include the primary group	admin	el	Οι ομάδες πρέπει να συμπεριλαμβάνουν την αρχική ομάδα.

admin/lang/egw_en.lang

@@ -22,8 +22,7 @@
 %1 token %2.	admin	en	%1 token %2.
 %1 user %2	admin	en	%1 user %2
 (de)activate mail accounts	admin	en	(de)Activate mail accounts
-(default no, leave it off if you dont use it)	admin	en	Default = No, leave it off if you dont use it
-(imapclass must support this feature by querying the corresponding config value and pass it as defaultquota to the imapserver)	admin	en	(imapclass must support this feature by querying the corresponding config value and pass it as defaultquota to the IMAP server)
+(default no, leave it off if you dont use it)	admin	en	Default = No, leave it off if you don't use it
 (no subject)	admin	en	(no subject)
 -  type	admin	en	- type
 1 year	admin	en	1 year
@@ -122,6 +121,7 @@ anonymous user	admin	en	Anonymous user
 anonymous user (not shown in list sessions)	admin	en	Anonymous user. Not shown in sessions list.
 anonymous user does not exist!	admin	en	Anonymous user does NOT exist!
 anonymous user has no run-rights for the application!	admin	en	Anonymous user has NO run-rights for the application!
+anonymous user. not shown in list sessions.	admin	en	Anonymous user. Not shown in list sessions.
 any application	admin	en	Any application
 any group	admin	en	Any group
 any user	admin	en	Any user
@@ -225,7 +225,7 @@ connection is not secure! everyone can read eg. your credentials.	admin	en	Conne
 container	admin	en	Container
 continue	admin	en	Continue
 cookie domain (default empty means use full domain name, for sitemgr eg. ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com)	admin	en	Cookie domain. Default empty uses full domain name. E.g. in Site Manager ".domain.com" allows to use the same cookie for egw.domain.com and www.domain.com.
-cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	en	Cookie path. Allows multiple EGroupware sessions with different directories.
+cookie path (allows multiple egw sessions with different directories, has problemes with sitemgr!)	admin	en	Cookie path. Allows multiple EGroupware sessions with different directories
 copy of	admin	en	Copy of
 could not append message:	admin	en	Could not append Message:
 could not complete request. reason given: %s	admin	en	Could not complete request. %s
@@ -861,14 +861,8 @@ successfull, but no refresh-token received!	admin	en	Successfull, but NO refresh
 switch back to standard identity to save account.	admin	en	Switch back to standard identity to save account.
 switch back to standard identity to save other account data.	admin	en	Switch back to standard identity to save other account data.
 switch it off, if users are randomly thrown out	admin	en	Switch it off, if users are randomly logged out
-template selection	admin	en	Template selection
 templates	admin	en	Templates
-text entry	admin	en	Text entry
-that application name already exists.	admin	en	That application name already exists.
-that application order must be a number.	admin	en	That application order must be a number.
 that loginid has already been taken	admin	en	That login ID has already been taken.
-that name has been used already	admin	en	That name has been used already.
-that server name has been used already !	admin	en	That server name has been used already!
 the api is current	admin	en	The API is current
 the api requires an upgrade	admin	en	The API requires an upgrade
 the cumulated and anonymised data will be publically available:	admin	en	The accumulated and anonymous data will be publicly available:
@@ -958,6 +952,7 @@ user csv import	admin	en	User CSV import
 user data	common	en	User data
 user for smtp-authentication (leave it empty if no auth required)	admin	en	User for SMTP authentication. Leave it empty if no authentication is required.
 user groups	admin	en	User groups
+user hidden vom non-admins.	admin	en	User hidden vom non-admins.
 user-agent	admin	en	User-Agent
 userdata	admin	en	User data
 userid@domain eg. u1234@domain	admin	en	UserId@domain eg. u1234@domain

admin/lang/egw_es-es.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	es-es	%1 token %2.
 %1 user %2	admin	es-es	%1 usuario %2
 (de)activate mail accounts	admin	es-es	(des)activar cuentas de correo
+(default no, leave it off if you dont use it)	admin	es-es	Por defecto = No, déjelo desactivado si no lo utiliza
 (no subject)	admin	es-es	(Sin asunto)
 -  type	admin	es-es	- tipo
 1 year	admin	es-es	1 año
@@ -490,7 +491,7 @@ hostname or ip	admin	es-es	Nombre de host o IP
 hour<br>(0-23)	admin	es-es	Hora<br>(0-23)
 how big should thumbnails for linked images be (maximum in pixels) ?	admin	es-es	Qué tamaño deben tener las miniaturas para las imágenes vinculadas (máximo en pixels)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	es-es	Cuántos días deben permanecer las entradas en el registro de acceso, antes de borrarlas (por defecto, 90)
-how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	es-es	Cuántas entradas deben poder exportar los usuarios que no son administradores (vacío=sin límite, no=no exportan)
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	es-es	Cuántas entradas deben poder exportar los usuarios que no son administradores (Vacío=sin límite, No=no exportan)
 how many minutes should an account or ip be blocked (default 1) ?	admin	es-es	Cuántos minutos debe permanecer bloqueada una cuenta o una IP (por defecto, 30)
 how should email addresses for new users be constructed?	admin	es-es	Cómo deben construirse las direcciones para los usuarios nuevos
 how username get constructed	admin	es-es	Cómo se construye el nombre de usuario
@@ -639,6 +640,7 @@ no default account found!	admin	es-es	¡No se encontró ninguna cuenta predeterm
 no encryption	admin	es-es	Sin cifrar
 no forwarding email address	admin	es-es	Sin dirección de correo para reenviar
 no jobs in the database !!!	admin	es-es	¡No hay trabajos en la base de datos!
+no limit	admin	es-es	Sin límite
 no login history exists for this user	admin	es-es	¡No existen registros de acceso para este usuario!
 no matches found	admin	es-es	¡No se encontraron resultados!
 no message returned.	admin	es-es	No se devolvió ningún mensaje
@@ -823,6 +825,7 @@ site	admin	es-es	Sitio
 skip imap	admin	es-es	Omitir IMAP
 skipping imap configuration!	admin	es-es	¡Omitiendo la configuración de IMAP!
 smtp authentication	admin	es-es	Identificación SMTP
+smtp only: to create only an smtp account	admin	es-es	Crear cuenta sólo SMTP sin IMAP
 smtp options	admin	es-es	Opciones SMTP
 smtp server	admin	es-es	Servidor SMTP
 smtp server name	admin	es-es	Nombre del servidor SMTP
@@ -857,14 +860,8 @@ successfull, but no refresh-token received!	admin	es-es	Con éxito, ¡pero NO se
 switch back to standard identity to save account.	admin	es-es	Vuelva a la identidad estándar para guardar la cuenta.
 switch back to standard identity to save other account data.	admin	es-es	Vuelva a la identidad estándar para guardar otros datos de la cuenta.
 switch it off, if users are randomly thrown out	admin	es-es	Desactivarlo si a los usuarios se les cierra la sesión aleatoriamente
-template selection	admin	es-es	Selección de plantilla
 templates	admin	es-es	Plantillas
-text entry	admin	es-es	Entrada de texto
-that application name already exists.	admin	es-es	Ese nombre de aplicación ya existe.
-that application order must be a number.	admin	es-es	El orden de la aplicación debe ser un número.
 that loginid has already been taken	admin	es-es	Ese nombre de usuario ya está siendo utilizado.
-that name has been used already	admin	es-es	Ese nombre ya ha sido usado.
-that server name has been used already !	admin	es-es	¡Ese nombre de servidor ya ha sido usado!
 the api is current	admin	es-es	La API está al día
 the api requires an upgrade	admin	es-es	La API requiere ser actualizada
 the cumulated and anonymised data will be publically available:	admin	es-es	Los datos acumulados y anónimos estarán disponibles públicamente:

admin/lang/egw_et.lang

@@ -13,6 +13,7 @@
 %1 successful	admin	et	%1 edukas
 %1 token %2.	admin	et	%1 sümbol %2.
 (de)activate mail accounts	admin	et	(de)Aktiveerige postikontod
+(default no, leave it off if you dont use it)	admin	et	Vaikimisi = Ei, jätke see välja, kui te seda ei kasuta.
 1 year	admin	et	1 aasta
 2 month	admin	et	2 kuud
 2 weeks	admin	et	2 nädalat
@@ -178,9 +179,11 @@ group name	admin	et	Grupi Nimi
 hide php information	admin	et	Peida PHP informatsioon
 home directory	admin	et	Kodu kataloog
 host information	admin	et	Hosti informatsioon
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	et	Kui palju kirjeid peaksid mitte-adminid saama eksportida. Tühi = piirangut ei ole, Ei = ei saa eksportida.
 how many minutes should an account or ip be blocked (default 1) ?	admin	et	Mitu minutit konto või IP blokeeritakse (vaikimisi 30)?
 how should email addresses for new users be constructed?	admin	et	Kuidas EMail aadress uute kasutajatejaoks konstrueeritakse?
 icon	admin	et	Ikoon
+if different from email address	admin	et	Kui erineb e-posti aadressist
 imap admin password	admin	et	IMAP admin parool
 imap admin user	admin	et	IMAP admin kasutaja
 imap server	admin	et	IMAP Server
@@ -225,6 +228,7 @@ new name	admin	et	Uus nimi
 new password [ leave blank for no change ]	admin	et	Uus parool (Jäta tühjaks kui ei soovi muuta)
 no alternate email address	admin	et	Pole alternatiivset email aadressi
 no encryption	admin	et	Ilna krüpteeringutta
+no limit	admin	et	Piirangut ei ole
 no login history exists for this user	admin	et	Pole sisselogimise ajalugu sellel kasutajal
 no matches found	admin	et	Sobivaid ei leitud!
 no permission to add groups	admin	et	Pole õigusi gruppide lisamiseks!
@@ -275,6 +279,7 @@ show session ip address	admin	et	Näita sessiooni IP aadressi
 sieve server port	admin	et	Sieve serveri port
 sieve settings	admin	et	Sieve setingud
 site	admin	et	Sait
+smtp only: to create only an smtp account	admin	et	Ainult SMTP-konto loomine ilma IMAPita
 smtp server name	admin	et	SMTP serveri nimi
 smtp settings	admin	et	SMTP setingud
 smtp-server port	admin	et	SMTP serveri port
@@ -282,11 +287,7 @@ sorry, that group name has already been taken.	admin	et	Vabandust, see grupinimi
 ssl	admin	et	SSL
 start	admin	et	Start
 submit changes	admin	et	Salvesta Muudatused
-text entry	admin	et	Järgmine Kirje
-that application name already exists.	admin	et	See rakenduse nimi juba eksisteerib.
 that loginid has already been taken	admin	et	See logimis-ID on juba võetud.
-that name has been used already	admin	et	See nimi on juba kasutusel.
-that server name has been used already !	admin	et	See serveri nimi on juba kasutusel!
 the api is current	admin	et	API on kaasaegne
 the api requires an upgrade	admin	et	API vajab uuendamist
 the login and password can not be the same	admin	et	Kasutajanimi ja parool ei tohi olla samad.

admin/lang/egw_eu.lang

@@ -297,13 +297,7 @@ start testjob!	admin	eu	Froga lana hasi
 submit changes	admin	eu	Aldaketak bidali
 submit the search string	admin	eu	Bilaketa katea bidali
 subtype	admin	eu	Azpimota
-template selection	admin	eu	Pantaila aukeratu
-text entry	admin	eu	Testu sarrera
-that application name already exists.	admin	eu	Aplikazio izen hori existitzen da.
-that application order must be a number.	admin	eu	Aplikazioaren ordena zenbaki bat izan behar da.
 that loginid has already been taken	admin	eu	Erabiltzaile izen hori erabiltzen ari dira
-that name has been used already	admin	eu	Izen hori erabilia izan da
-that server name has been used already !	admin	eu	Zerbitzari izen hori erabilia izan da!
 the api is current	admin	eu	API-ak eguneratua dago
 the api requires an upgrade	admin	eu	API-ak eguneratzea behar du
 the groups must include the primary group	admin	eu	Taldeek talde nagusian sartu behar dira

admin/lang/egw_fa.lang

@@ -376,13 +376,7 @@ start testjob!	admin	fa	شروع کار آزمایشی!
 submit changes	admin	fa	ثبت تغییرات
 submit the search string	admin	fa	ثبت رشته جستجو
 subtype	admin	fa	زیرنوع
-template selection	admin	fa	انتخاب قالب
-text entry	admin	fa	ورودی متن
-that application name already exists.	admin	fa	نام کاربرد وجود دارد
-that application order must be a number.	admin	fa	ترتیب کاربرد باید عدد باشد
 that loginid has already been taken	admin	fa	شناسه ورود قبلا گرفته شده است
-that name has been used already	admin	fa	نام قبلا گرفته شده است
-that server name has been used already !	admin	fa	نام کارگزار قبلا استفاده شده
 the api is current	admin	fa	API بروز است
 the api requires an upgrade	admin	fa	API بهنگام سازی لازم دارد
 the groups must include the primary group	admin	fa	گروهها باید شامل گروه اولیه باشند

admin/lang/egw_fi.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	fi	%1 merkki %2.
 %1 user %2	admin	fi	%1 käyttäjä %2
 (de)activate mail accounts	admin	fi	(de)aktivoi sähköpostitilit
+(default no, leave it off if you dont use it)	admin	fi	Oletusarvo = Ei, jätä pois päältä, jos et käytä sitä.
 (no subject)	admin	fi	Ei aihetta
 -  type	admin	fi	- muoto
 1 year	admin	fi	1 vuosi
@@ -359,11 +360,12 @@ host information	admin	fi	Palvelimen tiedot
 hour<br>(0-23)	admin	fi	Tunti<br>(0-23)
 how big should thumbnails for linked images be (maximum in pixels) ?	admin	fi	Thumbnailin maksimikoko linkitetyille kuville pikseleinä
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	fi	Kuinka monta vuorokautta tietoja säilytetään käyttölokissa (oletus: 90)
-how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	fi	Kuinka monta tietuetta käyttäjien (joilla EI ole ylläpiöoikeuksia) sallitaan viedä (tyhjä = ei rajoitusta, ei = ei vientiä)
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	fi	Kuinka monta tietuetta käyttäjien (joilla EI ole ylläpiöoikeuksia) sallitaan viedä (Tyhjä = ei rajoitusta, Ei = ei vientiä)
 how many minutes should an account or ip be blocked (default 1) ?	admin	fi	Kuinka moneksi minuutiksi tunnus tai IP-osoite lukitaan (oletus: 30)
 how should email addresses for new users be constructed?	admin	fi	Kuinka uusien käyttäjien sähköpostitunnus luodaan
 icon	admin	fi	Kuvake
 idle	admin	fi	Vapaa
+if different from email address	admin	fi	Jos eri kuin sähköpostiosoite
 if no acl records for user or any group the user is a member of	admin	fi	Jos käyttäjälle tai ryhmälle ei ole ACL -tietueita, kuuluu käyttäjä ryhmään
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	fi	Jos käytät LDAP-hakemistoa, haluatko hallita kotihakemistoja ja shellejä?
 if using ssl or tls, you must have the php openssl extension loaded.	admin	fi	Jos SSL tai TLS on käytössä, PHP openssl lisäosa pitää olla ladattuna.
@@ -478,6 +480,7 @@ no alternate email address	admin	fi	Ei vaihtoehtoista osoitetta
 no encryption	admin	fi	Ei suojausta
 no forwarding email address	admin	fi	Välityksen sähköpostiosoitetta ei löytynyt
 no jobs in the database !!!	admin	fi	Tietokannassa ei ole töitä!
+no limit	admin	fi	Ei rajoitusta
 no login history exists for this user	admin	fi	Käyttäjällä ei ole kirjautumishistoriaa!
 no matches found	admin	fi	Yhtään kohdetta ei löytynyt!
 no message returned.	admin	fi	Viestiä ei palautettu
@@ -611,6 +614,7 @@ sieve server port	admin	fi	Sieve -palvelimen portti
 sieve settings	admin	fi	Sieven asetukset
 site	admin	fi	Palvelu
 smtp authentication	admin	fi	SMTP -tunnistus
+smtp only: to create only an smtp account	admin	fi	Luo vain SMTP-tili ilman IMAP:tä
 smtp options	admin	fi	SMTP -asetukset
 smtp server name	admin	fi	SMTP -palvelimen nimi
 smtp settings	admin	fi	SMTP -asetukset
@@ -636,14 +640,8 @@ submit the search string	admin	fi	Hae merkkijonoa
 subtype	admin	fi	Alamuoto
 success	admin	fi	Onnistunut
 switch it off, if users are randomly thrown out	admin	fi	Ota pois käytöstä, jos käyttäjät ovat satunnaisesti hylätty
-template selection	admin	fi	Malliohjan valinta
 templates	admin	fi	Mallipohjat
-text entry	admin	fi	Tekstille
-that application name already exists.	admin	fi	Sovelluksen nimi on jo käytössä.
-that application order must be a number.	admin	fi	Järjestyksen pitää olla numero.
 that loginid has already been taken	admin	fi	Käyttäjätunnus on jo käytössä.
-that name has been used already	admin	fi	Nimi on jo käytössä.
-that server name has been used already !	admin	fi	Palvelimen nimi on jo käytössä!
 the api is current	admin	fi	API on ajan tasalla
 the api requires an upgrade	admin	fi	API vaatii päivityksen
 the groups must include the primary group	admin	fi	Ensisijainen ryhmä on valittava.

admin/lang/egw_fr.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	fr	%1 jeton %2.
 %1 user %2	admin	fr	%1 utilisateur %2
 (de)activate mail accounts	admin	fr	(dés)activer les comptes email
+(default no, leave it off if you dont use it)	admin	fr	Valeur par défaut = Non, laissez cette option désactivée si vous ne l'utilisez pas.
 (no subject)	admin	fr	Pas de sujet
 -  type	admin	fr	- type
 1 year	admin	fr	1 an
@@ -490,7 +491,7 @@ hostname or ip	admin	fr	Serveur hôte ou IP
 hour<br>(0-23)	admin	fr	Heure<br>(0-23)
 how big should thumbnails for linked images be (maximum in pixels) ?	admin	fr	Taille maximale en pixels des vignettes pour les images liées
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	fr	Pendant combien de jours les entrées doivent-elles rester dans la log d'accès avant d'être effacées (90 par défaut)
-how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	fr	Combien d'entrées les non-admins peuvent-ils exporter. Vide = pas de limite, no = pas d'export
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	fr	Combien d'entrées les non-admins peuvent-ils exporter. Vide = pas de limite, Non = pas d'export
 how many minutes should an account or ip be blocked (default 1) ?	admin	fr	Pendant combien de minutes un compte ou une adresse IP doit-il(elle) être bloqué(e) (30 par défaut)
 how should email addresses for new users be constructed?	admin	fr	Comment former les adresses de messagerie des nouveaux utilisateurs
 how username get constructed	admin	fr	Comment les codes utiliateurs sont construits
@@ -639,6 +640,7 @@ no default account found!	admin	fr	Pas de compte par défaut trouvé !
 no encryption	admin	fr	Pas de chiffrement
 no forwarding email address	admin	fr	Pas d'adresse email de transfert
 no jobs in the database !!!	admin	fr	Pas de travaux dans la base de données !
+no limit	admin	fr	Pas de limite
 no login history exists for this user	admin	fr	Aucun historique de connexion n'existe pour cet utilisateur !
 no matches found	admin	fr	Aucune occurrence trouvée !
 no message returned.	admin	fr	Aucun message n'est retourné
@@ -823,6 +825,7 @@ site	admin	fr	Site
 skip imap	admin	fr	Sauter la configuration IMAP
 skipping imap configuration!	admin	fr	Sauter la configuration IMAP !
 smtp authentication	admin	fr	Authentication SMTP
+smtp only: to create only an smtp account	admin	fr	Créer un compte SMTP uniquement sans IMAP
 smtp options	admin	fr	Options SMTP
 smtp server	admin	fr	Serveur SMTP
 smtp server name	admin	fr	Nom du serveur SMTP
@@ -857,14 +860,8 @@ successfull, but no refresh-token received!	admin	fr	Réussi, mais AUCUN refresh
 switch back to standard identity to save account.	admin	fr	Revenir à l'identité standard pour sauvegarder le compte.
 switch back to standard identity to save other account data.	admin	fr	Revenez à l'identité standard pour sauvegarder les autres données du compte.
 switch it off, if users are randomly thrown out	admin	fr	Décocher si des utilisateurs sont déconnectés par hasard
-template selection	admin	fr	Sélection du style
 templates	admin	fr	Templates
-text entry	admin	fr	Entrée de texte
-that application name already exists.	admin	fr	Ce nom d'application existe déjà.
-that application order must be a number.	admin	fr	Cet ordre d'application doit être un nombre.
 that loginid has already been taken	admin	fr	Ce LoginID a déjà été pris.
-that name has been used already	admin	fr	Ce nom a déjà été utilisé.
-that server name has been used already !	admin	fr	Ce nom de serveur a déjà été utilisé !
 the api is current	admin	fr	L'API est à jour
 the api requires an upgrade	admin	fr	L'API nécessite une mise à jour
 the cumulated and anonymised data will be publically available:	admin	fr	Les données accumulées et anonymes seront publiquement disponibles :

admin/lang/egw_hr.lang

@@ -370,13 +370,7 @@ standard smtp-server	admin	hr	Standard SMTP server
 start testjob!	admin	hr	Start TestJob!
 submit changes	admin	hr	Pošalji promjene
 submit the search string	admin	hr	Pošalji niz znakova za pretragu
-template selection	admin	hr	Izabir predloška
-text entry	admin	hr	Unos teksta
-that application name already exists.	admin	hr	Ime aplikacije već postoji
-that application order must be a number.	admin	hr	That application order must be a number.
 that loginid has already been taken	admin	hr	That loginid has already been taken
-that name has been used already	admin	hr	To ime je već upotrebljeno
-that server name has been used already !	admin	hr	To ime poslužitelja j eveć upotrijebljeno!
 the api is current	admin	hr	The API is current
 the api requires an upgrade	admin	hr	The API requires an upgrade
 the groups must include the primary group	admin	hr	grupe moraju sadržavati primarne grupe

admin/lang/egw_hu.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	hu	%1 token %2.
 %1 user %2	admin	hu	%1 felhasználó %2
 (de)activate mail accounts	admin	hu	Mailfiókok (de)aktiválása
+(default no, leave it off if you dont use it)	admin	hu	Alapértelmezett = Nem, hagyja ki, ha nem használja.
 (no subject)	admin	hu	(nincs tárgy)
 -  type	admin	hu	- típus
 1 year	admin	hu	1 év
@@ -337,11 +338,13 @@ host information	admin	hu	Host információ
 hostname or ip	admin	hu	Hostnév vagy IP
 hour<br>(0-23)	admin	hu	Óra<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	hu	A hozzáférési listában hány napig legyenek megőrizve az adatok, mielőtt törlődnének (alapértelmezett 90 nap)
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	hu	Hány bejegyzést exportálhatnak a nem rendszergazdák. Üres = nincs korlátozás, Nem = nincs exportálás.
 how many minutes should an account or ip be blocked (default 1) ?	admin	hu	Hány percig legyenek blokkolva a hozzáférések vagy IP címek (alapértelmezett 30 perc)
 how should email addresses for new users be constructed?	admin	hu	Új felhasználók email címét hogyan készítsük el
 html/plaintext	admin	hu	HTML/Szöveg
 icon	admin	hu	Ikon
 idle	admin	hu	Inaktív
+if different from email address	admin	hu	Ha eltér az e-mail címtől
 if no acl records for user or any group the user is a member of	admin	hu	Ha a felhasználónak vagy összes csoportjának nincs ACL meghatározva
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	hu	Ha LDAP-ot használ, kívánja kezelni a Saját könyvtárat és a bejelentkezési héj tulajdonságait?
 if using ssl or tls, you must have the php openssl extension loaded.	admin	hu	SSL vagy TLS használatához a PHP openssl kiterjesztését telepíteni kell.
@@ -436,6 +439,7 @@ no alternate email address	admin	hu	Nincs alternatív email cím
 no encryption	admin	hu	Titkosítás nélkül
 no forwarding email address	admin	hu	Nincs továbbküldési email cím
 no jobs in the database !!!	admin	hu	Nem található feladat az adatbázisban!
+no limit	admin	hu	Nincs korlátozás
 no login history exists for this user	admin	hu	Ehhez a felhasználóhoz nem található belépési történet!
 no matches found	admin	hu	Nincs egyezés!
 no message returned.	admin	hu	Nincs visszaadott üzenet
@@ -550,6 +554,7 @@ sieve server port	admin	hu	Sieve szerver port
 sieve settings	admin	hu	SIEVE beállítások
 site	admin	hu	Oldal
 smtp authentication	admin	hu	SMTP azonosítás
+smtp only: to create only an smtp account	admin	hu	Csak SMTP-fiók létrehozása IMAP nélkül
 smtp options	admin	hu	SMTP opciók
 smtp server	admin	hu	SMTP szerver
 smtp server name	admin	hu	SMTP szerver neve
@@ -572,14 +577,8 @@ submit changes	admin	hu	Változások elküldése
 submit the search string	admin	hu	Keresési szöveg elküldése
 subtype	admin	hu	Altípus
 switch it off, if users are randomly thrown out	admin	hu	Kapcsolja ki, a felhasználókat véletlenszerűen kidobja a rendszer
-template selection	admin	hu	Sablon választás
 templates	admin	hu	Sablonok
-text entry	admin	hu	Szöveges bejegyzés
-that application name already exists.	admin	hu	Ez az alkalmazás név már létezik.
-that application order must be a number.	admin	hu	Az alkalmazás sorrend szám kell legyen.
 that loginid has already been taken	admin	hu	Ez a felhasználónév már foglalt.
-that name has been used already	admin	hu	Ez a név már használatban van.
-that server name has been used already !	admin	hu	Ez a szerver név már használatban van!
 the api is current	admin	hu	Az API nem igényel frissítést
 the api requires an upgrade	admin	hu	Az API frissítést igényel
 the groups must include the primary group	admin	hu	A csoportoknak az elsődleges csoportot tartalmaznia kell.

admin/lang/egw_id.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	id	%1 token %2.
 %1 user %2	admin	id	%1 pengguna %2
 (de)activate mail accounts	admin	id	(de) Mengaktifkan akun email
+(default no, leave it off if you dont use it)	admin	id	Default = Tidak, biarkan saja jika Anda tidak menggunakannya
 (no subject)	admin	id	(tanpa subyek)
 -  type	admin	id	- tipe
 1 year	admin	id	1 tahun
@@ -227,8 +228,10 @@ home directory	admin	id	Direktori rumah
 home screen message	admin	id	Pesan layar utama
 host information	admin	id	Informasi host
 hour<br>(0-23)	admin	id	Jam<br>(0-23)
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	id	Berapa banyak entri yang dapat diekspor oleh non-admin. Kosong = tidak ada batas, Tidak = tidak ada ekspor
 icon	admin	id	Ikon
 idle	admin	id	Menganggur
+if different from email address	admin	id	Tidak ada batasan
 imap admin password	admin	id	Password admin IMAP
 imap admin user	admin	id	Admin IMAP
 imap server	admin	id	IMAP Server
@@ -300,6 +303,7 @@ next run	admin	id	Jalankan berikutnya
 no algorithms available	admin	id	Tidak ada algoritma yang tersedia!
 no alternate email address	admin	id	Tanpa alamat email pengganti
 no encryption	admin	id	Tanpa enkripsi
+no limit	admin	id	Tidak ada batasan
 no matches found	admin	id	Tidak ditemukan kecocokan!
 no modes available	admin	id	Tidak ada mode yang tersedia!
 number of row for a multiline inputfield or line of a multi-select-box	admin	id	Jumlah baris untuk bidang input multi-baris atau baris dari kotak multi-pilihan
@@ -378,6 +382,7 @@ sieve server port	admin	id	Sieve server port
 sieve settings	admin	id	Pengaturan Sieve
 site	admin	id	Situs
 smtp authentication	admin	id	Otentikasi SMTP
+smtp only: to create only an smtp account	admin	id	Membuat akun khusus SMTP tanpa IMAP
 smtp options	admin	id	Opsi SMTP
 smtp server name	admin	id	Nama server SMTP
 smtp settings	admin	id	Pengaturan SMTP
@@ -399,9 +404,7 @@ submit statistic information	admin	id	Submit statistic information
 submit to egroupware.org	admin	id	Submit to egroupware.org
 subtype	admin	id	Subtype
 success	admin	id	Sukses
-template selection	admin	id	Pemilihan Templat
 templates	admin	id	Templat
-text entry	admin	id	Text Entry
 the api is current	admin	id	API saat ini
 the two passwords are not the same	admin	id	Kedua password tidak sama
 the users bellow are still members of group %1	admin	id	Pengguna berikut ini masih menjadi anggota kelompok %1

admin/lang/egw_it.lang

@@ -23,7 +23,6 @@
 %1 user %2	admin	it	%1 utente %2
 (de)activate mail accounts	admin	it	(dis)attivare account email
 (default no, leave it off if you dont use it)	admin	it	Predefinito = No, lascialo così se non lo usi
-(imapclass must support this feature by querying the corresponding config value and pass it as defaultquota to the imapserver)	admin	it	(imapclass deve supportare questa funzionalità interrogando il valore corrispondente in configurazione e passandolo come defaultquota al server IMAP)
 (no subject)	admin	it	(nessun oggetto)
 -  type	admin	it	- tipo
 1 year	admin	it	1 anno
@@ -492,7 +491,7 @@ hostname or ip	admin	it	Nome del computer o indirizzo IP
 hour<br>(0-23)	admin	it	Ore<br>(0-23)
 how big should thumbnails for linked images be (maximum in pixels) ?	admin	it	Dimensione massima in pixel delle miniature per le immagini collegate
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	it	Quanti giorni le voci rimangono nel log di accesso prima che vengano cancellate (predefinito 90)
-how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	it	Quante voci possono esportare gli utenti semplici. Vuoto = nessun limite, no = nessuna esportazione consentita
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	it	Quante voci possono esportare gli utenti semplici. Vuoto = nessun limite, No = nessuna esportazione consentita
 how many minutes should an account or ip be blocked (default 1) ?	admin	it	Quanti minuti un account o un IP rimarrà bloccato (predefinito 30)
 how should email addresses for new users be constructed?	admin	it	Come deve essere strutturata la mail per i nuovi utenti
 how username get constructed	admin	it	Come viene costruito il nome utente
@@ -641,6 +640,7 @@ no default account found!	admin	it	Nessun account predefinito trovato!
 no encryption	admin	it	Nessuna cifratura
 no forwarding email address	admin	it	Nessun indirizzo email di inoltro
 no jobs in the database !!!	admin	it	Nessun job nel database!
+no limit	admin	it	Nessun limite
 no login history exists for this user	admin	it	Non esiste una cronologia di login per questo utente!
 no matches found	admin	it	Nessuna corrispondenza trovata!
 no message returned.	admin	it	Nessun messaggio ricevuto
@@ -825,6 +825,7 @@ site	admin	it	Sito
 skip imap	admin	it	Salta IMAP
 skipping imap configuration!	admin	it	Salta la configurazione IMAP!
 smtp authentication	admin	it	Autenticazione SMTP
+smtp only: to create only an smtp account	admin	it	Creare un account solo SMTP senza IMAP
 smtp options	admin	it	Opzioni SMTP
 smtp server	admin	it	Server SMTP (posta in uscita)
 smtp server name	admin	it	Nome server SMTP
@@ -859,14 +860,8 @@ successfull, but no refresh-token received!	admin	it	Successo, ma nessun refresh
 switch back to standard identity to save account.	admin	it	Ritornare all'identità standard per conservare l'account.
 switch back to standard identity to save other account data.	admin	it	Ritornare all'identità standard per conservare gli altri dati dell'account.
 switch it off, if users are randomly thrown out	admin	it	Spegnilo in caso di logout casuali degli utenti
-template selection	admin	it	Selezione Aspetto
 templates	admin	it	Modelli
-text entry	admin	it	Inserimento di Testo
-that application name already exists.	admin	it	Quel nome di applicazione esiste già.
-that application order must be a number.	admin	it	Quel numero d'ordine deve essere un numero.
 that loginid has already been taken	admin	it	Quel nome utente è già stato scelto.
-that name has been used already	admin	it	Quel nome è già stato utilizzato.
-that server name has been used already !	admin	it	Questo nome di server è già stato utilizzato!
 the api is current	admin	it	Le API sono aggiornate
 the api requires an upgrade	admin	it	Le API hanno bisogno di essere aggiornate
 the cumulated and anonymised data will be publically available:	admin	it	I dati accumulati e i dati anonimi saranno pubblicamente disponibili:

admin/lang/egw_iw.lang

@@ -365,13 +365,7 @@ standard smtp-server	admin	iw	תקני SMTP שרת
 start testjob!	admin	iw	!החל עבודת הניסיון
 submit changes	admin	iw	הגש שינוים
 submit the search string	admin	iw	הגש את מחרוזת החיפוש
-template selection	admin	iw	בחירת תבנית
-text entry	admin	iw	רשומת טקסט
-that application name already exists.	admin	iw	.שם יישום זה כבר קיים
-that application order must be a number.	admin	iw	.סדר יישום זה חייב להיות מספרי
 that loginid has already been taken	admin	iw	זיהוי כניסה זה כבר תפוס
-that name has been used already	admin	iw	שם זה כבר בשימוש
-that server name has been used already !	admin	iw	!שם שרת זה כבר בשימוש
 the api is current	admin	iw	מעודכן API-ה
 the api requires an upgrade	admin	iw	זקוק לעדכון API-ה
 the groups must include the primary group	admin	iw	הקבוצות חייבות לכלול את הקבוצה הראשית

admin/lang/egw_ja.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	ja	%1 トークン %2。
 %1 user %2	admin	ja	%1 ユーザ %2
 (de)activate mail accounts	admin	ja	メール・アカウントを有効化/無効化
+(default no, leave it off if you dont use it)	admin	ja	デフォルト = いいえ、使用しない場合はオフのままにしてください。
 (no subject)	admin	ja	（件名無し）
 -  type	admin	ja	-  タイプ
 1 year	admin	ja	1年
@@ -556,6 +557,7 @@ no default account found!	admin	ja	既定のアカウントが見つかりませ
 no encryption	admin	ja	暗号化無し
 no forwarding email address	admin	ja	転送先アドレスがありません
 no jobs in the database !!!	admin	ja	No jobs in the database!
+no limit	admin	ja	制限なし
 no login history exists for this user	admin	ja	No login history exists for this user!
 no matches found	admin	ja	一致が見つかりません。
 no message returned.	admin	ja	No message returned
@@ -713,6 +715,7 @@ site	admin	ja	サイト
 skip imap	admin	ja	IMAP を飛ばす
 skipping imap configuration!	admin	ja	IMAP 設定を飛ばします!
 smtp authentication	admin	ja	SMTP 認証
+smtp only: to create only an smtp account	admin	ja	IMAPなしのSMTP専用アカウントを作成する
 smtp options	admin	ja	SMTP オプション
 smtp server	admin	ja	SMTPサーバー
 smtp server name	admin	ja	SMTP サーバー名
@@ -746,14 +749,8 @@ successful connected to %1 server%2.	admin	ja	%1 サーバー %2 に接続しま
 switch back to standard identity to save account.	admin	ja	Switch back to standard identity to save account.
 switch back to standard identity to save other account data.	admin	ja	Switch back to standard identity to save other account data.
 switch it off, if users are randomly thrown out	admin	ja	ユーザがランダムに強制ログアウトしてしまう場合は無効にしてください
-template selection	admin	ja	テンプレート選択
 templates	admin	ja	テンプレート
-text entry	admin	ja	テキスト入力
-that application name already exists.	admin	ja	このアプリケーション名は既に存在します。
-that application order must be a number.	admin	ja	That application order must be a number.
 that loginid has already been taken	admin	ja	ログインIDは既に登録済みです。
-that name has been used already	admin	ja	この名前は既に使われています
-that server name has been used already !	admin	ja	That server name has been used already!
 the api is current	admin	ja	The API is current
 the api requires an upgrade	admin	ja	The API requires an upgrade
 the cumulated and anonymised data will be publically available:	admin	ja	これまでに蓄積された匿名データは下記URLで参照可能です:

admin/lang/egw_km.lang

@@ -813,14 +813,8 @@ successfull, but no refresh-token received!	admin	km	ជោគជ័យ ប៉
 switch back to standard identity to save account.	admin	km	ប្តូរទៅអត្តសញ្ញាណស្តង់ដារវិញ ដើម្បីរក្សាទុកគណនី។
 switch back to standard identity to save other account data.	admin	km	ប្តូរទៅអត្តសញ្ញាណស្តង់ដារវិញ ដើម្បីរក្សាទុកទិន្នន័យគណនីផ្សេងទៀត។
 switch it off, if users are randomly thrown out	admin	km	បិទវា ប្រសិនបើអ្នកប្រើប្រាស់ត្រូវបានចេញដោយចៃដន្យ
-template selection	admin	km	ការជ្រើសរើសគំរូ
 templates	admin	km	គំរូ
-text entry	admin	km	ការបញ្ចូលអត្ថបទ
-that application name already exists.	admin	km	ឈ្មោះកម្មវិធីនោះមានរួចហើយ។
-that application order must be a number.	admin	km	លំដាប់ពាក្យសុំនោះត្រូវតែជាលេខ។
 that loginid has already been taken	admin	km	លេខសម្គាល់ចូលនោះត្រូវបានយករួចហើយ។
-that name has been used already	admin	km	ឈ្មោះនេះត្រូវបានប្រើប្រាស់រួចហើយ។
-that server name has been used already !	admin	km	ឈ្មោះ​ម៉ាស៊ីន​បម្រើ​នោះ​ត្រូវ​បាន​ប្រើ​រួច​ហើយ!
 the api is current	admin	km	API គឺបច្ចុប្បន្ន
 the api requires an upgrade	admin	km	API ទាមទារការអាប់ដេត
 the cumulated and anonymised data will be publically available:	admin	km	ទិន្នន័យដែលប្រមូលបាន និងអនាមិកនឹងមានជាសាធារណៈ៖

admin/lang/egw_ko.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	ko	%1 토큰 %2.
 %1 user %2	admin	ko	%1 사용자 %2
 (de)activate mail accounts	admin	ko	메일 계정 (비)활성화
+(default no, leave it off if you dont use it)	admin	ko	기본값 = 아니요, 사용하지 않는 경우 그대로 둡니다.
 (no subject)	admin	ko	(제목 없음)
 access token revoked.	admin	ko	액세스 토큰이 해지되었습니다.
 account	admin	ko	계정
@@ -226,10 +227,12 @@ home screen message	admin	ko	주 화면 메세지
 host information	admin	ko	호스트 정보
 hour<br>(0-23)	admin	ko	시간<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	ko	접근 로그에 항목을 삭제되기까지 일간 유지할까요 (기본 90) ?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	ko	관리자가 아닌 사람이 내보낼 수 있는 항목 수입니다. 비어 있음 = 제한 없음, 아니요 = 내보내기 없음
 how many minutes should an account or ip be blocked (default 1) ?	admin	ko	몇분간 IP나 계정을 막을까요 (기본 30) ?
 html/plaintext	admin	ko	HTML/텍스트
 icon	admin	ko	아이콘
 idle	admin	ko	대기시간
+if different from email address	admin	ko	이메일 주소와 다른 경우
 if no acl records for user or any group the user is a member of	admin	ko	사용자나 어떤 그룹 사용자 ACL 레코드가 없다면 다음의 멤버 :
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	ko	LDAP를 사용한다면, 홈디렉토리와 로그인쉘 속성을 관리 하시겠습니까?
 inbound	admin	ko	인바운드
@@ -288,6 +291,7 @@ new password [ leave blank for no change ]	admin	ko	새 패스워드[ 바꾸지
 next run	admin	ko	다음 실행
 no algorithms available	admin	ko	어떠한 알고리즘도 가능하지 않습니다.
 no jobs in the database !!!	admin	ko	데이터베이스에 어떠한 작업도 없습니다 !
+no limit	admin	ko	제한 없음
 no login history exists for this user	admin	ko	이 사용자의 접속 기록은 없습니다
 no matches found	admin	ko	일치하는 것을 찾을수 없습니다
 no modes available	admin	ko	가능한 모드(mode)가 없습니다
@@ -352,6 +356,7 @@ show groups in container based on	admin	ko	コンテナ内のグループの表
 show phpinfo()	admin	ko	phpinfo()를 보임
 show session ip address	admin	ko	세션 IP주소를 보임
 site	admin	ko	Site
+smtp only: to create only an smtp account	admin	ko	IMAP 없이 SMTP 전용 계정 만들기
 soap	admin	ko	SOAP
 sorry, that group name has already been taken.	admin	ko	죄송합니다, 입력하신 그룹이름은 이미 있습니다.
 sorry, the above users are still a member of the group %1	admin	ko	죄송합니다 위의 사용자는 아직 %1 그룹의 구성원입니다.
@@ -363,13 +368,7 @@ start	admin	ko	시작
 start testjob!	admin	ko	테스트작업(TestJob) 시작
 submit changes	admin	ko	변경된것을 보냄(Submit)
 submit the search string	admin	ko	검색 문자열 보냄
-template selection	admin	ko	템플릿 선택
-text entry	admin	ko	텍스트 엔트리(Text entry)
-that application name already exists.	admin	ko	응용프로그램 이름이 이미 있습니다
-that application order must be a number.	admin	ko	응용프로그램 순서는 반드시 정수여야 합니다
 that loginid has already been taken	admin	ko	이 접속ID는 이미 사용중입니다
-that name has been used already	admin	ko	이름이 이미 있습니다
-that server name has been used already !	admin	ko	이미 존재하는 서버이름 입니다!
 the api is current	admin	ko	API는 현재버전
 the api requires an upgrade	admin	ko	API의 업그레이드가 필요
 the groups must include the primary group	admin	ko	그룹은 반드시 주 그룹을 포함해야함

admin/lang/egw_lo.lang

@@ -440,13 +440,7 @@ submit to egroupware.org	admin	lo	ສົ່ງໄປທີ່ egroupware.org
 subtype	admin	lo	ຊະນິດຍ່ອຍ
 success	admin	lo	ສໍາເລັດ
 switch it off, if users are randomly thrown out	admin	lo	ປິດການເຮັດວຽກ, ຖ້າຜູ້ໃຊ້ອອກລະບົບ
-template selection	admin	lo	ການເລືອກແມ່ແບບ
-text entry	admin	lo	ລາຍການຂໍ້ຄວາມ
-that application name already exists.	admin	lo	ຊື່ຂອງແອັບພຼິເຄຊັນ ມີແລ້ວ.
-that application order must be a number.	admin	lo	ລາຍການ ແອັບພຼິເຄຊັນ ຕ້ອງເປັນຕົວເລກ.
 that loginid has already been taken	admin	lo	ລະຫັດທີ່ໄດ້ເຂົ້າລະບົບແລ້ວ
-that name has been used already	admin	lo	ຊື່ນີ້ມີຜູ້ໃຊ້ແລ້ວ
-that server name has been used already !	admin	lo	ຊື່ ເຊີເວີ້ ນີ້ມີຜູ້ໃຊ້ແລ້ວ !
 the api is current	admin	lo	API ປັດຈຸບັນ
 the api requires an upgrade	admin	lo	API ຕ້ອງມີການປັບລຸ້ນ
 the cumulated and anonymised data will be publically available:	admin	lo	cumulated ແລະ anonymised ຂໍ້ມູນຈະຢູ່ໃນຖານະໃຫ້ບໍລິການ

admin/lang/egw_lt.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	lt	%1 simbolis %2.
 %1 user %2	admin	lt	%1 naudotojas %2
 (de)activate mail accounts	admin	lt	(de)aktyvuoti pašto paskyras
+(default no, leave it off if you dont use it)	admin	lt	Numatytoji reikšmė = Ne, palikite išjungtą, jei nenaudojate
 1 year	admin	lt	1 metai
 2 month	admin	lt	2 mėnesiai
 2 weeks	admin	lt	2 savaitės
@@ -49,13 +50,16 @@ custom 1	admin	lt	Pasirinktinis 1
 custom 2	admin	lt	Pasirinktinis 2
 custom 3	admin	lt	Pasirinktinis 3
 group hierarchy	admin	lt	Grupių hierarchija
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	lt	Kiek įrašų gali eksportuoti ne administratoriai. Tuščias = neribojama, Ne = neeksportuojama
 html/plaintext	admin	lt	HTML / Tekstas
+if different from email address	admin	lt	Jei skiriasi nuo el. pašto adreso
 last %1 logins	admin	lt	Paskutiniai %1 prisijungimai
 last %1 logins for %2	admin	lt	Paskutiniai %1 prisijungimai prie %2
 last time read	admin	lt	Paskutinį kartą perskaitytas
 last updated	admin	lt	Paskutinį kartą atnaujinta
 leave empty for no quota	admin	lt	Palikite tuščią, jei kvotos nėra
 leave empty to use oauth, if supported	admin	lt	Palikite tuščią, jei norite naudoti OAuth, jei palaikoma
+no limit	admin	lt	Nėra ribos
 oauth authentiction	admin	lt	OAuth autentiškumo nustatymas
 offer to installing egroupware as mail-handler	admin	lt	Pasiūlymas įdiegti EGroupware kaip pašto tvarkytuvą
 one day	admin	lt	Vieną dieną
@@ -68,5 +72,6 @@ own install id	admin	lt	Nuosavas diegimo ID
 own install id:	admin	lt	Nuosavas diegimo ID:
 regular expression to find part to use as container	admin	lt	Reguliarioji išraiška daliai, kurią galima naudoti kaip konteinerį, rasti
 show groups in container based on	admin	lt	Rodyti grupes konteineryje pagal
+smtp only: to create only an smtp account	admin	lt	Sukurti tik SMTP paskyrą be IMAP
 total records	admin	lt	Iš viso įrašų
 user-agent	admin	lt	User-Agent

admin/lang/egw_lv.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	lv	%1 token %2.
 %1 user %2	admin	lv	%1 lietotājs %2
 (de)activate mail accounts	admin	lv	(de)aktivizēt pasta kontus
+(default no, leave it off if you dont use it)	admin	lv	Noklusējuma iestatījums = Nē, atstājiet to izslēgtu, ja to neizmantojat.
 (no subject)	admin	lv	(nav temata)
 1 year	admin	lv	1 gads
 2 month	admin	lv	2 mēneši
@@ -251,10 +252,12 @@ home screen message	admin	lv	Galvenā loga ziņojums
 host information	admin	lv	Host informācija
 hour<br>(0-23)	admin	lv	Stundas <br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	lv	Cik dienu vajadzētu saglabāt iesniegtos datus piekļuves loga, pirms tie tiek izdzēsti (noklusējums 90)?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	lv	Cik daudz ierakstu var eksportēt personas, kas nav administratori. Tukšs = nav ierobežojuma, Nē = nav eksporta
 how many minutes should an account or ip be blocked (default 1) ?	admin	lv	Cik minūtes vajadzētu bloķēt kontu vai IP (noklusējums 30)?
 html/plaintext	admin	lv	HTML/Teksts
 icon	admin	lv	Ikona
 idle	admin	lv	Dīkstāve (idle)
+if different from email address	admin	lv	Ja atšķiras no e-pasta adreses
 if no acl records for user or any group the user is a member of	admin	lv	Ja nav ACL ierakstu lietotājiem vai kādai grupai, lietotājs ir ...?
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	lv	Vai vēlies pārvaldīt mājasdirektoriju un pieteikšanāsformas atribūtus, ja lieto LDAP
 imap admin password	admin	lv	IMAP administratora parole
@@ -330,6 +333,7 @@ no algorithms available	admin	lv	Nav pieejami algoritmi
 no alternate email address	admin	lv	Nav alternatīvas e-pasta adreses
 no forwarding email address	admin	lv	Nav pārsūtāmās e-pasta adreses
 no jobs in the database !!!	admin	lv	Datubāzē uzdevumu nav!
+no limit	admin	lv	Nav ierobežojuma
 no login history exists for this user	admin	lv	Šim lietotājam nav autorizāciju vētures
 no matches found	admin	lv	Nav atbilstošu ierakstu
 no modes available	admin	lv	Nav pieejamu režīmu
@@ -407,6 +411,7 @@ sieve server hostname or ip address	admin	lv	Sijāšanas servera hostname vai IP
 sieve server port	admin	lv	Sieve servera ports
 sieve settings	admin	lv	Sieve uzstadījumi
 site	admin	lv	Lapa(site)
+smtp only: to create only an smtp account	admin	lv	Izveidot tikai SMTP kontu bez IMAP
 smtp server name	admin	lv	SMTP servera nosaukums
 smtp settings	admin	lv	SMTP uzstādījumi
 smtp-server hostname or ip address	admin	lv	SMTP servera hosta vārds vai IP adrese
@@ -423,13 +428,7 @@ standard smtp-server	admin	lv	Standarta SMTP serveris
 start testjob!	admin	lv	Sākt testa darbu!
 submit changes	admin	lv	Apstiprināt Izmaiņas
 submit the search string	admin	lv	Apstiprināt meklēšamas stringu
-template selection	admin	lv	Veidnes izvēle
-text entry	admin	lv	Teksta Ievadīšana
-that application name already exists.	admin	lv	Šāds aplikācijas nosaukums jau eksistē
-that application order must be a number.	admin	lv	Aplikāciju secība jānorāda ar skaitli
 that loginid has already been taken	admin	lv	Šāds autorizācijas ID jau ir aizņemts
-that name has been used already	admin	lv	Šāds nosaukums jau tiek lietots
-that server name has been used already !	admin	lv	Šāds servera vārds jau tiek lietots!
 the api is current	admin	lv	Patreizējais API
 the api requires an upgrade	admin	lv	API pieprasa jauninājumus
 the groups must include the primary group	admin	lv	Grupām jāiekļauj pamatgrupa

admin/lang/egw_nl.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	nl	%1 token %2.
 %1 user %2	admin	nl	%1 gebruiker %2
 (de)activate mail accounts	admin	nl	(De)Activeer mailaccounts
+(default no, leave it off if you dont use it)	admin	nl	Standaard = Nee, laat uit als je het niet gebruikt
 (no subject)	admin	nl	(geen onderwerp)
 -  type	admin	nl	- type
 1 year	admin	nl	1 jaar
@@ -422,6 +423,7 @@ no alternate email address	admin	nl	Geen alternatief emailadres
 no encryption	admin	nl	Geen versleuteling
 no forwarding email address	admin	nl	Geen emailadres om naar door te sturen
 no jobs in the database !!!	admin	nl	Geen taken in DB
+no limit	admin	nl	Geen limiet
 no login history exists for this user	admin	nl	Er is geen loginhistorie aanwezig voor deze gebruiker
 no matches found	admin	nl	Geen overeenkomsten gevonden
 no message returned.	admin	nl	Geen bericht teruggekomen.
@@ -534,6 +536,7 @@ sieve server port	admin	nl	Sieve-serverpoort
 sieve settings	admin	nl	Sieve instellingen
 site	admin	nl	Site
 smtp authentication	admin	nl	SMTP authenticatie
+smtp only: to create only an smtp account	admin	nl	Alleen SMTP-account maken zonder IMAP
 smtp options	admin	nl	SMTP opties
 smtp server name	admin	nl	SMTP-servernaam
 smtp settings	admin	nl	SMTP instellingen
@@ -555,14 +558,8 @@ submit changes	admin	nl	Wijzigingen toepassen
 submit the search string	admin	nl	Verzend de zoekopdracht
 subtype	admin	nl	Subtype
 switch it off, if users are randomly thrown out	admin	nl	Schakel het uit, wanneer gebruiker willekeurig eruit gegooid worden
-template selection	admin	nl	Templateselectie
 templates	admin	nl	Sjablonen
-text entry	admin	nl	Tekstinvoer
-that application name already exists.	admin	nl	Die toepassingsnaam bestaat reeds.
-that application order must be a number.	admin	nl	De invoer van de toepassingsvolgorde moet numeriek zijn.
 that loginid has already been taken	admin	nl	Die loginnaam is reeds in gebruik!
-that name has been used already	admin	nl	Die naam is reeds in Gebruik!
-that server name has been used already !	admin	nl	Die servernaam is reeds in gebruik!
 the api is current	admin	nl	De API is actueel.
 the api requires an upgrade	admin	nl	De API vereist een upgrade.
 the groups must include the primary group	admin	nl	De groepen moeten de primaire groep bevatten

admin/lang/egw_no.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	no	%1 token %2.
 %1 user %2	admin	no	%1 bruker %2
 (de)activate mail accounts	admin	no	(de)aktivere e-postkontoer
+(default no, leave it off if you dont use it)	admin	no	Standard = Nei, la den være av hvis du ikke bruker den
 (no subject)	admin	no	(uten emne)
 access token revoked.	admin	no	Tilgangstoken tilbakekalt.
 account	admin	no	Konto
@@ -247,9 +248,11 @@ home screen message	admin	no	Melding på hovedside
 host information	admin	no	Vertsinformasjon
 hour<br>(0-23)	admin	no	Time <br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	no	Hvor mange dager skal innhold være i tilgangsloggen før de blir slettet (standard 90)?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	no	Hvor mange oppføringer skal ikke-administratorer kunne eksportere? Tom = ingen grense, Nei = ingen eksport
 how many minutes should an account or ip be blocked (default 1) ?	admin	no	Hvor mange minutter skal en konto eller IP være sperret(standard 30)?
 icon	admin	no	Ikon
 idle	admin	no	Idle
+if different from email address	admin	no	Hvis forskjellig fra e-postadressen
 if no acl records for user or any group the user is a member of	admin	no	Dersom ingen ACL post for bruker eller noen gruppe bruker medlem av
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	no	Om LDAP används, vill du hantera attribut för hemktalog och programskal?
 imap admin password	admin	no	IMAP Administrasjonspassord
@@ -326,6 +329,7 @@ no algorithms available	admin	no	Ingen algoritmer tilgjengelig
 no alternate email address	admin	no	Ingen alternativ e-mailadresse
 no forwarding email address	admin	no	Ingen e-mailadresse for videresending
 no jobs in the database !!!	admin	no	Ingen jobber i databasen
+no limit	admin	no	Ingen grense
 no login history exists for this user	admin	no	Ingen login historikk for denne brukeren
 no matches found	admin	no	Ingen treff funnet
 no modes available	admin	no	Ingen modus tilgjengelig
@@ -404,6 +408,7 @@ sieve server hostname or ip address	admin	no	Tjenernavn eller IP-adresse for Sie
 sieve server port	admin	no	Sieve tjenerport
 sieve settings	admin	no	Sieve innstillinger
 site	admin	no	Nettsted
+smtp only: to create only an smtp account	admin	no	Opprett SMTP-konto uten IMAP
 smtp server name	admin	no	SMTP Tjenernavn
 smtp settings	admin	no	SMTP innstillinger
 smtp-server hostname or ip address	admin	no	Tjenernavn eller IP-Adresse for SMTP-Tjener
@@ -421,13 +426,7 @@ start	admin	no	Start
 start testjob!	admin	no	Start testjobb!
 submit changes	admin	no	Bekreft endringene
 submit the search string	admin	no	Bekreft søkestrengen
-template selection	admin	no	Valg av mal
-text entry	admin	no	Tekstfelt
-that application name already exists.	admin	no	Programnavnet er allerede i bruk
-that application order must be a number.	admin	no	Programrekkefølgen må være et nummer
 that loginid has already been taken	admin	no	Den loginID er opptatt
-that name has been used already	admin	no	Det navnet er allerede benyttet
-that server name has been used already !	admin	no	Det tjenernavnet er allerede benyttet!
 the api is current	admin	no	API er gjeldende
 the api requires an upgrade	admin	no	API trenger en oppgradering
 the groups must include the primary group	admin	no	Gruppen må inkludere primærgruppen

admin/lang/egw_pl.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	pl	%1 token %2.
 %1 user %2	admin	pl	%1 użytkownik %2
 (de)activate mail accounts	admin	pl	(de)Aktywacja kont pocztowych
+(default no, leave it off if you dont use it)	admin	pl	Domyślnie = Nie, pozostaw to wyłączone, jeśli z tego nie korzystasz.
 (no subject)	admin	pl	(bez tematu)
 -  type	admin	pl	- typ
 1 year	admin	pl	1 rok
@@ -337,6 +338,7 @@ how many minutes should an account or ip be blocked (default 1) ?	admin	pl	Na il
 how should email addresses for new users be constructed?	admin	pl	Jak tworzyć adresy mailowe dla nowych użytkowników?
 icon	admin	pl	Ikonka
 idle	admin	pl	Czas jałowy
+if different from email address	admin	pl	Jeśli inny niż adres e-mail
 if no acl records for user or any group the user is a member of	admin	pl	Jeśli brak uprawnień dostępu (ACL) dla użytkownika lub jakiejkolwiek grupy, której użytkownik jest członkiem
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	pl	Jeżeli używasz LDAP, czy chciałbyś administrować katalogiem domowym i atrybutami powłoki?
 if using ssl or tls, you must have the php openssl extension loaded.	admin	pl	Jeżeli korzystasz z SSL lub TLS, musisz zapewnić obsługę OpenSSL w PHP.
@@ -440,6 +442,7 @@ no alternate email address	admin	pl	Brak zapasowego adresu e-mail
 no encryption	admin	pl	Brak szyfrowania
 no forwarding email address	admin	pl	Brak adresu poczty przesyłanej
 no jobs in the database !!!	admin	pl	Nie ma jobs w bazie
+no limit	admin	pl	Bez limitu
 no login history exists for this user	admin	pl	Nie ma historii logowania dla tego użytkownika
 no matches found	admin	pl	Nie znaleziono zgodnych
 no message returned.	admin	pl	Nie otrzymano wiadomości.
@@ -565,6 +568,7 @@ sieve server port	admin	pl	Port serwera Sieve
 sieve settings	admin	pl	Ustawienia Sieve
 site	admin	pl	Serwis
 smtp authentication	admin	pl	Autentykacja SMTP
+smtp only: to create only an smtp account	admin	pl	Utwórz konto tylko SMTP bez IMAP
 smtp options	admin	pl	Opcje SMTP
 smtp server name	admin	pl	Nazwa serwera SMTP
 smtp settings	admin	pl	Ustawienia SMTP
@@ -590,14 +594,8 @@ submit to egroupware.org	admin	pl	Prześlij do egroupware.org
 subtype	admin	pl	Pod-typ
 success	admin	pl	Sukces
 switch it off, if users are randomly thrown out	admin	pl	Wyłącz to, jeżeli użytkownicy są wyrzucani losowo
-template selection	admin	pl	Wybór szablonu
 templates	admin	pl	Szablony
-text entry	admin	pl	Wpisywanie tekstu
-that application name already exists.	admin	pl	Podana nazwa aplikacji już istnieje
-that application order must be a number.	admin	pl	Numer porządkowy aplikacji musi być liczbą
 that loginid has already been taken	admin	pl	Taki login już istnieje
-that name has been used already	admin	pl	Taka nazwa jest już użyta
-that server name has been used already !	admin	pl	Podana nazwa serwera jest już używana
 the api is current	admin	pl	Wersja API jest aktualna
 the api requires an upgrade	admin	pl	Wersja API wymaga aktualizacji
 the cumulated and anonymised data will be publically available:	admin	pl	Anonimowe dane które będą publicznie dostępne:

admin/lang/egw_pt-br.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	pt-br	%1 token %2.
 %1 user %2	admin	pt-br	%1 usuário %2
 (de)activate mail accounts	admin	pt-br	(Des)Ativar contas de e-mail
+(default no, leave it off if you dont use it)	admin	pt-br	Padrão = Não, deixe-o desativado se você não o usar
 (no subject)	admin	pt-br	(sem assunto)
 -  type	admin	pt-br	- tipo
 1 year	admin	pt-br	1 ano
@@ -462,6 +463,7 @@ no alternate email address	admin	pt-br	Sem conta de e-mail alternativa
 no encryption	admin	pt-br	Sem criptografia
 no forwarding email address	admin	pt-br	Sem conta de e-mail para encaminhar
 no jobs in the database !!!	admin	pt-br	Nenhum trabalho na base de dados!
+no limit	admin	pt-br	Sem limite
 no login history exists for this user	admin	pt-br	Não existe histórico de conexões para este usuário!
 no matches found	admin	pt-br	Nenhuma ocorrência encontrada!
 no message returned.	admin	pt-br	Nenhuma mensagem retornada
@@ -577,6 +579,7 @@ site	admin	pt-br	Site
 skip imap	admin	pt-br	Ir IMAP
 skipping imap configuration!	admin	pt-br	Ignorando configuração IMAP!
 smtp authentication	admin	pt-br	Autenticação smtp
+smtp only: to create only an smtp account	admin	pt-br	Criar conta somente SMTP sem IMAP
 smtp options	admin	pt-br	Opções smtp
 smtp server	admin	pt-br	Servidor SMTP
 smtp server name	admin	pt-br	Nome do Servidor SMTP
@@ -603,14 +606,8 @@ subtype	admin	pt-br	Sub tipo
 successful connected to %1 server%2.	admin	pt-br	Successful ligado ao %1servidor%2.
 switch back to standard identity to save account.	admin	pt-br	Volte para a identidade padrão para salvar conta.
 switch it off, if users are randomly thrown out	admin	pt-br	Desabilite, se usuários estiverem, aleatoriamente, sendo desconectados
-template selection	admin	pt-br	Seleção de modelos
 templates	admin	pt-br	Templates
-text entry	admin	pt-br	Entrada de texto
-that application name already exists.	admin	pt-br	Este nome de aplicativo já existe.
-that application order must be a number.	admin	pt-br	O campo ordem de aplicativo deve ser um número.
 that loginid has already been taken	admin	pt-br	Este código de usuário já existe.
-that name has been used already	admin	pt-br	Este nome já está em uso.
-that server name has been used already !	admin	pt-br	Este nome de servidor já está em uso!
 the api is current	admin	pt-br	A base (API) do EGroupware está atualizada
 the api requires an upgrade	admin	pt-br	A base (API) do EGroupware precisa ser atualizada
 the groups must include the primary group	admin	pt-br	.Os grupos devem incluír o grupo primário

admin/lang/egw_pt.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	pt	%1 token %2.
 %1 user %2	admin	pt	%1 utilizador %2
 (de)activate mail accounts	admin	pt	(des)Ativar contas de correio
+(default no, leave it off if you dont use it)	admin	pt	Predefinição = Não, deixe-a desligada se não a utilizar
 (no subject)	admin	pt	(sem assunto)
 -  type	admin	pt	- tipo
 1 year	admin	pt	1 ano
@@ -272,6 +273,7 @@ host information	admin	pt	Informações do servidor
 hostname or ip	admin	pt	Nome do host ou IP
 hour<br>(0-23)	admin	pt	Hora<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	pt	Os registos devem ser permanecer no registo de acessos quantos dias até serem eliminados (por omissão 90) ?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	pt	Quantas entradas devem os não-administradores poder exportar. Vazio = sem limite, Não = sem exportação
 how many minutes should an account or ip be blocked (default 1) ?	admin	pt	Uma conta ou IP deve ficar bloqueado durante quantos minutos (por omissão 30) ?
 how should email addresses for new users be constructed?	admin	pt	Selecionar o formato de endereço de correio eletrónico predefinido para novas contas de utilizador
 icon	admin	pt	Ícone
@@ -357,6 +359,7 @@ no algorithms available	admin	pt	Nenhum algoritmo disponível
 no alternate email address	admin	pt	Sem endereço de correio electrónico alternativo
 no forwarding email address	admin	pt	Sem endereço de correio electrónico para reencaminhamento
 no jobs in the database !!!	admin	pt	Nenhum trabalho na base de dados!
+no limit	admin	pt	Sem limite
 no login history exists for this user	admin	pt	Não existe histórico de acessos para este utilizador
 no matches found	admin	pt	Nenhuma ocorrência encontrada
 no modes available	admin	pt	Nenhum modo disponível
@@ -449,6 +452,7 @@ sieve server port	admin	pt	Porto do servidor Sieve
 sieve settings	admin	pt	Configurações do Sieve
 site	admin	pt	Sítio
 smtp authentication	admin	pt	Autenticação SMTP
+smtp only: to create only an smtp account	admin	pt	Criar conta apenas SMTP sem IMAP
 smtp options	admin	pt	Opções do SMTP
 smtp server name	admin	pt	Nome do servidor SMTP
 smtp settings	admin	pt	Definições do SMTP
@@ -468,14 +472,8 @@ start testjob!	admin	pt	Iniciar trabalho de teste!
 submit changes	admin	pt	Enviar alterações
 submit the search string	admin	pt	Enviar termo de pesquisa
 subtype	admin	pt	Subtipo
-template selection	admin	pt	Selecção de modelos
 templates	admin	pt	Templates
-text entry	admin	pt	Entrada de texto
-that application name already exists.	admin	pt	Este nome de aplicação já existe.
-that application order must be a number.	admin	pt	O campo ordem da aplicação tem d ser um número.
 that loginid has already been taken	admin	pt	Esse nome de utilizador já existe
-that name has been used already	admin	pt	Esse nome já existe
-that server name has been used already !	admin	pt	Esse nome de servidor já existe!
 the api is current	admin	pt	A base (API) do EGroupware está actualizada
 the api requires an upgrade	admin	pt	A base (API) do EGroupware precisa ser actualizada
 the groups must include the primary group	admin	pt	Os grupos têm de incluir o grupo primário

admin/lang/egw_ro.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	ro	%1 token %2.
 %1 user %2	admin	ro	%1 utilizator %2
 (de)activate mail accounts	admin	ro	(de)Activarea conturilor de poștă electronică
+(default no, leave it off if you dont use it)	admin	ro	Implicit = Nu, lăsați-l dezactivat dacă nu îl utilizați
 1 year	admin	ro	1 an
 2 month	admin	ro	2 luni
 2 weeks	admin	ro	2 săptămâni
@@ -48,13 +49,16 @@ custom 1	admin	ro	Personalizat 1
 custom 2	admin	ro	Personalizat 2
 custom 3	admin	ro	Personalizat 3
 group hierarchy	admin	ro	Ierarhia grupurilor
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	ro	Câte intrări ar trebui să poată exporta non-admins. Empty = fără limită, No = fără export
 html/plaintext	admin	ro	HTML/Text
+if different from email address	admin	ro	Dacă este diferit de adresa de e-mail
 last %1 logins	admin	ro	Ultimele %1 accesări
 last %1 logins for %2	admin	ro	Ultimele %1 autentificări pentru %2
 last time read	admin	ro	Ultima dată când a fost citit
 last updated	admin	ro	Ultima actualizare
 leave empty for no quota	admin	ro	Lăsați gol pentru nici o cotă
 leave empty to use oauth, if supported	admin	ro	Lăsați gol pentru a utiliza OAuth, dacă este acceptat
+no limit	admin	ro	Fără limită
 oauth authentiction	admin	ro	Autentificare OAuth
 offer to installing egroupware as mail-handler	admin	ro	Ofertă pentru instalarea EGroupware ca mail-handler
 one day	admin	ro	O zi
@@ -67,6 +71,7 @@ own install id	admin	ro	Propria instalare ID
 own install id:	admin	ro	Propria instalare ID:
 regular expression to find part to use as container	admin	ro	Expresie regulată pentru a găsi partea care urmează să fie utilizată ca container
 show groups in container based on	admin	ro	Afișarea grupurilor în container pe baza
+smtp only: to create only an smtp account	admin	ro	Creați cont numai SMTP fără IMAP
 soap	admin	ro	SOAP
 ssl	admin	ro	SSL
 total records	admin	ro	Total înregistrări

admin/lang/egw_ru.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	ru	%1 токен %2.
 %1 user %2	admin	ru	%1 пользователь %2
 (de)activate mail accounts	admin	ru	(де)Активация почтовых учетных записей
+(default no, leave it off if you dont use it)	admin	ru	По умолчанию = Нет, оставьте этот параметр, если вы его не используете
 (no subject)	admin	ru	(без темы)
 -  type	admin	ru	- тип
 1 year	admin	ru	1 год
@@ -373,6 +374,7 @@ how many minutes should an account or ip be blocked (default 1) ?	admin	ru	На
 how should email addresses for new users be constructed?	admin	ru	Как должен строиться e-mail адрес для новых пользователей?
 icon	admin	ru	Пиктограмма
 idle	admin	ru	Простой
+if different from email address	admin	ru	Если отличается от адреса электронной почты
 if no acl records for user or any group the user is a member of	admin	ru	Если нет ACL-записей для пользователя или группы, участником которой он является
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	ru	При использовании LDAP - хотите ли управлять свойствами "Домашний каталог" и "Оболочка входа"
 if using ssl or tls, you must have the php openssl extension loaded.	admin	ru	При использовании SSL или TLS, у вас должен быть установлен PHP с загруженным расширением openssl
@@ -486,6 +488,7 @@ no alternate email address	admin	ru	Нет дополнительного эл.
 no encryption	admin	ru	Без шифрования
 no forwarding email address	admin	ru	Нет адреса перенаправления
 no jobs in the database !!!	admin	ru	Нет заданий в базе данных!
+no limit	admin	ru	Нет лимита
 no login history exists for this user	admin	ru	Для данного пользователя история подключений не существует
 no matches found	admin	ru	Совпадений не найдено
 no message returned.	admin	ru	Нет ответа
@@ -627,6 +630,7 @@ sieve server port	admin	ru	Порт сервера Sieve
 sieve settings	admin	ru	Настройки Sieve
 site	admin	ru	Сайт
 smtp authentication	admin	ru	Авторизация SMTP
+smtp only: to create only an smtp account	admin	ru	Создать учетную запись только для SMTP без IMAP
 smtp options	admin	ru	Параметры SMTP
 smtp server name	admin	ru	Имя сервера SMTP
 smtp settings	admin	ru	Установки SMTP
@@ -653,14 +657,8 @@ submit to egroupware.org	admin	ru	Подтвердить на egroupware.org
 subtype	admin	ru	Подтип
 success	admin	ru	Успешно
 switch it off, if users are randomly thrown out	admin	ru	Выключите, если пользователи отключаются произвольно
-template selection	admin	ru	Выбор шаблона
 templates	admin	ru	Шаблоны
-text entry	admin	ru	Текстовая запись
-that application name already exists.	admin	ru	Такое имя приложения уже существует
-that application order must be a number.	admin	ru	Порядковое место этого приложения должно быть номером
 that loginid has already been taken	admin	ru	Этот логин уже занят
-that name has been used already	admin	ru	Это имя уже используется
-that server name has been used already !	admin	ru	Это имя сервера уже используется!
 the api is current	admin	ru	Обновление API не требуется
 the api requires an upgrade	admin	ru	API требует обновления
 the cumulated and anonymised data will be publically available:	admin	ru	Эти накопленные и анонимные данные могут быть опубликованы:

admin/lang/egw_sk.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	sk	%1 token %2.
 %1 user %2	admin	sk	%1 používateľ %2
 (de)activate mail accounts	admin	sk	(de)Aktivovať poštové účty
+(default no, leave it off if you dont use it)	admin	sk	Predvolené nastavenie = Nie, ak ho nepoužívate, nechajte ho vypnuté
 (no subject)	admin	sk	(bez predmetu)
 -  type	admin	sk	- typ
 1 year	admin	sk	1 rok
@@ -630,6 +631,7 @@ no default account found!	admin	sk	Predvolený účet sa nenašiel!
 no encryption	admin	sk	Bez šifrovania
 no forwarding email address	admin	sk	Bez emailovej adresy pre preposielanie
 no jobs in the database !!!	admin	sk	V databáze nie sú žiadne úlohy!
+no limit	admin	sk	Žiadny limit
 no login history exists for this user	admin	sk	Pre používateľa neexistuje žiadna história prihlásení!
 no matches found	admin	sk	Nenašlo sa!
 no message returned.	admin	sk	Žiadne správy sa nevrátili
@@ -813,6 +815,7 @@ site	admin	sk	Stránka
 skip imap	admin	sk	Vynechať IMAP
 skipping imap configuration!	admin	sk	Vynechávam nastavenia IMAP!
 smtp authentication	admin	sk	SMTP overovanie
+smtp only: to create only an smtp account	admin	sk	Vytvorenie účtu len SMTP bez IMAP
 smtp options	admin	sk	SMTP možnosti
 smtp server	admin	sk	SMTP server
 smtp server name	admin	sk	Názov SMTP servera
@@ -847,14 +850,8 @@ successfull, but no refresh-token received!	admin	sk	Úspech, ale NEdostali sme
 switch back to standard identity to save account.	admin	sk	Prepnúť naspäť na štandardnú identitu pre uloženie účtu.
 switch back to standard identity to save other account data.	admin	sk	Prepnúť naspäť na štandardnú identitu pre uloženie údajov účtu.
 switch it off, if users are randomly thrown out	admin	sk	Vypnite to, ak sú používatelia náhodne odpájaní
-template selection	admin	sk	Výber šablóny
 templates	admin	sk	Šablóny
-text entry	admin	sk	Textová položka
-that application name already exists.	admin	sk	Takýto názov aplikácie už existuje.
-that application order must be a number.	admin	sk	Poradie aplikácie musí byť číslom.
 that loginid has already been taken	admin	sk	Takéto ID prihlásenia sa už používa.
-that name has been used already	admin	sk	Toto meno sa už používa.
-that server name has been used already !	admin	sk	Toto meno servera sa už používa!
 the api is current	admin	sk	API je aktuálne
 the api requires an upgrade	admin	sk	API potrebuje aktualizáciu
 the cumulated and anonymised data will be publically available:	admin	sk	Zhromaždené anonymizované údaje budú verejne dostupné:

admin/lang/egw_sl.lang

@@ -16,6 +16,7 @@
 %1 sessions killed	admin	sl	Ubitih %1 sej.
 %1 user %2	admin	sl	%1 uporabnik %2
 (de)activate mail accounts	admin	sl	(de) aktivirate poštne račune
+(default no, leave it off if you dont use it)	admin	sl	Privzeto = Ne, če ga ne uporabljate, ga pustite izklopljenega
 (no subject)	admin	sl	(brez zadeve)
 -  type	admin	sl	- vrsta
 1 year	admin	sl	1 leto
@@ -556,6 +557,7 @@ no default account found!	admin	sl	Ne najdem privzetega računa !
 no encryption	admin	sl	Brez šifriranja
 no forwarding email address	admin	sl	Ni E-naslova za posredovanje
 no jobs in the database !!!	admin	sl	Ni nalog v podatkovni bazi!
+no limit	admin	sl	Brez omejitve
 no login history exists for this user	admin	sl	Ni zgodovine prijav tega uporabnika.
 no matches found	admin	sl	Ni najdenih zadetkov
 no message returned.	admin	sl	Ni vrnjenega sporočila.
@@ -711,6 +713,7 @@ site	admin	sl	Strežnik
 skip imap	admin	sl	Preskočite IMAP
 skipping imap configuration!	admin	sl	Preskoči konfiguracijo IMAP!
 smtp authentication	admin	sl	SMTP avtentikacija
+smtp only: to create only an smtp account	admin	sl	Ustvarjanje računa samo za SMTP brez IMAP
 smtp options	admin	sl	SMTP možnosti
 smtp server	admin	sl	SMTP strežnik
 smtp server name	admin	sl	ime SMTP strežnika
@@ -743,14 +746,8 @@ successful connected to %1 server%2.	admin	sl	Uspešno priključen na %1 strežn
 switch back to standard identity to save account.	admin	sl	Preklopite nazaj na standardno identiteto, da shranite račun.
 switch back to standard identity to save other account data.	admin	sl	Preklopite nazaj na standardno identiteto, da shranite druge podatke o računu.
 switch it off, if users are randomly thrown out	admin	sl	Izključite, če se uporabnike izloči naključno
-template selection	admin	sl	Izbor predloge
 templates	admin	sl	Predloge
-text entry	admin	sl	Besedilni vnos
-that application name already exists.	admin	sl	Aplikacija s tem imenom že obstaja.
-that application order must be a number.	admin	sl	Vrstni red aplikacije mora biti številka.
 that loginid has already been taken	admin	sl	Ta uporabniško ime je že uporabljeno.
-that name has been used already	admin	sl	To ime je že uporabljeno.
-that server name has been used already !	admin	sl	To ime strežnika je že uporabljeno.
 the api is current	admin	sl	API je najnovejši
 the api requires an upgrade	admin	sl	API potrebuje nadgradnjo.
 the cumulated and anonymised data will be publically available:	admin	sl	Zbrani in anonimni podatki bodo javno dostopni:

admin/lang/egw_sv.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	sv	%1 token %2.
 %1 user %2	admin	sv	%1 användare %2
 (de)activate mail accounts	admin	sv	(de)Aktivera e-postkonton
+(default no, leave it off if you dont use it)	admin	sv	Standard = Nej, lämna den avstängd om du inte använder den
 (no subject)	admin	sv	(ingen rubrik)
 -  type	admin	sv	- typ
 1 year	admin	sv	1 år
@@ -273,10 +274,12 @@ home screen message	admin	sv	Meddelande på Startsidan
 host information	admin	sv	Värdinformation
 hour<br>(0-23)	admin	sv	Timma<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	sv	Hur många dagar skall poster ligga kvar i accessloggen innan de raderas (standard 90)?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	sv	Hur många poster ska icke-administratörer kunna exportera? Empty = ingen begränsning, No = ingen export
 how many minutes should an account or ip be blocked (default 1) ?	admin	sv	Hur många minuter skall ett konto eller IP adress blokeras (standard 30)?
 how should email addresses for new users be constructed?	admin	sv	Hur ska e-postadresser för nya användare formateras?
 icon	admin	sv	Ikon
 idle	admin	sv	Vilande
+if different from email address	admin	sv	Om det skiljer sig från e-postadressen
 if no acl records for user or any group the user is a member of	admin	sv	Om inga ACL poster för användare eller grupp blir användaren medlem i
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	sv	Om LDAP används, vill du hantera hemkatalog och skal-egenskaper?
 if using ssl or tls, you must have the php openssl extension loaded.	admin	sv	Om du vill använda SSL eller TLS måste PHP openssl stödet laddas
@@ -360,6 +363,7 @@ no alternate email address	admin	sv	Ingen alternerande e-post adress
 no encryption	admin	sv	Ingen kryptering
 no forwarding email address	admin	sv	Ingen e-post vidarebefodrings adress
 no jobs in the database !!!	admin	sv	Inga jobb i databasen!
+no limit	admin	sv	Ingen gräns
 no login history exists for this user	admin	sv	Inloggningshistorik saknas för användaren
 no matches found	admin	sv	Inga träffar
 no message returned.	admin	sv	Inget svar meddelandes
@@ -452,6 +456,7 @@ sieve server hostname or ip address	admin	sv	Sieve server hostnamn eller IP adre
 sieve server port	admin	sv	Sieve server port
 sieve settings	admin	sv	Sieve alternativ
 site	admin	sv	Sajt
+smtp only: to create only an smtp account	admin	sv	Skapa konto för endast SMTP utan IMAP
 smtp server name	admin	sv	SMTP server namn
 smtp settings	admin	sv	SMTP alternativ
 smtp-server hostname or ip address	admin	sv	SMTP server hostnamn eller IP adress
@@ -470,13 +475,7 @@ start testjob!	admin	sv	Starta testjobb!
 submit changes	admin	sv	Verkställ förändring
 submit the search string	admin	sv	Verkställ sökning
 subtype	admin	sv	Undertyp
-template selection	admin	sv	Val av Mall
-text entry	admin	sv	Text
-that application name already exists.	admin	sv	En applikation med det namnet existerar redan.
-that application order must be a number.	admin	sv	Applikationsordning måste anges med siffror
 that loginid has already been taken	admin	sv	Detta inloggnings ID är redan upptaget
-that name has been used already	admin	sv	Det namnet används redan
-that server name has been used already !	admin	sv	Det servernamnet används redan!
 the api is current	admin	sv	API är aktuellt
 the api requires an upgrade	admin	sv	API behöver uppgraderas
 the groups must include the primary group	admin	sv	Grupperna måste inkludera en primärgrupp

admin/lang/egw_tr.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	tr	%1 belirteci %2.
 %1 user %2	admin	tr	%1 kullanıcı %2
 (de)activate mail accounts	admin	tr	Posta hesaplarını (de)Etkinleştir
+(default no, leave it off if you dont use it)	admin	tr	Varsayılan = Hayır, kullanmıyorsanız kapalı bırakın
 (no subject)	admin	tr	(konu yok)
 1 year	admin	tr	1 yıl
 2 month	admin	tr	2 ay
@@ -238,9 +239,11 @@ host information	admin	tr	Host bilgisi
 hostname or ip	admin	tr	Ana Bilgisayar Adı veya IP
 hour<br>(0-23)	admin	tr	Saat<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	tr	Erişim kütüklerindeki kayıtlar en fazla kaç günlük oalcaktır (varsayılan 90) ?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	tr	Yönetici olmayanlar kaç girişi dışa aktarabilmelidir. Boş = sınır yok, Hayır = dışa aktarma yok
 html/plaintext	admin	tr	HTML/metin
 icon	admin	tr	Simge
 idle	admin	tr	Boşta
+if different from email address	admin	tr	E-posta adresinden farklıysa
 if no acl records for user or any group the user is a member of	admin	tr	ACL kaydı olmayan herhangi bir kullanıcı/grup bu grup üyesi sayılacaktır
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	tr	LDAP kullanıyorsanız, ev dizini ve erişim ayarlarını yönetmek ister misiniz?
 inbound	admin	tr	gelen
@@ -295,6 +298,7 @@ new password [ leave blank for no change ]	admin	tr	Yeni şifre (Değişiklik ya
 next run	admin	tr	Sıradaki çalıştırma
 no algorithms available	admin	tr	Mevcut hiç algoritma yok
 no jobs in the database !!!	admin	tr	Veritabanında görev yok
+no limit	admin	tr	Sınır yok
 no login history exists for this user	admin	tr	Bu kullanıcı için giriş geçmişi bulunmamakta
 no matches found	admin	tr	Hiç eşleşme yok
 no modes available	admin	tr	Mevcut hiç mod yok
@@ -368,6 +372,7 @@ show groups in container based on	admin	tr	Kapsayıcıdaki grupları aşağıdak
 show phpinfo()	admin	tr	phpinfo() görüntüle
 show session ip address	admin	tr	Oturum IP adreslerini görüntüle
 site	admin	tr	Site
+smtp only: to create only an smtp account	admin	tr	IMAP olmadan yalnızca SMTP hesabı oluşturma
 soap	admin	tr	SOAP
 sorry, that group name has already been taken.	admin	tr	Üzgünüm, o group ismi kullanımda
 sorry, the above users are still a member of the group %1	admin	tr	Üzgünüm, yukarıdaki kullanıcılar hala %1 grubunun üyeleridir.
@@ -378,13 +383,7 @@ standard	admin	tr	Standart
 start testjob!	admin	tr	Test görevini başlat!
 submit changes	admin	tr	Değişiklikleri gönder!
 submit the search string	admin	tr	Arama kriterini gönder
-template selection	admin	tr	Şablon Seçimi
-text entry	admin	tr	Metin Girdisi
-that application name already exists.	admin	tr	Uygulama ismi kullanımda.
-that application order must be a number.	admin	tr	Uygulama sırası bir sayı olmalıdır.
 that loginid has already been taken	admin	tr	Bu kullanıcı adı kullanımda
-that name has been used already	admin	tr	Bu isim kullanımda
-that server name has been used already !	admin	tr	Bu sunucu ismi kullanımda
 the api is current	admin	tr	API güncel
 the api requires an upgrade	admin	tr	API güncelleme gerektiriyor
 the groups must include the primary group	admin	tr	Gruplar temel grubu içermelidir.

admin/lang/egw_uk.lang

@@ -22,6 +22,7 @@
 %1 token %2.	admin	uk	%1 токен %2.
 %1 user %2	admin	uk	Користувач %1 користувач %2
 (de)activate mail accounts	admin	uk	(де)Активувати поштові облікові записи
+(default no, leave it off if you dont use it)	admin	uk	За замовчуванням = Ні, вимкніть, якщо не використовуєте його
 1 year	admin	uk	1 рік
 2 month	admin	uk	2 місяці
 2 weeks	admin	uk	2 тижні
@@ -214,9 +215,11 @@ home screen message	admin	uk	Повідомлення основного екр
 host information	admin	uk	Інформація хосту
 hour<br>(0-23)	admin	uk	Година<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	uk	Скільки днів записи мають зберігатися в протоколі доступу (по замовченню 90)?
+how many entries should non-admins be able to export (empty = no limit, no = no export)	admin	uk	Скільки записів можуть експортувати неадміністратори. Порожнє = без обмежень, Ні = без експорту
 how many minutes should an account or ip be blocked (default 1) ?	admin	uk	На скільки хвилин блокується рахунок або IP (по замовченню 30)?
 html/plaintext	admin	uk	HTML/Tекст
 idle	admin	uk	простій
+if different from email address	admin	uk	Якщо відрізняється від адреси електронної пошти
 if no acl records for user or any group the user is a member of	admin	uk	Якщо немає записів ACL для користувача або будь якої групи, членом якої є користувач
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	uk	При використанні LDAP, чи хочете Ви керувати домашніми каталогами та атрибутами входу до системи?
 inbound	admin	uk	вхідний
@@ -273,6 +276,7 @@ new password [ leave blank for no change ]	admin	uk	Новий пароль [з
 next run	admin	uk	Наступний запуск
 no algorithms available	admin	uk	Немає алгоритмів
 no jobs in the database !!!	admin	uk	В базі немає завдань
+no limit	admin	uk	Без обмежень
 no login history exists for this user	admin	uk	Для користувача немає історії входів
 no matches found	admin	uk	Відповідностей не знайдено
 no modes available	admin	uk	Немає режимів
@@ -342,6 +346,7 @@ show groups in container based on	admin	uk	Показувати групи в к
 show phpinfo()	admin	uk	Показати phpinfo()
 show session ip address	admin	uk	Показати IP адреси сесій
 site	admin	uk	Сайт
+smtp only: to create only an smtp account	admin	uk	Створити обліковий запис лише для SMTP без IMAP
 soap	admin	uk	SOAP
 sorry, that group name has already been taken.	admin	uk	Вибачте, така назва групи вже зайнята,
 sorry, the above users are still a member of the group %1	admin	uk	Вибачте, вищевказані користувачі все ще члени групи %1
@@ -352,13 +357,7 @@ standard	admin	uk	стандарт
 start testjob!	admin	uk	Стартувати тестове завдання!
 submit changes	admin	uk	Відіслати зміни
 submit the search string	admin	uk	Відіслати зразок пошуку
-template selection	admin	uk	Вибір шаблону
-text entry	admin	uk	Текстовий запис
-that application name already exists.	admin	uk	Така назва приложення вже існує.
-that application order must be a number.	admin	uk	Номер послідовності приложень має бути числом.
 that loginid has already been taken	admin	uk	Такий ідентифікатор користувача вже зайнято
-that name has been used already	admin	uk	Така назва вже використовується
-that server name has been used already !	admin	uk	Така назва серверу вже використовується
 the api is current	admin	uk	API не потребує оновлення
 the api requires an upgrade	admin	uk	API потребує оновлення
 the login and password can not be the same	admin	uk	Ідентифікатор користувача та пароль не можуть співпадати

admin/lang/egw_zh-tw.lang

@@ -438,13 +438,7 @@ submit changes	admin	zh-tw	送出更新資料
 submit the search string	admin	zh-tw	送出搜尋字串
 subtype	admin	zh-tw	副類型
 switch it off, if users are randomly thrown out	admin	zh-tw	如果使用者不定時被登出，請將它關閉
-template selection	admin	zh-tw	選擇畫面配置
-text entry	admin	zh-tw	文字資料
-that application name already exists.	admin	zh-tw	應用程式名稱已經存在
-that application order must be a number.	admin	zh-tw	應用程式順序必須是數字
 that loginid has already been taken	admin	zh-tw	該使用者代碼已被使用了
-that name has been used already	admin	zh-tw	這個名稱已經被使用了
-that server name has been used already !	admin	zh-tw	這個伺服器名稱已經被使用了
 the api is current	admin	zh-tw	API不需要升級
 the api requires an upgrade	admin	zh-tw	API需要升級
 the groups must include the primary group	admin	zh-tw	這個群組必須包含主要群組

admin/lang/egw_zh.lang

@@ -12,6 +12,7 @@
 %1 successful	admin	zh	%1 成功
 %1 token %2.	admin	zh	%1 标记 %2.
 %1 user %2	admin	zh	%1 用户 %2
+(default no, leave it off if you dont use it)	admin	zh	默认 = 否，如果不使用，请将其关闭
 (no subject)	admin	zh	(无主题)
 -  type	admin	zh	- 类型
 1 year	admin	zh	1年
@@ -305,6 +306,7 @@ how many minutes should an account or ip be blocked (default 1) ?	admin	zh	多
 how should email addresses for new users be constructed?	admin	zh	应该怎么为新用户创建邮箱地址？
 icon	admin	zh	图标
 idle	admin	zh	空闲
+if different from email address	admin	zh	如果与电子邮件地址不同
 if no acl records for user or any group the user is a member of	admin	zh	如果没有用户或任何小组的 ACL 纪录，该用户将作为成员属于
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	zh	如果使用 LDAP，您想要管理主目录和 Login Shell 属性吗？
 if using ssl or tls, you must have the php openssl extension loaded.	admin	zh	如果使用 SSL 或 TLS，您必须加载 PHP openssl 扩展。
@@ -398,6 +400,7 @@ no alternate email address	admin	zh	无备用邮箱地址
 no encryption	admin	zh	未加密
 no forwarding email address	admin	zh	没有转发邮件地址
 no jobs in the database !!!	admin	zh	没有任务在数据库中！
+no limit	admin	zh	无限制
 no login history exists for this user	admin	zh	没有该用户登录的历史记录
 no matches found	admin	zh	未找到匹配
 no message returned.	admin	zh	无返回消息。
@@ -505,6 +508,7 @@ sieve server port	admin	zh	Sieve 服务器端口号
 sieve settings	admin	zh	Sieve 设置
 site	admin	zh	站点
 smtp authentication	admin	zh	SMTP 认证
+smtp only: to create only an smtp account	admin	zh	创建不带 IMAP 的 SMTP 专用账户
 smtp options	admin	zh	SMTP 选项
 smtp server name	admin	zh	SMTP 服务器名
 smtp settings	admin	zh	SMTP 设置
@@ -525,13 +529,7 @@ submit changes	admin	zh	提交更改
 submit the search string	admin	zh	提交查找字符串
 subtype	admin	zh	子类型
 switch it off, if users are randomly thrown out	admin	zh	如果用户任意地退出，请将它关闭
-template selection	admin	zh	模版选择
-text entry	admin	zh	文本条目
-that application name already exists.	admin	zh	应用程序名称已存在。
-that application order must be a number.	admin	zh	应用程序的次序必须为数字。
 that loginid has already been taken	admin	zh	该登录名已被使用
-that name has been used already	admin	zh	该名称已被使用
-that server name has been used already !	admin	zh	该服务器名称已被使用！
 the api is current	admin	zh	当前 API
 the api requires an upgrade	admin	zh	API 需要升级
 the groups must include the primary group	admin	zh	这个群组必须包含主要群组

admin/templates/default/account.xet

@@ -39,7 +39,10 @@
 					</et2-vbox>
 					<et2-description></et2-description>
 					<et2-description></et2-description>
-					<et2-checkbox  id="anonymous" label="Anonymous user. Not shown in list sessions."></et2-checkbox>
+					<et2-vbox>
+						<et2-checkbox  id="anonymous" label="Anonymous user. Not shown in list sessions."></et2-checkbox>
+						<et2-checkbox  id="hidden" label="User hidden vom non-admins."></et2-checkbox>
+					</et2-vbox>
 					<et2-description></et2-description>
 				</row>
 				<row disabled="!@ldap_extra_attributes">

admin/templates/default/categories.edit.xet

@@ -26,10 +26,7 @@
 				</row>
 				<row>
 					<et2-description  value="Icon" for="data[icon]"></et2-description>
-					<et2-hbox  cellpadding="0" cellspacing="0" >
-						<et2-select  id="data[icon]" onchange="app.admin.change_icon(widget);" emptyLabel="None"></et2-select>
-						<et2-image  src="icon_url" id="icon_url" class="leftPad5"></et2-image>
-					</et2-hbox>
+					<et2-select id="data[icon]" emptyLabel="None" search="true" searchUrl="preferences.preferences_categories_ui.ajax_search"></et2-select>
 				</row>
 				<row disabled="@appname=phpgw">
 					<et2-description  value="Application"></et2-description>

admin/templates/default/site-config.xet

@@ -2,26 +2,26 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.site-config" template="" lang="" group="0" version="16.1">
-		<et2-vbox height="100%">
-		    <et2-description value="Site configuration" class="subHeader"></et2-description>
-		    <et2-box disabled="@need_tab" class="mainContent">
-			<template template="@template" width="99%"/>
-		    </et2-box>
-		    <et2-box disabled="!@need_tab" class="mainContent">
-			<et2-tabbox id="tabs2">
-			    <tabs>
-				<tab id="config" label="Configuration"/>
-			    </tabs>
-			    <tabpanels>
-				<template template="@template" width="99%"/>
-			    </tabpanels>
-			</et2-tabbox>
-		    </et2-box>
-		    <et2-hbox class="dialogFooterToolbar">
-			<et2-button id="save" label="Save"></et2-button>
-			<et2-button id="apply" label="Apply"></et2-button>
-			<et2-button id="cancel" label="Cancel"></et2-button>
-		    </et2-hbox>
-		</et2-vbox>
+        <et2-vbox height="100%">
+            <et2-description value="Site configuration" class="subHeader"></et2-description>
+            <et2-box disabled="@need_tab" class="mainContent">
+                <template template="@template" width="99%"/>
+            </et2-box>
+            <et2-box disabled="!@need_tab" class="mainContent">
+                <et2-tabbox id="tabs2">
+                    <tabs>
+                        <tab id="config" label="Configuration"/>
+                    </tabs>
+                    <tabpanels>
+                        <template template="@template" width="99%"/>
+                    </tabpanels>
+                </et2-tabbox>
+            </et2-box>
+            <et2-hbox class="dialogFooterToolbar">
+                <et2-button id="save" label="Save"></et2-button>
+                <et2-button id="apply" label="Apply"></et2-button>
+                <et2-button id="cancel" label="Cancel"></et2-button>
+            </et2-hbox>
+        </et2-vbox>
 	</template>
 </overlay>

api/categories.php

@@ -45,12 +45,14 @@ foreach($categories as $cat)
 		// Use slightly more specific selector that just class, to allow defaults
 		// if the category has no color
 		$content .= "/** {$cat['name']} **/\n/*webComponent*/\n";
-		$content .= ":root,:host {--cat-{$cat['id']}-color: {$cat['data']['color']};}, :host.cat_{$cat['id']}, .cat_{$cat['id']} {--category-color: {$cat['data']['color']};} et2-select-cat > .cat_{$cat['id']} {--category-color: {$cat['data']['color']};} \n";
+		$content .= ":root,:host {--cat-{$cat['id']}-color: {$cat['data']['color']};} :host.cat_{$cat['id']}, .cat_{$cat['id']} {--category-color: {$cat['data']['color']};} et2-select-cat > .cat_{$cat['id']} {--category-color: {$cat['data']['color']};} \n";
 		$content .= "/*legacy*/\n.egwGridView_scrollarea tr.row_category.cat_{$cat['id']} > td:first-child, .select-cat li.cat_{$cat['id']}, .et2_selectbox ul.chzn-results li.cat_{$cat['id']}, .et2_selectbox ul.chzn-choices li.cat_{$cat['id']}, .nextmatch_header_row .et2_selectbox.select-cat.cat_{$cat['id']} a.chzn-single {border-left-color: {$cat['data']['color']};} .cat_{$cat['id']}.fullline_cat_bg, div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};}  \n";
 	}
 	if (!empty($cat['data']['icon']))
 	{
-		$content .= ".cat_{$cat['id']} .cat_icon { background-image: url('". admin_categories::icon_url($cat['data']['icon']) ."');} /*{$cat['name']}*/\n";
+		$icon = preg_replace('/\.(png|svg|jpe?g|gif)$/i', '', $cat['data']['icon']);
+		$content .= ".cat_{$cat['id']} .cat_icon { background-image: url('". (
+			Api\Image::find('', 'images/'.$icon) ?: Api\Image::find('vfs', $icon)) ."');} /*{$cat['name']}*/\n";
 	}
 }
 
@@ -78,4 +80,4 @@ if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_
 
 // Content-Lenght header is important, otherwise browsers dont cache!
 Header('Content-Length: '.bytes($content));
-echo $content;
+echo $content;

api/etemplate.php

@@ -198,6 +198,19 @@ function send_template()
 			return "<et2-details" . stringAttrs($attrs) . '>' . $matches[2] . "</et2-details>";
 		}, $str);
 
+		// Change groupbox <caption label="..."/> --> summary attribute
+		$str = preg_replace_callback('#<groupbox([^>]*?)>(.*?)</groupbox>#su', static function ($matches)
+		{
+			$attrs = parseAttrs($matches[1]);
+
+			if (preg_match('#^\n?\s*<caption([^>]*?)/?>(.*?)(</caption>)?#su', $matches[2], $caption))
+			{
+				$attrs['summary'] = parseAttrs($caption[1])['label'];
+				$matches[2] = str_replace($caption[0], '', $matches[2]);
+			}
+			return "<et2-groupbox" . stringAttrs($attrs) . '>' . $matches[2] . "</et2-groupbox>";
+		}, $str);
+
 		// Change splitter dockside -> primary + vertical
 		$str = preg_replace_callback('#<split([^>]*?)>(.*?)</split>#su', static function ($matches)
 		{
@@ -352,7 +365,10 @@ function send_template()
 		}, $str);
 
 		// use et2-email instead of et2-select-email
-		$str = preg_replace('#<et2-select-email\s(.*?")\s*></et2-select-email>#s', '<et2-email $1></et2-email>', $str);
+		$str = preg_replace('#<et2-select-email\s(.*?")\s*/?>(</et2-select-email>)?#s', '<et2-email $1></et2-email>', $str);
+
+		// use et2-select-cat instead of et2-tree-cat
+		$str = preg_replace('#<et2-tree-cat\s(.*?")\s*/?>(</et2-tree-cat>)?#s', '<et2-select-cat $1></et2-select-cat>', $str);
 
 		// nextmatch headers
 		$str = preg_replace_callback('#<(nextmatch-)([^ ]+)(header|filter) ([^>]+?)/>#s', static function (array $matches)

api/images/README

@@ -1,3 +0,0 @@
-This folder is used from the gdimage-class used by projects.
-
-It has to be writable by the webserver-user.

api/images/index.php

@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>eGroupWare: Permission denied !!!</title>
-</head>
-<body>
-<h1>eGroupWare: Permission denied !!!</h1>
-</body>
-</html>