diff --git a/addressbook/setup/phpgw_sk.lang b/addressbook/setup/phpgw_sk.lang
index bd717d6371..ffa337ecce 100644
--- a/addressbook/setup/phpgw_sk.lang
+++ b/addressbook/setup/phpgw_sk.lang
@@ -1,9 +1,14 @@
+%1 contact(s) %2	addressbook	sk	%1 kontakt(ov) %2
+%1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	sk	%1 kontakt(ov) %2, %3 sa nepodarilov z dôvodu nedostatočných práv !!!
 %1 records imported	addressbook	sk	Naimportovaných %1 záznamov
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	sk	prečítaných %1 záznamov (zatiaľ neimportované, môžete se vrátit %2späť%3 a odznačit Test importu)
+%1 starts with '%2'	addressbook	sk	%1 začína na '%2'
 (e.g. 1969)	addressbook	sk	(napr. 1969)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	sk	<b>Nevybrali ste žiadny typ prevodu.</b> Prosím, vyberte ho zo zoznamu.
 @-eval() is only availible to admins!!!	addressbook	sk	Iba správci môžu použiť @-eval() !!!
+accounts	addressbook	sk	Účty
 actions	addressbook	sk	Akcie
+add a new contact	addressbook	sk	Pridať nový kontakt
 add a single entry by passing the fields.	addressbook	sk	Pridaj záznam zadaním položiek.
 add custom field	addressbook	sk	Pridaj používateľskú položku
 address book	common	sk	Adresár
@@ -13,19 +18,23 @@ address line 2	addressbook	sk	Adresa riadok 2
 address line 3	addressbook	sk	Adresa riadok 3
 address type	addressbook	sk	Typ adresy
 addressbook	common	sk	Adresár
+addressbook menu	addressbook	sk	Menu Adresára
 addressbook preferences	addressbook	sk	Predvoľby Adresára
+addressbook the contact should be saved to	addressbook	sk	Adresár -tento kontakt uložiť do
 addressbook-fieldname	addressbook	sk	Pole adresára
 addvcard	addressbook	sk	Pridaj vizitku VCard
 advanced search	addressbook	sk	Rozšírené hľadanie
 alt. csv import	addressbook	sk	Alternatívny import z CSV
+always	addressbook	sk	vždy
+apply the action on the whole selection, not only the shown contacts!!!	addressbook	sk	Vykonať túto akciu na celý výber, NIE iba na zobrazené kontakty!!!
 are you shure you want to delete this contact?	addressbook	sk	Naozaj chcete zmazať tento kontakt?
 are you sure you want to delete this field?	addressbook	sk	Naozaj mám zmazať túto položku?
-bbs phone	addressbook	sk	Číslo na BBS
+assistent	addressbook	sk	Pomocník
 birthday	common	sk	Narodeniny
 birthdays	common	sk	Narodeniny
 blank	addressbook	sk	Prázdne
 business	common	sk	Zamestnanie
-business address type	addressbook	sk	Typ adresy do zamestnania
+business address	addressbook	sk	Adresa do zamestnania
 business city	addressbook	sk	Mesto
 business country	addressbook	sk	Krajina
 business email	addressbook	sk	E-mail do zamestnania
@@ -38,19 +47,22 @@ business zip code	addressbook	sk	PS
 car phone	addressbook	sk	Telefón do auta
 cell phone	addressbook	sk	Mobil
 charset of file	addressbook	sk	Znaková sada súboru
-choose an icon for this contact type	addressbook	sk	Zvoľte ikonu pre tento typ kontaktu
-chosse an etemplate for this contact type	addressbook	sk	Zvoľte eŠablónu pre tento typ kontaktu
+check all	addressbook	sk	Označ všetko
+choose an icon for this contact type	admin	sk	Zvoľte ikonu pre tento typ kontaktu
+chosse an etemplate for this contact type	admin	sk	Zvoľte eŠablónu pre tento typ kontaktu
 city	common	sk	Mesto
 company	common	sk	Spoločnosť
-company name	common	sk	Firma
+company name	addressbook	sk	Firma
 configuration	common	sk	Nastavenia
 contact	common	sk	Kontakt
 contact application	admin	sk	Kontakty
+contact deleted !!!	addressbook	sk	Kontakt vymazaný !!!
 contact saved	addressbook	sk	Kontakt bol uložený
 contact settings	admin	sk	Nastavenia kontaktov
 copied by %1, from record #%2.	addressbook	sk	Skopíroval %1 od záznamu č.%2
 country	common	sk	Krajina
 create new links	addressbook	sk	Vytvoriť nové odkazy
+created	addressbook	sk	Vytvorené
 csv-fieldname	addressbook	sk	Pole v CSV
 csv-filename	addressbook	sk	CSV súbor
 custom	addressbook	sk	Vlastné
@@ -58,7 +70,12 @@ custom fields	addressbook	sk	Vlastn
 debug output in browser	addressbook	sk	Ladiací výstup v prehliadači
 default filter	addressbook	sk	Štandardný filter
 delete a single entry by passing the id.	addressbook	sk	Zmaž záznam zadaním id.
+delete this contact	addressbook	sk	Zmazať tento kontakt
+deleted	addressbook	sk	Zmazané
+deletes the photo	addressbook	sk	Zmaže obrázok
 department	common	sk	Oddelenie
+displays a remider for birthdays happening today or tomorrow on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	sk	Zobrazí na úvodnej stránke pripomienku ku každým narodeninám, ktoré majú nastať dnes alebo zajtra. To je tá stránka, ktorá sa zobrazí keď sa prihlásite do eGroupWare, alebo keď kliknete na ikonu Domovskej stránky v eGroupWare.
+do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	sk	Chcete súkromný adresár, ktorý ostatní používatelia nemôžu prezerať? Vy prideľujete prístupové oprávnenia ku svojmu osobnému Adresáru.
 do your really want to delete this contact?	addressbook	sk	Naozaj chcete zmazať tento kontakt?
 doesn't matter	addressbook	sk	nezáleží
 domestic	addressbook	sk	Domáci
@@ -67,15 +84,19 @@ download export file (uncheck to debug output in browser)	addressbook	sk	Ulo
 download this contact as vcard file	addressbook	sk	stiahnuť tento kontakt ak súbor vCard
 edit custom field	addressbook	sk	Oprav vlastnú položku
 edit custom fields	admin	sk	Oprav vlastné položky
+edit extra account-data in the addressbook	addressbook	sk	Upraviť extra dáta účtu v Adresári
 edit phonenumbers -	addressbook	sk	Upraviť telefónne čísla -
 email & internet	addressbook	sk	Email & Internet
 empty for all	addressbook	sk	prázdne znamená všetko
+enable an extra private addressbook	addressbook	sk	Zapnúť extra súkromný adresár
 enter the path to the exported file here	addressbook	sk	Zadajte cestu k exportovanému súboru
 existing links	addressbook	sk	Existujúce odkazy
 export	addressbook	sk	export
+export as vcard	addressbook	sk	Exportovať ako VCard
 export contacts	addressbook	sk	Export kontaktov
 export file name	addressbook	sk	Názov súboru exportu
 export from addressbook	addressbook	sk	Export z Adresára
+exported	addressbook	sk	Exportované
 extra	addressbook	sk	Extra
 fax	addressbook	sk	Fax
 fax number	common	sk	Číslo faxu
@@ -88,7 +109,8 @@ full name	addressbook	sk	Cel
 geo	addressbook	sk	GEO
 global categories	addressbook	sk	Globálne kategórie
 grant addressbook access	common	sk	Deleguj práva pre přístup k Adresáru
-home address type	addressbook	sk	Typ adresy domov
+group %1	addressbook	sk	Skupina %1
+home address	addressbook	sk	Adresa -domov
 home city	addressbook	sk	Mesto - domov
 home country	addressbook	sk	Krajina - domov
 home email	addressbook	sk	E-mail - domov
@@ -130,11 +152,13 @@ mobile	addressbook	sk	Mobil
 mobile phone	addressbook	sk	Mobil
 modem phone	addressbook	sk	Číslo na modem
 more ...	addressbook	sk	Viac ...
+moved	addressbook	sk	Presunuté
 multiple vcard	addressbook	sk	Viacero vizitiek VCard
 no vcard	addressbook	sk	Žiadna vizitka
 number	addressbook	sk	Číslo
 number of records to read (%1)	addressbook	sk	Počet záznamov k načítaniu (%1)
-options for type	addressbook	sk	Voľby pre tento typ
+only if there is content	addressbook	sk	Iba ak je tam nejaký obsah
+options for type	admin	sk	Voľby pre tento typ
 organisation	addressbook	sk	organizácia
 other number	addressbook	sk	Telefón - ostatné
 other phone	addressbook	sk	Iný telefón
@@ -142,7 +166,9 @@ pager	common	sk	Pager
 parcel	addressbook	sk	Parcela
 phone number	common	sk	Telefónne číslo
 phone numbers	common	sk	Telefónne čísla
+photo	addressbook	sk	Fotografia
 please enter a name for that field !	addressbook	sk	Prosím zadajte meno pre túto položku !
+please select only one category	addressbook	sk	Prosím, vyberte iba jednu kategóriu
 postal	common	sk	Poštové
 pref	addressbook	sk	Titul
 prefix	addressbook	sk	Titul
@@ -153,12 +179,17 @@ read a list of entries.	addressbook	sk	Na
 read a single entry by passing the id and fieldlist.	addressbook	sk	Načítaj záznam zadaním id a zoznamu položek.
 record access	addressbook	sk	Prístup k záznamu
 record owner	addressbook	sk	Vlastník záznamu
-retrieve contacts	admin	sk	načítaj kontakty
+room	addressbook	sk	Miestnosť
+search for '%1'	addressbook	sk	Hľadať '%1'
+select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	sk	Vyberte obrázok jpeg orientovaný na výšku. Bude prispôsobený na výškový rozmer 60 pixlov.
+select addressbook type	addressbook	sk	Vyberte typ Adresára
 select all	addressbook	sk	Označiť všetko
+select an action or addressbook to move to	addressbook	sk	Vyberte akciu alebo Adresár kam sa presunúť
 select the type of conversion	addressbook	sk	Vyberte typ prevodu
 select the type of conversion:	addressbook	sk	Vyberte typ prevodu:
-select where you want to store	admin	sk	Vyberte miesto pre uloženie
+select where you want to store / retrieve contacts	admin	sk	Vyberte, kde chcete ukladať / získavať kontakty
 show	addressbook	sk	Ukázať
+show a column for %1	addressbook	sk	Zobraziť stĺpec pre %1
 show birthday reminders on main screen	addressbook	sk	Pripomínať narodeniny na hlavnej stránke
 something went wrong by deleting %1	addressbook	sk	Niečo sa nepodarilo pri mazaní %1
 something went wrong by deleting this contact	addressbook	sk	Niečo sa nepodarilo pri mazaní kontaktu
@@ -174,25 +205,30 @@ test import (show importable records <u>only</u> in browser)	addressbook	sk	Otes
 that field name has been used already !	addressbook	sk	Takýto názov položky už existuje!
 this person's first name was not in the address book.	addressbook	sk	Takéto meno sa v adresári nenachádza.
 this person's last name was not in the address book.	addressbook	sk	Takéto priezvisko sa v adresári nenachádza.
+timezone	addressbook	sk	Časové pásmo
 to many might exceed your execution-time-limit	addressbook	sk	príliš veľa záznamov môže spôsobiť prekročenie povoleného časového limitu
 today is %1's birthday!	common	sk	Dnes má narodeniny %1!
 tomorrow is %1's birthday.	common	sk	Zajtra má narodeniny %1.
 translation	addressbook	sk	Preklad
 update a single entry by passing the fields.	addressbook	sk	Zmeniť jednotlivý záznam zadaním položiek.
+upload or delete the photo	addressbook	sk	Nahrať alebo vymazať túto fotku
 use country list	addressbook	sk	Použiť zoznam krajín
 vcard	common	sk	Vizitka VCard
 vcards require a first name entry.	addressbook	sk	Vizitky potrebujú zadané krstné meno.
 vcards require a last name entry.	addressbook	sk	Vizitky potřebujú zadané priezvisko.
 video phone	addressbook	sk	Video telefón
-voice phone	addressbook	sk	Voice telefón
 warning!! ldap is valid only if you are not using contacts for accounts storage!	admin	sk	VAROVANIE!! LDAP sa dá použiť jedine ak NEPOUŽÍVATE kontakty na uchovanie používateľských účtov!
 warning: all contacts found will be deleted!	addressbook	sk	POZOR: Všetky kontakty budú zmazané!
+when should the contacts list display that colum. "only if there is content" hides the column, unless there is some content in the view.	addressbook	sk	Kedy má zoznam kontaktov zobrazovať tento stĺpec. "Iba ak je tam nejaký obsah" skryje stĺpec v prípade, ak v zobrazení nie je nejaký obsah.
+whole selection	addressbook	sk	celý výber
 work phone	addressbook	sk	Telefón do zamestnania
+write (update or add) a single entry by passing the fields.	addressbook	sk	Zapísať (aktualizovať alebo pridať) jednotlivú položku zadaním polí.
 you are not permitted to delete contact %1	addressbook	sk	Nemáte oprávnenie zmazať kontakt %1
 you are not permittet to delete this contact	addressbook	sk	Nemáte oprávnenie zmazať tento kontakt
 you are not permittet to edit this contact	addressbook	sk	Nemáte oprávnenie upraviť tento kontakt
 you are not permittet to view this contact	addressbook	sk	Nemáte oprávnenie vidieť tento kontakt
 you must select a vcard. (*.vcf)	addressbook	sk	Musíte vybrať VCard (*.vcf)
 you must select at least 1 column to display	addressbook	sk	Musíte vybrať aspoň 1 stĺpec k zobrazeniu.
+you need to select some contacts first	addressbook	sk	Najprv musíte vybrať nejaké kontakty.
 zip code	common	sk	PSČ
 zip_note	addressbook	sk	<p><b>Poznámka:</b>Súbor môže byť archív formátu zip s kolekciou súborov .csv, .vcf alebo .ldif. V žiadnom prípade pri importe nemiešajte rôzne typy súborov.
diff --git a/addressbook/setup/phpgw_zh-tw.lang b/addressbook/setup/phpgw_zh-tw.lang
index 51123cedc4..901c995138 100644
--- a/addressbook/setup/phpgw_zh-tw.lang
+++ b/addressbook/setup/phpgw_zh-tw.lang
@@ -1,35 +1,41 @@
+%1 contact(s) %2	addressbook	zh-tw	%1 個聯絡人 %2
+%1 contact(s) %2, %3 failed because of insufficent rights !!!	addressbook	zh-tw	%1 個聯絡人 %2, %3 個錯誤，因為權限有誤！
 %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 筆記錄被讀取（還未被匯入，您應該 %2回上頁%3 並取消「匯入測試」）
+%1 starts with '%2'	addressbook	zh-tw	%1 開始於 '%2'
 (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() 只提供給管理者使用！！
 actions	addressbook	zh-tw	動作
+add a new contact	addressbook	zh-tw	新增聯絡人
 add a single entry by passing the fields.	addressbook	zh-tw	從欄位中新增一筆資料。
 add custom field	addressbook	zh-tw	新增自訂欄位
 address book	common	zh-tw	通訊錄
 address book - vcard in	addressbook	zh-tw	通訊錄 - VCard匯入
 address book - view	addressbook	zh-tw	通訊錄 - 檢視
 address line 2	addressbook	zh-tw	住址 2
-address line 3	addressbook	zh-tw	住址 3
 address type	addressbook	zh-tw	住址類型
 addressbook	common	zh-tw	通訊錄
+addressbook menu	addressbook	zh-tw	通訊錄選單
 addressbook preferences	addressbook	zh-tw	通訊錄設定
+addressbook the contact should be saved to	addressbook	zh-tw	通訊錄聯絡人儲存位置
 addressbook-fieldname	addressbook	zh-tw	通訊錄-欄位名稱
 addvcard	addressbook	zh-tw	新增VCard
 advanced search	addressbook	zh-tw	進階搜尋
 alt. csv import	addressbook	zh-tw	Alt. CSV匯入
+always	addressbook	zh-tw	永遠
+apply the action on the whole query, not only the shown contacts!!!	addressbook	zh-tw	在整個查詢套用這個操作，不只是已經顯示的聯絡人！
 are you shure you want to delete this contact?	addressbook	zh-tw	您確定要刪除這個聯絡人？
 are you sure you want to delete this field?	addressbook	zh-tw	您確定要刪除這個欄位嗎？
-bbs phone	addressbook	zh-tw	BBS電話
+assistent	addressbook	zh-tw	助理
 birthday	common	zh-tw	生日
 birthdays	common	zh-tw	生日
 blank	addressbook	zh-tw	空白
 business	common	zh-tw	公司
-business address type	addressbook	zh-tw	住址類型
+business address	addressbook	zh-tw	公司住址
 business city	addressbook	zh-tw	縣/市
 business country	addressbook	zh-tw	國家/地區
 business email	addressbook	zh-tw	電子郵件
-business email type	addressbook	zh-tw	電子郵件類型
 business fax	addressbook	zh-tw	傳真
 business phone	addressbook	zh-tw	電話
 business state	addressbook	zh-tw	省/市
@@ -38,11 +44,11 @@ business zip code	addressbook	zh-tw	郵遞區號
 car phone	addressbook	zh-tw	車用電話
 cell phone	addressbook	zh-tw	行動電話
 charset of file	addressbook	zh-tw	檔案字元編碼設定
-choose an icon for this contact type	addressbook	zh-tw	選擇這個聯絡人類型要使用的圖示
-chosse an etemplate for this contact type	addressbook	zh-tw	選擇這個聯絡人類型要使用的 eTemplate
+check all	addressbook	zh-tw	全選
+choose an icon for this contact type	admin	zh-tw	選擇這個聯絡人類型要使用的圖示
+chosse an etemplate for this contact type	admin	zh-tw	選擇這個聯絡人類型要使用的 eTemplate
 city	common	zh-tw	縣市
 company	common	zh-tw	公司
-company name	common	zh-tw	公司名稱
 configuration	common	zh-tw	設定
 contact	common	zh-tw	聯羥人
 contact application	admin	zh-tw	聯絡人申請
@@ -51,6 +57,7 @@ contact settings	admin	zh-tw	聯絡人設定
 copied by %1, from record #%2.	addressbook	zh-tw	由 %1 複製, 從記錄 #%2.
 country	common	zh-tw	國家/地區
 create new links	addressbook	zh-tw	新增連結
+created	addressbook	zh-tw	建立日期
 credit	addressbook	zh-tw	信用額度
 csv-fieldname	addressbook	zh-tw	CSV欄位名稱
 csv-filename	addressbook	zh-tw	CSV檔名
@@ -59,7 +66,12 @@ custom fields	addressbook	zh-tw	自訂欄位
 debug output in browser	addressbook	zh-tw	從瀏覽器輸入錯誤訊息
 default filter	addressbook	zh-tw	預設過濾器
 delete a single entry by passing the id.	addressbook	zh-tw	從id刪除一筆資料。
+delete this contact	addressbook	zh-tw	刪除這個聯絡人
+deleted	addressbook	zh-tw	刪除了
+deletes the photo	addressbook	zh-tw	刪除照片
 department	common	zh-tw	部門
+displays a remider for birthdays happening today or tomorrow on the startpage (page you get when you enter egroupware or click on the homepage icon).	addressbook	zh-tw	在首頁提醒今明兩天生日的聯絡人（在進入 eGroupWare 中以及點選首頁圖示時）。
+do you want a private addressbook, which can not be viewed by users, you grant access to your personal addressbook?	addressbook	zh-tw	您是否需要私人通訊錄，也就是其他人無法檢視的、只有您能夠存取的個人通訊錄？
 do your really want to delete this contact?	addressbook	zh-tw	您確定要刪除這個聯絡人？
 doesn't matter	addressbook	zh-tw	沒關係
 domestic	addressbook	zh-tw	國內
@@ -68,15 +80,19 @@ download export file (uncheck to debug output in browser)	addressbook	zh-tw	下
 download this contact as vcard file	addressbook	zh-tw	以 vCard 格式下載這個聯絡人資料
 edit custom field	addressbook	zh-tw	編輯自訂欄位
 edit custom fields	admin	zh-tw	編輯自訂欄位
+edit extra account-data in the addressbook	admin	zh-tw	編輯通訊錄的其他帳號資料
 edit phonenumbers -	addressbook	zh-tw	編輯電話號碼 -
 email & internet	addressbook	zh-tw	Email & 眲衯
 empty for all	addressbook	zh-tw	全部清除
+enable an extra private addressbook	addressbook	zh-tw	啟用私人通訊錄
 enter the path to the exported file here	addressbook	zh-tw	輸入匯出檔案的路徑
 existing links	addressbook	zh-tw	現有連結
 export	addressbook	zh-tw	匯出
+export as vcard	addressbook	zh-tw	匯出成 VCard
 export contacts	addressbook	zh-tw	匯出聯絡人
 export file name	addressbook	zh-tw	匯出檔名
 export from addressbook	addressbook	zh-tw	從通訊錄匯出
+exported	addressbook	zh-tw	匯出了
 extra	addressbook	zh-tw	其他
 fax	addressbook	zh-tw	傳真
 fax number	common	zh-tw	傳真號碼
@@ -89,11 +105,11 @@ full name	addressbook	zh-tw	全名
 geo	addressbook	zh-tw	GEO
 global categories	addressbook	zh-tw	全域類別
 grant addressbook access	common	zh-tw	允許存取通訊錄
-home address type	addressbook	zh-tw	住址
+group %1	addressbook	zh-tw	群組 %1
+home address	addressbook	zh-tw	住家住址
 home city	addressbook	zh-tw	縣/市
 home country	addressbook	zh-tw	國家/地區
 home email	addressbook	zh-tw	電子郵件
-home email type	addressbook	zh-tw	電子郵件類型
 home phone	addressbook	zh-tw	電話
 home state	addressbook	zh-tw	省/市
 home street	addressbook	zh-tw	地址
@@ -111,7 +127,6 @@ import next set	addressbook	zh-tw	匯入下一個
 import_instructions	addressbook	zh-tw	Netscape，開啟通訊錄並且從<b>檔案</b>功能選擇<b>匯出</b>，匯出的檔案是LDIF格式。Outlook，選擇聯絡人資料夾，從<b>檔案</b>功能選擇<b>匯入與匯出...</b>來匯出聯絡人資料成為逗點分隔(CSV)檔案。
 income	addressbook	zh-tw	收入
 international	addressbook	zh-tw	國際
-isdn phone	addressbook	zh-tw	ISDN電話
 label	addressbook	zh-tw	概述
 last modified	addressbook	zh-tw	最後更新
 ldap context for contacts	admin	zh-tw	聯絡人之LDAP context
@@ -131,19 +146,24 @@ mobile	addressbook	zh-tw	行動電話
 mobile phone	addressbook	zh-tw	行動電話
 modem phone	addressbook	zh-tw	撥接電話
 more ...	addressbook	zh-tw	芳細 ...
+moved	addressbook	zh-tw	移動了
 multiple vcard	addressbook	zh-tw	多重名片檔
 no vcard	addressbook	zh-tw	沒有VCard
 number	addressbook	zh-tw	數字
 number of records to read (%1)	addressbook	zh-tw	讀取記錄號碼(%1)
-options for type	addressbook	zh-tw	類型選項
+only if there is content	addressbook	zh-tw	只在有內容時
+options for type	admin	zh-tw	類型選項
 organisation	addressbook	zh-tw	組織
 other number	addressbook	zh-tw	其他號碼
 other phone	addressbook	zh-tw	其他電話
+own sorting	addressbook	zh-tw	自訂排序
 pager	common	zh-tw	呼叫器
 parcel	addressbook	zh-tw	兼職
 phone number	common	zh-tw	電話號碼
 phone numbers	common	zh-tw	電話號碼
+photo	addressbook	zh-tw	照片
 please enter a name for that field !	addressbook	zh-tw	請輸入欄位名稱！
+please select only one category	addressbook	zh-tw	請選擇唯一的類別
 postal	common	zh-tw	郵政信箱
 pref	addressbook	zh-tw	丝茁
 prefix	addressbook	zh-tw	稱謂(前置)
@@ -154,12 +174,20 @@ read a list of entries.	addressbook	zh-tw	讀取項目清單。
 read a single entry by passing the id and fieldlist.	addressbook	zh-tw	從id及欄位清單讀取一筆資料。
 record access	addressbook	zh-tw	記錄存取
 record owner	addressbook	zh-tw	記錄擁有者
-retrieve contacts	admin	zh-tw	讀取聯絡人
+role	addressbook	zh-tw	角色
+room	addressbook	zh-tw	辦公室
+search for '%1'	addressbook	zh-tw	搜尋 '%1'
+select a portrait format jpeg photo. it will be resized to 60 pixel width.	addressbook	zh-tw	選擇一個 jpeg 格式的照片，它會被重新調整為寬度 60 畫素。
+select addressbook type	addressbook	zh-tw	選擇通訊錄類型
 select all	addressbook	zh-tw	選擇全部
+select an action or addressbook to move to	addressbook	zh-tw	選擇一個操作或是要移動的通訊錄
+select multiple contacts for a further action	addressbook	zh-tw	選擇多個聯絡人來進行操作
+select phone number as prefered way of contact	addressbook	zh-tw	選擇聯絡人的建議聯絡電話方式
 select the type of conversion	addressbook	zh-tw	選擇轉換的格式
 select the type of conversion:	addressbook	zh-tw	選擇轉換的格式：
-select where you want to store	admin	zh-tw	選擇您想存放的位置
+select where you want to store / retrieve contacts	admin	zh-tw	選擇您希望儲存、取得聯絡人的位置
 show	addressbook	zh-tw	饯示
+show a column for %1	addressbook	zh-tw	顯示 %1 的欄位
 show birthday reminders on main screen	addressbook	zh-tw	在主畫面顯示生日提示
 something went wrong by deleting %1	addressbook	zh-tw	刪除 %1 時發生錯誤
 something went wrong by deleting this contact	addressbook	zh-tw	刪除這個聯絡人時發生錯誤
@@ -175,19 +203,22 @@ test import (show importable records <u>only</u> in browser)	addressbook	zh-tw	
 that field name has been used already !	addressbook	zh-tw	這個欄位名稱已經被使用！
 this person's first name was not in the address book.	addressbook	zh-tw	這個人的名字沒有在通訊錄中。
 this person's last name was not in the address book.	addressbook	zh-tw	這個人的姓氏沒有在通訊錄中。
+timezone	addressbook	zh-tw	時區
 to many might exceed your execution-time-limit	addressbook	zh-tw	太多可能會超過您的時間限制
 today is %1's birthday!	common	zh-tw	今天是 %1 的生日！
 tomorrow is %1's birthday.	common	zh-tw	明天是 %1 的生日。
 translation	addressbook	zh-tw	轉換
 update a single entry by passing the fields.	addressbook	zh-tw	從欄位更新一筆資料。
+upload or delete the photo	addressbook	zh-tw	上傳或是刪除照片
 use country list	addressbook	zh-tw	使用國家清單
+used for links and for the own sorting of the list	addressbook	zh-tw	用在連結以及自訂排序清單
 vcard	common	zh-tw	名片檔
 vcards require a first name entry.	addressbook	zh-tw	名片檔需要名字資料。
 vcards require a last name entry.	addressbook	zh-tw	名片檔需要姓氏資料。
-video phone	addressbook	zh-tw	影像電話
-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	警告：找到的所有聯絡人都會被刪除！
+when should the contacts list display that colum. "only if there is content" hides the column, unless there is some content in the view.	addressbook	zh-tw	什麼時候聯絡人清單該顯示那個欄位，'只在有內容時' 隱藏欄位，其他表示有內容可以檢視。
+whole query	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
@@ -196,5 +227,6 @@ you are not permittet to edit this contact	addressbook	zh-tw	您沒有權限編
 you are not permittet to view this contact	addressbook	zh-tw	您沒有權限檢視這個聯絡人
 you must select a vcard. (*.vcf)	addressbook	zh-tw	您必須選取一個名片檔 (*.vcf)
 you must select at least 1 column to display	addressbook	zh-tw	您必須至少選取一個欄位才能顯示
+you need to select some contacts first	addressbook	zh-tw	您必須先選擇一些聯絡人
 zip code	common	zh-tw	郵遞區號
 zip_note	addressbook	zh-tw	<p><b>注意：</b> 壓縮檔案可能包含 .csv, .vcf, 或 .ldif 格式，請不要在同一次的匯入工作中混用不同的檔案格式！
diff --git a/admin/setup/phpgw_sk.lang b/admin/setup/phpgw_sk.lang
index 5018b19405..683c97c9a6 100644
--- a/admin/setup/phpgw_sk.lang
+++ b/admin/setup/phpgw_sk.lang
@@ -48,6 +48,8 @@ allow anonymous access to this app	admin	sk	Povoli
 alternate email address	admin	sk	alternatívna emailová adresa
 anonymous user	admin	sk	Anonymný používateľ
 anonymous user (not shown in list sessions)	admin	sk	Anonymný používateľ (nezobrazuje sa na zozname sedení)
+anonymous user does not exist!	admin	sk	Anonymný používateľ NEexistuje!
+anonymous user has no run-rights for the application!	admin	sk	Anonymný používateľ NEMÁ právo spustiť túto aplikáciu!
 appearance	admin	sk	Vzhľad
 application	admin	sk	Aplikácia
 application name	admin	sk	Názov aplikácie
@@ -190,6 +192,7 @@ enter your smtp server hostname or ip address	admin	sk	Zadajte hostname alebo IP
 enter your smtp server port	admin	sk	Zadajte port vášho SMTP servera
 error canceling timer, maybe there's none set !!!	admin	sk	Chyba pri rušení časovača, možnože žiadny nie je nastavený !!!
 error setting timer, wrong syntax or maybe there's one already running !!!	admin	sk	Chyba pri nastavovaní časovača, chybná syntax alebo možno už nejaký beží !!!
+error! no appname found	admin	sk	CHYBA! Nenašiel sa názov aplikácie
 error: %1 not found or other error !!!	admin	sk	Chyba: %1 sa nenašiel, alebo iná chyba !!!
 expires	admin	sk	Vyprší
 explanation of ldapman	admin	sk	Tento modul bol testovaný doposiaľ pre POSTFIX,LDAP,Courier-IMAP vyžaduje schémy CORE a QMAIL (OID7914). Podrobnosti o používaní a nastavení tohto systému nájdete v README.ldapman v doc adresári ADMIN-a.
@@ -201,7 +204,6 @@ for the times above	admin	sk	pre vy
 for the times below (empty values count as '*', all empty = every minute)	admin	sk	pre nižšieuvedené časy (prázdne hodnoty sa berú ako '*', všetky prázdne = každú minútu)
 force selectbox	admin	sk	Vynúť menu pre výber
 forward also to	admin	sk	Preposlať ešte
-forward email's to	admin	sk	Preposlať emaily (komu)
 forward emails to	admin	sk	preposlať správy (komu)
 forward only	admin	sk	iba preposlať
 global categories	common	sk	Globálne kategórie
@@ -214,14 +216,18 @@ group manager	admin	sk	Spr
 group name	admin	sk	Názov skupiny
 hide php information	admin	sk	skryť php informácie
 home directory	admin	sk	Domovský (home) adresár
+host information	admin	sk	Informácie o stroji
 hour<br>(0-23)	admin	sk	Hodina<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	sk	Koľko dní má záznam ostávať v Prístupových Záznamoch než sa zmaže (predvolené: 90) ?
 how many minutes should an account or ip be blocked (default 30) ?	admin	sk	Koľko minút má trvať zablokovanie účtu alebo IP? (predvolené: 30) ?
+how should email addresses for new users be constructed?	admin	sk	Ako sa majú vytvárať emailové adresy pre nových používateľov?
 icon	admin	sk	Ikona
+idle	admin	sk	voľné
 if no acl records for user or any group the user is a member of	admin	sk	Ak pre používateľa alebo akúkoľvek skupinu, ktorej je členom, neexistujú ACL záznamy
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	sk	Ak používate LDAP, chcete spravovať domovský (home) adresár a atribúty login shellu?
 in mbyte	admin	sk	v Megabajtoch
 inbound	admin	sk	príchodzie
+initial	admin	sk	Počiatočné
 install crontab	admin	sk	Nainštalovať crontab
 installed applications	common	sk	Nainštalované aplikácie
 installed crontab	admin	sk	Nainštalovaný crontab
@@ -390,7 +396,7 @@ use cookies to pass sessionid	admin	sk	Pou
 use pure html compliant code (not fully working yet)	admin	sk	Použiť čistý HTML kód (zatiaľ nie je plne funkčné)
 use theme	admin	sk	Použiť tému
 user accounts	admin	sk	Používateľské účty
-user data	admin	sk	Používateľské dáta
+user data	common	sk	Používateľské dáta
 user for smtp-authentication (leave it empty if no auth required)	admin	sk	Používateľ pre SMTP autentifikáciu (ak netreba, ponechajte prázdne)
 user groups	admin	sk	Používateľské skupiny
 userdata	admin	sk	používateľské dáta
@@ -412,6 +418,7 @@ would you like to show each application's upgrade status ?	admin	sk	M
 xml-rpc	admin	sk	XML-RPC
 you have entered an invalid expiration date	admin	sk	Zadali ste nesprávny čas vypršania
 you have to enter a name, to create a new field!!!	admin	sk	Ak chcete vytvoriť novú položku, musíte zadať názov!!!
+you have to enter a name, to create a new type!!!	admin	sk	Ak chcete vytvoriť nový typ, musíte zadať názov!!!
 you must add at least 1 permission or group to this account	admin	sk	Tomuto účtu musíte pridať aspoň 1 oprávnenie alebo skupinu
 you must enter a group name.	admin	sk	Musíte zadať názov skupiny
 you must enter a lastname	admin	sk	Musíte zadať priezvisko
diff --git a/admin/setup/phpgw_zh-tw.lang b/admin/setup/phpgw_zh-tw.lang
index b6acb29aef..da1988dc79 100644
--- a/admin/setup/phpgw_zh-tw.lang
+++ b/admin/setup/phpgw_zh-tw.lang
@@ -221,12 +221,14 @@ host information	admin	zh-tw	主機資訊
 hour<br>(0-23)	admin	zh-tw	小時<br>(0-23)
 how many days should entries stay in the access log, before they get deleted (default 90) ?	admin	zh-tw	存取紀錄應該保留幾天內的事件後刪除(預設90)？
 how many minutes should an account or ip be blocked (default 30) ?	admin	zh-tw	帳號鎖定將持續幾分鐘(預設30)？
+how should email addresses for new users be constructed?	admin	zh-tw	新使用者的信箱該如何建構？
 icon	admin	zh-tw	圖示
 idle	admin	zh-tw	閒置時間
 if no acl records for user or any group the user is a member of	admin	zh-tw	如果使用者或任何群組沒有 ACL 資料，要將它歸類於
 if using ldap, do you want to manage homedirectory and loginshell attributes?	admin	zh-tw	如果使用 LDAP ，您是否要管理家目錄與登入指令列屬性？
 in mbyte	admin	zh-tw	䝼MB饯示
 inbound	admin	zh-tw	聚集
+initial	admin	zh-tw	初始的
 install crontab	admin	zh-tw	安裝排定的工作
 installed applications	common	zh-tw	已安裝之應用程式
 installed crontab	admin	zh-tw	已經安裝的排定工作
@@ -406,7 +408,7 @@ use cookies to pass sessionid	admin	zh-tw	使用 COOKIE 傳遞連線代碼
 use pure html compliant code (not fully working yet)	admin	zh-tw	使用標準 HTML 原始碼（尚未完全支援）
 use theme	admin	zh-tw	使用佈景主題
 user accounts	admin	zh-tw	使用者管理
-user data	admin	zh-tw	使用者資料
+user data	common	zh-tw	使用者資料
 user for smtp-authentication (leave it empty if no auth required)	admin	zh-tw	SMTP認證帳號(如果不需要就不用填入)
 user groups	admin	zh-tw	使用者群組管理
 userdata	admin	zh-tw	使用者資料
@@ -420,6 +422,7 @@ view this user	admin	zh-tw	查看該使用者
 view user account	admin	zh-tw	瀏覽使用者帳號
 who would you like to transfer all records owned by the deleted user to?	admin	zh-tw	您希望將被移除使用者的資料轉移給誰？
 would you like egroupware to cache the egw info array ?	admin	zh-tw	您希望 eGroupWare 暫存 egw 資訊嗎？
+would you like egroupware to cache the phpgw info array ?	admin	zh-tw	您希望 eGroupWare 暫存 phpgw 資訊嗎？
 would you like egroupware to check for a new version<br>when admins login ?	admin	zh-tw	您希望 egroupWare 自動於管理者登入時檢查是否有最新版本？
 would you like egroupware to check for new application versions when admins login ?	admin	zh-tw	您希望egroupWare在每次管理者登入時檢查新版的應用程式嗎？
 would you like to automaticaly load new langfiles (at login-time) ?	admin	zh-tw	您想要自動讀取新的語言檔案嗎(登入時)？