diff --git a/addressbook/setup/phpgw_es-es.lang b/addressbook/setup/phpgw_es-es.lang
index df278389a6..47f7ff4196 100644
--- a/addressbook/setup/phpgw_es-es.lang
+++ b/addressbook/setup/phpgw_es-es.lang
@@ -189,6 +189,7 @@ voice phone	addressbook	es-es	Tel
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	es-es	¡Atención! ¡LDAP es valido sólo si no está usando contactos para almacenar las cuentas!
 warning: all contacts found will be deleted!	addressbook	es-es	ATENCIÓN: ¡Se borrarán todos los contactos encontrados!
 work phone	addressbook	es-es	Teléfono del trabajo
+write (update or add) a single entry by passing the fields.	addressbook	es-es	Escribir (actualizar o añadir) una única entrada pasando los campos.
 you are not permitted to delete contact %1	addressbook	es-es	No tiene permiso para borrar el contacto %1
 you are not permittet to delete this contact	addressbook	es-es	No tiene permiso para borrar este contacto
 you are not permittet to edit this contact	addressbook	es-es	No tiene permiso para editar este contacto
diff --git a/addressbook/setup/phpgw_sl.lang b/addressbook/setup/phpgw_sl.lang
index fd0704c560..02af2db5ff 100644
--- a/addressbook/setup/phpgw_sl.lang
+++ b/addressbook/setup/phpgw_sl.lang
@@ -1,7 +1,7 @@
 %1 records imported	addressbook	sl	%1 zapisov uvoženih
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	sl	1% zapisov prebranih (niso še uvoženi, lahko greste %2nazaj%3 in odzna�ite preizkus uvoza)
 (e.g. 1969)	addressbook	sl	(npr. 1969)
-<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	sl	<b>Ni tipa prevoda &lt;noben&gt; lahko je zaklenjen.</b> Izberite tip prevoda s seznama.
+<b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	sl	<b>Ni tipa prevoda <noben> lahko je zaklenjen.</b> Izberite tip prevoda s seznama.
 @-eval() is only availible to admins!!!	addressbook	sl	Funkcija @-eval() je na voljo samo za oskrbniku!
 actions	addressbook	sl	Dejanja
 add a single entry by passing the fields.	addressbook	sl	Dodaj  zapis z vnosom polj.
@@ -16,7 +16,9 @@ addressbook	common	sl	Adresar
 addressbook preferences	addressbook	sl	Lastnosti adresarja
 addressbook-fieldname	addressbook	sl	Adresar-Ime polja
 addvcard	addressbook	sl	Dodaj VCard
+advanced search	addressbook	sl	Napredno iskanje
 alt. csv import	addressbook	sl	Uvoz CSV datoteke
+are you shure you want to delete this contact?	addressbook	sl	Res želite zbrisati ta stik?
 are you sure you want to delete this field?	addressbook	sl	Ste prepri�ani, da želite izbrisati to polje?
 bbs phone	addressbook	sl	BBS Telefon
 birthday	common	sl	Rojstni dan
@@ -36,15 +38,20 @@ business zip code	addressbook	sl	Poštna št.
 car phone	addressbook	sl	Telefon v avtu
 cell phone	addressbook	sl	GSM
 charset of file	addressbook	sl	Kodna tabela datoteke
+choose an icon for this contact type	addressbook	sl	Izberite ikono za to vrsto stika
+chosse an etemplate for this contact type	addressbook	sl	Izberite eTemplate za to vrsto stika
 city	common	sl	Mesto
 company	common	sl	Podjetje
 company name	common	sl	Ime podjetja
 configuration	common	sl	Nastavitve
 contact	common	sl	Stik
 contact application	admin	sl	Kontaktna aplikacija
+contact saved	addressbook	sl	Stik shranjen
 contact settings	admin	sl	Nastavitve stikov
 copied by %1, from record #%2.	addressbook	sl	Kopirano iz zapisa %2 v zapis %1.
 country	common	sl	Država
+create new links	addressbook	sl	Ustvari nove povezave
+credit	addressbook	sl	Zasluge
 csv-fieldname	addressbook	sl	CSV-Ime polja
 csv-filename	addressbook	sl	CSV-Ime datoteke
 custom	addressbook	sl	Lasten
@@ -53,13 +60,20 @@ debug output in browser	addressbook	sl	Preglej izpis v brskalniku
 default filter	addressbook	sl	Privzeti filter
 delete a single entry by passing the id.	addressbook	sl	Zbriši zapis s podano šifro
 department	common	sl	Oddelek
+do your really want to delete this contact?	addressbook	sl	Res želite zbrisati ta stik?
+doesn't matter	addressbook	sl	ni pomembno
 domestic	addressbook	sl	Doma�i
 download	addressbook	sl	Prenos
 download export file (uncheck to debug output in browser)	addressbook	sl	Prenos izvožene datoteke (Odzna�i za izpis v brskalniku)
+download this contact as vcard file	addressbook	sl	Prenesite ta stik kot datoteko vCard
 edit custom field	addressbook	sl	Uredi lastno polje
 edit custom fields	admin	sl	Uredi lastna polja
+edit phonenumbers -	addressbook	sl	Uredi telefonske Å¡tevilke -
+email & internet	addressbook	sl	E-pošta in Splet
 empty for all	addressbook	sl	izprazni za vse
 enter the path to the exported file here	addressbook	sl	Vnesite pot do izhodne datoteke
+existing links	addressbook	sl	Obstoje�e povezave
+export	addressbook	sl	izvozi
 export contacts	addressbook	sl	Izvozi kontakte
 export file name	addressbook	sl	Ime izvožene datoteke
 export from addressbook	addressbook	sl	Izvoz iz adresarja
@@ -84,6 +98,7 @@ home phone	addressbook	sl	Telefon
 home state	addressbook	sl	Država
 home street	addressbook	sl	Naslov
 home zip code	addressbook	sl	Poštna št.
+icon	addressbook	sl	Ikona
 import	addressbook	sl	Uvozi
 import contacts	addressbook	sl	Uvozi  kontakte
 import csv-file into addressbook	addressbook	sl	Uvozi CSV-polja v imenik
@@ -94,15 +109,18 @@ import from outlook	addressbook	sl	Uvoz iz Outlook-a
 import multiple vcard	addressbook	sl	Uvoz ve�ih VCard
 import next set	addressbook	sl	Uvozi naslednji niz
 import_instructions	addressbook	sl	V Netscapu odprite adresar in izberite <b>Export</b> v meniju <b>File</b>. Izvožena datoteka bo v obliki LDIF.<p>V Outlooku izberite mapo Stiki (Contacts), izberite <b>Uvoz/izvoz (Import/Export)</b> v meniju <b>Datoteka (File)</b>. Izvožena datoteka bo v obliki CSV.
+income	addressbook	sl	Priliv
 international	addressbook	sl	Mednarodni
 isdn phone	addressbook	sl	ISDN
 label	addressbook	sl	Zna�ilnosti
+last modified	addressbook	sl	nazadnje spremenjeno
 ldap context for contacts	admin	sl	LDAP kontekst za kontakte
 ldap host for contacts	admin	sl	LDAP strežnik za kontakte
 ldap root dn for contacts	admin	sl	LDAP root dn za kontakte
 ldap root pw for contacts	admin	sl	LDAP root pw za povezave
 ldif	addressbook	sl	LDIF
 line 2	addressbook	sl	Vrstica 2
+links	addressbook	sl	Povezave
 list all categories	addressbook	sl	Izpis vseh kategorij
 list all customfields	addressbook	sl	Izpis vseh lastnih polj
 load vcard	addressbook	sl	Naloži VCard
@@ -112,10 +130,13 @@ middle name	addressbook	sl	Srednje ime
 mobile	addressbook	sl	Mobilni
 mobile phone	addressbook	sl	GSM
 modem phone	addressbook	sl	Modem
+more ...	addressbook	sl	Ve� ...
 multiple vcard	addressbook	sl	Ve� VCard zapisov
 no vcard	addressbook	sl	Ni VCard zapisov
+number	addressbook	sl	Å tevilo
 number of records to read (%1)	addressbook	sl	Å tevilo zapisov za branje (%1)
-number of records to read (<=200)	addressbook	sl	Å tevilka zapisov za branje(<=200)
+options for type	addressbook	sl	Možnosti za vrsto
+organisation	addressbook	sl	organizacija
 other number	addressbook	sl	Å tevilka
 other phone	addressbook	sl	Telefon
 pager	common	sl	Pozivnik
@@ -127,6 +148,7 @@ postal	common	sl	Poštni
 pref	addressbook	sl	privzeta
 prefix	addressbook	sl	Predpona
 public key	addressbook	sl	Javni klju�
+publish into groups:	addressbook	sl	Objavi v skupinah:
 read a list / search for entries.	addressbook	sl	Preberi seznam / iskanje vnosov
 read a list of entries.	addressbook	sl	Preberi seznam vnosov.
 read a single entry by passing the id and fieldlist.	addressbook	sl	Preberi zapis s podano Å¡ifro in seznamom polj.
@@ -139,11 +161,16 @@ select the type of conversion:	addressbook	sl	Izberite tip pretvorbe:
 select where you want to store	admin	sl	Izberite kam želite shraniti
 show	addressbook	sl	Prikaži
 show birthday reminders on main screen	addressbook	sl	Prikaži opomnike rojstnih dni v glavnem oknu
+something went wrong by deleting %1	addressbook	sl	Napaka pri brisanju %1
+something went wrong by deleting this contact	addressbook	sl	Napaka pri brisanju tega stika
+something went wrong by reading this contact	addressbook	sl	Napaka pri branju tega stika
+something went wrong by saving this contact. errorcode %1	addressbook	sl	Napaka pri shranjevanju tega stika. Koda napake %1
 startrecord	addressbook	sl	Za�etni zapis
 state	common	sl	Država
 street	common	sl	Ulica
 successfully imported %1 records into your addressbook.	addressbook	sl	Uspešno prenesenih %1 zapisov v vaš adresar.
 suffix	addressbook	sl	Pripona
+tel home	addressbook	sl	doma�i telefon
 test import (show importable records <u>only</u> in browser)	addressbook	sl	Preizkus uvoza (Pokaže uvožene zapise<u>samo</u> v brskalniku).
 that field name has been used already !	addressbook	sl	To ime polja je že v uporabi!
 this person's first name was not in the address book.	addressbook	sl	Imena te osebe ni v adresarju.
@@ -160,8 +187,13 @@ vcards require a last name entry.	addressbook	sl	VCards zahteva vpis priimka.
 video phone	addressbook	sl	Videotelefon
 voice phone	addressbook	sl	Glasovni telefon
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	sl	OPOZORILO!! LDAP je veljaven samo, �e ne uporabljate kontaktov za skladiš�enje ra�unov!
+warning: all contacts found will be deleted!	addressbook	sl	Opozorilo: vsi najdeni stiki bodo zbrisani!
 work phone	addressbook	sl	Telefon
 write (update or add) a single entry by passing the fields.	addressbook	sl	Zapiši (posodobi ali dodaj) zapis s podanimi polji.
+you are not permitted to delete contact %1	addressbook	sl	Nimate dovoljenja brisati stik %1
+you are not permittet to delete this contact	addressbook	sl	Nimate dovoljenja brisati tega stika
+you are not permittet to edit this contact	addressbook	sl	Nimate dovoljenja spremeniti tega stika
+you are not permittet to view this contact	addressbook	sl	Nimate dovoljenja pogledati tega stika
 you must select a vcard. (*.vcf)	addressbook	sl	Izbrati morate VCard. (*.vcf)
 you must select at least 1 column to display	addressbook	sl	Izbrati morate najmanj 1 stolpec za prikaz
 zip code	common	sl	Poštna številka
diff --git a/addressbook/setup/phpgw_zh-tw.lang b/addressbook/setup/phpgw_zh-tw.lang
index 5559c39c5f..51123cedc4 100644
--- a/addressbook/setup/phpgw_zh-tw.lang
+++ b/addressbook/setup/phpgw_zh-tw.lang
@@ -1,5 +1,5 @@
 %1 records imported	addressbook	zh-tw	共有%1  筆紀錄被匯入
-%1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	zh-tw	共有%1 筆記錄被讀�（還未被匯入，您應該�往 %2back%3 並�消「匯入測試�）
+%1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	zh-tw	共有%1 筆記錄被讀�（還未被匯入，您應該 %2回上�%3 並�消「匯入測試�）
 (e.g. 1969)	addressbook	zh-tw	(例如 1969)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	zh-tw	<b>沒有轉�格� <沒有> �以被指定。</b>  請從�單��一種轉�格�
 @-eval() is only availible to admins!!!	addressbook	zh-tw	@-eval() ��供給管�者使用��
@@ -189,6 +189,7 @@ voice phone	addressbook	zh-tw	語音電話
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	zh-tw	注����有當您沒有將�絡人作為帳號儲存時LDAP�會生效�
 warning: all contacts found will be deleted!	addressbook	zh-tw	警告：找到的所有�絡人都會被刪除�
 work phone	addressbook	zh-tw	工作電話
+write (update or add) a single entry by passing the fields.	addressbook	zh-tw	���供的欄�寫入（更新或新增）一筆�立資料。
 you are not permitted to delete contact %1	addressbook	zh-tw	您沒有權�刪除�絡人 %1
 you are not permittet to delete this contact	addressbook	zh-tw	您沒有權�刪除這個�絡人
 you are not permittet to edit this contact	addressbook	zh-tw	您沒有權�編輯這個�絡人
diff --git a/admin/setup/phpgw_es-es.lang b/admin/setup/phpgw_es-es.lang
index fd5ccf89c2..105b2a32cb 100644
--- a/admin/setup/phpgw_es-es.lang
+++ b/admin/setup/phpgw_es-es.lang
@@ -190,6 +190,7 @@ enter your smtp server hostname or ip address	admin	es-es	Introduzca su servidor
 enter your smtp server port	admin	es-es	Introduzca el puerto del servidor SMTP
 error canceling timer, maybe there's none set !!!	admin	es-es	Error al cancelar el temporizador ¡Puede que no haya ninguno!
 error setting timer, wrong syntax or maybe there's one already running !!!	admin	es-es	Error al configurar el temporizador. La sintaxis es incorrecta o puede que haya uno que ya se esté ejecutándo.
+error! no appname found	admin	es-es	¡Error! No se encontró el nombre de la aplicación
 error: %1 not found or other error !!!	admin	es-es	Error: no se encontró %1 u otro error
 expires	admin	es-es	Expira
 explanation of ldapman	admin	es-es	Este módulo ha sido probado en POSTFIX, LDAP, Courier-IMAP y necesita los esquemas CORE y QMAIL (OID7914). Más detalles sobre el uso y configuración de este sistema puede encontrarse en el fichero README.ldapman en el directorio doc de ADMIN.
@@ -309,6 +310,7 @@ please select	admin	es-es	Por favor, seleccione
 postfix with ldap	admin	es-es	Postfix con LDAP
 preferences	admin	es-es	Preferencias
 primary group	admin	es-es	Grupo principal
+qmaildotmode	admin	es-es	qmaildotmode
 quota settings	admin	es-es	configuración de la cuota
 quota size in mbyte	admin	es-es	tamaño de la cuota en MBytes
 re-enter password	admin	es-es	Confirmar contraseña
@@ -396,6 +398,7 @@ top	admin	es-es	Superior
 total records	admin	es-es	Total de registros
 trust level	admin	es-es	Nivel de confianza
 trust relationship	admin	es-es	Relaciones de confianza
+type '%1' already exists !!!	admin	es-es	¡El tipo '%1' ya existe!
 type of customfield	admin	es-es	Tipo de campo personalizado
 under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!!	admin	es-es	En windows, se necesita instalar asyncservice %1manualmente%2 o usar el modo de fallos. El modo de fallos sólo comprueba los trabajos después de ver cada página. ¡Cuidado!
 use cookies to pass sessionid	admin	es-es	Usar cookies para almacenar sesiones
@@ -424,6 +427,7 @@ would you like to show each application's upgrade status ?	admin	es-es	
 xml-rpc	admin	es-es	XML-RPC
 you have entered an invalid expiration date	admin	es-es	Ha introducido una fecha de expiración que no es válida
 you have to enter a name, to create a new field!!!	admin	es-es	Tiene que introducir un nombre para crear un nuevo campo
+you have to enter a name, to create a new type!!!	admin	es-es	¡Tiene que introducir un nombre para crear un tipo nuevo!
 you must add at least 1 permission or group to this account	admin	es-es	Debe añadir al menos 1 permiso o grupo para esta cuenta
 you must enter a group name.	admin	es-es	Debe introducir un nombre de grupo
 you must enter a lastname	admin	es-es	Debe introducir un apellido
diff --git a/admin/setup/phpgw_zh-tw.lang b/admin/setup/phpgw_zh-tw.lang
index 5b07899e0a..599c648187 100644
--- a/admin/setup/phpgw_zh-tw.lang
+++ b/admin/setup/phpgw_zh-tw.lang
@@ -190,6 +190,7 @@ enter your smtp server hostname or ip address	admin	zh-tw	輸入您的SMTP伺�
 enter your smtp server port	admin	zh-tw	輸入您的SMTP伺�器連接埠
 error canceling timer, maybe there's none set !!!	admin	zh-tw	刪除計時器錯誤，也許並未設定�
 error setting timer, wrong syntax or maybe there's one already running !!!	admin	zh-tw	計時器設定錯誤，錯誤的語法或是已經有一個正在執行�
+error! no appname found	admin	zh-tw	錯誤�找�到應用程��稱
 error: %1 not found or other error !!!	admin	zh-tw	錯誤：找�到%1或是其他錯誤�
 expires	admin	zh-tw	�期
 explanation of ldapman	admin	zh-tw	這個模組已經在 POSTFIX,LDAP,Courier-IMAP 測試�且需�核心與 QMAIL (OID7914)概�。更多細節�以�考 ADMIN 資料夾中的 README.ldapman 。
@@ -397,6 +398,7 @@ top	admin	zh-tw	頂部
 total records	admin	zh-tw	所有紀錄
 trust level	admin	zh-tw	信用層級
 trust relationship	admin	zh-tw	信用關係
+type '%1' already exists !!!	admin	zh-tw	類型 '%1' 已經存在
 type of customfield	admin	zh-tw	自訂欄�類型
 under windows you need to install the asyncservice %1manually%2 or use the fallback mode. fallback means the jobs get only checked after each page-view !!!	admin	zh-tw	在 windows 環境需� %1手動%2 安� asyncservice 或是使用回應模�，回應模�指的是在���覽完�會被檢查。
 use cookies to pass sessionid	admin	zh-tw	使用 COOKIE 傳�連線代碼
@@ -425,6 +427,7 @@ would you like to show each application's upgrade status ?	admin	zh-tw	您希望
 xml-rpc	admin	zh-tw	XML-RPC
 you have entered an invalid expiration date	admin	zh-tw	您輸入了一個錯誤的��期的日期
 you have to enter a name, to create a new field!!!	admin	zh-tw	�建立一個新欄�需�輸入�稱�
+you have to enter a name, to create a new type!!!	admin	zh-tw	您必須輸入一個�稱來新增類型�
 you must add at least 1 permission or group to this account	admin	zh-tw	您必須至少授權此帳號一項權�或將此帳號歸於一個群組下。
 you must enter a group name.	admin	zh-tw	您必須輸入群組�稱
 you must enter a lastname	admin	zh-tw	您必須輸入使用者姓�
diff --git a/etemplate/setup/phpgw_es-es.lang b/etemplate/setup/phpgw_es-es.lang
index df042f91c7..4cd064eec6 100644
--- a/etemplate/setup/phpgw_es-es.lang
+++ b/etemplate/setup/phpgw_es-es.lang
@@ -178,6 +178,7 @@ help	etemplate	es-es	Ayuda
 horizontal rule	etemplate	es-es	Línea horizontal
 hour	etemplate	es-es	Hora
 hours	etemplate	es-es	horas
+how many entries should the list show	etemplate	es-es	¿Cuántas entradas se muestran en la lista?
 html	etemplate	es-es	Html
 if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell	etemplate	es-es	Si el campo está desactivado, la celda de la tabla estará vacía, para borrar temporalmente un campo o celda.
 image	etemplate	es-es	Imagen
@@ -216,6 +217,7 @@ linkto	etemplate	es-es	Enlace a
 load this template into the editor	etemplate	es-es	cargar esta plantilla en el editor
 middle	etemplate	es-es	Medio
 minute	etemplate	es-es	Minuto
+minutes	etemplate	es-es	MInutos
 month	etemplate	es-es	Mes
 multicolumn indices	etemplate	es-es	Indices multicolumna
 name	etemplate	es-es	Nombre
diff --git a/etemplate/setup/phpgw_zh-tw.lang b/etemplate/setup/phpgw_zh-tw.lang
index 9dbf257206..3965eb020d 100644
--- a/etemplate/setup/phpgw_zh-tw.lang
+++ b/etemplate/setup/phpgw_zh-tw.lang
@@ -178,6 +178,7 @@ help	etemplate	zh-tw	求助
 horizontal rule	etemplate	zh-tw	�併�則
 hour	etemplate	zh-tw	�時
 hours	etemplate	zh-tw	�時
+how many entries should the list show	etemplate	zh-tw	清單�顯示多少筆資料
 html	etemplate	zh-tw	HTML
 if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell	etemplate	zh-tw	如果儲存格被�用則會顯示一個空白的表格�，藉此(暫時)移除一個儲存格
 image	etemplate	zh-tw	圖片
@@ -216,6 +217,7 @@ linkto	etemplate	zh-tw	連�網�
 load this template into the editor	etemplate	zh-tw	將這個樣�載入編輯器中
 middle	etemplate	zh-tw	中間
 minute	etemplate	zh-tw	分
+minutes	etemplate	zh-tw	分
 month	etemplate	zh-tw	月
 multicolumn indices	etemplate	zh-tw	多欄索引
 name	etemplate	zh-tw	�稱
diff --git a/infolog/setup/phpgw_es-es.lang b/infolog/setup/phpgw_es-es.lang
index 04233bab80..348d56c543 100644
--- a/infolog/setup/phpgw_es-es.lang
+++ b/infolog/setup/phpgw_es-es.lang
@@ -98,6 +98,7 @@ duration	infolog	es-es	Duraci
 each value is a line like <id>[=<label>]	infolog	es-es	cada valor es una línea como <id>[=<etiqueta>]
 edit	infolog	es-es	Editar
 edit or create categories for ingolog	infolog	es-es	Editar o crear categorías para el Registro
+edit rights (full edit rights incl. making someone else responsible!)	infolog	es-es	editar derechos (editar todos los derechos, incluyendo hacer a alguien responsable)
 edit status	infolog	es-es	Editar estado
 edit the entry	infolog	es-es	Editar la entrada
 edit this entry	infolog	es-es	Editar esta entrada
@@ -204,6 +205,7 @@ project	infolog	es-es	Proyecto
 project settings: price, times	infolog	es-es	Configuración del proyecto: precio, tiempos
 re:	infolog	es-es	Re:
 read one record by passing its id.	infolog	es-es	Leer un registro pasando su id.
+read rights (default)	infolog	es-es	derecho de lectura (predeterminado)
 reg. expr. for local ip's<br>eg. ^192\.168\.1\.	infolog	es-es	expresión regular para IPs locales <br>ej. ^192\.168\.1\.
 remark	infolog	es-es	Comentario
 remove this link (not the entry itself)	infolog	es-es	Eliminar este enlace (no la entrada en sí)
@@ -213,6 +215,7 @@ responsible overdue	infolog	es-es	responsable vencido
 responsible upcoming	infolog	es-es	responsable por llegar
 responsible user, priority	infolog	es-es	usuario responsable, prioridad
 returns a list / search for records.	infolog	es-es	Devuelve una lista o busca registros
+rights for the responsible	infolog	es-es	Derechos para el responsable
 save	infolog	es-es	Guardar
 saves the changes made and leaves	infolog	es-es	guardar los cambios realizados y salir
 saves this entry	infolog	es-es	Guardar esta entrada
@@ -234,12 +237,16 @@ should infolog display your open entries - not finished tasks, phonecalls or not
 should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent.	infolog	es-es	¿Mostrar las Subtareas (subllamadas o subnotas) en la vista normal? Puede ver siempre estos subtipos a través de su tipo superior.
 should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog).	infolog	es-es	¿Deben mostrarse los enlaces a otras aplicaciones y/o los ficheros adjuntos en la lista del registro (la vista normal al entrar en el registro)?
 should infolog use full names (surname and familyname) or just the loginnames.	infolog	es-es	¿Usar nombres completos (apellido y nombre de la familia), o sólo los nombres internos de la aplicación?
+should the infolog list show a unique numerical id, which can be used eg. as ticket id.	infolog	es-es	¿Mostrar una lista con un id numérico único, que se pueda usar como id de ticket?
+should the infolog list show the percent done only for status ongoing or two separate icons.	infolog	es-es	¿Mostrar en la lista el porcentaje de finalización sólo para el estado de salida o dos iconos separados?
 should this entry only be visible to you and people you grant privat access via the acl	infolog	es-es	¿Poner esta entrada visible sólo para usted y la gente que indique?
 show a column for used and planned times in the list.	infolog	es-es	Mostrar una columna para horas usadas y previstas en la lista
 show full usernames	infolog	es-es	Mostrar nombres de usuario completos
 show in the infolog list	infolog	es-es	Mostrar la lista del Registro
 show list of upcoming entries	infolog	es-es	Mostrar la lista de entradas por llegar
 show open entries: tasks/calls/notes on main screen	infolog	es-es	Mostrar las entradas abiertas: Tareas, llamadas o notas en la pantalla principal
+show status and percent done separate	infolog	es-es	Mostrar el estado y el porcentaje de finalización por separado
+show ticket id	infolog	es-es	Mostrar id del ticket?
 show times	infolog	es-es	Mostrar horas
 small view	infolog	es-es	vista reducida
 start a new search, cancel this link	infolog	es-es	iniciar nueva búsqueda, cancelar este enlace
@@ -285,6 +292,8 @@ view subs	infolog	es-es	ver subs
 view the parent of this entry and all his subs	infolog	es-es	Ver el padre de esta entrada y todos sus subs
 view this linked entry in its application	infolog	es-es	ver esta entrada vinculada en su aplicación
 when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage)	infolog	es-es	Cuándo se debe iniciar las tareas pendientes o llamada de teléfono. Se muestra en la fecha del filtro o al abrir manualmente en la página de inicio
+which additional fields should the responsible be allowed to edit without having edit rights?<br />status, percent and date completed are always allowed.	infolog	es-es	¿Qué campos adicionales puede editar el responsable sin tener derechos de edición?<br />El estado, porcentaje y fecha de finalización se permiten siempre.
+which implicit acl rights should the responsible get?	infolog	es-es	¿Qué derechos implícitos de ACL debe tener el responsable?
 will-call	infolog	es-es	va a llamar
 write (add or update) a record by passing its fields.	infolog	es-es	Escribir (añadir o actualizar) un registro pasando sus campos.
 yes - delete	infolog	es-es	Sí - Eliminar
diff --git a/infolog/setup/phpgw_zh-tw.lang b/infolog/setup/phpgw_zh-tw.lang
index 31cb0b08cd..78d33ffe20 100644
--- a/infolog/setup/phpgw_zh-tw.lang
+++ b/infolog/setup/phpgw_zh-tw.lang
@@ -98,6 +98,7 @@ duration	infolog	zh-tw	進行期間
 each value is a line like <id>[=<label>]	infolog	zh-tw	�個值都是這樣的線 <id>[=<label>]
 edit	infolog	zh-tw	編輯
 edit or create categories for ingolog	infolog	zh-tw	編輯或建立訊�紀錄的類別
+edit rights (full edit rights incl. making someone else responsible!)	infolog	zh-tw	編輯權�（完整的編輯權�包括指定負責人�）
 edit status	infolog	zh-tw	編輯狀態
 edit the entry	infolog	zh-tw	編輯這個事件
 edit this entry	infolog	zh-tw	編輯這個事件
@@ -204,6 +205,7 @@ project	infolog	zh-tw	專案
 project settings: price, times	infolog	zh-tw	專案設定： 價格�時間
 re:	infolog	zh-tw	回覆：
 read one record by passing its id.	infolog	zh-tw	��傳�ID來讀�記錄
+read rights (default)	infolog	zh-tw	閱讀權�（�設）
 reg. expr. for local ip's<br>eg. ^192\.168\.1\.	infolog	zh-tw	本地端IP的�濾�則<br>例如^192\.168\.1\.
 remark	infolog	zh-tw	標註
 remove this link (not the entry itself)	infolog	zh-tw	移除這個連�(�是它的資料)
@@ -213,6 +215,7 @@ responsible overdue	infolog	zh-tw	責任期間
 responsible upcoming	infolog	zh-tw	�將產生的責任
 responsible user, priority	infolog	zh-tw	負責人�順�
 returns a list / search for records.	infolog	zh-tw	傳回一個清單 / �尋記錄
+rights for the responsible	infolog	zh-tw	負責人權�
 save	infolog	zh-tw	儲存
 saves the changes made and leaves	infolog	zh-tw	儲存後離開
 saves this entry	infolog	zh-tw	儲存這個事件
@@ -234,12 +237,16 @@ should infolog display your open entries - not finished tasks, phonecalls or not
 should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent.	infolog	zh-tw	記事本需�在一般�覽中顯示附屬任務，�絡清單或是記事嗎？您�以在原始事件中看到附屬的資訊。
 should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog).	infolog	zh-tw	記事本是��顯示與其他應用程�的連�與/或附加檔案（通常會在進入記事本時看到）。
 should infolog use full names (surname and familyname) or just the loginnames.	infolog	zh-tw	記事本使用全�或是登入�稱？
+should the infolog list show a unique numerical id, which can be used eg. as ticket id.	infolog	zh-tw	記事清單是��顯示唯一的編號，其他功能�能會需�，例如傳票編號。
+should the infolog list show the percent done only for status ongoing or two separate icons.	infolog	zh-tw	記事清單是���顯示進行中狀態完�的比率或是兩個�立的圖示。
 should this entry only be visible to you and people you grant privat access via the acl	infolog	zh-tw	這個事件��許您以�您從ACL�得存�權�的人？
 show a column for used and planned times in the list.	infolog	zh-tw	在清單中顯示一個用於已使用與已�劃時間的欄�。
 show full usernames	infolog	zh-tw	顯示完整的使用者姓�
 show in the infolog list	infolog	zh-tw	在記事本清單中顯示
 show list of upcoming entries	infolog	zh-tw	顯示所有�將到來的記錄
 show open entries: tasks/calls/notes on main screen	infolog	zh-tw	在主�畫�中顯示開啟的事件：工作/�絡清單/記事
+show status and percent done separate	infolog	zh-tw	將狀態與完�度比率分開
+show ticket id	infolog	zh-tw	顯示傳票編號
 show times	infolog	zh-tw	顯示時間
 small view	infolog	zh-tw	縮�
 start a new search, cancel this link	infolog	zh-tw	開啟一個新的�尋並且�消這個連�
@@ -285,6 +292,8 @@ view subs	infolog	zh-tw	顯示附屬的
 view the parent of this entry and all his subs	infolog	zh-tw	顯示這個事件的主�與所有附屬事件
 view this linked entry in its application	infolog	zh-tw	在應用程�中顯示這個被連�的事件
 when should the todo or phonecall be started, it shows up from that date in the filter open or own open (startpage)	infolog	zh-tw	待辦事項或是�絡清單應該開始的時間？當�濾�件為"所有未完�"或是"自己未完�"時顯示在開始��。
+which additional fields should the responsible be allowed to edit without having edit rights?<br />status, percent and date completed are always allowed.	infolog	zh-tw	哪些�外欄��使負責人沒有編輯權�也能夠編輯？<br />狀態�比率與完�日期�設都會�許。
+which implicit acl rights should the responsible get?	infolog	zh-tw	負責人�以�得哪個隱�的權�？
 will-call	infolog	zh-tw	將連絡
 write (add or update) a record by passing its fields.	infolog	zh-tw	��傳�它的欄�來寫入(新增或更新)一筆記錄
 yes - delete	infolog	zh-tw	確定 - 刪除
diff --git a/phpgwapi/setup/phpgw_pt-br.lang b/phpgwapi/setup/phpgw_pt-br.lang
index 865dd73add..5d9ee3c0b8 100755
--- a/phpgwapi/setup/phpgw_pt-br.lang
+++ b/phpgwapi/setup/phpgw_pt-br.lang
@@ -889,6 +889,7 @@ this is just a template popup	tinymce	pt-br	Este 
 this name has been used already	common	pt-br	Este nome já está em uso !
 this will drop changes and quit spell checker.  please confirm.	htmlarea-SpellChecker	pt-br	Isso descartará alterações e terminará o verificador ortográfico. Por favor, confirme.
 thursday	common	pt-br	Quinta
+tiled	common	pt-br	mosaico
 time	common	pt-br	Hora
 time selection:	jscalendar	pt-br	Seleção da hora:
 time zone	common	pt-br	Fuso horário
@@ -920,6 +921,7 @@ type	common	pt-br	Tipo
 uganda	common	pt-br	UGANDA
 ukraine	common	pt-br	UCRÂNIA
 underline	common	pt-br	Sublinhado
+underline.gif	common	pt-br	underline.gif
 undo	tinymce	pt-br	Desfazer
 undoes your last action	htmlarea	pt-br	Refazer a última ação
 united arab emirates	common	pt-br	EMIRADOS ÁRABES UNIDOS
diff --git a/phpgwapi/setup/phpgw_sl.lang b/phpgwapi/setup/phpgw_sl.lang
index 57f3540216..02cad0a406 100644
--- a/phpgwapi/setup/phpgw_sl.lang
+++ b/phpgwapi/setup/phpgw_sl.lang
@@ -1,5 +1,8 @@
 %1 email addresses inserted	common	sl	Vnešenih %1 E-naslovov
 %1 is not executable by the webserver !!!	common	sl	Spletni strežnik ne more zagnati %1!
+%1 manual	common	sl	Priro�nik %1
+%1 start	common	sl	Zaženi %1
+%1choose an other directory%2<br />or make %3 writeable by webserver	common	sl	%1Izberite drugo mapo%2<br /> ali nastavite, da bo %3 zapisljiva za spletni strežnik
 %1egroupware%2 is a multi-user, web-based groupware suite written in %3php%4.	common	sl	%1eGroupWare%2 je ve�uporabniški, spletno osnovani paket za skupinsko delo, napisan v %3PHP%4-ju.
 (shift-)click or drag to change value	jscalendar	sl	(Shift)-klik ali povleci-in-spusti za spremembo vrednosti.
 - click on any of the time parts to increase it	jscalendar	sl	- Kliknite na katerikoli del �asa za njegovo pove�anje.
@@ -8,7 +11,6 @@
 - or shift-click to decrease it	jscalendar	sl	- ali kliknite s Shift za njegovo zmanjšanje
 - use the %1, %2 buttons to select month	jscalendar	sl	- Uporabite gumba %1, %2 za izbiro meseca
 - use the %1, %2 buttons to select year	jscalendar	sl	- Uporabite gumba %1, %2 za izbiro leta
-/workflow directory does not exist and could not be created, please ask adminstrator to check the global configuration	common	sl	/workflow mapa ne obstaja in je ne morem ustvariti. Prosite oskrbnika, da preveri glabalno konfiguracijo.
 00 (disable)	admin	sl	00 (izklopi)
 13 (ntp)	admin	sl	13 (ntp)
 3 number of chars for day-shortcut	jscalendar	sl	3 - število znakov za okrajšavo dneva
@@ -20,8 +22,10 @@ _image properties...	htmlarea-ContextMenu	sl	_Lastnosti slike...
 _modify link...	htmlarea-ContextMenu	sl	_Spremeni povezavo...
 _remove link...	htmlarea-ContextMenu	sl	_Odstrani povezavo...
 _table properties...	htmlarea-ContextMenu	sl	_Lastnosti tabele...
+a editor instance must be focused before using this command.	tinymce	sl	Pred uporabo tega ukaza morate klikniti v urejevalnik.
 about	common	sl	Vizitka
 about %1	common	sl	Vizitka aplikacije %1
+about egroupware	common	sl	O programu eGroupware
 about the calendar	jscalendar	sl	O koledarju
 about this editor	htmlarea	sl	O urejevalniku
 access	common	sl	Dostop
@@ -36,6 +40,7 @@ active	common	sl	Aktiven
 add	common	sl	Dodaj
 add %1 category for	common	sl	Dodaj kategorijo %1 za
 add category	common	sl	Dodaj kategorijo
+add shortcut	common	sl	Dodaj bližnjico
 add sub	common	sl	Dodaj pod
 addressbook	common	sl	Adresar
 admin	common	sl	Oskrbnik
@@ -44,18 +49,25 @@ afghanistan	common	sl	AFGANISTAN
 albania	common	sl	ALBANIJA
 algeria	common	sl	ALŽIRIJA
 align	htmlarea-TableOperations	sl	Poravnaj
+align center	tinymce	sl	Poravnaj na sredino
+align full	tinymce	sl	Poravnaj obojestransko
+align left	tinymce	sl	Poravnaj levo
+align right	tinymce	sl	Poravnaj desno
+alignment	tinymce	sl	Poravnava
 all	common	sl	Vse
 all fields	common	sl	vsa polja
 all four sides	htmlarea-TableOperations	sl	Vse Å¡tiri strani
-all languages (incl. not listed ones)	common	sl	vsi jeziki (vklju�no s temi, ki jih ni na seznamu)
+all occurrences of the search string was replaced.	tinymce	sl	Vse pojavitve iskanega niza so bile zamenjane.
 alphabet	common	sl	a,b,c,�,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,š,t,u,v,w,x,y,z,ž
 alternate style-sheet:	common	sl	Nadomestna (CSS) predloga
+alternative image	tinymce	sl	Nadomestna slika
 american samoa	common	sl	AMERIÅ KA SAMOA
 andorra	common	sl	ANDORA
 angola	common	sl	ANGOLA
 anguilla	common	sl	ANGVILA
 antarctica	common	sl	ANTARKTIKA
 antigua and barbuda	common	sl	ANTIGVA IN BARBUDA
+application	common	sl	Aplikacija
 apply	common	sl	Uporabi
 april	common	sl	april
 are you sure you want to delete these entries ?	common	sl	Ste prepri�ani, da želite izbrisati te vnose?
@@ -67,7 +79,9 @@ august	common	sl	Avgust
 australia	common	sl	AVSTRALIJA
 austria	common	sl	AVSTRIJA
 author	common	sl	Avtor
+autohide sidebox menu's	common	sl	Samodejno skrij stranske menije
 autohide sidebox menus	common	sl	Samodejno skrivanje stranskih menijev
+automatically hide the sidebox menu's?	common	sl	Samodejno skrijem stranske menije?
 automatically hide the sidebox menus?	common	sl	Samodejno skrijem stranske menije?
 autosave default category	common	sl	Samodejno shrani privzeto kategorijo
 azerbaijan	common	sl	AZARBEJDŽAN
@@ -82,23 +96,25 @@ bahamas	common	sl	BAHAMI
 bahrain	common	sl	BAHRAIN
 bangladesh	common	sl	BANGLADEÅ 
 barbados	common	sl	BARBADOS
-base directory does not exist, please ask adminstrator to check the global configuration	common	sl	Osnovna mapa ne obstaja. Prosite oskrbnika, da preveri globalno konfiguracijo.
-baseline	htmlarea-TableOperations	sl	Temeljna vrstica
+baseline	htmlarea-TableOperations	sl	Osnovnica
 bcc	common	sl	BCC
 belarus	common	sl	BELORUSIJA
 belgium	common	sl	BELGIJA
 belize	common	sl	BELIZE
 benin	common	sl	BENIN
 bermuda	common	sl	BERMUDI
+bg color	tinymce	sl	Barva ozadnja
 bhutan	common	sl	BUTAN
 blocked, too many attempts	common	sl	Zaklenjeno: preve� poskusov.
-bold	htmlarea	sl	Krepko
+bold	common	sl	Krepko
+bold.gif	common	sl	bold.gif
 bolivia	common	sl	BOLIVIJA
-border	htmlarea-TableOperations	sl	Rob
+border	common	sl	Rob
+border color	tinymce	sl	Barva obrobe
 borders	htmlarea-TableOperations	sl	Robovi
 bosnia and herzegovina	common	sl	BOSNA IN HERCEGOVINA
 botswana	common	sl	BOCVANA
-bottom	htmlarea-TableOperations	sl	Dno
+bottom	common	sl	Dno
 bouvet island	common	sl	OTOÄŒJE BOUVET
 brazil	common	sl	BRAZILIJA
 british indian ocean territory	common	sl	BRITANSKO INDIJSKO OTOÄŒJE
@@ -116,7 +132,7 @@ cancel	common	sl	Prekli�i
 cannot replace %1 because it is a directory	common	sl	Ne morem nadomestiti %1, ker je mapa.
 cant open '%1' for %2	common	sl	Ne morem odpreti '%1' za '%2'
 cape verde	common	sl	KAPVERDSKO OTOÄŒJE
-caption	htmlarea-TableOperations	sl	Zajem
+caption	common	sl	Zajem
 categories	common	sl	Kategorije
 categories for	common	sl	kategorije za
 category	common	sl	Kategorija
@@ -125,7 +141,8 @@ category %1 has been updated !	common	sl	Osvežena je bila kategorija %1!
 cayman islands	common	sl	KAJMANSKI OTOKI
 cc	common	sl	CC
 cell properties	htmlarea-TableOperations	sl	Lastnosti celice
-center	htmlarea-TableOperations	sl	Sredina
+center	tinymce	sl	Sredina
+centered	common	sl	na sredini
 central african republic	common	sl	SREDNJEAFRIÅ KA REPUBLIKA
 chad	common	sl	ÄŒAD
 change	common	sl	Spremeni
@@ -136,31 +153,45 @@ check installation	common	sl	Preveri namestitev
 check now	common	sl	Preveri sedaj
 chile	common	sl	ÄŒILE
 china	common	sl	KITAJSKA
+choose a background color	common	sl	Izberite barvo ozadja
+choose a background color for the icons	common	sl	Izberite barvo ozadja za ikone
+choose a background image.	common	sl	Izberite sliko za ozadje.
+choose a background style.	common	sl	Izberite slog ozadja.
+choose a text color for the icons	common	sl	Izberite barvo besedila za ikoneozadja
+choose directory to move selected folders and files to.	tinymce	sl	Izberite mapo, v katero želite premakniti izbrane mape in datoteke.
 choose list style type (for ordered lists)	htmlarea-ListType	sl	Izberi tip seznama (za urejeni seznam)
 choose the category	common	sl	Izberi kategorijo
 choose the parent category	common	sl	Izberi nadrejeno kategorijo
 christmas island	common	sl	BOŽIČNI OTOK
+class	tinymce	sl	Razred
 clear	common	sl	Izprazni
 clear form	common	sl	Izprazni formo
 click	common	sl	Klikni
 click or mouse over to show menus	common	sl	Klik ali prehod z mišjo za prikaz menijev
 click or mouse over to show menus?	common	sl	Klik ali prehod z mišjo za prikaz menijev?
 close	common	sl	Zapri
+close sidebox	common	sl	Zapri stranski meni
 cocos (keeling) islands	common	sl	KOKOSOVI (KEELINGOVI) OTOKI
 collapsed borders	htmlarea-TableOperations	sl	Strnjeni robovi
 colombia	common	sl	KOLUMBIJA
 color	htmlarea-TableOperations	sl	Barva
+columns	tinymce	sl	Stolpci
+comment	tinymce	sl	Komentar
+common preferences	common	sl	Skupne nastavitve
 comoros	common	sl	KOMORI
 company	common	sl	Podjetje
-config password	common	sl	Konfiguracijsko geslo
-config username	common	sl	Konfiguracijsko uporabniško ime
+configuration problem	tinymce	sl	Problem s konfiguracijo
 congo	common	sl	KONGO
 congo, the democratic republic of the	common	sl	KONGO, DEMOKRATIÄŒNA REPUBLIKA
+contacting server...	common	sl	Vzpostavljanje povezave ...
 cook islands	common	sl	COOKOVI OTOKI
 copy	common	sl	Kopiraj
 copy selection	htmlarea	sl	Kopiraj izbor
+copy table row	tinymce	sl	Kopiraj vrstico tabele
+copy/cut/paste is not available in mozilla and firefox.\ndo you want more information about this issue?	tinymce	sl	Kopiraj/Izreži/Prilepi ni na voljo v Mozilli in Firefoxu.\nŽelite ve� informacij o tem problemu?
 costa rica	common	sl	KOSTARIKA
 cote d ivoire	common	sl	SLONOKOÅ ÄŒENA OBALA
+could not contact server. operation timed out!	common	sl	Nisem mogel vzpostaviti povezave s strežnikom. Časovna omejitev se je iztekla!
 create	common	sl	Ustvari
 create a link	htmlarea-ContextMenu	sl	Ustvari povezavo
 created by	common	sl	Ustvaril
@@ -173,21 +204,26 @@ current url is	htmlarea-ContextMenu	sl	Trenutni URL je
 current users	common	sl	Trenutni uporabniki
 cut	htmlarea-ContextMenu	sl	Izreži
 cut selection	htmlarea	sl	Izreži izbor
+cut table row	tinymce	sl	Izreži vrstico tabele
 cyprus	common	sl	CIPER
 czech republic	common	sl	ÄŒEÅ KA REPUBLIKA
 date	common	sl	Datum
 date due	common	sl	Rok
+date modified	tinymce	sl	Datum spremenjen
 date selection:	jscalendar	sl	Izbor datuma
 datetime port.<br>if using port 13, please set firewall rules appropriately before submitting this page.<br>(port: 13 / host: 129.6.15.28)	admin	sl	Vrata za datum in �as. Če uporabljate vrata 13, nastavite ustrezne parametre požarnega zidu preden potrdite to stran.<br> (Vrata: 13/ Strežnik: 129.6.15.28)
 de_lete column	htmlarea-ContextMenu	sl	Izbriši sto_lpec
 december	common	sl	December
 decimal numbers	htmlarea-ListType	sl	Decimalna Å¡tevila
 decrease indent	htmlarea	sl	Zmanjšaj zamik
+default	tinymce	sl	Privzeto
 default category	common	sl	Privzeta kategorija
+default height for the windows	common	sl	Privzeta višina oken
+default width for the windows	common	sl	Privzeta Å¡irina oken
 delete	common	sl	Izbriši
 delete cell	htmlarea-TableOperations	sl	Izbriši celico
 delete column	htmlarea-TableOperations	sl	Izbriši stolpec
-delete row	htmlarea-TableOperations	sl	Izbriši vrstico
+delete row	common	sl	Izbriši vrstico
 delete the current column	htmlarea-ContextMenu	sl	Izbriši trenutni stolpec
 delete the current row	htmlarea-ContextMenu	sl	Izbriši trenutno vrstico
 denmark	common	sl	DANSKA
@@ -196,15 +232,18 @@ detail	common	sl	Podrobnost
 details	common	sl	Podrobnosti
 diable the execution a bugfixscript for internet explorer 5.5 and higher to show transparency in png-images?	common	sl	Onemogo�i izvajanje skripte, ki popravi hroš�a pri prikazu transparentnih PNG slik v Microsoft Internet Explorerju 5.5 in višjih?
 dictionary	htmlarea-SpellChecker	sl	Slovar
+direction	tinymce	sl	Smer
+direction left to right	common	sl	Smer levo proti desni
+direction right to left	tinymce	sl	Smer desno proti levi
+directory	tinymce	sl	Mapa
 disable internet explorer png-image-bugfix	common	sl	Onemogo�i popravek PNG hroš�a v IE?
 disable slider effects	common	sl	Onemogo�i u�inek drsnika
 disable the animated slider effects when showing or hiding menus in the page? opera and konqueror users will probably must want this.	common	sl	Onemogo�i animirane u�inke drsnika ob prikazu menija ob strani? Uporabniki Opere in Konquererja bodo verjetno hoteli to možnost.
 disabled	common	sl	Onemogo�eno
 display %s first	jscalendar	sl	Pokaži najprej %1
-display monday first	common	sl	Najprej ponedeljek
-display sunday first	common	sl	Najprej nedelja
 djibouti	common	sl	DŽIBUTI
 do you also want to delete all subcategories ?	common	sl	Ali želite izbrisati tudi podkategorije?
+do you want to use the wysiwyg mode for this textarea?	tinymce	sl	Želite uporabiti na�in WYSIWYG za to podro�je z besedilom?
 doctype:	common	sl	DOCTYPE:
 document properties	common	sl	Lastnosti dokumenta
 document title:	common	sl	Naziv dokumenta
@@ -214,6 +253,7 @@ domestic	common	sl	Doma�
 dominica	common	sl	DOMINIKA
 dominican republic	common	sl	DOMINIKANSKA REPUBLIKA
 done	common	sl	Kon�ano
+down	tinymce	sl	Dol
 drag to move	jscalendar	sl	Povleci za premik
 e-mail	common	sl	E-pošta
 east timor	common	sl	VZHODNI TIMOR
@@ -229,11 +269,13 @@ el salvador	common	sl	SALVADOR
 element...	htmlarea-ContextMenu	sl	Element...
 email	common	sl	E-pošta
 email-address of the user, eg. "%1"	common	sl	E-naslov uporabnika, npr. "%1"
+emotions	tinymce	sl	Smeški
+en	common	sl	en
 enabled	common	sl	Omogo�eno
 end date	common	sl	Kon�ni datum
 end time	common	sl	Kon�ni �as
 enlarge editor	htmlarea	sl	Pove�aj urejevalnik
-enter the location of egroupware's url.<br>example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br><b>no trailing slash</b>	admin	sl	Vnesite URL eGroupWare. Primer: http://www.domain.com/egroupware &nbsp; ali &nbsp; /egroupware<br><b>Brez zaklju�ne poševnice!</b>
+enter the location of egroupware's url.<br>example: http://www.domain.com/egroupware &nbsp; or &nbsp; /egroupware<br><b>no trailing slash</b>	admin	sl	Vnesite URL eGroupWare. Primer: http://www.domain.com/egroupware   ali   /egroupware<br><b>Brez zaklju�ne poševnice!</b>
 entry has been deleted sucessfully	common	sl	Vnos je bil uspešno izbrisan
 entry updated sucessfully	common	sl	Vnos je bil uspešno osvežen
 equatorial guinea	common	sl	EKVATORIALNA GVINEJA
@@ -252,8 +294,22 @@ february	common	sl	Februar
 fg color	htmlarea-TableOperations	sl	Barva ospredja
 fields	common	sl	Polja
 fiji	common	sl	FIDŽI
+file already exists. file was not uploaded.	tinymce	sl	Datoteka že obstaja, zato ni bila prenešena.
+file exceeds the size limit	tinymce	sl	Datoteka je ve�ja od dovoljene velikosti
+file manager	tinymce	sl	Upravljalec datotek
+file not found.	tinymce	sl	Ne najdem datoteke.
+file was not uploaded.	tinymce	sl	Datoteka ni bila prenešena.
+file with specified new name already exists. file was not renamed/moved.	tinymce	sl	Datoteka z navedenim imenom že obstaja, zato ni bila preimenovana/premaknjena.
+file(s)	tinymce	sl	datoteka/-e
+file:	tinymce	sl	Datoteka:
 files	common	sl	Datoteke
+files with this extension are not allowed.	tinymce	sl	Datoteke s to kon�nico niso dovoljene.
 filter	common	sl	Filter
+find	tinymce	sl	Najdi
+find again	tinymce	sl	Najdi ponovno
+find what	tinymce	sl	Besedilo za iskanje
+find&nbsp;next	tinymce	sl	Najdi naslednje
+find/replace	tinymce	sl	Najdi/zamenjaj
 finished list of mispelled words	htmlarea-SpellChecker	sl	Kon�ni seznam zatipkanih besed
 finland	common	sl	FINSKA
 first name	common	sl	Ime
@@ -262,7 +318,15 @@ first page	common	sl	Prva stran
 firstname	common	sl	Ime
 fixme!	common	sl	POPRAVI ME!
 float	htmlarea-TableOperations	sl	Plavajo�
+folder	tinymce	sl	Mapa
+folder already exists.	common	sl	Mapa že obstaja.
+folder name missing.	tinymce	sl	Manjka ime mape.
+folder not found.	tinymce	sl	Mapa ni bila najdena.
+folder with specified new name already exists. folder was not renamed/moved.	tinymce	sl	Mapa z navedenim imenom že obstaja, zato ni bila preimenovana/premaknjena.
+folder(s)	tinymce	sl	mapa/-e
 font color	htmlarea	sl	Barva pisave
+for mouse out	tinymce	sl	pri izhodu z miško
+for mouse over	tinymce	sl	pri prehodu z miško
 force selectbox	common	sl	Vsili izbirna polja
 frames	htmlarea-TableOperations	sl	Okvirji
 france	common	sl	FRANCIJA
@@ -272,10 +336,12 @@ french southern territories	common	sl	FRANCOSKI JUŽNI TERITORIJ
 friday	common	sl	Petek
 ftp	common	sl	FTP
 fullname	common	sl	Polno ime
+fullscreen mode	common	sl	Celozaslonski na�in
 gabon	common	sl	GABON
 gambia	common	sl	GAMBIJA
 general menu	common	sl	Splošni meni
 georgia	common	sl	GRUZIJA
+german	common	sl	Nemški
 germany	common	sl	NEMÄŒIJA
 ghana	common	sl	GANA
 gibraltar	common	sl	GIBRALTAR
@@ -303,11 +369,8 @@ guinea	common	sl	GVINEJA
 guinea-bissau	common	sl	GVINEJA-BISAO
 guyana	common	sl	GVAJANA
 haiti	common	sl	HAITI
-header admin login	common	sl	Prijava upravljalca glave
-header password	common	sl	Geslo upravljalca glave
-header username	common	sl	Uporabniško ime upravljalca glave
 heard island and mcdonald islands	common	sl	OTOK HEARD IN MCDONALDOVI OTOKI
-height	htmlarea-TableOperations	sl	Višina
+height	common	sl	Višina
 help	common	sl	Pomo�
 help using editor	htmlarea	sl	Pomo� pri uporabi urejevalnika
 high	common	sl	Visoko
@@ -330,13 +393,23 @@ hungary	common	sl	MADŽARSKA
 i will open it in a new page.	htmlarea-SpellChecker	sl	Odprl bom na novi strani.
 i_nsert row before	htmlarea-ContextMenu	sl	Vstavi vrstico pred izbrano
 iceland	common	sl	ISLANDIJA
+iespell not detected. click ok to go to download page.	common	sl	ieSpell ni bil zaznan. Kliknite V redu za obisk spletne strani za prenos.
+if the clock is enabled would you like it to update it every second or every minute?	common	sl	Če je ura omogo�ena, bi jo radi posodobili vsako sekundo ali vsako minutu?
+if there are some images in the background folder you can choose the one you would like to see.	common	sl	Če so v mapi kakšne slike, lahko izberete tisto, ki jo želite videti.
 ignore	htmlarea-SpellChecker	sl	Ignoriraj
 ignore all	htmlarea-SpellChecker	sl	Ignoriraj vse
-image url	htmlarea-TableOperations	sl	URL podobe
+image description	tinymce	sl	Opis slike
+image title	tinymce	sl	Naslov slike
+image url	common	sl	URL podobe
 in_sert row after	htmlarea-ContextMenu	sl	V_stavi vrstico za izbrano
 increase indent	htmlarea	sl	Pove�aj zamik
+indent	tinymce	sl	Zamik
 india	common	sl	INDIJA
 indonesia	common	sl	INDONEZIJA
+insert	tinymce	sl	Vstavi
+insert 'return false'	common	sl	vstavi 'return false'
+insert / edit flash movie	tinymce	sl	Vstavi / uredi film Flash
+insert / edit horizontale rule	tinymce	sl	Vstavi / uredi vodoravno ravnilo
 insert _column before	htmlarea-ContextMenu	sl	Vstavi stolpe_c pred izbranim
 insert a new column after the current one	htmlarea-ContextMenu	sl	Vstavi nov stolpec za trenutnim
 insert a new column before the current one	htmlarea-ContextMenu	sl	Vstavi nov stolpec pred trenutnim
@@ -346,14 +419,24 @@ insert all %1 addresses of the %2 contacts in %3	common	sl	Vstavi vseh %1 naslov
 insert c_olumn after	htmlarea-ContextMenu	sl	Vstavi st_olpec za drugim
 insert cell after	htmlarea-TableOperations	sl	Vstavi celico za izbrano
 insert cell before	htmlarea-TableOperations	sl	Vstavi celico pred izbrano
-insert column after	htmlarea-TableOperations	sl	Vstavi stolpec za izbranim
-insert column before	htmlarea-TableOperations	sl	Vstavi stolpec pred izbranim
+insert column after	common	sl	Vstavi stolpec za izbranim
+insert column before	common	sl	Vstavi stolpec pred izbranim
+insert date	tinymce	sl	Vstavi datum
+insert emotion	tinymce	sl	Vstavi smeška
+insert file	tinymce	sl	Vstavi datoteko
 insert image	htmlarea	sl	Vstavi podobo
-insert row after	htmlarea-TableOperations	sl	Vstavi vrstico za izbranim
-insert row before	htmlarea-TableOperations	sl	Vstavi vrstico pred izbrano
+insert link to file	tinymce	sl	Vstavi povezavo do datoteke
+insert row after	common	sl	Vstavi vrstico za izbranim
+insert row before	common	sl	Vstavi vrstico pred izbrano
 insert table	htmlarea	sl	Vstavi tabelo
+insert time	tinymce	sl	Vstavi �as
 insert web link	htmlarea	sl	Vstavi spletno povezavo
+insert/edit image	tinymce	sl	Vstavi/uredi sliko
+insert/edit link	tinymce	sl	Vstavi/uredi povezavo
+insert/modify table	tinymce	sl	Vstavi/spremeni tabelo
+inserts a new table	tinymce	sl	Vstavi novo tabelo
 international	common	sl	Mednarodni
+invalid filename	common	sl	Napa�no ime datotke
 invalid ip address	common	sl	Napa�na IP številka
 invalid password	common	sl	Napa�no geslo
 iran, islamic republic of	common	sl	IRAN, ISLAMSKA REPUBLIKA
@@ -363,11 +446,13 @@ israel	common	sl	IZRAEL
 it has been more then %1 days since you changed your password	common	sl	Od zadnje menjave gesla je preteklo že ve� kot %1 dni.
 it is recommended that you run setup to upgrade your tables to the current version	common	sl	Priporo�amo, da poženete namestitev za nadgradnjo tabel na najnovejšo razli�ico.
 italic	common	sl	Leže�e
+italic.gif	common	sl	italic.gif
 italy	common	sl	ITALIJA
 jamaica	common	sl	JAMAJKA
 january	common	sl	Januar
 japan	common	sl	JAPONSKA
 jordan	common	sl	JORDANIJA
+js-popup	tinymce	sl	JS-Popup
 july	common	sl	Julij
 jun	common	sl	Jun
 june	common	sl	Junij
@@ -377,6 +462,7 @@ justify full	common	sl	Poravnaj obojestransko
 justify left	common	sl	Poravnaj levo
 justify right	common	sl	Poravnaj desno
 kazakstan	common	sl	KAZAHSTAN
+keep linebreaks	tinymce	sl	Obdrži prelome vrstic
 kenya	common	sl	KENIJA
 keywords	common	sl	Klju�ne  besede
 kiribati	common	sl	KIRIBATI
@@ -385,6 +471,7 @@ korea, republic of	common	sl	KOREJA, REPUBLIKA
 kuwait	common	sl	KUVAJT
 kyrgyzstan	common	sl	KIRGIZISTAN
 language	common	sl	Jezik
+language_direction_rtl	common	sl	language_direction_rtl
 lao peoples democratic republic	common	sl	LAOS
 last name	common	sl	Priimek
 last name of the user, eg. "%1"	common	sl	priimek uporabnika, npr. "%1"
@@ -394,7 +481,7 @@ latvia	common	sl	LATVIJA
 layout	htmlarea-TableOperations	sl	Postavitev
 ldap-mgr	common	sl	Upravitelj LDAP-a
 lebanon	common	sl	LIBANON
-left	htmlarea-TableOperations	sl	Levo
+left	common	sl	Levo
 lesotho	common	sl	LESOTO
 liberia	common	sl	LIBERIJA
 libyan arab jamahiriya	common	sl	LIBIJA
@@ -402,9 +489,11 @@ license	common	sl	Licenca
 liechtenstein	common	sl	LICHTENSTEIN
 line %1: '%2'<br><b>csv data does not match column-count of table %3 ==> ignored</b>	common	sl	Vrstica %1: '%2'<br><b>CSV podatki se ne ujemajo s Å¡tevilom stolpcev v tabeli %3==>zavrnjen</b>
 link points to:	htmlarea-ContextMenu	sl	Povezava kaže na:
+link url	tinymce	sl	URL povezava
 list	common	sl	Seznam
 list members	common	sl	Seznam �lanov
 lithuania	common	sl	LITVA
+loading files	tinymce	sl	Nalagam datoteke
 local	common	sl	Lokalno
 login	common	sl	Prijava
 loginid	common	sl	Uporabniško ime
@@ -422,17 +511,18 @@ mail domain, eg. "%1"	common	sl	E-poštna domena, npr. "%1"
 main category	common	sl	Glavna kategorija
 main screen	common	sl	Glavni zaslon
 maintainer	common	sl	Vzdrževalec
-make lin_k...	htmlarea-ContextMenu	sl	Ustvari povezavo...
+make lin_k...	htmlarea-ContextMenu	sl	Ustvari povezavo ...
+make window resizable	tinymce	sl	Ustvari okno s spremenljivo velikostjo
 malawi	common	sl	MALAVI
 malaysia	common	sl	MALEZIJA
 maldives	common	sl	MALDIVI
 mali	common	sl	MALI
 malta	common	sl	MALTA
-manual	common	sl	Priro�nik
 march	common	sl	Marec
 margin	htmlarea-TableOperations	sl	Meja
 marshall islands	common	sl	MARSHALLOVO OTOÄŒJE
 martinique	common	sl	MARTINIQUE
+match case	tinymce	sl	Razlikuj velike in male �rke
 mauritania	common	sl	MAVRETANIJA
 mauritius	common	sl	MAVRICIUS
 max number of icons in navbar	common	sl	Najve�je število ikon v orodni vrstici
@@ -441,10 +531,13 @@ mayotte	common	sl	MAYOTTE
 medium	common	sl	Srednje
 menu	common	sl	Meni
 merge cells	htmlarea-TableOperations	sl	Združi celice
+merge table cells	tinymce	sl	Spoji celice tabele
 message	common	sl	Sporo�ilo
 mexico	common	sl	MEHIKA
 micronesia, federated states of	common	sl	MIKRONEZIJA
 middle	htmlarea-TableOperations	sl	Sredina
+minute	common	sl	minuta
+mkdir failed.	tinymce	sl	Ustvarjanje mape ni uspelo.
 modify url	htmlarea-ContextMenu	sl	Spremeni URL
 moldova, republic of	common	sl	MOLDAVIJA
 monaco	common	sl	MONAKO
@@ -452,6 +545,7 @@ monday	common	sl	Ponedeljek
 mongolia	common	sl	MONGOLIJA
 montserrat	common	sl	MONSERRAT
 morocco	common	sl	MAROKO
+move	tinymce	sl	Premakni
 mozambique	common	sl	MOZAMBIK
 multiple	common	sl	mnogokraten
 myanmar	common	sl	MJANMAR
@@ -465,6 +559,11 @@ netherlands antilles	common	sl	NIZOZEMSKI ANTILI
 never	common	sl	Nikoli
 new caledonia	common	sl	NOVA KALEDONIJA
 new entry added sucessfully	common	sl	Nov vnos je uspešno dodan.
+new file name missing!	tinymce	sl	Manjka ime nove datoteke!
+new file name:	tinymce	sl	Ime nove datoteke:
+new folder	tinymce	sl	Nova mapa
+new folder name missing!	tinymce	sl	Manjka ime nove mape!
+new folder name:	tinymce	sl	Ime nove mape:
 new main category	common	sl	Nova glavna kategorija
 new value	common	sl	Nova vrednost
 new zealand	common	sl	NOVA ZELANDIJA
@@ -478,9 +577,17 @@ nigeria	common	sl	NIGERIJA
 niue	common	sl	NIUE
 no	common	sl	Ne
 no entries found, try again ...	common	sl	Ne najdem vnosov. Poskusite ponovno...
+no files...	tinymce	sl	Ni datotek ...
 no history for this record	common	sl	Ni zgodovine za ta zapis.
 no mispelled words found with the selected dictionary.	htmlarea-SpellChecker	sl	Z izbranim slovarjem ne najdem nobene zatipkane besede.
+no permission to create folder.	tinymce	sl	Nimate pravice ustvariti mape.
+no permission to delete file.	tinymce	sl	Nimate pravice brisanja datoteke.
+no permission to move files and folders.	tinymce	sl	Nimate pravice premikati datoteke ali mape.
+no permission to rename files and folders.	tinymce	sl	Nimate pravice preimenovati datoteke ali mape.
+no permission to upload.	tinymce	sl	Nimate pravice nalaganja.
 no rules	htmlarea-TableOperations	sl	Brez pravil
+no savant2 template directories were found in:	common	sl	Mape s predlogo Savant2 ni bilo mogo�e najti v:
+no shadow	tinymce	sl	Brez sence
 no sides	htmlarea-TableOperations	sl	Brez strani
 no subject	common	sl	Brez zadeve
 none	common	sl	Noben
@@ -492,6 +599,7 @@ not assigned	common	sl	ni dodeljeno
 note	common	sl	Opomba
 notes	common	sl	Opombe
 notify window	common	sl	Okno za opozorila
+notify your administrator to correct this situation	common	sl	Obvestite administratorja, da odpravi problem
 november	common	sl	November
 october	common	sl	Oktober
 ok	common	sl	V redu
@@ -499,15 +607,26 @@ old value	common	sl	Stara vrednost
 oman	common	sl	OMAN
 on *nix systems please type: %1	common	sl	Na *nix sistemih vnesite: %1
 on mouse over	common	sl	Ob prehodu z miško
+only files with extensions are permited, e.g. "imagefile.jpg".	tinymce	sl	Dovoljene so samo datoteke s kon�nicami, npr. "slika.jpg"
 only private	common	sl	samo zasebno
 only yours	common	sl	samo vaše
+open file in new window	tinymce	sl	Odpri datoteko v novem oknu
+open in new window	tinymce	sl	Odpri v novem oknu
+open in parent window / frame	tinymce	sl	Odpri v drugem oknu / okvirju
+open in the window	tinymce	sl	Odpri v novem oknu
+open in this window / frame	tinymce	sl	Odpri v tem oknu / okvirju
+open in top frame (replaces all frames)	tinymce	sl	Odpri v zgornjam okvirju (zamenja vse okvirje)
+open link in a new window	tinymce	sl	Odpri povezavo v novem oknu
+open link in the same window	tinymce	sl	Odpri povezavo v istem oknu
 open notify window	common	sl	Odpri okno z opozorilom
 open popup window	common	sl	Odpri pojavno okno
+open sidebox	common	sl	Odpri stranski meni
 opens this link in a new window	htmlarea-ContextMenu	sl	Ta povezava bo odprta v novem oknu
-ordered list	htmlarea	sl	Urejen seznam
+ordered list	common	sl	Urejen seznam
 original	common	sl	Izvirnik
 original word	htmlarea-SpellChecker	sl	Izvirna beseda
 other	common	sl	Ostalo
+outdent	tinymce	sl	Zamik
 overview	common	sl	Pregled
 owner	common	sl	Lastnik
 padding	htmlarea-TableOperations	sl	Odmik
@@ -524,9 +643,19 @@ parent category	common	sl	Nadrejena kategorija
 password	common	sl	Geslo
 password could not be changed	common	sl	Gesla ni mogo�e zamenjati.
 password has been updated	common	sl	Geslo je bilo zamenjano.
+password must contain at least %1 lowercase letters	common	sl	Geslo mora vsebovati najmanj %1 majhnih �rk
+password must contain at least %1 numbers	common	sl	Geslo mora vsebovati najmanj %1Å¡tevilk
+password must contain at least %1 special charactars	common	sl	Geslo mora vsebovati najmanj %1 posebnih znakov
+password must contain at least %1 uppercase letters	common	sl	Geslo mora vsebovati najmanj %1 velikih �rk
+password must have at least %1 characters	common	sl	Geslo mora imeti najmanj %1 znakov
 paste	htmlarea-ContextMenu	sl	Prilepi
+paste as plain text	tinymce	sl	Prilepi kot navadno besedilo
 paste from clipboard	htmlarea	sl	Prilepi z odložiš�a
+paste from word	tinymce	sl	Prilepi iz Worda
+paste table row after	tinymce	sl	Prilepi vsrtico tabele za
+paste table row before	tinymce	sl	Prilepi vsrtico tabele pred
 path	htmlarea	sl	Pot
+path not found.	tinymce	sl	Ne najdem poti.
 path to user and group files has to be outside of the webservers document-root!!!	common	sl	Pot do uporabniških in skupinskih datotek NE SME BITI podrejena korenski mapi spletiš�a.
 pattern for search in addressbook	common	sl	Vzorec za iskanje v adresarju
 pattern for search in calendar	common	sl	Vzorec za iskanje v koledarju
@@ -537,6 +666,7 @@ personal	common	sl	Zasebno
 peru	common	sl	PERU
 philippines	common	sl	FILIPINI
 phone number	common	sl	telefonska Å¡tevilka
+phpgwapi	common	sl	eGroupWare API
 pitcairn	common	sl	PITCAIRN
 pixels	htmlarea-TableOperations	sl	piksli
 please %1 by hand	common	sl	Prosim, ro�no %1
@@ -545,6 +675,8 @@ please confirm that you want to open this link	htmlarea-SpellChecker	sl	Potrdite
 please confirm that you want to remove this element:	htmlarea-ContextMenu	sl	Potrdite odstranitev elementa:
 please confirm that you want to unlink this element.	htmlarea-ContextMenu	sl	Potrdite odstranitev povezave elementa.
 please enter a name	common	sl	Vnesite ime!
+please enter the caption text	tinymce	sl	Vnesite besedilo naslova
+please insert a name for the target or choose another option.	tinymce	sl	Vnesite ime cilja ali izberite drugo možnost.
 please run setup to become current	common	sl	Poženite namestitev za posodobitev!
 please select	common	sl	Izberite
 please set your global preferences	common	sl	Vnesite splošne nastavitve.
@@ -554,18 +686,23 @@ please wait...	common	sl	Prosimo, po�akajte...
 please wait: changing dictionary to	htmlarea-SpellChecker	sl	Prosimo po�akajte: menjam slovar
 pliz weit ;-)	htmlarea-SpellChecker	sl	prosm po�akte ;-)
 poland	common	sl	POLJSKA
+popup url	tinymce	sl	URL pojavnega okna
 portugal	common	sl	PORTUGALSKA
+position (x/y)	tinymce	sl	Položaj (X/Y)
 postal	common	sl	Poštno
 powered by egroupware version %1	common	sl	Te�e na <a href="http://www.egroupware.org">eGroupware</a> razli�ica %1
+powered by phpgroupware version %1	common	sl	Te�e na phpGroupWare razli�ica %1
 preferences	common	sl	Nastavitve
 preferences for the idots template set	common	sl	Nastavitve predloge idots
 prev. month (hold for menu)	jscalendar	sl	Prejšnji mesec (držite tipko za meni)
 prev. year (hold for menu)	jscalendar	sl	Prejšnje leto (držite tipko za meni)
+preview	tinymce	sl	Predogled
 previous page	common	sl	Prejšnja stran
 primary style-sheet:	common	sl	Glavna CSS predloga
 print	common	sl	Natisni
 priority	common	sl	Prioriteta
 private	common	sl	Zasebno
+programs	common	sl	Programi
 project	common	sl	Projekt
 public	common	sl	javno
 puerto rico	common	sl	PORTORIKO
@@ -574,28 +711,37 @@ re-check	htmlarea-SpellChecker	sl	Preveri
 read	common	sl	Beri
 read this list of methods.	common	sl	Preberi ta seznam postopkov
 reading	common	sl	berem
+redo	tinymce	sl	Ponovno uveljavi
 redoes your last action	htmlarea	sl	Ponovi vaše zadnje dejanje
+refresh	tinymce	sl	Osveži
 reject	common	sl	Zavrni
+remove col	tinymce	sl	Odstrani stolpec
 remove selected accounts	common	sl	odstrani izbrane ra�une
+remove shortcut	common	sl	Odstrani bližnjico
 remove the	htmlarea-ContextMenu	sl	Odstrani
 remove this node from the document	htmlarea-ContextMenu	sl	Odstrani to to�ko iz dokumenta
 rename	common	sl	Preimenuj
-replace	htmlarea-SpellChecker	sl	Zamenjaj
+rename failed	tinymce	sl	Preimenuj polje
+replace	common	sl	Zamenjaj
 replace all	htmlarea-SpellChecker	sl	Zamenjaj vse
-replace with	htmlarea-SpellChecker	sl	Zamenjaj z
+replace with	common	sl	Zamenjaj z
+replace&nbsp;all	tinymce	sl	Zamenjaj vse
 returns a full list of accounts on the system.  warning: this is return can be quite large	common	sl	Vrne poln seznam uporabnikov sistema. Pozor: seznam je lahko precej dolg.
 returns an array of todo items	common	sl	Vrne niz opravil
 returns struct of users application access	common	sl	Vrne strukturo dostopanja uporabnikov do programa
 reunion	common	sl	REUNION
 revert	htmlarea-SpellChecker	sl	Povrni
-right	htmlarea-TableOperations	sl	Desno
+right	common	sl	Desno
+rmdir failed.	tinymce	sl	Napaka pri brisanju mape.
 ro_w properties...	htmlarea-ContextMenu	sl	Lastnosti vrstice...
 romania	common	sl	ROMUNIJA
 row properties	htmlarea-TableOperations	sl	Lastnosti vrstice
+rows	tinymce	sl	Vrstice
 rules	htmlarea-TableOperations	sl	Pravila
 rules will appear between all rows and columns	htmlarea-TableOperations	sl	Pravila se bodo pojavila med vsemi vrsticami in stolpci
 rules will appear between columns only	htmlarea-TableOperations	sl	Pravila se bodo pojavila samo med stolpci
 rules will appear between rows only	htmlarea-TableOperations	sl	Pravila se bodo pojavila samo med vrsticami
+run spell checking	tinymce	sl	Zaženi preverjanje �rkovanja
 russian federation	common	sl	RUSKA FEDERACIJA
 rwanda	common	sl	RUANDA
 saint helena	common	sl	SVETA HELENA
@@ -613,8 +759,10 @@ search	common	sl	Iš�i
 search %1 '%2'	common	sl	Iš�i %1 '%2'
 search or select accounts	common	sl	Iš�i ali izberi uporabniške ra�une
 search or select multiple accounts	common	sl	iš�i ali izberi ve� ra�unov hkrati
+second	common	sl	sekunda
 section	common	sl	Odsek
 select	common	sl	Izberi
+select all	tinymce	sl	Izberi vse
 select all %1 %2 for %3	common	sl	Izberi vse %1 %2 za %3
 select category	common	sl	Izberi kategorijo
 select date	common	sl	Izberi datum
@@ -622,6 +770,8 @@ select group	common	sl	Izberi skupino
 select home email address	common	sl	Izberi doma�i E-naslov
 select multiple accounts	common	sl	izberi ve� ra�unov hkrati
 select one	common	sl	Izberi
+select the default height for the application windows	common	sl	Izberite privzeto višino okna aplikacij
+select the default width for the application windows	common	sl	Izberite privzeto Å¡irino okna aplikacij
 select user	common	sl	Izberi uporabnika
 select work email address	common	sl	Izberi službeni E-naslov
 selection	common	sl	Izbor
@@ -629,26 +779,38 @@ send	common	sl	Pošlji
 senegal	common	sl	SENEGAL
 september	common	sl	September
 server %1 has been added	common	sl	Dodan je bil strežnik %1.
+server answered. processing response...	common	sl	Strežnik je odgovoril. Obdelujem odgovor ...
+server contacted. waiting for response...	common	sl	Povezava s strežnikom je bila vzpostavljena. Čakam na odgovor ...
 server name	common	sl	Ime strežnika
 session has been killed	common	sl	Seja je bila prekinjena.
 setup	common	sl	Namestitev
 setup main menu	common	sl	Glavni meni namestitve
-setup/config admin login	common	sl	Oskrbnikova prijava v Nastavitve/Konfiguracijo
 seychelles	common	sl	SEJEÅ ELI
 show all	common	sl	prikaži vse
 show all categorys	common	sl	Pokaži vse kategorije
+show clock?	common	sl	Prikažem uro?
+show home and logout button in main application bar?	common	sl	Prikažem gumba Domov in Odjavi v glavni vrstici aplikacije?
+show locationbar	tinymce	sl	Pokaži vrstico z lokacijami
+show logo's on the desktop.	common	sl	Prikaži logotip na namizju.
 show menu	common	sl	Pokaži meni
+show menubar	tinymce	sl	Pokaži menijsko vrstico
 show page generation time	common	sl	Pokaži �as generiranja strani
 show page generation time on the bottom of the page?	common	sl	Pokažem �as generiranja strani na dnu?
+show page generation time?	common	sl	Prikažem �as ustvarjanja strani?
+show scrollbars	tinymce	sl	Prikaži drsnike
+show statusbar	tinymce	sl	Prikaži statusno vrstico
 show the image properties dialog	htmlarea-ContextMenu	sl	Prikaži lastnosti slike
+show the logo's of egroupware and x-desktop on the desktop.	common	sl	Prikaži logotipa eGroupware in x-desktop na namizju.
 show the table cell properties dialog	htmlarea-ContextMenu	sl	Prikaži lastnosti celice v tabeli
 show the table properties dialog	htmlarea-ContextMenu	sl	Prikaži lastnosti tabele
 show the table row properties dialog	htmlarea-ContextMenu	sl	Prikaži lastnosti vrstice v tabeli
+show toolbars	tinymce	sl	Prikaži orodjarne
 show_more_apps	common	sl	pokaži ve� aplikacij
 showing %1	common	sl	prikazanih %1
 showing %1 - %2 of %3	common	sl	prikazani %1 - %2 od %3
 sierra leone	common	sl	SIERRA LEONE
 singapore	common	sl	SINGAPUR
+size	tinymce	sl	Velikost
 slovakia	common	sl	SLOVAÅ KA
 slovenia	common	sl	SLOVENIJA
 solomon islands	common	sl	SOLOMONOVO OTOÄŒJE
@@ -664,12 +826,16 @@ spell-check	htmlarea-SpellChecker	sl	ÄŒrkuj
 split cell	htmlarea-TableOperations	sl	Razdeli celico
 split column	htmlarea-TableOperations	sl	Razdeli stolpec
 split row	htmlarea-TableOperations	sl	Razdeli vrstico
+split table cells	tinymce	sl	Razdeli celice tabele
 sri lanka	common	sl	Å RI LANKA
 start date	common	sl	Za�etni datum
 start time	common	sl	Za�etni �as
 start with	common	sl	za�ni z
+starting up...	common	sl	Zaganjam ...
 status	common	sl	Status
+stretched	common	sl	raztegnjeno
 strikethrough	htmlarea	sl	Pre�rtano
+striketrough	tinymce	sl	Pre�rtano
 style [css]	htmlarea-TableOperations	sl	Stil [CSS]
 subject	common	sl	Zadeva
 submit	common	sl	Pošlji
@@ -686,10 +852,13 @@ swaziland	common	sl	SVAZILAND
 sweden	common	sl	Å VEDSKA
 switzerland	common	sl	Å VICA
 syrian arab republic	common	sl	SIRIJA
-table properties	htmlarea-TableOperations	sl	Lastnosti tabele
+table cell properties	tinymce	sl	Lastnosti celice tabele
+table properties	common	sl	Lastnosti tabele
+table row properties	tinymce	sl	Lastnosti vrstice tabele
 taiwan	common	sl	TAJVAN
 tajikistan	common	sl	TADŽIKISTAN
 tanzania, united republic of	common	sl	TANZANIJA
+target	tinymce	sl	Cilj
 text align	htmlarea-TableOperations	sl	Poravnaj besedilo
 text color:	common	sl	Barva besedila:
 thailand	common	sl	TAJSKA
@@ -701,10 +870,13 @@ the left-hand side only	htmlarea-TableOperations	sl	Samo na levi strani
 the mail server returned	common	sl	Poštni strežnik je vrnil
 the right and left sides only	htmlarea-TableOperations	sl	Samo ne levi in desni strani
 the right-hand side only	htmlarea-TableOperations	sl	Samo na desni strani
+the search has been compleated. the search string could not be found.	tinymce	sl	Iskanje kon�ano. Iskani niz ni bil najden.
 the top and bottom sides only	htmlarea-TableOperations	sl	Samo zgoraj in spodaj
 the top side only	htmlarea-TableOperations	sl	Samo zgoraj
 this application is current	common	sl	Aplikacija je najnovejša
 this application requires an upgrade	common	sl	Aplikacijo je potrebno nadgraditi
+this is just a template button	tinymce	sl	To je samo gumb predloge
+this is just a template popup	tinymce	sl	To je samo pojavno okno predloge
 this name has been used already	common	sl	To ime je že uporabljeno!
 this will drop changes and quit spell checker.  please confirm.	htmlarea-SpellChecker	sl	To bo zavrglo spremembe in ustavilo �rkovalnik. Prosim potrdite.
 thursday	common	sl	ÄŒetrtek
@@ -719,13 +891,15 @@ to go back to the msg list, click <a href= %1 >here</a>	common	sl	Da pridete naz
 today	common	sl	Danes
 todays date, eg. "%1"	common	sl	današnji datum, npr. "%1"
 toggle first day of week	jscalendar	sl	Zamenjajte prvi dan v tednu
+toggle fullscreen mode	tinymce	sl	Preklopi celozaslonski na�in
 toggle html source	htmlarea	sl	Prikaži HTML kodo
 togo	common	sl	TOGO
 tokelau	common	sl	TOKELAU
 tonga	common	sl	TONGA
 too many unsucessful attempts to login: %1 for the user '%2', %3 for the ip %4	common	sl	Preve� neuspešnih poskusov prijave: %1 za uporabnika %2, %3 za IP %4.
-top	htmlarea-TableOperations	sl	Vrh
+top	common	sl	Vrh
 total	common	sl	Skupaj
+transparant bg for the icons?	common	sl	Prosojno ozadnje ikon?
 trinidad and tobago	common	sl	TRINIDAD IN TOBAGO
 tuesday	common	sl	Torek
 tunisia	common	sl	TUNIZIJA
@@ -733,19 +907,30 @@ turkey	common	sl	TURÄŒIJA
 turkmenistan	common	sl	TURKMENISTAN
 turks and caicos islands	common	sl	TURKS IN CAICOS
 tuvalu	common	sl	TUVALU
+type	common	sl	Vrsta
 uganda	common	sl	UGANDA
 ukraine	common	sl	UKRAJINA
-underline	htmlarea	sl	Pod�rtano
+underline	common	sl	Pod�rtano
+underline.gif	common	sl	underline.gif
+undo	tinymce	sl	Razveljavi
 undoes your last action	htmlarea	sl	Prekli�e vaše zadnje dejanje
 united arab emirates	common	sl	ZDRUŽENI ARABSKI EMIRATI
 united kingdom	common	sl	VELIKA BRITANIJA
 united states	common	sl	ZDRUŽENE DRŽAVE
 united states minor outlying islands	common	sl	CELINSKE ZDRUŽENE DRŽAVE
 unknown	common	sl	Neznano
+unlink	tinymce	sl	Prekini povezavo
+unlink failed.	tinymce	sl	Odstranjevanje povezave ni uspelo.
 unlink the current element	htmlarea-ContextMenu	sl	Odstrani povezavo trenutnega elementa
+unordered list	tinymce	sl	Nerazvrš�en seznam
 unset color	htmlarea-TableOperations	sl	Odstrani barvo
+up	tinymce	sl	Gor
 update	common	sl	Obnovi
+update the clock per minute or per second	common	sl	Posodobi uro vsako minuto ali vsako sekundo
+upload	common	sl	Naloži
+upload directory does not exist, or is not writeable by webserver	common	sl	Mapa za prenos ne obstaja ali pa ni zapisljiva s strani spletnega strežnika
 upload image	htmlarea-UploadImage	sl	Prenesi sliko
+uploading...	tinymce	sl	Nalagam ...
 upper latin letters	htmlarea-ListType	sl	Velike latinske �rke
 upper roman numbers	htmlarea-ListType	sl	Velike rimske Å¡tevilke
 url	common	sl	URL
@@ -754,6 +939,8 @@ use button to search for	common	sl	Uporabi gumb za iskanje
 use button to search for address	common	sl	Uporabi gumb za iskanje naslova
 use button to search for calendarevent	common	sl	Uporabi gumb za iskanje dogodka v koledarju
 use button to search for project	common	sl	Uporabi gumb za iskanje projekta
+use ctrl and/or shift to select multiple items.	tinymce	sl	Za ve�kratno izbiro uporabite tipko Ctrl in/ali Shift
+use ctrl+v on your keyboard to paste the text into the window.	tinymce	sl	Uporabite Ctrl+V da prilepite besedil v okno.
 user	common	sl	Uporabnik
 user accounts	common	sl	uporabniški ra�un
 user groups	common	sl	uporabniška skupina
@@ -765,18 +952,25 @@ vanuatu	common	sl	VANUATU
 venezuela	common	sl	VENEZUELA
 version	common	sl	Razli�ica
 vertical align	htmlarea-TableOperations	sl	Vertikalna poravnava
+vertical alignment	tinymce	sl	Navpi�na poravnava
 viet nam	common	sl	VIETNAM
 view	common	sl	Pregled
 virgin islands, british	common	sl	DEVIÅ KI OTOKI (BRITANSKI)
 virgin islands, u.s.	common	sl	DEVIÅ KI OTOKI (ZDA)
 wallis and futuna	common	sl	WALLIS IN FUTUNA
+warning!\n renaming or moving folders and files will break existing links in your documents. continue?	tinymce	sl	Opozorilo!\n Preimenovanje ali premikanje map bo pokvarilo povezave v vaših dokumentih. Nadaljujem?
 wednesday	common	sl	Sreda
 welcome	common	sl	Dobrodošli!
 western sahara	common	sl	ZAHODNA SAHARA
+what color should all the blank space on the desktop have	common	sl	Kakšne barve naj bo prazen prostor na namizju?
+what style would you like the image to have?	common	sl	Kakšen slog želite za sliko?
+when you say yes the home and logout buttons are presented as applications in the main top applcation bar.	common	sl	ÄŒe odgovorite z Da, bosta gumba Domov in Odjavi v orodni vrstici aplikacij.
 which groups	common	sl	Katere skupine
-width	htmlarea-TableOperations	sl	Å irina
+width	common	sl	Å irina
+window name	tinymce	sl	Ime okna
 wk	jscalendar	sl	ted
 work email	common	sl	službeni E-naslov
+would you like to display the page generation time at the bottom of every window?	common	sl	Želite na dnu vsakega okna prikazati �as ustvarjanja strani?
 writing	common	sl	zapisujem
 written by:	common	sl	Napisal:
 year	common	sl	Leto
@@ -784,7 +978,6 @@ yemen	common	sl	JEMEN
 yes	common	sl	Da
 you are in text mode.  use the [<>] button to switch back to wysiwig.	htmlarea	sl	Ste v besedilnem na�inu. Uporabite ikono [<>] za preklop nazaj v na�in WYSIWYG.
 you are required to change your password during your first login	common	sl	Ob prvi prijavi morate zamenjati geslo!
-you are running a newer version of egroupware than your database is setup for	common	sl	Uporabljate novejšo razli�ico egroupware, kot je nameš�ena v bazi podatkov.
 you have been successfully logged out	login	sl	Bili ste uspešno odjavljeni.
 you have not entered a title	common	sl	Niste vnesli naziva
 you have not entered a valid date	common	sl	Niste vnesli veljavnega datuma
@@ -793,6 +986,7 @@ you have not entered participants	common	sl	Niste vnesli udeležencev
 you have selected an invalid date	common	sl	Izbrali ste napa�en datum
 you have selected an invalid main category	common	sl	Izbrali ste napa�no glavno kategorijo
 you have successfully logged out	common	sl	Bili ste uspešno odjavljeni
+you must enter the url	tinymce	sl	Vnesti morate URL
 you need to add the webserver user '%1' to the group '%2'.	common	sl	Uporabnika '%1' je potrebno dodati skupini '%2'.
 your message could <b>not</b> be sent!<br>	common	sl	Vaše sporo�ilo <b>NI<b> bilo poslano! <br>
 your message has been sent	common	sl	Vaše sporo�ilo je bilo poslano
@@ -803,3 +997,4 @@ your settings have been updated	common	sl	Vaše nastavitve so bile posodobljene
 yugoslavia	common	sl	JUGOSLAVIJA
 zambia	common	sl	ZAMBIJA
 zimbabwe	common	sl	ZIMBABVE
+zoom	common	sl	Zoom
diff --git a/phpgwapi/setup/phpgw_zh-tw.lang b/phpgwapi/setup/phpgw_zh-tw.lang
index 668904b597..506e038488 100644
--- a/phpgwapi/setup/phpgw_zh-tw.lang
+++ b/phpgwapi/setup/phpgw_zh-tw.lang
@@ -966,7 +966,7 @@ vertical align	htmlarea-TableOperations	zh-tw	垂直�齊
 vertical alignment	tinymce	zh-tw	垂直�齊
 viet nam	common	zh-tw	VIET NAM
 view	common	zh-tw	檢視
-virgin islands, british	common	zh-tw	VIRGIN ISLANDS, BRITISH
+virgin islands, british	common	zh-tw	英屬�京群島
 virgin islands, u.s.	common	zh-tw	VIRGIN ISLANDS, U.S.
 wallis and futuna	common	zh-tw	WALLIS AND FUTUNA
 warning!\n renaming or moving folders and files will break existing links in your documents. continue?	tinymce	zh-tw	警告�\n修改/移動資料夾與檔案會造�文件中的連�失效，確定繼續？
@@ -979,7 +979,7 @@ when you say yes the home and logout buttons are presented as applications in th
 which groups	common	zh-tw	哪個群組
 width	common	zh-tw	寬度
 window name	tinymce	zh-tw	視窗�稱
-wk	jscalendar	zh-tw	星期
+wk	jscalendar	zh-tw	週
 work email	common	zh-tw	工作信箱
 would you like to display the page generation time at the bottom of every window?	common	zh-tw	您是��在�個視窗的最下方顯示產生時間？
 writing	common	zh-tw	寫入中
diff --git a/timesheet/setup/phpgw_es-es.lang b/timesheet/setup/phpgw_es-es.lang
index 0d3e4dec22..507a51b083 100644
--- a/timesheet/setup/phpgw_es-es.lang
+++ b/timesheet/setup/phpgw_es-es.lang
@@ -7,6 +7,7 @@ create new links	timesheet	es-es	Crear enlaces nuevos
 delete this entry	timesheet	es-es	Borrar esta entrada
 edit this entry	timesheet	es-es	Editar esta entrada
 empty if identical to duration	timesheet	es-es	Vacío si es idéntico a la duración
+end	timesheet	es-es	Fin
 entry deleted	timesheet	es-es	Se ha borrado la entrada
 entry saved	timesheet	es-es	Se ha guardado la entrada
 error deleting the entry!!!	timesheet	es-es	Error al borrar la entrada
@@ -28,11 +29,14 @@ saves the changes made	timesheet	es-es	Guardar los cambios realizados
 saves this entry and add a new one	timesheet	es-es	Guarda esta entrada y añade una nueva
 select a price	timesheet	es-es	Seleccionar un precio
 select a project	timesheet	es-es	Seleccionar un proyecto
+start	timesheet	es-es	Inicio
+sum %1:	timesheet	es-es	Suma %1:
 this month	timesheet	es-es	Este mes
 this week	timesheet	es-es	Esta semana
 this year	timesheet	es-es	Este año
 timesheet	common	es-es	Hoja de presencia
 unitprice	timesheet	es-es	Precio por unidad
 view this entry	timesheet	es-es	Ver esta entrada
+week	timesheet	es-es	Semana
 yesterday	timesheet	es-es	Ayer
 your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database.	timesheet	es-es	La base de datos NO está actualizada (%1 vs %2). Por favor, ejecute %3setup%4 para actualizar la base de datos.
diff --git a/timesheet/setup/phpgw_zh-tw.lang b/timesheet/setup/phpgw_zh-tw.lang
index 7076371e79..2bf976f5b8 100644
--- a/timesheet/setup/phpgw_zh-tw.lang
+++ b/timesheet/setup/phpgw_zh-tw.lang
@@ -7,6 +7,7 @@ create new links	timesheet	zh-tw	建立新連�
 delete this entry	timesheet	zh-tw	刪除這筆資料
 edit this entry	timesheet	zh-tw	編輯這筆資料
 empty if identical to duration	timesheet	zh-tw	如果期間相�就��空白
+end	timesheet	zh-tw	��
 entry deleted	timesheet	zh-tw	資料刪除了
 entry saved	timesheet	zh-tw	資料儲存了
 error deleting the entry!!!	timesheet	zh-tw	資料刪除時發生錯誤�
@@ -28,11 +29,14 @@ saves the changes made	timesheet	zh-tw	儲存異動
 saves this entry and add a new one	timesheet	zh-tw	儲存這筆資料後新增�一個
 select a price	timesheet	zh-tw	�擇價格
 select a project	timesheet	zh-tw	�擇專案
+start	timesheet	zh-tw	開始
+sum %1:	timesheet	zh-tw	%1 �計：
 this month	timesheet	zh-tw	這個月
 this week	timesheet	zh-tw	這星期
 this year	timesheet	zh-tw	今年
 timesheet	common	zh-tw	時間表
 unitprice	timesheet	zh-tw	單�價格
 view this entry	timesheet	zh-tw	檢視這筆資料
+week	timesheet	zh-tw	週
 yesterday	timesheet	zh-tw	昨天
 your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database.	timesheet	zh-tw	您的資料庫�是最新版本（%1 vs. %2），請執行 %3安�程�%4來更新您的資料庫。