pending changes from our translation server

2024-11-07 08:34:42 +01:00 · 2024-11-05 20:16:00 +01:00 · 2024-11-05 20:16:00 +01:00 · 1afdfbc992
commit 1afdfbc992
parent 2e469a00de
214 changed files with 1171 additions and 1036 deletions
--- a/admin/lang/egw_bg.lang
+++ b/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	две седмици
--- a/admin/lang/egw_ca.lang
+++ b/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
--- a/admin/lang/egw_cs.lang
+++ b/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:
--- a/admin/lang/egw_da.lang
+++ b/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.
--- a/admin/lang/egw_de.lang
+++ b/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
@ -225,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
@ -503,7 +502,7 @@ identity	admin	de	Identität
 identity deleted	admin	de	Identität gelöscht.
 identity saved.	admin	de	Identität gespeichert.
 idle	admin	de	Im Leerlauf
-if different from email address	admin	de	Falls unterschiedlich zu E-Mail-Adresse
+if different from email address	admin	de	falls unterschiedlich zu E-Mail-Adresse
 if disabled existing tokens immediatly stop working.	admin	de	Wenn deaktiviert funktionieren bereits existierende Token sofort nicht mehr.
 if no acl records for user or any group the user is a member of	admin	de	Wenn es keinen ACL-Eintrag für einen Benutzer oder eine Gruppe, der er angehört, gibt
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	de	Wenn Sie LDAP verwenden, möchten Sie Benutzerverzeichnisse und Kommandointerpreter verwalten?
@ -827,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
@ -862,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:
--- a/admin/lang/egw_el.lang
+++ b/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	Οι ομάδες πρέπει να συμπεριλαμβάνουν την αρχική ομάδα.
--- a/admin/lang/egw_en.lang
+++ b/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
@ -226,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
@ -862,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:
--- a/admin/lang/egw_es-es.lang
+++ b/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:
--- a/admin/lang/egw_et.lang
+++ b/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.
--- a/admin/lang/egw_eu.lang
+++ b/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
--- a/admin/lang/egw_fa.lang
+++ b/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	گروهها باید شامل گروه اولیه باشند
--- a/admin/lang/egw_fi.lang
+++ b/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.
--- a/admin/lang/egw_fr.lang
+++ b/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 :
--- a/admin/lang/egw_hr.lang
+++ b/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
--- a/admin/lang/egw_hu.lang
+++ b/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.
--- a/admin/lang/egw_id.lang
+++ b/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
--- a/admin/lang/egw_it.lang
+++ b/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:
--- a/admin/lang/egw_iw.lang
+++ b/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	הקבוצות חייבות לכלול את הקבוצה הראשית
--- a/admin/lang/egw_ja.lang
+++ b/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で参照可能です:
--- a/admin/lang/egw_km.lang
+++ b/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	ទិន្នន័យដែលប្រមូលបាន និងអនាមិកនឹងមានជាសាធារណៈ៖
--- a/admin/lang/egw_ko.lang
+++ b/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	그룹은 반드시 주 그룹을 포함해야함
--- a/admin/lang/egw_lo.lang
+++ b/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 ຂໍ້ມູນຈະຢູ່ໃນຖານະໃຫ້ບໍລິການ
--- a/admin/lang/egw_lt.lang
+++ b/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
--- a/admin/lang/egw_lv.lang
+++ b/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
--- a/admin/lang/egw_nl.lang
+++ b/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
--- a/admin/lang/egw_no.lang
+++ b/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
--- a/admin/lang/egw_pl.lang
+++ b/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:
--- a/admin/lang/egw_pt-br.lang
+++ b/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
--- a/admin/lang/egw_pt.lang
+++ b/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
--- a/admin/lang/egw_ro.lang
+++ b/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
--- a/admin/lang/egw_ru.lang
+++ b/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	Эти накопленные и анонимные данные могут быть опубликованы:
--- a/admin/lang/egw_sk.lang
+++ b/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é:
--- a/admin/lang/egw_sl.lang
+++ b/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:
--- a/admin/lang/egw_sv.lang
+++ b/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
--- a/admin/lang/egw_tr.lang
+++ b/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.
--- a/admin/lang/egw_uk.lang
+++ b/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	Ідентифікатор користувача та пароль не можуть співпадати
--- a/admin/lang/egw_zh-tw.lang
+++ b/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	這個群組必須包含主要群組
--- a/admin/lang/egw_zh.lang
+++ b/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	这个群组必须包含主要群组
--- a/api/lang/egw_bg.lang
+++ b/api/lang/egw_bg.lang
@ -70,6 +70,7 @@ all	common	bg	Всички
 all addressbooks	groupdav	bg	Всички адресни книги
 all categories	common	bg	Всички категории
 all fields	common	bg	всички полета
+all files	common	bg	Всички файлове
 all in one	groupdav	bg	Всичко в едно
 all users	common	bg	Всички потребители
 allow editing the %1	common	bg	Разрешете редактирането на %1
@ -466,9 +467,11 @@ light mode	common	bg	Светъл режим
 line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ignored</b>	common	bg	Ред %1: '%2'<br><b>данните в csv съдържат ##last-check-run## на таблица %3 ==> игнориран</b>
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	bg	Ред %1: '%2'<br><b>данните в csv не съвпадат с броя на колоните в таблицата %3 ==> игнориран</b>
 link	common	bg	Връзка
+link to each entry	common	bg	Връзка към всеки запис
 list	common	bg	Списък
 list members	common	bg	Списък с членове
 lithuania	common	bg	Литва
+load more links ...	common	bg	Зареждане на още връзки...
 loading	common	bg	зареждане
 local	common	bg	Локален
 locations	common	bg	местоположения
@ -504,6 +507,11 @@ may	common	bg	Май
 mayotte	common	bg	Майот
 medium	common	bg	Средно
 menu	common	bg	Меню
+merge	common	bg	Сливане
+merge & send	common	bg	Сливане и изпращане
+merge individually	common	bg	Сливане поотделно
+merge options	common	bg	Опции за сливане
+merged document filename	preferences	bg	Име на файла на обединения документ
 message	common	bg	Съобщение
 mexico	common	bg	Мексико
 micronesia, federated states of	common	bg	Микронезия
@ -587,7 +595,6 @@ open	common	bg	отвори
 open existing contact	common	bg	Отваряне на съществуващ контакт
 open notify window	common	bg	Отваряне на прозореца за известяване
 open popup window	common	bg	Отваряне на "изскачащ" прозорец
-open sidebox	common	bg	Отваряне на страничната кутия
 open the online help.	common	bg	Отваряне на онлайн помощ
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	bg	Входът в OpenIDConnect е успешен, но потребител '%1' НЕ съществува в EGroupware, а автоматичното създаване на потребители е деактивирано!
 operator	common	bg	Оператор
@ -703,6 +710,8 @@ sao tome and principe	common	bg	Сао Томе и Принсипе
 saturday	common	bg	Събота
 saudi arabia	common	bg	Саудитска Арабия
 save	common	bg	Запис
+save as pdf	common	bg	Записване като PDF
+save as zip	common	bg	Записване като ZIP
 saved column sizes to preferences.	common	bg	Запазете размерите на колоните в предпочитанията.
 search	common	bg	Търсене
 search %1 '%2'	common	bg	Търсене на %1 '%2'
@ -727,6 +736,7 @@ select the default width for the application windows	common	bg	Изберете
 select user	common	bg	Изберете потребител
 select work email address	common	bg	Изберете служебен e-mail адрес
 selection	common	bg	Избор
+selection of files can only be done in one folder.  %1 files unselected.	common	bg	Избирането на файлове може да се извърши само в една папка. %1 файлове не са избрани.
 send	common	bg	Изпращане
 senegal	common	bg	Сенегал
 september	common	bg	Септември
--- a/api/lang/egw_ca.lang
+++ b/api/lang/egw_ca.lang
@ -108,7 +108,6 @@ blurtext	common	ca	Texto poco claro
 bold	common	ca	Negreta
 bolivia	common	ca	BOLIVIA
 border	common	ca	Borde
-border-line-thickness for the table-tag	common	ca	Grosor de la línea del borde de la etiqueta de la tabla
 bosnia and herzegovina	common	ca	BOSNIA I HERZEGOVINA
 botswana	common	ca	BOTSWANA
 bottom	common	ca	Part inferior
@ -627,7 +626,6 @@ oops! you caught us in the middle of system maintainance.	common	ca	Ups! Ens heu
 open	common	ca	obert
 open notify window	common	ca	Obrir finestra de notificació
 open popup window	common	ca	Obrir finestra emergent
-open sidebox	common	ca	Obre el menú del costat
 optional note about the link	common	ca	nota opcional sobre el enlace
 options	common	ca	Opciones
 or	common	ca	o
--- a/api/lang/egw_cs.lang
+++ b/api/lang/egw_cs.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	cs	Všechny adresáře
 all categories	common	cs	Všechny kategorie
 all days	common	cs	Všechny dny
 all fields	common	cs	Všechna pole
+all files	common	cs	Všechny soubory
 all in one	groupdav	cs	Vše v jednom
 all languages	common	cs	Všechny jazyky
 all operations save the template!	common	cs	Všechny operace ukládají šablonu!
@ -197,7 +198,6 @@ blurtext	common	cs	rozmazaný text
 bold	common	cs	Tučné
 bolivia	common	cs	BOLÍVIE
 border	common	cs	Okraj
-border-line-thickness for the table-tag	common	cs	Tloušťka okraje pro tag tabulky
 bosnia and herzegovina	common	cs	BOSNA A HERCEGOVINA
 botswana	common	cs	BOTSWANA
 bottom	common	cs	Dolní okraj
@ -789,6 +789,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	cs	Odkaz připojený k e-mailu dovoluje příjemcům stáhnout aktuální verzi souboru
 link target %1 not found!	common	cs	Propojení s %1 nebylo nalezeno!
 link title of current record	common	cs	Odkaz na název aktuálního záznamu
+link to each entry	common	cs	Odkaz na jednotlivé položky
 linkapps	common	cs	Propojit s aplikací
 linked	common	cs	Propojeno
 linkentry	common	cs	Záznam propojení
@ -802,6 +803,7 @@ list members	common	cs	Seznam členů
 list of files linked to the current record	preferences	cs	Seznam souborů připojených k aktuálnímu záznamu
 lithuania	common	cs	LITVA
 load	common	cs	Nahrát
+load more links ...	common	cs	Načíst další odkazy ...
 load this template into the editor	common	cs	Načíst tuto šablonu do editoru
 loading	common	cs	Nahrávám
 local	common	cs	Lokální
@ -842,6 +844,10 @@ maybe	common	cs	Možná
 mayotte	common	cs	MAYOTTE
 medium	common	cs	Střední
 menu	common	cs	Menu
+merge	common	cs	Sloučit
+merge & send	common	cs	Sloučení a odeslání
+merge individually	common	cs	Sloučit jednotlivě
+merge options	common	cs	Možnosti sloučení
 merged document filename	preferences	cs	Název souboru sloučeného dokumentu
 message	common	cs	Zpráva
 message ...	common	cs	Zpráva ...
@ -978,7 +984,6 @@ open	common	cs	Otevřít
 open existing contact	common	cs	Otevřít stávající kontakt
 open notify window	common	cs	Otevřít okno s upozorněním
 open popup window	common	cs	Otevřít překryvné okno
-open sidebox	common	cs	Otevřít postranní panel
 open the online help.	common	cs	Otevřit online nápovědu
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	cs	Přihlášení pomocí OpenIDConnect proběhlo úspěšně, ale uživatel '%1' v EGroupware NEexistuje a automatické vytváření uživatelů je zakázáno!
 operator	common	cs	Operátor
@ -1147,6 +1152,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	cs	Uložit
 save all	common	cs	Uložit vše
 save as	common	cs	Uložit jako
+save as pdf	common	cs	Uložit jako PDF
 save as zip	common	cs	Uložit jako ZIP soubor
 save selected columns as default preference for all users.	common	cs	Uložit vybrané sloupce jako výchozí předvolbu pro všechny uživatele.
 save the changes made and close the window	common	cs	Uložit provedené změny a zavřít okno
@ -1226,6 +1232,7 @@ select work email address	common	cs	Vybrat pracovní e-mailovou adresu
 select year	common	cs	Vybrat rok
 selectbox	common	cs	Rozbalovací nabídka
 selection	common	cs	Výběr
+selection of files can only be done in one folder.  %1 files unselected.	common	cs	Výběr souborů lze provést pouze v jedné složce. %1 souborů nevybráno.
 send	common	cs	Odeslat
 send succeeded to %1	common	cs	Úspěšně odesláno na %1
 senegal	common	cs	SENEGAL
--- a/api/lang/egw_da.lang
+++ b/api/lang/egw_da.lang
@ -75,6 +75,7 @@ all addressbooks	groupdav	da	Alle adressebøger
 all categories	common	da	Alle kategorier
 all days	common	da	Alle dage
 all fields	common	da	Alle felter
+all files	common	da	Alle filer
 all in one	groupdav	da	Alle i én
 all users	common	da	Alle brugere
 allow editing the %1	common	da	Tillad redigering af %1
@ -484,9 +485,11 @@ license	common	da	Licens
 liechtenstein	common	da	Liechenstein
 light mode	common	da	Lys tilstand
 link	common	da	Link
+link to each entry	common	da	Link til hver post
 list	common	da	Liste
 lithuania	common	da	Lithuania
 load	common	da	Indlæs
+load more links ...	common	da	Indlæs flere links ...
 local	common	da	Lokal
 login	common	da	Login
 login rejected by epl firewall, please contact your administrator	common	da	Login afvist af EGroupware firewall, kontakt venligst din administrator.
@ -520,6 +523,10 @@ may	common	da	Maj
 mayotte	common	da	Mayotte
 medium	common	da	Medium
 menu	common	da	Menu
+merge	common	da	Flette
+merge & send	common	da	Flet og send
+merge individually	common	da	Flet individuelt
+merge options	common	da	Indstillinger for fletning
 merged document filename	preferences	da	Flettet dokument filnavn
 message	common	da	Besked
 message ...	common	da	Besked ...
@ -724,6 +731,7 @@ saudi arabia	common	da	Saudi Arabien
 save	common	da	Gem
 save all	common	da	Gem alle
 save as	common	da	Gem som
+save as pdf	common	da	Gem som PDF
 save as zip	common	da	Gem som ZIP
 save selected columns as default preference for all users.	common	da	Gem kolonner som standardindstilling for alle brugere.
 save the changes made and close the window	common	da	Gem ændringer og luk
@ -746,6 +754,7 @@ select one	common	da	Vælg en
 select user	common	da	Vælg bruger
 select work email address	common	da	Vælg arbejds e-mail adresse
 selectbox	common	da	Selectboks
+selection of files can only be done in one folder.  %1 files unselected.	common	da	Valg af filer kan kun ske i én mappe. %1 filer er ikke valgt.
 send	common	da	Send
 senegal	common	da	Senegal
 september	common	da	September
--- a/api/lang/egw_de.lang
+++ b/api/lang/egw_de.lang
@ -819,7 +819,7 @@ list members	common	de	Mitglieder anzeigen
 list of files linked to the current record	preferences	de	Liste der Dokumente, die zu dem aktuellen Datensatz gehören.
 lithuania	common	de	LITAUEN
 load	common	de	Daten werden geladen
-load more links ...	common	de	Weitere Verknüpfungen laden ...
+load more links ...	common	de	Weitere Links laden ...
 load this template into the editor	common	de	Lädt diese Template zum Bearbeiten
 loading	common	de	Lade
 local	common	de	Lokal
@ -1002,7 +1002,6 @@ open	common	de	Öffnen
 open existing contact	common	de	Vorhandenen Kontakt öffnen
 open notify window	common	de	Benachrichtigungsfenster öffnen
 open popup window	common	de	Pop-up Fenster öffnen
-open sidebox	common	de	Seitenmenü öffnen
 open the online help.	common	de	Öffnet die Online-Hilfe
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	de	OpenIDConnect Anmeldung erfolgreich, aber der Benutzer '%1' existiert NICHT in EGroupware, UND das automatische Anlegen von Benutzers ist ausgeschaltet!
 operator	common	de	Operator
@ -1183,7 +1182,7 @@ save as zip	common	de	Als ZIP-Datei speichern
 save selected columns as default preference for all users.	common	de	Speichert die ausgewählten Spalten als Vorgabe für alle Benutzer.
 save the changes made and close the window	common	de	Speichert die Änderungen uns schließt das Fenster
 save the etemplate under the above keys (name, ...), change them for a saveas	common	de	Speichert das eTemplate unter den obigen Schlüsseln (name, ...), ändern für ein Speichern unter
-saved column sizes to preferences.	common	de	Spaltengrößen in den Voreinstellungen gespeichert
+saved column sizes to preferences.	common	de	Spaltengrößen in den Voreinstellungen gespeichert.
 saves changes to tables_current.inc.php	common	de	Speichert die Änderungen in tables_current.inc.php
 saves the template with given version number and closes the window	common	de	Speichert das Template unter der angegebenen Versionsnummer und schließt das Fenster.
 scale	common	de	Scale
--- a/api/lang/egw_el.lang
+++ b/api/lang/egw_el.lang
@ -66,6 +66,7 @@ all	common	el	Ολα
 all addressbooks	groupdav	el	Όλα τα βιβλία διευθύνσεων
 all categories	common	el	Όλες οι κατηγορίες
 all fields	common	el	όλα τα πεδία
+all files	common	el	Όλα τα αρχεία
 all users	common	el	Ολοι οι χρήστες
 allow editing the %1	common	el	Επιτρέψτε την επεξεργασία του: %1
 alternate style-sheet:	common	el	Εναλλακτικό στυλ-φύλλου:
@ -509,11 +510,13 @@ link	common	el	Σύνδεσμος
 link is appended to mail allowing recipients to download currently attached version of files	common	el	Ο σύνδεσμος επισυνάπτεται στην αλληλογραφία επιτρέποντας στους παραλήπτες να κατεβάσουν την τρέχουσα επισυναπτόμενη έκδοση των αρχείων
 link is appended to mail allowing recipients to download or modify up to date version of files (epl only)	common	el	Ο σύνδεσμος επισυνάπτεται στην αλληλογραφία που επιτρέπει στους παραλήπτες να κατεβάζουν ή να τροποποιούν την ενημερωμένη έκδοση των αρχείων (μόνο EPL)
 link is appended to mail allowing recipients to download up to date version of files	common	el	Ο σύνδεσμος επισυνάπτεται στην αλληλογραφία που επιτρέπει στους παραλήπτες να κατεβάζουν την ενημερωμένη έκδοση των αρχείων
+link to each entry	common	el	Σύνδεσμος σε κάθε καταχώρηση
 links and attached files	preferences	el	Σύνδεσμοι και συνημμένα αρχεία
 list	common	el	Λίστα
 list members	common	el	Μέλη λίστας
 lithuania	common	el	ΛΙΘΟΥΑΝΙΑ
 load	common	el	Φόρτωση
+load more links ...	common	el	Φόρτωση περισσότερων συνδέσμων ...
 loading	common	el	φόρτωση
 local	common	el	Τοπικός
 locations	common	el	τοποθεσίες
@ -549,6 +552,10 @@ may	common	el	Μάϊος
 mayotte	common	el	ΜΑΓΙΟΤΕ
 medium	common	el	Μεσαίο
 menu	common	el	Μενού
+merge	common	el	Συγχώνευση
+merge & send	common	el	Συγχώνευση & αποστολή
+merge individually	common	el	Συγχώνευση μεμονωμένα
+merge options	common	el	Επιλογές συγχώνευσης
 merged document filename	preferences	el	Συγχωνευμένο όνομα αρχείου εγγράφου
 message	common	el	Μήνυμα
 mexico	common	el	ΜΕΞΙΚΟ
@ -639,7 +646,6 @@ open	common	el	Άνοιγμα
 open existing contact	common	el	Άνοιγμα υπάρχουσας επαφής
 open notify window	common	el	Ανοιξε το παράθυρο ειδοποίησης
 open popup window	common	el	Ανοιξε το εκτινασσόμενο παράθυρο
-open sidebox	common	el	Άνοιγμα μενού
 open the online help.	common	el	Άνοιγμα της ηλεκτρονικής βοήθειας
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	el	Επιτυχής σύνδεση OpenIDConnect, αλλά ο χρήστης '%1' ΔΕΝ υπάρχει στο EGroupware, ΚΑΙ η αυτόματη δημιουργία χρηστών είναι απενεργοποιημένη!
 operator	common	el	Χειριστής
@ -762,6 +768,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	el	Αποθήκευση
 save all	common	el	Αποθήκευση όλων
 save as	common	el	Αποθήκευση ως
+save as pdf	common	el	Αποθήκευση ως PDF
 save as zip	common	el	Αποθήκευση ως ZIP
 saved column sizes to preferences.	common	el	Αποθηκευμένα μεγέθη στηλών στις προτιμήσεις.
 search	common	el	Αναζήτηση
@ -789,6 +796,7 @@ select user or group	common	el	Επιλογή χρήστη ή ομάδας
 select work email address	common	el	Επιλογή διεύθυνσης email eργασίας
 selectbox	common	el	Κουτί επιλογής
 selection	common	el	Επιλογή
+selection of files can only be done in one folder.  %1 files unselected.	common	el	Η επιλογή των αρχείων μπορεί να γίνει μόνο σε έναν φάκελο.  %1 αρχεία δεν έχουν επιλεγεί.
 send	common	el	Αποστολή
 senegal	common	el	ΣΕΝΕΓΑΛΗ
 september	common	el	Σεπτέμβριος
--- a/api/lang/egw_en.lang
+++ b/api/lang/egw_en.lang
@ -1002,7 +1002,6 @@ open	common	en	Open
 open existing contact	common	en	Open existing contact
 open notify window	common	en	Open notify window
 open popup window	common	en	Open popup window
-open sidebox	common	en	Open side box
 open the online help.	common	en	Open the online help
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	en	OpenIDConnect login successful, but user '%1' does NOT exist in EGroupware, AND automatic user creating is disabled!
 operator	common	en	Operator
@ -1259,7 +1258,7 @@ select work email address	common	en	Select work email address
 select year	common	en	Select year
 selectbox	common	en	Select box
 selection	common	en	Selection
-selection of files can only be done in one folder.  %1 files unselected.	common	en	Selection of files can only be done in one folder.  %1 files unselected.
+selection of files can only be done in one folder.  %1 files unselected.	common	en	Selection of files can only be done in one folder. %1 files unselected.
 send	common	en	Send
 send succeeded to %1	common	en	Send succeeded to %1
 senegal	common	en	SENEGAL
--- a/api/lang/egw_es-es.lang
+++ b/api/lang/egw_es-es.lang
@ -118,6 +118,7 @@ all addressbooks	groupdav	es-es	Todas las libretas de direcciones
 all categories	common	es-es	Todas las categorías
 all days	common	es-es	Todos los días
 all fields	common	es-es	Todos los campos
+all files	common	es-es	Todos los archivos
 all in one	groupdav	es-es	Todo en uno
 all languages	common	es-es	Todos los idiomas
 all operations save the template!	common	es-es	¡Todas las operaciones guardan la plantilla!
@ -202,7 +203,6 @@ blurtext	common	es-es	Texto poco claro
 bold	common	es-es	Negrita
 bolivia	common	es-es	BOLIVIA
 border	common	es-es	Borde
-border-line-thickness for the table-tag	common	es-es	Grosor de la línea del borde de la etiqueta de la tabla
 bosnia and herzegovina	common	es-es	BOSNIA AND HERZEGOVINA
 botswana	common	es-es	BOTSWANA
 bottom	common	es-es	Parte inferior
@ -801,6 +801,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	es-es	El enlace se adjunta al correo-e, lo que permite a los destinatarios descargar una versión actualizada de los archivos
 link target %1 not found!	common	es-es	¡No se ha encontrado el enlace de destino %1!
 link title of current record	common	es-es	Vincular título del registro actual
+link to each entry	common	es-es	Enlace a cada entrada
 linkapps	common	es-es	Enlace a aplicaciones
 linked	common	es-es	Enlazado
 linkentry	common	es-es	Entrada de enlace
@ -814,6 +815,7 @@ list members	common	es-es	Lista de miembros
 list of files linked to the current record	preferences	es-es	Lista de archivos vinculados al registro actual
 lithuania	common	es-es	LITUANIA
 load	common	es-es	Cargar
+load more links ...	common	es-es	Cargar más enlaces ...
 load this template into the editor	common	es-es	Cargar esta plantilla en el editor
 loading	common	es-es	Cargando
 local	common	es-es	Local
@ -855,6 +857,10 @@ maybe	common	es-es	Tal vez
 mayotte	common	es-es	MAYOTTE
 medium	common	es-es	Medio
 menu	common	es-es	Menú
+merge	common	es-es	Fusionar
+merge & send	common	es-es	Fusionar y enviar
+merge individually	common	es-es	Fusionar individualmente
+merge options	common	es-es	Opciones de fusión
 merged document filename	preferences	es-es	Nombre de archivo del documento combinado
 message	common	es-es	Mensaje
 message ...	common	es-es	Mensaje ...
@ -1166,6 +1172,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	es-es	Grabar
 save all	common	es-es	Guardar todo
 save as	common	es-es	Guardar como
+save as pdf	common	es-es	Guardar como PDF
 save as zip	common	es-es	Guardar como ZIP
 save selected columns as default preference for all users.	common	es-es	Guardar las columnas seleccionadas como preferencia predeterminada para todos los usuarios.
 save the changes made and close the window	common	es-es	Guardar los cambios realizados y cerrar la ventana
@ -1246,6 +1253,7 @@ select work email address	common	es-es	Seleccione dirección de correo del traba
 select year	common	es-es	Seleccione año
 selectbox	common	es-es	Cuadro de selección
 selection	common	es-es	Selección
+selection of files can only be done in one folder.  %1 files unselected.	common	es-es	La selección de archivos sólo puede hacerse en una carpeta. %1 ficheros no seleccionados.
 send	common	es-es	Enviar
 send succeeded to %1	common	es-es	Enviado correctamente a %1
 senegal	common	es-es	SENEGAL
--- a/api/lang/egw_et.lang
+++ b/api/lang/egw_et.lang
@ -612,6 +612,7 @@ select which values to show	common	et	Vali mis väärtusi näidata
 select work email address	common	et	Vali töö email aadress
 select year	common	et	Vali Aasta
 selection	common	et	Valik
+selection of files can only be done in one folder.  %1 files unselected.	common	et	Failide valimist saab teha ainult ühes kaustas. %1 failid ei ole valitud.
 send	common	et	Saada
 senegal	common	et	SENEGAL
 september	common	et	September
--- a/api/lang/egw_eu.lang
+++ b/api/lang/egw_eu.lang
@ -105,7 +105,6 @@ blurtext	common	eu	testu ez oso argia
 bold	common	eu	Lodia
 bolivia	common	eu	BOLIBIA
 border	common	eu	Ertza
-border-line-thickness for the table-tag	common	eu	Taulako etiketaren ertzeko lerroaren handiera
 bosnia and herzegovina	common	eu	BOSNIA ETA HERZEGOVINA
 botswana	common	eu	BOSTWANA
 bottom	common	eu	Beheraldea
--- a/api/lang/egw_fa.lang
+++ b/api/lang/egw_fa.lang
@ -102,7 +102,6 @@ blocked, too many attempts	common	fa	بلاک شده، تلاش زياد
 blurtext	common	fa	متن بلوری
 bold	common	fa	درشت
 border	common	fa	کادر
-border-line-thickness for the table-tag	common	fa	ضخامت خط کادر برای علامت جدول
 bosnia and herzegovina	common	fa	بوسنی و هرز گوين
 bottom	common	fa	پایین
 box	common	fa	جعبه
@ -558,7 +557,6 @@ only yours	common	fa	فقط برای شما
 open	common	fa	کارهای باز
 open notify window	common	fa	باز کردن پنجره آگاهی
 open popup window	common	fa	باز کردن پنجره جدا
-open sidebox	common	fa	باز کردن جعبه کناری
 open the online help.	common	fa	باز کردن راهنمای برخط
 operator	common	fa	عملگر
 optional note about the link	common	fa	یادداشت دلخواه برای پیوند
--- a/api/lang/egw_fi.lang
+++ b/api/lang/egw_fi.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	fi	Kaikki osoitekirjat
 all categories	common	fi	Kaikki luokat
 all days	common	fi	Kaikki päivät
 all fields	common	fi	Kaikki kentät
+all files	common	fi	Kaikki tiedostot
 all in one	groupdav	fi	Kaikki samaan
 all languages	common	fi	Kaikki kielet
 all operations save the template!	common	fi	Kaikki toiminnot tallentavat mallipohjan!
@ -197,7 +198,6 @@ blurtext	common	fi	blurText
 bold	common	fi	Lihavoi
 bolivia	common	fi	BOLIVIA
 border	common	fi	Reunaviiva
-border-line-thickness for the table-tag	common	fi	Reunaviivan paksuus
 bosnia and herzegovina	common	fi	BOSNIA AND HERZEGOVINA
 botswana	common	fi	BOTSWANA
 bottom	common	fi	Alareuna
@ -775,6 +775,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	fi	Linkki liitetään sähköpostiviestiin, jotta vastaanottajat voivat ladata tiedostojen ajantasaisen version
 link target %1 not found!	common	fi	Linkkikohdetta %1 ei löytynyt!
 link title of current record	common	fi	Nykyisen tietueen linkin otsikko
+link to each entry	common	fi	Linkki kuhunkin merkintään
 linkapps	common	fi	Linkki sovellukseen
 linked	common	fi	Linkitetty
 linkentry	common	fi	Linkki tietueeseen
@ -788,6 +789,7 @@ list members	common	fi	Jäsenluettelo
 list of files linked to the current record	preferences	fi	Lista liitetyistä tiedostoista
 lithuania	common	fi	LIETTUIA
 load	common	fi	Lataa
+load more links ...	common	fi	Lataa lisää linkkejä ...
 load this template into the editor	common	fi	Lataa mallipohja muokattavaksi
 loading	common	fi	Ladataan
 local	common	fi	Paikallinen
@ -826,6 +828,10 @@ may	common	fi	Toukokuu
 mayotte	common	fi	MAYOTTE
 medium	common	fi	Normaali
 menu	common	fi	Valikko
+merge	common	fi	Yhdistä
+merge & send	common	fi	Yhdistä & lähetä
+merge individually	common	fi	Yhdistä yksitellen
+merge options	common	fi	Yhdistämisvaihtoehdot
 merged document filename	preferences	fi	Yhdistetyn asiakirjan tiedostonimi
 message	common	fi	Viesti
 message ...	common	fi	Viesti ...
@ -1102,6 +1108,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	fi	Tallenna
 save all	common	fi	Tallenna kaikki
 save as	common	fi	Tallenna nimellä
+save as pdf	common	fi	Tallenna PDF-tiedostona
 save as zip	common	fi	Tallenna ZIP-muodossa
 save selected columns as default preference for all users.	common	fi	Tallenna valitut sarakkeet oletusasetuksiksi kaikille käyttäjille.
 save the changes made and close the window	common	fi	Tallenna muutokset ja sulje ikkuna
@ -1176,6 +1183,7 @@ select work email address	common	fi	Valitse työsähköpostiosoite
 select year	common	fi	Valitse vuosi
 selectbox	common	fi	Valintalaatikko
 selection	common	fi	Valinta
+selection of files can only be done in one folder.  %1 files unselected.	common	fi	Tiedostojen valinta voidaan tehdä vain yhdessä kansiossa. %1 tiedostoa ei ole valittu.
 send	common	fi	Lähetä
 send succeeded to %1	common	fi	Lähetä onnistui osoitteeseen %1
 senegal	common	fi	SENEGAL
--- a/api/lang/egw_fr.lang
+++ b/api/lang/egw_fr.lang
@ -118,6 +118,7 @@ all addressbooks	groupdav	fr	Tous les carnets d'adresses
 all categories	common	fr	Toutes les catégories
 all days	common	fr	Tous les jours
 all fields	common	fr	Tous les champs
+all files	common	fr	Tous les fichiers
 all in one	groupdav	fr	Tout en un
 all languages	common	fr	Toutes les langues
 all operations save the template!	common	fr	Toutes les opérations sauvegardent le template !
@ -202,7 +203,6 @@ blurtext	common	fr	texteFlou
 bold	common	fr	Gras
 bolivia	common	fr	BOLIVIE
 border	common	fr	Bord
-border-line-thickness for the table-tag	common	fr	Epaisseur de la ligne de bord pour le tag de la table eTemplate
 bosnia and herzegovina	common	fr	BOSNIE HERZEGOVINE
 botswana	common	fr	BOTSWANA
 bottom	common	fr	Bas
@ -801,6 +801,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	fr	Le lien est ajouté au mail permettant aux destinataires de télécharger la version à jour des fichiers
 link target %1 not found!	common	fr	Cible de lien %1 non trouvé
 link title of current record	common	fr	Link title of current record
+link to each entry	common	fr	Lien vers chaque entrée
 linkapps	common	fr	LinkApps
 linked	common	fr	Ligé
 linkentry	common	fr	LinkEntry
@ -814,6 +815,7 @@ list members	common	fr	Liste les membres
 list of files linked to the current record	preferences	fr	Listes des fichiers liés à l'enregistrement courant
 lithuania	common	fr	LITHUANIE
 load	common	fr	Charger
+load more links ...	common	fr	Charger d'autres liens ...
 load this template into the editor	common	fr	Charger ce template dans l'éditeur
 loading	common	fr	Chargement
 local	common	fr	Local
@ -854,6 +856,10 @@ maybe	common	fr	Peut-être
 mayotte	common	fr	MAYOTTE
 medium	common	fr	Moyen
 menu	common	fr	Menu
+merge	common	fr	Fusionner
+merge & send	common	fr	Fusionner et envoyer
+merge individually	common	fr	Fusionner individuellement
+merge options	common	fr	Options de fusion
 merged document filename	preferences	fr	Nom de fichier du document fusionné
 message	common	fr	Message
 message ...	common	fr	Message...
@ -991,7 +997,6 @@ open	common	fr	Ouvrir
 open existing contact	common	fr	Ouvrir un contact existant
 open notify window	common	fr	Ouvrir une fenêtre de notification
 open popup window	common	fr	Ouvrir une fenêtre de popup
-open sidebox	common	fr	Ouvrir la barre de menu latérale
 open the online help.	common	fr	Ouvrir l'aide en ligne
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	fr	Connexion OpenIDConnect réussie, mais l'utilisateur '%1' n'existe PAS dans EGroupware, et la création automatique d'utilisateurs est désactivée !
 operator	common	fr	Opérateur
@ -1166,6 +1171,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	fr	Enregistrer
 save all	common	fr	Tout enregistrer
 save as	common	fr	Enregistrer comme
+save as pdf	common	fr	Enregistrer en PDF
 save as zip	common	fr	Sauvegarder en ZIP
 save selected columns as default preference for all users.	common	fr	Enregistrer les colonnes sélectionnées comme préférence par défaut pour tous les utilisateurs.
 save the changes made and close the window	common	fr	Enregistrer les modifications et fermer la fenêtre
@ -1246,6 +1252,7 @@ select work email address	common	fr	Sélectionner l'email professionnel
 select year	common	fr	Choisissez l'année
 selectbox	common	fr	Boîte de sélection
 selection	common	fr	Sélection
+selection of files can only be done in one folder.  %1 files unselected.	common	fr	La sélection des fichiers ne peut se faire que dans un seul dossier. %1 fichiers non sélectionnés.
 send	common	fr	Envoyer
 send succeeded to %1	common	fr	Envoi réussi vers %1
 senegal	common	fr	SENEGAL
--- a/api/lang/egw_hr.lang
+++ b/api/lang/egw_hr.lang
@ -96,7 +96,6 @@ blocked, too many attempts	common	hr	Blokirano, previše pokušaja
 blurtext	common	hr	blurText
 bolivia	common	hr	BOLIVIA
 border	common	hr	Border
-border-line-thickness for the table-tag	common	hr	Border-line-thickness for the table-tag
 bosnia and herzegovina	common	hr	BOSNIA AND HERZEGOVINA
 botswana	common	hr	BOTSWANA
 bottom	common	hr	dno
--- a/api/lang/egw_hu.lang
+++ b/api/lang/egw_hu.lang
@ -74,6 +74,7 @@ all	common	hu	Összes
 all addressbooks	groupdav	hu	Minden címjegyzék
 all categories	common	hu	Minden kategória
 all fields	common	hu	Összes mező
+all files	common	hu	Minden fájl
 all in one	groupdav	hu	Mindent egyben
 all languages	common	hu	Minden nyelv
 all users	common	hu	Összes felhasználó
@ -270,6 +271,7 @@ detail	common	hu	Részlet
 details	common	hu	Részletek
 directory	common	hu	Mappa
 directory does not exist, is not readable by the webserver or is not relative to the document root!	common	hu	A könyvtár nem létezik, vagy nem olvasható a webszerverrel vagy a dokumentum gyökérkönyvtárához képest nem helyes a relatív útvonal!
+directory for storing merged documents	preferences	hu	Mappa az egyesített dokumentumok tárolására
 disabled	common	hu	Letiltva
 djibouti	common	hu	Dzsibuti
 do you also want to delete all subcategories ?	common	hu	Az alkategóriákat is törölni szeretné?
@ -510,10 +512,12 @@ line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ign
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	hu	%1 sor: '%2'<br><b>a csv adatok nem egyeznek a(z) %3 táblázat oszlopszámaival ==> kihagyva</b>
 link	common	hu	Hivatkozás
 link target %1 not found!	common	hu	Link célpontja nem található (%1)!
+link to each entry	common	hu	Link az egyes bejegyzésekhez
 list	common	hu	Lista
 list members	common	hu	Listatagok
 lithuania	common	hu	Litvánia
 load	common	hu	Betöltés
+load more links ...	common	hu	További linkek betöltése ...
 loading	common	hu	Betöltés
 local	common	hu	Helyi
 locations	common	hu	Helyek
@ -549,6 +553,11 @@ may	common	hu	Május
 mayotte	common	hu	Mayotte
 medium	common	hu	Közepes
 menu	common	hu	Menü
+merge	common	hu	Egyesítés
+merge & send	common	hu	Egyesítés és küldés
+merge individually	common	hu	Egyesítés külön-külön
+merge options	common	hu	Összevonási lehetőségek
+merged document filename	preferences	hu	Egyesített dokumentum fájlneve
 message	common	hu	Üzenet
 mexico	common	hu	Mexikó
 micronesia, federated states of	common	hu	Mikronézia
@ -751,6 +760,8 @@ saudi arabia	common	hu	Szaúd Arábia
 savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants version: %2	common	hu	A Savant2 verziója és wrappere különbözik. <br>Ez a verzió: %1 <br>Savant verzió: %2
 save	common	hu	Elment
 save all	common	hu	Összes mentése
+save as pdf	common	hu	Mentés PDF-ként
+save as zip	common	hu	Mentés ZIP-ként
 saved column sizes to preferences.	common	hu	Elmentett oszlopméretek a preferenciákhoz.
 search	common	hu	Keres
 search %1 '%2'	common	hu	Keres %1 '%2'
@ -913,6 +924,7 @@ weekend	common	hu	Hétvége
 welcome	common	hu	Üdvözlet
 western european	common	hu	Nyugat-európai
 western sahara	common	hu	Nyugat-Szahara
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	hu	Amikor a bejegyzéseket dokumentumokká egyesíti, azok itt kerülnek tárolásra. Ha nincs mappa megadva, akkor a fájlok az otthoni könyvtárban (%1) lesznek tárolva
 when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	hu	Igen választása esetén a Kezdőlap és Kilépés gombok megjelennek a felső alkalmazás tálcán.
 where and how will the egroupware links like preferences, about and logout be displayed.	common	hu	Hol és hogyan legyenek az EGroupware link szerű tulajdonságok, leírások és kijelentkezés megjelenítve.
 which groups	common	hu	Melyik csoport
--- a/api/lang/egw_id.lang
+++ b/api/lang/egw_id.lang
@ -105,6 +105,7 @@ all addressbooks	groupdav	id	Semua buku alamat
 all categories	common	id	Semua kategori
 all days	common	id	Seharian
 all fields	common	id	Semua field
+all files	common	id	Semua berkas
 all in one	groupdav	id	Semua dalam satu
 all languages	common	id	Semua bahasa
 all users	common	id	Semua pengguna
@ -566,6 +567,7 @@ license	common	id	Lisensi
 liechtenstein	common	id	LIECHTENSTEIN
 light mode	common	id	Mode terang
 link	common	id	Tautan
+link to each entry	common	id	Tautan ke setiap entri
 linkapps	common	id	Tautkan aplikasi
 linkentry	common	id	Entri tautan
 linklist	common	id	Daftar tautan
@ -576,6 +578,7 @@ list	common	id	Daftar
 list members	common	id	Daftar anggota
 lithuania	common	id	LITHUANIA
 load	common	id	Muatkan
+load more links ...	common	id	Memuat lebih banyak pranala ...
 load this template into the editor	common	id	Muatkan templat ini ke editor
 loading	common	id	Memuatkan
 local	common	id	Lokal
@ -611,6 +614,10 @@ may	common	id	Mei
 mayotte	common	id	MAYOTTE
 medium	common	id	Medium
 menu	common	id	Menu
+merge	common	id	Gabungkan
+merge & send	common	id	Gabungkan & kirim
+merge individually	common	id	Gabungkan satu per satu
+merge options	common	id	Opsi penggabungan
 merged document filename	preferences	id	Nama file dokumen yang digabungkan
 message	common	id	Pesan
 message ...	common	id	Pesan ...
@ -827,6 +834,7 @@ saudi arabia	common	id	ARAB SAUDI
 save	common	id	Simpan
 save all	common	id	Simpan semuanya
 save as	common	id	Simpan sebagai
+save as pdf	common	id	Simpan sebagai PDF
 save as zip	common	id	Simpan sebagai ZIP
 save the changes made and close the window	common	id	Simpan perubahan dan tutup
 saved column sizes to preferences.	common	id	Menyimpan ukuran kolom ke preferensi.
@ -871,6 +879,7 @@ select work email address	common	id	Pilih alamat email kerja
 select year	common	id	Pilih Tahun
 selectbox	common	id	Selectbox
 selection	common	id	Pemilihan
+selection of files can only be done in one folder.  %1 files unselected.	common	id	Pemilihan file hanya dapat dilakukan dalam satu folder. %1 file tidak dipilih.
 send	common	id	Kirim
 send succeeded to %1	common	id	Pengiriman berhasil ke %1
 senegal	common	id	SENEGAL
--- a/api/lang/egw_it.lang
+++ b/api/lang/egw_it.lang
@ -198,7 +198,6 @@ blurtext	common	it	blurText
 bold	common	it	Grassetto
 bolivia	common	it	BOLIVIA
 border	common	it	Bordo
-border-line-thickness for the table-tag	common	it	Spessore linea bordo per table-tag
 bosnia and herzegovina	common	it	BOSNIA E HERZEGOVINA
 botswana	common	it	BOTSWANA
 bottom	common	it	In fondo
@ -805,6 +804,7 @@ list members	common	it	Elenco membri
 list of files linked to the current record	preferences	it	Elenco dei file collegati al record attuale
 lithuania	common	it	LITUANIA
 load	common	it	Carica
+load more links ...	common	it	Carica altri link
 load this template into the editor	common	it	Carica questo template nell'editor
 loading	common	it	Sto caricando
 local	common	it	Locale
@ -985,7 +985,6 @@ open	common	it	Apri
 open existing contact	common	it	Aprire il contatto esistente
 open notify window	common	it	Apri finestra di Notifica
 open popup window	common	it	Apri finestra popup
-open sidebox	common	it	Apri riquadro laterale
 open the online help.	common	it	Apre help online.
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	it	L'accesso a OpenIDConnect è riuscito, ma l'utente '%1' NON esiste in EGroupware e la creazione automatica dell'utente è disabilitata!
 operator	common	it	Operatore
@ -1238,6 +1237,7 @@ select work email address	common	it	Selezione indirizzio e-mail ufficio
 select year	common	it	Seleziona Anno
 selectbox	common	it	Selectbox
 selection	common	it	Selezione
+selection of files can only be done in one folder.  %1 files unselected.	common	it	La selezione dei file può essere effettuata solo in una cartella. %1 file non selezionati.
 send	common	it	Invia
 send succeeded to %1	common	it	Invia i riuscito a %1
 senegal	common	it	SENEGAL
--- a/api/lang/egw_iw.lang
+++ b/api/lang/egw_iw.lang
@ -70,7 +70,6 @@ blocked, too many attempts	common	iw	חסום, יותר מדי נסיונות
 blurtext	common	iw	טשטש טקסט
 bold	common	iw	מודגש
 border	common	iw	גבול
-border-line-thickness for the table-tag	common	iw	עובי קו הגבול של תג טבלה
 bottom	common	iw	תחתית
 calendar	common	iw	לוח שנה
 can not have special sql-value null	common	iw	NULL מיוחד SQL לא יכול לקבל ערך
--- a/api/lang/egw_ja.lang
+++ b/api/lang/egw_ja.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	ja	全アドレス帳
 all categories	common	ja	全カテゴリ
 all days	common	ja	全ての日
 all fields	common	ja	全項目
+all files	common	ja	すべてのファイル
 all in one	groupdav	ja	ひとつにまとめる
 all languages	common	ja	全言語
 all operations save the template!	common	ja	All operations save the template!
@ -196,7 +197,6 @@ blocked, too many attempts	common	ja	ブロックされました（試行回数
 blurtext	common	ja	blurText
 bold	common	ja	太字
 border	common	ja	ボーダー
-border-line-thickness for the table-tag	common	ja	テーブル・タグのボーダー線の太さ
 bosnia and herzegovina	common	ja	ボスニア・ヘルツェゴビナ
 botswana	common	ja	ボツワナ
 bottom	common	ja	下部
@ -781,6 +781,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	ja	Link is appended to mail allowing recipients to download up to date version of files
 link target %1 not found!	common	ja	Link target %1 not found!
 link title of current record	common	ja	現在のレコードのリンクタイトル
+link to each entry	common	ja	各エントリーへのリンク
 linkapps	common	ja	Link apps
 linked	common	ja	Linked
 linkentry	common	ja	Link entry
@ -794,6 +795,7 @@ list members	common	ja	メンバー一覧
 list of files linked to the current record	preferences	ja	List of files linked to the current record
 lithuania	common	ja	リトアニア
 load	common	ja	ロード
+load more links ...	common	ja	もっとリンクをロードする
 load this template into the editor	common	ja	テンプレートをエディタにロード
 loading	common	ja	ロード中
 local	common	ja	ローカル
@ -833,6 +835,10 @@ maybe	common	ja	Maybe
 mayotte	common	ja	マヨット
 medium	common	ja	中
 menu	common	ja	メニュー
+merge	common	ja	マージ
+merge & send	common	ja	マージして送信
+merge individually	common	ja	個別にマージ
+merge options	common	ja	マージオプション
 merged document filename	preferences	ja	マージされたドキュメントのファイル名
 message	common	ja	メッセージ
 message ...	common	ja	メッセージ ...
@ -1131,6 +1137,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	ja	保存
 save all	common	ja	全て保存
 save as	common	ja	名前を付けて保存
+save as pdf	common	ja	PDFとして保存
 save as zip	common	ja	圧縮して保存
 save selected columns as default preference for all users.	common	ja	Save columns as default preference for all users.
 save the changes made and close the window	common	ja	Save changes and close
@ -1210,6 +1217,7 @@ select work email address	common	ja	メール・アドレスを選択
 select year	common	ja	年を選択
 selectbox	common	ja	セレクト・ボックス
 selection	common	ja	選択
+selection of files can only be done in one folder.  %1 files unselected.	common	ja	ファイルの選択は 1 つのフォルダでのみ可能です。ファイル %1 が選択されていません。
 send	common	ja	送信
 send succeeded to %1	common	ja	%1宛のメールを送信しました
 senegal	common	ja	セネガル
--- a/api/lang/egw_km.lang
+++ b/api/lang/egw_km.lang
@ -196,7 +196,6 @@ blurtext	common	km	អត្ថបទមិនច្បាស់
 bold	common	km	ដិត
 bolivia	common	km	បូលីវី
 border	common	km	ព្រំដែន
-border-line-thickness for the table-tag	common	km	កម្រាស់បន្ទាត់ព្រំដែនសម្រាប់ស្លាកតារាង
 bosnia and herzegovina	common	km	បូសនី និងហឺហ្សេហ្គោវីណា
 botswana	common	km	បូតស្វាណា
 bottom	common	km	បាត
@ -970,7 +969,6 @@ oops! you caught us in the middle of system maintainance.	common	km	ឱ! អ្
 open	common	km	បើក
 open notify window	common	km	បើកបង្អួចជូនដំណឹង
 open popup window	common	km	បើកបង្អួចលេចឡើង
-open sidebox	common	km	បើកប្រអប់ចំហៀង
 open the online help.	common	km	បើកជំនួយតាមអ៊ីនធឺណិត
 operator	common	km	ប្រតិបត្តិករ
 optional note about the link	common	km	កំណត់ចំណាំជាជម្រើសសម្រាប់តំណភ្ជាប់
--- a/api/lang/egw_ko.lang
+++ b/api/lang/egw_ko.lang
@ -50,6 +50,7 @@ administration	common	ko	관리
 advanced search	common	ko	상세 검색
 all	common	ko	모두
 all fields	common	ko	모든 필드
+all files	common	ko	すべてのファイル
 all users	common	ko	모든 사용자
 and	common	ko	그리고(AND 연산)
 answering no will not ask you again for this browser.	common	ko	아니요라고 대답하면 더 이상 이 브라우저를 입력하라는 메시지가 표시되지 않습니다.
@ -242,8 +243,10 @@ last page	common	ko	끝 페이지로
 lastname	common	ko	성
 left	common	ko	왼쪽
 link	common	ko	링크
+link to each entry	common	ko	各エントリーへのリンク
 list members	common	ko	멤버 목록
 load	common	ko	불러오기
+load more links ...	common	ko	もっとリンクをロードする
 login	common	ko	로그인
 login rejected by epl firewall, please contact your administrator	common	ko	E그룹웨어 방화벽에 의해 로그인이 거부된 경우 관리자에게 문의하세요.
 loginid	common	ko	로그인ID
@ -260,6 +263,11 @@ maintainer	common	ko	관리자
 march	common	ko	3월
 may	common	ko	5월
 medium	common	ko	중간
+merge	common	ko	マージ
+merge & send	common	ko	マージして送信
+merge individually	common	ko	個別にマージ
+merge options	common	ko	マージオプション
+merged document filename	preferences	ko	マージされたドキュメントのファイル名
 message	common	ko	메세지
 minute	common	ko	분
 minutes	common	ko	분
@ -381,6 +389,8 @@ returns struct of users application access	common	ko	사용자의 응용프로
 right	common	ko	오른쪽
 saturday	common	ko	토요일
 save	common	ko	저장
+save as pdf	common	ko	PDFとして保存
+save as zip	common	ko	ZIPとして保存
 search	common	ko	검색
 search accounts	common	ko	계정 찾기
 search or select accounts	common	ko	계정 선택 혹은 검색
@ -398,6 +408,7 @@ select the default width for the application windows	common	ko	이 응용프로
 select user	common	ko	사용자 선택
 select work email address	common	ko	업무 메일주소 선택
 selectbox	common	ko	선택상자
+selection of files can only be done in one folder.  %1 files unselected.	common	ko	ファイルの選択は 1 つのフォルダでのみ可能です。ファイル %1 が選択されていません。
 send	common	ko	보내기
 september	common	ko	9월
 server %1 has been added	common	ko	%1 서버가 추가되었습니다.
--- a/api/lang/egw_lo.lang
+++ b/api/lang/egw_lo.lang
@ -486,7 +486,6 @@ oops! you caught us in the middle of system maintainance.	common	lo	Oops! ລະ
 open	common	lo	ເປີດ
 open notify window	common	lo	ເປີດໜ້າຕ່າງແຈ້ງເຕືອນ
 open popup window	common	lo	ເປີດໜ້າຕ່າງປ໋ອບອັບ
-open sidebox	common	lo	ເປີດກ່ອງດ້ານຂ້າງ
 ordered list	common	lo	ຈັດລຽງລາຍການ
 original	common	lo	ຕົ້ນສະບັບ
 other	common	lo	ອື່ນໆ
--- a/api/lang/egw_lt.lang
+++ b/api/lang/egw_lt.lang
@ -49,6 +49,7 @@ albania	common	lt	ALBANIJA
 algeria	common	lt	ALŽYRAS
 all addressbooks	groupdav	lt	Visos adresų knygelės
 all categories	common	lt	Visos kategorijos
+all files	common	lt	Visi failai
 all in one	groupdav	lt	Viskas viename
 allow editing the %1	common	lt	Leisti redaguoti %1
 andorra	common	lt	ANDORA
@ -128,6 +129,7 @@ delete	common	lt	Trinti
 delete row	common	lt	Trinti eilutę
 denmark	common	lt	DANIJA
 description	common	lt	Apibūdinimas
+directory for storing merged documents	preferences	lt	Aplankas sujungtiems dokumentams saugoti
 djibouti	common	lt	DŽIBUTIS
 don't ask again!	common	lt	Nepaklauskite dar kartą!
 e-mail	common	lt	El. paštas
@ -214,7 +216,9 @@ lastname	common	lt	Pavardė
 latvia	common	lt	LATVIJA
 liberia	common	lt	LIBERIJA
 light mode	common	lt	Šviesus režimas
+link to each entry	common	lt	Nuoroda į kiekvieną įrašą
 lithuania	common	lt	LIETUVA
+load more links ...	common	lt	Įkelti daugiau nuorodų...
 login rejected by epl firewall, please contact your administrator	common	lt	Mailvelope addon instalācija ir veiksmīga. Tagad varat konfigurēt opcijas.
 logout	common	lt	Atsijungimas
 lost login id	common	lt	Pamestas prisijungimo ID
@ -229,6 +233,11 @@ mali	common	lt	MALIS
 malta	common	lt	MALTA
 march	common	lt	Kovas
 menu	common	lt	Meniu
+merge	common	lt	Sujungti
+merge & send	common	lt	Sujungti ir siųsti
+merge individually	common	lt	Sujungti atskirai
+merge options	common	lt	Sujungimo parinktys
+merged document filename	preferences	lt	Sujungto dokumento failo pavadinimas
 mexico	common	lt	MEKSIKA
 minute	common	lt	minutė
 monaco	common	lt	MONAKAS
@ -295,7 +304,10 @@ print	common	lt	Spausdinti
 project	common	lt	Projektas
 qatar	common	lt	KATARAS
 repeat password	common	lt	Pakartoti slaptažodį
+save as pdf	common	lt	Išsaugoti kaip PDF
+save as zip	common	lt	Išsaugoti kaip ZIP
 saved column sizes to preferences.	common	lt	Išsaugoti stulpelių dydžius nustatymuose.
+selection of files can only be done in one folder.  %1 files unselected.	common	lt	Atrinkti failus galima tik viename aplanke. %1 failai neatrinkti.
 show password	common	lt	Rodyti slaptažodį
 show/hide	common	lt	Rodyti/paslėpti šoninę juostą
 sign up	common	lt	Užsiregistruoti
@ -303,6 +315,7 @@ site configuration	common	lt	Programos konfigūracija
 to disable: [! = not]<value>[=<check>] eg: '!@data' disables if content of data is empty	common	lt	To disable: [! = not]<value>[=<check>] eg: '!@data' disables if content of data is empty
 too many rows selected.<br />select all, or less than %1 rows	common	lt	Too many rows selected.<br>Select all, or less than %1 rows
 total: %1 successful: %2 failed: %3 skipped: %4	common	lt	Total: %1 Successful: %2 Failed: %3 Skipped: %4
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	lt	Sujungus įrašus į dokumentus, jie bus saugomi čia. Jei aplankas nenurodytas, jie bus saugomi jūsų namų kataloge (%1)
 yemen	common	lt	JEMENAS
 your account has been updated with new data from your identity provider.	common	lt	Jūsų paskyra buvo atnaujinta naujais jūsų tapatybės paslaugų teikėjo duomenimis.
 your browser is not up-to-date (javascript es6 compatible), you may experience some of the features not working.	common	lt	Jūsų naršyklė nėra atnaujinta (suderinama su JavaScript ES6), gali būti, kad neveiks kai kurios funkcijos.
--- a/api/lang/egw_lv.lang
+++ b/api/lang/egw_lv.lang
@ -91,6 +91,7 @@ all	common	lv	Visi
 all addressbooks	groupdav	lv	Visas adrešu grāmatas
 all categories	common	lv	Visas kategorijas
 all fields	common	lv	Visi lauki
+all files	common	lv	Visi faili
 all in one	groupdav	lv	Viss vienā
 all users	common	lv	Visi lietotāji
 allow editing the %1	common	lv	Atļaut rediģēt %1
@ -150,7 +151,6 @@ blocked, too many attempts	common	lv	Bloķēts, pārāk daudz neveiksmīgu mēģ
 blurtext	common	lv	neskaidrs teksts
 bolivia	common	lv	BOLĪVIJA
 border	common	lv	Robeža
-border-line-thickness for the table-tag	common	lv	Tabulas taga robežlīnijas biezums
 bosnia and herzegovina	common	lv	BOSNIJA UN HERCOGOVINA
 botswana	common	lv	BOTSVĀNA
 bottom	common	lv	Augšā
@ -559,6 +559,7 @@ light mode	common	lv	Gaismas režīms
 link	common	lv	Saite
 link target %1 not found!	common	lv	Saites mērķis %1 nav atrasts!
 link title of current record	common	lv	Pašreizējā ieraksta saites nosaukums
+link to each entry	common	lv	Saite uz katru ierakstu
 linklist	common	lv	Saistīt sarakstu
 links and attached files	preferences	lv	Saites un pievienotie faili
 links to specified application.  example: {{links/addressbook}}	common	lv	Saites uz norādīto lietojumprogrammu. Piemērs: {{links/addressbook}}
@ -568,6 +569,7 @@ list	common	lv	Saraksts
 list members	common	lv	Saraksta dalībnieki
 lithuania	common	lv	LIETUVA
 load	common	lv	Lelādēt
+load more links ...	common	lv	Ielādēt vairāk saites ...
 load this template into the editor	common	lv	Ielādēt šo veidni redaktorā
 local	common	lv	Vietējais
 login	common	lv	Pieteikties
@ -601,6 +603,11 @@ may	common	lv	Maijs
 mayotte	common	lv	MAJOTA
 medium	common	lv	Vidēja
 menu	common	lv	Izvēlne
+merge	common	lv	Apvienot
+merge & send	common	lv	Apvienot un nosūtīt
+merge individually	common	lv	Apvienot atsevišķi
+merge options	common	lv	Apvienošanas opcijas
+merged document filename	preferences	lv	Apvienotais dokumenta faila nosaukums
 message	common	lv	Ziņa
 mexico	common	lv	MEKSIKA
 micronesia, federated states of	common	lv	MIKRONĒZIJAS FEDERATĪVĀS VALSTIS
@ -814,6 +821,7 @@ saudi arabia	common	lv	SAŪDA ARĀBIJA
 save	common	lv	Saglabāt
 save all	common	lv	Saglabāt visus
 save as	common	lv	Saglabāt kā
+save as pdf	common	lv	Saglabāt kā PDF
 save as zip	common	lv	Saglabāt kā ZIP
 save selected columns as default preference for all users.	common	lv	Saglabāt kolonnas kā noklusējuma izvēli visiem lietotājiem.
 save the changes made and close the window	common	lv	Saglabājiet izmaiņas un aizveriet
@ -867,6 +875,7 @@ select work email address	common	lv	Izvēlies e-pasta adresi darbā
 select year	common	lv	Atzīmē gadu
 selectbox	common	lv	Selectbox
 selection	common	lv	Izvēle
+selection of files can only be done in one folder.  %1 files unselected.	common	lv	Failu atlasi var veikt tikai vienā mapē. %1 faili nav atlasīti.
 send	common	lv	Sūtīt
 senegal	common	lv	SENEGĀLA
 september	common	lv	Septembris
--- a/api/lang/egw_nl.lang
+++ b/api/lang/egw_nl.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	nl	Alle adresboeken
 all categories	common	nl	Alle categorieën
 all days	common	nl	Alle dagen
 all fields	common	nl	Alle velden
+all files	common	nl	Alle bestanden
 all in one	groupdav	nl	Alles in een
 all languages	common	nl	Alle talen
 all operations save the template!	common	nl	Alle bewerkingen slaan de template op!
@ -197,7 +198,6 @@ blurtext	common	nl	Vage Text
 bold	common	nl	Vet
 bolivia	common	nl	BOLIVIA
 border	common	nl	Rand
-border-line-thickness for the table-tag	common	nl	Randlijndikte voor de table-tag
 bosnia and herzegovina	common	nl	BOSNIË-HERZEGOVINA
 botswana	common	nl	BOTSWANA
 bottom	common	nl	Onderzijde
@ -778,6 +778,7 @@ line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored
 link	common	nl	Link
 link target %1 not found!	common	nl	Link doel %1 niet gevonden!
 link title of current record	common	nl	Link titel van huidig record
+link to each entry	common	nl	Link naar elk item
 linkapps	common	nl	Linktoepassingen
 linkentry	common	nl	Linkitem
 linklist	common	nl	Linklijst
@ -790,6 +791,7 @@ list members	common	nl	Lijst van leden
 list of files linked to the current record	preferences	nl	Lijs van bestanden gelinkt aan huidig record
 lithuania	common	nl	LITOUWEN
 load	common	nl	Laad
+load more links ...	common	nl	Meer links laden ...
 load this template into the editor	common	nl	Laad deze tempate in de editor
 loading	common	nl	Wordt geladen
 local	common	nl	Lokaal
@ -829,6 +831,10 @@ may	common	nl	Mei
 mayotte	common	nl	MAYOTTE
 medium	common	nl	Gemiddeld
 menu	common	nl	Menu
+merge	common	nl	Samenvoegen
+merge & send	common	nl	Samenvoegen & verzenden
+merge individually	common	nl	Afzonderlijk samenvoegen
+merge options	common	nl	Opties voor samenvoegen
 merged document filename	preferences	nl	Bestandsnaam samengevoegd document
 message	common	nl	Bericht
 message ...	common	nl	Bericht ...
@ -1121,6 +1127,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	nl	Opslaan
 save all	common	nl	Bewaar alle
 save as	common	nl	Bewaar als
+save as pdf	common	nl	Opslaan als PDF
 save as zip	common	nl	Bewaar als ZIP
 save selected columns as default preference for all users.	common	nl	Bewaar geselecteerde kolommen als voorkeursstandaard voor alle gebruikers.
 save the changes made and close the window	common	nl	Bewaar de gemaakte wijzigingen en sluit het venster
@ -1200,6 +1207,7 @@ select work email address	common	nl	Selecteer emailadres werk
 select year	common	nl	Selecteer jaar
 selectbox	common	nl	Selectieveld
 selection	common	nl	Selectie
+selection of files can only be done in one folder.  %1 files unselected.	common	nl	Bestanden kunnen alleen in één map worden geselecteerd. %1 bestanden niet geselecteerd.
 send	common	nl	Verzend
 send succeeded to %1	common	nl	Verzenden naar %1 gelukt
 senegal	common	nl	SENEGAL
--- a/api/lang/egw_no.lang
+++ b/api/lang/egw_no.lang
@ -97,6 +97,7 @@ align	common	no	Juster
 all	common	no	Alle
 all days	common	no	Alle dager
 all fields	common	no	Alle felt
+all files	common	no	Alle filer
 all in one	groupdav	no	Alt i ett
 all languages	common	no	Alle språk
 all operations save the template!	common	no	Alle operasjoner lagrer malen!
@ -570,6 +571,7 @@ libyan arab jamahiriya	common	no	LIBYA
 license	common	no	Lisens
 liechtenstein	common	no	LIECHTENSTEIN
 link	common	no	Lenke
+link to each entry	common	no	Lenke til hver oppføring
 linklist	common	no	Lenkeliste
 linkstring	common	no	Lenkestreng
 linkto	common	no	Lenk til
@ -577,6 +579,7 @@ list	common	no	Liste
 list members	common	no	Liste medlemmer
 lithuania	common	no	LITAUEN
 load	common	no	Last inn
+load more links ...	common	no	Last inn flere lenker ...
 load this template into the editor	common	no	Laste denne malen inn i tekstbehandleren
 local	common	no	Lokal
 login	common	no	Login
@ -610,6 +613,11 @@ may	common	no	Mai
 mayotte	common	no	MAYOTTE
 medium	common	no	Medium
 menu	common	no	Meny
+merge	common	no	Slå sammen
+merge & send	common	no	Slå sammen og send
+merge individually	common	no	Slå sammen enkeltvis
+merge options	common	no	Alternativer for sammenslåing
+merged document filename	preferences	no	Filnavn for sammenslått dokument
 message	common	no	Melding
 mexico	common	no	MEXICO
 micronesia, federated states of	common	no	MIKRONESIA
@ -813,6 +821,8 @@ saturday	common	no	Lørdag
 saudi arabia	common	no	SAUDI-ARABIA
 save	common	no	Lagre
 save all	common	no	Lagre alle
+save as pdf	common	no	Lagre som PDF
+save as zip	common	no	Lagre som ZIP
 save the changes made and close the window	common	no	Lagre utførte endringer og så lukke vinduet
 saves changes to tables_current.inc.php	common	no	Lagre endringer til tables_current.inc.php
 saves the template with given version number and closes the window	common	no	Lagre malen med gitt versjonsnummer og så lukke vinduet.
@ -858,6 +868,7 @@ select work email address	common	no	Velg jobb-epost adresse
 select year	common	no	Velg år
 selectbox	common	no	Valgboks
 selection	common	no	Valg
+selection of files can only be done in one folder.  %1 files unselected.	common	no	Valg av filer kan bare gjøres i én mappe. %1 filer ikke valgt.
 send	common	no	Send
 senegal	common	no	SENEGAL
 september	common	no	September
--- a/api/lang/egw_pl.lang
+++ b/api/lang/egw_pl.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	pl	Wszystkie książki adresowe
 all categories	common	pl	Wszystkie kategorie
 all days	common	pl	Wszystkie dni
 all fields	common	pl	Wszystkie pola
+all files	common	pl	Wszystkie pliki
 all in one	groupdav	pl	Wszystko w jednym
 all languages	common	pl	Wszystkie języki
 all operations save the template!	common	pl	Wszystkie operacje prowadzą do zapisu wzorca!
@ -196,7 +197,6 @@ blurtext	common	pl	blurTExt
 bold	common	pl	Pogrubienie
 bolivia	common	pl	BOLIWIA
 border	common	pl	Ramka
-border-line-thickness for the table-tag	common	pl	Grubość ramki dla tagu table
 bosnia and herzegovina	common	pl	BOŚNIA I HERCEGOWINA
 botswana	common	pl	BOTSWANA
 bottom	common	pl	Do dolu
@ -775,6 +775,7 @@ line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ign
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	pl	Linia %1: '%2'<br><b>dane CSV mają złą liczbę kolumn dla tabeli %3 ==> ZIGNOROWANO</b>
 link	common	pl	Odnośnik
 link target %1 not found!	common	pl	Cel linku %1 nie odnaleziony!
+link to each entry	common	pl	Link do każdego wpisu
 linkapps	common	pl	LinkAplikacji
 linkentry	common	pl	LinkWpisu
 linklist	common	pl	LinkListy
@ -784,6 +785,7 @@ list	common	pl	Lista
 list members	common	pl	Członkowie listy
 lithuania	common	pl	LITWA
 load	common	pl	Załaduj
+load more links ...	common	pl	Załaduj więcej linków ...
 load this template into the editor	common	pl	Załaduj ten szablon do edytora
 loading	common	pl	Ładowanie
 local	common	pl	Lokalny
@ -820,6 +822,11 @@ may	common	pl	Maj
 mayotte	common	pl	MAYOTTE
 medium	common	pl	Średni
 menu	common	pl	Menu
+merge	common	pl	Scalanie
+merge & send	common	pl	Scal i wyślij
+merge individually	common	pl	Scalanie indywidualne
+merge options	common	pl	Opcje scalania
+merged document filename	preferences	pl	Nazwa pliku scalonego dokumentu
 message	common	pl	Komunikat
 message ...	common	pl	Wiadomość ...
 mexico	common	pl	MEKSYK
@ -1081,6 +1088,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	pl	Zachowaj
 save all	common	pl	Zapisz wszystko
 save as	common	pl	Zapisz jako
+save as pdf	common	pl	Zapisz jako PDF
 save as zip	common	pl	Zapisz jako ZIP
 save selected columns as default preference for all users.	common	pl	Zachowaj wybrane kolumny w formie domyślnej preferencji dla wszystkich użytkowników.
 save the changes made and close the window	common	pl	Zachowuje zmiany i zamyka okno
@ -1153,6 +1161,7 @@ select work email address	common	pl	Wybierz służbowy adres e-meil
 select year	common	pl	Wybierz rok
 selectbox	common	pl	Wybór z listy
 selection	common	pl	Wybór
+selection of files can only be done in one folder.  %1 files unselected.	common	pl	Wyboru plików można dokonać tylko w jednym folderze. %1 plików niewybranych.
 send	common	pl	Wyślij
 send succeeded to %1	common	pl	Wybierz niektóre opcje
 senegal	common	pl	SENEGAL
@ -1354,6 +1363,7 @@ welcome	common	pl	Strona główna
 western european	common	pl	Europa Zachodnia
 western sahara	common	pl	SAHARA ZACHODNIA
 what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	common	pl	Co dzieje się z przepełnioną zawartością (overflow): visible (domyślne), hidden, scroll, auto
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	pl	Po scaleniu wpisów w dokumenty zostaną one zapisane w tym folderze. Jeśli nie podano folderu, zostaną one zapisane w katalogu domowym (%1).
 when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	pl	Jeżeli wybierzesz "TAK", "Powrót na stronę domową" oraz "Wylogowanie" będą pokazywane jako przyciski aplikacji na głównym pasku aplikacji.
 where and how will the egroupware links like preferences, about and logout be displayed.	common	pl	Gdzie będą wyświetlane linki wylogowania EGroupware.
 which groups	common	pl	Które grupy
--- a/api/lang/egw_pt-br.lang
+++ b/api/lang/egw_pt-br.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	pt-br	Todos os catálogos de endereços
 all categories	common	pt-br	Todas as categorias
 all days	common	pt-br	Todos os dias
 all fields	common	pt-br	Todos os campos
+all files	common	pt-br	Todos os arquivos
 all in one	groupdav	pt-br	Tudo em um
 all languages	common	pt-br	Todos os idiomas
 all operations save the template!	common	pt-br	Todas as operações salvam o modelo!
@ -195,7 +196,6 @@ blurtext	common	pt-br	Texto borrado
 bold	common	pt-br	Negrito
 bolivia	common	pt-br	BOLÍVIA
 border	common	pt-br	Borda
-border-line-thickness for the table-tag	common	pt-br	Espessura da linha de borda para a tabela
 bosnia and herzegovina	common	pt-br	BOSNIA E HERZEGOVINA
 botswana	common	pt-br	BOTSWANA
 bottom	common	pt-br	Fundo
@ -766,6 +766,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	pt-br	O link é anexado ao e-mail, permitindo que os destinatários façam o download da versão atualizada dos arquivos
 link target %1 not found!	common	pt-br	Destino do link %1 não encontrado!
 link title of current record	common	pt-br	Título do link do registro atual
+link to each entry	common	pt-br	Link para cada registro
 linkapps	common	pt-br	Link de aplicativos
 linked	common	pt-br	Vinculado
 linkentry	common	pt-br	Entradas de link
@ -779,6 +780,7 @@ list members	common	pt-br	Listar membros
 list of files linked to the current record	preferences	pt-br	Lista de arquivos vinculados ao registro atual
 lithuania	common	pt-br	LITUÂNIA
 load	common	pt-br	Carga
+load more links ...	common	pt-br	Carregar mais links ...
 load this template into the editor	common	pt-br	Carregar este modelo para o editor
 loading	common	pt-br	Carregando
 local	common	pt-br	Local
@ -818,6 +820,10 @@ may	common	pt-br	Maio
 mayotte	common	pt-br	MAYOTTE
 medium	common	pt-br	Média
 menu	common	pt-br	Menú
+merge	common	pt-br	Mesclar
+merge & send	common	pt-br	Mesclar e enviar
+merge individually	common	pt-br	Mesclar individualmente
+merge options	common	pt-br	Opções de mesclagem
 merged document filename	preferences	pt-br	Nome do arquivo do documento mesclado
 message	common	pt-br	Mensagem
 message ...	common	pt-br	Mensagem ...
@ -1112,6 +1118,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	pt-br	Salvar
 save all	common	pt-br	Salvar tudo
 save as	common	pt-br	Salvar como
+save as pdf	common	pt-br	Salvar como PDF
 save as zip	common	pt-br	Salvar como ZIP
 save selected columns as default preference for all users.	common	pt-br	Salvar colunas selecionadas como padrão para todos os usuários.
 save the changes made and close the window	common	pt-br	Salvar as alterações feitas e fechar a janela
@ -1187,6 +1194,7 @@ select work email address	common	pt-br	Selecionar endereço de e-mail comercial
 select year	common	pt-br	Selecione o Ano
 selectbox	common	pt-br	Caixa de seleção
 selection	common	pt-br	Seleção
+selection of files can only be done in one folder.  %1 files unselected.	common	pt-br	A seleção de arquivos só pode ser feita em uma pasta. %1 arquivos não selecionados.
 send	common	pt-br	Enviar
 send succeeded to %1	common	pt-br	Enviar sucedeu %1
 senegal	common	pt-br	SENEGAL
--- a/api/lang/egw_pt.lang
+++ b/api/lang/egw_pt.lang
@ -108,6 +108,7 @@ all addressbooks	groupdav	pt	Todos os livros de endereços
 all categories	common	pt	Todas as categorias
 all days	common	pt	Todos os dias
 all fields	common	pt	Todos os campos
+all files	common	pt	Todos os ficheiros
 all in one	groupdav	pt	Tudo em um
 all languages	common	pt	Todos os idiomas
 all operations save the template!	common	pt	Todas as operações foram guardadas no modelo!
@ -176,7 +177,6 @@ blurtext	common	pt	Desfocar texto
 bold	common	pt	Negrito
 bolivia	common	pt	Bolívia
 border	common	pt	Contorno
-border-line-thickness for the table-tag	common	pt	Espessura da linha do contorno da tabela
 bosnia and herzegovina	common	pt	Bósnia-Herzegovina
 botswana	common	pt	Botsuana
 bottom	common	pt	Fundo
@ -678,6 +678,7 @@ light mode	common	pt	Modo de luz
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	pt	Linha %1:'%2'<br><b>dados csv não coincidem com o número de colunas da tabela %3 ==> ignorado</b>
 link	common	pt	Ligação
 link target %1 not found!	common	pt	Destino do link% 1 não encontrado!
+link to each entry	common	pt	Ligação a cada entrada
 linkapps	common	pt	Ligação aplicativos
 linkentry	common	pt	Registo de ligações
 linklist	common	pt	Lista de ligações
@ -689,6 +690,7 @@ list members	common	pt	Listar membros
 list of files linked to the current record	preferences	pt	Lista de arquivos vinculados ao registro atual
 lithuania	common	pt	Lituânia
 load	common	pt	Carregar
+load more links ...	common	pt	Carregar mais ligações ...
 load this template into the editor	common	pt	Carregar este modelo no editor
 local	common	pt	Local
 login	common	pt	Entrar
@ -723,6 +725,10 @@ may	common	pt	Maio
 mayotte	common	pt	Mayotte
 medium	common	pt	Média
 menu	common	pt	Menu
+merge	common	pt	Fundir
+merge & send	common	pt	Fundir e enviar
+merge individually	common	pt	Fundir individualmente
+merge options	common	pt	Opções de fusão
 message	common	pt	Mensagem
 message ...	common	pt	Mensagem ...
 message prepared for sending.	common	pt	Mensagem preparado para o envio.
@ -844,7 +850,6 @@ open	common	pt	Abrir
 open existing contact	common	pt	Abrir contacto existente
 open notify window	common	pt	Abrir janela de aviso
 open popup window	common	pt	Abrir janela popup
-open sidebox	common	pt	Abrir caixa lateral
 open the online help.	common	pt	Abrir ajuda em linha
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	pt	Início de sessão do OpenIDConnect bem sucedido, mas o utilizador '%1' NÃO existe no EGroupware, E a criação automática de utilizadores está desactivada!
 operator	common	pt	Operador
@ -980,6 +985,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	pt	Guardar
 save all	common	pt	Salve todo
 save as	common	pt	Salvar como
+save as pdf	common	pt	Guardar como PDF
 save the changes made and close the window	common	pt	Guardar as alterações efectuadas e fechar a janela
 save the etemplate under the above keys (name, ...), change them for a saveas	common	pt	Guardar o modelo Web com as chaves de cima (nome, ...). Terá de alterá-las para "Guardar como ..."
 saved column sizes to preferences.	common	pt	Guarde os tamanhos das colunas de acordo com as preferências.
@ -1044,6 +1050,7 @@ select work email address	common	pt	Seleccionar endereço de correio electrónic
 select year	common	pt	Seleccionar ano
 selectbox	common	pt	Caixa de selecção
 selection	common	pt	Selecção
+selection of files can only be done in one folder.  %1 files unselected.	common	pt	A seleção de ficheiros só pode ser feita numa pasta. %1 ficheiros não selecionados.
 send	common	pt	Enviar
 senegal	common	pt	Senegal
 september	common	pt	Setembro
--- a/api/lang/egw_ro.lang
+++ b/api/lang/egw_ro.lang
@ -33,6 +33,7 @@ admin settings for %1	common	ro	Setări administrative pentru %1
 advanced search	common	ro	Căutare avansată
 all addressbooks	groupdav	ro	Toate agendele de adrese
 all categories	common	ro	Toate categoriile
+all files	common	ro	Toate fișierele
 all in one	groupdav	ro	Toate într-una singură
 allow editing the %1	common	ro	Permiteți editarea lui %1
 answering no will not ask you again for this browser.	common	ro	Dacă răspundeți "nu", nu vi se va mai solicita acest browser.
@ -67,6 +68,7 @@ created by %1	common	ro	Creat de %1
 dark mode	common	ro	Mod întunecat
 date + time	common	ro	Data + Ora
 date+time	common	ro	Data+Ora
+directory for storing merged documents	preferences	ro	Folder pentru stocarea documentelor fuzionate
 don't ask again!	common	ro	Nu întrebați din nou!
 egroupware	common	ro	EGroupware
 example {{if n_prefix~mr~hello mr.~hello ms.}} - search the field "n_prefix", for "mr", if found, write hello mr., else write hello ms.	preferences	ro	Exemplu {{IF n_prefix~Mr~Bună ziua domnule ~Bună ziua doamnă}} - caută în câmpul "n_prefix", pentru "Mr", dacă se găsește, scrie Hello Mr., altfel scrie Hello Ms.
@ -101,12 +103,19 @@ invalid email	common	ro	E-mail invalid
 invalid or expired 'remember me' token	common	ro	Ficha "lembre-se de mim" inválida ou vencida
 it is recommended to store your public key in addressbook, so other users can write you encrypted mails.	common	ro	É recomendável armazenar sua chave pública no Addressbook, para que outros usuários possam escrever seus e-mails criptografados.
 light mode	common	ro	Mod deschis
+link to each entry	common	ro	Link către fiecare intrare
+load more links ...	common	ro	Încărcați mai multe link-uri ...
 login rejected by epl firewall, please contact your administrator	common	ro	Autentificare respinsă de firewall-ul EGroupware, vă rugăm să contactați administratorul.
 logout	common	ro	Leșire
 lost login id	common	ro	ID de conectare pierdut
 lost password	common	ro	Parolă pierdută
 mailvelope addon installation failed! please try again.	common	ro	Instalarea addon-ului Mailvelope a eșuat! Vă rugăm să încercați din nou.
 mailvelope addon installation succeded. now you may configure the options.	common	ro	Instalarea addon-ului Mailvelope a reușit. Acum puteți configura opțiunile.
+merge	common	ro	Unificare
+merge & send	common	ro	Fuzionați și trimiteți
+merge individually	common	ro	Fuzionați individual
+merge options	common	ro	Opțiuni de fuzionare
+merged document filename	preferences	ro	Numele fișierului documentului fuzionat
 more	common	ro	Mai mult
 move	common	ro	Mutați
 moved %1 children from directory fs_id=%2 to %3	admin	ro	A mutat %1 copii din folderul fs_id=%2 în %3
@ -138,10 +147,12 @@ preference	common	ro	Preferințe
 preferences	common	ro	Preferințe
 repeat password	common	ro	Repetarea parolei
 saved column sizes to preferences.	common	ro	Salvat dimensiunile coloanelor în preferințe.
+selection of files can only be done in one folder.  %1 files unselected.	common	ro	Selectarea fișierelor se poate face doar într-un singur dosar. %1 fișiere neselectate.
 show password	common	ro	Afișare parolă
 show/hide	common	ro	Afișați / ascundeți bara laterală
 sign up	common	ro	Înregistrare
 site configuration	common	ro	Configurația aplicației
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	ro	Atunci când îmbinați intrările în documente, acestea vor fi stocate aici. Dacă nu este furnizat niciun dosar, acestea vor fi stocate în directorul dvs. personal (%1)
 your account has been updated with new data from your identity provider.	common	ro	Contul dvs. a fost actualizat cu date noi de la furnizorul dvs. de identitate.
 your browser is not up-to-date (javascript es6 compatible), you may experience some of the features not working.	common	ro	Browserul dvs. nu este actualizat (compatibil cu JavaScript ES6), este posibil ca unele dintre caracteristici să nu funcționeze.
 your key has been restored successfully.	common	ro	Cheia dvs. a fost restaurată cu succes.
--- a/api/lang/egw_ru.lang
+++ b/api/lang/egw_ru.lang
@ -112,6 +112,7 @@ all addressbooks	groupdav	ru	Все адресные книги
 all categories	common	ru	Все категории
 all days	common	ru	все дни
 all fields	common	ru	все поля
+all files	common	ru	Все файлы
 all in one	groupdav	ru	Всё в одном
 all languages	common	ru	Все языки
 all operations save the template!	common	ru	все действия сохраняют шаблон!
@ -185,7 +186,6 @@ blurtext	common	ru	расплывшийсяТекст
 bold	common	ru	Полужирный
 bolivia	common	ru	Боливия
 border	common	ru	Кайма
-border-line-thickness for the table-tag	common	ru	Толщина-линии-каймы для тега Таблица
 bosnia and herzegovina	common	ru	Босния и Герцеговина
 botswana	common	ru	Ботсвана
 bottom	common	ru	Низ
@ -742,6 +742,7 @@ line %1: '%2'<br><b>csv data does contain ##last-check-run## of table %3 ==> ign
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	ru	Строка %1: '%2'<br><b>данных CSV не соответствует количеству столбцов таблицы %3 ==> игнорируется</b>
 link	common	ru	Ссылка
 link target %1 not found!	common	ru	Целевая ссылка %1 не найдена!
+link to each entry	common	ru	Ссылка на каждую запись
 linkapps	common	ru	СсылкаНаПриложение
 linkentry	common	ru	СсылкаНаЗапись
 linklist	common	ru	СсылкаНаСписок
@ -754,6 +755,7 @@ list members	common	ru	Список участников
 list of files linked to the current record	preferences	ru	Список файлов, связанных с текущей записью
 lithuania	common	ru	Литва
 load	common	ru	Загрузить
+load more links ...	common	ru	Загрузить другие ссылки ...
 load this template into the editor	common	ru	загрузить этот шаблон в редактор
 loading	common	ru	Загружаю
 local	common	ru	Местный
@ -792,6 +794,10 @@ may	common	ru	Май
 mayotte	common	ru	О-в Мейот
 medium	common	ru	Средний
 menu	common	ru	Меню
+merge	common	ru	Объединить
+merge & send	common	ru	Объединить и отправить
+merge individually	common	ru	Слияние по отдельности
+merge options	common	ru	Параметры слияния
 merged document filename	preferences	ru	Имя файла объединенного документа
 message	common	ru	Сообщение
 message ...	common	ru	Сообщение ...
@ -918,7 +924,6 @@ open	common	ru	Открыть
 open existing contact	common	ru	Открыть существующий контакт
 open notify window	common	ru	Открыть окно извещения
 open popup window	common	ru	Открыть всплывающее окно
-open sidebox	common	ru	Открыть боковое меню
 open the online help.	common	ru	Открыть онлайн справку
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	ru	Вход в систему OpenIDConnect прошел успешно, но пользователь '%1' НЕ существует в EGroupware, а автоматическое создание пользователя отключено!
 operator	common	ru	Оператор
@ -1065,6 +1070,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	ru	Сохранить
 save all	common	ru	Сохранить всё
 save as	common	ru	Сохранить как
+save as pdf	common	ru	Сохранить как PDF
 save as zip	common	ru	Сохранить в ZIP
 save selected columns as default preference for all users.	common	ru	Записать выбранные столбцы как настройки по-умолчанию для всех пользователей.
 save the changes made and close the window	common	ru	Сохранить изменения и закрыть окно
@ -1136,6 +1142,7 @@ select work email address	common	ru	Выберите рабочий адрес
 select year	common	ru	Выбрать Год
 selectbox	common	ru	Рамка выбора
 selection	common	ru	Выбор
+selection of files can only be done in one folder.  %1 files unselected.	common	ru	Выбор файлов возможен только в одной папке. %1 файл не выбран.
 send	common	ru	Отправить
 senegal	common	ru	Сенегал
 september	common	ru	Сентябрь
@ -1335,6 +1342,7 @@ welcome	common	ru	Добро пожаловать
 western european	common	ru	западноевропейский
 western sahara	common	ru	Западная Сахара
 what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	common	ru	что происходит при переполнении содержимого: видимо (по-умолчанию), скрыто, прокрутка, авто (решается браузером)
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	ru	Когда вы объединяете записи в документы, они будут храниться здесь. Если папка не указана, они будут храниться в вашем домашнем каталоге (%1)
 when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	ru	Если Вы ответите "да", кнопки "Домой" и "Выход" будут представлены в виде иконок на верхней панели.
 where and how will the egroupware links like preferences, about and logout be displayed.	common	ru	Где и как EGroupware будет показывать такие ссылки как Настройки, О Нас и Выход.
 which groups	common	ru	Какие группы
--- a/api/lang/egw_sk.lang
+++ b/api/lang/egw_sk.lang
@ -118,6 +118,7 @@ all addressbooks	groupdav	sk	Všetky adresáre
 all categories	common	sk	Všetky kategórie
 all days	common	sk	Všetky dni
 all fields	common	sk	Všetky polia
+all files	common	sk	Všetky súbory
 all in one	groupdav	sk	Všetko v jednom
 all languages	common	sk	Všetky jazyky
 all operations save the template!	common	sk	Všetky operácie ukladajú šablónu!
@ -201,7 +202,6 @@ blocked, too many attempts	common	sk	Zablokované, príliš veľa pokusov.
 bold	common	sk	Tučné
 bolivia	common	sk	BOLÍVIA
 border	common	sk	Hranica
-border-line-thickness for the table-tag	common	sk	Hrúbka okrajovej čiary pre tag tabuľky
 bosnia and herzegovina	common	sk	BOSNA A HERCEGOVINA
 botswana	common	sk	BOTSWANA
 bottom	common	sk	Spodok
@ -800,6 +800,7 @@ link is appended to mail allowing recipients to download or modify up to date ve
 link is appended to mail allowing recipients to download up to date version of files	common	sk	K správe je pripojený odkaz, ktorý umožňuje adresátom stiahnuť si aktuálnu verziu súborov
 link target %1 not found!	common	sk	Cieľ odkazu %1 sa nenašiel!
 link title of current record	common	sk	Názov odkazu aktuálneho záznamu
+link to each entry	common	sk	Odkaz na každý záznam
 linkapps	common	sk	Aplikácia odkazu
 linked	common	sk	Odkazuje
 linkentry	common	sk	Záznam o odkaze
@ -813,6 +814,7 @@ list members	common	sk	Zoznam členov
 list of files linked to the current record	preferences	sk	Zoznam súborov priložených k súčasnému záznamu
 lithuania	common	sk	LITVA
 load	common	sk	Načítať
+load more links ...	common	sk	Načítanie ďalších odkazov ...
 load this template into the editor	common	sk	Načítať túto šablónu do editora
 loading	common	sk	Načítava sa
 local	common	sk	Lokálny
@ -854,6 +856,10 @@ maybe	common	sk	Možno
 mayotte	common	sk	MAYOTTE
 medium	common	sk	Stredná
 menu	common	sk	Ponuka
+merge	common	sk	Zlúčenie
+merge & send	common	sk	Zlúčiť a odoslať
+merge individually	common	sk	Zlúčiť jednotlivo
+merge options	common	sk	Možnosti zlúčenia
 merged document filename	preferences	sk	Názov súboru pre zlúčený dokument
 message	common	sk	Správa
 message ...	common	sk	Správa ...
@ -1160,6 +1166,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	sk	Uložiť
 save all	common	sk	Uložiť všetko
 save as	common	sk	Uložiť ako
+save as pdf	common	sk	Uložiť ako PDF
 save as zip	common	sk	Uložiť ako ZIP
 save selected columns as default preference for all users.	common	sk	Uložiť vybrané stĺpce ako predvolené nastavenie pre všetkých používateľov.
 save the changes made and close the window	common	sk	Uložiť vykonané zmeny a zavrieť okno
@ -1240,6 +1247,7 @@ select work email address	common	sk	Vyberte pracovnú E-mailovú adresu
 select year	common	sk	Vyberte rok
 selectbox	common	sk	Výberové menu
 selection	common	sk	Výber
+selection of files can only be done in one folder.  %1 files unselected.	common	sk	Výber súborov je možné vykonať len v jednom priečinku. %1 súborov nevybraných.
 send	common	sk	Odoslať
 send succeeded to %1	common	sk	Odoslanie sa podarilo pre %1
 senegal	common	sk	SENEGAL
--- a/api/lang/egw_sl.lang
+++ b/api/lang/egw_sl.lang
@ -114,6 +114,7 @@ all addressbooks	groupdav	sl	Vsi adresarji
 all categories	common	sl	Vse kategorije
 all days	common	sl	Vsi dnevi
 all fields	common	sl	Vsa polja
+all files	common	sl	Vse datoteke
 all in one	groupdav	sl	Vse v enem
 all languages	common	sl	Vsi jeziki
 all operations save the template!	common	sl	Vse operacije shranijo predlogo!
@ -197,7 +198,6 @@ blurtext	common	sl	Zamaži tekst
 bold	common	sl	Krepko
 bolivia	common	sl	BOLIVIJA
 border	common	sl	Rob
-border-line-thickness for the table-tag	common	sl	Debelina robov
 bosnia and herzegovina	common	sl	BOSNA IN HERCEGOVINA
 botswana	common	sl	BOCVANA
 bottom	common	sl	Noga
@ -842,6 +842,10 @@ maybe	common	sl	Mogoče
 mayotte	common	sl	MAYOTTE
 medium	common	sl	Srednje
 menu	common	sl	Meni
+merge	common	sl	Združitev
+merge & send	common	sl	Združite in pošljite
+merge individually	common	sl	Združite posamezno
+merge options	common	sl	Možnosti združevanja
 merged document filename	preferences	sl	Ime datoteke združenega dokumenta
 message	common	sl	Sporočilo
 message ...	common	sl	Sporočilo ...
@ -1146,6 +1150,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	sl	Shrani
 save all	common	sl	Shrani vse
 save as	common	sl	Shrani kot
+save as pdf	common	sl	Shrani kot PDF
 save as zip	common	sl	Shrani kot ZIP
 save selected columns as default preference for all users.	common	sl	Shrani izbrane stolpce kot privzeto nastavitev za vse uporabnike.
 save the changes made and close the window	common	sl	Shrani spremembe in zapri okno
@ -1225,6 +1230,7 @@ select work email address	common	sl	Izberi službeni E-naslov
 select year	common	sl	Izberite leto
 selectbox	common	sl	Izbirno polje
 selection	common	sl	Izbor
+selection of files can only be done in one folder.  %1 files unselected.	common	sl	Izbira datotek se lahko izvede samo v eni mapi. %1 datotek ni izbranih.
 send	common	sl	Pošlji
 send succeeded to %1	common	sl	Pošiljanje je uspelo na %1
 senegal	common	sl	SENEGAL
--- a/api/lang/egw_sv.lang
+++ b/api/lang/egw_sv.lang
@ -104,6 +104,7 @@ all addressbooks	groupdav	sv	Alla adressböcker
 all categories	common	sv	Alla kategorier
 all days	common	sv	Samtliga dagar
 all fields	common	sv	Alla fält
+all files	common	sv	Alla filer
 all in one	groupdav	sv	Alla i en
 all operations save the template!	common	sv	Alla operationer sparar template!
 all users	common	sv	Alla användare
@ -170,7 +171,6 @@ blurtext	common	sv	Oskarptext
 bold	common	sv	Fet
 bolivia	common	sv	BOLIVIEN
 border	common	sv	Kantlinje
-border-line-thickness for the table-tag	common	sv	Kantlinjes tjocklek för tabell kod
 bosnia and herzegovina	common	sv	BOSNIEN OCH HERZEGOVINA
 botswana	common	sv	BOTSWANA
 bottom	common	sv	Nederst
@ -666,6 +666,7 @@ liechtenstein	common	sv	LIECHTENSTEIN
 light mode	common	sv	Ljust läge
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	sv	Rad %1: '%2'<br><b>CSV data motsvarar inte antalet kolumner i tabellen %3 ==> ignoreras</b>
 link	common	sv	Länk
+link to each entry	common	sv	Länk till varje post
 linkapps	common	sv	LinkApps
 linkentry	common	sv	Länka inmatning
 linklist	common	sv	Länklista
@ -676,6 +677,7 @@ list members	common	sv	Lista medlemmar
 list of files linked to the current record	preferences	sv	Lista över filer som är länkade till den aktuella posten
 lithuania	common	sv	LITAUEN
 load	common	sv	Ladda
+load more links ...	common	sv	Ladda fler länkar ...
 load this template into the editor	common	sv	Ladda mallen i editorn
 loading	common	sv	Laddar
 local	common	sv	Lokal
@ -714,6 +716,10 @@ may	common	sv	Maj
 mayotte	common	sv	MAYOTTE
 medium	common	sv	Medium
 menu	common	sv	Meny
+merge	common	sv	Sammanfoga
+merge & send	common	sv	Sammanfoga och skicka
+merge individually	common	sv	Sammanfoga individuellt
+merge options	common	sv	Alternativ för sammanfogning
 merged document filename	preferences	sv	Filnamn för sammanslaget dokument
 message	common	sv	Meddelande
 message prepared for sending.	common	sv	Meddelande förberett för sändning.
@ -962,6 +968,7 @@ savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants
 save	common	sv	Spara
 save all	common	sv	Spara alla
 save as	common	sv	Spara som
+save as pdf	common	sv	Spara som PDF
 save as zip	common	sv	Spara som ZIP
 save the changes made and close the window	common	sv	Spara ändringar och stäng fönster
 save the etemplate under the above keys (name, ...), change them for a saveas	common	sv	Spara eTemplate under ovanstående nycklar (namn, ....), ändra för att Spara Som
@ -1029,6 +1036,7 @@ select work email address	common	sv	Välj Företagets e-postadres
 select year	common	sv	Välj år
 selectbox	common	sv	Valruta
 selection	common	sv	Val
+selection of files can only be done in one folder.  %1 files unselected.	common	sv	Val av filer kan endast göras i en mapp. %1 filer har inte valts.
 send	common	sv	Skicka
 send succeeded to %1	common	sv	Skicka lyckats till %1
 senegal	common	sv	SENEGAL
@ -1212,6 +1220,7 @@ weekend	common	sv	Helg
 welcome	common	sv	Välkommen
 western sahara	common	sv	VÄSTRA SAHARA
 what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides)	common	sv	Vad händer med innehålls "overflow": synligt (default), göms, skroll, auto (browser bestämmer)
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	sv	När du sammanfogar poster till dokument lagras de här. Om ingen mapp anges kommer de att lagras i din hemkatalog (%1)
 when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	sv	Om du svara ja kommer Hem- och utloggningsknappen att visas i navigeringslisten.
 which groups	common	sv	Vilka grupper
 whole query	common	sv	Hela frågan
--- a/api/lang/egw_tr.lang
+++ b/api/lang/egw_tr.lang
@ -43,6 +43,7 @@ administration	common	tr	Yönetim
 advanced search	common	tr	Gelişmiş arama
 all addressbooks	groupdav	tr	Tüm adres defterleri
 all categories	common	tr	Tüm kategoriler
+all files	common	tr	Tüm dosyalar
 all in one	groupdav	tr	Hepsi bir arada
 allow editing the %1	common	tr	%1'in düzenlenmesine izin ver
 and	common	tr	Ve
@ -88,6 +89,7 @@ date + time	common	tr	Tarih + Saat
 date+time	common	tr	Tarih+Saat
 delete category	common	tr	Kategori sil
 description	common	tr	Açýklama
+directory for storing merged documents	preferences	tr	Birleştirilmiş belgeleri saklamak için klasör
 disabled	common	tr	Engellendi
 domestic	common	tr	Ev
 don't ask again!	common	tr	Tekrar sorma!
@ -137,7 +139,9 @@ invalid email	common	tr	Geçersiz e-posta
 invalid or expired 'remember me' token	common	tr	Geçersiz veya süresi dolmuş 'beni hatırla' belirteci
 it is recommended to store your public key in addressbook, so other users can write you encrypted mails.	common	tr	Açık anahtarınızı Adres Defteri'nde saklamanız önerilir, böylece diğer kullanıcılar size şifreli postalar yazabilir.
 light mode	common	tr	Işık modu
+link to each entry	common	tr	Her girişe bağlantı
 load	common	tr	Yükle
+load more links ...	common	tr	Daha fazla bağlantı yükle ...
 login rejected by epl firewall, please contact your administrator	common	tr	Giriş EGroupware güvenlik duvarı tarafından reddedildi, lütfen yöneticinize başvurun.
 loginid	common	tr	Kullanýcý Adý
 logout	common	tr	Oturum Kapatma
@ -146,6 +150,11 @@ lost password	common	tr	Kayıp şifre
 lowest	common	tr	En düþük
 mailvelope addon installation failed! please try again.	common	tr	Mailvelope eklentisi kurulumu başarısız oldu! Lütfen tekrar deneyin.
 mailvelope addon installation succeded. now you may configure the options.	common	tr	Mailvelope eklentisi kurulumu başarılı oldu. Şimdi seçenekleri yapılandırabilirsiniz.
+merge	common	tr	Birleştirme
+merge & send	common	tr	Birleştir ve gönder
+merge individually	common	tr	Ayrı ayrı birleştirin
+merge options	common	tr	Birleştirme seçenekleri
+merged document filename	preferences	tr	Birleştirilmiş belge dosya adı
 message	common	tr	Mesaj
 minute	common	tr	Dakika
 more	common	tr	Daha fazla
@ -190,6 +199,8 @@ primary group	common	tr	Ana grup
 project	common	tr	Proje
 read this list of methods.	common	tr	Method listesini oku
 repeat password	common	tr	Şifreyi tekrarla
+save as pdf	common	tr	PDF olarak kaydet
+save as zip	common	tr	ZIP olarak kaydet
 saved column sizes to preferences.	common	tr	Sütun boyutlarını tercihlere kaydedin.
 search accounts	common	tr	Hesaplarý ara
 select all	common	tr	Tümünü seçin
@ -206,6 +217,7 @@ user accounts	common	tr	Kullanýcý hesaplarý
 user groups	common	tr	Kullanýcý gruplarý
 users choice	common	tr	Kullanýcý Seçimleri
 version	common	tr	Sürüm
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	tr	Girdileri belgelerle birleştirdiğinizde, burada saklanacaktır. Herhangi bir klasör belirtilmemişse, bunlar ev dizininizde (%1) saklanacaktır
 you have not entered a title	common	tr	Bir baþlýk girmediniz.
 you have not entered a valid date	common	tr	Geçerli bir tarih girmediniz.
 you have not entered a valid time of day	common	tr	Geçerli bir gün saati girmediniz.
--- a/api/lang/egw_uk.lang
+++ b/api/lang/egw_uk.lang
@ -59,6 +59,7 @@ algeria	common	uk	АЛЖИР
 all	common	uk	Все
 all addressbooks	groupdav	uk	Всі адресні книги
 all categories	common	uk	Всі категорії
+all files	common	uk	Всі файли
 all in one	groupdav	uk	Все в одному
 all users	common	uk	Всі користувачі
 allow editing the %1	common	uk	Дозволити редагування %1
@ -182,6 +183,7 @@ denmark	common	uk	ДАНІЯ
 description	common	uk	Опис
 detail	common	uk	Деталі
 details	common	uk	Деталі
+directory for storing merged documents	preferences	uk	Папка для зберігання об'єднаних документів
 disabled	common	uk	Вимкнено
 do you also want to delete all subcategories ?	common	uk	Чи хочете ви також видалити вся підкатегорії?
 domain	common	uk	Domain
@ -333,9 +335,11 @@ license	common	uk	Ліцензія
 liechtenstein	common	uk	ЛІХТЕНШТЕЙН
 light mode	common	uk	Світлий режим
 link	common	uk	Посилання
+link to each entry	common	uk	Посилання на кожен запис
 list	common	uk	Перелік
 lithuania	common	uk	ЛИТВА
 load	common	uk	Вгрузити
+load more links ...	common	uk	Завантажити більше посилань ...
 local	common	uk	Локальний
 login	common	uk	Login
 login rejected by epl firewall, please contact your administrator	common	uk	Брандмауер EGroupware відхилив ваш логін, зверніться до вашого адміністратора.
@ -359,6 +363,11 @@ mauritius	common	uk	МАВРІКІЙ
 may	common	uk	Травень
 medium	common	uk	Середній
 menu	common	uk	Меню
+merge	common	uk	Об'єднати
+merge & send	common	uk	Об'єднати та надіслати
+merge individually	common	uk	Об'єднати окремо
+merge options	common	uk	Параметри об'єднання
+merged document filename	preferences	uk	Ім'я файлу об'єднаного документа
 message	common	uk	Повідомлення
 mexico	common	uk	МЕКСІКА
 minute	common	uk	Хвилина
@ -490,6 +499,8 @@ san marino	common	uk	САН-МАРІНО
 saturday	common	uk	Субота
 saudi arabia	common	uk	САУДІВСЬКА АРАВІЯ
 save	common	uk	Зберегти
+save as pdf	common	uk	Зберегти як PDF
+save as zip	common	uk	Зберегти як ZIP
 saved column sizes to preferences.	common	uk	Збережені розміри стовпців у налаштуваннях.
 search	common	uk	Шукати
 search accounts	common	uk	Шукати рахунки
@ -600,6 +611,7 @@ view	common	uk	Перегляд
 view this linked entry in its application	common	uk	переглянути посилання в відповідному приложенні
 wednesday	common	uk	Середа
 welcome	common	uk	Вітаємо
+when you merge entries into documents, they will be stored here. if no directory is provided, they will be stored in your home directory (%1)	preferences	uk	Коли ви об'єднаєте записи в документи, вони будуть збережені тут. Якщо папку не вказано, вони будуть збережені у вашій домашній директорії (%1)
 which groups	common	uk	Котрі групи
 work email	common	uk	робочий email
 written by:	common	uk	Написано:
--- a/api/lang/egw_zh-tw.lang
+++ b/api/lang/egw_zh-tw.lang
@ -123,7 +123,6 @@ blurtext	common	zh-tw	模糊文字
 bold	common	zh-tw	粗體
 bolivia	common	zh-tw	玻利維亞
 border	common	zh-tw	框線
-border-line-thickness for the table-tag	common	zh-tw	表格標籤使用的框線厚度
 bosnia and herzegovina	common	zh-tw	BOSNIA AND HERZEGOVINA
 botswana	common	zh-tw	波紮那
 bottom	common	zh-tw	底部
@ -701,7 +700,6 @@ only yours	common	zh-tw	屬於您的資料
 open	common	zh-tw	開啟
 open notify window	common	zh-tw	開啟警示視窗
 open popup window	common	zh-tw	開啟彈出式視窗
-open sidebox	common	zh-tw	開啟其他選單
 open the online help.	common	zh-tw	開啟線上說明
 operator	common	zh-tw	運算元
 optional note about the link	common	zh-tw	連結的附註
--- a/api/lang/egw_zh.lang
+++ b/api/lang/egw_zh.lang
@ -94,6 +94,7 @@ all addressbooks	groupdav	zh	所有地址簿
 all categories	common	zh	所有类别
 all days	common	zh	全部日数
 all fields	common	zh	所有字段
+all files	common	zh	所有文件
 all in one	groupdav	zh	一体化
 all languages	common	zh	所有语言
 all operations save the template!	common	zh	所有操作保存模板！
@ -647,6 +648,7 @@ liechtenstein	common	zh	列支敦士登
 light mode	common	zh	浅色模式
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	zh	第%1行：'%2'<br><b>csv 数据与数据表%3栏数不匹配 ==> 忽略</b>
 link	common	zh	链接
+link to each entry	common	zh	链接到每个条目
 linkapps	common	zh	链接应用程序
 linkentry	common	zh	链接条目
 linklist	common	zh	链接列表
@ -656,6 +658,7 @@ list	common	zh	列表
 list members	common	zh	会员列表
 lithuania	common	zh	立陶宛
 load	common	zh	加载
+load more links ...	common	zh	加载更多链接...
 load this template into the editor	common	zh	载入该模板到编辑器中
 loading	common	zh	载入
 local	common	zh	本地
@ -691,6 +694,11 @@ may	common	zh	五月
 mayotte	common	zh	马约特岛
 medium	common	zh	中间
 menu	common	zh	菜单
+merge	common	zh	合并
+merge & send	common	zh	合并并发送
+merge individually	common	zh	单独合并
+merge options	common	zh	合并选项
+merged document filename	preferences	zh	合并文件的文件名
 message	common	zh	消息
 mexico	common	zh	墨西哥
 micronesia, federated states of	common	zh	密克罗尼西亚联邦
@ -805,7 +813,6 @@ open	common	zh	待决事项
 open existing contact	common	zh	打开现有联系人
 open notify window	common	zh	打开提示窗口
 open popup window	common	zh	打开弹出式窗口·
-open sidebox	common	zh	打开侧边栏
 open the online help.	common	zh	开启在线帮助
 openidconnect login successful, but user '%1' does not exist in egroupware, and automatic user creating is disabled!	common	zh	OpenIDConnect 登录成功，但 EGroupware 中不存在用户 '%1'，而且用户自动创建功能被禁用！
 operator	common	zh	操作符
@ -943,6 +950,8 @@ saudi arabia	common	zh	沙特阿拉伯
 savant2 version differs from savant2 wrapper. <br/>this version: %1 <br/>savants version: %2	common	zh	Savant2 版本不同于 Savant2 wrapper。<br/>这个版本：%1 <br/>Savants 版本：%2
 save	common	zh	保存
 save all	common	zh	保存所有
+save as pdf	common	zh	保存为 PDF
+save as zip	common	zh	保存为 ZIP
 save selected columns as default preference for all users.	common	zh	保存所选列作为所有用户默认首选。
 save the changes made and close the window	common	zh	保存所作更改并且关闭窗口
 save the etemplate under the above keys (name, ...), change them for a saveas	common	zh	在上面的键值(name,...)之下保存模板，把它们改为另存将
@ -1005,6 +1014,7 @@ select work email address	common	zh	选择工作邮件地址
 select year	common	zh	选择年
 selectbox	common	zh	下拉选单
 selection	common	zh	选择
+selection of files can only be done in one folder.  %1 files unselected.	common	zh	只能在一个文件夹中选择文件。未选择 %1 文件。
 send	common	zh	发送
 senegal	common	zh	塞内加尔
 september	common	zh	九月
--- a/mail/lang/egw_bg.lang
+++ b/mail/lang/egw_bg.lang
@ -126,8 +126,6 @@ cross account forward attachment is not allowed!	mail	bg	Не е разреше
 current folder	mail	bg	текуща папка
 current subject	mail	bg	текуща тема
 currently:	mail	bg	Понастоящем:
-date(newest first)	mail	bg	По дата (първо най-новите)
-date(oldest first)	mail	bg	По дата (първо най-старите)
 deactive	mail	bg	Деактивиране
 default sorting order	mail	bg	Подреждане по подразбиране
 default toolbar actions shown in mail's html editor	mail	bg	Функции, активирани в лентата с инструменти на редактора HTML при съставяне на имейл
@ -189,7 +187,6 @@ drafts	mail	bg	Чернови
 drafts folder	mail	bg	Папка "Чернови"
 edit account	mail	bg	Редактиране на акаунта
 edit account ...	mail	bg	Редактиране на акаунта ...
-edit folder acl	mail	bg	Редактиране на ACL папката
 edit folder acl ...	mail	bg	Редактиране на ACL папката ...
 edit vacation settings	mail	bg	редактиране на настройките за "ваканция"
 effective only if server supports acl at all	admin	bg	използваем, само ако сървърът изобщо поддържа ACL
@ -277,6 +274,7 @@ handling of external http images / mixed content in mails	mail	bg	Обработ
 header	mail	bg	Заглавка (Header)
 header lines	mail	bg	Заглавна част
 high	mail	bg	високо
+high priority	mail	bg	Висок приоритет
 hold %1 to drag files to your computer	mail	bg	Натиснете и задръжте %1, за да плъзнете файлове към вашия компютър
 home page folders	mail	bg	Папки за начална страница
 hostname or ip	mail	bg	Име на хост или IP
@ -333,6 +331,7 @@ learning as spam failed because of %1	mail	bg	Ученето като спам
 less than	mail	bg	по-малко от
 limit mailing list results when searching for addresses	mail	bg	Ограничаване на резултатите от пощенски списъци при търсене на адреси
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	bg	Списък на действията, които трябва да се включат/активират по подразбиране (напр. действие Mail compose save as InfoLog)
+low priority	mail	bg	Нисък приоритет
 mail	common	bg	Поща
 mail acl	mail	bg	Права за достъп
 mail filter	mail	bg	Пощенски филтър
@ -446,7 +445,6 @@ report this email content as ham (not spam) - spam solutions like spamtitan will
 report this email content as spam - spam solutions like spamtitan will learn	mail	bg	Докладвайте това имейл съдържание като спам - спам решения като spamTitan ще се научат
 required pear class mail/mimedecode.php not found.	mail	bg	Не е намерен необходимият PEAR клас Mail/mimeDecode.php.
 required to disable if you use dovecot with private seen flags on shared or user folder!	mail	bg	Задължително се деактивира, ако използвате Dovecot с флагове за частно виждане на споделена или потребителска папка!
-row order style	mail	bg	Стил на изгледа
 s/mime encryption failed because no certificate has been found for sender address: %1	mail	bg	S/MIME Криптирането е неуспешно, тъй като не е намерен сертификат за адреса на подателя: %1
 save all attachments to filemanager	mail	bg	Запазете всички във Файлов мениджър
 save as draft	mail	bg	запис като чернова
@ -483,14 +481,12 @@ show vertical	mail	bg	Показване по вертикала (изглед
 show vertical with all columns	mail	bg	Показвайте вертикално с всички колони
 show/hide preview pane in mail list view	mail	bg	Показване/скриване на панела за предварителен преглед в изгледа на списъка с имейли.
 shows a temporary visible notification including from address, subject and a snippet of the mail	mail	bg	Показва временно видимо известие, включващо от адрес, тема и откъс от имейл.
-sieve script name	mail	bg	име на Sieve скрипт
 sieve_edit_instructions	mail	bg	(*) могат да се използват "заместващи символи" (*,?) Ако се опитвате да съчетаете помежду си * или ?, трябва да ги избегнете с наклонена черта (\). Ако поставите отметка „Използване на регулярни изрази“, трябва да използвате валидни регулярни изрази. За да избегнете удивителен знак (!) в началото, който не се използва като "НЕ", използвайте регекс и обратна черта (\) (например \!)
 sign your message with smime certificate	mail	bg	Подпишете съобщението си със сертификат S/MIME
 signature	mail	bg	Подпис
 signature at top	mail	bg	подпис в горната част
 signature position and visibility	mail	bg	Позиция и видимост на подписа
 signed by	mail	bg	Подписан от
-small view	mail	bg	умален изглед
 smime encrypted message	mail	bg	S/MIME криптирано съобщение
 smime signed message	mail	bg	S/MIME подписано съобщение
 smtp	mail	bg	SMTP
@ -510,7 +506,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	bg	Това съобщение е S/MIME криптирано и защитено с парола.
 timeout on connections to your imap server	mail	bg	Време за изчакване на връзките с вашия IMAP сървър
 to do	mail	bg	За да направите
-toggle all folders view for %1	mail	bg	Превключване на изгледа на всички папки за %1
 toggled on actions	mail	bg	Превключване на действията
 trash	mail	bg	Кошче
 trash folder	mail	bg	Папка за отпадъци
@ -523,10 +518,6 @@ view header lines	mail	bg	Заглавна част (Header)
 when deleting messages	mail	bg	При изтриване на съобщения
 which folders - in general - should not be automatically created, if not existing	mail	bg	кои папки НЕ следва са се създават автоматично, ако не съществуват
 wrote	mail	bg	написа
-yes, only trigger connection reset	mail	bg	да, само да задействате нулиране на връзката
-yes, show all debug information available for the user	mail	bg	да, показва цялата налична за потребителя информация за отстраняване на грешки
-yes, show basic info only	mail	bg	да, показва само основна информация
-you can either choose to save as infolog or tracker, not both.	mail	bg	Можете да изберете да запазите като InfoLog ИЛИ като тракер, но не и двете.
 you can select what info to be displayed on email tag	mail	bg	Можете да изберете каква информация да се показва на имейл тага.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	bg	Можете да използвате $$start$$ за горната начална дата и $$end$$ за крайната дата.
 you may add this certificate into your contact, if you trust this signature.	mail	bg	Можете да добавите този сертификат в контакта си, ако имате доверие на този подпис.
--- a/mail/lang/egw_ca.lang
+++ b/mail/lang/egw_ca.lang
@ -10,8 +10,6 @@ compose	mail	ca	Redactar
 compress folder	mail	ca	Comprimir carpeta
 contains	mail	ca	conté
 copy to	mail	ca	Copiar A
-date(newest first)	mail	ca	Data (la més recent primer)
-date(oldest first)	mail	ca	Data (la més antiga primer)
 default sorting order	mail	ca	Mode d'ordenació predeterminat
 delete folder	mail	ca	Esborrar carpeta
 deleted	mail	ca	eliminat
@ -82,7 +80,6 @@ save all	mail	ca	Desar tot
 select all	mail	ca	Seleccionar tot
 sent folder	mail	ca	Carpeta d'enviats
 signature	mail	ca	Signatura
-small view	mail	ca	Vista reduïda
 sort order	mail	ca	Forma de ordenación
 text	mail	ca	Texto
 then	mail	ca	ALESHORES
--- a/mail/lang/egw_cs.lang
+++ b/mail/lang/egw_cs.lang
@ -117,8 +117,6 @@ cross account forward attachment is not allowed!	mail	cs	Připojení křížové
 current folder	mail	cs	Aktuální složka
 current subject	mail	cs	Aktuální téma
 currently:	mail	cs	Aktuálně:
-date(newest first)	mail	cs	Datum (od nejnovějšího)
-date(oldest first)	mail	cs	Datum (od nejstaršího)
 deactive	mail	cs	Deaktivovat
 default sorting order	mail	cs	Výchozí třídění
 default toolbar actions shown in mail's html editor	mail	cs	Funkce povolené na panelu nástrojů editoru HTML při vytváření e-mailu
@ -180,7 +178,6 @@ drafts	mail	cs	Rozepsané
 drafts folder	mail	cs	Složka pro koncepty
 edit account	mail	cs	Upravit účet
 edit account ...	mail	cs	Upravit účet ...
-edit folder acl	mail	cs	Upravit oprávnění
 edit folder acl ...	mail	cs	Upravit oprávnění ...
 edit vacation settings	mail	cs	Editovat nastavení odpovědi v nepřítomnosti
 effective only if server supports acl at all	admin	cs	platí pouze pokud server podporuje ACL
@ -268,6 +265,7 @@ handling of external http images / mixed content in mails	mail	cs	Zpracování e
 header	mail	cs	Záhlaví
 header lines	mail	cs	Řádky hlavičky
 high	mail	cs	Vysoký
+high priority	mail	cs	Vysoká priorita
 hold %1 to drag files to your computer	mail	cs	Stiskněte a držte %1 pro přetažení souborů do vašeho počítače
 home page folders	mail	cs	Složky domovské stránky
 hostname or ip	mail	cs	Jméno nebo IP adresa serveru
@ -324,6 +322,7 @@ learning as spam failed because of %1	mail	cs	Učení jako spam selhalo kvůli %
 less than	mail	cs	menší než
 limit mailing list results when searching for addresses	mail	cs	Omezení výsledků poštovních seznamů při vyhledávání adres
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	cs	Seznam akcí, které mají být ve výchozím nastavení zapnuty/aktivovány (např. akce Mail kompose save as InfoLog).
+low priority	mail	cs	Nízká priorita
 mail	common	cs	E-mail
 mail acl	mail	cs	ACL práva e-mailu
 mail filter	mail	cs	Filtrovací pravidla
@ -462,7 +461,7 @@ refresh time in minutes	mail	cs	Čas obnovování v minutách
 refused to delete folder inbox	mail	cs	Smazání složky pro doručenou poštu bylo odmítnuto
 refused to delete folder with subfolders	mail	cs	Smazání složky s podsložkami bylo odmítnuto
 reject with	mail	cs	zamítnuto s
-reloaded account %1	mail	cs	Znovu načtený účet %1
+reloaded account %1	mail	cs	Znovu načtený účet %1.
 reloaded folder %1	mail	cs	Znovu načtená složka %1
 remember the password for	mail	cs	Zapamatujte si heslo pro
 remove all	mail	cs	Odstranit vše
@ -493,7 +492,6 @@ resend after how many days?	mail	cs	Po kolika dnech opakovat odeslání?
 respond to mail sent to:	mail	cs	Odpovědět:
 restrict acl management	admin	cs	Omezení správy ACL
 rights	mail	cs	Práva
-row order style	mail	cs	Způsob řazení řádků
 rule priority position	mail	cs	Priorita pravidla
 rule with priority	mail	cs	Pravidlo s prioritou
 rules	mail	cs	Pravidla
@ -575,7 +573,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	cs	Sieve
 sieve connection status	mail	cs	Stav podmínek Sieve
 sieve not activated	mail	cs	Sieve není aktivovaný
-sieve script name	mail	cs	Jméno Sieve skriptu
 sieve server	mail	cs	Sieve server
 sieve_edit_instructions	mail	cs	(*) Můžete použít zástupné znaky (*,?). Pokud chcete hledat znaky * nebo ? jako takové, je nutné před ně vložit zpětné lomítko \. Pokud zaškrtnete možnost regulárního dotazu, musíte zadat platný regulární výraz. Pokud v regulárním výrazu potřebujete použít vykřičník, který ale nemá reprezentovat negaci (NOT), je nutné před něj vložit zpětné lomítko \ (např. \!).
 sign your message with smime certificate	mail	cs	Podepište zprávu certifikátem S/MIME
@ -583,7 +580,6 @@ signature	mail	cs	Podpis
 signature at top	mail	cs	Podpis nahoře
 signature position and visibility	mail	cs	Pozice a viditelnost podpisu
 signed by	mail	cs	Podepsáno
-small view	mail	cs	malé zobrazení
 smime encrypted message	mail	cs	Šifrovaná zpráva S/MIME
 smime signed message	mail	cs	Zpráva podepsaná protokolem S/MIME
 smtp	mail	cs	SMTP
@ -607,7 +603,6 @@ subscribe to folder %1	mail	cs	Přihlásit složku %1 k odběru
 subscription folders	mail	cs	Složky přihlášené k odběru
 subscription successfully saved.	mail	cs	Nastavení odběru složek bylo úspěšně uloženo
 succeeded on %1 folders, failed on %2	mail	cs	Úspěšně na %1 složky, neúspěšně na %2
-successfully connected	mail	cs	Připojení bylo úspěšné
 switch off encryption?	mail	cs	Vypnout šifrování?
 template folder	mail	cs	Složka šablon
 templates	mail	cs	Šablony
@ -633,7 +628,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	cs	Tato zpráva je šifrována pomocí S/MIME a chráněna heslem.
 timeout on connections to your imap server	mail	cs	Vypršel časový limit při pokusu o připojení k vašemu IMAP serveru
 to do	mail	cs	K vyřízení
-toggle all folders view for %1	mail	cs	Změnit zobrazení všech složek jako %1
 toggled on actions	mail	cs	Přepnutí na akce
 trash	mail	cs	Koš
 trash folder	mail	cs	Koš
@ -683,13 +677,7 @@ wizard	mail	cs	Průvodce
 writable sharing requires epl version!	mail	cs	Sdílení s povoleným zápisem vyžaduje předplatné EPL!
 write	mail	cs	Uložit
 wrote	mail	cs	napsal
-yes, but mask all passwords	mail	cs	Ano, ale skrýt hesla
-yes, but mask all usernames and passwords	mail	cs	Ano, ale skrýt uživatelská jména a hesla
 yes, offer copy option	mail	cs	Ano, nabídnout volbu kopírování
-yes, only trigger connection reset	mail	cs	Ano, pouze resetovat připojení
-yes, show all debug information available for the user	mail	cs	Ano, zobrazit všechny ladicí informace dostupné pro uživatele
-yes, show basic info only	mail	cs	Ano, zobrazit pouze základní informace
-you can either choose to save as infolog or tracker, not both.	mail	cs	Můžete zvolit buď uložení jako úkol, nebo sledovací systém, ne však obojí.
 you can select what info to be displayed on email tag	mail	cs	Můžete vybrat, jaké informace se mají zobrazit na e-mailové značce.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	cs	Jako počáteční datum můžete použít $$start$$, jako koncové pak $$end$$.
 you may add this certificate into your contact, if you trust this signature.	mail	cs	Tento certifikát můžete přidat do svého kontaktu, pokud tomuto podpisu důvěřujete.
--- a/mail/lang/egw_da.lang
+++ b/mail/lang/egw_da.lang
@ -26,6 +26,7 @@ always respond / auto-responder	mail	da	Always respond / auto-responder
 always show html emails	mail	da	Vis altid HTML e-mails
 always show notifiction	mail	da	Vis altid meddelelse
 answered	mail	da	Besvaret
+archive folder	mail	da	Arkivmappe
 are you sure you want to delete all selected folders?	mail	da	Er du sikker på, at du vil slette alle valgte mapper?
 are you sure you want to move folder %1 to folder %2?	mail	da	Er du sikker på, at du vil flytte mappe %1 til mappe %2?
 attach files	mail	da	Vedhæft filer
@ -57,11 +58,12 @@ configured values will be set automatically on compose dialog for respected fiel
 connect to profile %1	mail	da	Opret forbindelse til profil %1
 contact label	mail	da	Kontakt-label
 contains	mail	da	indeholder
+convert mail to item and attach its attachments to this item (standard)	mail	da	Konverter e-mail til element og vedhæft vedhæftede filer til dette element (standard)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	da	Konverter e-mail til element, vedhæft dets vedhæftede filer og tilføj rå besked (.eml) som vedhæftet fil
+convert only mail to item (ignore possible attachments)	mail	da	Konverter kun e-mail til emne (ignorér eventuelle vedhæftede filer)
 copy to	mail	da	Kopier til
 cross account forward attachment is not allowed!	mail	da	Det er ikke tilladt at foretage en fremadrettet vedhæftning på tværs af konti!
 current subject	mail	da	Nuværende emne
-date(newest first)	mail	da	Dato (nyeste først)
-date(oldest first)	mail	da	Dato (ældste først)
 default sorting order	mail	da	Standart soterings rækkefølge
 default toolbar actions shown in mail's html editor	mail	da	Funktioner aktiveret i HTML-redigeringens værktøjslinje, når du udarbejder en e-mail
 default value for remembering s/mime passphrase in minutes	mail	da	Standardværdi for hukommelse af S/MIME-passphrase i minutter
@ -122,6 +124,7 @@ general	admin	da	Generelt
 get acl rights failed from imap server!	mail	da	Få ACL-rettigheder mislykkedes fra IMAP-server!
 ham folder	mail	da	Ham-mappe
 handling of external http images / mixed content in mails	mail	da	Håndtering af eksterne http-billeder / blandet indhold i mails
+high priority	mail	da	Høj prioritet
 html	mail	da	HTML
 ident name	mail	da	Ident navn
 ident name email	mail	da	Ident navn [E-mail]
@ -155,6 +158,7 @@ learning as spam failed because of %1	mail	da	Læring som spam mislykkedes på g
 less than	mail	da	mindre end
 limit mailing list results when searching for addresses	mail	da	Begræns mailinglisteresultater, når du søger efter adresser
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	da	Liste over handlinger, der skal slås til/aktiveres som standard (f.eks. Mail compose save as InfoLog action)
+low priority	mail	da	Lav prioritet
 mail	common	da	Mail
 mail acl	mail	da	Adgangsrettigheder
 mail filter	mail	da	Mailfilter
@ -284,7 +288,6 @@ signature	mail	da	Signatur
 signature at top	mail	da	signatur øverst
 signature position and visibility	mail	da	Signaturens placering og synlighed
 signed by	mail	da	Signeret af
-small view	mail	da	Lille overblik
 smime encrypted message	mail	da	S/MIME-krypteret meddelelse
 smime signed message	mail	da	S/MIME-signeret meddelelse
 smtp	mail	da	SMTP
@ -299,7 +302,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	da	Denne besked er S/MIME-krypteret og adgangskodebeskyttet.
 timeout on connections to your imap server	mail	da	Timeout på forbindelser til din IMAP-server
 to do	mail	da	Sådan gør du
-toggle all folders view for %1	mail	da	Slå visning af alle mapper til for %1
 toggled on actions	mail	da	Aktiveret på handlinger
 trash	mail	da	Papirkurv
 trash folder	mail	da	Papirkurv-mappe
@ -308,10 +310,6 @@ unread	mail	da	ulæst
 when deleting messages	mail	da	Når meddelser slettes
 write	mail	da	Skriv
 wrote	mail	da	skrev
-yes, only trigger connection reset	mail	da	ja, udløser kun nulstilling af forbindelsen
-yes, show all debug information available for the user	mail	da	ja, vis alle tilgængelige debug-informationer for brugeren
-yes, show basic info only	mail	da	ja, vis kun grundlæggende oplysninger
-you can either choose to save as infolog or tracker, not both.	mail	da	Du kan enten vælge at gemme som InfoLog ELLER tracker, ikke begge dele.
 you can select what info to be displayed on email tag	mail	da	Du kan vælge, hvilke oplysninger der skal vises på e-mail-tagget.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	da	Du kan bruge $$start$$ for ovenstående startdato og $$end$$ for slutdatoen.
 you may add this certificate into your contact, if you trust this signature.	mail	da	Du kan tilføje dette certifikat til din kontakt, hvis du stoler på denne signatur.
--- a/mail/lang/egw_de.lang
+++ b/mail/lang/egw_de.lang
@ -127,8 +127,6 @@ cross account forward attachment is not allowed!	mail	de	Weiterleitung als Anhan
 current folder	mail	de	Aktueller Ordner
 current subject	mail	de	Aktueller Betreff
 currently:	mail	de	Aktuell:
-date(newest first)	mail	de	Datum (neue zuerst)
-date(oldest first)	mail	de	Datum (alte zuerst)
 deactive	mail	de	Deaktiviert
 default sorting order	mail	de	Wählen Sie die Standard-Sortierreihenfolge aus
 default toolbar actions shown in mail's html editor	mail	de	Aktivierte Funktionen in der HTML-Editor-Symbolleiste beim E-Mail verfassen
@ -190,7 +188,6 @@ drafts	mail	de	Entwürfe
 drafts folder	mail	de	Ordner für Entwürfe
 edit account	mail	de	Konto Einstellungen
 edit account ...	mail	de	Konto bearbeiten ...
-edit folder acl	mail	de	Berechtigungen bearbeiten
 edit folder acl ...	mail	de	Zugriffsrechte bearbeiten ...
 edit vacation settings	mail	de	Abwesenheitsnotiz bearbeiten
 effective only if server supports acl at all	admin	de	Wird nur angewendet, wenn Ihr Server diese Methode unterstützt
@ -474,7 +471,7 @@ refresh time in minutes	mail	de	Aktualisierungsintervall in Minuten
 refused to delete folder inbox	mail	de	Die Löschung des Ordners Posteingang wird verweigert
 refused to delete folder with subfolders	mail	de	Die Löschung eines Ordners mit Unterordnern wird verweigert
 reject with	mail	de	ablehnen mit
-reloaded account %1	mail	de	Lade das Konto %1 neu
+reloaded account %1	mail	de	Lade das Konto %1 neu.
 reloaded folder %1	mail	de	Ordner %1 neu geladen
 remember the password for	mail	de	Passwort merken für
 remove "%1" from blacklisted domains	mail	de	Lösche "%1" aus der Blacklist Domainliste
@ -509,7 +506,6 @@ resend after how many days?	mail	de	Nach wie vielen Tagen erneut senden?
 respond to mail sent to:	mail	de	Benachrichtigung für:
 restrict acl management	admin	de	ACL-Verwaltung beschränken
 rights	mail	de	Zugriffsrechte
-row order style	mail	de	Spaltenanordnung
 rule priority position	mail	de	Priorität/Reihenfolge
 rule with priority	mail	de	Regel mit Priorität
 rules	mail	de	Regeln
@ -591,7 +587,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	de	Sieve
 sieve connection status	mail	de	Sieve Verbindungsstatus
 sieve not activated	mail	de	Sieve nicht aktiviert
-sieve script name	mail	de	Stellen Sie den Sieve-Skript-Namen ein
 sieve server	mail	de	Sieve-Server
 sieve_edit_instructions	mail	de	(*) Platzhalter (*,?) können verwendet werden. Wenn Sie * oder ? selbst finden wollen, dann müssen Sie diesen Zeichen je einen Backslash (\) voranstellen. Wenn Sie "reguläre Ausdrücke verwenden" aktivieren, dann müssen Sie jedoch gültige reguläre Ausdrücke angeben. Zur Verwendung von Ausrufezeichen (!), das NICHT als "NICHT" interprtiert werden soll, muss ein regulärer Ausdruck verwendet werden und ein Backslash - also "\!"
 sign your message with smime certificate	mail	de	Signieren Sie Ihre Nachricht mit einem S/MIME-Zertifikat
@ -599,7 +594,6 @@ signature	mail	de	Signatur
 signature at top	mail	de	Signatur am Anfang der Nachricht
 signature position and visibility	mail	de	Position und Sichtbarkeit der Signatur
 signed by	mail	de	Unterzeichnet von
-small view	mail	de	schmale Ansicht
 smime encrypted message	mail	de	S/MIME-verschlüsselte Nachricht
 smime signed message	mail	de	S/MIME-signierte Nachricht
 smtp	mail	de	Postausgangs-Server
@ -623,7 +617,6 @@ subscribe to folder %1	mail	de	Ordner %1 abonieren
 subscription folders	mail	de	Ordner abonnieren
 subscription successfully saved.	mail	de	Das Abonnieren der Ordner wurde erfolgreich gespeichert.
 succeeded on %1 folders, failed on %2	mail	de	Erfolgreich bei %1 Ordnern, fehlgeschlagen bei %2
-successfully connected	mail	de	Erfolgreich verbunden
 switch off encryption?	mail	de	Verschlüsselung ausschalten?
 template folder	mail	de	Vorlagen Ordner
 templates	mail	de	Vorlagen
@ -649,7 +642,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	de	Diese Nachricht ist S/MIME-verschlüsselt und mit Passwort geschützt.
 timeout on connections to your imap server	mail	de	Stellen Sie hier das Verbindungstimeout für IMAP Verbindungen ein.
 to do	mail	de	Zu erledigen
-toggle all folders view for %1	mail	de	Umschaltung der Alle-Ordner-anzeigen Ansicht für %1
 toggled on actions	mail	de	Folgende Aktionen sind immer eingeschaltet
 trash	mail	de	Papierkorb
 trash folder	mail	de	Ordner für gelöschte Nachrichten
@ -700,13 +692,7 @@ wizard	mail	de	Assistent
 writable sharing requires epl version!	mail	de	Beschreibbare Freigaben benötigen die EPL Version!
 write	mail	de	schreiben
 wrote	mail	de	schrieb
-yes, but mask all passwords	mail	de	Ja, aber maskiere alle Passwörter
-yes, but mask all usernames and passwords	mail	de	Ja, aber maskiere Benutzernamen und Passwörter
 yes, offer copy option	mail	de	Ja, mit Kopier-Option
-yes, only trigger connection reset	mail	de	Ja, aber führe nur das zurücksetzen der Verbindung aus
-yes, show all debug information available for the user	mail	de	Ja, zeige alle dem Benutzer zugänglichen Informationen an.
-yes, show basic info only	mail	de	Ja, nur Basis Informationen anzeigen
-you can either choose to save as infolog or tracker, not both.	mail	de	Sie können eine E-Mail entweder als InfoLog-, ODER als Ticket-Eintrag speichern, nicht beides gleichzeitig.
 you can select what info to be displayed on email tag	mail	de	Sie können auswählen, welche Informationen auf dem E-Mail-Tag angezeigt werden sollen. Die zusätzliche Anzeige der E-Mail-Adresse ermöglicht die Absenderadresse zu überprüfen.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	de	Sie können $$start$$ für das obige Start- und $$end$$ für das End-Datum verwenden.
 you may add this certificate into your contact, if you trust this signature.	mail	de	Sie können dieses Zertifikat in Ihren Kontakt speichern, wenn Sie dieser Signatur trauen.
--- a/mail/lang/egw_el.lang
+++ b/mail/lang/egw_el.lang
@ -124,8 +124,6 @@ cross account forward attachment is not allowed!	mail	el	Δεν επιτρέπε
 current folder	mail	el	Τρέχον φάκελος
 current subject	mail	el	Τρέχον θέμα
 currently:	mail	el	Αυτή τη στιγμή:
-date(newest first)	mail	el	Ημερομηνία (πρώτα η πιο πρόσφατη)
-date(oldest first)	mail	el	Ημερομηνία (πρώτα η πιο παλιά)
 deactive	mail	el	Απενεργοποίηση
 default sorting order	mail	el	Προεπιλεγμένη σειρά ταξινόμησης
 default toolbar actions shown in mail's html editor	mail	el	Ενεργοποίηση λειτουργιών στη γραμμή εργαλείων του επεξεργαστή HTML κατά τη σύνταξη ενός email
@ -183,7 +181,6 @@ drafts	mail	el	Προσχέδια
 drafts folder	mail	el	φάκελος για προσχέδια
 edit account	mail	el	Επεξεργασία λογαριασμού
 edit account ...	mail	el	Επεξεργασία λογαριασμού ...
-edit folder acl	mail	el	Επεξεργασία δικαιωμάτων φακέλου
 edit folder acl ...	mail	el	Επεξεργασία δικαιωμάτων φακέλου ...
 edit vacation settings	mail	el	επεξεργασία ρυθμίσεων διακοπών
 effective only if server supports acl at all	admin	el	Αποτελεσματικό μόνο αν ο διακομιστής υποστηρίζει δικαιώματα πρόσβασης στο email
@ -268,6 +265,7 @@ handling of external http images / mixed content in mails	mail	el	Χειρισμ
 header	mail	el	Κεφαλή
 header lines	mail	el	Γραμμές κεφαλής
 high	mail	el	υψηλό
+high priority	mail	el	Υψηλή προτεραιότητα
 hold %1 to drag files to your computer	mail	el	Κρατήστε πατημένο το %1 για να σύρετε αρχεία στον υπολογιστή σας
 hostname or ip	mail	el	Όνομα υπολογιστή ή διεύθυνση IP
 how often to check with the server for new mail	mail	el	Πόσο συχνά να ελέγχεται ο εξυπηρετητής για νέα μηνύματα
@ -322,6 +320,7 @@ learning as spam failed because of %1	mail	el	Η εκμάθηση ως spam απ
 less than	mail	el	μικρότερο από
 limit mailing list results when searching for addresses	mail	el	Περιορισμός των αποτελεσμάτων της λίστας αλληλογραφίας κατά την αναζήτηση διευθύνσεων
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	el	Λίστα ενεργειών που πρέπει να ενεργοποιούνται/ενεργοποιούνται από προεπιλογή (π.χ. Mail σύνταξη αποθήκευση ως ενέργεια InfoLog).
+low priority	mail	el	Χαμηλή προτεραιότητα
 mail	common	el	Mail
 mail acl	mail	el	Δικαιώματα πρόσβασης
 mail filter	mail	el	Φίλτρα μηνυμάτων
@ -474,7 +473,6 @@ required to disable if you use dovecot with private seen flags on shared or user
 resend after how many days?	mail	el	Επαναποστολή μετά από πόσες ημέρες;
 restrict acl management	admin	el	Περιορισμός διαχείρισης ACL
 rights	mail	el	Δικαιώματα
-row order style	mail	el	Στυλ ταξινόμησης σειράς
 rule priority position	mail	el	Κανόνας προτεραιότητα θέση
 rule with priority	mail	el	κανόνας με προτεραιότητα
 rules	mail	el	κανόνες
@ -551,14 +549,12 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	el	Sieve
 sieve connection status	mail	el	Κατάσταση επικοινωνίας Sieve
 sieve not activated	mail	el	Η λειτουργία Sieve δεν είναι ενεργοποιημένη
-sieve script name	mail	el	όνομα Sieve σεναρίου
 sieve server	mail	el	Εξυπηρετητής Sieve
 sign your message with smime certificate	mail	el	Εφαρμόστε ένα πιστοποιητικό S/MIME στο μήνυμά σας
 signature	mail	el	Υπογραφή
 signature at top	mail	el	υπογραφή στο πάνω μέρος
 signature position and visibility	mail	el	Θέση υπογραφής και κατάσταση εμφάνισης
 signed by	mail	el	Υπογραφή από
-small view	mail	el	μικρή προβολή
 smime encrypted message	mail	el	Κρυπτογραφημένο μήνυμα S/MIME
 smime signed message	mail	el	Υπογεγραμμένο μήνυμα S/MIME
 smtp	mail	el	SMTP
@ -579,7 +575,6 @@ subscribe to folder %1	mail	el	Συνδρομή στον φάκελο %1
 subscription folders	mail	el	Συνδρομές σε φακέλους
 subscription successfully saved.	mail	el	Η συνδρομή αποθηκεύθηκε επιτυχώς.
 succeeded on %1 folders, failed on %2	mail	el	Επιτυχία σε %1 φακέλους, αποτυχία σε %2
-successfully connected	mail	el	Συνδέθηκε επιτυχώς
 switch off encryption?	mail	el	Να απενεργοποιηθεί η κρυπτογράφηση;
 template folder	mail	el	φάκελος υποδειγμάτων
 templates	mail	el	Υποδείγματα
@ -596,7 +591,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	el	Αυτό το μήνυμα είναι κρυπτογραφημένο με S/MIME και προστατεύεται με κωδικό πρόσβασης.
 timeout on connections to your imap server	mail	el	Χρονικό όριο στις συνδέσεις με τον διακομιστή IMAP
 to do	mail	el	Για να κάνετε
-toggle all folders view for %1	mail	el	Εναλλαγή της προβολής όλων των φακέλων για το %1
 toggled on actions	mail	el	Εναλλαγή σε ενέργειες
 trash	mail	el	Κάδος αχρήστων
 trash folder	mail	el	Φάκελος κάδου αχρήστων
@ -628,13 +622,7 @@ with message:	mail	el	Με μήνυμα:
 wizard	mail	el	Βοηθός
 write	mail	el	Γραφή
 wrote	mail	el	γράφτηκε
-yes, but mask all passwords	mail	el	ναι, αλλά να αποκρύπτονται οι κωδικοί πρόσβασης
-yes, but mask all usernames and passwords	mail	el	ναι, αλλά να αποκρύπτονται τα ονόματα λογαριασμών και οι κωδικοί πρόσβασης
 yes, offer copy option	mail	el	ναι, να προτείνεται δυνατότητα αντιγραφής
-yes, only trigger connection reset	mail	el	ναι, να γίνεται πρόκληση επαναφοράς της σύνδεσης
-yes, show all debug information available for the user	mail	el	ναι, να εμφανίζονται όλες οι πληροφορίες αποσφαλμάτωσης που είναι διαθέσιμες για τον χρήστη
-yes, show basic info only	mail	el	ναι, εμφάνιση μόνο βασικών πληροφοριών
-you can either choose to save as infolog or tracker, not both.	mail	el	Μπορείτε να επιλέξετε είτε να αποθηκεύσετε ως InfoLog Ή ως tracker, όχι και τα δύο.
 you can select what info to be displayed on email tag	mail	el	Μπορείτε να επιλέξετε ποιες πληροφορίες θα εμφανίζονται στην ετικέτα email.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	el	Μπορείτε να χρησιμοποιήσετε $$start$$ για την παραπάνω ημερομηνία έναρξης και $$end$$ για την ημερομηνία λήξης.
 you may add this certificate into your contact, if you trust this signature.	mail	el	Μπορείτε να προσθέσετε αυτό το πιστοποιητικό στην επαφή σας, αν εμπιστεύεστε αυτή την υπογραφή.
--- a/mail/lang/egw_en.lang
+++ b/mail/lang/egw_en.lang
@ -127,8 +127,6 @@ cross account forward attachment is not allowed!	mail	en	Cross account forward a
 current folder	mail	en	current folder
 current subject	mail	en	Current subject
 currently:	mail	en	Currently:
-date(newest first)	mail	en	date(newest first)
-date(oldest first)	mail	en	date(oldest first)
 deactive	mail	en	Deactive
 default sorting order	mail	en	Default sorting order
 default toolbar actions shown in mail's html editor	mail	en	Functions enabled in the HTML editor toolbar when composing an email
@ -190,7 +188,6 @@ drafts	mail	en	Drafts
 drafts folder	mail	en	Drafts Folder
 edit account	mail	en	Edit Account
 edit account ...	mail	en	Edit account ...
-edit folder acl	mail	en	Email access rights
 edit folder acl ...	mail	en	Email access rights ...
 edit vacation settings	mail	en	Edit vacation notice
 effective only if server supports acl at all	admin	en	Effective only if server supports email access rights at all
@ -474,7 +471,7 @@ refresh time in minutes	mail	en	Refresh time in minutes
 refused to delete folder inbox	mail	en	refused to delete folder Inbox
 refused to delete folder with subfolders	mail	en	refused to delete folder with subfolders
 reject with	mail	en	reject with
-reloaded account %1	mail	en	Reloaded account %1
+reloaded account %1	mail	en	Reloaded account %1.
 reloaded folder %1	mail	en	Reloaded folder %1
 remember the password for	mail	en	Remember the password for
 remove "%1" from blacklisted domains	mail	en	Remove "%1" from blacklisted domains
@ -509,7 +506,6 @@ resend after how many days?	mail	en	Resend after how many days?
 respond to mail sent to:	mail	en	Respond to email sent to:
 restrict acl management	admin	en	Restrict access rights management
 rights	mail	en	Rights
-row order style	mail	en	row order style
 rule priority position	mail	en	Rule priority position
 rule with priority	mail	en	rule with priority
 rules	mail	en	Rules
@ -591,7 +587,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	en	Sieve
 sieve connection status	mail	en	Sieve Connection Status
 sieve not activated	mail	en	Sieve not activated
-sieve script name	mail	en	Sieve script name
 sieve server	mail	en	Sieve server
 sieve_edit_instructions	mail	en	(*) Wildcards (*,?) may be used. If you are trying to match * or ? itself, you must escape them with a backslash (\). If you check "Use regular expressions" you must use valid regular expressions. In order to escape of exclamation mark (!) at the beginning not being used as "NOT", use regex and backslash (\) (e.g. \!)
 sign your message with smime certificate	mail	en	Sign your message with S/MIME certificate
@ -599,7 +594,6 @@ signature	mail	en	Signature
 signature at top	mail	en	signature at top
 signature position and visibility	mail	en	Signature position and visibility
 signed by	mail	en	Signed by
-small view	mail	en	small view
 smime encrypted message	mail	en	S/MIME encrypted message
 smime signed message	mail	en	S/MIME signed message
 smtp	mail	en	SMTP
@ -623,7 +617,6 @@ subscribe to folder %1	mail	en	Subscribe to folder %1
 subscription folders	mail	en	Subscription folders
 subscription successfully saved.	mail	en	Subscription successfully saved.
 succeeded on %1 folders, failed on %2	mail	en	Succeeded on %1 folders, failed on %2
-successfully connected	mail	en	Successfully connected
 switch off encryption?	mail	en	Switch off encryption?
 template folder	mail	en	Template Folder
 templates	mail	en	Templates
@ -649,7 +642,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	en	This message is S/MIME encrypted and password protected.
 timeout on connections to your imap server	mail	en	Timeout on connections to your IMAP Server
 to do	mail	en	To do
-toggle all folders view for %1	mail	en	Toggle all folders view for %1
 toggled on actions	mail	en	Toggled on actions
 trash	mail	en	Trash
 trash folder	mail	en	Trash folder
@ -674,7 +666,7 @@ vacation notice	mail	en	Vacation notice
 vacation notice is active	mail	en	Vacation notice is active
 vacation notice is not saved yet! (but we filled in some defaults to cover some of the above errors. please correct and check your settings and save again.)	mail	en	Vacation notice is not saved yet! (But we filled in some defaults to cover some of the above errors. Please correct and check your settings and save again.)
 vacation notice sucessfully updated.	mail	en	Vacation notice successfully updated.
-vacation notice update failed	mail	en	Vacation notice update failed
+vacation notice update failed	mail	en	Vacation notice update failed.
 vacation start-date must be before the end-date!	mail	en	Vacation start-date must be BEFORE the end-date!
 vacation update failed	mail	en	vacation update failed
 valid for	mail	en	Valid for
@ -700,13 +692,7 @@ wizard	mail	en	Wizard
 writable sharing requires epl version!	mail	en	Writable sharing requires EPL version!
 write	mail	en	write
 wrote	mail	en	wrote
-yes, but mask all passwords	mail	en	yes, but mask all passwords
-yes, but mask all usernames and passwords	mail	en	yes, but mask all usernames and passwords
 yes, offer copy option	mail	en	Yes, offer copy option
-yes, only trigger connection reset	mail	en	yes, only trigger connection reset
-yes, show all debug information available for the user	mail	en	yes, show all debug information available for the user
-yes, show basic info only	mail	en	yes, show basic info only
-you can either choose to save as infolog or tracker, not both.	mail	en	You can either choose to save as InfoLog OR tracker, not both.
 you can select what info to be displayed on email tag	mail	en	You can select what info to be displayed on email tag.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	en	You can use $$start$$ for the above start date and $$end$$ for the end date.
 you may add this certificate into your contact, if you trust this signature.	mail	en	You may add this certificate into your contact, if you trust this signature.
--- a/mail/lang/egw_es-es.lang
+++ b/mail/lang/egw_es-es.lang
@ -126,8 +126,6 @@ cross account forward attachment is not allowed!	mail	es-es	No está permitido a
 current folder	mail	es-es	carpeta actual
 current subject	mail	es-es	Asunto actual
 currently:	mail	es-es	Actualmente:
-date(newest first)	mail	es-es	fecha (la más reciente primero)
-date(oldest first)	mail	es-es	fecha (la más antigua primero)
 deactive	mail	es-es	Desactivar
 default sorting order	mail	es-es	Modo de ordenar predeterminado
 default toolbar actions shown in mail's html editor	mail	es-es	Funciones habilitadas en la barra de herramientas del editor HTML al redactar un correo electrónico
@ -189,7 +187,6 @@ drafts	mail	es-es	Borradores
 drafts folder	mail	es-es	Carpeta de borradores
 edit account	mail	es-es	Editar cuenta
 edit account ...	mail	es-es	Editar cuenta ...
-edit folder acl	mail	es-es	Editar la lista de control de acceso de la carpeta
 edit folder acl ...	mail	es-es	Editar la lista de control de acceso de la carpeta ...
 edit vacation settings	mail	es-es	Editar configuración de vacaciones
 effective only if server supports acl at all	admin	es-es	eficaz sólo si el servidor admite lista de control de acceso en todo
@ -277,6 +274,7 @@ handling of external http images / mixed content in mails	mail	es-es	Tratamiento
 header	mail	es-es	Encabezado
 header lines	mail	es-es	Líneas de encabezado
 high	mail	es-es	alto
+high priority	mail	es-es	Alta prioridad
 hold %1 to drag files to your computer	mail	es-es	Sostenga %1 para arrastrar archivos a su computadora
 home page folders	mail	es-es	carpetas de la página de inicio
 hostname or ip	mail	es-es	Nombre de host o IP
@ -333,6 +331,7 @@ learning as spam failed because of %1	mail	es-es	El aprendizaje como spam falló
 less than	mail	es-es	menor que
 limit mailing list results when searching for addresses	mail	es-es	Limitar los resultados de las listas de correo al buscar direcciones
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	es-es	Lista de acciones que deben activarse por defecto (por ejemplo, la acción Guardar como InfoLog de Mail composose).
+low priority	mail	es-es	Prioridad baja
 mail	common	es-es	Correo
 mail acl	mail	es-es	Lista de control de acceso del correo
 mail filter	mail	es-es	Filtrar
@ -471,7 +470,7 @@ refresh time in minutes	mail	es-es	Tiempo de refresco en minutos
 refused to delete folder inbox	mail	es-es	Se negó a suprimir la carpeta INBOX
 refused to delete folder with subfolders	mail	es-es	Se negó a suprimir la carpeta con subcarpetas
 reject with	mail	es-es	rechazar con
-reloaded account %1	mail	es-es	Cuenta %1 recargada
+reloaded account %1	mail	es-es	Cuenta %1 recargada.
 reloaded folder %1	mail	es-es	Carpeta %1 recargada
 remember the password for	mail	es-es	Recordar la contraseña para
 remove "%1" from blacklisted domains	mail	es-es	Suprimir "%1" de los dominios en la lista negra
@ -506,7 +505,6 @@ resend after how many days?	mail	es-es	¿Reenviar después de cuántos días?
 respond to mail sent to:	mail	es-es	Responder al correo enviado a:
 restrict acl management	admin	es-es	Restringir gestión de lista de control de acceso
 rights	mail	es-es	Derechos
-row order style	mail	es-es	estilo de ordenar filas
 rule priority position	mail	es-es	Posición de prioridad de la regla
 rule with priority	mail	es-es	Regla con prioridad
 rules	mail	es-es	Reglas
@ -588,7 +586,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	es-es	Sieve
 sieve connection status	mail	es-es	Estado de la conexión Sieve
 sieve not activated	mail	es-es	Sieve no está activado
-sieve script name	mail	es-es	Nombre del script Sieve
 sieve server	mail	es-es	Servidor Sieve
 sieve_edit_instructions	mail	es-es	(*) Se pueden utilizar comodines (*,?). Si está intentando igualar * o? en sí, debe escapar estos con una barra invertida (\). Si marca "Utilizar expresiones regulares" debe utilizar expresiones regulares válidas. Con el fin de escapar de signo de exclamación (!) en el inicio no siendo usado "NO", utilizar regex y barra invertida (\) (e.g. \!)
 sign your message with smime certificate	mail	es-es	Firme su mensaje con un certificado S/MIME
@ -596,7 +593,6 @@ signature	mail	es-es	Firma
 signature at top	mail	es-es	firma en la parte superior
 signature position and visibility	mail	es-es	Posición y visibilidad de la firma
 signed by	mail	es-es	Firmado por
-small view	mail	es-es	Vista reducida
 smime encrypted message	mail	es-es	Mensaje cifrado S/MIME
 smime signed message	mail	es-es	Mensaje firmado S/MIME
 smtp	mail	es-es	SMTP
@ -620,7 +616,6 @@ subscribe to folder %1	mail	es-es	Suscribirse a la carpeta %1
 subscription folders	mail	es-es	Carpetas de suscripción
 subscription successfully saved.	mail	es-es	La suscripción se ha grabado correctamente.
 succeeded on %1 folders, failed on %2	mail	es-es	Se ha realizado correctamente en %1 carpetas, ha fallado en %2
-successfully connected	mail	es-es	Conectado correctamente
 switch off encryption?	mail	es-es	¿Desea desactivar el cifrado?
 template folder	mail	es-es	Carpeta de plantillas
 templates	mail	es-es	Plantillas
@ -646,7 +641,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	es-es	Este mensaje está encriptado S/MIME y protegido por contraseña.
 timeout on connections to your imap server	mail	es-es	Tiempo de espera en las conexiones a su servidor IMAP
 to do	mail	es-es	Por hacer
-toggle all folders view for %1	mail	es-es	Activar la vista de todas las carpetas para %1
 toggled on actions	mail	es-es	Activar acciones
 trash	mail	es-es	Papelera
 trash folder	mail	es-es	Carpeta Papelera
@ -697,13 +691,7 @@ wizard	mail	es-es	Asistente
 writable sharing requires epl version!	mail	es-es	¡Compartir escritura requiere la versión EPL!
 write	mail	es-es	escribir
 wrote	mail	es-es	escribió
-yes, but mask all passwords	mail	es-es	si, pero enmascarar todas las contraseñas
-yes, but mask all usernames and passwords	mail	es-es	si, pero enmascarar todos los usuarios y las contraseñas
 yes, offer copy option	mail	es-es	sí, ofrecer la opción de copiar
-yes, only trigger connection reset	mail	es-es	sí, sólo desencadenar el restablecimiento de la conexión
-yes, show all debug information available for the user	mail	es-es	si, mostrar toda la información de depuración disponible para el usuario
-yes, show basic info only	mail	es-es	si, sólo mostrar información básica
-you can either choose to save as infolog or tracker, not both.	mail	es-es	Puede elegir guardar como infolog o seguimiento, no ambos.
 you can select what info to be displayed on email tag	mail	es-es	Puede seleccionar la información que se mostrará en la etiqueta de correo electrónico.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	es-es	Puede utilizar $$start$$ para la fecha de inicio y $$end$$ para la fecha de finalización.
 you may add this certificate into your contact, if you trust this signature.	mail	es-es	Puede añadir este certificado a su contacto, si confía en esta firma.
--- a/mail/lang/egw_et.lang
+++ b/mail/lang/egw_et.lang
@ -25,6 +25,7 @@ always show html emails	mail	et	Alati näita HTML emaile
 always show notifiction	mail	et	Näita alati teavitust
 answered	mail	et	Vastatud
 any status	mail	et	kõik staatused
+archive folder	mail	et	Arhiivikaust
 attach files	mail	et	Failide lisamine
 attach users vcard at compose to every new mail	mail	et	Lisada kasutajate vCard iga uue posti koostamisel.
 attach vcard	mail	et	Kinnita vCard
@ -52,10 +53,11 @@ checking admin credentials failed	mail	et	Administraatori volituste kontrollimin
 configured values will be set automatically on compose dialog for respected field when composing a new email.	mail	et	Konfigureeritud väärtused määratakse automaatselt koostamise dialoogis kinnipeetavale väljale, kui koostate uue e-kirja.
 contact label	mail	et	Kontakt silt
 contains	mail	et	sisaldab
+convert mail to item and attach its attachments to this item (standard)	mail	et	E-posti muutmine elemendiks ja selle manuste lisamine sellele elemendile (standard)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	et	Teisenda e-kiri elemendiks, lisa selle manuseid ja lisa manusena toorsõnum (.eml)
+convert only mail to item (ignore possible attachments)	mail	et	Konverteerida ainult e-kiri elemendiks (ignoreerida võimalikke manuseid)
 copied %1 message(s) from %2 to %3	mail	et	Kopeeritud %1 sõnum(id) %2-st %3-sse
 cross account forward attachment is not allowed!	mail	et	Det er ikke tilladt at foretage en fremadrettet vedhæftning på tværs af konti!
-date(newest first)	mail	et	Kuupäev (uuemad enne)
-date(oldest first)	mail	et	Kuupäev (vanemad enne)
 default sorting order	mail	et	Vaikimisi sorteerimise järjekord
 default toolbar actions shown in mail's html editor	mail	et	Funktioner aktiveret i HTML-redigeringens værktøjslinje, når du udarbejder en e-mail
 default value for remembering s/mime passphrase in minutes	mail	et	Standardværdi for hukommelse af S/MIME-passphrase i minutter
@ -108,6 +110,7 @@ general	admin	et	Üldine
 get acl rights failed from imap server!	mail	et	ACL-õiguste saamine IMAP-serverist ebaõnnestus!
 ham folder	mail	et	Ham kaust
 handling of external http images / mixed content in mails	mail	et	Välise http-pildi / segatud sisu käsitlemine e-kirjades
+high priority	mail	et	Kõrge prioriteet
 html	mail	et	HTML
 ident name	mail	et	Tunnuse nimi
 ident name email	mail	et	Ident name [Email]
@ -138,6 +141,7 @@ learning as spam failed because of %1	mail	et	Õppimine rämpspostina ebaõnnest
 less than	mail	et	vähem kui
 limit mailing list results when searching for addresses	mail	et	Postiloendi tulemuste piiramine aadresside otsimisel
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	et	Loetelu tegevustest, mis tuleb vaikimisi sisse lülitada/aktiveerida (nt Mail compose save as InfoLog action).
+low priority	mail	et	Madal prioriteet
 mail	common	et	E-postid
 mail acl	mail	et	Juurdepääsuõigused
 mail filter	mail	et	Maili filter
@ -256,7 +260,6 @@ signature	mail	et	Allkiri
 signature at top	mail	et	allkiri üleval
 signature position and visibility	mail	et	Allkirja asukoht ja nähtavus
 signed by	mail	et	Allkirjastanud
-small view	mail	et	väike vaade
 smime encrypted message	mail	et	S/MIME krüpteeritud sõnum
 smime signed message	mail	et	S/MIME allkirjastatud sõnum
 smtp	mail	et	SMTP
@ -269,15 +272,11 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	et	See sõnum on S/MIME-krüpteeritud ja parooliga kaitstud.
 timeout on connections to your imap server	mail	et	IMAP-serveriga ühenduse aegumistähtaeg
 to do	mail	et	Teha
-toggle all folders view for %1	mail	et	Lülitage kõigi kaustade vaade %1 jaoks ümber
 toggled on actions	mail	et	Tegevuste sisselülitamine
 trash	mail	et	Prügikasti
 trash folder	mail	et	Prügikasti kaust
 unread	mail	et	lugematta
 write	mail	et	Kirjuta
-yes, only trigger connection reset	mail	et	jah, ainult ühenduse lähtestamine
-yes, show all debug information available for the user	mail	et	jah, näidata kogu kasutajale kättesaadavat silumisandmeid
-you can either choose to save as infolog or tracker, not both.	mail	et	Saate valida, kas salvestada InfoLogi VÕI jälgimisseadmena, mitte mõlemat.
 you can select what info to be displayed on email tag	mail	et	Saate valida, millist teavet kuvatakse e-posti sildil.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	et	Saate kasutada $$start$$ ülaltoodud alguskuupäeva ja $$end$$$ lõppkuupäeva jaoks.
 you may add this certificate into your contact, if you trust this signature.	mail	et	Te võite lisada selle sertifikaadi oma kontakti, kui te usaldate seda allkirja.
--- a/mail/lang/egw_eu.lang
+++ b/mail/lang/egw_eu.lang
@ -9,8 +9,6 @@ compress folder	mail	eu	Karpeta konprimatu
 condition	mail	eu	baldintza
 contains	mail	eu	dauka
 copy to	mail	eu	Kopiatu Hona
-date(newest first)	mail	eu	Data (berriak lehenik)
-date(oldest first)	mail	eu	Data (Zaharrak lehenik)
 default sorting order	mail	eu	sailkapen lehenetsia
 delete folder	mail	eu	Karpeta ezabatu
 deleted	mail	eu	ezabatua
@ -75,7 +73,6 @@ save all	mail	eu	Gorde dena
 select all	mail	eu	Guztiak hautatu
 sent folder	mail	eu	Bidalitakoen karpeta
 signature	mail	eu	Sinadura
-small view	mail	eu	ikuspegi txikia
 then	mail	eu	ORDUAN
 trash folder	mail	eu	Zakar karpeta
 unflagged	mail	eu	bandera gabea
--- a/mail/lang/egw_fa.lang
+++ b/mail/lang/egw_fa.lang
@ -9,8 +9,6 @@ compose	mail	fa	نامه جدید
 compress folder	mail	fa	فشرده سازی پوشه
 contains	mail	fa	شامل است
 copy to	mail	fa	نسخه برداری به
-date(newest first)	mail	fa	تاریخ (جدیدها اول)
-date(oldest first)	mail	fa	تاریخ (قدیمی ها اول)
 default sorting order	mail	fa	ترتیب مرتب سازی پیش فرض
 delete folder	mail	fa	حذف پوشه
 deleted	mail	fa	حذف شد
@ -81,7 +79,6 @@ save all	mail	fa	ذخیره کردن همه
 select all	mail	fa	انتخاب همه
 sent folder	mail	fa	پوشه ارسال شده
 signature	mail	fa	امضاء
-small view	mail	fa	نمای کوچک
 sort order	mail	fa	ترتیب مرتب سازی
 text	mail	fa	متن
 the mimeparser can not parse this message.	mail	fa	تشخیص دهنده نوع فایل قادر به تشخیص این پیام نیست
--- a/mail/lang/egw_fi.lang
+++ b/mail/lang/egw_fi.lang
@ -27,6 +27,7 @@ and the rule with priority %1, now got the priority %2	mail	fi	Ja sääntö, jol
 answered	mail	fi	Vastattu
 any of	mail	fi	Mikä tahansa
 any status	mail	fi	Mikä tahansa tila
+archive folder	mail	fi	Arkistokansio
 are you sure you want to delete all selected folders?	mail	fi	Oletko varma, että haluat poistaa kaikki valitut kansiot?
 are you sure you want to move folder %1 to folder %2?	mail	fi	Haluatko varmasti siirtää kansion %1 kansioon %2?
 attach files	mail	fi	Tiedostojen liittäminen
@ -59,10 +60,11 @@ condition	mail	fi	Ehdot
 configured values will be set automatically on compose dialog for respected field when composing a new email.	mail	fi	Määritetyt arvot asetetaan automaattisesti laatimisvalintaikkunassa arvostetulle kentälle, kun laadit uutta sähköpostia.
 contact label	mail	fi	Yhteystieto etiketti
 contains	mail	fi	Sisältää
+convert mail to item and attach its attachments to this item (standard)	mail	fi	Muunna sähköposti kohteeksi ja liitä sen liitteet tähän kohteeseen (vakio)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	fi	Muunna sähköpostiviesti kohteeksi, liitä sen liitteet ja lisää raakaviesti (.eml) liitetiedostoksi
+convert only mail to item (ignore possible attachments)	mail	fi	Muunna vain sähköposti kohteeksi (jätä mahdolliset liitteet huomiotta)
 copy to	mail	fi	Kopio
 cross account forward attachment is not allowed!	mail	fi	Tilin rajat ylittävä eteenpäin kiinnittäminen ei ole sallittua!
-date(newest first)	mail	fi	Päivämäärä - uusin ensin
-date(oldest first)	mail	fi	Päivämäärä - vanhin ensin
 default sorting order	mail	fi	Oletus lajittelujärjestys
 default toolbar actions shown in mail's html editor	mail	fi	HTML-editorin työkalupalkissa sähköpostia laadittaessa käytössä olevat toiminnot
 default value for remembering s/mime passphrase in minutes	mail	fi	S/MIME-salasanan muistamisen oletusarvo minuutteina
@ -143,6 +145,7 @@ greater than	mail	fi	Suurempi kuin
 ham folder	mail	fi	Ham-kansio
 handling of external http images / mixed content in mails	mail	fi	Ulkoisten http-kuvien / sekasisällön käsittely sähköpostiviesteissä
 header lines	mail	fi	Ylätunnisterivit
+high priority	mail	fi	Korkea prioriteetti
 how to forward messages	mail	fi	Kuinka viestejä välitetään
 html	mail	fi	HTML
 ident name	mail	fi	Tunnuksen nimi
@ -181,6 +184,7 @@ learning as spam failed because of %1	mail	fi	Oppiminen roskapostina epäonnistu
 less than	mail	fi	Vähemmän kuin
 limit mailing list results when searching for addresses	mail	fi	Rajoita postituslistan tuloksia osoitteita etsittäessä
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	fi	Luettelo toiminnoista, jotka kytketään/aktivoidaan oletusarvoisesti päälle (esim. Mail kompositio tallenna InfoLog-toimintona).
+low priority	mail	fi	Vähäinen prioriteetti
 mail	common	fi	Sähköpostit
 mail acl	mail	fi	Käyttöoikeudet
 mail filter	mail	fi	Postisuodatin
@ -287,7 +291,6 @@ report this email content as ham (not spam) - spam solutions like spamtitan will
 report this email content as spam - spam solutions like spamtitan will learn	mail	fi	Ilmoita tämä sähköpostin sisältö roskapostina - spamTitanin kaltaiset roskapostiratkaisut oppivat siitä
 required pear class mail/mimedecode.php not found.	mail	fi	Tarvittavaa PEAR-luokkaa Mail/mimeDecode.php ei löydy.
 required to disable if you use dovecot with private seen flags on shared or user folder!	mail	fi	Vaaditaan poistettavaksi käytöstä, jos käytät Dovecotia, jossa on private seen -liput jaetussa tai käyttäjäkansiossa!
-row order style	mail	fi	Rivijärjestyksen muotoilu
 s/mime encryption failed because no certificate has been found for sender address: %1	mail	fi	S/MIME-salaus epäonnistui, koska lähettäjän osoitteelle ei löytynyt sertifikaattia: %1
 save all	mail	fi	Tallenna kaikki
 save all attachments to filemanager	mail	fi	Tallenna kaikki liitetiedostot tiedostonhallintaan
@ -329,13 +332,11 @@ show vertical with all columns	mail	fi	Näytä pystysuora näkymä kaikkine sara
 show/hide preview pane in mail list view	mail	fi	Näytä/piilota esikatseluruutu sähköpostiluettelonäkymässä.
 shows a temporary visible notification including from address, subject and a snippet of the mail	mail	fi	Näyttää tilapäisen näkyvän ilmoituksen, joka sisältää lähettäjän osoitteen, aiheen ja pätkän sähköpostista.
 sieve	mail	fi	Sieve
-sieve script name	mail	fi	Sieve skriptin nimi
 sign your message with smime certificate	mail	fi	Allekirjoita viestisi S/MIME-varmenteella
 signature	mail	fi	Allekirjoitus
 signature at top	mail	fi	allekirjoitus ylhäällä
 signature position and visibility	mail	fi	Allekirjoituksen sijainti ja näkyvyys
 signed by	mail	fi	Allekirjoittanut
-small view	mail	fi	Pieni näkymä
 smime encrypted message	mail	fi	S/MIME-salattu viesti
 smime signed message	mail	fi	S/MIME-allekirjoitettu viesti
 smtp	mail	fi	SMTP
@ -357,7 +358,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	fi	Tämä viesti on S/MIME-salattu ja salasanalla suojattu.
 timeout on connections to your imap server	mail	fi	IMAP-palvelimen yhteyksien aikakatkaisu
 to do	mail	fi	Toimi näin
-toggle all folders view for %1	mail	fi	Vaihda kaikki kansiot -näkymä %1:lle
 toggled on actions	mail	fi	Kytketty päälle toiminnot
 trash	mail	fi	Roskakori
 trash folder	mail	fi	Roskakori-kansio
@ -374,10 +374,6 @@ which folders - in general - should not be automatically created, if not existin
 write	mail	fi	Kirjoita
 wrote	mail	fi	Kirjoitettu
 yes, offer copy option	mail	fi	Kyllä, tarjoa kopiointimahdollisuutta
-yes, only trigger connection reset	mail	fi	kyllä, vain yhteyden nollaaminen
-yes, show all debug information available for the user	mail	fi	kyllä, näyttää kaikki käyttäjän saatavilla olevat virheenkorjaustiedot
-yes, show basic info only	mail	fi	Kyllä, näytä vain perustiedot
-you can either choose to save as infolog or tracker, not both.	mail	fi	Voit tallentaa joko InfoLogina tai reklamaationa, et molempina.
 you can select what info to be displayed on email tag	mail	fi	Voit valita, mitä tietoja sähköpostitunnisteessa näytetään.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	fi	Voit käyttää $$start$$ edellä mainittua alkamispäivää ja $$end$$ loppumispäivää.
 you may add this certificate into your contact, if you trust this signature.	mail	fi	Voit lisätä tämän varmenteen yhteystietoihin, jos luotat tähän allekirjoitukseen.
--- a/mail/lang/egw_fr.lang
+++ b/mail/lang/egw_fr.lang
@ -126,8 +126,6 @@ cross account forward attachment is not allowed!	mail	fr	La pièce jointe du com
 current folder	mail	fr	Dossier actif
 current subject	mail	fr	Sujet actuel
 currently:	mail	fr	Actuellement :
-date(newest first)	mail	fr	Date (plus récente d'abord)
-date(oldest first)	mail	fr	Date (plus ancienne d'abord)
 deactive	mail	fr	Désactiver
 default sorting order	mail	fr	Ordre de tri par défaut
 default toolbar actions shown in mail's html editor	mail	fr	Fonctions activées dans la barre d'outils de l'éditeur HTML lors de la composition d'un courriel
@ -189,7 +187,6 @@ drafts	mail	fr	Projets
 drafts folder	mail	fr	Dossier brouillons
 edit account	mail	fr	Modifier le compte
 edit account ...	mail	fr	Modifier le compte ...
-edit folder acl	mail	fr	Modifier le dossier ACL
 edit folder acl ...	mail	fr	Modifier le dossier ACL ...
 edit vacation settings	mail	fr	Modifier les paramètres de vacances
 effective only if server supports acl at all	admin	fr	Ne fonctionne que si le serveur supporte les ACL
@ -277,6 +274,7 @@ handling of external http images / mixed content in mails	mail	fr	Traitement des
 header	mail	fr	En-tête
 header lines	mail	fr	Lignes d'en-tête
 high	mail	fr	haute
+high priority	mail	fr	Priorité élevée
 hold %1 to drag files to your computer	mail	fr	Maintenir la touche %1 pour déplacer les fichiers vers votre ordinateur
 home page folders	mail	fr	Dossiers de la page d'accueil
 hostname or ip	mail	fr	Serveur hôte ou IP
@ -333,6 +331,7 @@ learning as spam failed because of %1	mail	fr	L'apprentissage en tant que spam a
 less than	mail	fr	Moins que
 limit mailing list results when searching for addresses	mail	fr	Limiter les résultats de la liste de diffusion lors de la recherche d'adresses
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	fr	Liste des actions à activer par défaut (par exemple, l'action "Mail compose save as InfoLog").
+low priority	mail	fr	Faible priorité
 mail	common	fr	Mail
 mail acl	mail	fr	ACL Mail
 mail filter	mail	fr	Filtre de mail
@ -471,7 +470,7 @@ refresh time in minutes	mail	fr	Temps de rafraîchissement en minutes
 refused to delete folder inbox	mail	fr	Impossible de supprimer le dossier "boîte de réception"
 refused to delete folder with subfolders	mail	fr	Impossible de supprimer le dossier et ses sous-dossiers
 reject with	mail	fr	rejecter avec
-reloaded account %1	mail	fr	Compte %1 actualisé
+reloaded account %1	mail	fr	Compte %1 actualisé.
 reloaded folder %1	mail	fr	Dossier %1 actualisé
 remember the password for	mail	fr	Se souvenir du mot de passe pour
 remove "%1" from blacklisted domains	mail	fr	Retirer "%1" de la liste noire des domaines
@ -506,7 +505,6 @@ resend after how many days?	mail	fr	Ré-envoyer après combien de jours ?
 respond to mail sent to:	mail	fr	Répondre à l'email envoyé à :
 restrict acl management	admin	fr	restreindre la gestion des ACL
 rights	mail	fr	Droits
-row order style	mail	fr	style d'ordonnancement de ligne
 rule priority position	mail	fr	Position des règles
 rule with priority	mail	fr	règle avec la priorité
 rules	mail	fr	Règles
@ -588,7 +586,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	fr	Sieve
 sieve connection status	mail	fr	Statut de connexion à Sieve
 sieve not activated	mail	fr	Sieve non activé
-sieve script name	mail	fr	Nom du script sieve
 sieve server	mail	fr	Serveur Sieve
 sieve_edit_instructions	mail	fr	(*) des caractères de remplacement (*,?) peuvent être utilisés.
 sign your message with smime certificate	mail	fr	Chiffrer votre message avec un certificat S/MIME
@ -596,7 +593,6 @@ signature	mail	fr	Signature
 signature at top	mail	fr	Signature en haut
 signature position and visibility	mail	fr	Position et visibilité de la signature
 signed by	mail	fr	Signé par
-small view	mail	fr	Affichage réduit
 smime encrypted message	mail	fr	Message crypté S/MIME
 smime signed message	mail	fr	Message signé S/MIME
 smtp	mail	fr	SMTP
@ -620,7 +616,6 @@ subscribe to folder %1	mail	fr	S'abonner au dossier %1
 subscription folders	mail	fr	Abonnement dossiers
 subscription successfully saved.	mail	fr	Abonnement sauvegardé avec succès
 succeeded on %1 folders, failed on %2	mail	fr	Réussi sur %1 dossiers, échoué sur %2
-successfully connected	mail	fr	Connecté avec succès !
 switch off encryption?	mail	fr	Désactiver l'encryption
 template folder	mail	fr	Dossier de modèles
 templates	mail	fr	Modèles
@ -646,7 +641,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	fr	Ce message est crypté S/MIME et protégé par un mot de passe.
 timeout on connections to your imap server	mail	fr	Timout sur les connexion à votre serveur IMAP
 to do	mail	fr	A faire
-toggle all folders view for %1	mail	fr	Basculer l'affichage de tous les dossiers pour %1
 toggled on actions	mail	fr	Actions activées
 trash	mail	fr	Corbeille
 trash folder	mail	fr	Dossier Corbeille
@ -697,13 +691,7 @@ wizard	mail	fr	Assistant
 writable sharing requires epl version!	mail	fr	Les partages ouverts en écriture nécessitent la version EPL !
 write	mail	fr	Ecrire
 wrote	mail	fr	Ecrivait
-yes, but mask all passwords	mail	fr	Oui, mais masquer les mots de passe
-yes, but mask all usernames and passwords	mail	fr	Oui, mais masquer les noms d'utilisateur et mots de passe
 yes, offer copy option	mail	fr	oui, proposer une option de copie
-yes, only trigger connection reset	mail	fr	oui, seulement pour déclencher la réinitialisation de la connexion
-yes, show all debug information available for the user	mail	fr	oui, afficher toutes les informations de débogage disponibles pour l'utilisateur
-yes, show basic info only	mail	fr	Oui, afficher seulement les informations de base
-you can either choose to save as infolog or tracker, not both.	mail	fr	Vous pouvez choisir de sauvegarder soit dans infolog soit dans tracker, pas les 2.
 you can select what info to be displayed on email tag	mail	fr	Vous pouvez sélectionner les informations à afficher sur l'étiquette de l'e-mail.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	fr	Vous pouvez utiliser $$start$$ pour la date de début et $$end$$ pour la date de fin.
 you may add this certificate into your contact, if you trust this signature.	mail	fr	Vous pouvez ajouter ce certificat à votre contact si vous avez confiance en cette signature.
--- a/mail/lang/egw_hr.lang
+++ b/mail/lang/egw_hr.lang
@ -6,8 +6,6 @@ compose	mail	hr	Pisanje nove poruke
 compress folder	mail	hr	Smanjii mapu
 contains	mail	hr	sadrži
 copy to	mail	hr	Kopiraj u
-date(newest first)	mail	hr	po datumu (noviji prvo)
-date(oldest first)	mail	hr	po datumu (stariji prvo)
 default sorting order	mail	hr	Početno postavljen redoslijed sortiranja
 delete folder	mail	hr	Obriši mapu
 deleted	mail	hr	Obrisano
@ -63,7 +61,6 @@ save all	mail	hr	Spremi sve
 select all	mail	hr	Označi Sve
 sent folder	mail	hr	Mapa poslano
 signature	mail	hr	Potpis
-small view	mail	hr	smanji pogled
 text	mail	hr	Text
 then	mail	hr	TADA
 trash folder	mail	hr	Mapa Smeće
--- a/mail/lang/egw_hu.lang
+++ b/mail/lang/egw_hu.lang
@ -22,6 +22,7 @@ always show notifiction	mail	hu	Mindig megjeleníti az értesítést
 answered	mail	hu	Válaszolt
 any of	mail	hu	bármennyi
 any status	mail	hu	bármilyen állapot
+archive folder	mail	hu	Archívum mappa
 attach files	mail	hu	Fájlok csatolása
 attach users vcard at compose to every new mail	mail	hu	A felhasználók vCard-jának csatolása minden új levélhez a komponáláskor.
 attachment has been saved successfully.	mail	hu	A csatolás sikeresen mentésre került.
@ -40,6 +41,9 @@ certificate issued by	mail	hu	A tanúsítványt kiállította
 changing subject failed because of %1	mail	hu	A tárgy módosítása nem sikerült %1 miatt
 changing subject failed folder %1 does not exist	mail	hu	A téma módosítása sikertelen %1 mappa nem létezik
 check message against next rule also	mail	hu	Üzenet ellenőrzése a következő szabály szerint is
+check to save as calendar event on send	mail	hu	Jelölje be a gombot az eseményként való létrehozáshoz a küldés után
+check to save as infolog on send	mail	hu	Ellenőrizze a gombot az InfoLog létrehozásához küldés után
+check to save as tracker entry on send	mail	hu	Ellenőrizze a gombot a ticketként való létrehozáshoz küldés után
 checking admin credentials failed	mail	hu	Az admin hitelesítő adatok ellenőrzése sikertelen
 compose	mail	hu	Szerkeszt
 compose as new	mail	hu	Szerkesztés újként
@ -48,11 +52,12 @@ condition	mail	hu	Feltétel
 configured values will be set automatically on compose dialog for respected field when composing a new email.	mail	hu	A beállított értékek automatikusan beállítódnak a kompozíció párbeszédpanelen az adott mezőhöz, amikor új e-mailt állít össze.
 contact label	mail	hu	Kapcsolat címke
 contains	mail	hu	tartalmaz
+convert mail to item and attach its attachments to this item (standard)	mail	hu	E-mail elemmé alakítása és a mellékletek csatolása ehhez az elemhez (standard)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	hu	E-mail átalakítása elemmé, csatolmányainak csatolása és nyers üzenet (.eml) csatolmányként történő hozzáadása
+convert only mail to item (ignore possible attachments)	mail	hu	Csak az e-mailt alakítja át elemmé (figyelmen kívül hagyva az esetleges mellékleteket)
 copy to	mail	hu	Másold ide:
 cross account forward attachment is not allowed!	mail	hu	Kereszt számla előre csatolása nem megengedett!
 current subject	mail	hu	Jelenlegi téma
-date(newest first)	mail	hu	Dátum (újak elsőnek)
-date(oldest first)	mail	hu	Dátum (régiek elsőnek)
 default sorting order	mail	hu	Alapértelmezett rendezési sor
 default toolbar actions shown in mail's html editor	mail	hu	A HTML-szerkesztő eszköztárban e-mail készítésekor engedélyezett funkciók
 default value for remembering s/mime passphrase in minutes	mail	hu	Az S/MIME jelszó megjegyzésére szolgáló alapértelmezett érték percekben
@ -136,6 +141,7 @@ greater than	mail	hu	Nagyobb mint
 ham folder	mail	hu	Ham mappa
 handling of external http images / mixed content in mails	mail	hu	Külső http képek / vegyes tartalom kezelése e-mailekben
 header lines	mail	hu	Email fejléce
+high priority	mail	hu	Kiemelt prioritás
 how to forward messages	mail	hu	Üzenet továbbítás módja
 html	mail	hu	HTML
 ident name	mail	hu	Azonosító neve
@ -171,6 +177,7 @@ learning as spam failed because of %1	mail	hu	A spamként való tanulás %1 miat
 less than	mail	hu	kisebb mint
 limit mailing list results when searching for addresses	mail	hu	Levelezőlista találatok korlátozása címek keresésekor
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	hu	Az alapértelmezés szerint bekapcsolandó/aktiválandó műveletek listája (pl. Mail compose mentés InfoLog műveletként)
+low priority	mail	hu	Alacsony prioritás
 mail	common	hu	E-mail
 mail acl	mail	hu	Hozzáférési jogok
 mail filter	mail	hu	Levélszűrő
@ -194,6 +201,7 @@ modify subject	mail	hu	Tárgy módosítása
 modify subject of this message	mail	hu	Az üzenet tárgyának módosítása
 move selected to	mail	hu	Kijelöltek mozgatása
 move to	mail	hu	Kijelöltek mozgatása
+move to archive	mail	hu	Áthelyezés az archív mappába
 move to trash	mail	hu	Szemetesbe mozgatás
 name and domain	mail	hu	Név és domain
 name and email	mail	hu	Név és e-mail cím
@ -277,7 +285,6 @@ report this email content as ham (not spam) - spam solutions like spamtitan will
 report this email content as spam - spam solutions like spamtitan will learn	mail	hu	Jelentse ezt az e-mail tartalmat Spamként - a spam megoldások, mint a SpamTitan megtanulják
 required pear class mail/mimedecode.php not found.	mail	hu	A szükséges PEAR osztály Mail/mimeDecode.php nem található.
 required to disable if you use dovecot with private seen flags on shared or user folder!	mail	hu	Kötelező letiltani, ha a Dovecot-ot privát látott zászlókkal használja a megosztott vagy felhasználói mappán!
-row order style	mail	hu	sorok rendezése
 save all	mail	hu	Összes mentése
 save all attachments to filemanager	mail	hu	Minden melléklet mentése a fájlkezelőbe
 save as draft	mail	hu	Mentés vázlatként
@ -315,12 +322,10 @@ show vertical with all columns	mail	hu	Függőleges megjelenítés minden oszlop
 show/hide preview pane in mail list view	mail	hu	Előnézeti ablak megjelenítése/elrejtése a levelek listájának nézetében.
 shows a temporary visible notification including from address, subject and a snippet of the mail	mail	hu	Ideiglenesen látható értesítés megjelenítése, amely tartalmazza a címtől, a tárgyat és az e-mail egy részletét.
 sieve	mail	hu	Sieve
-sieve script name	mail	hu	Sieve szűrő szkript neve
 signature	mail	hu	Aláírás
 signature at top	mail	hu	aláírás a tetején
 signature position and visibility	mail	hu	Aláírás pozíciója és láthatósága
 signed by	mail	hu	Aláírta
-small view	mail	hu	tömör nézet
 smime encrypted message	mail	hu	S/MIME titkosított üzenet
 smime signed message	mail	hu	S/MIME aláírással ellátott üzenet
 smtp	mail	hu	SMTP
@ -341,7 +346,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	hu	Ez az üzenet S/MIME titkosított és jelszóval védett.
 timeout on connections to your imap server	mail	hu	Időkorlátozás az IMAP-kiszolgálóhoz való kapcsolódásnál
 to do	mail	hu	Tenni
-toggle all folders view for %1	mail	hu	Kapcsolja ki az összes mappa nézetét %1 esetében
 toggled on actions	mail	hu	Bekapcsolt műveletek
 trash	mail	hu	Szemét
 trash folder	mail	hu	Szemét mappa
@ -356,8 +360,6 @@ which folders (additional to the sent folder) should be displayed using the sent
 which folders - in general - should not be automatically created, if not existing	mail	hu	melyik mappa ne legyen automatikusan létrehozva
 write	mail	hu	Írás
 wrote	mail	hu	írta
-yes, only trigger connection reset	mail	hu	igen, csak a kapcsolat visszaállítását váltja ki
-yes, show all debug information available for the user	mail	hu	yes, a felhasználó számára elérhető összes hibakeresési információ megjelenítése
 you can select what info to be displayed on email tag	mail	hu	Kiválaszthatja, hogy milyen információk jelenjenek meg az e-mail címke.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	hu	A fenti kezdő dátumhoz használhatja a $$start$$$-t, a végdátumhoz pedig a $$end$$$-t.
 you may add this certificate into your contact, if you trust this signature.	mail	hu	Ezt a tanúsítványt hozzáadhatod a kapcsolatodhoz, ha megbízol ebben az aláírásban.
--- a/mail/lang/egw_id.lang
+++ b/mail/lang/egw_id.lang
@ -21,6 +21,7 @@ always show notifiction	mail	id	Selalu tampilkan pemberitahuan
 answered	mail	id	Menjawab
 any of	mail	id	sembarang
 any status	mail	id	status apapun
+archive folder	mail	id	Folder Arsip
 attach files	mail	id	Melampirkan file
 attach users vcard at compose to every new mail	mail	id	Lampirkan vCard pengguna saat menulis ke setiap email baru.
 attachment has been saved successfully.	mail	id	Lampiran telah berhasil disimpan.
@ -38,6 +39,9 @@ certificate info for email %1	mail	id	Info sertifikat untuk email %1
 certificate issued by	mail	id	Sertifikat dikeluarkan oleh
 changing subject failed because of %1	mail	id	Mengubah subjek gagal karena %1
 changing subject failed folder %1 does not exist	mail	id	Mengubah subjek gagal folder %1 tidak ada
+check to save as calendar event on send	mail	id	Tombol centang untuk membuat sebagai acara setelah mengirim
+check to save as infolog on send	mail	id	Tombol centang untuk membuat sebagai InfoLog setelah mengirim
+check to save as tracker entry on send	mail	id	Tombol centang untuk membuat sebagai tiket setelah mengirim
 checking admin credentials failed	mail	id	Memeriksa kredensial admin gagal
 compose	mail	id	Tulis
 compose as new	mail	id	tulis sbg pesan baru
@ -46,10 +50,11 @@ condition	mail	id	kondisi
 configured values will be set automatically on compose dialog for respected field when composing a new email.	mail	id	Nilai yang dikonfigurasi akan diatur secara otomatis pada dialog penulisan untuk bidang yang dihormati saat membuat email baru.
 contact label	mail	id	Label kontak
 contains	mail	id	mengandung
+convert mail to item and attach its attachments to this item (standard)	mail	id	Mengonversi email menjadi item dan melampirkan lampirannya ke item ini (standar)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	id	Mengonversi email menjadi item, melampirkan lampirannya dan menambahkan pesan mentah (.eml) sebagai lampiran
+convert only mail to item (ignore possible attachments)	mail	id	Hanya mengonversi email ke item (abaikan kemungkinan lampiran)
 copy to	mail	id	Salin ke
 cross account forward attachment is not allowed!	mail	id	Lampiran penerusan lintas akun tidak diperbolehkan!
-date(newest first)	mail	id	Tanggal (terbaru)
-date(oldest first)	mail	id	Tanggal (terkuno)
 default sorting order	mail	id	Pengurutan bawaan
 default toolbar actions shown in mail's html editor	mail	id	Fungsi yang diaktifkan di bilah alat editor HTML saat membuat email
 default value for remembering s/mime passphrase in minutes	mail	id	Nilai default untuk mengingat frasa sandi S/MIME dalam hitungan menit
@ -109,6 +114,7 @@ greater than	mail	id	lebih dari
 ham folder	mail	id	Folder ham
 handling of external http images / mixed content in mails	mail	id	Penanganan gambar eksternal/konten campuran dalam email
 header lines	mail	id	Baris Header
+high priority	mail	id	Prioritas tinggi
 html	mail	id	HTML
 ident name	mail	id	Nama identitas
 ident name email	mail	id	Nama identitas [Email]
@ -143,6 +149,7 @@ learning as spam failed because of %1	mail	id	Belajar sebagai spam gagal karena
 less than	mail	id	kurang dari
 limit mailing list results when searching for addresses	mail	id	Membatasi hasil milis saat mencari alamat
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	id	Daftar tindakan yang akan diaktifkan/dialihkan secara default (misalnya, tindakan menulis surat simpan sebagai InfoLog).
+low priority	mail	id	Prioritas rendah
 mail	common	id	Surat
 mail acl	mail	id	Hak akses
 mail filter	mail	id	Filter surat
@ -278,7 +285,6 @@ signature	mail	id	Tandatangan
 signature at top	mail	id	Tanda tangan di bagian atas
 signature position and visibility	mail	id	Posisi dan visibilitas tanda tangan
 signed by	mail	id	Ditandatangani oleh
-small view	mail	id	small view
 smime encrypted message	mail	id	Pesan terenkripsi S/MIME
 smime signed message	mail	id	Pesan yang ditandatangani S/MIME
 smtp	mail	id	SMTP
@ -296,7 +302,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	id	Pesan ini dienkripsi S/MIME dan dilindungi kata sandi.
 timeout on connections to your imap server	mail	id	Batas waktu koneksi ke Server IMAP Anda
 to do	mail	id	Melakukan
-toggle all folders view for %1	mail	id	Mengalihkan tampilan semua Folder untuk %1
 toggled on actions	mail	id	Mengaktifkan tindakan
 trash	mail	id	Trash
 trash folder	mail	id	Trash Folder
@ -306,10 +311,6 @@ vacation notice	mail	id	Pemberitahuan liburan
 write	mail	id	tulis
 wrote	mail	id	menulis
 yes, offer copy option	mail	id	Ya, tawarkan opsi salin
-yes, only trigger connection reset	mail	id	ya, hanya memicu pengaturan ulang koneksi
-yes, show all debug information available for the user	mail	id	ya, tampilkan semua informasi debug yang tersedia untuk pengguna
-yes, show basic info only	mail	id	ya, tampilkan info dasar saja
-you can either choose to save as infolog or tracker, not both.	mail	id	Anda dapat memilih untuk menyimpan sebagai InfoLog ATAU tracker, tidak keduanya.
 you can select what info to be displayed on email tag	mail	id	Anda dapat memilih informasi yang akan ditampilkan pada tag email.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	id	Anda dapat menggunakan $$start$$ untuk tanggal mulai di atas dan $$end$$ untuk tanggal akhir.
 you may add this certificate into your contact, if you trust this signature.	mail	id	Anda dapat menambahkan sertifikat ini ke dalam kontak Anda, jika Anda mempercayai tanda tangan ini.
--- a/mail/lang/egw_it.lang
+++ b/mail/lang/egw_it.lang
@ -126,8 +126,6 @@ cross account forward attachment is not allowed!	mail	it	Non è consentito l'att
 current folder	mail	it	cartella corrente
 current subject	mail	it	Oggetto corrente
 currently:	mail	it	Al momento:
-date(newest first)	mail	it	Data (prima più recenti)
-date(oldest first)	mail	it	Data (prima meno recenti)
 deactive	mail	it	Disattiva
 default sorting order	mail	it	Ordinamento predefinito
 default toolbar actions shown in mail's html editor	mail	it	Funzioni abilitate nella barra degli strumenti dell'editor HTML durante la composizione di un'email
@ -189,7 +187,6 @@ drafts	mail	it	Bozze
 drafts folder	mail	it	Cartella bozze
 edit account	mail	it	Modifica account
 edit account ...	mail	it	Modifica account...
-edit folder acl	mail	it	Modifica i permessi della cartella
 edit folder acl ...	mail	it	Modifica i permessi della cartella ...
 edit vacation settings	mail	it	Modifica impostazioni messaggio "ferie"
 effective only if server supports acl at all	admin	it	effettivo solo se il server supporta l'impostazione di permessi ACL
@ -277,6 +274,7 @@ handling of external http images / mixed content in mails	mail	it	Gestione di im
 header	mail	it	Intestazione (header)
 header lines	mail	it	Righe intestazione
 high	mail	it	alto
+high priority	mail	it	Alta priorità
 hold %1 to drag files to your computer	mail	it	Tieni premuto %1 per trascinare i file verso il tuo computer
 home page folders	mail	it	cartelle della home page
 hostname or ip	mail	it	Nome host oppure IP
@ -333,6 +331,7 @@ learning as spam failed because of %1	mail	it	Apprendimento come Spam fallito a
 less than	mail	it	meno di
 limit mailing list results when searching for addresses	mail	it	Limitare i risultati delle mailing list durante la ricerca di indirizzi
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	it	Elenco di azioni da attivare/attivare per impostazione predefinita (ad esempio, l'azione di composizione della posta salva come InfoLog).
+low priority	mail	it	Priorità bassa
 mail	common	it	Mail
 mail acl	mail	it	Permessi ACL della posta
 mail filter	mail	it	Filtro
@ -471,7 +470,7 @@ refresh time in minutes	mail	it	Tempo di aggiornamento in minuti
 refused to delete folder inbox	mail	it	rifiutato di eliminare la cartella INBOX
 refused to delete folder with subfolders	mail	it	rifiutato di eliminare la cartella con le sottocartelle
 reject with	mail	it	Rifiuta con
-reloaded account %1	mail	it	Account %1 ricaricato
+reloaded account %1	mail	it	Account %1 ricaricato.
 reloaded folder %1	mail	it	Cartella %1 ricaricata
 remember the password for	mail	it	RIcordare la password per
 remove "%1" from blacklisted domains	mail	it	Rimuovere %1 dalla blacklist dei domini
@ -506,7 +505,6 @@ resend after how many days?	mail	it	Dopo quanti giorni tentare di reinviare?
 respond to mail sent to:	mail	it	Rispondi a email inviate a:
 restrict acl management	admin	it	restringi la gestione dei permessi ACL
 rights	mail	it	Permessi
-row order style	mail	it	Stile dell'ordinameno per righe
 rule priority position	mail	it	Posizione di priorità della regola
 rule with priority	mail	it	regola con priorità
 rules	mail	it	Regole
@ -588,7 +586,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	it	Sieve
 sieve connection status	mail	it	Stato della connessione Sieve
 sieve not activated	mail	it	Sieve non attivato
-sieve script name	mail	it	Nome script Sieve
 sieve server	mail	it	Server Sieve
 sieve_edit_instructions	mail	it	(*) possono essere usate le wildcard (jolly). Se si cerca il carattere * o ? invece, bisogna usare (\) davanti. Se si seleziona "Usa espressioni regolari" è necessario usare espressioni regolari valide. Per il punto esclamativo quando non usato come operatore "NOT", usare regex e backslash (\) (p.es. \!)
 sign your message with smime certificate	mail	it	Firma il messaggio con il certificato S/MIME
@ -596,7 +593,6 @@ signature	mail	it	Firma
 signature at top	mail	it	firma in cima
 signature position and visibility	mail	it	Posizione e visibilità della firma
 signed by	mail	it	Firmato da
-small view	mail	it	visualizzazione ridotta
 smime encrypted message	mail	it	Messaggio criptato S/MIME
 smime signed message	mail	it	Messaggio firmato S/MIME
 smtp	mail	it	SMTP
@ -620,7 +616,6 @@ subscribe to folder %1	mail	it	Sottoscrivi cartella %1
 subscription folders	mail	it	Cartelle da sottoscrivere
 subscription successfully saved.	mail	it	Sottoscrizione salvata corretamente.
 succeeded on %1 folders, failed on %2	mail	it	Riuscito su %1 cartelle, fallito su %2
-successfully connected	mail	it	Connesso con successo
 switch off encryption?	mail	it	Disabilitare la cifratura?
 template folder	mail	it	Cartella dei modelli
 templates	mail	it	Modelli
@ -646,7 +641,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	it	Questo messaggio è criptato via S/MIME e protetto da password.
 timeout on connections to your imap server	mail	it	Timeout della connessione al server IMAP
 to do	mail	it	Da fare
-toggle all folders view for %1	mail	it	Alterna la vista di tutte le cartelle per %1
 toggled on actions	mail	it	Attivare le azioni
 trash	mail	it	Cestino
 trash folder	mail	it	Cartella del cestino
@ -697,13 +691,7 @@ wizard	mail	it	Procedura guidata
 writable sharing requires epl version!	mail	it	La condivisione scrivibile richiede la versione completa EPL!
 write	mail	it	scrivi
 wrote	mail	it	scritto
-yes, but mask all passwords	mail	it	sì, però maschera tutte le password
-yes, but mask all usernames and passwords	mail	it	sì, però maschera tutti i nomi utente e le password
 yes, offer copy option	mail	it	Sì, fornisci l'ozione di copia
-yes, only trigger connection reset	mail	it	Sì, innesca solo la reimpostazione della connessione
-yes, show all debug information available for the user	mail	it	sì mostra le informazioni di debug complete disponibili all'utente
-yes, show basic info only	mail	it	sì, mostra solo le informazioni di base
-you can either choose to save as infolog or tracker, not both.	mail	it	Puoi scegliere di salvare come Attività oppure Tracker, non entrambi.
 you can select what info to be displayed on email tag	mail	it	È possibile selezionare le informazioni da visualizzare sul tag e-mail.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	it	Puoi usare $$start$$ per la data di inizio e $$end$$ per la data fine.
 you may add this certificate into your contact, if you trust this signature.	mail	it	Puoi aggiungere questo certificato nel tuo contatto se ti fidi della firma.
--- a/mail/lang/egw_iw.lang
+++ b/mail/lang/egw_iw.lang
@ -6,8 +6,6 @@ compose	mail	iw	חדש
 compress folder	mail	iw	קבץ תיקיה
 contains	mail	iw	מכיל
 copy to	mail	iw	העתק אל
-date(newest first)	mail	iw	(תאריך (חדשים תחילה
-date(oldest first)	mail	iw	(תאריך (ישנים תחילה
 default sorting order	mail	iw	סדר מיון מחדלי
 delete folder	mail	iw	מחק תיקיה
 deleted	mail	iw	נמחקו
@ -63,7 +61,6 @@ save all	mail	iw	שמור הכל
 select all	mail	iw	בחר הכל
 sent folder	mail	iw	תיקיית נשלחו
 signature	mail	iw	חתימה
-small view	mail	iw	תצוגה קטנה
 sort order	mail	iw	סדר אתר
 text	mail	iw	טקסט
 trash folder	mail	iw	תיקיית אשפה
--- a/mail/lang/egw_ja.lang
+++ b/mail/lang/egw_ja.lang
@ -126,8 +126,6 @@ cross account forward attachment is not allowed!	mail	ja	クロスアカウン
 current folder	mail	ja	現在のフォルダ
 current subject	mail	ja	現在の件名
 currently:	mail	ja	現在値:
-date(newest first)	mail	ja	日時(新しい順)
-date(oldest first)	mail	ja	日時(古い順)
 deactive	mail	ja	無効化
 default sorting order	mail	ja	既定のソート順
 default toolbar actions shown in mail's html editor	mail	ja	メール作成時にHTMLエディタツールバーで有効になる機能
@ -189,7 +187,6 @@ drafts	mail	ja	下書き
 drafts folder	mail	ja	下書きフォルダ
 edit account	mail	ja	アカウントを編集
 edit account ...	mail	ja	アカウントを編集 ...
-edit folder acl	mail	ja	フォルダ ACL を編集
 edit folder acl ...	mail	ja	フォルダ ACL を編集 ...
 edit vacation settings	mail	ja	不在案内設定を編集
 effective only if server supports acl at all	admin	ja	サーバーで ACL を利用可能である場合に限り有効
@ -277,6 +274,7 @@ handling of external http images / mixed content in mails	mail	ja	メール内
 header	mail	ja	メール・ヘッダを表示
 header lines	mail	ja	ヘッダ行
 high	mail	ja	高
+high priority	mail	ja	高い優先度
 hold %1 to drag files to your computer	mail	ja	%1 を押したままファイルをコンピュータにドラッグします。
 home page folders	mail	ja	ホーム・ページ・フォルダ
 hostname or ip	mail	ja	ホスト名またはIPアドレス
@ -333,6 +331,7 @@ learning as spam failed because of %1	mail	ja	スパム学習に失敗しまし
 less than	mail	ja	指定値よりサイズが小さい
 limit mailing list results when searching for addresses	mail	ja	アドレス検索時にメーリング・リストの結果を制限する
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	ja	デフォルトでオン/オフにするアクションのリスト (例: メール作成時にInfoLogとして保存するアクション)。
+low priority	mail	ja	低い優先度
 mail	common	ja	メール
 mail acl	mail	ja	メール ACL
 mail filter	mail	ja	メール・フィルター
@ -506,7 +505,6 @@ resend after how many days?	mail	ja	指定日数後に再送信?
 respond to mail sent to:	mail	ja	送信されたメールに応答する：
 restrict acl management	admin	ja	ACL 管理を制限
 rights	mail	ja	権限
-row order style	mail	ja	行順スタイル
 rule priority position	mail	ja	ルールの優先順位
 rule with priority	mail	ja	優先順位付きルール
 rules	mail	ja	ルール
@ -588,7 +586,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	ja	Sieve
 sieve connection status	mail	ja	Sieve 接続状態
 sieve not activated	mail	ja	Sieve 無効
-sieve script name	mail	ja	Sieve スクリプト名
 sieve server	mail	ja	Sieve サーバー
 sieve_edit_instructions	mail	ja	(*) ワイルドカード (*,?) を使用できます。文字 * や ? とマッチするには、バックスラッシュ（\）でエスケープする必要があります。正規表現を使う場合は、ワイルドカードでなく正規表現を使用してください。論理否定の目的でない行頭のエクスクラメーション記号（!）をエスケープする場合は、エスケープした正規表現（\!）を使用してください。
 sign your message with smime certificate	mail	ja	S/MIME証明書でメッセージに署名
@ -596,7 +593,6 @@ signature	mail	ja	署名
 signature at top	mail	ja	署名を上部に表示
 signature position and visibility	mail	ja	署名の表示位置
 signed by	mail	ja	署名者
-small view	mail	ja	スモール・ビュー
 smime encrypted message	mail	ja	S/MIME暗号化メッセージ
 smime signed message	mail	ja	S/MIME署名付きメッセージ
 smtp	mail	ja	SMTP
@ -620,7 +616,6 @@ subscribe to folder %1	mail	ja	フォルダ %1 を購読
 subscription folders	mail	ja	購読フォルダー
 subscription successfully saved.	mail	ja	購読フォルダーを更新しました
 succeeded on %1 folders, failed on %2	mail	ja	フォルダ %1 で成功しましたが、%2 で失敗しました
-successfully connected	mail	ja	接続成功
 switch off encryption?	mail	ja	暗号化を解除しますか？
 template folder	mail	ja	テンプレート・フォルダ
 templates	mail	ja	テンプレート
@ -646,7 +641,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	ja	このメッセージはS/MIME暗号化されておりパスワードで保護されています。
 timeout on connections to your imap server	mail	ja	IMAP サーバー接続でタイムアウトが発生
 to do	mail	ja	設定方法
-toggle all folders view for %1	mail	ja	全フォルダの表示を %1 に変更
 toggled on actions	mail	ja	アクションの切り替え
 trash	mail	ja	ゴミ箱
 trash folder	mail	ja	ゴミ箱フォルダ
@ -697,13 +691,7 @@ wizard	mail	ja	ウィザード
 writable sharing requires epl version!	mail	ja	書き込み可能な共有を利用するには EPL 版が必要!
 write	mail	ja	書き込み
 wrote	mail	ja	書き込みました
-yes, but mask all passwords	mail	ja	はい（パスワードは非表示）
-yes, but mask all usernames and passwords	mail	ja	はい（ユーザ名,パスワードは非表示）
 yes, offer copy option	mail	ja	はい（コピー・オプションあり）
-yes, only trigger connection reset	mail	ja	はい（接続リセット付き）
-yes, show all debug information available for the user	mail	ja	はい（ユーザのデバッグ情報を表示）
-yes, show basic info only	mail	ja	はい（基本情報のみ表示）
-you can either choose to save as infolog or tracker, not both.	mail	ja	インフォログまたはトラッカーに保存することができます。
 you can select what info to be displayed on email tag	mail	ja	メールタグに表示する情報を選択できます。
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	ja	開始日を $$start$$、終了日を $$end$$ で記述できます。
 you may add this certificate into your contact, if you trust this signature.	mail	ja	署名を信頼できる場合は、この証明書をアドレス帳に追加することができます。
--- a/mail/lang/egw_km.lang
+++ b/mail/lang/egw_km.lang
@ -120,8 +120,6 @@ cross account forward attachment is not allowed!	mail	km	ឯកសារភ្
 current folder	mail	km	ថតបច្ចុប្បន្ន
 current subject	mail	km	ប្រធានបទបច្ចុប្បន្ន
 currently:	mail	km	បច្ចុប្បន្ន៖
-date(newest first)	mail	km	កាលបរិច្ឆេទ (ថ្មីបំផុតដំបូង)
-date(oldest first)	mail	km	កាលបរិច្ឆេទ (ចាស់ជាងគេដំបូង)
 deactive	mail	km	សកម្ម
 default sorting order	mail	km	លំដាប់តម្រៀបលំនាំដើម
 default toolbar actions shown in mail's html editor	mail	km	មុខងារត្រូវបានបើកនៅក្នុងរបារឧបករណ៍កម្មវិធីនិពន្ធ HTML នៅពេលសរសេរអុីមែល
@ -182,7 +180,6 @@ drafts	mail	km	សេចក្តីព្រាង
 drafts folder	mail	km	ថតឯកសារព្រាង
 edit account	mail	km	កែសម្រួលគណនី
 edit account ...	mail	km	កែសម្រួលគណនី...
-edit folder acl	mail	km	កែសម្រួលថត ACL
 edit folder acl ...	mail	km	កែសម្រួលថត ACL...
 edit vacation settings	mail	km	កែសម្រួលការកំណត់វិស្សមកាល
 effective only if server supports acl at all	admin	km	មានប្រសិទ្ធភាពលុះត្រាតែម៉ាស៊ីនមេគាំទ្រ ACL ទាំងអស់។
@ -485,7 +482,6 @@ resend after how many days?	mail	km	ផ្ញើឡើងវិញប៉ុន
 respond to mail sent to:	mail	km	ឆ្លើយតបទៅសំបុត្រដែលបានផ្ញើទៅ៖
 restrict acl management	admin	km	ដាក់កម្រិតការគ្រប់គ្រង acl
 rights	mail	km	សិទ្ធិ
-row order style	mail	km	រចនាប័ទ្មលំដាប់ជួរ
 rule priority position	mail	km	គោលការណ៍អាទិភាព
 rule with priority	mail	km	គ្រប់គ្រងដោយអាទិភាព
 rules	mail	km	ច្បាប់
@ -564,14 +560,12 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	km	Sieve
 sieve connection status	mail	km	ស្ថានភាពការតភ្ជាប់ Sieve
 sieve not activated	mail	km	Sieve មិនដំណើរការទេ។
-sieve script name	mail	km	ឈ្មោះស្គ្រីប sieve
 sieve server	mail	km	ម៉ាស៊ីនបម្រើ Sieve
 sieve_edit_instructions	mail	km	(*) អក្សរជំនួស (*,?) អាចត្រូវបានប្រើ។ ប្រសិនបើអ្នកកំពុងព្យាយាមផ្គូផ្គង * ឬ ? ដោយខ្លួនវាផ្ទាល់ អ្នកត្រូវតែគេចចេញពីពួកវាដោយប្រើសញ្ញាសម្គាល់ (\) ។ ប្រសិនបើអ្នកធីក "ប្រើកន្សោមធម្មតា" អ្នកត្រូវតែប្រើកន្សោមធម្មតាត្រឹមត្រូវ។ ដើម្បីគេចផុតពីសញ្ញាឧទាន (!) នៅដើមដំបូងមិនត្រូវបានប្រើជា "NO" សូមប្រើ regex និង backslash (\) (ឧ. \!)
 sign your message with smime certificate	mail	km	ចុះហត្ថលេខាលើសាររបស់អ្នកជាមួយវិញ្ញាបនបត្រ S/MIME
 signature	mail	km	ហត្ថលេខា
 signature at top	mail	km	ហត្ថលេខានៅខាងលើ
 signature position and visibility	mail	km	ទីតាំងហត្ថលេខា និងការមើលឃើញ
-small view	mail	km	ទិដ្ឋភាពតូច
 smtp	mail	km	SMTP
 sneak preview in list	mail	km	លួចមើលជាមុននៅក្នុងបញ្ជី
 some clients fail to detect correct charset, if flowed lines are enabled.	mail	km	ម៉ាស៊ីនភ្ញៀវមួយចំនួនបរាជ័យក្នុងការរកឃើញសំណុំតួអក្សរត្រឹមត្រូវ ប្រសិនបើបន្ទាត់លំហូរត្រូវបានបើក។
@ -593,7 +587,6 @@ subscribe to folder %1	mail	km	ជាវទៅថត%1
 subscription folders	mail	km	ថតការជាវ
 subscription successfully saved.	mail	km	ការជាវបានរក្សាទុកដោយជោគជ័យ។
 succeeded on %1 folders, failed on %2	mail	km	បានជោគជ័យលើថត %1 បរាជ័យនៅលើ %2
-successfully connected	mail	km	បានភ្ជាប់ដោយជោគជ័យ
 switch off encryption?	mail	km	បិទការអ៊ិនគ្រីប?
 template folder	mail	km	ថតពុម្ព
 templates	mail	km	គំរូ
@ -619,7 +612,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	km	សារនេះត្រូវបានអ៊ិនគ្រីប S/MIME និងត្រូវបានការពារដោយពាក្យសម្ងាត់។
 timeout on connections to your imap server	mail	km	អស់ពេលលើការតភ្ជាប់ទៅម៉ាស៊ីនមេ IMAP របស់អ្នក។
 to do	mail	km	ធ្វើ
-toggle all folders view for %1	mail	km	បិទ/បើកទិដ្ឋភាពថតទាំងអស់សម្រាប់ %1
 toggled on actions	mail	km	បានបិទបើកសកម្មភាព
 trash	mail	km	សំរាម
 trash folder	mail	km	ធុងសំរាម
@ -670,13 +662,7 @@ wizard	mail	km	អ្នកជំនួយការ
 writable sharing requires epl version!	mail	km	ការចែករំលែកដែលអាចសរសេរបានទាមទារកំណែ EPL!
 write	mail	km	សរសេរ
 wrote	mail	km	បានសរសេរ
-yes, but mask all passwords	mail	km	យល់ព្រម ប៉ុន្តែបិទបាំងពាក្យសម្ងាត់ទាំងអស់។
-yes, but mask all usernames and passwords	mail	km	យល់ព្រម ប៉ុន្តែបិទបាំងឈ្មោះអ្នកប្រើប្រាស់ និងពាក្យសម្ងាត់ទាំងអស់។
 yes, offer copy option	mail	km	យល់ព្រម ផ្តល់ជម្រើសចម្លង
-yes, only trigger connection reset	mail	km	យល់ព្រម មានតែការកេះការតភ្ជាប់ឡើងវិញប៉ុណ្ណោះ។
-yes, show all debug information available for the user	mail	km	យល់ព្រម បង្ហាញព័ត៌មានបំបាត់កំហុសទាំងអស់ដែលមានសម្រាប់អ្នកប្រើប្រាស់
-yes, show basic info only	mail	km	យល់ព្រម បង្ហាញតែព័ត៌មានមូលដ្ឋានប៉ុណ្ណោះ។
-you can either choose to save as infolog or tracker, not both.	mail	km	អ្នកអាចជ្រើសរើសរក្សាទុកជា infolog ឬកម្មវិធីតាមដាន មិនមែនទាំងពីរទេ។
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	km	អ្នកអាចប្រើ $$start$$ សម្រាប់កាលបរិច្ឆេទចាប់ផ្តើមខាងលើ និង $$end$$ សម្រាប់កាលបរិច្ឆេទបញ្ចប់។
 you may add this certificate into your contact, if you trust this signature.	mail	km	អ្នកអាចបន្ថែមវិញ្ញាបនបត្រនេះទៅក្នុងទំនាក់ទំនងរបស់អ្នក ប្រសិនបើអ្នកជឿជាក់លើហត្ថលេខានេះ។
 you need to enter your s/mime passphrase to send this message.	mail	km	អ្នកត្រូវបញ្ចូលឃ្លាសម្ងាត់ S/MIME របស់អ្នក ដើម្បីផ្ញើសារនេះ។
--- a/mail/lang/egw_ko.lang
+++ b/mail/lang/egw_ko.lang
@ -5,6 +5,7 @@ add files as %1	mail	ko	파일을 %1로 추가
 add this certificate into contact	mail	ko	이 인증서를 연락처에 추가
 adding %1 to blacklisted email addresses failed because of %2	mail	ko	%2 때문에 블랙리스트에 추가된 전자 메일 주소에 %1을(를) 추가하지 못했습니다.
 adding %1 to whiltelisted email addresses failed because of %2	mail	ko	%2 때문에 허용되지 않은 전자 메일 주소에 %1을(를) 추가하지 못했습니다.
+archive folder	mail	ko	보관 폴더
 attach files	mail	ko	파일 첨부
 attach users vcard at compose to every new mail	mail	ko	모든 새 메일에 작성 시 사용자 vCard를 첨부합니다.
 attachment has been saved successfully.	mail	ko	첨부 파일이 성공적으로 저장되었습니다.
@ -20,8 +21,14 @@ certificate info for email %1	mail	ko	이메일 %1에 대한 인증서 정보
 certificate issued by	mail	ko	인증서 발급처
 changing subject failed because of %1	mail	ko	%1 때문에 제목을 변경하지 못했습니다
 changing subject failed folder %1 does not exist	mail	ko	제목 변경 실패 폴더 %1이(가) 존재하지 않습니다
+check to save as calendar event on send	mail	ko	전송 후 이벤트로 생성하려면 확인 버튼 선택
+check to save as infolog on send	mail	ko	전송 후 인포로그로 만들려면 확인 버튼 선택
+check to save as tracker entry on send	mail	ko	전송 후 티켓으로 만들려면 확인 버튼 선택
 checking admin credentials failed	mail	ko	관리자 자격 증명 확인에 실패했습니다.
 contact label	mail	ko	연락처 레이블
+convert mail to item and attach its attachments to this item (standard)	mail	ko	이메일을 항목으로 변환하고 첨부 파일을 이 항목에 첨부하기(표준)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	ko	이메일을 항목으로 변환하고 첨부 파일을 첨부하며 원시 메시지(.eml)를 첨부 파일로 추가합니다.
+convert only mail to item (ignore possible attachments)	mail	ko	이메일만 항목으로 변환(가능한 첨부 파일 무시)
 delete selected folders	mail	ko	選択したフォルダを削除する
 deleted	mail	ko	삭제됨
 do you really want to toggle flag %1 for all messages in the current view?	mail	ko	현재 보기의 모든 메시지에 대해 %1 플래그를 전환하시겠습니까?
@ -55,6 +62,7 @@ general	admin	ko	일반
 get acl rights failed from imap server!	mail	ko	IMAP 서버에서 ACL 권한 가져오기에 실패했습니다!
 ham folder	mail	ko	햄 폴더
 handling of external http images / mixed content in mails	mail	ko	전자 메일의 외부 http 이미지/혼합 콘텐츠 처리
+high priority	mail	ko	높은 우선순위
 html	mail	ko	HTML
 ident name	mail	ko	아이디 이름
 ident name email	mail	ko	아이디 이름 [이메일]
@ -87,6 +95,7 @@ learning as spam failed because of %1	mail	ko	%1 때문에 스팸으로 학습
 less than	mail	ko	미만
 limit mailing list results when searching for addresses	mail	ko	주소 검색 시 메일 그룹 결과 제한
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	ko	기본적으로 전환/활성화할 작업 목록(예: 메일 작성 InfoLog 작업으로 저장)
+low priority	mail	ko	낮은 우선순위
 mail probably has no text-body	mail	ko	메일에 텍스트가 없을 수 있습니다.
 mail settings	mail	ko	메일 설정
 mails can be copied to that folder via context menu, if folder is configured.	mail	ko	폴더가 구성된 경우 상황에 맞는 메뉴를 통해 해당 폴더로 메일을 복사할 수 있습니다.
@ -176,7 +185,6 @@ show/hide preview pane in mail list view	mail	ko	메일 목록 보기에서 미
 shows a temporary visible notification including from address, subject and a snippet of the mail	mail	ko	보낸 사람 주소, 제목 및 이메일 스니펫을 포함하여 임시로 표시되는 알림을 표시합니다.
 sign your message with smime certificate	mail	ko	S/MIME 인증서로 메시지 서명
 signed by	mail	ko	서명자
-small view	mail	ko	미니뷰
 the imap server need to meet certain requirements and be configured for it:	mail	ko	IMAP 서버는 특정 요구 사항을 충족해야 하며 이를 위해 구성되어야 합니다:
 the rule with priority %1 successfully saved!	mail	ko	우선 순위가 %1인 규칙이 성공적으로 저장되었습니다!
 there is no space left to store sieve script, please check sieve_maxscriptsize option on your mailserver's config.	mail	ko	체 스크립트를 저장할 공간이 없으므로 메일 서버의 구성에서 sieve_maxscriptsize 옵션을 확인하세요.
@ -184,14 +192,10 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	ko	이 메시지는 S/MIME 암호화 및 비밀번호로 보호되어 있습니다.
 timeout on connections to your imap server	mail	ko	IMAP 서버에 대한 연결 시간 초과
 to do	mail	ko	할 일
-toggle all folders view for %1	mail	ko	%1에 대한 모든 폴더 보기 토글
 toggled on actions	mail	ko	동작 토글
 trash	mail	ko	휴지통
 trash folder	mail	ko	휴지통 폴더
 write	mail	ko	쓰기
-yes, only trigger connection reset	mail	ko	예, 연결 재설정만 트리거
-yes, show all debug information available for the user	mail	ko	예, 사용자가 사용할 수 있는 모든 디버그 정보 표시
-you can either choose to save as infolog or tracker, not both.	mail	ko	InfoLog 또는 트래커로 저장하도록 선택할 수 있지만 둘 다 저장할 수는 없습니다.
 you can select what info to be displayed on email tag	mail	ko	이메일 태그에 표시할 정보를 선택할 수 있습니다.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	ko	위의 시작 날짜는 $$start$$로, 종료 날짜는 $$end$$로 사용할 수 있습니다.
 you may add this certificate into your contact, if you trust this signature.	mail	ko	이 서명을 신뢰하는 경우 이 인증서를 연락처에 추가할 수 있습니다.
--- a/mail/lang/egw_lt.lang
+++ b/mail/lang/egw_lt.lang
@ -12,6 +12,7 @@ after reply, visible during compose	mail	lt	Po atsakymo, matomas sudarymo metu
 aliases+forwards	mail	lt	Slapyvardžiai + persiuntimas
 always show notifiction	mail	lt	Visada rodyti pranešimą
 answered	mail	lt	Atsakyta
+archive folder	mail	lt	Archyvo aplankas
 attach files	mail	lt	Pridėti failus
 attach users vcard at compose to every new mail	mail	lt	Pridėti naudotojų vCard prie kiekvieno naujo laiško sudarymo metu
 attachment has been saved successfully.	mail	lt	Priedas sėkmingai išsaugotas.
@ -27,9 +28,15 @@ certificate info for email %1	mail	lt	Sertifikato informacija apie el. pašto %1
 certificate issued by	mail	lt	Sertifikatą išdavė
 changing subject failed because of %1	mail	lt	Pakeisti temą nepavyko dėl %1
 changing subject failed folder %1 does not exist	mail	lt	Pakeisti temą nepavyko aplankas %1 neegzistuoja
+check to save as calendar event on send	mail	lt	Pažymėkite mygtuką, kad po išsiuntimo būtų sukurtas kaip įvykis
+check to save as infolog on send	mail	lt	Pažymėkite mygtuką, kad po išsiuntimo sukurtumėte kaip informacinį žurnalą
+check to save as tracker entry on send	mail	lt	Pažymėkite mygtuką, jei norite sukurti kaip bilietą po išsiuntimo
 checking admin credentials failed	mail	lt	Nepavyko patikrinti administratoriaus įgaliojimų
 configured values will be set automatically on compose dialog for respected field when composing a new email.	mail	lt	Nustatytos reikšmės bus automatiškai nustatytos komponavimo dialogo lange gerbiamam laukui, kai kuriamas naujas el. laiškas.
 contact label	mail	lt	Kontaktų etiketė
+convert mail to item and attach its attachments to this item (standard)	mail	lt	Konvertuoti el. laišką į elementą ir pridėti jo priedus prie šio elemento (standartinis)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	lt	Konvertuoti el. laišką į elementą, pridėti jo priedus ir pridėti neapdorotą pranešimą (.eml) kaip priedą
+convert only mail to item (ignore possible attachments)	mail	lt	Konvertuoti tik el. laišką į elementą (ignoruoti galimus priedus)
 cross account forward attachment is not allowed!	mail	lt	Kryžminės paskyros pirmyn priedas neleidžiamas!
 current subject	mail	lt	Dabartinė tema
 default toolbar actions shown in mail's html editor	mail	lt	HTML redaktoriaus įrankių juostoje įjungtos funkcijos kuriant el. laišką
@ -64,6 +71,7 @@ folder %1 has been created successfully, although the subscription failed becaus
 get acl rights failed from imap server!	mail	lt	Nepavyko gauti ACL teisių iš IMAP serverio!
 ham folder	mail	lt	Kumpio aplankas
 handling of external http images / mixed content in mails	mail	lt	Išorinių http vaizdų / mišraus turinio tvarkymas el. laiškuose
+high priority	mail	lt	Aukštas prioritetas
 html	mail	lt	HTML
 ident name	mail	lt	Identifikatoriaus pavadinimas
 ident name email	mail	lt	Identifikatoriaus pavadinimas [El. paštas]
@ -96,6 +104,7 @@ learning as spam failed because of %1	mail	lt	Mokymasis kaip šlamštas nepavyko
 less than	mail	lt	mažiau nei
 limit mailing list results when searching for addresses	mail	lt	Apriboti pašto sąrašo rezultatus ieškant adresų
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	lt	Veiksmų, kurie turi būti įjungti ir (arba) įjungti pagal numatytuosius nustatymus, sąrašas (pvz., veiksmas "Mail kompose išsaugoti kaip "InfoLog")
+low priority	mail	lt	Mažas prioritetas
 mail	common	lt	Paštas
 mail acl	mail	lt	Prieigos teisės
 mail filter	mail	lt	Pašto filtras
@ -218,13 +227,9 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	lt	Šis laiškas užšifruotas S/MIME ir apsaugotas slaptažodžiu.
 timeout on connections to your imap server	mail	lt	Jungčių prie IMAP serverio laiko limitas
 to do	mail	lt	Atlikti
-toggle all folders view for %1	mail	lt	Perjunkite visų aplankų rodinį %1
 toggled on actions	mail	lt	Perjungti veiksmus
 trash	mail	lt	Šiukšliadėžė
 trash folder	mail	lt	Aplankas šiukšliadėžė
-yes, only trigger connection reset	mail	lt	taip, tik paleisti ryšio atstatymą
-yes, show all debug information available for the user	mail	lt	taip, rodo visą naudotojui prieinamą derinimo informaciją
-you can either choose to save as infolog or tracker, not both.	mail	lt	Galite pasirinkti, ar norite išsaugoti kaip "InfoLog", ar kaip "Tracker", bet ne kaip abu.
 you can select what info to be displayed on email tag	mail	lt	Galite pasirinkti, kokia informacija bus rodoma el. pašto žymoje.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	lt	Pirmiau nurodytai pradžios datai galite naudoti $$start$$, o pabaigos datai - $$end$$.
 you may add this certificate into your contact, if you trust this signature.	mail	lt	Šį sertifikatą galite įtraukti į savo kontaktą, jei pasitikite šiuo parašu.
--- a/mail/lang/egw_lv.lang
+++ b/mail/lang/egw_lv.lang
@ -37,11 +37,12 @@ compress folder	mail	lv	Kompresēt mapi
 configured values will be set automatically on compose dialog for respected field when composing a new email.	mail	lv	Konfigurētās vērtības tiks automātiski iestatītas sastādīšanas dialoglodziņā respektējamajam laukam, sastādot jaunu e-pastu.
 contact label	mail	lv	Kontakta etiķete
 contains	mail	lv	satur
+convert mail to item and attach its attachments to this item (standard)	mail	lv	Konvertēt e-pastu uz elementu un pievienot tā pielikumus šim elementam (standarta)
+convert mail to item, attach its attachments and add raw message (message/rfc822 (.eml)) as attachment	mail	lv	Konvertēt e-pastu vienībā, pievienot tā pielikumus un pievienot neapstrādātu ziņojumu (.eml) kā pielikumu
+convert only mail to item (ignore possible attachments)	mail	lv	Konvertēt tikai e-pastu vienumam (neņemot vērā iespējamos pielikumus).
 copy to	mail	lv	Kopēt Uz:
 cross account forward attachment is not allowed!	mail	lv	Nav atļauts pievienot starpkonta priekšējo pielikumu!
 current subject	mail	lv	Pašreizējais temats
-date(newest first)	mail	lv	Datums (jaunākais pirmais)
-date(oldest first)	mail	lv	Datums (vecākais pirmais)
 default sorting order	mail	lv	Noklusētā kārtošanas secība
 default toolbar actions shown in mail's html editor	mail	lv	HTML redaktora rīkjoslā iespējotās funkcijas, veidojot e-pasta vēstuli
 default value for remembering s/mime passphrase in minutes	mail	lv	S/MIME paroles frāzes atcerēšanās noklusējuma vērtība minūtēs
@ -256,7 +257,6 @@ signature	mail	lv	Paraksts
 signature at top	mail	lv	Paraksts augšpusē
 signature position and visibility	mail	lv	Paraksta pozīcija un redzamība
 signed by	mail	lv	Parakstījis
-small view	mail	lv	mazais skats
 smime encrypted message	mail	lv	S/MIME šifrēta ziņa
 smime signed message	mail	lv	S/MIME parakstīts ziņojums
 smtp	mail	lv	SMTP
@ -271,7 +271,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	lv	Šī ziņa ir šifrēta ar S/MIME un aizsargāta ar paroli.
 timeout on connections to your imap server	mail	lv	Savienojumu ar IMAP serveri laika ierobežojums
 to do	mail	lv	Darīt
-toggle all folders view for %1	mail	lv	Pārslēdziet visu mapju skatījumu %1
 toggled on actions	mail	lv	Pārslēgt uz darbībām
 trash	mail	lv	Izmest atkritumus
 trash folder	mail	lv	Atkritumu mape
@ -280,9 +279,6 @@ vacation notice	mail	lv	Norāde par atrašanos atvaļinājumā
 when deleting messages	mail	lv	Kad dzēš vēstules
 write	mail	lv	Rakstīt
 wrote	mail	lv	rakstīja
-yes, only trigger connection reset	mail	lv	jā, tikai aktivizēt savienojuma atiestatīšanu
-yes, show all debug information available for the user	mail	lv	jā, parādīt visu lietotājam pieejamo atkļūdošanas informāciju
-you can either choose to save as infolog or tracker, not both.	mail	lv	Varat izvēlēties saglabāt kā InfoLog VAI kā izsekošanas līdzekli, bet ne kā abus.
 you can select what info to be displayed on email tag	mail	lv	Varat izvēlēties, kāda informācija tiks rādīta e-pasta birkā.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	lv	Iepriekš minētajam sākuma datumam varat izmantot $$start$$, bet beigu datumam - $$end$$.
 you may add this certificate into your contact, if you trust this signature.	mail	lv	Jūs varat pievienot šo sertifikātu savā kontaktā, ja uzticaties šim parakstam.
--- a/mail/lang/egw_nl.lang
+++ b/mail/lang/egw_nl.lang
@ -116,8 +116,6 @@ cross account forward attachment is not allowed!	mail	nl	Cross account forward a
 current folder	mail	nl	huidige map
 current subject	mail	nl	Huidig onderwerp
 currently:	mail	nl	Momenteel:
-date(newest first)	mail	nl	Datum (meest recente eerst)
-date(oldest first)	mail	nl	Datum (oudste eerst)
 deactive	mail	nl	Niet actief
 default sorting order	mail	nl	Standaard volgorde
 default toolbar actions shown in mail's html editor	mail	nl	Functies ingeschakeld in de HTML editor werkbalk bij het samenstellen van een e-mail
@ -178,7 +176,6 @@ drafts	mail	nl	Concepten
 drafts folder	mail	nl	Concept map
 edit account	mail	nl	Bewerk account
 edit account ...	mail	nl	Bewerk account ...
-edit folder acl	mail	nl	Bewerk map ACL
 edit folder acl ...	mail	nl	Bewerk map ACL ...
 edit vacation settings	mail	nl	Bewerk afwezigheid instellingen
 effective only if server supports acl at all	admin	nl	Werkt alleen als server ACL ondersteund
@ -257,6 +254,7 @@ handling of external http images / mixed content in mails	mail	nl	Omgaan met ext
 header	mail	nl	Kop
 header lines	mail	nl	Kop lijnen
 high	mail	nl	Hoog
+high priority	mail	nl	Hoge prioriteit
 hold %1 to drag files to your computer	mail	nl	Houd %1 ingedrukt om bestanden naar je computer te slepen
 home page folders	mail	nl	Thuis mappen
 hostname or ip	mail	nl	Hostnaam of IP
@ -313,6 +311,7 @@ learning as spam failed because of %1	mail	nl	Leren als spam mislukt vanwege %1
 less than	mail	nl	minder dan
 limit mailing list results when searching for addresses	mail	nl	Resultaten van mailinglijsten beperken bij het zoeken naar adressen
 list of actions to be switched/activated on by default (eg. mail compose save as infolog action)	mail	nl	Lijst met acties die standaard ingeschakeld/geactiveerd moeten worden (bijv. Mail compose opslaan als InfoLog actie).
+low priority	mail	nl	Lage prioriteit
 mail	common	nl	Mail
 mail acl	mail	nl	Toegangsrechten
 mail filter	mail	nl	Berichten filter
@ -346,6 +345,7 @@ modify subject of this message	mail	nl	Wijzig het onderwerp van dit bericht
 move selected mails to archive	mail	nl	Geselecteerde e-mails naar archief verplaatsen
 move selected to	mail	nl	Verplaats geselecteeerde
 move to	mail	nl	Verplaats naar
+move to archive	mail	nl	Verplaatsen naar archiefmap
 move to trash	mail	nl	Verplaatsen naar prullenmand
 moved %1 message(s) from %2 to %3	mail	nl	%1 bericht verplaatst van %2 naar %3
 name and domain	mail	nl	Naam en domein
@ -471,7 +471,6 @@ resend after how many days?	mail	nl	Opnieuw verzenden na hoeveel dagen?
 respond to mail sent to:	mail	nl	Antwoord op bericht verzonden aan:
 restrict acl management	admin	nl	Beperk ACL beheer
 rights	mail	nl	Rechten
-row order style	mail	nl	rijvolgorde stijl
 rule priority position	mail	nl	Regel prioriteit positie
 rule with priority	mail	nl	regels met prioriteit
 rules	mail	nl	Regels
@ -542,7 +541,6 @@ shows a temporary visible notification including from address, subject and a sni
 sieve	mail	nl	Sieve
 sieve connection status	mail	nl	Status Sieve connectie
 sieve not activated	mail	nl	Sieve niet geactiveerd
-sieve script name	mail	nl	Sieve script naam
 sieve server	mail	nl	Sieve server
 sieve_edit_instructions	mail	nl	*) jokertekens (*,?) mogen worden gebruikt. Als je probeert om * of ? zelf te evenaren, moet je ze escapen met een backslash (?). Als je "Reguliere expressies gebruiken" aanvinkt, moet je geldige reguliere expressies gebruiken. Om een uitroepteken (!) aan het begin dat niet als "NOT" wordt gebruikt te omzeilen, moet je een regex en een backslash (^) gebruiken (bijv. ^!).
 sign your message with smime certificate	mail	nl	Onderteken uw bericht met een S/MIME certificaat
@ -550,7 +548,6 @@ signature	mail	nl	Handtekening
 signature at top	mail	nl	Ondertekeing bovenaan
 signature position and visibility	mail	nl	Positie en zichtbaarheid handtekening
 signed by	mail	nl	Ondertekend door
-small view	mail	nl	kleine weergave
 smime encrypted message	mail	nl	S/MIME gecodeerd bericht
 smime signed message	mail	nl	S/MIME ondertekend bericht
 smtp	mail	nl	SMTP
@ -570,7 +567,6 @@ subscribe folder ...	mail	nl	Abonneer op map ...
 subscription folders	mail	nl	Gabonneerde mappen
 subscription successfully saved.	mail	nl	Het abonnerren op deze map is succesvol bewaard.
 succeeded on %1 folders, failed on %2	mail	nl	Gelukt op %1 mappen, mislukt op %2
-successfully connected	mail	nl	Succesvol verbonden
 template folder	mail	nl	Sjabloon folder
 templates	mail	nl	Sjablonen
 templates folder	mail	nl	Sjablonen map
@ -591,7 +587,6 @@ this mail contains external images served via insecure http protocol. be aware s
 this message is smime encrypted and password protected.	mail	nl	Dit bericht is S/MIME gecodeerd en beveiligd met een wachtwoord.
 timeout on connections to your imap server	mail	nl	Timeout op connecties met de IMAP server
 to do	mail	nl	Te doen
-toggle all folders view for %1	mail	nl	Toogle alle mappen in overzicht %1
 toggled on actions	mail	nl	Acties inschakelen
 trash	mail	nl	Prullenbak
 trash folder	mail	nl	Prullenbak map
@ -636,13 +631,7 @@ with message:	mail	nl	Met bericht:
 writable sharing requires epl version!	mail	nl	Schrijfbaar delen vereist EPL versie!
 write	mail	nl	Schrijf
 wrote	mail	nl	schreef
-yes, but mask all passwords	mail	nl	ja, maar verberg alle wachtwoorden
-yes, but mask all usernames and passwords	mail	nl	ja, maar verberg alle gebruikersnamen en wachtwoorden
 yes, offer copy option	mail	nl	ja, stel kopieer functie voor
-yes, only trigger connection reset	mail	nl	ja, geef alleen herinitialering verbinding aam
-yes, show all debug information available for the user	mail	nl	ja, toon alle debug infromatie welke is beschikbaar voor de gebruiker
-yes, show basic info only	mail	nl	ja, toon alleen basis infromatie
-you can either choose to save as infolog or tracker, not both.	mail	nl	U kunt kiezen om het bericht te bewaren als InfoLog of Tracker maar niet allebei
 you can select what info to be displayed on email tag	mail	nl	U kunt selecteren welke informatie op de e-mailtag moet worden weergegeven.
 you can use $$start$$ for the above start date and $$end$$ for the end date.	mail	nl	U kunt $$start$$ gebruiken voor de bovenstaande begindatum en $$end$$ voor de einddatum.
 you may add this certificate into your contact, if you trust this signature.	mail	nl	Je kunt dit certificaat toevoegen aan je contactpersoon als je deze handtekening vertrouwt.
--- a/Show More
+++ b/Show More