Update localizations from Transifex

232 files changed, 2211 insertions, 1774 deletions

diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index acf80aca9..167788b4c 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -21,7 +21,7 @@ $labels['myrights'] = 'Přístupová práva';
 $labels['username'] = 'Uživatel:';
 $labels['advanced'] = 'pokročilý režim';
 $labels['newuser'] = 'Přidat záznam';
-$labels['actions'] = 'Access right actions...';
+$labels['actions'] = 'Přístupové právo akce ...';
 $labels['anyone'] = 'Všichni uživatelé (kdokoli)';
 $labels['anonymous'] = 'Hosté (anonymní)';
 $labels['identifier'] = 'Identifikátor';
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index a287a413e..bb8837190 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -26,46 +26,46 @@ $labels['anyone'] = 'Tódolos usuarios (calquera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
 $labels['identifier'] = 'Identificador';
 
-$labels['acll'] = 'Lookup';
+$labels['acll'] = 'Bloquear';
 $labels['aclr'] = 'Ler mensaxes';
 $labels['acls'] = 'Keep Seen state';
 $labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Insert (Copy into)';
 $labels['aclp'] = 'Post';
-$labels['aclc'] = 'Create subfolders';
-$labels['aclk'] = 'Create subfolders';
+$labels['aclc'] = 'Crear subcartafoles';
+$labels['aclk'] = 'Crear subcartafoles';
 $labels['acld'] = 'Borrar mensaxes';
 $labels['aclt'] = 'Borrar mensaxes';
 $labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
 
-$labels['aclfull'] = 'Full control';
-$labels['aclother'] = 'Other';
-$labels['aclread'] = 'Read';
-$labels['aclwrite'] = 'Write';
-$labels['acldelete'] = 'Delete';
+$labels['aclfull'] = 'Control total';
+$labels['aclother'] = 'Outros';
+$labels['aclread'] = 'Lectura';
+$labels['aclwrite'] = 'Escritura';
+$labels['acldelete'] = 'Borrado';
 
-$labels['shortacll'] = 'Lookup';
-$labels['shortaclr'] = 'Read';
-$labels['shortacls'] = 'Keep';
-$labels['shortaclw'] = 'Write';
-$labels['shortacli'] = 'Insert';
+$labels['shortacll'] = 'Busca';
+$labels['shortaclr'] = 'Ler';
+$labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Insertar';
 $labels['shortaclp'] = 'Post';
-$labels['shortaclc'] = 'Create';
-$labels['shortaclk'] = 'Create';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
 $labels['shortacle'] = 'Expunge';
-$labels['shortaclx'] = 'Folder delete';
+$labels['shortaclx'] = 'Borrar cartafol';
 $labels['shortacla'] = 'Administrar';
 
-$labels['shortaclother'] = 'Other';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = 'Write';
-$labels['shortacldelete'] = 'Delete';
+$labels['shortaclother'] = 'Outros';
+$labels['shortaclread'] = 'Lectura';
+$labels['shortaclwrite'] = 'Escritura';
+$labels['shortacldelete'] = 'Borrado';
 
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longacll'] = 'O cartafol é visible e pode ser suscrito';
 $labels['longaclr'] = 'The folder can be opened for reading';
 $labels['longacls'] = 'Messages Seen flag can be changed';
 $labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
@@ -93,7 +93,7 @@ $messages['updateerror'] = 'Ubable to update access rights';
 $messages['deleteerror'] = 'Unable to delete access rights';
 $messages['createerror'] = 'Unable to add access rights';
 $messages['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$messages['norights'] = 'No rights has been specified!';
-$messages['nouser'] = 'No username has been specified!';
+$messages['norights'] = 'Non se especificaron permisos!';
+$messages['nouser'] = 'Non se especificou o nome de usuario!';
 
 ?>
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index b4927fb3f..11d905387 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -41,7 +41,7 @@ $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
 
 $labels['aclfull'] = 'Controllo completo';
-$labels['aclother'] = 'Altri';
+$labels['aclother'] = 'Altro';
 $labels['aclread'] = 'Lettura';
 $labels['aclwrite'] = 'Scrittura';
 $labels['acldelete'] = 'Elimina';
@@ -57,10 +57,10 @@ $labels['shortaclk'] = 'Crea';
 $labels['shortacld'] = 'Elimina';
 $labels['shortaclt'] = 'Elimina';
 $labels['shortacle'] = 'Elimina';
-$labels['shortaclx'] = 'Cancella cartella';
+$labels['shortaclx'] = 'Elimina cartella';
 $labels['shortacla'] = 'Amministra';
 
-$labels['shortaclother'] = 'Altri';
+$labels['shortaclother'] = 'Altro';
 $labels['shortaclread'] = 'Lettura';
 $labels['shortaclwrite'] = 'Scrittura';
 $labels['shortacldelete'] = 'Elimina';
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index 85e33725d..524427a4e 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -19,81 +19,81 @@
 $labels['sharing'] = '공유';
 $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
-$labels['advanced'] = 'advanced mode';
+$labels['advanced'] = '고급 모드';
 $labels['newuser'] = '엔트리 추가';
-$labels['actions'] = 'Access right actions...';
-$labels['anyone'] = 'All users (anyone)';
-$labels['anonymous'] = 'Guests (anonymous)';
+$labels['actions'] = '접근 권한 동작...';
+$labels['anyone'] = '모든 사용자 (아무나)';
+$labels['anonymous'] = '방문자 (익명)';
 $labels['identifier'] = '식별자';
 
-$labels['acll'] = 'Lookup';
-$labels['aclr'] = 'Read messages';
+$labels['acll'] = '조회';
+$labels['aclr'] = '읽은 메시지';
 $labels['acls'] = '읽은 상태로 유지';
-$labels['aclw'] = 'Write flags';
-$labels['acli'] = 'Insert (Copy into)';
+$labels['aclw'] = '쓰기 깃발';
+$labels['acli'] = '삽입 (복사할 위치)';
 $labels['aclp'] = '게시';
 $labels['aclc'] = '하위 폴더 만들기';
 $labels['aclk'] = '하위 폴더 만들기';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
-$labels['acle'] = 'Expunge';
+$labels['acle'] = '영구 제거';
 $labels['aclx'] = '폴더 삭제';
 $labels['acla'] = '관리자';
 
-$labels['aclfull'] = 'Full control';
-$labels['aclother'] = 'Other';
-$labels['aclread'] = 'Read';
-$labels['aclwrite'] = 'Write';
-$labels['acldelete'] = 'Delete';
+$labels['aclfull'] = '전체 제어권';
+$labels['aclother'] = '기타';
+$labels['aclread'] = '읽기';
+$labels['aclwrite'] = '쓰기';
+$labels['acldelete'] = '삭제';
 
-$labels['shortacll'] = 'Lookup';
-$labels['shortaclr'] = 'Read';
-$labels['shortacls'] = 'Keep';
-$labels['shortaclw'] = 'Write';
-$labels['shortacli'] = 'Insert';
+$labels['shortacll'] = '조회';
+$labels['shortaclr'] = '읽기';
+$labels['shortacls'] = '보관';
+$labels['shortaclw'] = '쓰기';
+$labels['shortacli'] = '삽입';
 $labels['shortaclp'] = '게시';
-$labels['shortaclc'] = 'Create';
-$labels['shortaclk'] = 'Create';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
-$labels['shortacle'] = 'Expunge';
+$labels['shortaclc'] = '생성';
+$labels['shortaclk'] = '생성';
+$labels['shortacld'] = '삭제';
+$labels['shortaclt'] = '삭제';
+$labels['shortacle'] = '지움';
 $labels['shortaclx'] = '폴더 삭제';
-$labels['shortacla'] = '관리자';
+$labels['shortacla'] = '관리';
 
-$labels['shortaclother'] = 'Other';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = 'Write';
-$labels['shortacldelete'] = 'Delete';
+$labels['shortaclother'] = '기타';
+$labels['shortaclread'] = '읽기';
+$labels['shortaclwrite'] = '쓱';
+$labels['shortacldelete'] = '삭제';
 
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
-$labels['longaclr'] = 'The folder can be opened for reading';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = '폴더에 메시지를 복사하거나 작성할 수 있음';
-$labels['longaclp'] = '이 폴더로 메시지를 게시할 수 있음';
-$labels['longaclc'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
-$labels['longaclk'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
-$labels['longacld'] = '메시지 삭제 플래그가 변경될 수 있음';
-$labels['longaclt'] = '메시지 삭제 플래그가 변경될 수 있음';
-$labels['longacle'] = 'Messages can be expunged';
-$labels['longaclx'] = '폴더를 삭제하거나 이름 변경 할 수 있음';
+$labels['longacll'] = '폴더가 목록에 나타나고 다음 사용자가 구독할 수 있음:';
+$labels['longaclr'] = '읽기 위해 폴더를 열 수 있음';
+$labels['longacls'] = '읽은 메시지 깃발이 변경될 수 있음';
+$labels['longaclw'] = '메시지 깃발 및 키워드를 변경할 수 있음, 다만 읽음 및 삭제됨은 제외';
+$labels['longacli'] = '메시지를 폴더에 복사하거나 작성할 수 있음';
+$labels['longaclp'] = '메시지를 이 폴더로 게시할 수 있음';
+$labels['longaclc'] = '이 폴더의 바로 아래에 폴더를 생성(또는 이름 변경)할 수 있음';
+$labels['longaclk'] = '이 폴더의 바로 아래에 폴더를 생성(또는 이름 변경)할 수 있음';
+$labels['longacld'] = '메시지 삭제 깃발이 변경될 수 있음';
+$labels['longaclt'] = '메시지 삭제 깃발이 변경될 수 있음';
+$labels['longacle'] = '메시지가 영구 제거될 수 있음';
+$labels['longaclx'] = '폴더를 삭제하거나 이름을 변경 할 수 있음';
 $labels['longacla'] = '폴더의 접근 권한을 변경할 수 있음';
 
 $labels['longaclfull'] = '폴더 관리를 포함한 모든 제어권';
-$labels['longaclread'] = 'The folder can be opened for reading';
-$labels['longaclwrite'] = '메시지에 표시하거나, 폴더로 메시지를 복사하거나 작성할 수 있음';
+$labels['longaclread'] = '폴더를 열어 읽을 수 있음';
+$labels['longaclwrite'] = '메시지에 표시하거나, 폴더로 이동하거나 복사할 수 있음';
 $labels['longacldelete'] = '메시지를 삭제할 수 있음';
 
-$messages['deleting'] = '접근 권한 삭제 중...';
-$messages['saving'] = '접근 권한 저장 중...';
-$messages['updatesuccess'] = '접근 권한을 변경하는데 성공 함.';
-$messages['deletesuccess'] = '접근 권한을 삭제하는데 성공 함.';
-$messages['createsuccess'] = '접근 권한을 추가하는데 성공 함.';
-$messages['updateerror'] = '접근 권한을 갱신할 수 없음.';
+$messages['deleting'] = '접근 권한을 삭제하는 중...';
+$messages['saving'] = '접근 권한을 저장하는 중...';
+$messages['updatesuccess'] = '접근 권한을 성공적으로 변경함.';
+$messages['deletesuccess'] = '접근 권한을 성공적으로 삭제함.';
+$messages['createsuccess'] = '접근 권한을 성공적으로 추가함.';
+$messages['updateerror'] = '접근 권한을 업데이트할 수 없음.';
 $messages['deleteerror'] = '접근 권한을 삭제할 수 없음.';
 $messages['createerror'] = '접근 권한을 추가할 수 없음.';
-$messages['deleteconfirm'] = '선택한 사용자(들)의 접근 권한을 삭제하고자 하는 것이 확실 합니까?';
+$messages['deleteconfirm'] = '정말로 선택한 사용자의 접근 권한을 삭제하시겠습니까?';
 $messages['norights'] = '지정된 권한이 없음!';
-$messages['nouser'] = '지정된 username이 없음!';
+$messages['nouser'] = '지정된 사용자명이 없음!';
 
 ?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index 6507504e2..59393012f 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -70,7 +70,7 @@ $labels['longaclr'] = 'Aplanką galima peržiūrėti';
 $labels['longacls'] = 'Pranešimų vėliavėlė "Matyta" gali būti pakeista';
 $labels['longaclw'] = 'Pranešimų vėliavėlės ir raktažodžiai gali būti pakeisti, išskyrus "Matytas" ir "Ištrintas"';
 $labels['longacli'] = 'Pranešimai gali būti įrašyti arba nukopijuoti į aplanką';
-$labels['longaclp'] = 'Messages can be posted to this folder';
+$labels['longaclp'] = 'Į šį aplanką galima dėti laiškus.';
 $labels['longaclc'] = 'Nauji aplankai gali būti kuriami (arba pervadinami) šioje direktorijoje';
 $labels['longaclk'] = 'Nauji aplankai gali būti kuriami (arba pervadinami) šioje direktorijoje';
 $labels['longacld'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista';
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 0c5171664..ebf314043 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -16,12 +16,12 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels['sharing'] = '共享中';
+$labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
 $labels['username'] = '用户：';
 $labels['advanced'] = '高级模式';
-$labels['newuser'] = '添加条目';
-$labels['actions'] = 'Access right actions...';
+$labels['newuser'] = '新增条目';
+$labels['actions'] = '权限设置...';
 $labels['anyone'] = '所有用户(任何人)';
 $labels['anonymous'] = '来宾(匿名)';
 $labels['identifier'] = '标识符';
@@ -29,7 +29,7 @@ $labels['identifier'] = '标识符';
 $labels['acll'] = '查找';
 $labels['aclr'] = '读取消息';
 $labels['acls'] = '保存已读状态';
-$labels['aclw'] = 'Write flags';
+$labels['aclw'] = '写入标志';
 $labels['acli'] = '插入(复制至)';
 $labels['aclp'] = '发送';
 $labels['aclc'] = '创建子文件夹';
@@ -41,15 +41,15 @@ $labels['aclx'] = '删除文件夹';
 $labels['acla'] = '管理';
 
 $labels['aclfull'] = '全部控制';
-$labels['aclother'] = '其他';
-$labels['aclread'] = '阅读';
-$labels['aclwrite'] = '撰写';
+$labels['aclother'] = '其它';
+$labels['aclread'] = '读取';
+$labels['aclwrite'] = '写入';
 $labels['acldelete'] = '删除';
 
 $labels['shortacll'] = '查找';
-$labels['shortaclr'] = '阅读';
-$labels['shortacls'] = '保留';
-$labels['shortaclw'] = '撰写';
+$labels['shortaclr'] = '读取';
+$labels['shortacls'] = '保存';
+$labels['shortaclw'] = '写入';
 $labels['shortacli'] = '插入';
 $labels['shortaclp'] = '发送';
 $labels['shortaclc'] = '新建';
@@ -61,22 +61,22 @@ $labels['shortaclx'] = '删除文件夹';
 $labels['shortacla'] = '管理';
 
 $labels['shortaclother'] = '其他';
-$labels['shortaclread'] = 'Read';
-$labels['shortaclwrite'] = '撰写';
+$labels['shortaclread'] = '读取';
+$labels['shortaclwrite'] = '写入';
 $labels['shortacldelete'] = '删除';
 
 $labels['longacll'] = '该文件夹在列表上可见且可被订阅';
 $labels['longaclr'] = '该文件夹可被打开阅读';
 $labels['longacls'] = 'Messages Seen flag can be changed';
 $labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
-$labels['longacli'] = 'Messages can be written or copied to the folder';
+$labels['longacli'] = '消息可写或可被复制至文件夹中';
 $labels['longaclp'] = 'Messages can be posted to this folder';
 $labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
 $labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
 $labels['longacld'] = 'Messages Delete flag can be changed';
 $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = '消息可被清除';
-$labels['longaclx'] = '该文件夹可悲删除或重命名';
+$labels['longaclx'] = '该文件夹可被删除或重命名';
 $labels['longacla'] = '文件夹访问权限可被修改';
 
 $labels['longaclfull'] = 'Full control including folder administration';
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index 3125c286f..821f7b321 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -65,10 +65,10 @@ $labels['shortaclread'] = '讀取';
 $labels['shortaclwrite'] = '寫入';
 $labels['shortacldelete'] = '刪除';
 
-$labels['longacll'] = 'The folder is visible on lists and can be subscribed to';
+$labels['longacll'] = '此資料夾權限可以訂閱和瀏覽';
 $labels['longaclr'] = '資料夾能被打開與讀取';
 $labels['longacls'] = '能修改訊息標幟';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
+$labels['longaclw'] = '內容旗標和關鍵字可以變更,不包含已檢視和刪除的';
 $labels['longacli'] = '訊息能寫入或複製到資料夾';
 $labels['longaclp'] = '訊息能被投遞到這個資料夾';
 $labels['longaclc'] = '這個資料夾之下可以建子資料夾(或重新命名）';
diff --git a/plugins/archive/localization/az_AZ.inc b/plugins/archive/localization/az_AZ.inc
index 8aab6f2da..19a409d41 100644
--- a/plugins/archive/localization/az_AZ.inc
+++ b/plugins/archive/localization/az_AZ.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arxiv';
 $labels['buttontitle'] = 'Mesajı arxivə göndər';
 $labels['archived'] = 'Arxivə göndərildi';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Müvəffəqiyyətlə arxivləşdirildi. Yeni arxiv qovluqlarını görmək üçün səhifəni yeniləyin.';
+$labels['archiveerror'] = 'Bəzi məktublar arxivləşdirilə bilinmirlər';
 $labels['archivefolder'] = 'Arxiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arxiv';
+$labels['archivetype'] = 'Arxivi böl: ';
+$labels['archivetypeyear'] = 'İl (məs. Arxiv/2012)';
+$labels['archivetypemonth'] = 'Ay (məs. Arxiv/2012/06)';
+$labels['archivetypefolder'] = 'Orijinal qovluq';
+$labels['archivetypesender'] = 'Göndərənin E-Poçtu';
+$labels['unkownsender'] = 'naməlum';
 
 ?>
diff --git a/plugins/archive/localization/bg_BG.inc b/plugins/archive/localization/bg_BG.inc
index fd32931c2..b7be242e0 100644
--- a/plugins/archive/localization/bg_BG.inc
+++ b/plugins/archive/localization/bg_BG.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Архивиране';
 $labels['buttontitle'] = 'Архивиране на съобщението';
 $labels['archived'] = 'Архивирането е успешно';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Успешно архивирано. Презаредете страницата за да видите архивираните папки.';
+$labels['archiveerror'] = 'Някои съобщения не бяха архивирани';
 $labels['archivefolder'] = 'Архивиране';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Архив';
+$labels['archivetype'] = 'Раздели архива по';
+$labels['archivetypeyear'] = 'Година (пр. Архив/2012)';
+$labels['archivetypemonth'] = 'Месец (пр. Архив/2012/06)';
+$labels['archivetypefolder'] = 'Оригинална папка';
+$labels['archivetypesender'] = 'Email адрес на изпращача';
+$labels['unkownsender'] = 'неизвестно';
 
 ?>
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index fde7d358e..04ade1dbf 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arxivat correctament. Recarregueu la pàgina per veure les noves carpetes de l\'arxiu.';
+$labels['archiveerror'] = 'Alguns missatges no han pogut ser arxivats';
 $labels['archivefolder'] = 'Arxiva';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arxiu';
+$labels['archivetype'] = 'Dividir arxiu per';
+$labels['archivetypeyear'] = 'Any (p.ex. Arxiu/2012)';
+$labels['archivetypemonth'] = 'Mes (p.ex. Arxiu/2012/06)';
+$labels['archivetypefolder'] = 'Carpeta original';
+$labels['archivetypesender'] = 'Adreça del remitent';
+$labels['unkownsender'] = 'desconegut';
 
 ?>
diff --git a/plugins/archive/localization/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
index 2f2fd95d5..e71aa5fa6 100644
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archiv';
 $labels['buttontitle'] = 'Archivovat zprávu';
 $labels['archived'] = 'Úspěšně vloženo do archivu';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Úspěšně archivovány. Obnovte stránku, abyste uviděli nové složky v archivu.';
+$labels['archiveerror'] = 'Některé zprávy nelze archivovat';
 $labels['archivefolder'] = 'Archiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archiv';
+$labels['archivetype'] = 'Rozdělit archiv podle';
+$labels['archivetypeyear'] = 'Rok (např.  Archiv/2012)';
+$labels['archivetypemonth'] = 'Měsíc (např. Archiv/2012/06)';
+$labels['archivetypefolder'] = 'Původní složka';
+$labels['archivetypesender'] = 'E-mail odesílatele';
+$labels['unkownsender'] = 'neznámý';
 
 ?>
diff --git a/plugins/archive/localization/cy_GB.inc b/plugins/archive/localization/cy_GB.inc
index fa8e19756..454c26da5 100644
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archif';
 $labels['buttontitle'] = 'Archifo\'r neges hwn';
 $labels['archived'] = 'Archifwyd yn llwyddiannus';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Archifwyd yn llwyddiannus. Ail-lwythwch y dudalen i weld ffolderi archif newydd.';
+$labels['archiveerror'] = 'Nid oedd yn bosib archifo rhai negeseuon';
 $labels['archivefolder'] = 'Archif';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archif';
+$labels['archivetype'] = 'Rhannu archif gyda';
+$labels['archivetypeyear'] = 'Blwyddyn (e.g. Archif/2012)';
+$labels['archivetypemonth'] = 'Mis (e.g. Archif/2012/06)';
+$labels['archivetypefolder'] = 'Ffolder gwreiddiol';
+$labels['archivetypesender'] = 'Ebost anfonwr';
+$labels['unkownsender'] = 'anhysbys';
 
 ?>
diff --git a/plugins/archive/localization/da_DK.inc b/plugins/archive/localization/da_DK.inc
index d4a88cab4..ac67700a4 100644
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivér denne besked';
 $labels['archived'] = 'Succesfuldt arkiveret.';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arkivering lykkedes. Genindlæs siden for at se den nye arkiv mappe.';
+$labels['archiveerror'] = 'Nogle meddelelser kunne ikke arkiveres';
 $labels['archivefolder'] = 'Arkiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arkiver';
+$labels['archivetype'] = 'Del arkiv med';
+$labels['archivetypeyear'] = 'År (f.eks. Arkiv/2012)';
+$labels['archivetypemonth'] = 'Måned (f.eks. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Original mappe';
+$labels['archivetypesender'] = 'Afsenders email';
+$labels['unkownsender'] = 'ukendt';
 
 ?>
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index 57a98abc8..6da9f7dbf 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Αρχειοθέτηση';
 $labels['buttontitle'] = 'Αρχειοθέτηση μηνύματος';
 $labels['archived'] = 'Αρχειοθετήθηκε με επιτυχία';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Επιτυχής αρχειοθετηση. Ανανέωση της σελίδας για να δείτε τους νέους φακέλους αρχειοθέτησης. ';
+$labels['archiveerror'] = 'Ορισμένα μηνύματα δεν μπορεσαν να αρχειοθετηθουν. ';
 $labels['archivefolder'] = 'Αρχειοθέτηση';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Αρχειοθέτηση';
+$labels['archivetype'] = 'Χασμα αρχειου απο';
+$labels['archivetypeyear'] = 'Χρονος (π.χ. Αρχειο/2012)';
+$labels['archivetypemonth'] = 'Μηνας (π.χ. Αρχειο/2012/06)';
+$labels['archivetypefolder'] = 'Αυθεντικος φακελος';
+$labels['archivetypesender'] = 'Αποστολέας email';
+$labels['unkownsender'] = 'άγνωστο';
 
 ?>
diff --git a/plugins/archive/localization/es_AR.inc b/plugins/archive/localization/es_AR.inc
index ad9e84add..5fb082497 100644
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Archivado satisfactoriamente. Recarga la página para ver las nuevas capetas archivadas.';
+$labels['archiveerror'] = 'Algunos mensajes no pudieron archivarse';
 $labels['archivefolder'] = 'Archivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archivo';
+$labels['archivetype'] = 'Separar archivo por';
+$labels['archivetypeyear'] = 'Año (ej. Archivo/2012)';
+$labels['archivetypemonth'] = 'Mes (ej. Archivo/2012/06)';
+$labels['archivetypefolder'] = 'Carpeta original';
+$labels['archivetypesender'] = 'Remitente del correo';
+$labels['unkownsender'] = 'desconocido';
 
 ?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index 09b64b2ab..55180fefe 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensaxe';
 $labels['archived'] = 'Aquivouse a mensaxe';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Arquivado correctamente. Recargue a páxina para ver os novos cartafoles de arquivado.';
+$labels['archiveerror'] = 'Non se puideron arquivar algunhas mensaxes';
 $labels['archivefolder'] = 'Arquivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arquivar';
+$labels['archivetype'] = 'Dividir o arquivo por';
+$labels['archivetypeyear'] = 'Ano (p.ex. Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mes (p.ex. Arquivo/2012/06)';
+$labels['archivetypefolder'] = 'Cartafol orixe';
+$labels['archivetypesender'] = 'Enderezo do remitente';
+$labels['unkownsender'] = 'descoñecido';
 
 ?>
diff --git a/plugins/archive/localization/he_IL.inc b/plugins/archive/localization/he_IL.inc
index 834e46729..37bcaaa3f 100644
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'ארכיון';
 $labels['buttontitle'] = 'משלוח ההודעה לארכיב';
 $labels['archived'] = 'עדכון הארכיון הצליח';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'נשמר בהצלחה בארכיב. יש לרענו את הדף כדי לראות את התיקיות החדשות בארכיב.';
+$labels['archiveerror'] = 'לא ניתן היה להעביר לארכיב חלק מההודעות';
 $labels['archivefolder'] = 'ארכיון';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'ארכיב';
+$labels['archivetype'] = 'לחלק את הארכיב על ידי';
+$labels['archivetypeyear'] = 'שנה ( לדוגמה, ארכיב/2012/96 )';
+$labels['archivetypemonth'] = 'חודש ( לדוגמה, ארכיב/2012/96 )';
+$labels['archivetypefolder'] = 'תיקיה מקורית';
+$labels['archivetypesender'] = 'שולח ההודעה';
+$labels['unkownsender'] = 'לא ידוע';
 
 ?>
diff --git a/plugins/archive/localization/hu_HU.inc b/plugins/archive/localization/hu_HU.inc
index e95c2d0d2..970a24184 100644
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archiválás';
 $labels['buttontitle'] = 'Üzenet archiválása';
 $labels['archived'] = 'Sikeres archiválás';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Az arhiválás sikeres. Frissitsd az oldalt, hogy lásd a létrejött arhivum mappákat.';
+$labels['archiveerror'] = 'Néhány üzenetet nem sikerült arhiválni';
 $labels['archivefolder'] = 'Archiválás';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
+$labels['settingstitle'] = 'Archiválás';
+$labels['archivetype'] = 'Arhívum tovább bontása a következő szerint';
+$labels['archivetypeyear'] = 'Év ( pl Arhívum/2012)';
+$labels['archivetypemonth'] = 'Honap ( pl Arhívum/2012/06)';
+$labels['archivetypefolder'] = 'Eredeti mappa';
+$labels['archivetypesender'] = 'Feladó';
 $labels['unkownsender'] = 'ismeretlen';
 
 ?>
diff --git a/plugins/archive/localization/ko_KR.inc b/plugins/archive/localization/ko_KR.inc
index 96a7ac404..4226420a0 100644
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@@ -19,16 +19,16 @@
 $labels = array();
 $labels['buttontext'] = '보관';
 $labels['buttontitle'] = '이 메시지를 보관';
-$labels['archived'] = '성공적으로 보관 됨';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archived'] = '성공적으로 보관됨';
+$labels['archivedreload'] = '성공적으로 보관됨. 페이지를 다시 불러와서 새 보관 폴더를 확인하세요.';
+$labels['archiveerror'] = '일부 메시지가 보관되지 않음';
 $labels['archivefolder'] = '보관';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = '보관';
+$labels['archivetype'] = '보관된 메시지 정리 기준';
+$labels['archivetypeyear'] = '연도 (예: 보관 편지함/2012)';
+$labels['archivetypemonth'] = '월 (예: 보관 편지함/2012/06)';
+$labels['archivetypefolder'] = '원본 폴더';
+$labels['archivetypesender'] = '발신인 이메일';
+$labels['unkownsender'] = '알 수 없음';
 
 ?>
diff --git a/plugins/archive/localization/lt_LT.inc b/plugins/archive/localization/lt_LT.inc
index 36046277a..069a65665 100644
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Archyvuoti';
 $labels['buttontitle'] = 'Perkelti šį laišką į archyvą';
 $labels['archived'] = 'Laiškas sėkmingai perkeltas į archyvą';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Sėkmingai perkelta į archyvą. Iš naujo įkelkite puslapį, kad pamatytumėt pasikeitimus.';
+$labels['archiveerror'] = 'Į archyvą nepavyko perkelti keleto laiškų.';
 $labels['archivefolder'] = 'Archyvuoti';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Archyvuoti';
+$labels['archivetype'] = 'Padalinti archyvą pagal';
+$labels['archivetypeyear'] = 'Metai (pvz. Archyvas/2012)';
+$labels['archivetypemonth'] = 'Mėnesis (pvz. Archyvas/2012/06)';
+$labels['archivetypefolder'] = 'Tikrasis aplankas';
+$labels['archivetypesender'] = 'Siuntėjo el. pašto adresas';
+$labels['unkownsender'] = 'nežinomas';
 
 ?>
diff --git a/plugins/archive/localization/pt_BR.inc b/plugins/archive/localization/pt_BR.inc
index 6439780cb..3df6cfdad 100644
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@@ -20,13 +20,13 @@ $labels = array();
 $labels['buttontext'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archivedreload'] = 'Arquivado com sucesso. Recarregue a página para ver as novas pastas de arquivo.';
 $labels['archiveerror'] = 'Algumas mensagens não puderam ser arquivadas';
 $labels['archivefolder'] = 'Arquivo';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['settingstitle'] = 'Arquivo';
+$labels['archivetype'] = 'Dividir arquivo por';
+$labels['archivetypeyear'] = 'Ano (isto é, Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mês (isto é, Arquivo/2012/06)';
 $labels['archivetypefolder'] = 'Pasta original';
 $labels['archivetypesender'] = 'E-mail do remetente';
 $labels['unkownsender'] = 'desconhecido';
diff --git a/plugins/archive/localization/sl_SI.inc b/plugins/archive/localization/sl_SI.inc
index 94d1f68b1..b49fe93ab 100644
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arhiv';
 $labels['buttontitle'] = 'Arhiviraj to sporočilo';
 $labels['archived'] = 'Sporočilo je bilo uspešno arhivirano';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Uspešno  shranjeno v arhiv. Za pregled map v Arhivu ponovno naložite stran.';
+$labels['archiveerror'] = 'Nekaterih sporočil ni bilo mogoče arhivirati';
 $labels['archivefolder'] = 'Arhiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arhiv';
+$labels['archivetype'] = 'Razdeli arhiv glede na';
+$labels['archivetypeyear'] = 'Leto (npr. Arhiv/2012)';
+$labels['archivetypemonth'] = 'Mesec (npr. Arhiv/2012/06)';
+$labels['archivetypefolder'] = 'Izvorna mapa';
+$labels['archivetypesender'] = 'Naslov pošiljatelja';
+$labels['unkownsender'] = 'neznan';
 
 ?>
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index 765498301..b6960ea89 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = 'Arşiv';
 $labels['buttontitle'] = 'Bu postayı arşivle';
 $labels['archived'] = 'Başarıyla arşivlendi';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = 'Başarıyla arşivlendi. Yeni arşiv dosyalarını görmek için sayfayı yenileyin.';
+$labels['archiveerror'] = 'Bazı mesajlar arşivlenemedi.';
 $labels['archivefolder'] = 'Arşiv';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = 'Arşiv';
+$labels['archivetype'] = 'Arşivi bunla böl';
+$labels['archivetypeyear'] = 'Yıl (Arşiv/2012)';
+$labels['archivetypemonth'] = 'Ay(Arşiv/2012/06)';
+$labels['archivetypefolder'] = 'Özgün dosya';
+$labels['archivetypesender'] = 'E-Posta Göndericisi';
+$labels['unkownsender'] = 'bilinmeyen';
 
 ?>
diff --git a/plugins/archive/localization/zh_CN.inc b/plugins/archive/localization/zh_CN.inc
index f0e2d4236..4a13d541a 100644
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@@ -18,13 +18,13 @@
 
 $labels = array();
 $labels['buttontext'] = '存档';
-$labels['buttontitle'] = '将该信息存档';
+$labels['buttontitle'] = '存档该信息';
 $labels['archived'] = '存档成功';
-$labels['archivedreload'] = '存档成功。刷新本页来查看新的存档文件夹。';
+$labels['archivedreload'] = '存档成功。请刷新本页以查看新的存档文件夹。';
 $labels['archiveerror'] = '部分信息无法存档';
 $labels['archivefolder'] = '存档';
 $labels['settingstitle'] = '存档';
-$labels['archivetype'] = 'Divide archive by';
+$labels['archivetype'] = '分类存档按';
 $labels['archivetypeyear'] = '年(例如 存档/2012)';
 $labels['archivetypemonth'] = '月(例如 存档/2012/06)';
 $labels['archivetypefolder'] = '原始文件夹';
diff --git a/plugins/archive/localization/zh_TW.inc b/plugins/archive/localization/zh_TW.inc
index a434f3184..6eac3a391 100644
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@@ -20,15 +20,15 @@ $labels = array();
 $labels['buttontext'] = '封存';
 $labels['buttontitle'] = '封存此信件';
 $labels['archived'] = '已成功封存';
-$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
-$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivedreload'] = '封存動作完成.重新載入頁面瀏覽新的封存資料夾';
+$labels['archiveerror'] = '部分資訊無法完成封存';
 $labels['archivefolder'] = '封存';
-$labels['settingstitle'] = 'Archive';
-$labels['archivetype'] = 'Divide archive by';
-$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
-$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
-$labels['archivetypefolder'] = 'Original folder';
-$labels['archivetypesender'] = 'Sender email';
-$labels['unkownsender'] = 'unknown';
+$labels['settingstitle'] = '封存';
+$labels['archivetype'] = '封存檔案切割方式';
+$labels['archivetypeyear'] = '年分(例如: 封存/2012)';
+$labels['archivetypemonth'] = '月份(例如: 封存/2012/06)';
+$labels['archivetypefolder'] = '原始資料夾';
+$labels['archivetypesender'] = '寄件者電子信箱';
+$labels['unkownsender'] = '未知';
 
 ?>
diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc
index a589d0ce1..836da6639 100644
--- a/plugins/help/localization/ko_KR.inc
+++ b/plugins/help/localization/ko_KR.inc
@@ -19,6 +19,6 @@
 $labels = array();
 $labels['help'] = '도움말';
 $labels['about'] = '정보';
-$labels['license'] = '라이센스';
+$labels['license'] = '라이선스';
 
 ?>
diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc
index 5d6272eea..59719477b 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -19,6 +19,6 @@
 $labels = array();
 $labels['help'] = '帮助';
 $labels['about'] = '关于';
-$labels['license'] = '许可协议';
+$labels['license'] = '授权信息';
 
 ?>
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index 35ca87110..f272df7b0 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Göndərən';
 $labels['recipient'] = 'Qəbul edən';
 $labels['vacationaddresses'] = 'Əlavə ünvanlarım üçün siyahı (vergüllər ilə ayrılmış):';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
+$labels['vacationinterval'] = 'Məktublar nə qədər sıx göndərilsin:';
+$labels['days'] = 'günlər';
+$labels['seconds'] = 'saniyələr';
 $labels['vacationreason'] = 'Məktubun mətni (səbəb yoxdur):';
 $labels['vacationsubject'] = 'Məktubun mövzusu:';
 $labels['rulestop'] = 'Yerinə yetirməyi dayandır';
@@ -95,9 +98,9 @@ $labels['flagdeleted'] = 'Silindi';
 $labels['flaganswered'] = 'Cavab verilmiş';
 $labels['flagflagged'] = 'İşarəlilər';
 $labels['flagdraft'] = 'Qaralama';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
+$labels['setvariable'] = 'Dəyişəni təyin et';
+$labels['setvarname'] = 'Dəyişənin adı:';
+$labels['setvarvalue'] = 'Dəyişənin dəyəri:';
 $labels['setvarmodifiers'] = 'Modifikatorlar';
 $labels['varlower'] = 'aşağı registr';
 $labels['varupper'] = 'yuxarı registr';
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 47719e85e..64f81599e 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Ад каго';
 $labels['recipient'] = 'Каму';
 $labels['vacationaddresses'] = 'Дадатковы спіс атрымальнікаў (праз коску):';
 $labels['vacationdays'] = 'Як часта дасылаць паведамленні (ў днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index f718e3d39..28f2ddb99 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Подател';
 $labels['recipient'] = 'Получател';
 $labels['vacationaddresses'] = 'Допълнителни e-mail адреси (разделени със запетая):';
 $labels['vacationdays'] = 'Колко често пращате съобщения (в дни):';
+$labels['vacationinterval'] = 'Колко често да праща съобщения:';
+$labels['days'] = 'дни';
+$labels['seconds'] = 'секунди';
 $labels['vacationreason'] = 'Текст на съобщението (причина за ваканцията)';
 $labels['vacationsubject'] = 'Тема на съобщението';
 $labels['rulestop'] = 'Правила за спиране';
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index e12886f58..7d21dbd9f 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pošiljaoc';
 $labels['recipient'] = 'Primaoc';
 $labels['vacationaddresses'] = 'Moje dodatne email adrese (odvojite zarezima):';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
+$labels['vacationinterval'] = 'Frekvencija slanja poruka:';
+$labels['days'] = 'dana';
+$labels['seconds'] = 'sekundi';
 $labels['vacationreason'] = 'Tijelo poruke (razlog za odmor):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prestani procjenjivati pravila';
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index 2320dfe14..e721fcce3 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
 $labels['vacationaddresses'] = 'Altres adreces electròniques meves (separades per coma)';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
+$labels['vacationinterval'] = 'Amb quina freqüència enviar missatges:';
+$labels['days'] = 'dies';
+$labels['seconds'] = 'segons';
 $labels['vacationreason'] = 'Cos del missatge (raó de les vacances):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
 $labels['rulestop'] = 'Deixa d\'avaluar regles';
@@ -95,25 +98,25 @@ $labels['flagdeleted'] = 'Suprimit';
 $labels['flaganswered'] = 'Respost';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Esborrany';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
+$labels['setvariable'] = 'Ajusta la variable';
+$labels['setvarname'] = 'Nom de la variable:';
+$labels['setvarvalue'] = 'Valor de la variable:';
+$labels['setvarmodifiers'] = 'Modificadors:';
+$labels['varlower'] = 'minúscules';
+$labels['varupper'] = 'majúscules';
+$labels['varlowerfirst'] = 'el primer caràcter és minúscul';
+$labels['varupperfirst'] = 'el primer caràcter és majúscul';
+$labels['varquotewildcard'] = 'engloba els caràcters especials amb cometes';
+$labels['varlength'] = 'llargada';
+$labels['notify'] = 'Envia notificació';
+$labels['notifyaddress'] = 'Per a adreça de correu electrònic:';
+$labels['notifybody'] = 'Cos de la notificació';
+$labels['notifysubject'] = 'Tema de la notificació:';
+$labels['notifyfrom'] = 'Remitent de la notificació:';
+$labels['notifyimportance'] = 'Importànica:';
+$labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Crea filtre';
 $labels['usedata'] = 'Fes servir les següents dades al filtre:';
 $labels['nextstep'] = 'Següent pas';
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 0d7dfb2fb..26baeff2b 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -55,8 +55,11 @@ $labels['add'] = 'Přidej';
 $labels['del'] = 'Smaž';
 $labels['sender'] = 'Odesílatel';
 $labels['recipient'] = 'Příjemce';
-$labels['vacationaddresses'] = 'Seznam příjemců, kterým nebude zpráva odeslána (oddělené čárkou):';
+$labels['vacationaddresses'] = 'Moje další e-mailové adresy (aliasy) spojené s tímto účtem (oddělené čárkou):';
 $labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:';
+$labels['vacationinterval'] = 'Prodleva mezi automatickými odpověďmi:';
+$labels['days'] = 'dnů';
+$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Zpráva (Důvod nepřítomnosti):';
 $labels['vacationsubject'] = 'Předmět zprávy:';
 $labels['rulestop'] = 'Zastavit pravidla';
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index 81f2ca216..52fafe770 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Anfonwr';
 $labels['recipient'] = 'Derbynnwr';
 $labels['vacationaddresses'] = 'Fy chyfeiriadau ebost ychwanegol (gwahanir gyda coma):';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
+$labels['vacationinterval'] = 'Pa mor aml i ddanfon negeseuon:';
+$labels['days'] = 'dyddiau';
+$labels['seconds'] = 'eiliadau';
 $labels['vacationreason'] = 'Corff neges (rheswm ar wyliau):';
 $labels['vacationsubject'] = 'Pwnc neges:';
 $labels['rulestop'] = 'Stopio gwerthuso rheolau';
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 02aaa1b0e..cd3deaf40 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
 $labels['vacationaddresses'] = 'Mine alternative e-mailadresser (kommasepareret):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
+$labels['vacationinterval'] = 'Hvor tit skal besked sendes:';
+$labels['days'] = 'dage';
+$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Besked (ved ferie):';
 $labels['vacationsubject'] = 'Besked emne:';
 $labels['rulestop'] = 'Stop behandling af regler';
@@ -95,22 +98,22 @@ $labels['flagdeleted'] = 'Slettede';
 $labels['flaganswered'] = 'Besvaret';
 $labels['flagflagged'] = 'Markeret';
 $labels['flagdraft'] = 'Kladde';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
+$labels['setvariable'] = 'Skriv variablen';
+$labels['setvarname'] = 'Variabel navn:';
+$labels['setvarvalue'] = 'Variabel værdi:';
+$labels['setvarmodifiers'] = 'Modifikator';
+$labels['varlower'] = 'små bogstaver';
+$labels['varupper'] = 'store bogstaver';
+$labels['varlowerfirst'] = 'første bogstav lille';
+$labels['varupperfirst'] = 'Første bogstav stort';
+$labels['varquotewildcard'] = 'Sæt specialle tegn i citationstegn ';
 $labels['varlength'] = 'længde';
-$labels['notify'] = 'Send notification';
+$labels['notify'] = 'Send meddelelse';
 $labels['notifyaddress'] = 'Til e-mail adresse:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
+$labels['notifybody'] = 'meddelelses indhold:';
+$labels['notifysubject'] = 'Meddelelses emne:';
+$labels['notifyfrom'] = 'Meddelelses afsender:';
+$labels['notifyimportance'] = 'Vigtighed:';
 $labels['notifyimportancelow'] = 'lav';
 $labels['notifyimportancenormal'] = 'normal';
 $labels['notifyimportancehigh'] = 'høj';
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 207475896..b30625fe9 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
 $labels['vacationaddresses'] = 'Zusätzliche Liste von Empfängern (Komma getrennt):';
 $labels['vacationdays'] = 'Antwort wird erneut gesendet nach (in Tagen):';
+$labels['vacationinterval'] = 'Wie oft senden:';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Betreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
diff --git a/plugins/managesieve/localization/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 6bd9046b2..d0cba28db 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
 $labels['vacationaddresses'] = 'Zusätzliche Liste von E-Mail Empfängern (Komma getrennt):';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
+$labels['vacationinterval'] = 'Wie oft sollen Nachrichten gesendet werden:';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Nachrichteninhalt (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Nachrichtenbetreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index 8504f7747..5ef9916ad 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -34,18 +34,18 @@ $labels['filteris'] = 'είναι ίσο με';
 $labels['filterisnot'] = 'δεν είναι ίσο με';
 $labels['filterexists'] = 'υπάρχει';
 $labels['filternotexists'] = 'δεν υπάρχει';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
+$labels['filtermatches'] = 'ταιριάζει με την έκφραση ';
+$labels['filternotmatches'] = 'Δεν ταιριάζει με την έκφραση';
+$labels['filterregex'] = 'ταιριάζει με κανονική έκφραση';
+$labels['filternotregex'] = 'δεν ταιριάζει με κανονική έκφραση';
 $labels['filterunder'] = 'κάτω';
 $labels['filterover'] = 'πάνω';
 $labels['addrule'] = 'Προσθήκη κανόνα';
 $labels['delrule'] = 'Διαγραφή κανόνα';
 $labels['messagemoveto'] = 'Μετακίνηση μηνύματος στο';
 $labels['messageredirect'] = 'Προώθηση μηνύματος στο';
-$labels['messagecopyto'] = 'Copy message to';
-$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagecopyto'] = 'Αντιγραφη μυνηματος σε';
+$labels['messagesendcopy'] = 'Αποστολη της αντιγραφης μυνηματος σε';
 $labels['messagereply'] = 'Απάντηση με μήνυμα';
 $labels['messagedelete'] = 'Διαγραφή μηνύματος';
 $labels['messagediscard'] = 'Απόρριψη με μήνυμα';
@@ -57,86 +57,89 @@ $labels['sender'] = 'Αποστολέας';
 $labels['recipient'] = 'Παραλήπτης';
 $labels['vacationaddresses'] = 'Πρόσθετη λίστα email παραληπτών (διαχωρισμένη με κόμματα):';
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
+$labels['vacationinterval'] = 'Συχνότητα αποστολής μηνυμάτων:';
+$labels['days'] = 'ημερες';
+$labels['seconds'] = 'δευτερόλεπτα';
 $labels['vacationreason'] = 'Σώμα μηνύματος (λόγος απουσίας):';
-$labels['vacationsubject'] = 'Message subject:';
+$labels['vacationsubject'] = 'Θέμα μηνύματος: ';
 $labels['rulestop'] = 'Παύση επαλήθευσης κανόνων';
-$labels['enable'] = 'Enable/Disable';
-$labels['filterset'] = 'Filters set';
-$labels['filtersets'] = 'Filter sets';
-$labels['filtersetadd'] = 'Add filters set';
-$labels['filtersetdel'] = 'Delete current filters set';
-$labels['filtersetact'] = 'Activate current filters set';
-$labels['filtersetdeact'] = 'Deactivate current filters set';
-$labels['filterdef'] = 'Filter definition';
-$labels['filtersetname'] = 'Filters set name';
-$labels['newfilterset'] = 'New filters set';
-$labels['active'] = 'active';
-$labels['none'] = 'none';
-$labels['fromset'] = 'from set';
-$labels['fromfile'] = 'from file';
-$labels['filterdisabled'] = 'Filter disabled';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count does not equal';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value does not equal';
-$labels['setflags'] = 'Set flags to the message';
-$labels['addflags'] = 'Add flags to the message';
-$labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
+$labels['enable'] = 'Ενεργοποιηση/Απενεργοποιηση';
+$labels['filterset'] = 'Φίλτρα';
+$labels['filtersets'] = 'Φίλτρο';
+$labels['filtersetadd'] = 'Προσθήκη φίλτρων';
+$labels['filtersetdel'] = 'Διαγραφή φίλτρων';
+$labels['filtersetact'] = 'Ενεργοποιηση φιλτρων';
+$labels['filtersetdeact'] = 'Απενεργοποιηση φιλτρων';
+$labels['filterdef'] = 'Ορισμος φιλτρου';
+$labels['filtersetname'] = 'Ονομασία φίλτρων';
+$labels['newfilterset'] = 'Νεα φιλτρα';
+$labels['active'] = 'ενεργο';
+$labels['none'] = 'κανένα';
+$labels['fromset'] = 'από το σύνολο ';
+$labels['fromfile'] = 'απο αρχειο';
+$labels['filterdisabled'] = 'Απενεργοποιημενο φιλτρο';
+$labels['countisgreaterthan'] = 'αρίθμηση είναι μεγαλύτερη από';
+$labels['countisgreaterthanequal'] = 'η μετρηση είναι μεγαλύτερη ή ίση προς';
+$labels['countislessthan'] = 'η μετρηση είναι μικρότερη απο';
+$labels['countislessthanequal'] = 'η μετρηση είναι μικρότερη ή ίση προς';
+$labels['countequals'] = 'η μέτρηση είναι ίση προς ';
+$labels['countnotequals'] = 'η μέτρηση δεν είναι ίση προς ';
+$labels['valueisgreaterthan'] = 'η τιμη είναι μεγαλύτερη από';
+$labels['valueisgreaterthanequal'] = 'η τιμη είναι μεγαλύτερη ή ίση προς';
+$labels['valueislessthan'] = 'η τιμη είναι μικρότερη απο';
+$labels['valueislessthanequal'] = 'η τιμη είναι μικρότερη ή ίση προς';
+$labels['valueequals'] = 'η τιμη είναι ίση με';
+$labels['valuenotequals'] = 'η τιμη δεν είναι ίση με';
+$labels['setflags'] = 'Ορισμός σημαίων στο μήνυμα';
+$labels['addflags'] = 'Προσθήκη σημαίων στο μήνυμα';
+$labels['removeflags'] = 'Αφαιρέση σημαίων από το μήνυμα';
+$labels['flagread'] = 'Αναγνωση';
+$labels['flagdeleted'] = 'Διεγραμμένο';
+$labels['flaganswered'] = 'Απαντήθηκε ';
+$labels['flagflagged'] = 'Σημειωμένο';
+$labels['flagdraft'] = 'Πρόχειρα';
+$labels['setvariable'] = 'Ορισμός μεταβλητής';
+$labels['setvarname'] = 'Όνομα μεταβλητης:';
+$labels['setvarvalue'] = 'Τιμη μεταβλητης:';
+$labels['setvarmodifiers'] = 'Τροποποιητές: ';
+$labels['varlower'] = 'Μικρογράμματη γραφή';
+$labels['varupper'] = 'κεφαλαία γράμματα ';
+$labels['varlowerfirst'] = 'πρώτος χαρακτήρας πεζός ';
+$labels['varupperfirst'] = 'πρώτος χαρακτήρας κεφαλαία γράμματα';
+$labels['varquotewildcard'] = 'παραθέση ειδικων χαρακτήρων';
+$labels['varlength'] = 'Μήκος';
+$labels['notify'] = 'Αποστολή ειδοποίησης ';
+$labels['notifyaddress'] = 'Σε διεύθυνση email:';
+$labels['notifybody'] = 'Οργανισμός ειδοποιησης:';
+$labels['notifysubject'] = 'Θεμα ειδοποιησης:';
+$labels['notifyfrom'] = 'Αποστολεας ειδοποιησης:';
+$labels['notifyimportance'] = 'Σημασία: ';
+$labels['notifyimportancelow'] = 'Χαμηλή';
+$labels['notifyimportancenormal'] = 'Κανονική';
+$labels['notifyimportancehigh'] = 'Υψηλή';
+$labels['filtercreate'] = 'Δημιουργία φίλτρου';
+$labels['usedata'] = 'Χρησιμοποιηση ακολουθων δεδομενων στο φιλτρο:';
+$labels['nextstep'] = 'Επομενο βημα';
 $labels['...'] = '...';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['advancedopts'] = 'Προχωρημένες ρυθμίσεις';
+$labels['body'] = 'Σώμα';
+$labels['address'] = 'Διεύθυνση';
+$labels['envelope'] = 'φάκελος';
+$labels['modifier'] = 'Τροποποιηση: ';
+$labels['text'] = 'κειμενο';
+$labels['undecoded'] = 'αποκωδικοποιημένο (raw)';
+$labels['contenttype'] = 'Τύπος περιεχομένου ';
+$labels['modtype'] = 'τυπος:';
+$labels['allparts'] = 'Όλα';
+$labels['domain'] = 'τομέας';
+$labels['localpart'] = 'τοπικό τμήμα ';
+$labels['user'] = 'χρηστης';
+$labels['detail'] = 'λεπτομερειες';
+$labels['comparator'] = 'σύγκριση:';
+$labels['default'] = 'προεπιλογή';
+$labels['octet'] = 'αυστηρή (οκτάδα) ';
+$labels['asciicasemap'] = 'πεζά ή κεφαλαία (ascii-casemap)';
+$labels['asciinumeric'] = 'αριθμητικό (ascii-αριθμητικο)';
 
 $messages = array();
 $messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
@@ -145,30 +148,30 @@ $messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρ
 $messages['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
 $messages['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
 $messages['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['filterdeleteconfirm'] = 'Είστε σίγουροι ότι θέλετε να διαγράψετε το επιλεγμένο φίλτρο? ';
 $messages['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
 $messages['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
 $messages['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
 $messages['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
-$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$messages['setactivated'] = 'Filters set activated successfully.';
-$messages['setdeactivated'] = 'Filters set deactivated successfully.';
-$messages['setdeleted'] = 'Filters set deleted successfully.';
-$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$messages['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$messages['setcreated'] = 'Filters set created successfully.';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$messages['nametoolong'] = 'Name too long.';
-$messages['namereserved'] = 'Reserved name.';
-$messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['ruleexist'] = 'Φιλτρο με αυτο το όνομα υπάρχει ήδη. ';
+$messages['setactivateerror'] = 'Αδυναμία ενεργοποιησης επιλεγμενων φιλτρων. Προέκυψε σφάλμα στον διακομιστή.';
+$messages['setdeactivateerror'] = 'Αδυναμία απενεργοποιησης επιλεγμενων φιλτρων. Προέκυψε σφάλμα στον διακομιστή.';
+$messages['setdeleteerror'] = 'Αδυναμία διαγραφής φίλτρων. Προέκυψε σφάλμα στον διακομιστή';
+$messages['setactivated'] = 'Φίλτρα ενεργοποιήθηκαν με επιτυχία.';
+$messages['setdeactivated'] = 'Φίλτρα απενεργοποιήθηκαν με επιτυχία.';
+$messages['setdeleted'] = 'Τα φίλτρα διαγράφηκαν επιτυχώς.';
+$messages['setdeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τα επιλεγμένα φιλτρα?';
+$messages['setcreateerror'] = 'Αδυναμία δημιουργιας φιλτρων. Προέκυψε σφάλμα στον διακομιστή.';
+$messages['setcreated'] = 'Τα φιλτρα δημιουργηθηκαν επιτυχως.';
+$messages['activateerror'] = 'Αδυναμία ενεργοποιησης επιλεγμενου φίλτρου(ων). Προέκυψε σφάλμα στον διακομιστή.';
+$messages['deactivateerror'] = 'Αδυναμία απενεργοποιησης επιλεγμενου φίλτρου(ων). Προέκυψε σφάλμα στον διακομιστή.';
+$messages['deactivated'] = 'Το φιλτρο(α) απενεργοποιηθηκαν επιτυχως.';
+$messages['activated'] = 'Το φίλτρο(α) ενεργοποιηθηκαν επιτυχώς.';
+$messages['moved'] = 'Το φίλτρο μετακινηθηκε επιτυχώς.';
+$messages['moveerror'] = 'Αδυναμία μετακινησης επιλεγμενου φίλτρου. Προέκυψε σφάλμα στον διακομιστή.';
+$messages['nametoolong'] = 'Το όνομα είναι πολύ μεγάλο.';
+$messages['namereserved'] = 'Δεσμευμένο όνομα. ';
+$messages['setexist'] = 'Set υπάρχει ήδη. ';
+$messages['nodata'] = 'Τουλάχιστον μία θέση πρέπει να επιλεγεί!';
 
 ?>
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 394b6c014..4dd4f7d8b 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/eo.inc b/plugins/managesieve/localization/eo.inc
index b30b08ab7..3ce49ddb2 100644
--- a/plugins/managesieve/localization/eo.inc
+++ b/plugins/managesieve/localization/eo.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sendanto';
 $labels['recipient'] = 'Ricevanto';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index 20dee2f74..c9c6e70f8 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index 430079288..69ad9ce8a 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuánto enviar mensajes (en días):';
+$labels['vacationinterval'] = 'Cada cuánto enviar mensajes:';
+$labels['days'] = 'días';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
 $labels['vacationsubject'] = 'Asunto del Mensaje:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index 7e70a9d57..334a65cee 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
 $labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
 $labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Kirja sisu (puhkuse põhjus):';
 $labels['vacationsubject'] = 'Kirja teema:';
 $labels['rulestop'] = 'Peata reeglite otsimine';
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index 7185d8059..ebdc4531d 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'فرستنده';
 $labels['recipient'] = 'گیرنده';
 $labels['vacationaddresses'] = 'آدرس‌های ایمیل دیگر من (جدا شده با ویرگول):';
 $labels['vacationdays'] = 'پیغام ها در چه مواقعی فرستاده شدند (در روزهای):';
+$labels['vacationinterval'] = 'مواقعی که پیغام‌ها ارسال می‌شوند:';
+$labels['days'] = 'روزها';
+$labels['seconds'] = 'ثانیه‌ها';
 $labels['vacationreason'] = 'بدنه پیغام (علت مسافرت):';
 $labels['vacationsubject'] = 'موضوع پیغام:';
 $labels['rulestop'] = 'توقف قوانین ارزیابی';
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 18cd0c68f..71856c95f 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Lähettäjä';
 $labels['recipient'] = 'Vastaanottaja';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Viestin aihe:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 912c03f48..c269fd32e 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Expéditeur';
 $labels['recipient'] = 'Destinataire';
 $labels['vacationaddresses'] = 'Liste des destinataires (séparés par une virgule) :';
 $labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
+$labels['vacationinterval'] = 'Comment envoyer les messages :';
+$labels['days'] = 'jours';
+$labels['seconds'] = 'secondes';
 $labels['vacationreason'] = 'Corps du message (raison de l\'absence) :';
 $labels['vacationsubject'] = 'Sujet du message:';
 $labels['rulestop'] = 'Arrêter d\'évaluer les prochaines règles';
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index 4a4ec3dc5..fef5ed718 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -34,10 +34,10 @@ $labels['filteris'] = 'é igual a';
 $labels['filterisnot'] = 'non é igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'non existe';
-$labels['filtermatches'] = 'matches expression';
-$labels['filternotmatches'] = 'not matches expression';
-$labels['filterregex'] = 'matches regular expression';
-$labels['filternotregex'] = 'not matches regular expression';
+$labels['filtermatches'] = 'casa coa expresión';
+$labels['filternotmatches'] = 'non casa coa expresión';
+$labels['filterregex'] = 'casa coa expresión regular';
+$labels['filternotregex'] = 'non casa coa expresión regular';
 $labels['filterunder'] = 'baixo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Engadir regra';
@@ -57,12 +57,15 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de enderezos de correo de destinatarios adicionais (separados por comas):';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
+$labels['vacationinterval'] = 'Con qué frecuencia vanse enviar mensaxes:';
+$labels['days'] = 'días';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Corpo da mensaxe (razón de vacacións):';
-$labels['vacationsubject'] = 'Message subject:';
+$labels['vacationsubject'] = 'Asunto da mensaxe:';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Activar/Desactivar';
 $labels['filterset'] = 'Conxunto de filtros';
-$labels['filtersets'] = 'Filter sets';
+$labels['filtersets'] = 'Conxunto de filtros';
 $labels['filtersetadd'] = 'Engadir un conxunto de filtros';
 $labels['filtersetdel'] = 'Eliminar o conxunto de filtros actual';
 $labels['filtersetact'] = 'Activar o conxunto de filtros actual';
@@ -75,68 +78,68 @@ $labels['none'] = 'ningún';
 $labels['fromset'] = 'de conxunto';
 $labels['fromfile'] = 'de arquivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
-$labels['countisgreaterthan'] = 'count is greater than';
-$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
-$labels['countislessthan'] = 'count is less than';
-$labels['countislessthanequal'] = 'count is less than or equal to';
-$labels['countequals'] = 'count is equal to';
-$labels['countnotequals'] = 'count does not equal';
-$labels['valueisgreaterthan'] = 'value is greater than';
-$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
-$labels['valueislessthan'] = 'value is less than';
-$labels['valueislessthanequal'] = 'value is less than or equal to';
-$labels['valueequals'] = 'value is equal to';
-$labels['valuenotequals'] = 'value does not equal';
+$labels['countisgreaterthan'] = 'a conta é meirande que';
+$labels['countisgreaterthanequal'] = 'a conta é meirande ou igual a';
+$labels['countislessthan'] = 'a conta é menor que';
+$labels['countislessthanequal'] = 'a conta é menor ou igual a';
+$labels['countequals'] = 'a conta é igual a';
+$labels['countnotequals'] = 'a conta non é igual a';
+$labels['valueisgreaterthan'] = 'o valor é meirande que ';
+$labels['valueisgreaterthanequal'] = 'o valor é meirande ou igual a';
+$labels['valueislessthan'] = 'o valor é menor que';
+$labels['valueislessthanequal'] = 'o valor é menor ou igual a';
+$labels['valueequals'] = 'o valor é igual a';
+$labels['valuenotequals'] = 'o valor non é igual a';
 $labels['setflags'] = 'Set flags to the message';
 $labels['addflags'] = 'Add flags to the message';
 $labels['removeflags'] = 'Remove flags from the message';
-$labels['flagread'] = 'Read';
-$labels['flagdeleted'] = 'Deleted';
-$labels['flaganswered'] = 'Answered';
-$labels['flagflagged'] = 'Flagged';
-$labels['flagdraft'] = 'Draft';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
+$labels['flagread'] = 'Lidas';
+$labels['flagdeleted'] = 'Eliminadas';
+$labels['flaganswered'] = 'Respostadas';
+$labels['flagflagged'] = 'Marcadas';
+$labels['flagdraft'] = 'Borrador';
+$labels['setvariable'] = 'Establecer variable';
+$labels['setvarname'] = 'Nome da variable:';
+$labels['setvarvalue'] = 'Valor da variable:';
+$labels['setvarmodifiers'] = 'Modificadores:';
+$labels['varlower'] = 'minúscula';
+$labels['varupper'] = 'maiúscula';
+$labels['varlowerfirst'] = 'primeira letra minúscula';
+$labels['varupperfirst'] = 'primeira letra maiúscula';
 $labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
+$labels['varlength'] = 'lonxitude';
+$labels['notify'] = 'Enviar notificación';
+$labels['notifyaddress'] = 'Destinatario:';
+$labels['notifybody'] = 'Corpo da notificación:';
+$labels['notifysubject'] = 'Asunto da notificación:';
+$labels['notifyfrom'] = 'Remitente da notificación:';
+$labels['notifyimportance'] = 'Importancia:';
+$labels['notifyimportancelow'] = 'baixa';
 $labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
-$labels['filtercreate'] = 'Create filter';
-$labels['usedata'] = 'Use following data in the filter:';
-$labels['nextstep'] = 'Next Step';
+$labels['notifyimportancehigh'] = 'alta';
+$labels['filtercreate'] = 'Crear filtro';
+$labels['usedata'] = 'Usar os seguintes datos no filtro:';
+$labels['nextstep'] = 'Seguinte paso';
 $labels['...'] = '...';
-$labels['advancedopts'] = 'Advanced options';
-$labels['body'] = 'Body';
-$labels['address'] = 'address';
+$labels['advancedopts'] = 'Opcións avanzadas';
+$labels['body'] = 'Corpo';
+$labels['address'] = 'enderezo';
 $labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
-$labels['text'] = 'text';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
-$labels['domain'] = 'domain';
-$labels['localpart'] = 'local part';
-$labels['user'] = 'user';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = 'default';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['modifier'] = 'modificador:';
+$labels['text'] = 'texto';
+$labels['undecoded'] = 'sen codificar (en bruto)';
+$labels['contenttype'] = 'tipo de contido';
+$labels['modtype'] = 'tipo:';
+$labels['allparts'] = 'todos';
+$labels['domain'] = 'dominio';
+$labels['localpart'] = 'parte local';
+$labels['user'] = 'usuario';
+$labels['detail'] = 'detalle';
+$labels['comparator'] = 'comparador';
+$labels['default'] = 'defecto';
+$labels['octet'] = 'estricto (octeto)';
+$labels['asciicasemap'] = 'non sensible a maiúsculas/minúsculas (ascii-casemap)';
+$labels['asciinumeric'] = 'numérico (ascii-numerico)';
 
 $messages = array();
 $messages['filterunknownerror'] = 'Erro descoñecido servidor';
@@ -150,7 +153,7 @@ $messages['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra se
 $messages['actiondeleteconfirm'] = 'Está seguro de que desexa eliminar a acción seleccionada?';
 $messages['forbiddenchars'] = 'Caracteres non permitidos no campo';
 $messages['cannotbeempty'] = 'O campo non pode estar baleiro';
-$messages['ruleexist'] = 'Filter with specified name already exists.';
+$messages['ruleexist'] = 'Xa existe un filtro con nome especificado.';
 $messages['setactivateerror'] = 'Imposible activar o conxunto de filtros seleccionado. Ocurriu un erro no servidor';
 $messages['setdeactivateerror'] = 'Imposible desactivar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
 $messages['setdeleteerror'] = 'Imposible eliminar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
@@ -160,15 +163,15 @@ $messages['setdeleted'] = 'O Conxunto de filtros borrouse con éxito';
 $messages['setdeleteconfirm'] = 'Está seguro de que desexa eliminar o conxunto de filtros seleccionado?';
 $messages['setcreateerror'] = 'Imposible crear o conxunto de filtros. Ocurriu un error no servidor';
 $messages['setcreated'] = 'Conxunto de filtros creado con éxito';
-$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$messages['deactivated'] = 'Filter(s) disabled successfully.';
-$messages['activated'] = 'Filter(s) enabled successfully.';
-$messages['moved'] = 'Filter moved successfully.';
-$messages['moveerror'] = 'Unable to move selected filter. Server error occured.';
+$messages['activateerror'] = 'Non foi posible activar o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
+$messages['deactivateerror'] = 'Non foi posible desactivar o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
+$messages['deactivated'] = 'Desactiváronse os filtros correctamente.';
+$messages['activated'] = 'Activáronse os filtros correctamente';
+$messages['moved'] = 'Moveuse correctamente o filtro.';
+$messages['moveerror'] = 'Non foi posible mover o(s) filtro(s) seleccionado(s). Ocurriu un erro no servidor.';
 $messages['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis';
-$messages['namereserved'] = 'Reserved name.';
+$messages['namereserved'] = 'Nome reservado';
 $messages['setexist'] = 'Set already exists.';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = 'É preciso seleccionar polo menos unha posición!';
 
 ?>
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index 547913199..aa736ac87 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'השולח';
 $labels['recipient'] = 'הנמען';
 $labels['vacationaddresses'] = 'כתובות דוא"ל נוספות שלי (מופרדות ע"י פסיקים)';
 $labels['vacationdays'] = 'באיזו תדירות ( בימים ) לשלוח הודעות:';
+$labels['vacationinterval'] = 'באיזו תדירות לשלוח ההודעה';
+$labels['days'] = 'ימים';
+$labels['seconds'] = 'שניות';
 $labels['vacationreason'] = 'גוף ההודעה (סיבת החופשה):';
 $labels['vacationsubject'] = 'נושא ההודעה:';
 $labels['rulestop'] = 'עצירה של בחינת הכללים';
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index c38ed3ee2..64b9bef62 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Primatelj';
 $labels['vacationaddresses'] = 'Dodatna lista primatelja (odvojenih zarezom):';
 $labels['vacationdays'] = 'Koliko često slati poruku (u danima):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Tijelo poruke (razlog odmora):';
 $labels['vacationsubject'] = 'Naslov poruke:';
 $labels['rulestop'] = 'Prekini izvođenje filtera';
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index de4f687d8..9d39ffac3 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Feladó';
 $labels['recipient'] = 'Címzett';
 $labels['vacationaddresses'] = 'További címzettek (vesszővel elválasztva):';
 $labels['vacationdays'] = 'Válaszüzenet küldése ennyi naponként:';
+$labels['vacationinterval'] = 'Milyen gyakran küld üzeneteket:';
+$labels['days'] = 'napok';
+$labels['seconds'] = 'másodpercek';
 $labels['vacationreason'] = 'Levél szövege (automatikus válasz):';
 $labels['vacationsubject'] = 'Üzenet tárgya:';
 $labels['rulestop'] = 'Műveletek végrehajtásának befejezése';
diff --git a/plugins/managesieve/localization/hy_AM.inc b/plugins/managesieve/localization/hy_AM.inc
index a0c1c7cca..908175f1d 100644
--- a/plugins/managesieve/localization/hy_AM.inc
+++ b/plugins/managesieve/localization/hy_AM.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Ուղարկող';
 $labels['recipient'] = 'Ստացող';
 $labels['vacationaddresses'] = 'Իմ հավելյալ էլփոստի հասցեներ (բաժանված ստորակետներով).';
 $labels['vacationdays'] = 'Ինչ հաճախությամբ ուղարկել հաղորդագրությունները (օրեր)`';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Հաղորդագրության բովանդակություն (արձակուրդի պատճառ)`';
 $labels['vacationsubject'] = 'Հաղորդագրության վերնագիր`';
 $labels['rulestop'] = 'Դադարել պայմանների ստուգումը';
diff --git a/plugins/managesieve/localization/ia.inc b/plugins/managesieve/localization/ia.inc
index f4ea903be..45f6e5263 100644
--- a/plugins/managesieve/localization/ia.inc
+++ b/plugins/managesieve/localization/ia.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index 0e9245d6f..a30c2a0b0 100644
--- a/plugins/managesieve/localization/id_ID.inc
+++ b/plugins/managesieve/localization/id_ID.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pengirim';
 $labels['recipient'] = 'Penerima';
 $labels['vacationaddresses'] = 'Alamat email tambahan saya (dipisahkan koma):';
 $labels['vacationdays'] = 'Seberapa sering mengirim pesan (dalam hari):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Isi pesan (alasan liburan):';
 $labels['vacationsubject'] = 'Judul pesan:';
 $labels['rulestop'] = 'Berhenti mengevaluasi aturan';
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index bcbf4d186..0ac4f293a 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Mittente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
+$labels['vacationinterval'] = 'Ogni quanto tempo inviare i messaggi:';
+$labels['days'] = 'giorni';
+$labels['seconds'] = 'secondi';
 $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
 $labels['vacationsubject'] = 'Oggetto del messaggio';
 $labels['rulestop'] = 'Non valutare le regole successive';
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index 715827bd4..0cd4f44b9 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -57,6 +57,9 @@ $labels['sender'] = '送信者';
 $labels['recipient'] = '宛先';
 $labels['vacationaddresses'] = '電子メールの宛先の(コンマ区切った)追加のリスト:';
 $labels['vacationdays'] = 'メッセージを(1日に)送信する頻度:';
+$labels['vacationinterval'] = 'メッセージを送信する頻度:';
+$labels['days'] = '日';
+$labels['seconds'] = '秒';
 $labels['vacationreason'] = 'メッセージ本体(休暇の理由):';
 $labels['vacationsubject'] = 'メッセージの件名:';
 $labels['rulestop'] = 'ルールの評価を停止';
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index 8445c297d..5ab4fc220 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -19,156 +19,159 @@
 
 $labels['filters'] = '필터';
 $labels['managefilters'] = '수신 메일 필터 관리';
-$labels['filtername'] = '필터 이름';
+$labels['filtername'] = '필터명';
 $labels['newfilter'] = '새 필터';
 $labels['filteradd'] = '필터 추가';
 $labels['filterdel'] = '필터 삭제';
 $labels['moveup'] = '위로 이동';
 $labels['movedown'] = '아래로 이동';
-$labels['filterallof'] = '다음에 오는 규칙들 전부와 일치';
-$labels['filteranyof'] = '다음에 오는 규칙들 중 어떠한 것 이라도 일치';
+$labels['filterallof'] = '다음의 모든 규칙과 일치함';
+$labels['filteranyof'] = '다음 규칙 중 하나라도 일치함';
 $labels['filterany'] = '모든 메시지';
-$labels['filtercontains'] = '포함합니다';
-$labels['filternotcontains'] = '포함하지 않습니다';
-$labels['filteris'] = '와 같습니다';
-$labels['filterisnot'] = '와 같지 않습니다';
-$labels['filterexists'] = '존재합니다';
-$labels['filternotexists'] = '존재하지 않습니다';
-$labels['filtermatches'] = '표현식과 일치합니다';
-$labels['filternotmatches'] = '표현식과 일치하지 않습니다';
-$labels['filterregex'] = '정규표현식과 일치합니다';
-$labels['filternotregex'] = '정규 표현식과 일치하지 않습니다';
-$labels['filterunder'] = 'under';
-$labels['filterover'] = 'over';
-$labels['addrule'] = '규칙 더하기';
+$labels['filtercontains'] = '다음을 포함함';
+$labels['filternotcontains'] = '다음을 포함하지 않음';
+$labels['filteris'] = '다음과 같음';
+$labels['filterisnot'] = '다음과 같지 않음';
+$labels['filterexists'] = '다음이 존재함';
+$labels['filternotexists'] = '다음이 존재하지 않음';
+$labels['filtermatches'] = '다음 표현식과 일치함';
+$labels['filternotmatches'] = '다음 표현식과 일치하지 않음';
+$labels['filterregex'] = '다음 정규 표현식과 일치함';
+$labels['filternotregex'] = '다음 정규 표현식과 일치하지 않음';
+$labels['filterunder'] = '다음보다 아래임';
+$labels['filterover'] = '다음보다 위임';
+$labels['addrule'] = '규칙 추가';
 $labels['delrule'] = '규칙 삭제';
-$labels['messagemoveto'] = '메시지 이동';
-$labels['messageredirect'] = '메시지를 Redirect';
-$labels['messagecopyto'] = '메시지를 복사';
-$labels['messagesendcopy'] = '메시지의 복사본 보내기';
-$labels['messagereply'] = '메시지에 회신하기';
-$labels['messagedelete'] = '메시지 삭제';
-$labels['messagediscard'] = 'Discard with message';
-$labels['messagesrules'] = 'For incoming mail:';
-$labels['messagesactions'] = '...execute the following actions:';
+$labels['messagemoveto'] = '메시지를 다음 위치로 이동함';
+$labels['messageredirect'] = '메시지를 다음 주소로 전송함';
+$labels['messagecopyto'] = '메시지를 다음 위치로 복사함';
+$labels['messagesendcopy'] = '메시지의 사본을 다음 위치로 보냄';
+$labels['messagereply'] = '다음 메시지로 회신';
+$labels['messagedelete'] = '메시지를 삭제';
+$labels['messagediscard'] = '다음 메시지와 함께 폐기';
+$labels['messagesrules'] = '해당 받은 메일:';
+$labels['messagesactions'] = '...다음 동작을 실행:';
 $labels['add'] = '추가';
 $labels['del'] = '삭제';
-$labels['sender'] = '보낸 사람';
-$labels['recipient'] = '수신자';
-$labels['vacationaddresses'] = '나의 추가 e-mail 주소(들) (콤마로 구분 됨):';
-$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['sender'] = '발신인';
+$labels['recipient'] = '수신인';
+$labels['vacationaddresses'] = '나의 추가 이메일 주소 (쉼표로 구분됨):';
+$labels['vacationdays'] = '메시지 발신 주기 (일):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '메시지 본문 (휴가 사유):';
 $labels['vacationsubject'] = '메시지 제목:';
-$labels['rulestop'] = '규칙의 실행을 멈춤';
-$labels['enable'] = '사용/사용안함';
-$labels['filterset'] = '필터 묶음';
-$labels['filtersets'] = '필터 묶음';
-$labels['filtersetadd'] = '필터 묶음 추가';
-$labels['filtersetdel'] = '현재 필터 묶음을 삭제';
+$labels['rulestop'] = '규칙 평가를 중단';
+$labels['enable'] = '활성화/비활성화';
+$labels['filterset'] = '필터 세트';
+$labels['filtersets'] = '필터 세트';
+$labels['filtersetadd'] = '필터 세트 추가';
+$labels['filtersetdel'] = '현재 필터 세트를 삭제';
 $labels['filtersetact'] = '현재 필터 세트를 활성화';
 $labels['filtersetdeact'] = '현재 필터 세트를 비활성화';
 $labels['filterdef'] = '필터 정의';
-$labels['filtersetname'] = '필터 세트 이름';
-$labels['newfilterset'] = '새로운 필터 세트';
+$labels['filtersetname'] = '필터 세트명';
+$labels['newfilterset'] = '새 필터 세트';
 $labels['active'] = '활성';
 $labels['none'] = '없음';
-$labels['fromset'] = '묶음으로 부터';
-$labels['fromfile'] = '파일로 부터';
-$labels['filterdisabled'] = '필터 사용하지 않음';
-$labels['countisgreaterthan'] = '갯수가 큼';
-$labels['countisgreaterthanequal'] = '갯수가 크거나 같음';
-$labels['countislessthan'] = '갯수가 작음';
-$labels['countislessthanequal'] = '갯수가 작거나 같음';
-$labels['countequals'] = '갯수가 같음';
-$labels['countnotequals'] = '갯수가 같지 않음';
-$labels['valueisgreaterthan'] = '값이 큼';
-$labels['valueisgreaterthanequal'] = '값이 크거나 같음';
-$labels['valueislessthan'] = '값이 작음';
-$labels['valueislessthanequal'] = '값이 작거나 같음';
-$labels['valueequals'] = '값이 같음';
-$labels['valuenotequals'] = '값이 같지 않음';
-$labels['setflags'] = '메시지에 플래그를 설정';
-$labels['addflags'] = '메시지에 플래그를 추가';
-$labels['removeflags'] = '메시지에서 플래그를 제거';
+$labels['fromset'] = '세트로부터';
+$labels['fromfile'] = '파일로부터';
+$labels['filterdisabled'] = '필터가 비활성화됨';
+$labels['countisgreaterthan'] = '개수가 다음보다 큼';
+$labels['countisgreaterthanequal'] = '개수가 다음보다 크거나 같음';
+$labels['countislessthan'] = '개수가 다음보다 작음';
+$labels['countislessthanequal'] = '개수가 작거나 같음';
+$labels['countequals'] = '개수가 다음과 같음';
+$labels['countnotequals'] = '개수가 다음과 같지 않음';
+$labels['valueisgreaterthan'] = '값이 다음보다 큼';
+$labels['valueisgreaterthanequal'] = '값이 다음보다 크거나 같음';
+$labels['valueislessthan'] = '값이 다음보다 작음';
+$labels['valueislessthanequal'] = '값이 다음보다 작거나 같음';
+$labels['valueequals'] = '값이 다음과 같음';
+$labels['valuenotequals'] = '값이 다음과 같지 않음';
+$labels['setflags'] = '메시지에 깃발을 설정';
+$labels['addflags'] = '메시지에 깃발을 추가';
+$labels['removeflags'] = '메시지에서 깃발을 제거';
 $labels['flagread'] = '읽음';
 $labels['flagdeleted'] = '삭제됨';
 $labels['flaganswered'] = '응답함';
-$labels['flagflagged'] = '표시함';
+$labels['flagflagged'] = '깃발을 추가함';
 $labels['flagdraft'] = '임시 보관함';
-$labels['setvariable'] = 'Set variable';
-$labels['setvarname'] = 'Variable name:';
-$labels['setvarvalue'] = 'Variable value:';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
-$labels['varlength'] = 'length';
-$labels['notify'] = 'Send notification';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
-$labels['notifysubject'] = 'Notification subject:';
-$labels['notifyfrom'] = 'Notification sender:';
-$labels['notifyimportance'] = 'Importance:';
-$labels['notifyimportancelow'] = 'low';
-$labels['notifyimportancenormal'] = 'normal';
-$labels['notifyimportancehigh'] = 'high';
+$labels['setvariable'] = '변수 설정';
+$labels['setvarname'] = '변수명:';
+$labels['setvarvalue'] = '변수 값:';
+$labels['setvarmodifiers'] = '수식자:';
+$labels['varlower'] = '소문자';
+$labels['varupper'] = '대문자';
+$labels['varlowerfirst'] = '첫 문자를 소문자로';
+$labels['varupperfirst'] = '첫 문자를 대문자로';
+$labels['varquotewildcard'] = '특수 기호를 인용';
+$labels['varlength'] = '길이';
+$labels['notify'] = '알림 메시지 보내기';
+$labels['notifyaddress'] = '대상 이메일 주소:';
+$labels['notifybody'] = '알림 메시지 본문:';
+$labels['notifysubject'] = '알림 메시지 제목:';
+$labels['notifyfrom'] = '알림 메시지 발신인:';
+$labels['notifyimportance'] = '중요도:';
+$labels['notifyimportancelow'] = '낮음';
+$labels['notifyimportancenormal'] = '보통';
+$labels['notifyimportancehigh'] = '높음';
 $labels['filtercreate'] = '필터 생성';
-$labels['usedata'] = '필터에서 다음에 오는 데이터를 사용';
+$labels['usedata'] = '필터에서 다음 데이터를 사용:';
 $labels['nextstep'] = '다음 단계';
 $labels['...'] = '...';
-$labels['advancedopts'] = '상세 설정';
+$labels['advancedopts'] = '고급 설정';
 $labels['body'] = '본문';
 $labels['address'] = '주소';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
+$labels['envelope'] = '봉투';
+$labels['modifier'] = '수식자:';
 $labels['text'] = '텍스트';
-$labels['undecoded'] = 'undecoded (raw)';
-$labels['contenttype'] = 'content type';
-$labels['modtype'] = 'type:';
-$labels['allparts'] = 'all';
+$labels['undecoded'] = '암호화되지 않음 (원상태)';
+$labels['contenttype'] = '내용 유형';
+$labels['modtype'] = '유형:';
+$labels['allparts'] = '모두';
 $labels['domain'] = '도메인';
-$labels['localpart'] = 'local part';
+$labels['localpart'] = '로컬 부분';
 $labels['user'] = '사용자';
-$labels['detail'] = 'detail';
-$labels['comparator'] = 'comparator:';
-$labels['default'] = '기본값';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['detail'] = '세부사항';
+$labels['comparator'] = '비교기:';
+$labels['default'] = '기본';
+$labels['octet'] = '엄격 (8진수)';
+$labels['asciicasemap'] = '대/소문자 구분 (ascii-casemap)';
+$labels['asciinumeric'] = '숫자 (ascii-numeric)';
 
 $messages = array();
-$messages['filterunknownerror'] = '알수 없는 서버 에러.';
-$messages['filterconnerror'] = '서버에 연결할 수 없습니다.';
-$messages['filterdeleteerror'] = '필터를 삭제할 수 없습니다. 서버 에러 발생 함.';
-$messages['filterdeleted'] = '필터를 성공적으로 삭제 함.';
-$messages['filtersaved'] = '필터를 성공적으로 저장 함.';
-$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 에러 발생 함.';
-$messages['filterdeleteconfirm'] = '정말로 선택한 필터의 삭제를 원하십니까?';
-$messages['ruledeleteconfirm'] = '선택한 규칙을 삭제하고자 하는 것이 확실합니까?';
-$messages['actiondeleteconfirm'] = '선택한 동작을 삭제하고자 하는 것이 확실합니까?';
-$messages['forbiddenchars'] = '필드에 금지된 문자가 있음.';
-$messages['cannotbeempty'] = '필드는 비어있을 수 없음.';
-$messages['ruleexist'] = '지정한 이름의 필터가 이미 존재 함.';
-$messages['setactivateerror'] = '선택한 필터 묶음을 활성화 할 수 없음. 서버 에러 발생 함.';
-$messages['setdeactivateerror'] = '선택한 필터 묶음을 비활성화 할 수 없음. 서버 에러 발생 함.';
-$messages['setdeleteerror'] = '선택한 필터 묶음을 삭제할 수 없음. 서버 에러 발생 함.';
-$messages['setactivated'] = '필터 묶음을 성공적으로 활성화 하였음.';
-$messages['setdeactivated'] = '필터 묶음을 성공적으로 비활성화 하였음.';
-$messages['setdeleted'] = '필터 묶음을 성공적으로 삭제 함.';
-$messages['setdeleteconfirm'] = '선택한 필터 묶음을 지우고자 하는 것이 확실합니까?';
-$messages['setcreateerror'] = '필터 묶음을 생성할 수 없음. 서버 에러 발생 함.';
-$messages['setcreated'] = '필터 묶음을 성공적으로 생성 함.';
-$messages['activateerror'] = '선택한 필터(들)을 동작하게 할 수 없음. 서버 에러 발생 함.';
-$messages['deactivateerror'] = '선택한 필터(들)을 동작하지 않게 할 수 없음. 서버 에러 발생 함.';
-$messages['deactivated'] = '필터(들)을 동작하게 하는데 성공하였음.';
-$messages['activated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.';
-$messages['moved'] = '필터를 이동하는 데 성공하였음.';
-$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 에러 발생 함.';
+$messages['filterunknownerror'] = '알수 없는 서버 오류.';
+$messages['filterconnerror'] = '서버에 연결할 수 없음.';
+$messages['filterdeleteerror'] = '필터를 삭제할 수 없음. 서버 오류가 발생함.';
+$messages['filterdeleted'] = '필터가 성공적으로 삭제됨.';
+$messages['filtersaved'] = '필터가 성공적으로 저장됨.';
+$messages['filtersaveerror'] = '필터를 저장할 수 없음. 서버 오류가 발생함.';
+$messages['filterdeleteconfirm'] = '정말로 선택한 필터를 삭제하시겠습니까?';
+$messages['ruledeleteconfirm'] = '정말로 선택한 규칙을 삭제하시겠습니까?';
+$messages['actiondeleteconfirm'] = '정말로 선택한 동작을 삭제하시겠습니까?';
+$messages['forbiddenchars'] = '필드에 금지된 문자가 존재함.';
+$messages['cannotbeempty'] = '필드는 비워둘 수 없음.';
+$messages['ruleexist'] = '지정한 이름의 필터가 이미 존재함.';
+$messages['setactivateerror'] = '선택한 필터 세트를 활성화 할 수 없음. 서버 오류가 발생함.';
+$messages['setdeactivateerror'] = '선택한 필터 세트를 비활성화 할 수 없음. 서버 오류가 발생함.';
+$messages['setdeleteerror'] = '선택한 필터 세트를 삭제할 수 없음. 서버 오류가 발생함.';
+$messages['setactivated'] = '필터 세트가 성공적으로 활성화됨.';
+$messages['setdeactivated'] = '필터 세트가 성공적으로 비활성화됨.';
+$messages['setdeleted'] = '필터 세트가 성공적으로 삭제됨.';
+$messages['setdeleteconfirm'] = '정말로 선택한 필터 세트를 삭제하시겠습니까?';
+$messages['setcreateerror'] = '필터 세트를 생성할 수 없음. 서버 오류가 발생함.';
+$messages['setcreated'] = '필터 세트가 성공적으로 생성됨.';
+$messages['activateerror'] = '선택한 필터를 활성화할 수 없음. 서버 오류가 발생함.';
+$messages['deactivateerror'] = '선택한 필터를 비활성화할 수 없음. 서버 오류가 발생함.';
+$messages['deactivated'] = '필터가 성공적으로 비활성화됨.';
+$messages['activated'] = '필터가 성공적으로 활성화됨.';
+$messages['moved'] = '필터가 성공적으로 이동함.';
+$messages['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 오류가 발생함.';
 $messages['nametoolong'] = '이름이 너무 김.';
 $messages['namereserved'] = '예약된 이름.';
-$messages['setexist'] = '묶음이 이미 존재 함.';
-$messages['nodata'] = '적어도 하나의 위치가 선택되어야 함!';
+$messages['setexist'] = '세트가 이미 존재함.';
+$messages['nodata'] = '최소 하나의 위치가 선택되어야 합니다!';
 
 ?>
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index d0a19cc62..8fafb6d8d 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Siuntėjas';
 $labels['recipient'] = 'Gavėjas';
 $labels['vacationaddresses'] = 'Papildomas gavėjų adresų sąrašas (skirti kableliais):';
 $labels['vacationdays'] = 'Kaip dažnai išsiųsti laiškus (dienomis):';
+$labels['vacationinterval'] = 'Kaip dažnai siųsti laiškus:';
+$labels['days'] = 'd.';
+$labels['seconds'] = 'sek.';
 $labels['vacationreason'] = 'Laiško tekstas';
 $labels['vacationsubject'] = 'Laiško tema:';
 $labels['rulestop'] = 'Nutraukti taisyklių vykdymą';
@@ -169,6 +172,6 @@ $messages['moveerror'] = 'Pasirinkto filtro perkelti neįmanoma. Įvyko serverio
 $messages['nametoolong'] = 'Vardas per ilgas.';
 $messages['namereserved'] = 'Rezervuotas vardas.';
 $messages['setexist'] = 'Rinkinys jau yra sukurtas.';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = 'Būtina pasirinkti bent vieną poziciją!';
 
 ?>
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index dc0d6fd75..f1f85c2e0 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Sūtītājs';
 $labels['recipient'] = 'Saņēmējs';
 $labels['vacationaddresses'] = 'Ievadiet vienu vai vairākus e-pastu(s), atdalot tos komatu:';
 $labels['vacationdays'] = 'Cik dienu laikā vienam un tam pašam sūtītājam neatbildēt atkārtoti (piem., 7):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Atvaļinājuma paziņojuma teksts:';
 $labels['vacationsubject'] = 'Vēstules tēma:';
 $labels['rulestop'] = 'Apturēt nosacījumu pārbaudi';
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
index 88c57da9d..67cd6829f 100644
--- a/plugins/managesieve/localization/ml_IN.inc
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'അയചയാള്‍';
 $labels['recipient'] = 'സ്വീകര്‍ത്താവ്';
 $labels['vacationaddresses'] = 'സ്വീകര്‍ത്താവിന്റെ ഇമെയില്‍ വിലാസങ്ങളുടെ അധികമുള്ള പട്ടിക (കോമയിട്ട് തിരിച്ച)';
 $labels['vacationdays'] = 'എത്ര ഭിവസം കൂടുമ്പോള്‍ സന്ദേശം അയക്കണം:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'സന്ദേശത്തിന്റെ ഉള്ളടക്കം (അവധിയുടെ കാരണം):';
 $labels['vacationsubject'] = 'സന്ദേശത്തിന്റെ വിഷയം:';
 $labels['rulestop'] = 'നിയമങ്ങള്‍ വിലയിരുത്തുന്നത് നിര്‍ത്തുക';
diff --git a/plugins/managesieve/localization/mr_IN.inc b/plugins/managesieve/localization/mr_IN.inc
index 20a99991b..3339737e0 100644
--- a/plugins/managesieve/localization/mr_IN.inc
+++ b/plugins/managesieve/localization/mr_IN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'प्रेषक';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index 167283c81..c2c17b23c 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsender';
 $labels['recipient'] = 'Mottaker';
 $labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):';
 $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
+$labels['vacationinterval'] = 'Periode mellom meldinger:';
+$labels['days'] = 'dager';
+$labels['seconds'] = 'sekunder';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index e90eb2819..1fd6eee4e 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -18,7 +18,7 @@
 
 
 $labels['filters'] = 'Filters';
-$labels['managefilters'] = 'Beheer inkomende mail filters';
+$labels['managefilters'] = 'Beheer filters voor inkomende e-mail';
 $labels['filtername'] = 'Filternaam';
 $labels['newfilter'] = 'Nieuw filter';
 $labels['filteradd'] = 'Filter toevoegen';
@@ -43,7 +43,7 @@ $labels['filterover'] = 'over';
 $labels['addrule'] = 'Regel toevoegen';
 $labels['delrule'] = 'Regel verwijderen';
 $labels['messagemoveto'] = 'Verplaats bericht naar';
-$labels['messageredirect'] = 'Redirect bericht naar';
+$labels['messageredirect'] = 'Bericht doorsturen naar';
 $labels['messagecopyto'] = 'Kopieer bericht naar';
 $labels['messagesendcopy'] = 'Verstuur een kopie naar';
 $labels['messagereply'] = 'Beantwoord met bericht';
@@ -57,6 +57,9 @@ $labels['sender'] = 'Afzender';
 $labels['recipient'] = 'Ontvanger';
 $labels['vacationaddresses'] = 'Aanvullende lijst van geadresseerden (gescheiden met komma\'s):';
 $labels['vacationdays'] = 'Hoe vaak moet een bericht verstuurd worden (in dagen):';
+$labels['vacationinterval'] = 'Hoe vaak moet een bericht verstuurd worden:';
+$labels['days'] = 'dagen';
+$labels['seconds'] = 'seconden';
 $labels['vacationreason'] = 'Bericht (vakantiereden):';
 $labels['vacationsubject'] = 'Onderwerp:';
 $labels['rulestop'] = 'Stop met regels uitvoeren';
diff --git a/plugins/managesieve/localization/nn_NO.inc b/plugins/managesieve/localization/nn_NO.inc
index 9bb9a7c18..18bf8b987 100644
--- a/plugins/managesieve/localization/nn_NO.inc
+++ b/plugins/managesieve/localization/nn_NO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsendar';
 $labels['recipient'] = 'Mottakar';
 $labels['vacationaddresses'] = 'Liste med mottakaradresser (komma-separert):';
 $labels['vacationdays'] = 'Periode mellom meldingar (i dagar):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Innhald (grunngjeving for fråvær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index e3a530e62..9a6b70d8a 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Nadawca';
 $labels['recipient'] = 'Odbiorca';
 $labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
 $labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
+$labels['vacationinterval'] = 'Jak często wysyłać wiadomości:';
+$labels['days'] = 'dni';
+$labels['seconds'] = 'sekundy';
 $labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
 $labels['vacationsubject'] = 'Temat wiadomości:';
 $labels['rulestop'] = 'Przerwij przetwarzanie reguł';
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index a18ef1546..941119335 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de e-mails destinatários (separado por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = 'Como geralmente enviam mensagens:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):';
 $labels['vacationsubject'] = 'Título da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 375277ac2..bfb3f296a 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de destinatários de e-mails (separados por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = 'Com que frequência envia mensagens:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Conteúdo da mensagem (motivo da ausência):';
 $labels['vacationsubject'] = 'Assunto da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index a619045a6..2c917cbdd 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Expeditor';
 $labels['recipient'] = 'Destinatar';
 $labels['vacationaddresses'] = 'Adresele mele de e-mail adiționale (împărțite cu virgulă):';
 $labels['vacationdays'] = 'Cât de des să trimit mesajele (în zile):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpul mesajului (motivul vacanţei):';
 $labels['vacationsubject'] = 'Subiectul mesajului:';
 $labels['rulestop'] = 'Nu mai evalua reguli';
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index 47b139949..fb3f113c3 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Отправитель';
 $labels['recipient'] = 'Получатель';
 $labels['vacationaddresses'] = 'Список моих дополнительных адресов (разделённых запятыми):';
 $labels['vacationdays'] = 'Как часто отправлять сообщения (в днях):';
+$labels['vacationinterval'] = 'Как часто отправлять сообщения:';
+$labels['days'] = 'дней';
+$labels['seconds'] = 'секунд';
 $labels['vacationreason'] = 'Текст сообщения (причина отсутствия):';
 $labels['vacationsubject'] = 'Тема сообщения:';
 $labels['rulestop'] = 'Закончить выполнение';
diff --git a/plugins/managesieve/localization/si_LK.inc b/plugins/managesieve/localization/si_LK.inc
index 8a2856369..afc2e3851 100644
--- a/plugins/managesieve/localization/si_LK.inc
+++ b/plugins/managesieve/localization/si_LK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'යවන්නා';
 $labels['recipient'] = 'ලබන්නා';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'පණිවිඩයේ මාතෘකාව:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index 81caec02d..f336cf2c5 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Odosielateľ';
 $labels['recipient'] = 'Adresát';
 $labels['vacationaddresses'] = 'Dodatoční príjemcovia správy (oddelení čiarkami):';
 $labels['vacationdays'] = 'Počet dní medzi odoslaním správy:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Dôvod neprítomnosti:';
 $labels['vacationsubject'] = 'Predmet správy:';
 $labels['rulestop'] = 'Koniec pravidiel';
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index eb37f5298..d9da8ab60 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Prejemnik';
 $labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (ločenih z vejico):';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
+$labels['vacationinterval'] = 'Sporočila pošlji na:';
+$labels['days'] = 'dni';
+$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Vsebina sporočila (vzrok za odsotnost):';
 $labels['vacationsubject'] = 'Zadeva sporočila';
 $labels['rulestop'] = 'Prekini z izvajanjem pravil';
@@ -99,14 +102,14 @@ $labels['setvariable'] = 'Nastavi spremenljivko';
 $labels['setvarname'] = 'Ime spremenljivke:';
 $labels['setvarvalue'] = 'Vrednost spremenljivke:';
 $labels['setvarmodifiers'] = 'Modifikator:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
+$labels['varlower'] = 'majhne črke';
+$labels['varupper'] = 'velike črke';
+$labels['varlowerfirst'] = 'prvi znak velika začetnica';
 $labels['varupperfirst'] = 'prvi znak velika začetnica';
 $labels['varquotewildcard'] = 'citiraj posebne znake';
 $labels['varlength'] = 'dolžina';
 $labels['notify'] = 'Poštlji obvestilo';
-$labels['notifyaddress'] = 'To e-mail address:';
+$labels['notifyaddress'] = 'Na elektronski naslov:';
 $labels['notifybody'] = 'Telo obvestila:';
 $labels['notifysubject'] = 'Zadeva obvestila:';
 $labels['notifyfrom'] = 'Pošiljatelj obvestila:';
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index 50749e6ff..49d5b1222 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Avsändare';
 $labels['recipient'] = 'Mottagare';
 $labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
 $labels['vacationdays'] = 'Antal dagar mellan auto-svar:';
+$labels['vacationinterval'] = 'Tid mellan auto-svar:';
+$labels['days'] = 'Dagar';
+$labels['seconds'] = 'Sekunder';
 $labels['vacationreason'] = 'Meddelande i auto-svar:';
 $labels['vacationsubject'] = 'Meddelandeämne:';
 $labels['rulestop'] = 'Avsluta filtrering';
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index 1c12661ca..c36869d29 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Gönderici';
 $labels['recipient'] = 'Alıcı';
 $labels['vacationaddresses'] = 'İlave e-posta adreslerim(virgül ile ayrılmış)';
 $labels['vacationdays'] = 'Ne sıklıkla mesajlar gönderilir(gün)';
+$labels['vacationinterval'] = 'Ne kadar sıklıkla mesaj gönderirsiniz:';
+$labels['days'] = 'günler';
+$labels['seconds'] = 'saniyeler';
 $labels['vacationreason'] = 'Mesaj gövdesi(tatil sebebi):';
 $labels['vacationsubject'] = 'Mesaj konusu:';
 $labels['rulestop'] = 'Kuralları değerlendirmeyi bitir';
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index 476341834..41623df35 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
 $labels['vacationaddresses'] = 'Додатковий список адрес отримувачів (розділених комою)';
 $labels['vacationdays'] = 'Як часто повторювати (у днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст повідомлення:';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Зупинити перевірку правил';
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index fbb39b648..0a4ce6e82 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -57,6 +57,9 @@ $labels['sender'] = 'Người gửi';
 $labels['recipient'] = 'Người nhận';
 $labels['vacationaddresses'] = 'Địa chỉ email bổ sung của tôi ( phân cách bằng dấu phẩy)';
 $labels['vacationdays'] = 'Số lần gửi thư (trong ngày)';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Nội dung chính';
 $labels['vacationsubject'] = 'Tiêu đề thư';
 $labels['rulestop'] = 'Ngừng đánh giá qui luật';
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index b3b09ecee..79b705c54 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -35,29 +35,32 @@ $labels['filterisnot'] = '不等于';
 $labels['filterexists'] = '存在';
 $labels['filternotexists'] = '不存在';
 $labels['filtermatches'] = '匹配表达式';
-$labels['filternotmatches'] = '无匹配的表达式';
+$labels['filternotmatches'] = '不匹配表达式';
 $labels['filterregex'] = '匹配正则表达式';
-$labels['filternotregex'] = '无匹配的正则表达式';
+$labels['filternotregex'] = '不匹配正则表达式';
 $labels['filterunder'] = '小于';
 $labels['filterover'] = '大于';
-$labels['addrule'] = '添加规则';
+$labels['addrule'] = '新建规则';
 $labels['delrule'] = '删除规则';
 $labels['messagemoveto'] = '将邮件移至';
 $labels['messageredirect'] = '将邮件转发至';
 $labels['messagecopyto'] = '复制邮件至';
 $labels['messagesendcopy'] = '发送复制邮件至';
-$labels['messagereply'] = '回复以下信息';
+$labels['messagereply'] = '回复以下内容';
 $labels['messagedelete'] = '删除邮件';
-$labels['messagediscard'] = '舍弃邮件并回复以下信息';
-$labels['messagesrules'] = '对收取的邮件应用规则：';
-$labels['messagesactions'] = '...执行以下动作：';
+$labels['messagediscard'] = '舍弃邮件并回复以下内容';
+$labels['messagesrules'] = '对新收取的邮件应用规则：';
+$labels['messagesactions'] = '执行以下操作：';
 $labels['add'] = '添加';
 $labels['del'] = '删除';
 $labels['sender'] = '发件人';
 $labels['recipient'] = '收件人';
-$labels['vacationaddresses'] = '收件人地址的附加名单（以逗号分隔）';
-$labels['vacationdays'] = '发送邮件频率(天数):';
-$labels['vacationreason'] = '邮件正文(休假原因)';
+$labels['vacationaddresses'] = '收件人地址的附加名单（以半角逗号分隔）';
+$labels['vacationdays'] = '发送邮件频率(单位：天):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = '邮件正文(假期原因)';
 $labels['vacationsubject'] = '邮件主题';
 $labels['rulestop'] = '停止评价规则';
 $labels['enable'] = '启用/禁用';
@@ -70,11 +73,11 @@ $labels['filtersetdeact'] = '停用当前的过滤器设置集';
 $labels['filterdef'] = '过滤器定义';
 $labels['filtersetname'] = '过滤器集的名称';
 $labels['newfilterset'] = '新的过滤器集';
-$labels['active'] = '活动';
+$labels['active'] = '启用';
 $labels['none'] = '无';
-$labels['fromset'] = '从设置';
+$labels['fromset'] = '从设置集';
 $labels['fromfile'] = '从文件';
-$labels['filterdisabled'] = '禁用过滤器';
+$labels['filterdisabled'] = '过滤器已禁用';
 $labels['countisgreaterthan'] = '计数大于';
 $labels['countisgreaterthanequal'] = '计数大于或等于';
 $labels['countislessthan'] = '计数小于';
@@ -90,7 +93,7 @@ $labels['valuenotequals'] = '值不等于';
 $labels['setflags'] = '设定邮件的标识';
 $labels['addflags'] = '增加邮件的标识';
 $labels['removeflags'] = '删除邮件的标识';
-$labels['flagread'] = '阅读';
+$labels['flagread'] = '读取';
 $labels['flagdeleted'] = '删除';
 $labels['flaganswered'] = '已答复';
 $labels['flagflagged'] = '已标记';
@@ -98,26 +101,26 @@ $labels['flagdraft'] = '草稿';
 $labels['setvariable'] = '设置变量';
 $labels['setvarname'] = '变量名：';
 $labels['setvarvalue'] = '值：';
-$labels['setvarmodifiers'] = 'Modifiers:';
-$labels['varlower'] = 'lower-case';
-$labels['varupper'] = 'upper-case';
-$labels['varlowerfirst'] = 'first character lower-case';
-$labels['varupperfirst'] = 'first character upper-case';
-$labels['varquotewildcard'] = 'quote special characters';
+$labels['setvarmodifiers'] = '修改：';
+$labels['varlower'] = '小写';
+$labels['varupper'] = '大写';
+$labels['varlowerfirst'] = '首字母小写';
+$labels['varupperfirst'] = '首字母大写';
+$labels['varquotewildcard'] = '引用特殊字符';
 $labels['varlength'] = '长度';
 $labels['notify'] = '发送通知';
-$labels['notifyaddress'] = 'To e-mail address:';
-$labels['notifybody'] = 'Notification body:';
+$labels['notifyaddress'] = '收件地址：';
+$labels['notifybody'] = '通知正文：';
 $labels['notifysubject'] = '通知主题';
-$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyfrom'] = '通知的发送人：';
 $labels['notifyimportance'] = '优先级：';
 $labels['notifyimportancelow'] = '低';
 $labels['notifyimportancenormal'] = '中';
 $labels['notifyimportancehigh'] = '高';
-$labels['filtercreate'] = '创建过滤器';
-$labels['usedata'] = '在过滤器中使用以下数据';
+$labels['filtercreate'] = '创建过滤规则';
+$labels['usedata'] = '在过滤器中使用下列数据';
 $labels['nextstep'] = '下一步';
-$labels['...'] = '……';
+$labels['...'] = '...';
 $labels['advancedopts'] = '高级选项';
 $labels['body'] = '正文';
 $labels['address'] = '地址';
@@ -134,41 +137,41 @@ $labels['user'] = '用户';
 $labels['detail'] = '细节';
 $labels['comparator'] = '比较：';
 $labels['default'] = '默认';
-$labels['octet'] = '严格的（字节）';
-$labels['asciicasemap'] = '不区分大小写（ascii字符）';
-$labels['asciinumeric'] = '数字（ascii数字）';
+$labels['octet'] = '严格模式(字节)';
+$labels['asciicasemap'] = '不区分大小写(ascii 字符)';
+$labels['asciinumeric'] = '数字类型(ascii 数字)';
 
 $messages = array();
 $messages['filterunknownerror'] = '未知的服务器错误';
-$messages['filterconnerror'] = '无法连接到 managesieve 服务器';
-$messages['filterdeleteerror'] = '无法删除过滤器。服务器错误';
+$messages['filterconnerror'] = '无法连接至服务器';
+$messages['filterdeleteerror'] = '无法删除过滤器。服务器发生错误';
 $messages['filterdeleted'] = '过滤器已成功删除';
 $messages['filtersaved'] = '过滤器已成功保存。';
-$messages['filtersaveerror'] = '无法保存过滤器。服务器错误';
+$messages['filtersaveerror'] = '无法保存过滤器。服务器发生错误';
 $messages['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
 $messages['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
-$messages['actiondeleteconfirm'] = '您确定要删除所选择的动作吗？';
-$messages['forbiddenchars'] = '内容中包含禁用的字符';
+$messages['actiondeleteconfirm'] = '您确定要删除所选择的操作吗？';
+$messages['forbiddenchars'] = '内容包含禁用字符';
 $messages['cannotbeempty'] = '内容不能为空';
 $messages['ruleexist'] = '指定过滤器名称已存在。';
-$messages['setactivateerror'] = '无法启用指定过滤器，服务器错误。';
-$messages['setdeactivateerror'] = '无法停用指定过滤器，服务器错误。';
-$messages['setdeleteerror'] = '无法删除指定过滤器，服务器错误。';
-$messages['setactivated'] = '过滤器成功启用。';
-$messages['setdeactivated'] = '过滤器成功停用。';
-$messages['setdeleted'] = '过滤器成功删除。';
-$messages['setdeleteconfirm'] = '你确定要删除指定过滤器？';
-$messages['setcreateerror'] = '无法创建过滤器，服务器错误。';
+$messages['setactivateerror'] = '无法启用指定过滤器，服务器发生错误。';
+$messages['setdeactivateerror'] = '无法停用指定过滤器，服务器发生错误。';
+$messages['setdeleteerror'] = '无法删除指定过滤器，服务器发生错误。';
+$messages['setactivated'] = '启用过滤器集成功。';
+$messages['setdeactivated'] = '禁用过滤器集成功。';
+$messages['setdeleted'] = '删除过滤器成功。';
+$messages['setdeleteconfirm'] = '您确定要删除指定的过滤器吗？';
+$messages['setcreateerror'] = '无法创建过滤器，服务器发生错误。';
 $messages['setcreated'] = '过滤器成功创建。';
-$messages['activateerror'] = '无法启用选中的过滤器，因为服务器发生错误。';
-$messages['deactivateerror'] = '无法禁用选中的过滤器，因为服务器发生错误。';
+$messages['activateerror'] = '无法启用选中的过滤器，服务器发生错误。';
+$messages['deactivateerror'] = '无法禁用选中的过滤器，服务器发生错误。';
 $messages['deactivated'] = '启用过滤器成功。';
 $messages['activated'] = '禁用过滤器成功。';
-$messages['moved'] = '过滤器移动成功。';
-$messages['moveerror'] = '无法移动选中的过滤器，因为服务器发生错误。';
-$messages['nametoolong'] = '名称太长。';
-$messages['namereserved'] = 'Reserved name.';
+$messages['moved'] = '移动过滤器成功。';
+$messages['moveerror'] = '无法移动选中的过滤器，服务器发生错误。';
+$messages['nametoolong'] = '无法创建过滤器集，名称太长。';
+$messages['namereserved'] = '保留名称。';
 $messages['setexist'] = '设置已存在。';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = '至少选择一个位置！';
 
 ?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index cee1d1abd..3f3fc1313 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -57,12 +57,15 @@ $labels['sender'] = '寄件者';
 $labels['recipient'] = '收件者';
 $labels['vacationaddresses'] = '其他收件者（用半形逗號隔開）：';
 $labels['vacationdays'] = '多久回覆一次（單位：天）：';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '信件內容（休假原因）：';
 $labels['vacationsubject'] = '訊息主旨:';
 $labels['rulestop'] = '停止評估規則';
 $labels['enable'] = '啟用/停用';
 $labels['filterset'] = '篩選器集合';
-$labels['filtersets'] = 'Filter sets';
+$labels['filtersets'] = '篩選器集合';
 $labels['filtersetadd'] = '加入篩選器集合';
 $labels['filtersetdel'] = '刪除目前的篩選器集合';
 $labels['filtersetact'] = '啟用目前的篩選器集合';
@@ -92,13 +95,13 @@ $labels['addflags'] = '新增標記到訊息';
 $labels['removeflags'] = '移除訊息標記';
 $labels['flagread'] = '讀取';
 $labels['flagdeleted'] = '刪除';
-$labels['flaganswered'] = 'Answered';
+$labels['flaganswered'] = '已經回覆';
 $labels['flagflagged'] = '已加標記的郵件';
 $labels['flagdraft'] = '草稿';
 $labels['setvariable'] = '設定變數';
 $labels['setvarname'] = '變數名稱:';
 $labels['setvarvalue'] = '變數值:';
-$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['setvarmodifiers'] = '修改:';
 $labels['varlower'] = '低於';
 $labels['varupper'] = '高於';
 $labels['varlowerfirst'] = '第一個字低於';
@@ -121,8 +124,8 @@ $labels['...'] = '…';
 $labels['advancedopts'] = '進階選項';
 $labels['body'] = '內文';
 $labels['address'] = '郵件位址';
-$labels['envelope'] = 'envelope';
-$labels['modifier'] = 'modifier:';
+$labels['envelope'] = '信封';
+$labels['modifier'] = '修改:';
 $labels['text'] = '文字';
 $labels['undecoded'] = '未解碼(raw)';
 $labels['contenttype'] = '內容類型';
@@ -134,9 +137,9 @@ $labels['user'] = '使用者';
 $labels['detail'] = '細節';
 $labels['comparator'] = '比較:';
 $labels['default'] = '預設';
-$labels['octet'] = 'strict (octet)';
-$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
-$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['octet'] = '嚴謹模式(八位元組)';
+$labels['asciicasemap'] = '不區分大小寫(採用ASCII-Casemap)';
+$labels['asciinumeric'] = '數字類型(ascii-numeric)';
 
 $messages = array();
 $messages['filterunknownerror'] = '未知的伺服器錯誤';
@@ -167,8 +170,8 @@ $messages['activated'] = '篩選器已停用';
 $messages['moved'] = '篩選器已移動';
 $messages['moveerror'] = '無法移動選擇的篩選器。伺服器錯誤';
 $messages['nametoolong'] = '無法建立篩選器集合。 名稱太長';
-$messages['namereserved'] = 'Reserved name.';
+$messages['namereserved'] = '保留名稱.';
 $messages['setexist'] = '設定已存在';
-$messages['nodata'] = 'At least one position must be selected!';
+$messages['nodata'] = '至少要選擇一個位置';
 
 ?>
diff --git a/plugins/markasjunk/localization/el_GR.inc b/plugins/markasjunk/localization/el_GR.inc
index 78cfaf060..fb16a29ce 100644
--- a/plugins/markasjunk/localization/el_GR.inc
+++ b/plugins/markasjunk/localization/el_GR.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['buttontext'] = 'Junk';
+$labels['buttontext'] = 'Ανεπιθύμητα';
 $labels['buttontitle'] = 'Σήμανση ως Ανεπιθύμητου';
 $labels['reportedasjunk'] = 'Αναφέρθηκε ως Ανεπιθήμητο';
 
diff --git a/plugins/markasjunk/localization/gl_ES.inc b/plugins/markasjunk/localization/gl_ES.inc
index dd0c0ad40..d2a9e98b7 100644
--- a/plugins/markasjunk/localization/gl_ES.inc
+++ b/plugins/markasjunk/localization/gl_ES.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['buttontext'] = 'Junk';
+$labels['buttontext'] = 'Correo lixo';
 $labels['buttontitle'] = 'Marcar como correo lixo';
 $labels['reportedasjunk'] = 'Mensaxe marcada como correo lixo';
 
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
index 82240f37d..d9b519475 100644
--- a/plugins/new_user_dialog/localization/ko_KR.inc
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '수신자의 신원을 채우기 바랍니다.';
-$labels['identitydialoghint'] = '이 박스는 최초로 로그인할 때만 나타납니다.';
+$labels['identitydialogtitle'] = '수신인의 신원을 완성하시기 바랍니다.';
+$labels['identitydialoghint'] = '이 상자는 최초로 로그인할 때만 나타납니다.';
 
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/nl_NL.inc b/plugins/new_user_dialog/localization/nl_NL.inc
index 4d5d41185..c5d392f98 100644
--- a/plugins/new_user_dialog/localization/nl_NL.inc
+++ b/plugins/new_user_dialog/localization/nl_NL.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = 'Vul uw correcte identiteitgegevens in a.u.b.';
-$labels['identitydialoghint'] = 'Dit scherm verschijnt enkel bij uw eerste login.';
+$labels['identitydialogtitle'] = 'Vul alstublieft uw afzendergegevens in.';
+$labels['identitydialoghint'] = 'Dit scherm verschijnt eenmalig bij uw eerste aanmelding.';
 
 ?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/zh_CN.inc b/plugins/new_user_dialog/localization/zh_CN.inc
index 99b2de701..ca40173af 100644
--- a/plugins/new_user_dialog/localization/zh_CN.inc
+++ b/plugins/new_user_dialog/localization/zh_CN.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '请填写发送者标识';
+$labels['identitydialogtitle'] = '请填写发送人身份';
 $labels['identitydialoghint'] = '本提示仅在第一次登录时显示。';
 
 ?>
\ No newline at end of file
diff --git a/plugins/newmail_notifier/localization/gl_ES.inc b/plugins/newmail_notifier/localization/gl_ES.inc
index 6c1129b31..8d105531e 100644
--- a/plugins/newmail_notifier/localization/gl_ES.inc
+++ b/plugins/newmail_notifier/localization/gl_ES.inc
@@ -16,14 +16,14 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels['basic'] = 'Display browser notifications on new message';
-$labels['desktop'] = 'Display desktop notifications on new message';
-$labels['sound'] = 'Play the sound on new message';
+$labels['basic'] = 'Amosar notificacións no navegador cando entre unha mensaxe nova';
+$labels['desktop'] = 'Amosar notificacións no escritorio cando chegue unha mensaxe nova';
+$labels['sound'] = 'Tocar un son cando chegue unha mensaxe nova';
 $labels['test'] = 'Proba';
 $labels['title'] = 'Novo Correo!';
-$labels['body'] = 'You\'ve received a new message.';
-$labels['testbody'] = 'This is a test notification.';
-$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
+$labels['body'] = 'Recibiu unha mensaxe nova';
+$labels['testbody'] = 'Esta é unha notificación de proba';
+$labels['desktopdisabled'] = 'As notificacións de escritorio están desactivadas no seu navegador';
 $labels['desktopunsupported'] = 'O teu navegador non soporta notificacións de escritorio.';
 
 ?>
diff --git a/plugins/newmail_notifier/localization/nl_NL.inc b/plugins/newmail_notifier/localization/nl_NL.inc
index e18a6ff2d..01f97e4ce 100644
--- a/plugins/newmail_notifier/localization/nl_NL.inc
+++ b/plugins/newmail_notifier/localization/nl_NL.inc
@@ -16,14 +16,14 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels['basic'] = 'Toon browsermelding bij nieuw bericht';
-$labels['desktop'] = 'Toon desktopmelding bij nieuw bericht';
-$labels['sound'] = 'Speel geluid bij nieuw bericht';
+$labels['basic'] = 'Toon melding in browser bij nieuw bericht';
+$labels['desktop'] = 'Toon melding op bureaublad bij nieuw bericht';
+$labels['sound'] = 'Geluid afspelen bij nieuw bericht';
 $labels['test'] = 'Test';
 $labels['title'] = 'Nieuwe e-mail!';
 $labels['body'] = 'U heeft een nieuw bericht ontvangen.';
 $labels['testbody'] = 'Dit is een testmelding.';
-$labels['desktopdisabled'] = 'Desktopmeldingen zijn uitgeschakeld in uw browser.';
-$labels['desktopunsupported'] = 'Uw browser ondersteunt geen desktopmeldingen.';
+$labels['desktopdisabled'] = 'Bureaubladmeldingen zijn uitgeschakeld in uw browser.';
+$labels['desktopunsupported'] = 'Uw browser ondersteunt geen bureaubladmeldingen.';
 
 ?>
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index c2c4599bc..e5b634602 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -17,21 +17,21 @@
 */
 
 $labels = array();
-$labels['changepasswd']  = 'Wijzig Wachtwoord';
-$labels['curpasswd']  = 'Huidig Wachtwoord:';
-$labels['newpasswd']  = 'Nieuw Wachtwoord:';
-$labels['confpasswd']  = 'Bevestig Nieuw Wachtwoord:';
+$labels['changepasswd']  = 'Wachtwoord wijzigen';
+$labels['curpasswd']  = 'Huidig wachtwoord:';
+$labels['newpasswd']  = 'Nieuw wachtwoord:';
+$labels['confpasswd']  = 'Bevestig nieuw wachtwoord:';
 
 $messages = array();
-$messages['nopassword'] = 'Vul een wachtwoord in.';
-$messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
+$messages['nopassword'] = 'Vul uw nieuwe wachtwoord in.';
+$messages['nocurpassword'] = 'Vul uw huidige wachtwoord in.';
 $messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
 $messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
-$messages['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
-$messages['connecterror'] = 'Kan het nieuwe wachtwoord niet opslaan. Verbindingsfout.';
-$messages['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
+$messages['crypterror'] = 'Nieuwe wachtwoord kan niet opgeslagen worden; de server mist een versleutelfunctie.';
+$messages['connecterror'] = 'Nieuwe wachtwoord kan niet opgeslagen worden; verbindingsfout.';
+$messages['internalerror'] = 'Uw nieuwe wachtwoord kan niet worden opgeslagen.';
 $messages['passwordshort'] = 'Het wachtwoord moet minimaal $length tekens lang zijn.';
-$messages['passwordweak'] = 'Het wachtwoord moet minimaal één nummer en één leesteken bevatten.';
+$messages['passwordweak'] = 'Het wachtwoord moet minimaal één cijfer en één leesteken bevatten.';
 $messages['passwordforbidden'] = 'Het wachtwoord bevat tekens die niet toegestaan zijn.';
 
 ?>
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
index 5a15635e7..5d14926f2 100644
--- a/plugins/password/localization/zh_CN.inc
+++ b/plugins/password/localization/zh_CN.inc
@@ -24,13 +24,13 @@ $labels['confpasswd']  = '确认新密码：';
 
 $messages = array();
 $messages['nopassword'] = '请输入新密码。';
-$messages['nocurpassword'] = '请输入正确的密码。';
+$messages['nocurpassword'] = '请输入当前的密码。';
 $messages['passwordincorrect'] = '当前密码不正确。';
 $messages['passwordinconsistency'] = '两次输入的密码不一致，请重试。';
-$messages['crypterror'] = '无法保存新密码，因为加密功能不可用。';
-$messages['connecterror'] = '无法保存新密码，因为连接出错。';
+$messages['crypterror'] = '无法保存新密码，缺少加密功能。';
+$messages['connecterror'] = '无法保存新密码，连接出错。';
 $messages['internalerror'] = '无法保存新密码。';
-$messages['passwordshort'] = '密码必须至少为 $length 位。';
+$messages['passwordshort'] = '密码至少为 $length 位。';
 $messages['passwordweak'] = '密码必须至少包含一个数字和一个标点符号。';
 $messages['passwordforbidden'] = '密码包含禁止使用的字符。';
 
diff --git a/plugins/userinfo/localization/nl_NL.inc b/plugins/userinfo/localization/nl_NL.inc
index 8c636e700..8c46ca6c4 100644
--- a/plugins/userinfo/localization/nl_NL.inc
+++ b/plugins/userinfo/localization/nl_NL.inc
@@ -19,7 +19,7 @@
 $labels = array();
 $labels['userinfo'] = 'Gebruikersinformatie';
 $labels['created'] = 'Aangemaakt';
-$labels['lastlogin'] = 'Laatste login';
+$labels['lastlogin'] = 'Laatste aanmelding';
 $labels['defaultidentity'] = 'Standaardidentiteit';
 
 ?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/zh_CN.inc b/plugins/userinfo/localization/zh_CN.inc
index 265c0704a..2b06ab218 100644
--- a/plugins/userinfo/localization/zh_CN.inc
+++ b/plugins/userinfo/localization/zh_CN.inc
@@ -18,8 +18,8 @@
 
 $labels = array();
 $labels['userinfo'] = '用户信息';
-$labels['created'] = '创建';
-$labels['lastlogin'] = '最后登录';
+$labels['created'] = '创建于';
+$labels['lastlogin'] = '最近登录';
 $labels['defaultidentity'] = '默认身份';
 
 ?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/zh_CN.inc b/plugins/vcard_attachments/localization/zh_CN.inc
index 6deb21da4..5ff81a806 100644
--- a/plugins/vcard_attachments/localization/zh_CN.inc
+++ b/plugins/vcard_attachments/localization/zh_CN.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['addvcardmsg'] = '添加 vCard 到地址簿中';
+$labels['addvcardmsg'] = '添加 vCard 至地址簿中';
 $labels['vcardsavefailed'] = '无法保存 vCard';
 
 ?>
\ No newline at end of file
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index da2e80672..af08cc301 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'نسخ';
 $labels['move']     = 'نقل';
 $labels['moveto']   = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'الصفحة الحالية';
 $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
 $labels['unanswered'] = 'بلا رد';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'محذوف';
 $labels['undeleted'] = 'غير محذوفة';
 $labels['invert'] = 'عكس';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'تعديل كجديد';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'إنشاء رسائل بنسق HTML';
 $labels['htmlonreply'] = 'حال الرد على الرسائل بصيغة HTML فقط';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'توقيع HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'إظهار قسم المعاينة';
 $labels['skin'] = 'شكل الواجهة';
 $labels['logoutclear'] = 'إفراغ سلة المحذوفات عند الخروج';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'إزالة التوقيع من الرسالة
 $labels['autoaddsignature'] = 'إضافة التوقيع آلياً';
 $labels['newmessageonly'] = 'الرسالة الجديدة فقط';
 $labels['replyandforwardonly'] = 'الردود والتمريرات فقط';
-$labels['replysignaturepos'] = 'إضافة التوقيع عند الرد أو التمرير';
-$labels['belowquote'] = 'بعد الاقتباس';
-$labels['abovequote'] = 'قبل الاقتباس';
 $labels['insertsignature'] = 'إضافة التوقيع';
 $labels['previewpanemarkread']  = 'تحديد الرسائل المُعاينة كمقروءة';
 $labels['afternseconds']  = 'بعد $n ثواني';
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index e10c83228..9429a3910 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'خطأ في قاعدة البيانات!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'تعذر تنفيذ العملية. المجلد للقراءة فقط.';
 $messages['errornoperm'] = 'تعذر تنفيذ العملية. ليست لديك الصلاحية.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'طلب غير صالح! لم تحفظ أية بيانات.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index 075097e42..49f85689b 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'mover pa...';
 $labels['download'] = 'baxar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Ensin lleer';
 $labels['flagged'] = 'Marcáu';
 $labels['unanswered'] = 'Ensin contestar';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Desaniciáu';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invertir';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir en una ventana nueva';
 $labels['emlsave'] = 'Baxar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Facer el mensaxe n\'HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Entever';
 $labels['skin'] = 'Estilu';
 $labels['logoutclear'] = 'Vaciar la papelera al zarrar la sesión';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 135f70b73..9e415b8ec 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Fallu de la solicitú. Nun se guardaron datos.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nun doi con mensaxes';
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 1b7994f8d..0cb4b3e82 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Köçür';
 $labels['moveto']   = 'Burada köçür...';
 $labels['download'] = 'Endir';
+$labels['open']     = 'Aç';
 $labels['showattachment'] = 'Göstər';
 $labels['showanyway'] = 'İstənilən halda göstər';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Hazırki səhifəni';
 $labels['unread'] = 'Oxunmamışları';
 $labels['flagged'] = 'İşarəliləri';
 $labels['unanswered'] = 'Cavabsızları';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Silinmişləri';
 $labels['undeleted'] = 'Silinməyib';
 $labels['invert'] = 'İnvertliləri';
@@ -204,6 +206,8 @@ $labels['body']  = 'Mətn';
 
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
+$labels['changeformattext'] = 'Sadə mətn formatında göstər';
+$labels['changeformathtml'] = 'HTML formatında göstər';
 
 // message compose
 $labels['editasnew']      = 'Yeni kimi redaktə et';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Seçilmiş ünvanlara məktub yaz';
 $labels['contactsfromto'] = '$count ünvanının $from - $to arası';
 $labels['print']          = 'Çap et';
 $labels['export']         = 'İxrac et';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Hamısını İxrac et';
+$labels['exportsel']      = 'Seçilmişləri İxrac et';
 $labels['exportvcards']   = 'Ünvanları vCards formatında ixrac et';
 $labels['newcontactgroup'] = 'Ünvanlar qrupunu yarat';
 $labels['grouprename']    = 'Qruğun adını dəyişdir';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML-də mesaj yaz';
 $labels['htmlonreply'] = 'yalnız HTML mesajlar ilə cavab';
 $labels['htmlonreplyandforward'] = 'HTML məktuba cavab və yönəltmə zamanı';
 $labels['htmlsignature'] = 'HTML imza';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prevyu paneli göstər';
 $labels['skin'] = 'İnterfeys stili';
 $labels['logoutclear'] = 'Poçtdan çıxan zaman səbəti təmizlə';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Cavab zamanı imzanı sil';
 $labels['autoaddsignature'] = 'İmzanı avtomatik əlavə et';
 $labels['newmessageonly'] = 'yalnız yeni məktublarda';
 $labels['replyandforwardonly'] = 'Yalnız cavab və yönəldilənlərdə';
-$labels['replysignaturepos'] = 'Cavab və yönəltmə zamanı imzanı bərkid';
-$labels['belowquote'] = 'sitatdan sonra';
-$labels['abovequote'] = 'sitatdan əvvəl';
 $labels['insertsignature'] = 'İmza əlavə et';
 $labels['previewpanemarkread']  = 'Baxılmış şəkilləri oxunmuş kimi qeyd et';
 $labels['afternseconds']  = '$n saniyədən sonra';
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index 939827247..418f270be 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -17,20 +17,22 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'Xəta baş verib!';
-$messages['loginfailed']  = 'Giriş uğursuz oldu';
-$messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir';
-$messages['sessionerror'] = 'Sizin sessiya köhnəlib';
-$messages['storageerror'] = 'IMAP serverlə bağlantı alınmadı';
-$messages['servererror'] = 'Server xətası!';
-$messages['servererrormsg'] = 'Server xətası: $msg';
-$messages['dberror'] = 'Məlumatlar bazasında xəta!';
+$messages['errortitle']  = 'Xəta baş verdi!';
+$messages['loginfailed']  = 'Giriş uğursuz oldu.';
+$messages['cookiesdisabled'] = 'Sizin brauzer kukiləri qəbul etmir.';
+$messages['sessionerror'] = 'Sizin sessiya köhnəlib.';
+$messages['storageerror'] = 'IMAP serverlə bağlantı alınmadı.';
+$messages['servererror'] = 'Server Xətası!';
+$messages['servererrormsg'] = 'Server Xətası: $msg';
+$messages['dberror'] = 'Məlumatlar Bazasında Xəta!';
 $messages['requesttimedout'] = 'Sorğunun gözləmə müddəti bitdi';
-$messages['errorreadonly'] = 'Əməliyyatı etmək mümkün deyil. Qovluq yalnız oxunuş üçündür.';
+$messages['errorreadonly'] = 'Əməliyyatı icra etmək mümkün deyil. Qovluq yalnız oxunuş üçündür.';
 $messages['errornoperm'] = 'Əməliyyatı etmək mümkün deyil. Giriş qadağandır.';
+$messages['erroroverquota'] = 'Əməliyyat icra edilə bilinmir. Boş disk həcmi yoxdur.';
+$messages['erroroverquotadelete'] = 'Boş disk həcmi yoxdur. Məktubu silmək üçün SHIFT+DEL düyməsini istifadə edin.';
 $messages['invalidrequest'] = 'Səhv sorğu! Məlumat yaddaşda qalmadı.';
-$messages['invalidhost'] = 'Səhv server adı';
-$messages['nomessagesfound'] = 'Poçt qutusunda məktub tapılmadı';
+$messages['invalidhost'] = 'Səhv server adı.';
+$messages['nomessagesfound'] = 'Poçt qutusunda məktub tapılmadı.';
 $messages['loggedout'] = 'Çıxış uğurlu oldu. Sağ olun!';
 $messages['mailboxempty'] = 'Poçt qutusu boşdur';
 $messages['refreshing'] = 'Yenilənmə...';
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index 5bafc78f1..a5489a454 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 0aaa4d4d7..73cdb3ed8 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Памылка базы даных!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Немагчыма выканаць аперацыю. Тэчка даступна толькі для чытання.';
 $messages['errornoperm'] = 'Немагчыма выканаць аперацыю. Адмоўлена ў доступе.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Не дзейсны запыт! Даныя не захаваныя.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 0a5334263..6542cfc53 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копиране';
 $labels['move']     = 'Преместване';
 $labels['moveto']   = 'Премести в...';
 $labels['download'] = 'Изтегли';
+$labels['open']     = 'Отвори';
 $labels['showattachment'] = 'Показване';
 $labels['showanyway'] = 'Показване въпреки това';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Страница';
 $labels['unread'] = 'Нови';
 $labels['flagged'] = 'Отбелязано';
 $labels['unanswered'] = 'Без отговор';
+$labels['withattachment'] = 'С прикачен файл';
 $labels['deleted'] = 'Изтрито';
 $labels['undeleted'] = 'Не е изтрит';
 $labels['invert'] = 'Инвертирай';
@@ -204,6 +206,8 @@ $labels['body']  = 'Основен текст';
 
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
+$labels['changeformattext'] = 'Покажи в опростен текстов формат';
+$labels['changeformathtml'] = 'Покажи в HTML формат';
 
 // message compose
 $labels['editasnew']      = 'Промени като ново';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Писане на съобщениe като HTML';
 $labels['htmlonreply'] = 'само при отговор на HTML събощения';
 $labels['htmlonreplyandforward'] = 'само при препращане или отговор на HTML съобщение';
 $labels['htmlsignature'] = 'HTML подпис';
+$labels['showemail'] = 'Показва email адрес с екранното име';
 $labels['previewpane'] = 'Панел за преглед';
 $labels['skin'] = 'Смяна изгледа на интерфейса';
 $labels['logoutclear'] = 'Изчисти кошчето при изход';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Премахване на предишния
 $labels['autoaddsignature'] = 'Автоматично добавяне на подпис';
 $labels['newmessageonly'] = 'само на нови съобщения';
 $labels['replyandforwardonly'] = 'само на отговори и препратени';
-$labels['replysignaturepos'] = 'Поставяне на подпис при отговор или препращане';
-$labels['belowquote'] = 'над цитатът';
-$labels['abovequote'] = 'под цитатът';
 $labels['insertsignature'] = 'Вмъкване на подпис';
 $labels['previewpanemarkread']  = 'Маркиране на прегледаните съобщения като прочетени';
 $labels['afternseconds']  = 'след $n секунди';
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index ead68921c..219772e74 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Грешка с базата данни!';
 $messages['requesttimedout'] = 'Заявката е с изтекло време';
 $messages['errorreadonly'] = 'Операцията не може да бъде изпълнена. Папката е с права само за четене';
 $messages['errornoperm'] = 'Операцията не може да бъде изпълнена. Отказани права за достъп';
+$messages['erroroverquota'] = 'Невъзможно извършване на действието, няма достатъчно свободно дисково пространство.';
+$messages['erroroverquotadelete'] = 'Няма достатъчно свободно дисково пространство. Ползвайте SHIFT+DEL за да изтриете съобщение.';
 $messages['invalidrequest'] = 'Невалидна заявка! Данните не са съхранени.';
 $messages['invalidhost'] = 'Невалидно име на сървър';
 $messages['nomessagesfound'] = 'Няма съобщения';
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index f1ad34bc0..a0866a3a7 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'অনুলিপির ঠিকানা';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'নাদেখা (unread)';
 $labels['flagged'] = 'দাগানো (flagged)';
 $labels['unanswered'] = 'উত্তর না দেওয়া গুলো';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML এ মেইল/চিঠি লিখুন';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML এ স্বাক্ষর';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ছোটোকরে দেখার জায়গা';
 $labels['skin'] = 'মেইলবক্স এর পুরোটার চেহারা';
 $labels['logoutclear'] = 'বেরহবার সময় ডাস্টবিন অটোমেটিক খালি হবে';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index eaa4024b1..44d5fcc60 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'এই মেইলবক্সে কোনো চিঠি নাই';
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 4cc9e6f89..537a887df 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Eilañ';
 $labels['move']     = 'Dilec\'hiañ';
 $labels['moveto']   = 'Dilec\'hiañ da...';
 $labels['download'] = 'Pellgargañ';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Diskouez';
 $labels['showanyway'] = 'Diskouez anezhañ memestra';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na lennet';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Sevel ur c\'hemennad er furmad HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Sinadur HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Diskouez panel alberz';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 425dad996..c1988577d 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Fazi stlennvon !';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Kemennadoù ebet er voest lizhiri';
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 37b1abebb..5afdcad1f 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi';
+$labels['open']     = 'Otvori';
 $labels['showattachment'] = 'Prikaži';
 $labels['showanyway'] = 'Ipak prikaži';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitano';
 $labels['flagged'] = 'Važno';
 $labels['unanswered'] = 'Neodgovoreno';
+$labels['withattachment'] = 'Sa prilogom';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Nije obrisano';
 $labels['invert'] = 'Izokreni';
@@ -204,6 +206,8 @@ $labels['body']  = 'Tijelo';
 
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
+$labels['changeformattext'] = 'Prikaži kao obični tekst';
+$labels['changeformathtml'] = 'Prikaži kao HTML';
 
 // message compose
 $labels['editasnew']      = 'Uredi kao novo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Piši HTML poruke';
 $labels['htmlonreply'] = 'samo kao odgovor na HTML poruke';
 $labels['htmlonreplyandforward'] = 'prilikom prosljeđivanja ili odgovaranja na HTML poruku';
 $labels['htmlsignature'] = 'HTML potpis';
+$labels['showemail'] = 'Prikaži email adresu sa imenom';
 $labels['previewpane'] = 'Prikaži pregled poruke';
 $labels['skin'] = 'Skin interfejsa';
 $labels['logoutclear'] = 'Očisti smeće prilikom odjavljivanja';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Prilikom odgovaranja na poruku, ukloni origin
 $labels['autoaddsignature'] = 'Automatski dodaj potpis';
 $labels['newmessageonly'] = 'samo za nove poruke';
 $labels['replyandforwardonly'] = 'samo za odgovore i prosljeđivanja';
-$labels['replysignaturepos'] = 'Prilikom odgovaranja ili prosljeđivanja potpis ubaci';
-$labels['belowquote'] = 'ispod citata';
-$labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
 $labels['previewpanemarkread']  = 'Obilježi prikazane poruke kao pročitane';
 $labels['afternseconds']  = 'nakon $n sekundi';
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index 3949a42a6..7a1b26168 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Greška u bazi podataka!';
 $messages['requesttimedout'] = 'Zahtjev je istekao';
 $messages['errorreadonly'] = 'Nije moguće izvršiti operaciju. Folder je samo za čitanje.';
 $messages['errornoperm'] = 'Nije moguće izvršiti operaciju. Pristup je odbijen.';
+$messages['erroroverquota'] = 'Nije moguće izvršiti operaciju. Nema slobodnog prostora.';
+$messages['erroroverquotadelete'] = 'Nema slobodnog prostora. Pritisnite SHIFT+DEL da obrišete poruku.';
 $messages['invalidrequest'] = 'Neispravan zahtjev! Podaci nisu sačuvani.';
 $messages['invalidhost'] = 'Neispravno ime servera.';
 $messages['nomessagesfound'] = 'Nema poruka u ovom sandučetu.';
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 3d5df27b4..3be753b68 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Correu brossa';
 // message listing
 $labels['subject'] = 'Assumpte';
 $labels['from']    = 'Remitent';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitent';
 $labels['to']      = 'Destinatari';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -64,7 +64,8 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Mou';
 $labels['moveto']   = 'Mou a...';
 $labels['download'] = 'Descarrega';
-$labels['showattachment'] = 'Mostrar';
+$labels['open']     = 'Obre';
+$labels['showattachment'] = 'Mostra';
 $labels['showanyway'] = 'Mostra-ho de totes maneres';
 
 $labels['filename'] = 'Nom del fitxer';
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pàgina actual';
 $labels['unread'] = 'No llegits';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'No respost';
+$labels['withattachment'] = 'Amb fitxer adjunt';
 $labels['deleted'] = 'Suprimit';
 $labels['undeleted'] = 'No s\'ha suprimit';
 $labels['invert'] = 'Inverteix';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Cerca ràpida';
 $labels['resetsearch']  = 'Neteja cerca';
 $labels['searchmod']  = 'Cerca modificadors';
 $labels['msgtext']  = 'Missatge sencer';
-$labels['body']  = 'Body';
+$labels['body']  = 'Cos';
 
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
+$labels['changeformattext'] = 'Mostra en format de text net';
+$labels['changeformathtml'] = 'Mostra en format HTML';
 
 // message compose
 $labels['editasnew']      = 'Edita com a nou';
@@ -243,7 +247,7 @@ $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
 $labels['isdraft']    = 'Aquest és un missatge esborrany.';
 $labels['andnmore']   = '$nr més...';
 $labels['togglemoreheaders'] = 'Mostra més capçaleres del missatge';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = 'Conmuta les capçaleres de text cru';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text net';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Redacta correu per a';
 $labels['contactsfromto'] = 'Contactes $from a $to de $count';
 $labels['print']          = 'Imprimeix';
 $labels['export']         = 'Exporta';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exporta\'ls tots';
+$labels['exportsel']      = 'Exporta els seleccionats';
 $labels['exportvcards']   = 'Exporta contactes en format vCard';
 $labels['newcontactgroup'] = 'Crea un nou grup de contactes';
 $labels['grouprename']    = 'Reanomena el grup';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Importa contactes';
 $labels['importfromfile'] = 'Importa des d\'un fitxer:';
 $labels['importtarget'] = 'Afegeix contactes nous a la llibreta d\'adreces:';
 $labels['importreplace'] = 'Reemplaça la llibreta d\'adreçes sencera';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Podeu carregar contactes des d\'una llibreta de direccions.<br/>Actualment donem suport a la importació d\'adreces des de fitxers de tipus <a href="http://ca.wikipedia.org/wiki/VCard">vCard</a> o CSV (valors separats per comes).';
 $labels['done'] = 'Fet';
 
 // settings
@@ -381,7 +385,7 @@ $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de caràcters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
 $labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['digitalsig'] = 'Signatura digital';
 $labels['dateformat'] = 'Format de la data';
 $labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
@@ -396,8 +400,9 @@ $labels['showinextwin'] = 'Obrir el missatge en una nova finestra';
 $labels['composeextwin'] = 'Redactar en una nova finestra';
 $labels['htmleditor'] = 'Escriu missatges en HTML';
 $labels['htmlonreply'] = 'només en resposta a missatges en HTML';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'en reenviament o resposta a missatge HTML';
 $labels['htmlsignature'] = 'Signatura en HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostra el panell de previsualització';
 $labels['skin'] = 'Aparença d\'interfície';
 $labels['logoutclear'] = 'Buida la paperera al tancar la sessió';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Quan es contesti, suprimeix la signatura orig
 $labels['autoaddsignature'] = 'Afegeix la signatura automàticament';
 $labels['newmessageonly'] = 'només si és un missatge nou';
 $labels['replyandforwardonly'] = 'només a respostes i reenviaments';
-$labels['replysignaturepos'] = 'Quan es contesti o reenviï, posa-hi la signatura';
-$labels['belowquote'] = 'sota les cometes';
-$labels['abovequote'] = 'sobre les cometes';
 $labels['insertsignature'] = 'Inserta la signatura';
 $labels['previewpanemarkread']  = 'Marca els missatges previsualitzats com a llegits';
 $labels['afternseconds']  = 'després de $n segons';
@@ -470,7 +472,7 @@ $labels['spellcheckignorenums'] = 'Ignora paraules amb números';
 $labels['spellcheckignorecaps'] = 'Ignora paraules amb lletres capitalitzades';
 $labels['addtodict'] = 'Afegeix al diccionari';
 $labels['mailtoprotohandler'] = 'Registra controlador de protocol pels enllaços mailto:';
-$labels['forwardmode'] = 'Messages forwarding';
+$labels['forwardmode'] = 'Reenviament de missatges';
 $labels['inline'] = 'en línia';
 $labels['asattachment'] = 'com adjunt';
 
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index 5f0e1d609..70c3fbd0c 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -19,24 +19,26 @@
 $messages = array();
 $messages['errortitle']  = 'Hi ha hagut un error!';
 $messages['loginfailed']  = 'L\'accés ha fallat.';
-$messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies';
-$messages['sessionerror'] = 'La vostra sessió no existeix o ha expirat';
-$messages['storageerror'] = 'Error de conexió amb el servidor IMAP';
+$messages['cookiesdisabled'] = 'El vostre navegador no accepta cookies.';
+$messages['sessionerror'] = 'La vostra sessió no existeix o ha expirat.';
+$messages['storageerror'] = 'Error de connexió amb el servidor IMAP.';
 $messages['servererror'] = 'Error del Servidor!';
 $messages['servererrormsg'] = 'Error del Servidor: $msg';
 $messages['dberror'] = 'Error a la Base de Dades!';
 $messages['requesttimedout'] = 'S\'ha esgotat el temps de la sol·licitud';
 $messages['errorreadonly'] = 'Impossible de realitzar l\'operació. La carpeta és de només lectura.';
 $messages['errornoperm'] = 'Impossible de realitzar l\'operació. Permís denegat.';
-$messages['invalidrequest'] = 'Petició no vàlida! No s\'ha desat les dades.';
+$messages['erroroverquota'] = 'No s\'ha pogut completar l\'operació. No hi ha prou espai lliure al disc dur.';
+$messages['erroroverquotadelete'] = 'No hi ha prou espai lliure. Feu servir MAJÚS+SUPR per suprimir el missatge.';
+$messages['invalidrequest'] = 'Petició no vàlida! No s\'han desat les dades.';
 $messages['invalidhost'] = 'Nom de servidor no vàlid.';
 $messages['nomessagesfound'] = 'No s\'han trobat missatges en aquesta bústia.';
-$messages['loggedout'] = 'Heu tancat la sessió. A reveure!';
+$messages['loggedout'] = 'Heu tancat la sessió correctament. A reveure!';
 $messages['mailboxempty'] = 'La bústia és buida.';
-$messages['refreshing'] = 'Refrescant...';
+$messages['refreshing'] = 'S\'està refrescant...';
 $messages['loading'] = 'S\'està carregant…';
 $messages['uploading'] = 'S\'està pujant el fitxer...';
-$messages['uploadingmany'] = 'S\'està pujant els fitxers...';
+$messages['uploadingmany'] = 'S\'estan pujant els fitxers...';
 $messages['loadingdata'] = 'S\'estan carregant les dades...';
 $messages['checkingmail'] = 'S’està comprovant si hi ha missatges nous…';
 $messages['sendingmessage'] = 'S’està enviant el missatge…';
@@ -52,26 +54,26 @@ $messages['encryptedmessage'] = 'Aquest és un missatge xifrat i no pot ser most
 $messages['nocontactsfound'] = 'No s\'ha trobat cap contacte.';
 $messages['contactnotfound'] = 'No s\'ha trobat el contacte sol·licitat.';
 $messages['contactsearchonly'] = 'Introduïu termes de cerca per trobar contactes';
-$messages['sendingfailed'] = 'Error enviant missatge.';
+$messages['sendingfailed'] = 'Error enviant el missatge.';
 $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge.';
 $messages['errorsavingsent'] = 'Hi ha hagut un error mentre es desava el missatge enviat.';
-$messages['errorsaving'] = 'Hi ha hagut un error mentre es desava.';
+$messages['errorsaving'] = 'Hi ha hagut un error mentre s\'estava desant.';
 $messages['errormoving'] = 'No s\'ha pogut moure el(s) missatge(s).';
 $messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s).';
-$messages['errordeleting'] = 'No s\'ha pogut suprimir el missatge.';
+$messages['errordeleting'] = 'No s\'ha pogut suprimir el(s) missatge(s).';
 $messages['errormarking'] = 'No s\'ha pogut marcar el(s) missatge(s).';
-$messages['deletecontactconfirm']  = 'Esteu segurs de voler suprimir el(s) contacte(s) selecionat(s)?';
-$messages['deletegroupconfirm']  = 'Esteu segurs de voler suprimirr el grup seleccionat?';
-$messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) selecionat(s)?';
+$messages['deletecontactconfirm']  = 'Esteu segurs de voler suprimir el(s) contacte(s) seleccionat(s)?';
+$messages['deletegroupconfirm']  = 'Esteu segurs de voler suprimir el grup seleccionat?';
+$messages['deletemessagesconfirm'] = 'Esteu segurs de voler suprimir el(s) missatge(s) seleccionat(s)?';
 $messages['deletefolderconfirm']  = 'Esteu segurs de voler suprimir aquesta carpeta?';
 $messages['purgefolderconfirm']  = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
 $messages['contactdeleting'] = 'S\'està suprimint els contacte(s)...';
 $messages['groupdeleting'] = 'S\'està suprimint el grup...';
 $messages['folderdeleting'] = 'S\'està suprimint la carpeta...';
 $messages['foldermoving'] = 'S\'està movent la carpeta...';
-$messages['foldersubscribing'] = 'S\'està subscribint la carpeta...';
-$messages['folderunsubscribing'] = 'S\'està cancelant la subscripció de la carpeta...';
-$messages['formincomplete'] = 'El formulari no ha estat emplenat totalment.';
+$messages['foldersubscribing'] = 'S\'està subscrivint la carpeta...';
+$messages['folderunsubscribing'] = 'S\'està cancel·lant la subscripció de la carpeta...';
+$messages['formincomplete'] = 'El formulari no ha estat emplenat completament.';
 $messages['noemailwarning'] = 'Si us plau, introduïu una adreça de correu electrònic vàlida.';
 $messages['nonamewarning']  = 'Si us plau, introduïu un nom.';
 $messages['nopagesizewarning'] = 'Si us plau, introduïu una mida de pàgina.';
@@ -91,11 +93,11 @@ $messages['checking'] = 'S\'està comprovant...';
 $messages['nospellerrors'] = 'No s\'han trobat errors d\'ortografia.';
 $messages['folderdeleted'] = 'Carpeta suprimida correctament.';
 $messages['foldersubscribed'] = 'Carpeta subscrita correctament.';
-$messages['folderunsubscribed'] = 'Carpeta desubscrita correctament.';
+$messages['folderunsubscribed'] = 'Carpeta de-subscrita correctament.';
 $messages['folderpurged'] = 'La carpeta ha estat buidada correctament.';
 $messages['folderexpunged'] = 'La carpeta ha estat compactada correctament.';
 $messages['deletedsuccessfully'] = 'Suprimit correctament.';
-$messages['converting'] = 'S\'està traient format del missatge...';
+$messages['converting'] = 'S\'està traient el format del missatge...';
 $messages['messageopenerror'] = 'No s\'ha pogut carregar el missatge del servidor.';
 $messages['fileuploaderror'] = 'La pujada del fitxer ha fallat.';
 $messages['filesizeerror'] = 'El fitxer pujat excedeix la mida màxima de $size.';
@@ -103,13 +105,13 @@ $messages['copysuccess'] = 'S\'han copiat $nr adreces correctament.';
 $messages['copyerror'] = 'No s\'ha pogut copiar cap adreça.';
 $messages['sourceisreadonly'] = 'Aquesta adreça és només de lectura.';
 $messages['errorsavingcontact'] = 'No s\'ha pogut desar l\'adreça de contacte.';
-$messages['movingmessage'] = 'S\'està movent el missatge...';
-$messages['copyingmessage'] = 'S\'està copiant missatge...';
-$messages['copyingcontact'] = 'S\'està copiant els contacte(s)...';
-$messages['deletingmessage'] = 'S\'està suprimint els missatge(s)...';
-$messages['markingmessage'] = 'S\'està marcant els missatge(s)...';
-$messages['addingmember'] = 'S\'està afegint els contacte(s) al grup...';
-$messages['removingmember'] = 'S\'està suprimint els contacte(s) del grup...';
+$messages['movingmessage'] = 'S\'està movent missatge(s)...';
+$messages['copyingmessage'] = 'S\'està copiant missatge(s)...';
+$messages['copyingcontact'] = 'S\'està copiant contacte(s)...';
+$messages['deletingmessage'] = 'S\'està suprimint missatge(s)...';
+$messages['markingmessage'] = 'S\'està marcant missatge(s)...';
+$messages['addingmember'] = 'S\'està afegint contacte(s) al grup...';
+$messages['removingmember'] = 'S\'està suprimint contacte(s) del grup...';
 $messages['receiptsent'] = 'Confirmació de lectura enviada correctament.';
 $messages['errorsendingreceipt'] = 'No es pot enviar la confirmació.';
 $messages['deleteidentityconfirm'] = 'Esteu segurs de voler suprimir aquesta identitat?';
@@ -132,16 +134,16 @@ $messages['smtpconnerror'] = 'Error SMTP ($code): La connexió al servidor ha fa
 $messages['smtpautherror'] = 'Error SMTP ($code): La identificació ha fallat.';
 $messages['smtpfromerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$from" com a remitent ($msg).';
 $messages['smtptoerror'] = 'Error SMTP ($code): No s\'ha pogut posar "$to" com a destinatari ($msg).';
-$messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la lista de destinataris.';
+$messages['smtprecipientserror'] = 'Error SMTP: No s\'ha pogut analitzar la llista de destinataris.';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Adreça de correu no vàlida: $email';
 $messages['toomanyrecipients'] = 'Massa destinataris. Reduïu el nombre de destinataris a $max.';
 $messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el màxim de $max.';
 $messages['internalerror'] = 'Hi ha hagut un error intern. Si us plau torneu-ho a provar.';
-$messages['contactdelerror'] = 'No s\'ha pogut suprimir el(s) contacte(s).';
-$messages['contactdeleted'] = 'Contacte(s) suprimits(s) correctament.';
-$messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimits(s).';
-$messages['contactrestored'] = 'Contacte(s) restaurats correctament.';
+$messages['contactdelerror'] = 'No s\'han pogut suprimir el(s) contacte(s).';
+$messages['contactdeleted'] = 'Contacte(s) suprimit(s) correctament.';
+$messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimit(s).';
+$messages['contactrestored'] = 'Contacte(s) restaurat(s) correctament.';
 $messages['groupdeleted'] = 'Grup suprimit correctament.';
 $messages['grouprenamed'] = 'Grup reanomenat correctament.';
 $messages['groupcreated'] = 'Grup creat correctament.';
@@ -149,7 +151,7 @@ $messages['savedsearchdeleted'] = 'S\'ha suprimit correctament la cerca desada.'
 $messages['savedsearchdeleteerror'] = 'No s\'ha pogut suprimit la cerca desada.';
 $messages['savedsearchcreated'] = 'S\'ha creat correctament la cerca desada.';
 $messages['savedsearchcreateerror'] = 'No s\'ha pogut crear la cerca desada.';
-$messages['messagedeleted'] = 'Missatge(s) suprimits(s) correctament.';
+$messages['messagedeleted'] = 'Missatge(s) suprimit(s) correctament.';
 $messages['messagemoved'] = 'Missatge(s) mogut(s) correctament.';
 $messages['messagecopied'] = 'Missatge(s) copiat(s) correctament.';
 $messages['messagemarked'] = 'Missatge(s) marcat(s) correctament.';
@@ -160,10 +162,10 @@ $messages['nametoolong'] = 'El nom és massa llarg.';
 $messages['folderupdated'] = 'La carpeta ha estat actualitzada correctament.';
 $messages['foldercreated'] = 'La carpeta ha estat creada correctament.';
 $messages['invalidimageformat'] = 'No és un format d\'imatge vàlid.';
-$messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al misstage.';
+$messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al missatge.';
 $messages['parentnotwritable'] = 'No s\'ha pogut crear/moure la carpeta dins de la carpeta ascendent seleccionada. No hi ha permisos d\'escriptura.';
 $messages['messagetoobig'] = 'La part del missatge és massa gran per processar-la.';
-$messages['attachmentvalidationerror'] = 'ATENCIÓ! Aquest adjunt és sospitós perquè el seu tipus no coincideix amb el tipus declarat al missatge. Si no confies en l\'emissor, no l\'hauries d\'obrir al navegador perquè pot contenir elements maliciosos. <br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Atenció: Aquest client de correu necessita Javascript! Per a poder fer-lo servir, has d\'activar Javascript a les opcions del navegador.';
+$messages['attachmentvalidationerror'] = 'ATENCIÓ! Aquest adjunt és sospitós perquè el seu tipus no coincideix amb el tipus declarat al missatge. Si no confieu en l\'emissor, no l\'hauríeu d\'obrir al navegador perquè pot contenir elements maliciosos. <br/><br/><em>S\'esperava: $expected; s\'ha trobat: $detected</em>';
+$messages['noscriptwarning'] = 'Atenció: Aquest client de correu necessita Javascript! Per a poder fer-lo servir, heu d\'activar Javascript a les opcions del navegador.';
 
 ?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index 9f8dc1870..8fb7ffade 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopírovat';
 $labels['move']     = 'Přesunout';
 $labels['moveto']   = 'přesunout do...';
 $labels['download'] = 'stáhnout';
+$labels['open']     = 'Otevřít';
 $labels['showattachment'] = 'Zobrazit';
 $labels['showanyway'] = 'Přesto zobrazit';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuální stránka';
 $labels['unread'] = 'Nepřečtené';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
+$labels['withattachment'] = 'S přílohou';
 $labels['deleted'] = 'Smazané';
 $labels['undeleted'] = 'Nesmazáno';
 $labels['invert'] = 'Převrátit';
@@ -204,6 +206,8 @@ $labels['body']  = 'Tělo';
 
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
+$labels['changeformattext'] = 'Zobrazit v textovém formátu';
+$labels['changeformathtml'] = 'Zobrazit v HTML formátu';
 
 // message compose
 $labels['editasnew']      = 'Upravit jako novou';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Poslat e-mail';
 $labels['contactsfromto'] = 'Kontakty $from až $to z celkem $count';
 $labels['print']          = 'Tisk';
 $labels['export']         = 'Export';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Export všech';
+$labels['exportsel']      = 'Export vybraných';
 $labels['exportvcards']   = 'Exportovat kontakty ve formátu vCard';
 $labels['newcontactgroup'] = 'Vytvořit novou skupinu kontaktů';
 $labels['grouprename']    = 'Přejmenovat skupinu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Vytvářet HTML zprávy';
 $labels['htmlonreply'] = 'jen při odpovědi na HTML zprávy';
 $labels['htmlonreplyandforward'] = 'při přeposlání nebo odpovědi na HTML zprávu';
 $labels['htmlsignature'] = 'HTML podpis';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Zobrazit panel náhledu';
 $labels['skin'] = 'Vzhled';
 $labels['logoutclear'] = 'Vyprázdnit koš při odhlášení';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Při odpovídání odstranit ze zprávy půvo
 $labels['autoaddsignature'] = 'Automaticky přidat podpis';
 $labels['newmessageonly'] = 'pouze k novým zprávám';
 $labels['replyandforwardonly'] = 'jen k odpovědi a přeposílané zprávě';
-$labels['replysignaturepos'] = 'Při odpovídání nebo přeposílání zprávy vložit podpis';
-$labels['belowquote'] = 'pod citaci';
-$labels['abovequote'] = 'nad citaci';
 $labels['insertsignature'] = 'Vložit podpis';
 $labels['previewpanemarkread']  = 'Označit zobrazené zprávy jako přečtené';
 $labels['afternseconds']  = 'po $n sekundách';
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index cee1bd09a..9800b2412 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Chyba v databázi!';
 $messages['requesttimedout'] = 'Došlo k vypršení požadavku';
 $messages['errorreadonly'] = 'Příkaz nelze provést, složka je určena jen ke čtení.';
 $messages['errornoperm'] = 'Příkaz nelze provést, nemáte oprávnění.';
+$messages['erroroverquota'] = 'Příkaz nelze provést, není volné místo na disku.';
+$messages['erroroverquotadelete'] = 'Není volné místo na disku. Použijte SHIFT+DEL k odstranění zprávy.';
 $messages['invalidrequest'] = 'Nesprávný požadavek. Data nebyla uložena.';
 $messages['invalidhost'] = 'Špatné jméno serveru.';
 $messages['nomessagesfound'] = 'Ve schránce nebyla nalezena žádná zpráva';
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index c6cf2344a..3e4f136bc 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copio';
 $labels['move']     = 'Symud';
 $labels['moveto']   = 'Symud i...';
 $labels['download'] = 'Llwytho lawr';
+$labels['open']     = 'Agor';
 $labels['showattachment'] = 'Dangos';
 $labels['showanyway'] = 'Dangos beth bynnag';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Tudalen gyfredol';
 $labels['unread'] = 'Heb eu darllen';
 $labels['flagged'] = 'Nodwyd';
 $labels['unanswered'] = 'Heb ei ateb';
+$labels['withattachment'] = 'Gyda atodiad';
 $labels['deleted'] = 'Dilewyd';
 $labels['undeleted'] = 'Heb ei ddileu';
 $labels['invert'] = 'Gwrth-droi';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corff';
 
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
+$labels['changeformattext'] = 'Dangos mewn fformat testun plaen';
+$labels['changeformathtml'] = 'Dangos mewn fformat HTML';
 
 // message compose
 $labels['editasnew']      = 'Golygu fel neges newydd';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Ysgrifennu neges at';
 $labels['contactsfromto'] = 'Cysylltiadau $from i $to o $count';
 $labels['print']          = 'Argraffu';
 $labels['export']         = 'Allforio';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Allforio popeth';
+$labels['exportsel']      = 'Allforio dewiswyd';
 $labels['exportvcards']   = 'Allforio cysylltiadau mewn fformat vCard';
 $labels['newcontactgroup'] = 'Creu grŵp cysylltiadau newydd';
 $labels['grouprename']    = 'Ail-enwi grŵp';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Ysgrifennu negeseuon HTML';
 $labels['htmlonreply'] = 'wrth ateb i neges HTML yn unig';
 $labels['htmlonreplyandforward'] = 'wrth ddanfon ymlaen neu ymateb i neges HTML';
 $labels['htmlsignature'] = 'Llofnod HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Dangos ffenest rhagolwg';
 $labels['skin'] = 'Croen rhyngwyneb';
 $labels['logoutclear'] = 'Clirio\'r Sbwriel wrth allgofnodi';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Wrth ateb, dileu\'r llofnod gwreiddiol o\'r n
 $labels['autoaddsignature'] = 'Ychwanegu llofnod yn awtomatig';
 $labels['newmessageonly'] = 'negeseuon newydd yn unig';
 $labels['replyandforwardonly'] = 'atebion a danfon ymlaen yn unig';
-$labels['replysignaturepos'] = 'Wrth ateb neu ddanfon ymlaen, rhoi\'r llofnod';
-$labels['belowquote'] = 'o dan y dyfynniad';
-$labels['abovequote'] = 'uwchben y dyfynniad';
 $labels['insertsignature'] = 'Mewnosod llofnod';
 $labels['previewpanemarkread']  = 'Nodi negeseuon rhagolwg fel darllenwyd';
 $labels['afternseconds']  = 'ar ôl $n eiliad';
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 553422948..edadc3b45 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Gwall Cronfa Ddata!';
 $messages['requesttimedout'] = 'Cais wedi dod i derfyn amser';
 $messages['errorreadonly'] = 'Methwyd gweithredu. Mae\'r ffolder yn darllen-yn-unig';
 $messages['errornoperm'] = 'Methwyd gweithredu. Gwrthodwyd caniatad';
+$messages['erroroverquota'] = 'Methwyd gweithredu. Nid oes gofod gwag ar y disg.';
+$messages['erroroverquotadelete'] = 'Dim gofod gwag ar y disg. Defnyddiwch SHIFT+DEL i ddileu neges.';
 $messages['invalidrequest'] = 'Cais annilys! Ni chadwyd unrhyw wybodaeth.';
 $messages['invalidhost'] = 'Enw gweinydd annilys.';
 $messages['nomessagesfound'] = 'Dim negeseuon wedi eu canfod yn y blwch hwn';
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 93209b869..02d7dd9e3 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiér';
 $labels['move']     = 'Flyt';
 $labels['moveto']   = 'Flyt til...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Åben';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis alligevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuel side';
 $labels['unread'] = 'Ulæste';
 $labels['flagged'] = 'Markeret';
 $labels['unanswered'] = 'Ubesvaret';
+$labels['withattachment'] = 'Med vedhæftning';
 $labels['deleted'] = 'Slettede';
 $labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Invertér';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Vis i ren tekst format';
+$labels['changeformathtml'] = 'Vis i HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redigér som ny';
@@ -243,7 +247,7 @@ $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
 $labels['isdraft']    = 'Dette er en kladde.';
 $labels['andnmore']   = '$nr yderligere...';
 $labels['togglemoreheaders'] = 'Vis yderligere headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = 'Ændre rå brevhoveder';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Skriv besked til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
 $labels['print']          = 'Udskriv';
 $labels['export']         = 'Eksportér';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksporter alt';
+$labels['exportsel']      = 'Eksporter udvalgte';
 $labels['exportvcards']   = 'Eksportér kontakter i vCard format';
 $labels['newcontactgroup'] = 'Opret ny kontaktgruppe';
 $labels['grouprename']    = 'Omdøb gruppe';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Skriv HTML-besked';
 $labels['htmlonreply'] = 'kun når jeg besvarer HTML-beskeder';
 $labels['htmlonreplyandforward'] = 'ved videresendelse eller besvarelse af HTML beskeder';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Forhåndsvisning';
 $labels['skin'] = 'Brugerflade';
 $labels['logoutclear'] = 'Tøm Papirkurv når jeg logger af';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Fjern original signatur fra besked, når der
 $labels['autoaddsignature'] = 'Indsæt automatisk signatur';
 $labels['newmessageonly'] = 'kun på nye beskeder';
 $labels['replyandforwardonly'] = 'kun på svar og videresendelse af beskeder';
-$labels['replysignaturepos'] = 'Når beskeder besvares eller videresendes; indsæt signatur';
-$labels['belowquote'] = 'under det citerede';
-$labels['abovequote'] = 'over det citerede';
 $labels['insertsignature'] = 'Indsæt signatur';
 $labels['previewpanemarkread']  = 'Markér forhåndsviste beskeder som læst';
 $labels['afternseconds']  = 'efter $n sekunder';
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index 6b8ce1928..9a0b8e4a5 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database fejl!';
 $messages['requesttimedout'] = 'Forespørgselstiden udløb';
 $messages['errorreadonly'] = 'Kunne ikke udføre den ønskede handling. Mappen er skrivebeskyttet.';
 $messages['errornoperm'] = 'Kunne ikke udføre den ønskede handling. Adgang nægtet.';
+$messages['erroroverquota'] = 'Kan ikke udføre handlingen. Der er ikke nok ledig diskplads.';
+$messages['erroroverquotadelete'] = 'Der er ikke nok ledig diskplads. Brug SHIFT+DEL til at slette en meddelelse.';
 $messages['invalidrequest'] = 'Ugyldig forespørgsel! Ingen data blev gemt.';
 $messages['invalidhost'] = 'Ugyldigt servernavn.';
 $messages['nomessagesfound'] = 'Der blev ikke fundet nogen beskeder i denne postkasse.';
@@ -163,7 +165,7 @@ $messages['invalidimageformat'] = 'Ikke et gyldigt billedformat.';
 $messages['mispellingsfound'] = 'Der er fundet stavefejl i beskeden.';
 $messages['parentnotwritable'] = 'Kan ikke oprette/flytte mappe ind i valgt mappe. Ingen adgangsrettigheder.';
 $messages['messagetoobig'] = 'Denne del af beskeden er for stor til at blive behandlet.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'ADVARSEL! Den vedhæftede fil er mistænkelig - Typen stemmer ikke overens med den oplyste type. Hvis du ikke har tillid til afsender, skal du ikke åbne filen da den kan indholde onsindet indhold. <br/><br/><em>Forventet: $expected; Fundet: $detected</em>';
 $messages['noscriptwarning'] = 'Advarsel: Denne webmailclient kræver Javascript! For at kunne bruge den slå venligst Javascripts til i din browserindstillinger.';
 
 ?>
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 31444b6c1..bea939d3d 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieren';
 $labels['move']     = 'Verschieben';
 $labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Öffnen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
+$labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelöschte';
 $labels['undeleted'] = 'Nicht gelöscht';
 $labels['invert'] = 'Umkehren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Inhalt';
 
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Herunterladen (.eml)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
 
 // message compose
 $labels['editasnew']      = 'Als neue Nachricht öffnen';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML-Nachrichten verfassen';
 $labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
 $labels['htmlonreplyandforward'] = 'Antworten oder Weiterleiten einer HTML-Nachricht';
 $labels['htmlsignature'] = 'HTML-Signatur';
+$labels['showemail'] = 'E-Mail-Adresse und Namen anzeigen';
 $labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
 $labels['skin'] = 'Oberflächendesign';
 $labels['logoutclear'] = 'Papierkorb beim Abmelden leeren';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Beim Antworten die Signatur der Originalnachr
 $labels['autoaddsignature'] = 'Signatur automatisch einfügen';
 $labels['newmessageonly'] = 'nur bei neuen Nachrichten';
 $labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
-$labels['replysignaturepos'] = 'Beim Antworten oder Weiterleiten die Signatur';
-$labels['belowquote'] = 'unter der Originalnachricht einfügen';
-$labels['abovequote'] = 'über der Originalnachricht einfügen';
 $labels['insertsignature'] = 'Signatur einfügen';
 $labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
 $labels['afternseconds']  = 'nach $n Sekunden';
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 027e2ee06..f3697a825 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datenbankfehler!';
 $messages['requesttimedout'] = 'Zeitlimit überschritten';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
+$messages['erroroverquota'] = 'Die Aktion kann nicht ausgeführt werden. Keine freier Speicherplatz.';
+$messages['erroroverquotadelete'] = 'Kein freier Speicherplatz. Drücken Sie SHIFT+DEL um die Nachricht zu löschen.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
 $messages['invalidhost'] = 'Ungültiger Servername';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 6ce679caa..376376dad 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieren';
 $labels['move']     = 'Verschieben';
 $labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Herunterladen';
+$labels['open']     = 'Offen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
 $labels['unanswered'] = 'Unbeantwortete';
+$labels['withattachment'] = 'Mit Anhang';
 $labels['deleted'] = 'Gelöschte';
 $labels['undeleted'] = 'Nicht gelöscht';
 $labels['invert'] = 'Invertieren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Inhalt';
 
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
 
 // message compose
 $labels['editasnew']      = 'Als neue Nachricht öffnen';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML-Nachrichten verfassen';
 $labels['htmlonreply'] = 'nur Antworten auf HTML-Nachrichten';
 $labels['htmlonreplyandforward'] = 'beim Weiterleiten und  Beantworten auf HTML-Nachrichten';
 $labels['htmlsignature'] = 'HTML-Signatur';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Nachrichtenvorschau anzeigen';
 $labels['skin'] = 'Oberflächendesign';
 $labels['logoutclear'] = 'Papierkorb beim Abmelden leeren';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Beim Antworten Signatur der Originalnachricht
 $labels['autoaddsignature'] = 'Signatur automatisch einfügen';
 $labels['newmessageonly'] = 'nur bei neuen Nachrichten';
 $labels['replyandforwardonly'] = 'nur bei Antworten und Weiterleitungen';
-$labels['replysignaturepos'] = 'Beim Antworten die Signatur';
-$labels['belowquote'] = 'unter der Originalnachricht einfügen';
-$labels['abovequote'] = 'über der Originalnachricht einfügen';
 $labels['insertsignature'] = 'Signatur einfügen';
 $labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
 $labels['afternseconds']  = 'nach $n Sekunden';
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index eeaba7db2..ba0936d28 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datenbankfehler!';
 $messages['requesttimedout'] = 'Zeitüberschreitung der Anforderung';
 $messages['errorreadonly'] = 'Die Aktion kann nicht ausgeführt werden. Der Ordner ist schreibgeschützt.';
 $messages['errornoperm'] = 'Die Aktion kann nicht ausgeführt werden. Zugriff verweigert.';
+$messages['erroroverquota'] = 'Die Aktion kann nicht ausgeführt werden. Nicht genug freier Speicherplatz.';
+$messages['erroroverquotadelete'] = 'Nicht genug freier Speicherplatz. Verwenden sie SHIFT+ENTF um Nachrichten zu löschen.';
 $messages['invalidrequest'] = 'Ungültige Anfrage! Es wurden keine Daten gespeichert.';
 $messages['invalidhost'] = 'Ungültiger Server Name';
 $messages['nomessagesfound'] = 'Keine Nachrichten in diesem Ordner.';
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 208164779..9f5d81839 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Αντιγραφή';
 $labels['move']     = 'Μετακίνηση';
 $labels['moveto']   = 'Μετακίνηση σε...';
 $labels['download'] = 'Λήψη';
+$labels['open']     = 'Ανοιγμα';
 $labels['showattachment'] = 'Εμφάνιση';
 $labels['showanyway'] = 'Εμφάνιση';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Τρέχουσα σελίδα';
 $labels['unread'] = 'Μη αναγνωσμένο';
 $labels['flagged'] = 'Σημειωμένο';
 $labels['unanswered'] = 'Αναπάντητο';
+$labels['withattachment'] = 'Με επισύναψη';
 $labels['deleted'] = 'Διεγραμμένο';
 $labels['undeleted'] = 'Μη διεγραμμένο';
 $labels['invert'] = 'Αναστροφή';
@@ -204,6 +206,8 @@ $labels['body']  = 'Σώμα';
 
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
+$labels['changeformattext'] = 'Εμφάνιση σε μορφή απλού κειμένου';
+$labels['changeformathtml'] = 'Εμφάνιση σε μορφή HTML';
 
 // message compose
 $labels['editasnew']      = 'Επεξεργασία σαν νέο';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Δημιουργία μηνύματος σε μορφή
 $labels['htmlonreply'] = 'μόνο σε απάντηση μηνύματος μορφής HTML';
 $labels['htmlonreplyandforward'] = 'σε προώθηση ή σε απάντηση σε HTML μήνυμα';
 $labels['htmlsignature'] = 'Υπογραφή HTML';
+$labels['showemail'] = 'Εμφάνιση διεύθυνσης e-mail με το εμφανιζόμενο όνομα';
 $labels['previewpane'] = 'Εμφάνιση προεπισκόπησης';
 $labels['skin'] = 'Θέμα εμφάνισης';
 $labels['logoutclear'] = 'Άδειασμα του κάδου στην έξοδο';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Όταν το μήνυμα είναι απά�
 $labels['autoaddsignature'] = 'Η υπογραφή να προστίθεται αυτόματα';
 $labels['newmessageonly'] = 'μόνο στα νέα μηνύματα';
 $labels['replyandforwardonly'] = 'μόνο στις απαντήσεις και προωθήσεις';
-$labels['replysignaturepos'] = 'Όταν γίνεται απάντηση ή προώθηση, η υπογραφή να τοποθετείτε';
-$labels['belowquote'] = 'πάνω από την παράθεση';
-$labels['abovequote'] = 'κάτω από την παράθεση';
 $labels['insertsignature'] = 'Προσθήκη υπογραφής';
 $labels['previewpanemarkread']  = 'Στα μηνύματα που έγινε προεπισκόπηση να μαρκάρονται σαν αναγνωσμένα';
 $labels['afternseconds']  = 'μετά από $n δευτερόλεπτα';
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index 542066efa..dc2499d8b 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Σφάλμα βάσης δεδομένων!';
 $messages['requesttimedout'] = 'Το αίτημα εξέπνευσε χρονικά';
 $messages['errorreadonly'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Ο φάκελος είναι μόνο για ανάγνωση.';
 $messages['errornoperm'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Άρνηση άδειας';
+$messages['erroroverquota'] = 'Δεν είναι δυνατή η εκτέλεση της λειτουργίας. Δεν υπάρχει ελεύθερος χώρος στο δίσκο. ';
+$messages['erroroverquotadelete'] = 'Δεν υπάρχει ελεύθερος χώρος στο δίσκο. Χρησιμοποιήστε το συνδυασμό πλήκτρων SHIFT DEL για να διαγράψετε ένα μήνυμα.';
 $messages['invalidrequest'] = 'Λανθασμένο αίτημα! Δεν αποθηκεύτηκαν δεδομένα.';
 $messages['invalidhost'] = 'Άκυρο όνομα εξυπηρετητή.';
 $messages['nomessagesfound'] = 'Δε βρέθηκαν μηνύματα σε αυτή τη θυρίδα';
@@ -90,8 +92,8 @@ $messages['searching'] = 'Αναζήτηση...';
 $messages['checking'] = 'Έλεγχος...';
 $messages['nospellerrors'] = 'Δε βρέθηκαν ορθογραφικά λάθη';
 $messages['folderdeleted'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
-$messages['foldersubscribed'] = 'Folder successfully subscribed.';
-$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['foldersubscribed'] = 'Ο φάκελος εχει εγγραφεί με επιτυχία.';
+$messages['folderunsubscribed'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
 $messages['folderpurged'] = 'Ο φάκελος καθαρίστηκε με επιτυχία.';
 $messages['folderexpunged'] = 'Ο φάκελος συμπιέστηκε με επιτυχία.';
 $messages['deletedsuccessfully'] = 'Διαγραφή Επιτυχώς';
@@ -119,9 +121,9 @@ $messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβα
 $messages['addresswriterror'] = 'Η επιλεγμένη ατζέντα διευθύνσεων δεν είνα εγγράψιμη';
 $messages['contactaddedtogroup'] = 'Οι επαφές προστέθηκαν στην ομάδα με επιτυχία.';
 $messages['contactremovedfromgroup'] = 'Οι επαφές αφαιρέθηκαν από την ομάδα με επιτυχία.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Οι αναθεσεις της ομαδας δεν αλλαξαν.';
 $messages['importwait'] = 'Εισαγωγή, παρακαλώ περιμένετε...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'Η εισαγωγή απέτυχε! Το αρχείο δεν είναι έγκυρο εισαγωγής δεδομένων.';
 $messages['importconfirm'] = '<b>Εισήχθησαν $inserted επαφές με επιτυχία</b>';
 $messages['importconfirmskipped'] = '<b>Παραλήφθηκαν $skipped υπάρχοντα αντικείμενα</b>';
 $messages['opnotpermitted'] = 'Η λειτουργία δεν επιτρέπεται!';
@@ -140,30 +142,30 @@ $messages['maxgroupmembersreached'] = 'Ο αριθμός των μελών τη�
 $messages['internalerror'] = 'Προέκυψε ένα εσωτερικό σφάλμα. Παρακαλώ δοκιμάστε πάλι.';
 $messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγραφή της επαφής/ων';
 $messages['contactdeleted'] = 'Η επαφή/ές διαγράφηκαν με επιτυχία.';
-$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
-$messages['contactrestored'] = 'Contact(s) restored successfully.';
-$messages['groupdeleted'] = 'Group deleted successfully.';
-$messages['grouprenamed'] = 'Group renamed successfully.';
-$messages['groupcreated'] = 'Group created successfully.';
-$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
-$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
-$messages['savedsearchcreated'] = 'Saved search created successfully.';
-$messages['savedsearchcreateerror'] = 'Could not create saved search.';
-$messages['messagedeleted'] = 'Message(s) deleted successfully.';
-$messages['messagemoved'] = 'Message(s) moved successfully.';
-$messages['messagecopied'] = 'Message(s) copied successfully.';
-$messages['messagemarked'] = 'Message(s) marked successfully.';
-$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
-$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
-$messages['namecannotbeempty'] = 'Name cannot be empty.';
-$messages['nametoolong'] = 'Name is too long.';
-$messages['folderupdated'] = 'Folder updated successfully.';
-$messages['foldercreated'] = 'Folder created successfully.';
-$messages['invalidimageformat'] = 'Not a valid image format.';
-$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
-$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['contactrestoreerror'] = 'Οι διαγραφημενη επαφη(ες) δεν μπορουν να επαναφερθουν.';
+$messages['contactrestored'] = 'Η επαφη(ες) επαναφερθηκαν.';
+$messages['groupdeleted'] = 'Η ομαδα διαγράφηκε επιτυχώς.';
+$messages['grouprenamed'] = 'Η ομαδα μετονομαστηκε επιτυχως.';
+$messages['groupcreated'] = 'Η ομαδα δημιουργηθηκε επιτυχως.';
+$messages['savedsearchdeleted'] = 'Η αποθηκευμένη αναζήτηση διαγράφηκε επιτυχως. ';
+$messages['savedsearchdeleteerror'] = 'Δεν ήταν δυνατή η διαγραφή της αποθηκευμένης αναζήτησης.';
+$messages['savedsearchcreated'] = 'Η αποθηκευμένη αναζητήση δημιουργήθηκε με επιτυχία. ';
+$messages['savedsearchcreateerror'] = 'Η αποθηκευμενη αναζητηση δεν μπορεσε να δημιουργηθει.';
+$messages['messagedeleted'] = 'Το μυνημα(τα) διαγραφηκαν επιτυχως.';
+$messages['messagemoved'] = 'Το μυνημα(τα) μετακινηθηκαν επιτυχως.';
+$messages['messagecopied'] = 'Το μυνημα(τα) αντιγραφθηκαν επιτυχως.';
+$messages['messagemarked'] = 'Το μυνημα(τα) μαρκαρισθηκαν επιτυχως.';
+$messages['autocompletechars'] = 'Εισάγετε τουλάχιστον $min χαρακτήρες για αυτόματη συμπλήρωση.';
+$messages['autocompletemore'] = 'Περισσότερες ταιριάστες καταχωρήσεις βρέθηκαν. Πληκτρολογείστε περισσότερους χαρακτήρες.';
+$messages['namecannotbeempty'] = 'Το ονομα δεν μπορεί να είναι κενό.';
+$messages['nametoolong'] = 'Το όνομα είναι πολύ μεγάλο.';
+$messages['folderupdated'] = 'Ο φάκελος ανανεωθηκε επιτυχώς.';
+$messages['foldercreated'] = 'Ο φάκελος δημιουργηθηκε επιτυχώς.';
+$messages['invalidimageformat'] = 'Μη έγκυρη μορφή εικόνας. ';
+$messages['mispellingsfound'] = 'Ορθογραφικά λάθη εντοπίστηκαν στο μήνυμα. ';
+$messages['parentnotwritable'] = 'Δεν είναι δυνατή η δημιουργία/μετακινήση φάκελου σε επιλεγμένο φάκελο γονέα. Κανένα δικαίωμα πρόσβασης. ';
+$messages['messagetoobig'] = 'Το τμήμα μήνυματος είναι πολύ μεγάλο για επεξεργασια. ';
+$messages['attachmentvalidationerror'] = 'ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Αυτή η κατάσχεση είναι ύποπτη, επειδή ο τύπος δεν ταιριάζει με τον τύπο που δηλώνεται στο μήνυμα. Εάν δεν εμπιστεύεστε τον αποστολέα, δεν θα πρέπει να το ανοίγετε στο πρόγραμμα περιήγησης επειδή μπορεί να περιέχει κακόβουλο περιεχόμενο.<br/><br/><em>Expected: $expected; found: $detected</em> ';
+$messages['noscriptwarning'] = 'Προειδοποίηση : Αυτή η υπηρεσία webmail απαιτεί Javascript! Για να ΤΟ χρησιμοποιήσετε ενεργοποιήστε τΟ JavaScript στις ρυθμίσεις του browser σας. ';
 
 ?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index fb9ebe383..275208a98 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message only';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index f819147b0..21e7539b4 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 57d7c2e42..c088fc50e 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopii';
 $labels['move']     = 'Movi';
 $labels['moveto']   = 'transloku al...';
 $labels['download'] = 'elŝutu';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Nuna paĝo';
 $labels['unread'] = 'Nelegitan';
 $labels['flagged'] = 'Markita';
 $labels['unanswered'] = 'Nerespondita';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Forigita';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inversigu';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Redaktu kiel nova';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Uzado de HTML-redaktilo';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML subskribo';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Montru antaŭrigardejon';
 $labels['skin'] = 'Interfaco-etoso';
 $labels['logoutclear'] = 'Malplenigu rubujon je eliro';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 32771733d..4d72fe54b 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Datumbaz-eraro!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Ne povis fari agon. Dosierujo estas nurlega';
 $messages['errornoperm'] = 'Ne povis fari agon. Ne havas permeson.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Nevalida peto';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Neniu mesaĝo en ĉi tiu dosierujo';
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index d6760ac97..d9a83be75 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Basura';
 // message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitente';
 $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia';
 $labels['bcc']     = 'Cco';
@@ -52,20 +52,21 @@ $labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Read status';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = 'Listar opciones...';
 
 $labels['mailboxlist'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
-$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['threadsfromto'] = '$from a $to de $count conversaciones';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['fromtoshort'] = '$from – $to of $count';
+$labels['fromtoshort'] = '$from – $to de $count';
 
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Mostrar';
+$labels['showanyway'] = 'Mostrar esto siempre';
 
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
@@ -121,18 +122,18 @@ $labels['longdec']	= 'Diciembre';
 $labels['today'] = 'Hoy';
 
 // toolbar buttons
-$labels['refresh']          = 'Refresh';
+$labels['refresh']          = 'Actualizar';
 $labels['checkmail']        = 'Revisar si hay nuevos mensajes';
 $labels['compose']          = 'Escribir un mensaje';
 $labels['writenewmessage']  = 'Crear nuevo mensaje';
-$labels['reply']            = 'Reply';
+$labels['reply']            = 'Responder';
 $labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['replyall']         = 'Reply all';
-$labels['replylist']        = 'Reply list';
-$labels['forward']          = 'Forward';
-$labels['forwardinline']    = 'Forward inline';
-$labels['forwardattachment'] = 'Forward as attachment';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder a lista';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar en linea';
+$labels['forwardattachment'] = 'Reenviar como adjunto';
 $labels['forwardmessage']   = 'Reenviar mensaje';
 $labels['deletemessage']    = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
@@ -143,16 +144,16 @@ $labels['nextmessage']      = 'Mostrar siguente mensaje';
 $labels['lastmessage']      = 'Mostrar último mensaje';
 $labels['backtolist']       = 'Volver a la lista de mensajes';
 $labels['viewsource']       = 'Mostrar código';
-$labels['mark']             = 'Mark';
+$labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar mensajes';
 $labels['markread']         = 'Como leído';
 $labels['markunread']       = 'Como no leído';
 $labels['markflagged']      = 'Como marcado';
 $labels['markunflagged']    = 'Como no marcado';
-$labels['moreactions']      = 'More actions...';
-$labels['more']             = 'More';
-$labels['back']             = 'Back';
-$labels['options']          = 'Options';
+$labels['moreactions']      = 'Mas acciones...';
+$labels['more']             = 'Más';
+$labels['back']             = 'Atrás';
+$labels['options']          = 'Opciones';
 
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
@@ -161,34 +162,35 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Marcado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eliminado';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
-$labels['list'] = 'List';
-$labels['threads'] = 'Threads';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Conversaciones';
 $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
-$labels['threaded'] = 'Threaded';
+$labels['threaded'] = 'Como conversaciones';
 
-$labels['autoexpand_threads'] = 'Expand message threads';
-$labels['do_expand'] = 'all threads';
+$labels['autoexpand_threads'] = 'Expandir mensajes en conversación';
+$labels['do_expand'] = 'todas las conversaciones';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = 'Flag';
+$labels['fromto'] = 'De/A';
+$labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
 $labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de Enviado';
 $labels['arrival'] = 'Fecha de Recepción';
 $labels['asc'] = 'Ascendente';
 $labels['desc'] = 'Descendente';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = 'Sorting column';
-$labels['listorder'] = 'Sorting order';
+$labels['listcolumns'] = 'Listar columnas';
+$labels['listsorting'] = 'Ordenar por';
+$labels['listorder'] = 'Ordenado por';
 $labels['listmode'] = 'List view mode';
 
-$labels['folderactions'] = 'Folder actions...';
+$labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
 
@@ -204,32 +206,34 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
-$labels['send']           = 'Send';
+$labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar ahora el mensaje';
 $labels['savemessage']    = 'Guardar como borrador';
 $labels['addattachment']  = 'Añadir un archivo';
 $labels['charset']        = 'Codificación';
 $labels['editortype']     = 'Tipo de editor';
 $labels['returnreceipt']  = 'Acuse de recibo';
-$labels['dsn']            = 'Delivery status notification';
-$labels['mailreplyintro'] = 'On $date, $sender wrote:';
-$labels['originalmessage'] = 'Original Message';
+$labels['dsn']            = 'Notificación de estado del envío';
+$labels['mailreplyintro'] = 'El $date, $sender escribió:';
+$labels['originalmessage'] = 'Mensaje original';
 
-$labels['editidents']    = 'Edit identities';
-$labels['spellcheck']    = 'Spell';
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Gramática';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
 $labels['revertto']      = 'Revertir a';
 
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
-$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['uploadprogress'] = '$percent ($current de $total)';
 $labels['close']  = 'Cerrar';
-$labels['messageoptions']  = 'Message options...';
+$labels['messageoptions']  = 'Opciones de mensaje...';
 
 $labels['low']     = 'Bajo';
 $labels['lowest']  = 'Bajísimo';
@@ -240,9 +244,9 @@ $labels['highest'] = 'Altísimo';
 $labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Siempre mostrar imágenes de $sender';
-$labels['isdraft']    = 'This is a draft message.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['isdraft']    = 'Este es un borrador.';
+$labels['andnmore']   = '$nr más...';
+$labels['togglemoreheaders'] = 'Mostrarme más encabezados de mensaje';
 $labels['togglefullheaders'] = 'Toggle raw message headers';
 
 $labels['htmltoggle'] = 'HTML';
@@ -266,68 +270,68 @@ $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaj
 $labels['name']         = 'Nombre completo';
 $labels['firstname']    = 'Nombre';
 $labels['surname']      = 'Apellido';
-$labels['middlename']   = 'Middle Name';
-$labels['nameprefix']   = 'Prefix';
-$labels['namesuffix']   = 'Suffix';
-$labels['nickname']     = 'Nickname';
-$labels['jobtitle']     = 'Job Title';
-$labels['department']   = 'Department';
-$labels['gender']       = 'Gender';
-$labels['maidenname']   = 'Maiden Name';
+$labels['middlename']   = 'Segundo nombre';
+$labels['nameprefix']   = 'Prefijo';
+$labels['namesuffix']   = 'Subfijo';
+$labels['nickname']     = 'Sobre nombre';
+$labels['jobtitle']     = 'Puesto';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Apellido de soltera';
 $labels['email']        = 'Correo';
-$labels['phone']        = 'Phone';
-$labels['address']      = 'Address';
-$labels['street']       = 'Street';
-$labels['locality']     = 'City';
-$labels['zipcode']      = 'ZIP Code';
-$labels['region']       = 'State/Province';
-$labels['country']      = 'Country';
-$labels['birthday']     = 'Birthday';
-$labels['anniversary']  = 'Anniversary';
-$labels['website']      = 'Website';
-$labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notes';
-$labels['male']   = 'male';
-$labels['female'] = 'female';
-$labels['manager'] = 'Manager';
-$labels['assistant'] = 'Assistant';
-$labels['spouse'] = 'Spouse';
-$labels['allfields'] = 'All fields';
-$labels['search'] = 'Search';
-$labels['advsearch'] = 'Advanced Search';
-$labels['advanced'] = 'Advanced';
-$labels['other'] = 'Other';
-
-$labels['typehome']   = 'Home';
-$labels['typework']   = 'Work';
-$labels['typeother']  = 'Other';
-$labels['typemobile']  = 'Mobile';
-$labels['typemain']  = 'Main';
-$labels['typehomefax']  = 'Home Fax';
-$labels['typeworkfax']  = 'Work Fax';
-$labels['typecar']  = 'Car';
+$labels['phone']        = 'Teléfono';
+$labels['address']      = 'Dirección';
+$labels['street']       = 'Calle';
+$labels['locality']     = 'Ciudad';
+$labels['zipcode']      = 'Código Postal';
+$labels['region']       = 'Estado/Provincia';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Cumpleaños';
+$labels['anniversary']  = 'Aniversario';
+$labels['website']      = 'Sitio Web';
+$labels['instantmessenger'] = 'Mensajería Instantanea';
+$labels['notes'] = 'Notas';
+$labels['male']   = 'masculino';
+$labels['female'] = 'femenino';
+$labels['manager'] = 'Administrador';
+$labels['assistant'] = 'Asistente';
+$labels['spouse'] = 'Cónygue';
+$labels['allfields'] = 'Todos los campos';
+$labels['search'] = 'Buscar';
+$labels['advsearch'] = 'Búsqueda Avanzada';
+$labels['advanced'] = 'Avanzado';
+$labels['other'] = 'Otro';
+
+$labels['typehome']   = 'Particular';
+$labels['typework']   = 'Laboral';
+$labels['typeother']  = 'Otro';
+$labels['typemobile']  = 'Móvil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax Particular';
+$labels['typeworkfax']  = 'Fax Laboral';
+$labels['typecar']  = 'Auto';
 $labels['typepager']  = 'Pager';
 $labels['typevideo']  = 'Video';
-$labels['typeassistant']  = 'Assistant';
-$labels['typehomepage']  = 'Home Page';
+$labels['typeassistant']  = 'Asistente';
+$labels['typehomepage']  = 'Página Personal';
 $labels['typeblog'] = 'Blog';
-$labels['typeprofile'] = 'Profile';
+$labels['typeprofile'] = 'Perfil';
 
-$labels['addfield'] = 'Add field...';
+$labels['addfield'] = 'Agregar campo...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
-$labels['contacts'] = 'Contacts';
-$labels['contactproperties'] = 'Contact properties';
-$labels['personalinfo'] = 'Personal information';
+$labels['contacts'] = 'Contactos';
+$labels['contactproperties'] = 'Propiedades del contacto';
+$labels['personalinfo'] = 'Información personal';
 
 $labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
 $labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
-$labels['rename'] = 'Rename';
-$labels['addphoto'] = 'Add';
-$labels['replacephoto'] = 'Replace';
-$labels['uploadphoto'] = 'Upload photo';
+$labels['rename'] = 'Renombrar';
+$labels['addphoto'] = 'Agregar';
+$labels['replacephoto'] = 'Reemplazar';
+$labels['uploadphoto'] = 'Subir foto';
 
 $labels['newcontact']     = 'Añadir nuevo contacto';
 $labels['deletecontact']  = 'Eliminar contactos seleccionados';
@@ -339,9 +343,9 @@ $labels['exportall']      = 'Export all';
 $labels['exportsel']      = 'Export selected';
 $labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
-$labels['grouprename']    = 'Rename group';
-$labels['groupdelete']    = 'Delete group';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
+$labels['grouprename']    = 'Renombrar grupo';
+$labels['groupdelete']    = 'Eliminar grupo';
+$labels['groupremoveselected'] = 'Remover del grupo los contactos seleccionados';
 
 $labels['previouspage']   = 'Mostrar grupo anterior';
 $labels['firstpage']      = 'Mostrar primer grupo';
@@ -352,20 +356,20 @@ $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
 
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
+$labels['searchsave'] = 'Guardar búsqueda';
+$labels['searchdelete'] = 'Eliminar búsqueda';
 
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
-$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importtarget'] = 'Agregar nuevos contactos a la libreta de direcciones:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Puedes subir contactos desde una libreta de direcciones existente.<br/>Actualmente soportamos la importación de direcciones utilizando el formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (Valores Separados por Coma).';
 $labels['done'] = 'Hecho';
 
 // settings
 $labels['settingsfor'] = 'Configuración para';
-$labels['about'] = 'About';
+$labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
@@ -382,8 +386,8 @@ $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
 $labels['messagepart'] = 'Part';
 $labels['digitalsig'] = 'Digital Signature';
-$labels['dateformat'] = 'Date format';
-$labels['timeformat'] = 'Time format';
+$labels['dateformat'] = 'Formato de fecha';
+$labels['timeformat'] = 'Formato de tiempo';
 $labels['prettydate'] = 'Fecha detallada';
 $labels['setdefault']  = 'Seleccionar opción por defecto';
 $labels['autodetect']  = 'Automático';
@@ -392,12 +396,13 @@ $labels['timezone']  = 'Zona horaria';
 $labels['pagesize']  = 'Filas por página';
 $labels['signature'] = 'Firma';
 $labels['dstactive']  = 'Cambio de horario';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['showinextwin'] = 'Abrir mensaje en nueva ventana';
+$labels['composeextwin'] = 'Redactar en nueva ventana';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
-$labels['htmlonreply'] = 'on reply to HTML message';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreply'] = 'al responder un mensaje HTML';
+$labels['htmlonreplyandforward'] = 'al reenviar o responder un mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesión';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje o
 $labels['autoaddsignature'] = 'Agregar la firma automáticamente';
 $labels['newmessageonly'] = 'nuevos mensajes solamente';
 $labels['replyandforwardonly'] = 'respuestas o reenvios solamente';
-$labels['replysignaturepos'] = 'Agregar firma al responder o reenviar';
-$labels['belowquote'] = 'debajo de la cita';
-$labels['abovequote'] = 'sobre la cita';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
 $labels['afternseconds']  = 'despues de $n segundos';
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 167fbe290..1cec9f01d 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Error en base de datos!';
 $messages['requesttimedout'] = 'Tiempo de espera agotado';
 $messages['errorreadonly'] = 'No se pudo realizar la operación. La carpeta es de sólo lectura.';
 $messages['errornoperm'] = 'No se pudo realizar la operación. Permiso denegado.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Peteción invalida! No se guardó nada.';
 $messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla';
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index eca1d1e93..03f6b489a 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a…';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrarlo de todos modos';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Sin leer';
 $labels['flagged'] = 'Señalado';
 $labels['unanswered'] = 'Sin respuesta';
+$labels['withattachment'] = 'Con adjunto';
 $labels['deleted'] = 'Eliminado';
 $labels['undeleted'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
@@ -204,6 +206,8 @@ $labels['body']  = 'Cuerpo';
 
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
+$labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
+$labels['changeformathtml'] = 'Mostrar en formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nuevo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Componer mensaje en HTML';
 $labels['htmlonreply'] = 'sólo en respuesta a un mensaje HTML';
 $labels['htmlonreplyandforward'] = 'en reenvío o respuesta al mensaje HTML';
 $labels['htmlsignature'] = 'Firma HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
 $labels['logoutclear'] = 'Vaciar papelera al cerrar sesión';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Eliminar la firma original del mensaje al res
 $labels['autoaddsignature'] = 'Añadir firma automáticamente';
 $labels['newmessageonly'] = 'solamente mensaje nuevo';
 $labels['replyandforwardonly'] = 'respuestas y reenvíos solamente';
-$labels['replysignaturepos'] = 'Colocar firma al responder o reenviar';
-$labels['belowquote'] = 'abajo del texto seleccionado';
-$labels['abovequote'] = 'arriba del texto seleccionado';
 $labels['insertsignature'] = 'Insertar firma';
 $labels['previewpanemarkread']  = 'Marcar mensaje previsualizado como leído';
 $labels['afternseconds']  = 'después de $n segundos';
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 45552200c..6c031df29 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '¡Error de base de datos!';
 $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
 $messages['errorreadonly'] = 'Imposible realizar la operación. La bandeja es sólo de lectura.';
 $messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado.';
+$messages['erroroverquota'] = 'No se pudo completar la operación. No queda espacio en el disco.';
+$messages['erroroverquotadelete'] = 'No queda espacio en el disco. Use Shift+Supr para borrar un mensaje.';
 $messages['invalidrequest'] = '¡Petición no válida! No se han guardado los datos.';
 $messages['invalidhost'] = 'Nombre de servidor inválido.';
 $messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla.';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 01c372308..c3b3aa954 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopeeri';
 $labels['move']     = 'Liiguta';
 $labels['moveto']   = 'liiguta kausta...';
 $labels['download'] = 'laadi arvutisse';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Näita';
 $labels['showanyway'] = 'Näita ikka';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Praegune leht';
 $labels['unread'] = 'Lugemata';
 $labels['flagged'] = 'Märgistatud';
 $labels['unanswered'] = 'Vastamata';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Kustutatud';
 $labels['undeleted'] = 'Pole kustutatud';
 $labels['invert'] = 'Vaheta';
@@ -204,6 +206,8 @@ $labels['body']  = 'Keha';
 
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Kasuta uue kirja põhjana';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Kasuta HTML redaktorit';
 $labels['htmlonreply'] = 'vaid HTML-vormingus kirjale vastamisel';
 $labels['htmlonreplyandforward'] = 'edastamisel või HTML kirjale vastates';
 $labels['htmlsignature'] = 'HTML allkiri';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Näita eelvaate akent';
 $labels['skin'] = 'Kliendi välimus';
 $labels['logoutclear'] = 'Tühjenda väljumisel prügikast';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Vastates eemalda kirjast esialgne allkiri';
 $labels['autoaddsignature'] = 'Lisa allkiri automaatselt';
 $labels['newmessageonly'] = 'ainult uutele';
 $labels['replyandforwardonly'] = 'ainult vastates ja edastades';
-$labels['replysignaturepos'] = 'Vastates või edastades aseta allkiri';
-$labels['belowquote'] = 'tsiteeritu alla';
-$labels['abovequote'] = 'tsiteeritu kohale';
 $labels['insertsignature'] = 'Sisesta allkiri';
 $labels['previewpanemarkread']  = 'Märgi eelvaadatud kirjad loetuks';
 $labels['afternseconds']  = '$n sekundi pärast';
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 653b48be5..0064eaf9d 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Andmebaasi tõrge!';
 $messages['requesttimedout'] = 'Päring aegus';
 $messages['errorreadonly'] = 'Operatsioon nurjus. Kaustale on vaid lugemisõigus';
 $messages['errornoperm'] = 'Operatsioon nurjus. Ligipääsu õigused puuduvad';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Lubamatu päring! Andmeid ei salvestatud.';
 $messages['invalidhost'] = 'Lubamatu serveri nimi.';
 $messages['nomessagesfound'] = 'Postkast paistab tühi olevat';
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 6b45038f8..8052d69e8 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopia';
 $labels['move']     = 'Mugitu';
 $labels['moveto']   = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Uneko orrialdea';
 $labels['unread'] = 'Irakurri gabeak';
 $labels['flagged'] = 'Banderaduna';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ezabatuak';
 $labels['undeleted'] = 'Ezabatu gabeak';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Lehio berrian ireki';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML mezuak sortu';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML sinadura';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Aurrebista panela ikusi';
 $labels['skin'] = 'Azal-interfazea';
 $labels['logoutclear'] = 'Garbitu Zakarronzia irtetean';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index 118f53ff6..a3985b233 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Ez da mezurik aurkitu posta kutxa honetan';
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index ae38105db..70113bc49 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'تکثیر';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'انتقال بدهید به ...';
 $labels['download'] = 'داونلود کردن';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'پيغام ايچ ټي ام ايل رانوشته کن�
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'امضای حساب ایمیل بشکل ایچ تی ام ال';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'چوکات پیشنما را نشان دهید';
 $labels['skin'] = 'تمپلیت محیط کاربری';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index aa479b9c6..4f3d4be55 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index 518c6742b..221e4b891 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -20,9 +20,9 @@ $labels = array();
 
 // login page
 $labels['welcome']   = 'به $product خوش آمدید';
-$labels['username']  = 'نام‌کاربری';
+$labels['username']  = 'نام کاربری';
 $labels['password']  = 'گذرواژه';
-$labels['server']    = 'سرور';
+$labels['server']    = 'سرویس‌دهنده';
 $labels['login']     = 'ورود';
 
 // taskbar
@@ -34,8 +34,8 @@ $labels['addressbook'] = 'دفتر نشانی';
 // mailbox names
 $labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
-$labels['sent']   = 'ارسال شده';
-$labels['trash']  = 'زباله‌دان';
+$labels['sent']   = 'فرستاده شده';
+$labels['trash']  = 'سطل آشغال';
 $labels['junk']   = 'بنجل';
 
 // message listing
@@ -64,6 +64,7 @@ $labels['copy']     = 'رونوشت';
 $labels['move']     = 'انتقال';
 $labels['moveto']   = 'انتقال به...';
 $labels['download'] = 'بارگیری';
+$labels['open']     = 'باز کردن';
 $labels['showattachment'] = 'نمایش';
 $labels['showanyway'] = 'نمایش آن در هر صورت';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'صفحه جاری';
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'حذف شده';
 $labels['undeleted'] = 'حذف نشده';
 $labels['invert'] = 'وارونه';
@@ -204,6 +206,8 @@ $labels['body']  = 'بدنه';
 
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
+$labels['changeformattext'] = 'نمایش در قالب متنی';
+$labels['changeformathtml'] = 'نمایش در قالب اچ‌تی‌ام‌ال';
 
 // message compose
 $labels['editasnew']      = 'ویرایش به عنوان جدید';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML ‌نوشتن پیغام‌های';
 $labels['htmlonreply'] = 'فقط در پاسخ به پیغام HTML';
 $labels['htmlonreplyandforward'] = 'در بازگردانی یا پاسخ به پیغام‌های HTML';
 $labels['htmlsignature'] = 'HTML امضای';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'نمایش قاب پیش‌نمایش';
 $labels['skin'] = 'پوسته ظاهری';
 $labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌رفت';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'هنگام پاسخ امضاء اصلی را
 $labels['autoaddsignature'] = 'اضافه کردن خودکار امضاء';
 $labels['newmessageonly'] = 'فقط پیغام جدید';
 $labels['replyandforwardonly'] = 'فقط پاسخ‌ها و ارجاع‌ها';
-$labels['replysignaturepos'] = 'هنگام پاسخ یا ارجاع امضاء را قرار داده شود';
-$labels['belowquote'] = 'زیر نقل‌قول';
-$labels['abovequote'] = 'بالای نقل‌قول';
 $labels['insertsignature'] = 'درج امضاء';
 $labels['previewpanemarkread']  = 'نشانه‌گذاری پیغام‌های پیش مرور شده به عنوان خوانده شده';
 $labels['afternseconds']  = 'بعد از $s ثانیه';
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 5db68b005..ff53c650e 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'خطای پایگاه‌داده';
 $messages['requesttimedout'] = 'زمان درخواست تمام شد';
 $messages['errorreadonly'] = 'ناتوانی در انجام عملیات. پوشه فقط خواندنی است.';
 $messages['errornoperm'] = 'ناتوانی در انجام عملیات. دسترسی وجود ندارد.';
+$messages['erroroverquota'] = 'ناتوانی در انجام عملیات. فضای دیسک خالی نیست.';
+$messages['erroroverquotadelete'] = 'فضای دیسک خالی نیست. برای حذف پیغام از SHIFT+DEL استفاده کنید.';
 $messages['invalidrequest'] = 'درخواست نامعتبر! هیچ داده‌ای ذخیره نشد.';
 $messages['invalidhost'] = 'نام سرور غیرمعتبر.';
 $messages['nomessagesfound'] = 'هیچ پیغامی در این صندوق پیدا نشد.';
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index 99ccb242c..006f62947 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopioi';
 $labels['move']     = 'Siirrä';
 $labels['moveto']   = 'siirrä kansioon...';
 $labels['download'] = 'lataa';
+$labels['open']     = 'Avaa';
 $labels['showattachment'] = 'Näytä';
 $labels['showanyway'] = 'Näytä silti';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Nykyinen sivu';
 $labels['unread'] = 'Lukemattomat';
 $labels['flagged'] = 'Korostettu';
 $labels['unanswered'] = 'Vastaamaton';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Poistettu';
 $labels['undeleted'] = 'Ei poistettu';
 $labels['invert'] = 'Käännä';
@@ -204,6 +206,8 @@ $labels['body']  = 'Runko';
 
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
+$labels['changeformattext'] = 'Näytä raakatekstimuodossa';
+$labels['changeformathtml'] = 'Näytä HTML-muodossa';
 
 // message compose
 $labels['editasnew']      = 'Muokkaa uutena';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Kirjoita HTML-muodossa';
 $labels['htmlonreply'] = 'Vain vastatessa HTML-viesteihin';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-allekirjoitus';
+$labels['showemail'] = 'Näytä sähköpostiosoite näyttönimen kanssa';
 $labels['previewpane'] = 'Näytä esikatselulehti';
 $labels['skin'] = 'Käyttöliittymän teema';
 $labels['logoutclear'] = 'Tyhjennä roskakori kirjautuessa ulos';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Vastattaessa poista alkuperäinen allekirjoit
 $labels['autoaddsignature'] = 'Lisää allekirjoitus automaattisesti';
 $labels['newmessageonly'] = 'vain uuteen viestiin';
 $labels['replyandforwardonly'] = 'vain vastauksiin ja välityksiin';
-$labels['replysignaturepos'] = 'Vastattaessa tai välitettäessä laita allekirjoitus';
-$labels['belowquote'] = 'lainauksen alle';
-$labels['abovequote'] = 'lainauksen ylle';
 $labels['insertsignature'] = 'Lisää allekirjoitus';
 $labels['previewpanemarkread']  = 'Merkitse esikatsellut viestit luetuiksi';
 $labels['afternseconds']  = '$n sekunnin jälkeen';
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index 035ba411f..3a8c393d6 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Tietokantavirhe!';
 $messages['requesttimedout'] = 'Pyyntö aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
+$messages['erroroverquota'] = 'Toiminnon suoritus epäonnistui. Levytila on loppu.';
+$messages['erroroverquotadelete'] = 'Levytila on loppu. Paina SHIFT+DEL poistaaksesi viestin.';
 $messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
 $messages['invalidhost'] = 'Virheellinen palvelinnimi.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index 29e2c028b..6731ecc3f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copier';
 $labels['move']     = 'Déplacer';
 $labels['moveto']   = 'Déplacer vers...';
 $labels['download'] = 'Télécharger';
+$labels['open']     = 'Ouvrir';
 $labels['showattachment'] = 'Afficher';
 $labels['showanyway'] = 'Afficher quand même';
 
@@ -142,7 +143,7 @@ $labels['firstmessage']     = 'Voir le premier message';
 $labels['nextmessage']      = 'Voir le message suivant';
 $labels['lastmessage']      = 'Voir le dernier message';
 $labels['backtolist']       = 'Retourner à la liste des messages';
-$labels['viewsource']       = 'Voir le source';
+$labels['viewsource']       = 'Voir la source';
 $labels['mark']             = 'Marquer';
 $labels['markmessages']     = 'Marquer les messages';
 $labels['markread']         = 'Comme lus';
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
 $labels['unanswered'] = 'Non répondu';
+$labels['withattachment'] = 'Avec pièce jointe';
 $labels['deleted'] = 'Supprimé';
 $labels['undeleted'] = 'Non supprimé';
 $labels['invert'] = 'Inverser';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corps';
 
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
+$labels['changeformattext'] = 'Afficher au format texte';
+$labels['changeformathtml'] = 'Afficher au format HTML';
 
 // message compose
 $labels['editasnew']      = 'Éditer en tant que nouveau message';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Composer un message au format HTML';
 $labels['htmlonreply'] = 'en réponse aux messages HTML uniquement';
 $labels['htmlonreplyandforward'] = 'Transférer ou répondre au message HTML';
 $labels['htmlsignature'] = 'Signature HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Afficher le panneau d\'aperçu';
 $labels['skin'] = 'Thème de l\'interface';
 $labels['logoutclear'] = 'Vider la corbeille à la déconnexion';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'En répondant, supprimer la signature d\'orig
 $labels['autoaddsignature'] = 'Ajouter la signature automatiquement';
 $labels['newmessageonly'] = 'nouveau message uniquement';
 $labels['replyandforwardonly'] = 'réponses et transferts uniquement';
-$labels['replysignaturepos'] = 'En répondant ou en transférant, placer la signature';
-$labels['belowquote'] = 'en-dessous de la citation';
-$labels['abovequote'] = 'au-dessus de la citation';
 $labels['insertsignature'] = 'Insérer la signature';
 $labels['previewpanemarkread']  = 'Marquer les messages prévisualisés comme lus';
 $labels['afternseconds']  = 'après $n secondes';
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index bd3fd2094..a736e103e 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Erreur avec la base de donnée!';
 $messages['requesttimedout'] = 'Délai de la requête expiré';
 $messages['errorreadonly'] = 'Impossible d\'effectuer cette opération. Le dossier est en lecture seule';
 $messages['errornoperm'] = 'Impossible d\'effectuer cette opération. Permission refusée';
+$messages['erroroverquota'] = 'Impossible d\'effectuer cette opération. Plus d\'espace libre.';
+$messages['erroroverquotadelete'] = 'Plus d\'espace libre. Utilisez SHIFT+DEL pour supprimer un message.';
 $messages['invalidrequest'] = 'Requête invalide ! Aucune donnée n\'a été sauvegardée.';
 $messages['invalidhost'] = 'Nom du serveur invalide.';
 $messages['nomessagesfound'] = 'Cette boîte aux lettres ne contient aucun message.';
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index cd6154626..891371f58 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieare';
 $labels['move']     = 'Ferplaatse';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Delhelje';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Toane';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 795295eb2..9f0da6550 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Cóipeáil';
 $labels['move']     = 'Bog';
 $labels['moveto']   = 'bog go...';
 $labels['download'] = 'síos-luchtú';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Na rudaí nach bhuil corraithe';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Scríobh teachtaireachta HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Mana clabhsúir HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Taispeáin an pána réamhamharc';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 140b88639..70aa28a36 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Ní bhfuair mé aon teachtaireacht i bosca postas seo';
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 3c5b60026..5905ea4b9 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -41,7 +41,7 @@ $labels['junk']   = 'Correo lixo';
 // message listing
 $labels['subject'] = 'Asunto';
 $labels['from']    = 'Remitente';
-$labels['sender']  = 'Sender';
+$labels['sender']  = 'Remitente';
 $labels['to']      = 'Destinatario';
 $labels['cc']      = 'Copia (Cc)';
 $labels['bcc']     = 'Copia oculta (Cco)';
@@ -58,14 +58,15 @@ $labels['mailboxlist'] = 'Cartafoles';
 $labels['messagesfromto'] = 'Mensaxes da $from á $to de $count';
 $labels['threadsfromto'] = 'Fíos do $from ao $to de $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
-$labels['fromtoshort'] = '$from – $to of $count';
+$labels['fromtoshort'] = '$from - $to de $count';
 
 $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
-$labels['showattachment'] = 'Show';
-$labels['showanyway'] = 'Show it anyway';
+$labels['open']     = 'Abrir';
+$labels['showattachment'] = 'Amosar';
+$labels['showanyway'] = 'Amosala de tódolos xeitos';
 
 $labels['filename'] = 'Nome de ficheiro';
 $labels['filesize'] = 'Tamaño de ficheiro';
@@ -130,7 +131,7 @@ $labels['replytomessage']   = 'Respostar a mensaxe';
 $labels['replytoallmessage'] = 'Respostar á lista ou ao remitente e a tódolos destinatarios';
 $labels['replyall']         = 'Respostar a todos';
 $labels['replylist']        = 'Respostar á lista de correo';
-$labels['forward']          = 'Forward';
+$labels['forward']          = 'Reenviar';
 $labels['forwardinline']    = 'Reenviar inserido';
 $labels['forwardattachment'] = 'Reenviar como anexo';
 $labels['forwardmessage']   = 'Reenviar a mensaxe';
@@ -143,7 +144,7 @@ $labels['nextmessage']      = 'Amosar a seguinte mensaxe';
 $labels['lastmessage']      = 'Amosar a última mensaxe';
 $labels['backtolist']       = 'Voltar á lista de mensaxes';
 $labels['viewsource']       = 'Ver código fonte';
-$labels['mark']             = 'Mark';
+$labels['mark']             = 'Marcar';
 $labels['markmessages']     = 'Marcar mensaxes';
 $labels['markread']         = 'Como lidas';
 $labels['markunread']       = 'Como non lidas';
@@ -161,8 +162,9 @@ $labels['currpage'] = 'Páxina actual';
 $labels['unread'] = 'Non lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Non respostadas';
+$labels['withattachment'] = 'Con anexo';
 $labels['deleted'] = 'Marcadas como eliminadas';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Non borradas';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -200,14 +202,16 @@ $labels['quicksearch']  = 'Busca rápida';
 $labels['resetsearch']  = 'Restablecer a busca';
 $labels['searchmod']  = 'Modificadores de busca';
 $labels['msgtext']  = 'Mensaxe enteira';
-$labels['body']  = 'Body';
+$labels['body']  = 'Corpo';
 
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
+$labels['changeformattext'] = 'Amosar en texto plano';
+$labels['changeformathtml'] = 'Amosar en HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nova';
-$labels['send']           = 'Send';
+$labels['send']           = 'Enviar';
 $labels['sendmessage']    = 'Enviar a mensaxe agora';
 $labels['savemessage']    = 'Gardar a mensaxe como borrador';
 $labels['addattachment']  = 'Anexar un ficheiro';
@@ -219,12 +223,12 @@ $labels['mailreplyintro'] = 'O $date, $sender escribiu:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
 
 $labels['editidents']    = 'Modificar identidades';
-$labels['spellcheck']    = 'Spell';
+$labels['spellcheck']    = 'Ortografía';
 $labels['checkspelling'] = 'Revisar a ortografía';
 $labels['resumeediting'] = 'Voltar á edición';
 $labels['revertto']      = 'Voltar a';
 
-$labels['attach'] = 'Attach';
+$labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Ficheiros anexos';
 $labels['upload'] = 'Cargar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
@@ -241,9 +245,9 @@ $labels['nosubject']  = '(Sen asunto)';
 $labels['showimages'] = 'Amosar as imaxes';
 $labels['alwaysshow'] = 'Amosar sempre as imaxes nas mensaxes de $sender';
 $labels['isdraft']    = 'Esta mensaxe é un borrador';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['andnmore']   = '$nr máis...';
+$labels['togglemoreheaders'] = 'Amosar máis cabecerias';
+$labels['togglefullheaders'] = 'Conmutar cabeceiras en bruto';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Só texto';
@@ -335,13 +339,13 @@ $labels['composeto']      = 'Redactar mensaxe para';
 $labels['contactsfromto'] = 'Contactos do $from ao $to de $count';
 $labels['print']          = 'Imprimir';
 $labels['export']         = 'Exportar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Exportar todas';
+$labels['exportsel']      = 'Exportar as seleccionadas';
 $labels['exportvcards']   = 'Exportar os contactos en formato vCard';
 $labels['newcontactgroup'] = 'Crear novo grupo de contactos';
 $labels['grouprename']    = 'Mudar o nome do grupo';
 $labels['groupdelete']    = 'Borrar o grupo';
-$labels['groupremoveselected'] = 'Remove selected contacts from group';
+$labels['groupremoveselected'] = 'Eliminar do grupo os contactos seleccionados';
 
 $labels['previouspage']   = 'Amosar o grupo anterior';
 $labels['firstpage']      = 'Amosar o primeiro grupo';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde ficheiro:';
 $labels['importtarget'] = 'Engadir contactos ao caderno de enderezos:';
 $labels['importreplace'] = 'Substituír completamente o caderno de enderezos';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Pode cargar contactos desde un caderno de enderezos preexistente.<br/>Pódense importar enderezos en formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por comas)';
 $labels['done'] = 'Rematado';
 
 // settings
@@ -380,8 +384,8 @@ $labels['edititem'] = 'Editar';
 $labels['preferhtml'] = 'Prefiro HTML';
 $labels['defaultcharset'] = 'Xogo de caracteres por omisión';
 $labels['htmlmessage'] = 'Mensaxe HTML';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Sinatura dixital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Data decorada';
@@ -392,12 +396,13 @@ $labels['timezone']  = 'Zona horaria';
 $labels['pagesize']  = 'Liñas por páxina';
 $labels['signature'] = 'Sinatura';
 $labels['dstactive']  = 'Cambio de hora según horario de verán';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['showinextwin'] = 'Abrir a mensaxe nunha nova xanela';
+$labels['composeextwin'] = 'Redactar nunha xanela nova';
 $labels['htmleditor'] = 'Redactar mensaxes HTML';
 $labels['htmlonreply'] = 'só cando se resposte a unha mensaxe HTML';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'ao reenviar ou respostar a unha mensaxe HTML';
 $labels['htmlsignature'] = 'Sinatura HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Amosar previsualización';
 $labels['skin'] = 'Aspecto da interface';
 $labels['logoutclear'] = 'Baleirar o cubo do lixo ao saír';
@@ -415,14 +420,14 @@ $labels['readwhendeleted'] = 'Marcar a mensaxe como lida ao eliminar';
 $labels['flagfordeletion'] = 'Marcar a mensaxe para eliminar no canto de eliminar';
 $labels['skipdeleted'] = 'Non amosar as mensaxes marcadas como eliminadas';
 $labels['deletealways'] = 'Eliminar as mensaxes aínda que non se poidan gardar no cubo do lixo';
-$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['deletejunk'] = 'Borrar automáticamente as mensaxes no cartafol "Correo lixo"';
 $labels['showremoteimages'] = 'Amosar as imaxes remotas';
 $labels['fromknownsenders'] = 'de remitentes coñecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Amosar as imaxes anexas baixo a mensaxe';
 $labels['autosavedraft']  = 'Gardar borrador automáticamente';
 $labels['everynminutes']  = 'cada $n minuto(s)';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Refrescar (buscar novas mensaxes, etc)';
 $labels['never']  = 'nunca';
 $labels['immediately']  = 'de inmediato';
 $labels['messagesdisplaying'] = 'Visualización das mensaxes';
@@ -444,35 +449,32 @@ $labels['maintenance'] = 'Mantemento';
 $labels['newmessage'] = 'Mensaxes novas';
 $labels['signatureoptions'] = 'Opcións da firma';
 $labels['whenreplying'] = 'Ao respostar';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = 'non citar a mensaxe orixinal';
 $labels['replytopposting'] = 'comezar a nova mensaxe enriba da orixinal';
 $labels['replybottomposting'] = 'comezar a nova mensaxe embaixo da orixinal';
 $labels['replyremovesignature'] = 'Eliminar a firma do remitente ao respostar';
 $labels['autoaddsignature'] = 'Engadir firma automáticamente';
 $labels['newmessageonly'] = 'só nas mensaxes novas';
 $labels['replyandforwardonly'] = 'só nas respostas e reenvíos';
-$labels['replysignaturepos'] = 'Ao respostar ou reenviar colocar a firma';
-$labels['belowquote'] = 'embaixo do texto citado';
-$labels['abovequote'] = 'enriba do texto citado';
 $labels['insertsignature'] = 'Engadir firma';
 $labels['previewpanemarkread']  = 'Marcar como lidas as mensaxes previsualizadas';
 $labels['afternseconds']  = 'logo de $n segundos';
 $labels['reqmdn'] = 'Solicitar sempre unha notificación da entrega';
 $labels['reqdsn'] = 'Solicitar sempre unha notificación do estado de envío';
 $labels['replysamefolder'] = 'Deixar as respostas no cartafol onde está a mensaxe á que se responde';
-$labels['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Caderno de enderezos por defecto';
 $labels['autocompletesingle'] = 'Ignorar as direccións alternativas no autocompletado';
-$labels['listnamedisplay'] = 'List contacts as';
+$labels['listnamedisplay'] = 'Listar os contactos coma';
 $labels['spellcheckbeforesend'] = 'Revisar a ortografía antes de enviar unha mensaxe';
 $labels['spellcheckoptions'] = 'Opción da revisión ortográfica';
 $labels['spellcheckignoresyms'] = 'Ignorar as palabras con símbolos';
 $labels['spellcheckignorenums'] = 'Ignorar as palabras con números';
 $labels['spellcheckignorecaps'] = 'Ignorar as palabras escritas en maiúsculas';
 $labels['addtodict'] = 'Engadir ao diccionario';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['mailtoprotohandler'] = 'Rexistrar o manexador de protocolo para as ligazóns "mailto:"';
+$labels['forwardmode'] = 'Reenvio de mensaxes';
+$labels['inline'] = 'inserido';
+$labels['asattachment'] = 'coma anexo';
 
 $labels['folder']  = 'Cartafol';
 $labels['folders']  = 'Cartafoles';
@@ -500,7 +502,7 @@ $labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = 'Complementos instalados';
 $labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Fonte';
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 6f230bc89..207a016a1 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -17,7 +17,7 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'An error occurred!';
+$messages['errortitle']  = 'Ocurreu un erro!';
 $messages['loginfailed']  = 'O contrasinal ou o nome de usuario son incorrectos.';
 $messages['cookiesdisabled'] = 'O seu navegador non acepta galletas.';
 $messages['sessionerror'] = 'A súa sesión non é válida ou expirou.';
@@ -25,15 +25,17 @@ $messages['storageerror'] = 'Fallou a conexión co servidor IMAP.';
 $messages['servererror'] = 'Erro do servidor!';
 $messages['servererrormsg'] = 'Erro do servidor: $msg';
 $messages['dberror'] = 'Erro na base de datos!';
-$messages['requesttimedout'] = 'Request timed out';
+$messages['requesttimedout'] = 'A petición expirou';
 $messages['errorreadonly'] = 'Non foi posible realizar a operación. O cartafol é de só lectura.';
 $messages['errornoperm'] = 'Non foi posible realizar a operación. Permiso denegado.';
+$messages['erroroverquota'] = 'Non se pode realizar a operación, non hai espacio no disco.';
+$messages['erroroverquotadelete'] = 'Non hai espacio no disco. Utilice Maiúsculas+Supr para borrar unha mensaxe.';
 $messages['invalidrequest'] = 'Petición inválida!. Non se gardou ningún dato.';
-$messages['invalidhost'] = 'Invalid server name.';
+$messages['invalidhost'] = 'O nome do servidor non é válido.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo.';
 $messages['loggedout'] = 'Rematou correctamente a súa sesión. Ata logo!';
 $messages['mailboxempty'] = 'A caixa de correo está vacía.';
-$messages['refreshing'] = 'Refreshing...';
+$messages['refreshing'] = 'A refrescar...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
 $messages['uploadingmany'] = 'Cargando ficheiros...';
@@ -112,16 +114,16 @@ $messages['addingmember'] = 'Engadindo o(s) contacto(s) ao grupo...';
 $messages['removingmember'] = 'Eliminando o(s) contacto(s) do grupo...';
 $messages['receiptsent'] = 'A notificación da entrega enviouse correctamente.';
 $messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación da entrega.';
-$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['deleteidentityconfirm'] = 'Quere eliminar esta identidade?';
 $messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, é a última.';
 $messages['forbiddencharacter'] = 'O nome do cartafol contén un carácter non válido.';
 $messages['selectimportfile'] = 'Por favor, escolla un ficheiro para cargar.';
 $messages['addresswriterror'] = 'Non se pode escribir no caderno de enderezos que escolleu.';
 $messages['contactaddedtogroup'] = 'Engadiuse correctamente o contacto a este grupo.';
 $messages['contactremovedfromgroup'] = 'Suprimiuse correctamente o contacto deste grupo.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Non cambiou ningunha asignación de grupo.';
 $messages['importwait'] = 'A importar. Por favor, agarde...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'Fallou a importación! O ficheiro cargado non contén datos válidos.';
 $messages['importconfirm'] = '<b>Importáronse correctamente $inserted contactos. Ignoráronse $skipped contactos que xa existían</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Ignoráronse $skipped existing entradas</b>';
 $messages['opnotpermitted'] = 'Operación non permitida!';
@@ -162,8 +164,8 @@ $messages['foldercreated'] = 'O cartafol creouse correctamente.';
 $messages['invalidimageformat'] = 'O formato da imaxe non é válido.';
 $messages['mispellingsfound'] = 'Atopáronse erros ortográficos na mensaxe.';
 $messages['parentnotwritable'] = 'Non foi posible crear/mover o cartafol no cartafol padre escollido porque non ten permisos.';
-$messages['messagetoobig'] = 'The message part is too big to process it.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['messagetoobig'] = 'A mensaxe é demasiado grande para procesala';
+$messages['attachmentvalidationerror'] = 'ATENCIÓN! Este anexo é sospeitoso porque o seu tipo non coincide o tipo declarado na mensaxe. Se non confía no remitente, non debería abrilo, porque podería conter un virus ou malware.<br/><br/><em>Tipo agardado: $expected; Tipo detectado: $detected</em>';
+$messages['noscriptwarning'] = 'Atención: Este servicio de correo web precisa de Javascript!. Por favor, active javascript nas opción do seu navegador.';
 
 ?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 8cf6101f5..bfb9e2fef 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'העתק';
 $labels['move']     = 'העבר';
 $labels['moveto']   = 'תיוק ב...';
 $labels['download'] = 'הורדה';
+$labels['open']     = 'לפתוח';
 $labels['showattachment'] = 'הצגה';
 $labels['showanyway'] = 'להציג בכל מקרה';
 
@@ -132,7 +133,7 @@ $labels['replyall']         = 'מענה לכולם';
 $labels['replylist']        = 'מענה לרשימת תפוצה';
 $labels['forward']          = 'העברה';
 $labels['forwardinline']    = 'העבר בגוף ההודעה';
-$labels['forwardattachment'] = 'העבר כקובץ מצורף';
+$labels['forwardattachment'] = 'העבר כצרופה';
 $labels['forwardmessage']   = 'העבר הודעה';
 $labels['deletemessage']    = 'מחיקה';
 $labels['movemessagetotrash'] = 'השלכה לאשפה';
@@ -161,6 +162,7 @@ $labels['currpage'] = 'דף נוכחי';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
 $labels['unanswered'] = 'לא נענה';
+$labels['withattachment'] = 'עם צרופה';
 $labels['deleted'] = 'נמחק';
 $labels['undeleted'] = 'לא נמחק';
 $labels['invert'] = 'היפוך הסימון';
@@ -204,6 +206,8 @@ $labels['body']  = 'גוף ההודעה';
 
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
+$labels['changeformattext'] = 'הצגה בפורמט לא מעוצב';
+$labels['changeformathtml'] = 'הצגה בפורמט HTML';
 
 // message compose
 $labels['editasnew']      = 'עריכת ההודעה כחדשה';
@@ -225,7 +229,7 @@ $labels['resumeediting'] = 'המשך עריכה';
 $labels['revertto']      = 'חזור למצב קודם';
 
 $labels['attach'] = 'צירוף';
-$labels['attachments'] = 'קבצים מצורפים';
+$labels['attachments'] = 'צרופות';
 $labels['upload'] = 'העלאה';
 $labels['uploadprogress'] = '( $total  מתוך  $current )  $percent';
 $labels['close']  = 'סגירה';
@@ -400,6 +404,7 @@ $labels['htmleditor'] = 'יצירת הודעה מעוצבת';
 $labels['htmlonreply'] = 'רק במענה להודעת HTML';
 $labels['htmlonreplyandforward'] = 'להעביר או להשיב להודעה שהגיעה בפורמט HTML';
 $labels['htmlsignature'] = 'חתימה מעוצבת';
+$labels['showemail'] = 'הצגת כתובת דוא"ל עם שם השולח';
 $labels['previewpane'] = 'תצוגה מוקדמת';
 $labels['skin'] = 'ערכת מראה';
 $labels['logoutclear'] = 'ריקון סל אשפה ביציאה';
@@ -453,9 +458,6 @@ $labels['replyremovesignature'] = 'החתימה תוסר מההודעה המקו
 $labels['autoaddsignature'] = 'הוספה אוטומטית של חתימה';
 $labels['newmessageonly'] = 'הודעה חדשה בלבד';
 $labels['replyandforwardonly'] = 'מענה והעברת הודעה בלבד';
-$labels['replysignaturepos'] = 'במענה או בהעברת הודעה, החתימה תופיע';
-$labels['belowquote'] = 'בסוף ההודעה המקורית';
-$labels['abovequote'] = 'בתחילת ההודעה המקורית';
 $labels['insertsignature'] = 'שיבוץ חתימה';
 $labels['previewpanemarkread']  = 'סימון הודעה שנצפתה כנקראה';
 $labels['afternseconds']  = 'לאחר $n שניות';
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index be4ef2824..7d9b87c06 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '! שגיאה במסד הנתונים';
 $messages['requesttimedout'] = 'תם הזמן המוקצב לבקשה';
 $messages['errorreadonly'] = 'לא ניתן לבצע הפעולה כי התיק ניתן לקריאה בלבד';
 $messages['errornoperm'] = 'לא ניתן לבצע הפעולה כי אין הרשאה לבצעה';
+$messages['erroroverquota'] = 'לא ניתן לבצע הפעולה כי לא מקום פנוי על הדיסק';
+$messages['erroroverquotadelete'] = 'אין מקום פנוי על הדיסק. יש להשתמש ב SHIFT+DELETE כדי למחוק ההודעה';
 $messages['invalidrequest'] = 'בקשה לא חוקית. המידע לא נשמר';
 $messages['invalidhost'] = 'שם שרת לא חוקי';
 $messages['nomessagesfound'] = 'לא נמצאו הודעות בתיבה זו';
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 8188b8eca..3b8279f71 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'कार्बन';
 $labels['move']     = 'स्थानांतरित करें';
 $labels['moveto']   = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'अनदेखी';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'मेल ऐच-टी-ऐम-एल (HTML) मे ल
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) दस्तखत';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'झलक पट्टी दिखाऐं';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 328dbe00e..1d55f5c48 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index d7b1b2041..506d50f1f 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premjesti';
 $labels['moveto']   = 'Premjesti u...';
 $labels['download'] = 'Preuzmi (download)';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trenutna stranica';
 $labels['unread'] = 'Nepročitane';
 $labels['flagged'] = 'Označene';
 $labels['unanswered'] = 'Neodgovrene';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Obrisano';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Uredi kao novo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Sastavi HTML poruke';
 $labels['htmlonreply'] = 'odgovor samo na HTML poruke';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML potpis';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prikaži područje pregleda';
 $labels['skin'] = 'Tema izgleda';
 $labels['logoutclear'] = 'Očisti smeće pri izlazu';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Kod odgovaranja, makni originalni potpis iz p
 $labels['autoaddsignature'] = 'Automatski dodaj potpis';
 $labels['newmessageonly'] = 'samo nova poruka';
 $labels['replyandforwardonly'] = 'samo odgovori i proslijeđivanja';
-$labels['replysignaturepos'] = 'Kod downloada ili proslijeđivanja postavi potpis';
-$labels['belowquote'] = 'ispod citata';
-$labels['abovequote'] = 'iznad citata';
 $labels['insertsignature'] = 'Umetni potpis';
 $labels['previewpanemarkread']  = 'Obilježi pregledane poruke kao pročitane';
 $labels['afternseconds']  = 'nakon $n sekundi';
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index c3a4f1779..3e6cc6daf 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Greška baze podataka!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Nemoguća izvedba operacije. Mapa je samo za čitanje.';
 $messages['errornoperm'] = 'Nemoguća izvedba operacije. Dozvola odbijena.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Nepravilan zahtijev! Podaci nisu spremljeni.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nema poruka u sandučiću';
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 644fca261..3cc5da1aa 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Másolás';
 $labels['move']     = 'Áthelyezés';
 $labels['moveto']   = 'Áthelyezés...';
 $labels['download'] = 'letöltés';
+$labels['open']     = 'Megnyítás';
 $labels['showattachment'] = 'Megjelenítés';
 $labels['showanyway'] = 'Megjelnités mindenképpen';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuális oldal';
 $labels['unread'] = 'Olvasatlan';
 $labels['flagged'] = 'Megjelölt';
 $labels['unanswered'] = 'Megválaszolatlan';
+$labels['withattachment'] = 'Csatolmánnyal';
 $labels['deleted'] = 'Törölt';
 $labels['undeleted'] = 'Nem lett törölve';
 $labels['invert'] = 'Invertálás';
@@ -204,6 +206,8 @@ $labels['body']  = 'Törzs';
 
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
+$labels['changeformattext'] = 'Megjelenítés sima szöveges formátumban';
+$labels['changeformathtml'] = 'Megjelenítés HTML formátumban';
 
 // message compose
 $labels['editasnew']      = 'Szerkesztés újként';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML üzenet írása';
 $labels['htmlonreply'] = 'csak HTML üzenetre válaszolva';
 $labels['htmlonreplyandforward'] = 'HTML üzenet továbbításakor vagy az arra való válaszoláskor';
 $labels['htmlsignature'] = 'HTML aláírás';
+$labels['showemail'] = 'Az email címek megjelenítése a partner nevével';
 $labels['previewpane'] = 'Előnézeti kép';
 $labels['skin'] = 'Kinézet';
 $labels['logoutclear'] = 'Törölt elemek mappa ürítése kilépéskor';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Válasznál az eredeti aláírás eltávolít
 $labels['autoaddsignature'] = 'Aláírás automatikus hozzáadása';
 $labels['newmessageonly'] = 'csak új üzenetnél';
 $labels['replyandforwardonly'] = 'válasznál és továbbításnál';
-$labels['replysignaturepos'] = 'Válasznál és továbbításnál kerüljön az aláírás';
-$labels['belowquote'] = 'az idézett szöveg alá';
-$labels['abovequote'] = 'az idézett szöveg fölé';
 $labels['insertsignature'] = 'Aláírás beillesztése';
 $labels['previewpanemarkread']  = 'Előnézetben megjelent üzenetek megjelölése olvasottként';
 $labels['afternseconds']  = '$n másodperc elteltével';
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index ee3e8a9a5..6528602a4 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -17,7 +17,7 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'Hiba történt';
+$messages['errortitle']  = 'Hiba történt!';
 $messages['loginfailed']  = 'Sikertelen bejelentkezés.';
 $messages['cookiesdisabled'] = 'A böngésző nem támogatja a sütik használatát';
 $messages['sessionerror'] = 'Érvénytelen vagy lejárt munkamenet';
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Adatbázishiba!';
 $messages['requesttimedout'] = 'A kérés túllépte az időkorlátot';
 $messages['errorreadonly'] = 'A műveletet nem sikerült végrehajtani. A mappa írásvédett.';
 $messages['errornoperm'] = 'A műveletet nem sikerült végrehajtani. Hozzáférés megtagadva.';
+$messages['erroroverquota'] = 'A műveletet nem lehetett végrehajtani mivel nincs elég szabad hely a merevlemezen.';
+$messages['erroroverquotadelete'] = 'Nincs elég szabad hely a merevlemezen. A SHIFT+DEL billenytyű kombinációt használd az üzenet törléséhez.';
 $messages['invalidrequest'] = 'Érvénytelen kérés! Az adatok nem lettek elmentve.';
 $messages['invalidhost'] = 'Hibás szerver hoszt név';
 $messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 490604cc5..99cee4ab9 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Cc';
 $labels['move']     = 'Տեղափոխել';
 $labels['moveto']   = 'Տեղափոխել...';
 $labels['download'] = 'Քաշել';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Առկա էջ';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ջնջված';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Փոխատեղել';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Խմբագրել որպես նոր';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Ստեղծել HTML նամակներ';
 $labels['htmlonreply'] = 'միայն HTML հաղորդագրությանը պատասխանելիս';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ստորագրություն';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Ցուցադրել պատուհանը';
 $labels['skin'] = 'Տեսքի տարբերակ';
 $labels['logoutclear'] = 'Դուրս գալուց դատարկել աղբարկղը';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Պատասխանելիս հեռացնել հ�
 $labels['autoaddsignature'] = 'Ավելացնել ստորագրություն';
 $labels['newmessageonly'] = 'միայն նոր հաղորդագրություններում';
 $labels['replyandforwardonly'] = 'պատասխաններում և փոխանցումներում';
-$labels['replysignaturepos'] = 'Ավելացնել ստորագրությունը պատասխանելիս կամ փոխանցելիս';
-$labels['belowquote'] = 'Մեջբերման ներքևում';
-$labels['abovequote'] = 'Մեջբերման վերևում';
 $labels['insertsignature'] = 'Ներդնել ստորագրությունը';
 $labels['previewpanemarkread']  = 'Նշել նախադիտված հաղորդագրությունները որպես ընթերցված';
 $labels['afternseconds']  = '$n վարկյան հետո';
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index bbb083a21..6b3f4ebe9 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Տվյալների շտեմարանի սխա՛լ';
 $messages['requesttimedout'] = 'Հարցման թույլատրելի ժամանակը սպառվեց';
 $messages['errorreadonly'] = 'Գործողությունը անհնար է։ Պանակը միայն ընթերցման համար է։';
 $messages['errornoperm'] = 'Գործողության կատարման իրավունքը մերժված է։';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Սխալ հարցում, ապարդյուն։';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Այս փոստարկղում նամակներ չկան';
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index fcf5634ff..2a9501168 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover a';
 $labels['download'] = 'Discargar';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Monstrar';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Non legite';
 $labels['flagged'] = 'Marcate';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Delete';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Aperir in nove fenestra';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Modificar como nove';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Signatura HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Apparentia de interfacie';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automaticamente inserta signatura';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insertar signatura';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ia/messages.inc b/program/localization/ia/messages.inc
index fca8404b2..ebc6953d2 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Error de base de datos!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index 13c34bef6..eea3132cd 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Salin';
 $labels['move']     = 'Pindahkan';
 $labels['moveto']   = 'Pindahkan ke...';
 $labels['download'] = 'Unduh';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Tampilkan';
 $labels['showanyway'] = 'Tampilkan saja';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Halaman sekarang';
 $labels['unread'] = 'Belum terbaca';
 $labels['flagged'] = 'Ditandai';
 $labels['unanswered'] = 'Belum terjawab';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Terhapus';
 $labels['undeleted'] = 'Tidak terhapus';
 $labels['invert'] = 'Sebaliknya';
@@ -204,6 +206,8 @@ $labels['body']  = 'Badan';
 
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Sunting sebagai pesan baru';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Tulis pesan HTML';
 $labels['htmlonreply'] = 'balasan untuk pesan HTML saja';
 $labels['htmlonreplyandforward'] = 'ketika meneruskan atau membalas pesan HTML';
 $labels['htmlsignature'] = 'Tandatangan HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Unjuk pratinjau';
 $labels['skin'] = 'Tampilan antarmuka';
 $labels['logoutclear'] = 'Bersihkan Tong Sampah saat keluar';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'ketika membalas pesan hapus tanda tangan dari
 $labels['autoaddsignature'] = 'Otomatis tambahkan tanda tangan';
 $labels['newmessageonly'] = 'Hanya untuk pesan baru';
 $labels['replyandforwardonly'] = 'Hanya untuk dijawab dan diteruskan';
-$labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan tanda tangan';
-$labels['belowquote'] = 'Dibawah kutipan';
-$labels['abovequote'] = 'Diatas kutipan';
 $labels['insertsignature'] = 'Isi tanda tangan';
 $labels['previewpanemarkread']  = 'Tandai pesan yang sudah dilihat';
 $labels['afternseconds']  = 'setelah $n detik';
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index b604d0242..04d8242ad 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Basis data Error!';
 $messages['requesttimedout'] = 'Permintaan melewati batas waktu';
 $messages['errorreadonly'] = 'Tidak bisa melakukan operasi. Folder hanya bisa dibaca.';
 $messages['errornoperm'] = 'Tidak bisa melakukan operasi. Ijin ditolak.';
+$messages['erroroverquota'] = 'Tidak dapat melakukan operasi. Disk penuh.';
+$messages['erroroverquotadelete'] = 'Disk penuh. Tekan SHIFT + DEL untuk menghapus pesan';
 $messages['invalidrequest'] = 'Permintaan tidak valid! Tidak ada data yang tersimpan.';
 $messages['invalidhost'] = 'Nama server invalid.';
 $messages['nomessagesfound'] = 'Surat tidak ditemukan di kotak masuk ini';
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index 33dc7b6d2..80443dd3a 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Afrit';
 $labels['move']     = 'Færa';
 $labels['moveto']   = 'Færa í...';
 $labels['download'] = 'Hlaða niður';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Núverandi síða';
 $labels['unread'] = 'Ólesið';
 $labels['flagged'] = 'Flaggað';
 $labels['unanswered'] = 'Ósvarað';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Eytt';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Breyta sem nýju';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Skrifa HTML-skeyti';
 $labels['htmlonreply'] = 'sem svar við HTML-skeytum aðeins';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML-undirskrift';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Sýna forskoðunarglugga';
 $labels['skin'] = 'Sniðmát á viðmóti';
 $labels['logoutclear'] = 'Tæma rusl við útskráningu';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Þegar svarað fjarlægja upphaflega undirskr
 $labels['autoaddsignature'] = 'Bæta undirskrift við sjálfkrafa';
 $labels['newmessageonly'] = 'ný skeyti eingöngu';
 $labels['replyandforwardonly'] = 'svör og áframsendingar eingöngu';
-$labels['replysignaturepos'] = 'Þegar skeytum er svarað eða áframsend setja undirskrift';
-$labels['belowquote'] = 'undir tilvitnun';
-$labels['abovequote'] = 'fyrir ofan tilvitnun';
 $labels['insertsignature'] = 'Bæta undirskrift við';
 $labels['previewpanemarkread']  = 'Merka forskoðuð skeyti sem lesin';
 $labels['afternseconds']  = 'eftir $n sekúndur';
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 530e8008f..6e9f35af3 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Engin skeyti eru í þessu pósthólfi';
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 2f8442f18..75a24c5fd 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copia';
 $labels['move']     = 'Sposta';
 $labels['moveto']   = 'Sposta in...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Apri';
 $labels['showattachment'] = 'Visualizza';
 $labels['showanyway'] = 'Visualizza comunque';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pagina corrente';
 $labels['unread'] = 'Non letti';
 $labels['flagged'] = 'Contrassegnato';
 $labels['unanswered'] = 'Senza risposta';
+$labels['withattachment'] = 'Con allegato';
 $labels['deleted'] = 'Cancellato';
 $labels['undeleted'] = 'Non eliminato';
 $labels['invert'] = 'Inverti';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
+$labels['changeformattext'] = 'Visualizza nel formato testo semplice';
+$labels['changeformathtml'] = 'Visualizza nel formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Modifica come nuovo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Scrivi i messaggi in HTML';
 $labels['htmlonreply'] = 'solo in risposta a messaggi HTML';
 $labels['htmlonreplyandforward'] = 'su inoltro o risposta a messaggi HTML';
 $labels['htmlsignature'] = 'Firma in HTML';
+$labels['showemail'] = 'Visualizza indirizzi email con il nome visualizzato';
 $labels['previewpane'] = 'Mostra l\'anteprima';
 $labels['skin'] = 'Tema interfaccia';
 $labels['logoutclear'] = 'Svuota il Cestino all\'uscita';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Quando rispondi, rimuovi la firma dal messagg
 $labels['autoaddsignature'] = 'Aggiungi automaticamente la firma';
 $labels['newmessageonly'] = 'solo ai nuovi messaggi';
 $labels['replyandforwardonly'] = 'solo alle risposte e inoltri';
-$labels['replysignaturepos'] = 'In risposta o inoltro, posiziona la firma';
-$labels['belowquote'] = 'sotto la citazione';
-$labels['abovequote'] = 'sopra la citazione';
 $labels['insertsignature'] = 'Inserisci firma';
 $labels['previewpanemarkread']  = 'Segna i messagi in anteprima come letti';
 $labels['afternseconds']  = 'dopo $n secondi';
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index 66c248e74..80395b551 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Errore del database!';
 $messages['requesttimedout'] = 'Richiesta scaduta';
 $messages['errorreadonly'] = 'Impossibile eseguire l\'operazione. Cartella in sola lettura';
 $messages['errornoperm'] = 'Impossibile eseguire l\'operazione. Permesso negato';
+$messages['erroroverquota'] = 'Impossibile eseguire l\'operazione. Spazio su disco non sufficiente.';
+$messages['erroroverquotadelete'] = 'Spazio su disco non sufficiente. Utilizza SHIFT+CANC per eliminare un messaggio.';
 $messages['invalidrequest'] = 'Richiesta non valida! Nessun dato salvato.';
 $messages['invalidhost'] = 'Nome del server non valido.';
 $messages['nomessagesfound'] = 'Nessun messaggio trovato in questa cartella';
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index 46f6fad28..6998f0623 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'コピー';
 $labels['move']     = '移動';
 $labels['moveto']   = 'フォルダーに移動';
 $labels['download'] = 'ダウンロード';
+$labels['open']     = '開く';
 $labels['showattachment'] = '表示';
 $labels['showanyway'] = 'とにかく表示';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグ付き';
 $labels['unanswered'] = '未返信';
+$labels['withattachment'] = '添付ファイルあり';
 $labels['deleted'] = '削除済み';
 $labels['undeleted'] = '削除済みでない';
 $labels['invert'] = '反転';
@@ -204,6 +206,8 @@ $labels['body']  = '本文';
 
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
+$labels['changeformattext'] = 'テキスト形式で表示';
+$labels['changeformathtml'] = 'HTML形式で表示';
 
 // message compose
 $labels['editasnew']      = '新しいメッセージとして編集';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '作成時にHTMLメッセージを使用';
 $labels['htmlonreply'] = '返信時にHTMLメッセージを使用';
 $labels['htmlonreplyandforward'] = '転送またはHTMLメッセージへの返信';
 $labels['htmlsignature'] = 'HTMLの署名';
+$labels['showemail'] = '電子メールアドレスを表示名と共に表示';
 $labels['previewpane'] = 'プレビュー枠の表示';
 $labels['skin'] = 'インターフェイスのスキン';
 $labels['logoutclear'] = 'ログアウト時にごみ箱の内容を消去';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '返信時に元の署名をメッセージか
 $labels['autoaddsignature'] = '自動的に署名を付加';
 $labels['newmessageonly'] = '新しいメッセージだけ';
 $labels['replyandforwardonly'] = '返信と転送だけ';
-$labels['replysignaturepos'] = '返信や転送で署名を挿入する位置';
-$labels['belowquote'] = '引用の後';
-$labels['abovequote'] = '引用の前';
 $labels['insertsignature'] = '署名を挿入';
 $labels['previewpanemarkread']  = 'プレビューしたメッセージを既読に設定';
 $labels['afternseconds']  = '$n秒後';
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 6c6008a55..f4dd0fceb 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'データベースのエラーです!';
 $messages['requesttimedout'] = 'リクエストのタイムアウト';
 $messages['errorreadonly'] = '操作を実行できませんでした。フォルダーは読み込み専用です。';
 $messages['errornoperm'] = '操作を実行できませんでした。権限がありません。';
+$messages['erroroverquota'] = '操作を実行できませんでした。空きディスク容量がありません。';
+$messages['erroroverquotadelete'] = '空きディスク容量がありません。メッセージを削除するには SHIFT+DEL を使用してください。';
 $messages['invalidrequest'] = '不正なリクエストです!  データは保存していません。';
 $messages['invalidhost'] = '正しくないサーバー名です。';
 $messages['nomessagesfound'] = 'このフォルダーにはメッセージはありません。';
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 9b06db839..3ab3b6e63 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ასლი';
 $labels['move']     = 'გადატანა';
 $labels['moveto']   = 'გადატანა...';
 $labels['download'] = 'გადმოწერა';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'მიმდინარე გვერდი';
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
 $labels['unanswered'] = 'უპასუხო';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'წაშლილი';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'შებრუნებული';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'რედაქტირება როგორც ახლის';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'შეტყობინების შექმნა
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML ხელმოწერა';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'ჩვენება';
 $labels['skin'] = 'ინტერფეისი';
 $labels['logoutclear'] = 'წაშლილების გასუფთავება გამოსვლისას';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'წაიშალოს ხელმოწ�
 $labels['autoaddsignature'] = 'ავტომატურად დაემატოს ხელმოწერა';
 $labels['newmessageonly'] = 'მხოლოდ ახალი შეტყობინება';
 $labels['replyandforwardonly'] = 'მხოლოდ გადაგზავნის და პასუხის შემთხვევაში';
-$labels['replysignaturepos'] = 'მხოლოდ პასუხის ან გადაგზავნის შემთხვევაში გაყვეს ხელმოწერა';
-$labels['belowquote'] = 'ციტატის შემდეგ';
-$labels['abovequote'] = 'ციტატამდე';
 $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n წამის შემდეგ';
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 7ad0b665b..754343fac 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'მონაცემთა ბაზის შეცდ
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'მოქმედების შესრულება შეუძლებალია. წვდომა აკრძალულია.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'არასწორი მოთხოვნა! მონაცემების შენახვა არ მოხერხდა.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'არ არის ახალი შეტყობინება';
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 0f7d85dd8..7b10b5f7f 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'ចំលង';
 $labels['move']     = 'ផ្ទេរ';
 $labels['moveto']   = 'ផ្ទេរទៅ';
 $labels['download'] = 'ទាញយក';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'ទំព័រនេះ';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'បានលុបរួច';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'សរសេរសំបុត្រតាមបែប
 $labels['htmlonreply'] = 'ឆ្លើយតបសំបុត្រតាមបែប HTML';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ហត្ថលេខាតាមបែប HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'បង្ហាញប្រអប់សំរាប់មើលសំបុត្រ';
 $labels['skin'] = 'ការរចនាទំព័រ';
 $labels['logoutclear'] = 'សំអាតធុងសំរាមពេលពិនិត្យចេញ';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'នៅ​ពេល​ឆ្លើយ​តប
 $labels['autoaddsignature'] = 'បញ្ចូលហត្តលេខាដោយស្វ័យប្រវត្តិ';
 $labels['newmessageonly'] = 'សំរាប់សំបុត្រថ្មីតែប៉ុណ្ណោះ';
 $labels['replyandforwardonly'] = 'សំរាប់ឆើ្លយតប​និងផ្ញើបន្តតែ​ប៉ុណ្ណោះ';
-$labels['replysignaturepos'] = 'បញ្ចូលហត្តលេខានៅពេលឆើ្លយតប​និងផ្ញើបន្ត';
-$labels['belowquote'] = 'ពីក្រោមសម្រង់អត្ថបទ';
-$labels['abovequote'] = 'ពីលើសម្រង់អត្ថបទ';
 $labels['insertsignature'] = 'បញ្ចូលហត្តលេខា';
 $labels['previewpanemarkread']  = 'កំណត់សំបុត្រ​ដែល​បាន​បង្ហាញ​​ជា​សំបុត្របាន​អាន​រួច';
 $labels['afternseconds']  = 'ក្រោយពី $n វិនាទី';
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index c9ede486e..1f629fa6c 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះថតនេះត្រូវបានគេកំណត់សំរាប់តែមើល';
 $messages['errornoperm'] = 'មិនអាចប្រតិបត្តិបានពីព្រោះមិនមានសិទ្ទគ្រប់គ្រាន់';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'មិនអាចរក្សាទុកទិន្នន័យបានពីព្រោះមានបញ្ហានៅពេលបញ្ជូនទិន្នន័យ';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ពុំមានសំបុត្រក្នុងប្រអប់សំបុត្រនេះទេ';
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 1d17cdd94..950928767 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -21,53 +21,54 @@ $labels = array();
 // login page
 $labels['welcome']   = '$product에 오신 것을 환영합니다';
 $labels['username']  = '사용자명';
-$labels['password']  = '비밀번호';
+$labels['password']  = '암호';
 $labels['server']    = '서버';
 $labels['login']     = '로그인';
 
 // taskbar
 $labels['logout']   = '로그아웃';
-$labels['mail']     = '이메일';
-$labels['settings'] = '개인 설정';
+$labels['mail']     = '메일';
+$labels['settings'] = '설정';
 $labels['addressbook'] = '주소록';
 
 // mailbox names
-$labels['inbox']  = '받은편지함';
-$labels['drafts'] = '임시저장';
-$labels['sent']   = '보낸편지함';
+$labels['inbox']  = '받은 편지함';
+$labels['drafts'] = '임시 보관함';
+$labels['sent']   = '보낸 편지함';
 $labels['trash']  = '휴지통';
-$labels['junk']   = '정크메일';
+$labels['junk']   = '스팸 편지함';
 
 // message listing
 $labels['subject'] = '제목';
 $labels['from']    = '보내는 사람';
-$labels['sender']  = '보낸 사람';
+$labels['sender']  = '발신인';
 $labels['to']      = '받는 사람';
 $labels['cc']      = '참조';
 $labels['bcc']     = '숨은 참조';
 $labels['replyto'] = '회신 주소';
-$labels['followupto'] = '추가 답장';
+$labels['followupto'] = '전달';
 $labels['date']    = '날짜';
 $labels['size']    = '크기';
 $labels['priority'] = '우선순위';
 $labels['organization'] = '기관';
-$labels['readstatus'] = '보기 상태';
+$labels['readstatus'] = '읽음 상태';
 $labels['listoptions'] = '목록 옵션...';
 
 $labels['mailboxlist'] = '폴더';
-$labels['messagesfromto'] = '$count 개 중 $from 에서 $to 번 메시지';
-$labels['threadsfromto'] = '$from 에서 $to 까지 $count 개의 쓰레드';
-$labels['messagenrof'] = '$count 개 중 $nr 번 메시지';
-$labels['fromtoshort'] = '$from 에서 $to 까지 $count 개';
+$labels['messagesfromto'] = '총 $count개 중 $from 번째부터 $to 번째까지의 메시지';
+$labels['threadsfromto'] = '총 $count개 중 $from 번째부터 $to 번째까지의 스레드';
+$labels['messagenrof'] = '총 $count개 중  $nr 번째 메시지';
+$labels['fromtoshort'] = '총 $count개 중 $from 번째 - $to 번째';
 
-$labels['copy']     = '참조';
+$labels['copy']     = '복사';
 $labels['move']     = '이동';
-$labels['moveto']   = '이동...';
+$labels['moveto']   = '이동할 위치...';
 $labels['download'] = '다운로드';
-$labels['showattachment'] = '표시';
-$labels['showanyway'] = '항상 표시';
+$labels['open']     = '열기';
+$labels['showattachment'] = '보기';
+$labels['showanyway'] = '그래도 항상 보기';
 
-$labels['filename'] = '파일 이름';
+$labels['filename'] = '파일명';
 $labels['filesize'] = '파일 크기';
 
 $labels['addtoaddressbook'] = '주소록에 추가';
@@ -122,114 +123,117 @@ $labels['today'] = '오늘';
 
 // toolbar buttons
 $labels['refresh']          = '새로 고침';
-$labels['checkmail']        = '새 메일 확인';
-$labels['compose']          = '메일 쓰기';
-$labels['writenewmessage']  = '새 메일 작성';
+$labels['checkmail']        = '새 메시지 확인';
+$labels['compose']          = '메시지 작성';
+$labels['writenewmessage']  = '새 메시지 생성';
 $labels['reply']            = '회신';
-$labels['replytomessage']   = '회신 작성';
-$labels['replytoallmessage'] = '보낸이와 모든 수신자에게 회신';
+$labels['replytomessage']   = '발신인에게 회신';
+$labels['replytoallmessage'] = '보낸 사람과 모든 수신인에게 회신';
 $labels['replyall']         = '전체 회신';
 $labels['replylist']        = '회신 목록';
 $labels['forward']          = '전달';
-$labels['forwardinline']    = '전달';
-$labels['forwardattachment'] = '메일을 첨부파일로 전달';
-$labels['forwardmessage']   = '메일 전달';
-$labels['deletemessage']    = '메일 삭제';
-$labels['movemessagetotrash'] = '메일 휴지통으로 이동';
-$labels['printmessage']     = '메일 인쇄';
-$labels['previousmessage']  = '이전 메일 보기';
-$labels['firstmessage']     = '처음 메일 보기';
-$labels['nextmessage']      = '다음 메일 보기';
-$labels['lastmessage']      = '마지막 메일 보기';
-$labels['backtolist']       = '메일 목록으로';
+$labels['forwardinline']    = '본문 내용으로 전달';
+$labels['forwardattachment'] = '첨부파일로 전달';
+$labels['forwardmessage']   = '메시지 전달';
+$labels['deletemessage']    = '메시지 삭제';
+$labels['movemessagetotrash'] = '메시지를 휴지통으로 이동';
+$labels['printmessage']     = '이 메시지 인쇄';
+$labels['previousmessage']  = '이전 메시지 보기';
+$labels['firstmessage']     = '처음 메시지 표시';
+$labels['nextmessage']      = '다음 메시지 표시';
+$labels['lastmessage']      = '마지막 메시지 표시';
+$labels['backtolist']       = '메일 목록으로 돌아가기';
 $labels['viewsource']       = '소스 보기';
 $labels['mark']             = '표시';
-$labels['markmessages']     = '메시지 표시';
-$labels['markread']         = '읽은 것으로 표시';
-$labels['markunread']       = '읽지 않은 것으로 표시';
-$labels['markflagged']      = '깃발 달기';
-$labels['markunflagged']    = '깃발 내리기';
-$labels['moreactions']      = '이외의 동작...';
+$labels['markmessages']     = '메시지 표시하기';
+$labels['markread']         = '읽음으로 표시';
+$labels['markunread']       = '읽지 않음으로 표시';
+$labels['markflagged']      = '깃발로 표시됨으로 표시';
+$labels['markunflagged']    = '깃발로 표시되지 않음으로 표시';
+$labels['moreactions']      = '추가 동작...';
 $labels['more']             = '더보기';
 $labels['back']             = '뒤로';
-$labels['options']          = '선택 사항';
+$labels['options']          = '옵션';
 
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
 $labels['currpage'] = '현재 페이지';
 $labels['unread'] = '읽지 않음';
-$labels['flagged'] = '깃발';
+$labels['flagged'] = '깃발로 표시됨';
 $labels['unanswered'] = '답장하지 않음';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '삭제됨';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = '삭제되지 않음';
 $labels['invert'] = '반전';
 $labels['filter'] = '필터';
-$labels['list'] = '리스트';
-$labels['threads'] = '쓰레드';
+$labels['list'] = '목록';
+$labels['threads'] = '스레드';
 $labels['expand-all'] = '모두 확장';
-$labels['expand-unread'] = 'Expand Unread';
+$labels['expand-unread'] = '읽지 않은 메시지 확장';
 $labels['collapse-all'] = '모두 접기';
-$labels['threaded'] = '그룹화됨';
-
-$labels['autoexpand_threads'] = '모든 메시지 확장';
-$labels['do_expand'] = 'all threads';
-$labels['expand_only_unread'] = 'only with unread messages';
-$labels['fromto'] = 'From/To';
-$labels['flag'] = '표시';
-$labels['attachment'] = '첨부';
+$labels['threaded'] = '스레드화됨';
+
+$labels['autoexpand_threads'] = '메시지 스레드 확장';
+$labels['do_expand'] = '모든 스레드';
+$labels['expand_only_unread'] = '읽지 않은 메시지에만 적용';
+$labels['fromto'] = '보내는 사람/받는 사람';
+$labels['flag'] = '깃발로 표시';
+$labels['attachment'] = '첨부파일';
 $labels['nonesort'] = '없음';
-$labels['sentdate'] = '보낸 날짜';
-$labels['arrival'] = '수신 날짜';
+$labels['sentdate'] = '발신일';
+$labels['arrival'] = '도착일';
 $labels['asc'] = '오름차순';
 $labels['desc'] = '내림차순';
-$labels['listcolumns'] = 'List columns';
-$labels['listsorting'] = '정렬';
+$labels['listcolumns'] = '열 목록 보기';
+$labels['listsorting'] = '열 정렬';
 $labels['listorder'] = '정렬 순서';
-$labels['listmode'] = 'List view mode';
+$labels['listmode'] = '화면 모드 목록 보기';
 
 $labels['folderactions'] = '폴더 명령';
 $labels['compact'] = '간단하게';
-$labels['empty'] = '비우기';
+$labels['empty'] = '비어 있음';
 
-$labels['quota'] = '디스크 사용';
-$labels['unknown']  = '알수 없음';
+$labels['quota'] = '디스크 사용량';
+$labels['unknown']  = '알 수 없음';
 $labels['unlimited']  = '제한 없음';
 
-$labels['quicksearch']  = '빨리 찾기';
-$labels['resetsearch']  = '찾기 리셋';
-$labels['searchmod']  = 'Search modifiers';
+$labels['quicksearch']  = '빠른 검색';
+$labels['resetsearch']  = '검색 재설정';
+$labels['searchmod']  = '수정자 검색';
 $labels['msgtext']  = '전체 메시지';
-$labels['body']  = 'Body';
+$labels['body']  = '본문';
 
 $labels['openinextwin'] = '새 창에서 열기';
-$labels['emlsave'] = '다운로드 (.eml)';
+$labels['emlsave'] = '다운로드(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = 'Edit as new';
-$labels['send']           = 'Send';
-$labels['sendmessage']    = '메일 지금 보냄';
-$labels['savemessage']    = '드래프트 저장';
+$labels['editasnew']      = '새 메시지로 편집';
+$labels['send']           = '보내기';
+$labels['sendmessage']    = '메일 보내기';
+$labels['savemessage']    = '임시 보관함에 저장';
 $labels['addattachment']  = '파일 첨부';
-$labels['charset']        = '문자셋';
-$labels['editortype']     = '편집기 형태';
-$labels['returnreceipt']  = '수신 확인 요청하기';
-$labels['dsn']            = '전송상태 메일 받기';
-$labels['mailreplyintro'] = '$date에, $sender가 작성:';
+$labels['charset']        = '인코딩';
+$labels['editortype']     = '편집기 유형';
+$labels['returnreceipt']  = '수신 확인';
+$labels['dsn']            = '전송 상태 알림';
+$labels['mailreplyintro'] = '$date에 $sender이(가) 작성한 내용:';
 $labels['originalmessage'] = '원본 메세지';
 
-$labels['editidents']    = 'Edit identities';
+$labels['editidents']    = '신원 편집';
 $labels['spellcheck']    = '맞춤법';
-$labels['checkspelling'] = '스펠링 체크';
-$labels['resumeediting'] = '편집 계속';
-$labels['revertto']      = '돌아감';
+$labels['checkspelling'] = '맞춤법 검사하기';
+$labels['resumeediting'] = '편집 계속하기';
+$labels['revertto']      = '돌아가기';
 
 $labels['attach'] = '첨부';
-$labels['attachments'] = '첨부 파일';
+$labels['attachments'] = '첨부파일';
 $labels['upload'] = '업로드';
-$labels['uploadprogress'] = '$percent ($total 에서 $current)';
+$labels['uploadprogress'] = '$percent ($total개 중 $current개)';
 $labels['close']  = '닫기';
-$labels['messageoptions']  = '메시지 옵션(들)...';
+$labels['messageoptions']  = '메시지 옵션...';
 
 $labels['low']     = '낮음';
 $labels['lowest']  = '가장 낮음';
@@ -238,86 +242,86 @@ $labels['high']    = '높음';
 $labels['highest'] = '가장 높음';
 
 $labels['nosubject']  = '(제목 없음)';
-$labels['showimages'] = '이미지 표시';
-$labels['alwaysshow'] = '$sender 에서 온 이미지 항상 보기';
-$labels['isdraft']    = '이 메시지는 임시 보관 메시지 입니다.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['showimages'] = '이미지 보기';
+$labels['alwaysshow'] = '$sender에서 수신된 이미지 항상 보기';
+$labels['isdraft']    = '이것은 작성 중인 메시지입니다.';
+$labels['andnmore']   = '$nr 더 보기...';
+$labels['togglemoreheaders'] = '메시지 헤더 더 보기';
+$labels['togglefullheaders'] = '원 메시지 헤더 표시/숨기기';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '일반 텍스트';
-$labels['savesentmessagein'] = '보낸 메시지를 다음에 저장';
+$labels['savesentmessagein'] = '보낸 메시지를 다음 위치에 저장';
 $labels['dontsave'] = '저장하지 않음';
-$labels['maxuploadsize'] = '최대 파일 크기는 $size 입니다';
+$labels['maxuploadsize'] = '최대 허용 파일 크기는 $size 입니다';
 
-$labels['addcc'] = '참조 넣기';
-$labels['addbcc'] = '숨은참조 넣기';
-$labels['addreplyto'] = '회신주소 넣기';
-$labels['addfollowupto'] = 'Add Followup-To';
+$labels['addcc'] = '참조 추가';
+$labels['addbcc'] = '숨은 참조 추가';
+$labels['addreplyto'] = '회신 주소 추가';
+$labels['addfollowupto'] = '전달 추가';
 
 // mdn
-$labels['mdnrequest'] = '이 메시지를 보낸 분이 읽음 확인 요청을 했습니다. 확인할까요?';
-$labels['receiptread'] = '읽음 확인 보내기';
-$labels['yourmessage'] = '당신의 메시지를 읽었습니다.';
-$labels['receiptnote'] = '주의: 이 확인은 이 메시지가 수신자의 컴퓨터에 표시된 것만을 의미합니다. 수신자가 반드시 이 메일을 읽거나 이해했다는 것은 아닙니다.';
+$labels['mdnrequest'] = '이 메시지를 보낸 사람이 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 보낸 사람에게 알리시겠습니까?';
+$labels['receiptread'] = '수신 확인 (읽음)';
+$labels['yourmessage'] = '이것은 사용자의 메시지에 대한 수신 확인입니다.';
+$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 받는 사람의 컴퓨터에 표시되었다는 것만을 의미합니다. 받는 사람이 메시지 내용을 읽거나 이해했다는 보장은 없습니다.';
 
 // address boook
-$labels['name']         = '표시 이름';
+$labels['name']         = '표시명';
 $labels['firstname']    = '이름';
 $labels['surname']      = '성';
 $labels['middlename']   = '가운데 이름';
 $labels['nameprefix']   = '접두사';
 $labels['namesuffix']   = '접미사';
-$labels['nickname']     = '별명';
+$labels['nickname']     = '별칭';
 $labels['jobtitle']     = '직위';
 $labels['department']   = '부서';
 $labels['gender']       = '성별';
-$labels['maidenname']   = '결혼 전 이름';
+$labels['maidenname']   = '결혼 전 성';
 $labels['email']        = '이메일';
 $labels['phone']        = '전화';
 $labels['address']      = '주소';
-$labels['street']       = '세부주소';
+$labels['street']       = '나머지 주소';
 $labels['locality']     = '시/구/군';
 $labels['zipcode']      = '우편번호';
-$labels['region']       = '도';
+$labels['region']       = '시/도';
 $labels['country']      = '국가';
 $labels['birthday']     = '생년월일';
 $labels['anniversary']  = '기념일';
 $labels['website']      = '웹사이트';
-$labels['instantmessenger'] = '메신져';
-$labels['notes'] = '노트';
+$labels['instantmessenger'] = '인스턴트 메신저';
+$labels['notes'] = '메모';
 $labels['male']   = '남성';
 $labels['female'] = '여성';
-$labels['manager'] = '관리자';
-$labels['assistant'] = '도우미';
+$labels['manager'] = '상사';
+$labels['assistant'] = '비서';
 $labels['spouse'] = '배우자';
-$labels['allfields'] = '친구 전체';
+$labels['allfields'] = '모든 항목';
 $labels['search'] = '검색';
-$labels['advsearch'] = '상세 검색';
-$labels['advanced'] = '고급 설정';
-$labels['other'] = '그 외';
+$labels['advsearch'] = '고급 검색';
+$labels['advanced'] = '고급';
+$labels['other'] = '기타';
 
-$labels['typehome']   = '홈';
+$labels['typehome']   = '자택';
 $labels['typework']   = '직장';
-$labels['typeother']  = '그 외';
-$labels['typemobile']  = '휴대폰';
-$labels['typemain']  = '주';
-$labels['typehomefax']  = '팩스(집)';
-$labels['typeworkfax']  = '팩스(직장)';
+$labels['typeother']  = '기타';
+$labels['typemobile']  = '휴대전화';
+$labels['typemain']  = '대표';
+$labels['typehomefax']  = '자택 팩스';
+$labels['typeworkfax']  = '직장 팩스';
 $labels['typecar']  = '자동차';
 $labels['typepager']  = '호출기';
 $labels['typevideo']  = '동영상';
-$labels['typeassistant']  = '도우미';
-$labels['typehomepage']  = '홈 페이지';
+$labels['typeassistant']  = '비서';
+$labels['typehomepage']  = '홈페이지';
 $labels['typeblog'] = '블로그';
 $labels['typeprofile'] = '자기소개';
 
-$labels['addfield'] = '항목 추가..';
+$labels['addfield'] = '필드 추가..';
 $labels['addcontact'] = '새 연락처 추가';
 $labels['editcontact'] = '연락처 편집';
 $labels['contacts'] = '연락처';
-$labels['contactproperties'] = 'Contact properties';
+$labels['contactproperties'] = '연락처 속성';
 $labels['personalinfo'] = '개인 정보';
 
 $labels['edit']   = '편집';
@@ -327,207 +331,205 @@ $labels['delete'] = '삭제';
 $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
 $labels['replacephoto'] = '바꾸기';
-$labels['uploadphoto'] = '사진 올리기';
+$labels['uploadphoto'] = '사진 업로드';
 
-$labels['newcontact']     = '새 연락처 카드 만들기';
+$labels['newcontact']     = '새 연락처 카드 생성';
 $labels['deletecontact']  = '선택한 연락처 삭제';
-$labels['composeto']      = '새 메일 작성';
-$labels['contactsfromto'] = '$from 에서 $to 로의 연락처 $count 개';
+$labels['composeto']      = '메일 작성 대상';
+$labels['contactsfromto'] = '총 $count개의 연락처 중 $from 번째부터 $to 번째 까지';
 $labels['print']          = '인쇄';
 $labels['export']         = '내보내기';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '연락처를 vCard 포맷으로 내보내기';
-$labels['newcontactgroup'] = '새로운 연락처 그룹 생성';
-$labels['grouprename']    = '그룹 이름 바꾸기';
+$labels['exportall']      = '모두 내보내기';
+$labels['exportsel']      = '선택한 항목 내보내기';
+$labels['exportvcards']   = '연락처를 vCard 형식으로 내보내기';
+$labels['newcontactgroup'] = '새 연락처 그룹 생성';
+$labels['grouprename']    = '그룹명 변경';
 $labels['groupdelete']    = '그룹 삭제';
 $labels['groupremoveselected'] = '그룹에서 선택한 연락처 제거';
 
-$labels['previouspage']   = '이전 세트 보기';
-$labels['firstpage']      = '처음 세트 보기';
-$labels['nextpage']       = '다음 세트 보기';
-$labels['lastpage']       = '마지막 세트 보기';
+$labels['previouspage']   = '이전 페이지 보기';
+$labels['firstpage']      = '처음 페이지 보기';
+$labels['nextpage']       = '다음 페이지 보기';
+$labels['lastpage']       = '마지막 페이지 보기';
 
 $labels['group'] = '그룹';
 $labels['groups'] = '그룹';
 $labels['personaladrbook'] = '개인 주소';
 
-$labels['searchsave'] = 'Save search';
-$labels['searchdelete'] = 'Delete search';
+$labels['searchsave'] = '검색 저장';
+$labels['searchdelete'] = '검색 삭제';
 
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
-$labels['importfromfile'] = '파일에서 가져오기';
-$labels['importtarget'] = 'Add new contacts to address book:';
-$labels['importreplace'] = '전체 주소록을 바꿈';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importfromfile'] = '파일에서 가져오기:';
+$labels['importtarget'] = '새 연락처를 주소록에 추가:';
+$labels['importreplace'] = '전체 주소록을 바꾸기';
+$labels['importdesc'] = '기존 주소록에서 연락처를 가져올 수 있습니다.<br/> 현재 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 데이터 형식에서 주소 가져오기를 지원합니다.\'';
 $labels['done'] = '완료';
 
 // settings
 $labels['settingsfor'] = '설정';
-$labels['about'] = '이것은...';
-$labels['preferences'] = '환경 설정';
-$labels['userpreferences'] = '사용자 환경';
-$labels['editpreferences'] = '사용자 환경 편집';
+$labels['about'] = '정보...';
+$labels['preferences'] = '환경설정';
+$labels['userpreferences'] = '사용자 환경설정';
+$labels['editpreferences'] = '사용자 환경설정 편집';
 
 $labels['identities'] = '신원';
 $labels['manageidentities'] = '이 계정의 신원 관리';
 $labels['newidentity'] = '새 신원';
 
-$labels['newitem'] = '새 아이템';
-$labels['edititem'] = '아이템 편집';
+$labels['newitem'] = '새 항목';
+$labels['edititem'] = '항목 편집';
 
-$labels['preferhtml'] = 'HTML 보이기';
-$labels['defaultcharset'] = '기본 문자 세트';
+$labels['preferhtml'] = 'HTML 표시';
+$labels['defaultcharset'] = '기본 인코딩';
 $labels['htmlmessage'] = 'HTML 메시지';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = '부분';
+$labels['digitalsig'] = '디지털 서명';
 $labels['dateformat'] = '날짜 형식';
 $labels['timeformat'] = '시간 형식';
-$labels['prettydate'] = '날짜 형식';
-$labels['setdefault']  = '기본으로 설정';
+$labels['prettydate'] = '간결한 날짜';
+$labels['setdefault']  = '기본 설정';
 $labels['autodetect']  = '자동';
 $labels['language']  = '언어';
 $labels['timezone']  = '시간대';
-$labels['pagesize']  = '페이지당 줄 수';
+$labels['pagesize']  = '페이지당 행 수';
 $labels['signature'] = '서명';
-$labels['dstactive']  = '서머타임';
-$labels['showinextwin'] = 'Open message in a new window';
-$labels['composeextwin'] = 'Compose in a new window';
-$labels['htmleditor'] = 'HTML 메일 쓰기';
-$labels['htmlonreply'] = 'HTML 메시지에 회신할 때에 만';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['dstactive']  = '일광 절약 시간';
+$labels['showinextwin'] = '메시지를 새 창에서 열기';
+$labels['composeextwin'] = '새 창에서 작성하기';
+$labels['htmleditor'] = 'HTML 메시지 작성';
+$labels['htmlonreply'] = 'HTML 메시지 회신 시';
+$labels['htmlonreplyandforward'] = '전달 또는 HTML 메시지 회신 시';
 $labels['htmlsignature'] = 'HTML 서명';
-$labels['previewpane'] = '미리 보기 창 보기';
+$labels['showemail'] = 'Show email address with display name';
+$labels['previewpane'] = '미리보기 창 보기';
 $labels['skin'] = '인터페이스 스킨';
 $labels['logoutclear'] = '로그아웃할 때 휴지통 비우기';
-$labels['logoutcompact'] = '로그아웃할 때 받은편지함 압축하기';
+$labels['logoutcompact'] = '로그아웃할 때 받은 편지함 압축하기';
 $labels['uisettings'] = '사용자 인터페이스';
 $labels['serversettings'] = '서버 설정';
-$labels['mailboxview'] = '메일 상자 보기';
-$labels['mdnrequests'] = '수신 확인';
-$labels['askuser'] = '사용자에게 묻기';
-$labels['autosend'] = '자동으로 보내기';
-$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
-$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
-$labels['ignore'] = '무시';
-$labels['readwhendeleted'] = '삭제할 때 메시지를 읽은 것으로 표시';
-$labels['flagfordeletion'] = '지우는 대신 지울 메시지에 깃발 달기';
-$labels['skipdeleted'] = '지운 메시지 보이지 않기';
-$labels['deletealways'] = '휴지통으로 메시지 이동을 실패하면, 삭제';
-$labels['deletejunk'] = '정크 메일함에 있는 메시지들을 바로 삭제';
-$labels['showremoteimages'] = '원격 이미지 보이기';
-$labels['fromknownsenders'] = '아는 발신인에게서만';
+$labels['mailboxview'] = '메일함 화면';
+$labels['mdnrequests'] = '수신 확인 요청 시';
+$labels['askuser'] = '사용자에게 물어봄';
+$labels['autosend'] = '수신 확인 보내기';
+$labels['autosendknown'] = '내 연락처에 수신 확인 요청을 보냄, 아닐 경우 물어봄';
+$labels['autosendknownignore'] = '내 연락처에 수신 확인 요청을 보냄, 아닐 경우 무시함';
+$labels['ignore'] = '무시함';
+$labels['readwhendeleted'] = '삭제 시 메시지를 읽음으로 표시';
+$labels['flagfordeletion'] = '삭제 대신 삭제 대상 메시지를 깃발로 표시';
+$labels['skipdeleted'] = '삭제된 메시지 보지 않기';
+$labels['deletealways'] = '메시지를 휴지통으로 이동하는 작업에 실패할 경우 삭제';
+$labels['deletejunk'] = '스팸 메일함에 있는 메시지를 바로 삭제';
+$labels['showremoteimages'] = '본문 내용의 원격 이미지 표시';
+$labels['fromknownsenders'] = '알려진 발신인으로부터 받은 메시지만';
 $labels['always'] = '항상';
-$labels['showinlineimages'] = '메시지 아래에 첨부 이미지 보이기';
-$labels['autosavedraft']  = '드래프트 자동 저장';
-$labels['everynminutes']  = '$n 분마다';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['showinlineimages'] = '메시지 하단에 첨부 이미지 표시';
+$labels['autosavedraft']  = '작성 중인 메시지를 자동으로 저장';
+$labels['everynminutes']  = '매 $n분 마다';
+$labels['refreshinterval']  = '새로 고침 (새 메시지 확인, 기타 등등)';
 $labels['never']  = '하지 않음';
 $labels['immediately']  = '즉시';
-$labels['messagesdisplaying'] = '메시지 표시 중';
-$labels['messagescomposition'] = '메시지 작성 중';
-$labels['mimeparamfolding'] = '첨부 파일 이름';
+$labels['messagesdisplaying'] = '메시지 보기';
+$labels['messagescomposition'] = '메시지 작성';
+$labels['mimeparamfolding'] = '첨부파일명';
 $labels['2231folding'] = 'Full RFC 2231 (선더버드)';
-$labels['miscfolding'] = 'RFC 2047/2231 (MS 아웃룻)';
-$labels['2047folding'] = 'Full RFC 2047 (다른 프로그램들)';
-$labels['force7bit'] = '8-bit 문자들을 위해서 MIME 인코딩을 사용';
-$labels['advancedoptions'] = '상세 설정';
-$labels['focusonnewmessage'] = '새 메시지가 있으면 브라우저 윈도우로 포커스 이동';
-$labels['checkallfolders'] = '새 메시지를 위해 모든 폴더 체크';
-$labels['displaynext'] = '메시지 삭제/이동한 후에는 다음 메시지를 표시';
-$labels['defaultfont'] = 'HTML 메시지의 기본 폰트';
-$labels['mainoptions'] = '주 옵션';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS 아웃룩)';
+$labels['2047folding'] = 'Full RFC 2047 (기타)';
+$labels['force7bit'] = '8-bit 문자에 MIME 인코딩 사용';
+$labels['advancedoptions'] = '고급 옵션';
+$labels['focusonnewmessage'] = '새 메시지가 있을 경우 브라우저 창으로 포커스 이동';
+$labels['checkallfolders'] = '모든 폴더에서 새 메시지 확인';
+$labels['displaynext'] = '메시지 삭제/이동 후 다음 메시지 표시';
+$labels['defaultfont'] = 'HTML 메시지의 기본 글꼴';
+$labels['mainoptions'] = '주요 옵션';
 $labels['browseroptions'] = '브라우저 옵션';
 $labels['section'] = '섹션';
-$labels['maintenance'] = '유지 관리';
+$labels['maintenance'] = '유지관리';
 $labels['newmessage'] = '새 메시지';
 $labels['signatureoptions'] = '서명 옵션';
-$labels['whenreplying'] = 'When replying';
-$labels['replyempty'] = 'do not quote the original message';
-$labels['replytopposting'] = 'start new message above the quote';
-$labels['replybottomposting'] = 'start new message below the quote';
-$labels['replyremovesignature'] = 'When replying remove original signature from message';
-$labels['autoaddsignature'] = '자동으로 서명 추가';
-$labels['newmessageonly'] = '새로운 메시지만';
-$labels['replyandforwardonly'] = '회신이나 전달 메시지 만';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
+$labels['whenreplying'] = '회신 시';
+$labels['replyempty'] = '원문 메시지를 인용하지 않음';
+$labels['replytopposting'] = '새 메시지를 인용문 상단에서 시작';
+$labels['replybottomposting'] = '새 메시지를 인용문 하단에서 시작';
+$labels['replyremovesignature'] = '회신 시 메시지에서 원문 서명을 제거';
+$labels['autoaddsignature'] = '서명 자동으로 추가';
+$labels['newmessageonly'] = '새로운 메시지에만';
+$labels['replyandforwardonly'] = '회신 및 전달 시에만';
 $labels['insertsignature'] = '서명 삽입';
-$labels['previewpanemarkread']  = '미리 읽힘 메시지를 읽음으로 표시';
-$labels['afternseconds']  = '$n 초 이후';
-$labels['reqmdn'] = '항상 수신확인 요청 하기';
-$labels['reqdsn'] = 'Always request a delivery status notification';
-$labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
-$labels['defaultabook'] = 'Default address book';
-$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
-$labels['listnamedisplay'] = 'List contacts as';
-$labels['spellcheckbeforesend'] = '메시지를 보내기 전에 맞춤법 확인';
-$labels['spellcheckoptions'] = '맞춤법 확인 옵션';
-$labels['spellcheckignoresyms'] = '심볼이 포함된 단어 무시하기';
-$labels['spellcheckignorenums'] = '숫자가 포함된 단어 무시하기';
-$labels['spellcheckignorecaps'] = '대문자가 포함된 단어 무시하기';
+$labels['previewpanemarkread']  = '미리 본 메시지를 읽음으로 표시';
+$labels['afternseconds']  = '$n초 후';
+$labels['reqmdn'] = '수신 확인을 항상 요청';
+$labels['reqdsn'] = '전송 상태 알림을 항상 요청';
+$labels['replysamefolder'] = ' 회신 메시지를 회신 대상 메시지의 폴더로 이동';
+$labels['defaultabook'] = '기본 주소록';
+$labels['autocompletesingle'] = '자동완성에서 대체 이메일 주소를 건너뜀';
+$labels['listnamedisplay'] = '연락처 정렬 방식';
+$labels['spellcheckbeforesend'] = '메시지를 보내기 전에 맞춤법 검사';
+$labels['spellcheckoptions'] = '맞춤법 검사 옵션';
+$labels['spellcheckignoresyms'] = '기호가 포함된 단어 무시';
+$labels['spellcheckignorenums'] = '숫자가 포함된 단어 무시';
+$labels['spellcheckignorecaps'] = '모두 대문자로 표기된 단어 무시';
 $labels['addtodict'] = '사전에 추가';
-$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['mailtoprotohandler'] = 'mailto: 링크의 프로토콜 처리자 등록';
+$labels['forwardmode'] = '메시지 전달';
+$labels['inline'] = '본문 내용으로';
+$labels['asattachment'] = '첨부파일로';
 
 $labels['folder']  = '폴더';
 $labels['folders']  = '폴더';
-$labels['foldername']  = '폴더 이름';
-$labels['subscribed']  = '가입됨';
+$labels['foldername']  = '폴더명';
+$labels['subscribed']  = '구독함';
 $labels['messagecount'] = '메시지';
-$labels['create']  = '만들기';
-$labels['createfolder']  = '새 폴더 만들기';
+$labels['create']  = '생성';
+$labels['createfolder']  = '새 폴더 생성';
 $labels['managefolders']  = '폴더 관리';
 $labels['specialfolders'] = '특수 폴더';
-$labels['properties'] = '등록 정보';
-$labels['folderproperties'] = '폴더 등록 정보';
+$labels['properties'] = '속성';
+$labels['folderproperties'] = '폴더 속성';
 $labels['parentfolder'] = '상위 폴더';
-$labels['location'] = 'Location';
+$labels['location'] = '위치';
 $labels['info'] = '정보';
-$labels['getfoldersize'] = '폴더의 사이즈를 알아보려면 클릭';
-$labels['changesubscription'] = '구독을 변경하려면 클릭';
-$labels['foldertype'] = '폴더 타입';
+$labels['getfoldersize'] = '폴더 크기를 확인하려면 클릭하세요';
+$labels['changesubscription'] = '구독을 변경하려면 클릭하세요';
+$labels['foldertype'] = '폴더 유형';
 $labels['personalfolder']  = '개인 폴더';
 $labels['otherfolder']  = '다른 사용자의 폴더';
-$labels['sharedfolder']  = '공개 폴더';
+$labels['sharedfolder']  = '공유 폴더';
 
-$labels['sortby'] = '정렬';
+$labels['sortby'] = '정렬 방식';
 $labels['sortasc']  = '오름차순으로 정렬';
 $labels['sortdesc'] = '내림차순으로 정렬';
 $labels['undo'] = '실행 취소';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = '설치된 플러그인';
 $labels['plugin'] = '플러그인';
 $labels['version'] = '버전';
-$labels['source'] = 'Source';
-$labels['license'] = '라이센스';
-$labels['support'] = '지원 받기';
+$labels['source'] = '소스';
+$labels['license'] = '라이선스';
+$labels['support'] = '지원 요청';
 
 // units
-$labels['B'] = '바이트';
-$labels['KB'] = '킬로바이트';
-$labels['MB'] = '메가바이트';
-$labels['GB'] = '기가바이트';
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
 
 // character sets
-$labels['unicode'] = '유니코드(단일 코드,다국적 지원코드)';
+$labels['unicode'] = '유니코드';
 $labels['english'] = '영어';
-$labels['westerneuropean'] = 'Western European';
-$labels['easterneuropean'] = 'Eastern European';
-$labels['southeasterneuropean'] = 'South-Eastern European';
-$labels['baltic'] = 'Baltic';
-$labels['cyrillic'] = 'Cyrillic';
-$labels['arabic'] = 'Arabic';
-$labels['greek'] = 'Greek';
-$labels['hebrew'] = 'Hebrew';
+$labels['westerneuropean'] = '서유럽어';
+$labels['easterneuropean'] = '동유럽어';
+$labels['southeasterneuropean'] = '남동유럽어';
+$labels['baltic'] = '발트어';
+$labels['cyrillic'] = '키릴어';
+$labels['arabic'] = '아랍어';
+$labels['greek'] = '그리스어';
+$labels['hebrew'] = '히브리어';
 $labels['turkish'] = '터키어';
-$labels['nordic'] = 'Nordic';
+$labels['nordic'] = '북유럽어';
 $labels['thai'] = '태국어';
-$labels['celtic'] = 'Celtic';
+$labels['celtic'] = '켈트어';
 $labels['vietnamese'] = '베트남어';
 $labels['japanese'] = '일본어';
 $labels['korean'] = '한국어';
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index 4efd2f3d3..bf42c9c89 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -17,153 +17,156 @@
 */
 
 $messages = array();
-$messages['errortitle']  = '에러가 발생!';
+$messages['errortitle']  = '오류 발생!';
 $messages['loginfailed']  = '로그인이 실패하였습니다.';
-$messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다';
-$messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다';
+$messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다.';
+$messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다.';
 $messages['storageerror'] = 'IMAP 서버 연결 실패';
-$messages['servererror'] = '서버 에러!';
-$messages['servererrormsg'] = '서버 에러: $msg';
-$messages['dberror'] = '데이터베이스 에러!';
+$messages['servererror'] = '서버 오류!';
+$messages['servererrormsg'] = '서버 오류: $msg';
+$messages['dberror'] = '데이터베이스 오류!';
 $messages['requesttimedout'] = '요청 시간 초과';
-$messages['errorreadonly'] = '명령을 수행할 수 없습니다. 읽기전용 폴더.';
-$messages['errornoperm'] = '명령을 수행할 수 없습니다. 권한이 거부 됨.';
-$messages['invalidrequest'] = '잘못된 요청! 데이터는 저장되지 않았음.';
+$messages['errorreadonly'] = '명령을 수행할 수 없습니다. 읽기 전용 폴더임.';
+$messages['errornoperm'] = '명령을 수행할 수 없습니다. 권한이 거부됨.';
+$messages['erroroverquota'] = '작업을 수행할 수 없음. 여유 공간이 없음.';
+$messages['erroroverquotadelete'] = '여유 공간이 없음. SHIFT-DEL을 이용하여 메시지를 삭제하세요.';
+$messages['invalidrequest'] = '잘못된 요청! 데이터가 저장되지 않았음.';
 $messages['invalidhost'] = '잘못된 서버 이름입니다.';
-$messages['nomessagesfound'] = '이 메일함에 메일이 없습니다';
-$messages['loggedout'] = '세션을 성공적으로 종료하였습니다. 안녕히 가십시오!';
-$messages['mailboxempty'] = '메일함이 비어있습니다';
-$messages['refreshing'] = '새로고침 중 ...';
+$messages['nomessagesfound'] = '이 메일함에 메일이 없습니다.';
+$messages['loggedout'] = '세션을 성공적으로 종료하였습니다. 안녕히 가세요!';
+$messages['mailboxempty'] = '메일함이 비어있습니다.';
+$messages['refreshing'] = '새로 고치는 중 ...';
 $messages['loading'] = '불러오는 중...';
-$messages['uploading'] = '하나의 파일 올리기...';
-$messages['uploadingmany'] = '여러 파일 올리기...';
-$messages['loadingdata'] = '데이터 불러오는 중...';
-$messages['checkingmail'] = '새 메일 확인 중...';
-$messages['sendingmessage'] = '메일 보내는 중...';
-$messages['messagesent'] = '메일을 성공적으로 보냈습니다';
-$messages['savingmessage'] = '메일 저장 중...';
-$messages['messagesaved'] = '메일이 드래프트 폴더에 저장되었습니다';
-$messages['successfullysaved'] = '성공적으로 저장';
-$messages['addedsuccessfully'] = '연락처가 주소록에 성공적으로 추가되었습니다';
-$messages['contactexists'] = '이 메일로 지정된 연락처가 이미 있습니다';
-$messages['contactnameexists'] = '이미 존재하는 것과 동일한 이름의 연락처.';
-$messages['blockedimages'] = '보안 유지를 위해, 이 메일의 외부 이미지를 차단하였습니다';
-$messages['encryptedmessage'] = '이 메일은 암호화되어 볼 수 없습니다. 죄송합니다!';
-$messages['nocontactsfound'] = '연락처 없음';
-$messages['contactnotfound'] = '요청한 연락처가 없습니다';
-$messages['contactsearchonly'] = '연락처를 찾기 위해 검색 항목을 입력하세요.';
-$messages['sendingfailed'] = '메일을 보내지 못했습니다';
-$messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec 초 동안 기다리십시오.';
-$messages['errorsavingsent'] = '보낸 메시지를 저장할 때 에러가 발생했습니다.';
-$messages['errorsaving'] = '저장 중 에러가 발생했습니다';
-$messages['errormoving'] = '메일을 옮길 수 없습니다';
-$messages['errorcopying'] = '메시지(들)를 복사할 수 없습니다.';
-$messages['errordeleting'] = '메일을 지울 수 없습니다';
-$messages['errormarking'] = '메시지(들)에 표시할 수 없습니다.';
-$messages['deletecontactconfirm']  = '정말 선택한 연락처들을 삭제하시겠습니까?';
-$messages['deletegroupconfirm']  = '정말로 선택한 그룹을 삭제하는 것을 원하십니까?';
-$messages['deletemessagesconfirm'] = '정말 선택한 메일들을 삭제하시겠습니까?';
-$messages['deletefolderconfirm']  = '정말 이 폴더를 삭제하시겠습니까?';
-$messages['purgefolderconfirm']  = '정말 이 폴더의 모든 메일을 삭제하시겠습니까?';
-$messages['contactdeleting'] = '연락처(들) 삭제 중...';
+$messages['uploading'] = '파일을 업로드하는 중...';
+$messages['uploadingmany'] = '파일을 업로드하는 중...';
+$messages['loadingdata'] = '데이터를 불러오는 중...';
+$messages['checkingmail'] = '새 메시지를 확인하는 중...';
+$messages['sendingmessage'] = '메시지를 보내는 중...';
+$messages['messagesent'] = '메시지를 성공적으로 보냈습니다.';
+$messages['savingmessage'] = '메시지를 저장하는 중...';
+$messages['messagesaved'] = '메시지가 임시 보관함에 저장되었습니다.';
+$messages['successfullysaved'] = '성공적으로 저장됨.';
+$messages['addedsuccessfully'] = '연락처가 주소록에 성공적으로 추가되었습니다.';
+$messages['contactexists'] = '연락처에 동일한 이메일 주소가 이미 존재합니다.';
+$messages['contactnameexists'] = '연락처에 동일한 이름이 이미 존재합니다.';
+$messages['blockedimages'] = '보안을 위해, 이 메시지의 외부 이미지를 차단하였습니다.';
+$messages['encryptedmessage'] = '이것은 암호화된 메시지며 표시할 수 없습니다. 죄송합니다!';
+$messages['nocontactsfound'] = '연락처를 찾을 수 없음.';
+$messages['contactnotfound'] = '요청한 연락처를 찾을 수 없었습니다.';
+$messages['contactsearchonly'] = '연락처를 찾기 위해 일부 검색용어를 입력하세요.';
+$messages['sendingfailed'] = '메시지 보내기를 실패하였음.';
+$messages['senttooquickly'] = '이 메시지를 보내기 전에 $sec초 동안 기다리세요.';
+$messages['errorsavingsent'] = '보낸 메시지를 저장하는 동안 오류가 발생했습니다.';
+$messages['errorsaving'] = '저장 중 오류가 발생했습니다.';
+$messages['errormoving'] = '메시지를 이동할 수 없었음.';
+$messages['errorcopying'] = '메시지를 복사할 수 없었음.';
+$messages['errordeleting'] = '메시지를 삭제할 수 없었음.';
+$messages['errormarking'] = '메시지를 표시할 수 없었음.';
+$messages['deletecontactconfirm']  = '정말 선택한 연락처를 삭제하시겠습니까?';
+$messages['deletegroupconfirm']  = '정말로 선택한 그룹을 삭제하시겠습니까?';
+$messages['deletemessagesconfirm'] = '정말로 선택한 메시지를 삭제하시겠습니까?';
+$messages['deletefolderconfirm']  = '정말로 이 폴더를 삭제하시겠습니까?';
+$messages['purgefolderconfirm']  = '정말로 이 폴더의 모든 메시지를 삭제하시겠습니까?';
+$messages['contactdeleting'] = '연락처 삭제 중...';
 $messages['groupdeleting'] = '그룹 삭제 중...';
-$messages['folderdeleting'] = '폴더 지우는 중...';
-$messages['foldermoving'] = '폴더 옮기는 중...';
-$messages['foldersubscribing'] = '폴더의 구독을 활성화 하는 중...';
+$messages['folderdeleting'] = '폴더를 삭제하는 중...';
+$messages['foldermoving'] = '폴더를 이동하는 중...';
+$messages['foldersubscribing'] = '폴더를 구독하는 중...';
 $messages['folderunsubscribing'] = '폴더의 구독을 취소하는 중...';
-$messages['formincomplete'] = '양식을 완전히 채우지 않았습니다';
-$messages['noemailwarning'] = '유효한 이메일 주소를 넣어주십시오';
-$messages['nonamewarning']  = '이름을 넣어주십시오';
-$messages['nopagesizewarning'] = '페이지 크기를 넣어주십시오';
-$messages['nosenderwarning'] = '발신자 이메일 주소를 넣어주십시오';
-$messages['norecipientwarning'] = '적어도 한 개 이상의 수신 주소를 넣어주십시오';
-$messages['nosubjectwarning']  = '"제목"이 없습니다. 제목을 넣으시겠습니까?';
-$messages['nobodywarning'] = '텍스트 없이 메일을 보낼까요?';
-$messages['notsentwarning'] = '메일을 보내지 않았습니다. 메일을 버리시겠습니까?';
-$messages['noldapserver'] = '검색할 LDAP 서버를 선택하세요';
-$messages['nosearchname'] = '연락처 이름이나 메일 주소를 넣으세요';
-$messages['notuploadedwarning'] = '아직 모든 첨부가 업로드되지 않았습니다. 기다리거나 업로드를 취소하기 바랍니다.';
-$messages['searchsuccessful'] = '$nr개의 메일 발견';
-$messages['contactsearchsuccessful'] = '$nr 연락처 발견됨.';
-$messages['searchnomatch'] = '검색 결과가 없습니다';
+$messages['formincomplete'] = '양식을 완전히 작성되지 않았습니다.';
+$messages['noemailwarning'] = '유효한 이메일 주소를 입력하시기 바랍니다.';
+$messages['nonamewarning']  = '이름을 입력하시기 바랍니다.';
+$messages['nopagesizewarning'] = '페이지 크기를 입력하시기 바랍니다.';
+$messages['nosenderwarning'] = '발신인 이메일 주소를 입력하시기 바랍니다.';
+$messages['norecipientwarning'] = '적어도 한 개 이상의 수신인 주소를 입력하시기 바랍니다.';
+$messages['nosubjectwarning']  = '"제목" 필드가 비어있습니다. 지금 입력하시겠습니까?';
+$messages['nobodywarning'] = '텍스트가 없는 메시지를 보내시겠습니까?';
+$messages['notsentwarning'] = '메시지를 보내지 못했습니다. 메시지를 폐기하시겠습니까?';
+$messages['noldapserver'] = '검색할 LDAP 서버를 선택하시기 바랍니다.';
+$messages['nosearchname'] = '연락처명이나 이메일 주소를 입력하시기 바랍니다.';
+$messages['notuploadedwarning'] = '아직 모든 첨부가 업로드되지 않았습니다. 기다리거나 업로드를 취소하시기 바랍니다.';
+$messages['searchsuccessful'] = '$nr개의 메시지를 찾음.';
+$messages['contactsearchsuccessful'] = '$nr개의 연락처를 찾음.';
+$messages['searchnomatch'] = '검색이 일치 항목을 찾지 못함.';
 $messages['searching'] = '검색 중...';
-$messages['checking'] = '체크 중...';
-$messages['nospellerrors'] = '스펠링 에러가 없습니다';
-$messages['folderdeleted'] = '폴더를 성공적으로 삭제하였습니다';
-$messages['foldersubscribed'] = '폴더가 성공적으로 구독 됨.';
-$messages['folderunsubscribed'] = '폴더가 성공적으로 구독 취소 됨.';
-$messages['folderpurged'] = '폴더가 성공적으로 비워졌습니다.';
-$messages['folderexpunged'] = '폴더가 성공적으로 압축 되었습니다.';
-$messages['deletedsuccessfully'] = '성공적으로 삭제하였습니다';
-$messages['converting'] = '메일의 포맷을 지우는 중...';
-$messages['messageopenerror'] = '서버에서 메일을 가져올 수 없습니다';
-$messages['fileuploaderror'] = '파일 업로드 실패';
-$messages['filesizeerror'] = '올린 파일이 $size의 최대 크기를 초과했습니다';
-$messages['copysuccess'] = '$nr개의 주소를 성공적으로 복사했습니다';
-$messages['copyerror'] = '주소를 복사할 수 없습니다';
-$messages['sourceisreadonly'] = '이 주소 소스는 읽기 전용입니다';
-$messages['errorsavingcontact'] = '연락처 주소를 저장할 수 없습니다';
-$messages['movingmessage'] = '메시지 이동 중...';
-$messages['copyingmessage'] = '메시지(들) 복사 중...';
-$messages['copyingcontact'] = '연락처(들) 복사 중...';
-$messages['deletingmessage'] = '메시지(들) 삭제 중...';
-$messages['markingmessage'] = '메시지(들)에 표시 중...';
-$messages['addingmember'] = '그룹에 연락처(들)을 추가 중...';
-$messages['removingmember'] = '그룹으로 부터 연락처를 삭제 중...';
-$messages['receiptsent'] = '메일 읽음 확인을 보냈습니다';
-$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없습니다';
+$messages['checking'] = '확인 중...';
+$messages['nospellerrors'] = '맞춤법 오류를 찾지 못함.';
+$messages['folderdeleted'] = '폴더를 성공적으로 삭제함.';
+$messages['foldersubscribed'] = '폴더를 성공적으로 구독함.';
+$messages['folderunsubscribed'] = '폴더를 성공적으로 구독 취소함.';
+$messages['folderpurged'] = '폴더를 성공적으로 비웠습니다.';
+$messages['folderexpunged'] = '폴더를 성공적으로 압축하였습니다.';
+$messages['deletedsuccessfully'] = '성공적으로 삭제함.';
+$messages['converting'] = '서식 설정 삭제 중...';
+$messages['messageopenerror'] = '서버에서 메시지를 불러올 수 없음.';
+$messages['fileuploaderror'] = '파일 업로드를 실패함.';
+$messages['filesizeerror'] = '업로드된 파일이 최대 크기인 $size를 초과하였습니다.';
+$messages['copysuccess'] = '$nr개의 주소를 성공적으로 복사함.';
+$messages['copyerror'] = '모든 주소를 복사할 수 없음.';
+$messages['sourceisreadonly'] = '이 주소의 소스는 읽기 전용입니다.';
+$messages['errorsavingcontact'] = '연락처의 주소를 저장할 수 없음.';
+$messages['movingmessage'] = '메시지를 이동하는 중...';
+$messages['copyingmessage'] = '메시지 복사하는 중...';
+$messages['copyingcontact'] = '연락처 복사하는 중...';
+$messages['deletingmessage'] = '메시지 삭제하는 중...';
+$messages['markingmessage'] = '메시지에 표시하는 중...';
+$messages['addingmember'] = '그룹에 연락처를 추가하는 중...';
+$messages['removingmember'] = '그룹에서 연락처를 삭제하는 중...';
+$messages['receiptsent'] = '읽음 확인을 보냄.';
+$messages['errorsendingreceipt'] = '읽음 확인을 보낼 수 없음.';
 $messages['deleteidentityconfirm'] = '이 항목을 정말로 삭제 하시겠습니까?';
-$messages['nodeletelastidentity'] = '이 정보는 마지막 남은 것이므로 지울 수 없습니다';
-$messages['forbiddencharacter'] = '폴더 이름에 쓸 수 없는 문자가 포함되어 있습니다';
-$messages['selectimportfile'] = '업로드할 파일을 선택하세요';
-$messages['addresswriterror'] = '선택한 주소록은 쓸 수 없습니다';
-$messages['contactaddedtogroup'] = '이 그룹에 연락처를 성공적으로 추가 함.';
-$messages['contactremovedfromgroup'] = '이 그룹으로 부터 연락처를 성공적으로 제거 함.';
-$messages['nogroupassignmentschanged'] = '그룹 할당을 변경하지 못했습니다.';
-$messages['importwait'] = '가져오는 중, 기다리세요...';
-$messages['importformaterror'] = '가져 오기 실패! 업로드 한 파일은 가져올 수 없는 데이터 파일입니다.';
-$messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져왔고, $skipped 존재하는 항목은 건너뛰었습니다.</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>$skipped 건의 기존 항목을 건너 뜀.</ b>';
-$messages['opnotpermitted'] = '작업이 허가되지 않았습니다!';
-$messages['nofromaddress'] = '선택한 신원에 이메일 주소가 없음';
-$messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 서식이 사라집니다. 계속할까요?';
-$messages['httpreceivedencrypterror'] = '치명적인 설정 오류가 발생 되었음. 관리자에게 바로 연락을 취하세요.<b>메시지를 전송할 수 없습니다.</b>';
-$messages['smtpconnerror'] = 'SMTP 에러 ($code): 서버로의 연결이 실패 됨.';
-$messages['smtpautherror'] = 'SMTP 에러 ($code): 인증이 실패 됨.';
-$messages['smtpfromerror'] = 'SMTP 에러 ($code): 보낸 사람을 "$from"로 설정하는 것이 실패 됨 ($msg).';
-$messages['smtptoerror'] = 'SMTP 에러 ($code): 수신자 "$to"를 추가하는 데 실패 함 ($msg).';
-$messages['smtprecipientserror'] = 'SMTP 에러: 수신자 목록을 분석(parse)할 수 없음.';
-$messages['smtperror'] = 'SMTP 에러: $msg';
-$messages['emailformaterror'] = '잘못된 e-mail 주소: $email';
-$messages['toomanyrecipients'] = '수신자가 너무 많습니다. 수신자의 수를 $max로 줄이세요.';
-$messages['maxgroupmembersreached'] = '그룹 구성원의 수가 최대 인원 $max를 초과하였습니다.';
-$messages['internalerror'] = '내부 오류가 발생하였습니다. 다시 시도하기 바랍니다.';
-$messages['contactdelerror'] = '연락처(들)을 지울 수 없습니다.';
-$messages['contactdeleted'] = '연락처(들)이 성공적으로 제거 됨.';
-$messages['contactrestoreerror'] = '삭제된 연락처(들)을 복구할 수 없음.';
-$messages['contactrestored'] = '연락처(들)이 성공적으로 복구 됨.';
-$messages['groupdeleted'] = '그룹이 성공적으로 삭제 됨.';
-$messages['grouprenamed'] = '그룹명이 성공적으로 변경 됨.';
-$messages['groupcreated'] = '그룹이 성공적으로 생성 됨.';
-$messages['savedsearchdeleted'] = '저장 한 검색 정보를 삭제했습니다.';
-$messages['savedsearchdeleteerror'] = '저장 한 검색 정보를 삭제할 수 없습니다.';
-$messages['savedsearchcreated'] = '검색 정보를 만들었습니다.';
-$messages['savedsearchcreateerror'] = '검색 정보를 삭제할 수 없습니다.';
-$messages['messagedeleted'] = '메시지(들)이 성공적으로 삭제 됨.';
-$messages['messagemoved'] = '메시지(들)을 성공적으로 이동 함.';
-$messages['messagecopied'] = '메시지(들)을 성공적으로 복사 함.';
-$messages['messagemarked'] = '메시지(들)에 성공적으로 표시 함.';
-$messages['autocompletechars'] = '자동 완성을 위해서 적어도 $min 글자를 입력하세요.';
-$messages['autocompletemore'] = '많은 항목이 발견되었습니다. 더 많은 문자를 입력하세요.';
-$messages['namecannotbeempty'] = '이름이 비워져서는 안됩니다.';
+$messages['nodeletelastidentity'] = '이 신원은 마지막 하나이므로 삭제할 수 없습니다.';
+$messages['forbiddencharacter'] = '폴더명에 금지된 문자가 포함되어 있습니다.';
+$messages['selectimportfile'] = '업로드할 파일을 선택해주시기 바랍니다.';
+$messages['addresswriterror'] = '선택된 주소록은 쓰기가 불가능합니다.';
+$messages['contactaddedtogroup'] = '이 그룹에 연락처를 성공적으로 추가함.';
+$messages['contactremovedfromgroup'] = '이 그룹에서 연락처를 성공적으로 제거함.';
+$messages['nogroupassignmentschanged'] = '그룹 할당이 변경되지 않음.';
+$messages['importwait'] = '가져오는 중, 기다려주시기 바랍니다...';
+$messages['importformaterror'] = '가져오기를 실패함! 업로드된 파일은 유효하지 않은 가져오기 데이터 파일입니다.';
+$messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져옴<b>';
+$messages['importconfirmskipped'] = '<b>기존 기재사항인 $skipped을(를) 건너뜀</b>';
+$messages['opnotpermitted'] = '작업이 허가되지 않음!';
+$messages['nofromaddress'] = '선택된 신원에 이메일 주소 가 누락됨.';
+$messages['editorwarning'] = '일반 텍스트 편집기로 바꾸면 모든 텍스트 서식이 사라집니다. 계속하시겠습니까?';
+$messages['httpreceivedencrypterror'] = '치명적인 구성 오류가 발생하였습니다. 즉시 관리자에게 연락하세요.
+<b>메시지를 전송할 수 없습니다.</b>';
+$messages['smtpconnerror'] = 'SMTP 오류 ($code): 서버와의 연결을 실패함.';
+$messages['smtpautherror'] = 'SMTP 에러 ($code): 인증을 실패함.';
+$messages['smtpfromerror'] = 'SMTP 오류 ($code): 발신인을 "$from" ($msg)로 설정하는데 실패함.';
+$messages['smtptoerror'] = 'SMTP 오류 ($code): 수신인을 "$to" ($msg)에 추가하는데 실패함.';
+$messages['smtprecipientserror'] = 'SMTP 오류: 수신인 목록을 분석(parse)할 수 없음.';
+$messages['smtperror'] = 'SMTP 오류: $msg';
+$messages['emailformaterror'] = '유효하지 않은 이메일 주소: $email';
+$messages['toomanyrecipients'] = '수신인이 너무 많음. 수신인 수를 $max명으로 줄이세요.';
+$messages['maxgroupmembersreached'] = '그룹 구성원의 수가 최대 인원인 $max명을 초과합니다.';
+$messages['internalerror'] = '내부 오류가 발생함. 재시도 해주시기 바랍니다.';
+$messages['contactdelerror'] = '연락처를 삭제할 수 없음.';
+$messages['contactdeleted'] = '연락처가 성공적으로 삭제됨.';
+$messages['contactrestoreerror'] = '삭제된 연락처를 복구할 수 없음.';
+$messages['contactrestored'] = '연락처가 성공적으로 복구됨.';
+$messages['groupdeleted'] = '그룹이 성공적으로 삭제됨.';
+$messages['grouprenamed'] = '그룹명이 성공적으로 변경됨.';
+$messages['groupcreated'] = '그룹이 성공적으로 생성됨.';
+$messages['savedsearchdeleted'] = '저장된 검색이 성공적으로 삭제됨.';
+$messages['savedsearchdeleteerror'] = '저장된 정보를 삭제할 수 없었음.';
+$messages['savedsearchcreated'] = '저장된 검색이 성공적으로 생성됨.';
+$messages['savedsearchcreateerror'] = '저장된 검색을 생성할 수 없었음.';
+$messages['messagedeleted'] = '메시지가 성공적으로 삭제됨.';
+$messages['messagemoved'] = '메시지가 성공적으로 이동됨.';
+$messages['messagecopied'] = '메시지가 성공적으로 복사됨.';
+$messages['messagemarked'] = '메시지에 성공적으로 표시됨.';
+$messages['autocompletechars'] = '자동 완성을 위해서 적어도 $min개의 문자를 입력하세요.';
+$messages['autocompletemore'] = '더 많은 일치 항목이 발견됨. 더 많은 문자를 입력해주시기 바랍니다.';
+$messages['namecannotbeempty'] = '이름을 비워둘 수 없습니다.';
 $messages['nametoolong'] = '이름이 너무 깁니다.';
-$messages['folderupdated'] = '폴더를 성공적으로 갱신 함.';
-$messages['foldercreated'] = '폴더를 성공적으로 생성 함.';
-$messages['invalidimageformat'] = '올바른 이미지 포멧이 아님.';
-$messages['mispellingsfound'] = '메시지에서 맞춤법 오류를 감지 하였음.';
-$messages['parentnotwritable'] = '선택한 부모 폴더에 폴더를 생성하거나 이동할 수 없음. 접근 권한이 없음.';
-$messages['messagetoobig'] = '처리하기에 너무 큰 메시지 입니다.';
-$messages['attachmentvalidationerror'] = '경고! 이 첨부 파일은 메시지의 선언 유형과 일치하지 않기때문에 의심됩니다. 보낸 사람을 믿을 수 없다면, 악성 코드를 포함하는지도 모르기 때문에 브라우저에서 열 수 없습니다. <br/><br/><em> 예측 한 종류 : $expected; 발견 한 종류 : $found</ em>';
-$messages['noscriptwarning'] = '경고: 이 웹 메일 서비스는 Javascript가 필요합니다! 사용하려면 Javascript를 브라우저 설정에서 활성화하십시오.';
+$messages['folderupdated'] = '폴더가 성공적으로 업데이트됨.';
+$messages['foldercreated'] = '폴더가 성공적으로 생성됨.';
+$messages['invalidimageformat'] = '유효한 이미지 형식이 아님.';
+$messages['mispellingsfound'] = '메시지에서 맞춤법 오류가 감지되었음.';
+$messages['parentnotwritable'] = '선택한 상위 폴더에 폴더를 생성/이동할 수 없음. 접근 권한이 없음.';
+$messages['messagetoobig'] = '메시지 부분이 처리하기에는 너무 큽니다.';
+$messages['attachmentvalidationerror'] = '경고! 이 첨부 파일의 유형이 메시지에서 선언된 유형과 일치하지 않기 때문에 의심됩니다. 발신인을 신뢰할 수 없을 경우, 악성 코드를 포함할 수도 있기 때문에 브라우저에서 열지 않는 것이 좋습니다. <br/><br/><em> 예상한 유형: $expected; 발견된 유형: $found</ em>';
+$messages['noscriptwarning'] = '경고: 이 웹 메일 서비스는 자바스크립트가 필요합니다! 이 기능을 사용하시려면 자바스크립트를 브라우저 설정에서 활성화하시기 바랍니다.';
 
 ?>
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index 0193484a9..a4f6cb568 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiya Karbon';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Nexwendî';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Peyameke HTML biafirîne';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Şanenava HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Panela berê nîşan bide';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index 6783209a3..9d219cbf5 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Di vê peyamdankê de tu peyam nehat dîtin';
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 2a161824f..6398a3683 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopijuoti';
 $labels['move']     = 'Perkelti';
 $labels['moveto']   = 'Perkelti į…';
 $labels['download'] = 'Parsisiųsti';
+$labels['open']     = 'Atverti';
 $labels['showattachment'] = 'Rodyti';
 $labels['showanyway'] = 'Vistiek rodyti';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'matomus šiame puslapyje';
 $labels['unread'] = 'neskaitytus';
 $labels['flagged'] = 'su gairele';
 $labels['unanswered'] = 'neatsakytus';
+$labels['withattachment'] = 'Su priedu';
 $labels['deleted'] = 'pašalintus';
 $labels['undeleted'] = 'Neištrintas';
 $labels['invert'] = 'invertuoti';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Sparčioji paieška';
 $labels['resetsearch']  = 'Atšaukti paiešką';
 $labels['searchmod']  = 'Paieškos modifikatoriai';
 $labels['msgtext']  = 'Visas laiškas';
-$labels['body']  = 'Body';
+$labels['body']  = 'Laiško tekstas';
 
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
+$labels['changeformattext'] = 'Rodyti grynojo teksto formatu';
+$labels['changeformathtml'] = 'Rodyti HTML formatu';
 
 // message compose
 $labels['editasnew']      = 'Redaguoti kaip naują';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Rašyti laišką';
 $labels['contactsfromto'] = 'Adresatai nuo $from iki $to iš $count';
 $labels['print']          = 'Spausdinti';
 $labels['export']         = 'Eksportuoti';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Eksportuoti visus';
+$labels['exportsel']      = 'Eksportuoti pažymėtus';
 $labels['exportvcards']   = 'Eksportuoti adresatus  „vCard“ formatu';
 $labels['newcontactgroup'] = 'Kurti adresatų grupę';
 $labels['grouprename']    = 'Pervardinti grupę';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Laiškus kurti HTML formatu';
 $labels['htmlonreply'] = 'tik atsakymus į HTML formato laiškus';
 $labels['htmlonreplyandforward'] = 'atsakant į HTML laišką arba jį persiunčiant';
 $labels['htmlsignature'] = 'HTML parašas';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Rodyti laiško peržiūros polangį';
 $labels['skin'] = 'Grafinis apvalkalas';
 $labels['logoutclear'] = 'Išvalyti Šiukšlinę atsijungiant';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Pašalinti cituojamame laiške esantį paraš
 $labels['autoaddsignature'] = 'Automatiškai pridėti parašą';
 $labels['newmessageonly'] = 'tik naujuose laiškuose';
 $labels['replyandforwardonly'] = 'tik atsakymuose ir persiunčiamuose laiškuose';
-$labels['replysignaturepos'] = 'Atsakant ir persiunčiant laiškus, parašą pridėti';
-$labels['belowquote'] = 'po citata';
-$labels['abovequote'] = 'virš citatos';
 $labels['insertsignature'] = 'Pridėti parašą';
 $labels['previewpanemarkread']  = 'Peržiūros polangyje parodytus laiškus žymėti skaitytais';
 $labels['afternseconds']  = 'praėjus $n sek.';
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index 6a8e00239..df19c291b 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Duomenų bazės klaida!';
 $messages['requesttimedout'] = 'Baigėsi užklausai skirtas laikas';
 $messages['errorreadonly'] = 'Nepavyko atlikti veiksmo – aplankas prieinamas tik skaitymui.';
 $messages['errornoperm'] = 'Nepavyko atlikti veiksmo – nepakanka teisių.';
+$messages['erroroverquota'] = 'Nepavyko atlikti veiksmo. Diske trūksta laisvos vietos.';
+$messages['erroroverquotadelete'] = 'Diske trūksta laisvos vietos. Laiškui pašalinti naudokite Lyg2+Šal (Shift+Del) klavišų kombinaciją.';
 $messages['invalidrequest'] = 'Netinkama užklausa! Duomenys neišsaugoti.';
 $messages['invalidhost'] = 'Negalimas serverio vardas.';
 $messages['nomessagesfound'] = 'Šioje pašto dėžutėje laiškų nėra.';
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 5e47b1a29..7d4de2564 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopēt';
 $labels['move']     = 'Pārvietot';
 $labels['moveto']   = 'pārvietot uz...';
 $labels['download'] = 'lejupielādēt';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pašreizējā lapa';
 $labels['unread'] = 'nelasītās';
 $labels['flagged'] = 'iezīmētās';
 $labels['unanswered'] = 'neatbildētās';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'dzēstās';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'invertēt';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'rediģēt kā jaunu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Rakstīt HTML vēstules';
 $labels['htmlonreply'] = 'tikai atbildot uz HTML formatētām vēstulēm';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML paraksts';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Rādīt priekšskatījuma paneli';
 $labels['skin'] = 'Interfeisa izskats';
 $labels['logoutclear'] = 'Izejot no sistēmas, iztīrīt miskasti';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Atbildot izņemt oriģinālo parakstu no vēs
 $labels['autoaddsignature'] = 'Automātiski pievienot parakstu';
 $labels['newmessageonly'] = 'tikai jaunas vēstules';
 $labels['replyandforwardonly'] = 'tikai atbildes un pārsūtījumi';
-$labels['replysignaturepos'] = 'Atbildot vai pārsūtot ievietot parakstu';
-$labels['belowquote'] = 'zem citāta';
-$labels['abovequote'] = 'virs citāta';
 $labels['insertsignature'] = 'Ievietot parakstu';
 $labels['previewpanemarkread']  = 'Atzīmēt priekšskatītās vēstules kā lasītas';
 $labels['afternseconds']  = 'pēc $n sekundēm';
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index d65976fa2..b69a73e2b 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -17,87 +17,89 @@
 */
 
 $messages = array();
-$messages['errortitle']  = 'An error occurred!';
-$messages['loginfailed']  = 'Neizdevās pieslēgties';
+$messages['errortitle']  = 'Radās kļūda!';
+$messages['loginfailed']  = 'Pieslēgties neizdevās';
 $messages['cookiesdisabled'] = 'Jūsu pārlūkprogramma neatbalsta sīkdatnes (cookies)';
-$messages['sessionerror'] = 'Jūsu sessija ir beigusies';
+$messages['sessionerror'] = 'Jūsu sessija ir beigusies.';
 $messages['storageerror'] = 'Neizdevās pieslēgties IMAP serverim';
-$messages['servererror'] = 'Servera kļūme.';
+$messages['servererror'] = 'Servera kļūda!';
 $messages['servererrormsg'] = 'Servera kļūda: $msg';
 $messages['dberror'] = 'Datubāzes kļūda!';
-$messages['requesttimedout'] = 'Request timed out';
-$messages['errorreadonly'] = 'Neizdevās veikt darbību: Mape ir tikai lasāma (read only).';
-$messages['errornoperm'] = 'Neizdevās veikt darbību: Piekļuve liegta.';
-$messages['invalidrequest'] = 'Nederīgs pieprasījums. Dati netika saglabāti.';
-$messages['invalidhost'] = 'Invalid server name.';
+$messages['requesttimedout'] = 'Pieprasījumam iestājās noilgums';
+$messages['errorreadonly'] = 'Neizdevās veikt darbību: mape ir tikai lasāma (read only)';
+$messages['errornoperm'] = 'Neizdevās veikt darbību: piekļuve liegta';
+$messages['erroroverquota'] = 'Operāciju nav iespējams veikt. Uz diska nav brīvas veitas.';
+$messages['erroroverquotadelete'] = 'Uz diska nav brīvas vietas. Lai dzēstu vēstuli, lietojiet SHIFT+DEL.';
+$messages['invalidrequest'] = 'Nederīgs pieprasījums! Dati netika saglabāti ...';
+$messages['invalidhost'] = 'Nederīgs servera nosaukums';
 $messages['nomessagesfound'] = 'Šajā pastkastē nav vēstuļu';
-$messages['loggedout'] = 'Jūs esat veiksmīgi atslēdzies no sistēmas';
-$messages['mailboxempty'] = 'Pastkaste tukša';
-$messages['refreshing'] = 'Refreshing...';
+$messages['loggedout'] = 'Jūs esat veiksmīgi atslēdzies no sistēmas. Uz redzēšanos!';
+$messages['mailboxempty'] = 'Pastkaste ir tukša';
+$messages['refreshing'] = 'Atjauno...';
 $messages['loading'] = 'Notiek ielāde...';
-$messages['uploading'] = 'Notiek faila augšupielāde...';
+$messages['uploading'] = 'Augšupielāde failu...';
 $messages['uploadingmany'] = 'Augšupielādē failus...';
-$messages['loadingdata'] = 'Tiek ielādēti dati...';
-$messages['checkingmail'] = 'Notiek pasta pārbaude...';
-$messages['sendingmessage'] = 'Tiek sūtīta vēstule...';
+$messages['loadingdata'] = 'Ielādē datus...';
+$messages['checkingmail'] = 'Notiek pasta pārbaude ...';
+$messages['sendingmessage'] = 'Tiek sūtīta vēstule ...';
 $messages['messagesent'] = 'Vēstule nosūtīta veiksmīgi';
-$messages['savingmessage'] = 'Vēstule tiek saglabāta...';
-$messages['messagesaved'] = 'Vēstule saglabāta pie uzmetumiem';
-$messages['successfullysaved'] = 'Iestatījumi veiksmīgi saglabāti';
-$messages['addedsuccessfully'] = 'Ieraksts veiksmīgi pievienots adrešu grāmatai';
-$messages['contactexists'] = 'Ieraksts ar šādu e-pasta adresi jau eksistē';
+$messages['savingmessage'] = 'Vēstule tiek saglabāta ...';
+$messages['messagesaved'] = 'Vēstule saglabāta Uzmetumos';
+$messages['successfullysaved'] = 'Vēstule veiksmīgi saglabāta';
+$messages['addedsuccessfully'] = 'Kontakts veiksmīgi pievienots adrešu grāmatai';
+$messages['contactexists'] = 'Kontakts ar šādu e-pasta adresi jau eksistē';
 $messages['contactnameexists'] = 'Kontakts ar šādu vārdu jau eksistē.';
-$messages['blockedimages'] = 'Drošības nolūkos attēli, kas tiek ielādēti no cita servera, šajā vēstulē ir bloķēti';
-$messages['encryptedmessage'] = 'Šī ir šifrēta vēstule un diemžēl nevar tikt parādīta';
-$messages['nocontactsfound'] = 'Ieraksti netika atrasti';
-$messages['contactnotfound'] = 'Prasītais kontakts nav atrasts';
-$messages['contactsearchonly'] = 'Ievadiet meklēšanas kritērijus, lai atrastu kontaktus';
+$messages['blockedimages'] = 'Drošības nolūkos attēli, kuri tiek ielādēti no cita servera, šajā vēstulē ir bloķēti';
+$messages['encryptedmessage'] = 'Atvainojiet - šī ir šifrēta vēstule un diemžēl nevar tikt parādīta ...';
+$messages['nocontactsfound'] = 'Kontakti netika atrasti';
+$messages['contactnotfound'] = 'Pieprasītais kontakts nav atrasts';
+$messages['contactsearchonly'] = 'Lai atrastu kontaktus, ievadiet meklēšanas kritērijus';
 $messages['sendingfailed'] = 'Vēstule netika nosūtīta';
 $messages['senttooquickly'] = 'Lūdzu uzgaidiet $sec sekundi(-es) pirms sūtiet šo vēstuli';
-$messages['errorsavingsent'] = 'Notika kļūda saglabājot nosūtīto vēstuli';
-$messages['errorsaving'] = 'Saglabājot vēstuli notikusi kļūme, vēstule netika saglabāta';
-$messages['errormoving'] = 'Vēstule netika pārvietota';
-$messages['errorcopying'] = 'Neizdevās pārkopēt vēstules.';
-$messages['errordeleting'] = 'Vēstule netika dzēsta';
-$messages['errormarking'] = 'Nebija iespējams iezīmēt vēstuli';
-$messages['deletecontactconfirm']  = 'Vai tiešām vēlaties dzēst iezīmēto(ās) kontaktpersonas?';
+$messages['errorsavingsent'] = 'Saglabājot vēstuli notika kļūda - vēstule netika saglabāta';
+$messages['errorsaving'] = 'Saglabājot notika kļūda';
+$messages['errormoving'] = 'Vēstule(s) netika pārvietota(s)';
+$messages['errorcopying'] = 'Vēstules pārkopēt neizdevās';
+$messages['errordeleting'] = 'Vēstules izdzēst neizdevās';
+$messages['errormarking'] = 'Iezīmēt vēstules nebija iespējams';
+$messages['deletecontactconfirm']  = 'Vai tiešām vēlaties dzēst iezīmētās kontaktpersonas?';
 $messages['deletegroupconfirm']  = 'Vai tiešām vēlaties dzēst atzīmēto grupu?';
-$messages['deletemessagesconfirm'] = 'Vai tiešām vēlaties dzēst iezīmēto(ās) vēstules?';
+$messages['deletemessagesconfirm'] = 'Vai tiešām vēlaties dzēst iezīmētās vēstules?';
 $messages['deletefolderconfirm']  = 'Vai tiešām vēlaties dzēst šo mapi?';
-$messages['purgefolderconfirm']  = 'Vai tiešām vēlaties dzēst visas vēstules, kas atrodas šajā mapē?';
-$messages['contactdeleting'] = 'Kontakts(-i) tiek dzēsti...';
+$messages['purgefolderconfirm']  = 'Vai tiešām vēlaties dzēst visas vēstules, kuras atrodas šajā mapē?';
+$messages['contactdeleting'] = 'Dzēš kontaktus...';
 $messages['groupdeleting'] = 'Dzēš grupu...';
 $messages['folderdeleting'] = 'Dzēš mapi...';
-$messages['foldermoving'] = 'Pārvietoju mapi...';
+$messages['foldermoving'] = 'Pārvieto mapi...';
 $messages['foldersubscribing'] = 'Pieslēdz mapi...';
 $messages['folderunsubscribing'] = 'Atslēdz mapi...';
-$messages['formincomplete'] = 'Formulārs nav pilnībā aizpildīts';
-$messages['noemailwarning'] = 'Lūdzu ievadiet pareizu e-pasta adresi';
+$messages['formincomplete'] = 'Forma nav pilnībā aizpildīta';
+$messages['noemailwarning'] = 'Lūdzu ievadiet korektu e-pasta adresi';
 $messages['nonamewarning']  = 'Lūdzu ievadiet vārdu';
 $messages['nopagesizewarning'] = 'Lūdzu ievadiet lapas izmēru';
-$messages['nosenderwarning'] = 'Lūdzu ievadiet saņēmēja e-pasta adresi';
+$messages['nosenderwarning'] = 'Lūdzu ievadiet sūtītāja e-pasta adresi';
 $messages['norecipientwarning'] = 'Lūdzu ievadiet vismaz vienu saņēmēju';
 $messages['nosubjectwarning']  = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
-$messages['nobodywarning'] = 'Sūtīt vēstuli bez satura teksta?';
-$messages['notsentwarning'] = 'Vēstule netika nosūtīta. Vai tiešām vēlaties atcelt vēstules rakstīsanu?';
-$messages['noldapserver'] = 'Lūdzu izvēlaties LDAP serveri';
+$messages['nobodywarning'] = 'Sūtīt vēstuli bez teksta?';
+$messages['notsentwarning'] = 'Vēstule netika nosūtīta. Vai tiešām vēlaties atcelt vēstules rakstīšanu?';
+$messages['noldapserver'] = 'Lai meklētu, lūdzu izvēlaties LDAP serveri';
 $messages['nosearchname'] = 'Lūdzu ievadiet kontaktpersonas vārdu vai e-pasta adresi';
-$messages['notuploadedwarning'] = 'Visi pielikumi vēl nav augšupielādēti. Lūdzu uzgaidiet vai atceļiet augšupielādi!';
+$messages['notuploadedwarning'] = 'Visi pielikumi vēl nav augšupielādēti - lūdzu uzgaidiet vai atceļiet augšupielādi';
 $messages['searchsuccessful'] = 'Atrastas $nr vēstules';
-$messages['contactsearchsuccessful'] = 'Atrasti $nr kontakti.';
-$messages['searchnomatch'] = 'Meklēšanā nekas netika atrasts';
-$messages['searching'] = 'Notiek meklēšana...';
-$messages['checking'] = 'Notiek pārbaude...';
-$messages['nospellerrors'] = 'Netika atrastas pareizrakstības kļudas';
+$messages['contactsearchsuccessful'] = 'Atrasti $nr kontakti';
+$messages['searchnomatch'] = 'Meklējot nekas netika atrasts';
+$messages['searching'] = 'Meklē...';
+$messages['checking'] = 'Pārbauda...';
+$messages['nospellerrors'] = 'Pareizrakstības kļūdas netika atrastas';
 $messages['folderdeleted'] = 'Mape veiksmīgi izdzēsta';
 $messages['foldersubscribed'] = 'Mape veiksmīgi pieslēgta.';
 $messages['folderunsubscribed'] = 'Mape veiksmīgi atslēgta.';
 $messages['folderpurged'] = 'Mape tika veiksmīgi iztukšota.';
-$messages['folderexpunged'] = 'Mape tika veiksmīgi saspiesta.';
+$messages['folderexpunged'] = 'Mape saspiesta veiksmīgi';
 $messages['deletedsuccessfully'] = 'Veiksmīgi izdzēsts';
-$messages['converting'] = 'Tiek novākts vēstules formatējums...';
+$messages['converting'] = 'Tiek noņemts vēstules formatējums...';
 $messages['messageopenerror'] = 'Nevarēja ielādēt vēstuli no servera';
-$messages['fileuploaderror'] = 'Neizdevās ielādēt failu';
+$messages['fileuploaderror'] = 'Faila augšupielāde neveiksmīga';
 $messages['filesizeerror'] = 'Ielādētais fails pārsniedz pieļaujamo $size apjomu';
 $messages['copysuccess'] = 'Veiksmīgi nokopētas $nr vēstules';
 $messages['copyerror'] = 'Nevarēja nokopēt nevienu adresi';
@@ -119,9 +121,9 @@ $messages['selectimportfile'] = 'Lūdzu izvēlieties failu, ko vēlaties augšup
 $messages['addresswriterror'] = 'Izvēlētās adrešu grāmatas datus nevar labot';
 $messages['contactaddedtogroup'] = 'Kontakti tika veiksmīgi pievienoti šai grupai.';
 $messages['contactremovedfromgroup'] = 'Kontakti tika veiksmīgi atvienoti no šīs grupas.';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Grupā nekas netika mainīts.';
 $messages['importwait'] = 'Importēju, lūdzu uzgaidiet...';
-$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importformaterror'] = 'Imports neizdevās! Augšupielādētais fails nav derīgs importam.';
 $messages['importconfirm'] = '<b>Veiksmīgi ieimportēti $inserted kontakti, netika importēti $skipped esoši ieraksti</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Izlaida $skipped jau eksistējošus ierakstus</b>';
 $messages['opnotpermitted'] = 'Darbība nav atļauta!';
@@ -163,7 +165,7 @@ $messages['invalidimageformat'] = 'Nederīgs attēla formāts.';
 $messages['mispellingsfound'] = 'Vēstulē atrastas pareizrakstības kļūdas.';
 $messages['parentnotwritable'] = 'Neizdevās izveidot/pārvietot mapi uz atzīmēto virsmapi. Nav piekļuves tiesību.';
 $messages['messagetoobig'] = 'Vēstule ir pārāk liela, lai to varētu apstrādāt.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
-$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
+$messages['attachmentvalidationerror'] = 'BRĪDINĀJUMS! Šis pielikums ir aizdomīgs, jo tā tips neatbilst tipam, kurš ir uzrādīts e-pasta ziņojumā. Ja jūs neuzticaties sūtītājam, šo failu Jums vaļā vērt nevajadzētu, jo tas var saturēt ļaunprātīgu saturu. <br/><br/><em>Būtu jābūt: $expected; Bet ir: $detected</em>';
+$messages['noscriptwarning'] = 'Uzmanību: lai lasītu e-pastus, Jūsu tīmekļa pārlūkā jābūt iespējotiem JavaScript.';
 
 ?>
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 247cc334d..bb9606e6a 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копирај';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Премести во...';
 $labels['download'] = 'Преземи';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Избришано';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Обратно';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Уреди како ново';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Пиши HTML порака';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML потпис';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи прозорец за преглед';
 $labels['skin'] = 'Модел на изгледот';
 $labels['logoutclear'] = 'Исчисти ја Кантата при излез';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'При одговарање отстрани
 $labels['autoaddsignature'] = 'Автоматски додавај потпис';
 $labels['newmessageonly'] = 'само нови писма';
 $labels['replyandforwardonly'] = 'само одгорови и препраќања';
-$labels['replysignaturepos'] = 'При одговарање или препраќање стави потпис';
-$labels['belowquote'] = 'под цитираното';
-$labels['abovequote'] = 'над цитираното';
 $labels['insertsignature'] = 'Вметни потпис';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index c14370b14..f7a8d9a12 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Неважечко барање! Податоците не се зачувани.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Немате писма во ова сандаче';
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 5644f1599..ed0e7402a 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'പകര്‍ത്തുക';
 $labels['move']     = 'നീക്കുക';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'ഡൗണ്‍ലോഡ്';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'നിലവിലുളള പേജ്';
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'മായ്ച്ചവ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'തലതിരിക്കുക';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'പുതിയതായി തിരുത്തുക';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML സന്ദേശങ്ങള്‍ രചിക�
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'പുതിയ സന്ദേശം മാത്രം';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'ഉദ്ധാരണത്തിനു താഴെ';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index 85dc43d77..28eb22be2 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'പ്രവര്‍ത്തനം തടസപ്പെട്ടു . അനുമതി നിഷേധിക്കപെട്ടിരിക്കുന്നു';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'അസാധുവായ അപേക്ഷ ! ഒരു രേഖയും സൂക്ഷിച്ചിട്ടില്ല';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 1a02a7e2d..02b129e0b 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'नक्‍कल';
 $labels['move']     = 'हलवा';
 $labels['moveto']   = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'सध्‍याचे पान';
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'नवीन आहे असा संपादित करा';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'एच टी एम एल संदेश तया�
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'एच टी एम एल सही';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'प्रक्रियापूर्व तावदान दाखवा';
 $labels['skin'] = 'दृष्य गोष्टी';
 $labels['logoutclear'] = 'खात्यातून बाहेर पडतांना कचरा पेटी साफ करा';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'उत्‍तर देताना मु�
 $labels['autoaddsignature'] = 'आपोआप सही करा';
 $labels['newmessageonly'] = 'फक्‍त नवीन संदेश';
 $labels['replyandforwardonly'] = 'फक्‍त उत्‍तरे आ‍णी पुढे पाठवलेले संदेश';
-$labels['replysignaturepos'] = 'उत्‍तर देताना किंवा पुढे पाठवताना सही करा';
-$labels['belowquote'] = 'उतारया खाली';
-$labels['abovequote'] = 'उतारयाच्‍या वर';
 $labels['insertsignature'] = 'सही मध्‍ये टाका';
 $labels['previewpanemarkread']  = 'प्रदर्शित संदेश पाहीले अशी खुण करा';
 $labels['afternseconds']  = '$n क्षणानंतर';
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 98edd7efd..bc4097fb5 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'माहितीसाठा चूक !';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'कृती करण्यास असमर्थ, फोल्डर फक्त बघण्यासाठी';
 $messages['errornoperm'] = 'कृती करण्यास असमर्थ, परवानगी अमान्य';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'अवैध विनंती! माहिती साठवलेली नाही.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'या खात्यामधे कोणताही संदेश आलेला नाही';
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index ada834483..318af05ad 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Salin';
 $labels['move']     = 'Alih';
 $labels['moveto']   = 'Alih ke...';
 $labels['download'] = 'Muat Turun';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Muka terkini';
 $labels['unread'] = 'Belum dibaca';
 $labels['flagged'] = 'Ditanda';
 $labels['unanswered'] = 'Belum dijawab';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Telah dipadam';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Ubah seperti baharu';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Karang mesej HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Tandatangan HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Pamer ruang previu';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Kosongkan Tong sampah ketika keluar';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 0cddd6749..72d2e3075 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Tiada mesej dijumpai dalam kotak mel ini';
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 4c7a307d0..cba58dc9c 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til...';
 $labels['download'] = 'last ned';
+$labels['open']     = 'Åpen';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Gjeldende side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagget';
 $labels['unanswered'] = 'Ubesvarte';
+$labels['withattachment'] = 'Med vedlegg';
 $labels['deleted'] = 'Slettet';
 $labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Meldingstekst';
 
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
+$labels['changeformattext'] = 'Vis i ren tekst';
+$labels['changeformathtml'] = 'Vis i HTML';
 
 // message compose
 $labels['editasnew']      = 'Rediger som ny';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Bruk HTML-editor';
 $labels['htmlonreply'] = 'ved svar på HTML-melding';
 $labels['htmlonreplyandforward'] = 'ved videresending av eller svar på HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Vis e-postadresse sammen med visningsnavn';
 $labels['previewpane'] = 'Forhåndsvisning';
 $labels['skin'] = 'Utseende';
 $labels['logoutclear'] = 'Tøm søppel ved utlogging';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Fjern orginalsignaturen i svar på melding';
 $labels['autoaddsignature'] = 'Legg til signatur';
 $labels['newmessageonly'] = 'kun på nye meldinger';
 $labels['replyandforwardonly'] = 'kun i svar og videresendinger';
-$labels['replysignaturepos'] = 'Plassering av signatur ved svar eller videresending';
-$labels['belowquote'] = 'over sitert melding';
-$labels['abovequote'] = 'under sitert melding';
 $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread']  = 'Merk forhåndsviste meldinger som lest';
 $labels['afternseconds']  = 'etter $n sekunder';
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 939d1da76..7785f474a 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databasefeil!';
 $messages['requesttimedout'] = 'Forespørselen har fått et tidsavbrudd';
 $messages['errorreadonly'] = 'Kunne ikke utføre handlingen. Mappen kan kun leses.';
 $messages['errornoperm'] = 'Kan ikke utføre operasjon. Nektet tilgang.';
+$messages['erroroverquota'] = 'Kunne ikke utføre handlingen, tomt for diskplass.';
+$messages['erroroverquotadelete'] = 'Ingen ledig plass på disk. Bruk SHIFT+DEL for å slette en melding.';
 $messages['invalidrequest'] = 'Ugyldig forespørsel! Ingen data ble lagret.';
 $messages['invalidhost'] = 'Ugyldig servernavn.';
 $messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne mappen';
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index 4b62e942b..29d43ef9c 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'प्रतिलिपि गर्नुहोस्';
 $labels['move']     = 'सार्नुहोस';
 $labels['moveto']   = 'यहाँ सार्नुहोस';
 $labels['download'] = 'डाऊनलोड';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'नपढिएका |';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ऐच-टी-ऐम-एल (HTML) मेल लखन
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ऐच-टी-ऐम-एल (HTML) हस्ताक्षर';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'पूर्व दृष्य देखाउनुहोस';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index 0c764ba8a..c5214bb0f 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'यो मेलबक्स मा कुनै मेल छैन';
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index fd74ce4f1..eb44eefc0 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopieer';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Weergeven';
 $labels['showanyway'] = 'Toch weergeven';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Geselecteerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML berichten opmaken';
 $labels['htmlonreply'] = 'enkel bij beantwoorden van een HTML bericht';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML handtekening';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Opmaakprofiel';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Verwijder handtekening uit het origneel bij b
 $labels['autoaddsignature'] = 'Handtekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij beantwoorden en doorsturen';
-$labels['replysignaturepos'] = 'Ondertekening plaatsen bij beantwoorden of doorsturen';
-$labels['belowquote'] = 'onder het citaat';
-$labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Handtekening invoegen';
 $labels['previewpanemarkread']  = 'Markeer voorbeeldbericht als gelezen';
 $labels['afternseconds']  = 'Na $n seconden';
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index 7e61c97c8..d87329dc3 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Fout!';
 $messages['requesttimedout'] = 'Aanvraag verlopen';
 $messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige server.';
 $messages['nomessagesfound'] = 'Er zijn geen berichten in deze map...';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index abe96a90f..7bd48bd4a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiëren';
 $labels['move']     = 'Verplaats';
 $labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Openen';
 $labels['showattachment'] = 'Toon';
 $labels['showanyway'] = 'Laat toch zien';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
 $labels['flagged'] = 'Gemarkeerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'Met bijlage';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
@@ -204,6 +206,8 @@ $labels['body']  = 'Inhoud';
 
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
+$labels['changeformattext'] = 'Weergeven als platte tekst';
+$labels['changeformathtml'] = 'Weergeven als opgemaakte tekst (HTML)';
 
 // message compose
 $labels['editasnew']      = 'Als nieuw bewerken';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Berichten opstellen in HTML-opmaak';
 $labels['htmlonreply'] = 'alleen bij beantwoorden van HTML-berichten';
 $labels['htmlonreplyandforward'] = 'bij doorsturen of beantwoorden van een HTML-bericht';
 $labels['htmlsignature'] = 'HTML-ondertekening';
+$labels['showemail'] = 'Toon e-mailadressen met weergavenaam';
 $labels['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Interfacestijl';
 $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Verwijder oorspronkelijke ondertekening van b
 $labels['autoaddsignature'] = 'Ondertekening automatisch toevoegen';
 $labels['newmessageonly'] = 'alleen bij nieuwe berichten';
 $labels['replyandforwardonly'] = 'alleen bij antwoorden en doorsturen';
-$labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorsturen';
-$labels['belowquote'] = 'onder het citaat';
-$labels['abovequote'] = 'boven het citaat';
 $labels['insertsignature'] = 'Ondertekening invoegen';
 $labels['previewpanemarkread']  = 'Markeer voorbeeldberichten als gelezen';
 $labels['afternseconds']  = 'na $n seconden';
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index 05a362104..4a67e1590 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -25,9 +25,11 @@ $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
-$messages['requesttimedout'] = 'Wachttijd verzoek overschreden';
+$messages['requesttimedout'] = 'Verzoek duurde te lang';
 $messages['errorreadonly'] = 'De bewerking kan niet uitgevoerd worden. Map is alleen-lezen.';
 $messages['errornoperm'] = 'Niet in staat om de bewerking uit te voeren. Toestemming geweigerd.';
+$messages['erroroverquota'] = 'Niet in staat om de bewerking uit te voeren. Onvoldoende vrije opslagruimte.';
+$messages['erroroverquotadelete'] = 'Onvoldoende vrije opslagruimte. Gebruik Shift+Del om een bericht te verwijderen.';
 $messages['invalidrequest'] = 'Ongeldige aanvraag! Er zijn geen gegevens opgeslagen.';
 $messages['invalidhost'] = 'Ongeldige servernaam.';
 $messages['nomessagesfound'] = 'Geen berichten gevonden in deze mailbox.';
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index e67f758e5..d1a1c5700 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopier';
 $labels['move']     = 'Flytt';
 $labels['moveto']   = 'flytt til …';
 $labels['download'] = 'Last ned';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Gjeldande side';
 $labels['unread'] = 'Uleste';
 $labels['flagged'] = 'Flagga';
 $labels['unanswered'] = 'Ikkje svara';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Sletta';
 $labels['undeleted'] = 'Ikkje sletta';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Meldingstekst';
 
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Rediger som ny';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Lag HTML-meldingar';
 $labels['htmlonreply'] = 'ved svar på HTML-melding';
 $labels['htmlonreplyandforward'] = 'ved vidaresending av eller svar på HTML-melding';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Vis førehandsvisningsboks';
 $labels['skin'] = 'Bunad';
 $labels['logoutclear'] = 'Fjern alt i «sletta element» ved utlogging';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Fjern den original signatur frå eposten når
 $labels['autoaddsignature'] = 'Legg signatur til automatisk';
 $labels['newmessageonly'] = 'berre på nye epostar';
 $labels['replyandforwardonly'] = 'berre på svar og vidaresending';
-$labels['replysignaturepos'] = 'Når du svarar eller sender vidare, plasser signaturen';
-$labels['belowquote'] = 'nedanfor siteringa';
-$labels['abovequote'] = 'oppanfor siteringa';
 $labels['insertsignature'] = 'Sett inn signatur';
 $labels['previewpanemarkread']  = 'Merk forehandsviste epostar som leste';
 $labels['afternseconds']  = 'etter $n sekund';
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index e82beaf93..3dce30b98 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databasefeil!';
 $messages['requesttimedout'] = 'Førespurnaden fekk tidsavbrot';
 $messages['errorreadonly'] = 'Klarte ikkje utføra handlinga. Mappa kan berre lesast.';
 $messages['errornoperm'] = 'Klarte ikkje utføra handlinga. Nekta tilgang.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Eg forstår ingen ting! Ingen data lagra.';
 $messages['invalidhost'] = 'Ugyldig tenarnamn.';
 $messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa.';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 47a00f645..426ac381e 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiuj';
 $labels['move']     = 'Przenieś';
 $labels['moveto']   = 'Przenieś do...';
 $labels['download'] = 'Pobierz';
+$labels['open']     = 'Otwórz';
 $labels['showattachment'] = 'Pokaż';
 $labels['showanyway'] = 'Pokaż';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Bieżąca strona';
 $labels['unread'] = 'Nieprzeczytane';
 $labels['flagged'] = 'Oznaczone';
 $labels['unanswered'] = 'Bez odpowiedzi';
+$labels['withattachment'] = 'Z załącznikiem';
 $labels['deleted'] = 'Usunięte';
 $labels['undeleted'] = 'Nieusunięte';
 $labels['invert'] = 'Odwróć';
@@ -204,6 +206,8 @@ $labels['body']  = 'Treść';
 
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
+$labels['changeformattext'] = 'Wyświetl w formacie tekstowym';
+$labels['changeformathtml'] = 'Wyświetl w formacie HTML';
 
 // message compose
 $labels['editasnew']      = 'Edytuj jako nową';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Twórz wiadomości HTML';
 $labels['htmlonreply'] = 'tylko w odpowiedzi na wiadomość HTML';
 $labels['htmlonreplyandforward'] = 'podczas przesyłania dalej lub odpowiedzi na wiadomość HTML';
 $labels['htmlsignature'] = 'Podpis w HTML';
+$labels['showemail'] = 'Pokazuj adres e-mail wraz z nazwą/opisem';
 $labels['previewpane'] = 'Pokaż podgląd wiadomości';
 $labels['skin'] = 'Wygląd interfejsu';
 $labels['logoutclear'] = 'Przy wylogowaniu opróżnij Kosz';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Podczas odpowiedzi usuń podpis z cytowanej t
 $labels['autoaddsignature'] = 'Automatycznie wstaw podpis';
 $labels['newmessageonly'] = 'tylko dla nowych wiadomości';
 $labels['replyandforwardonly'] = 'tylko dla przekazywania i odpowiedzi';
-$labels['replysignaturepos'] = 'Podczas odpowiedzi wstaw podpis';
-$labels['belowquote'] = 'poniżej cytowanej treści';
-$labels['abovequote'] = 'ponad cytowaną treścią';
 $labels['insertsignature'] = 'Wstaw podpis';
 $labels['previewpanemarkread']  = 'Oznacz podglądane wiadomości jako przeczytane';
 $labels['afternseconds']  = 'po $n sekundach';
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 68e33fa1b..fb7ad6c97 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Błąd bazy danych!';
 $messages['requesttimedout'] = 'Upłynął limit czasu żądania';
 $messages['errorreadonly'] = 'Nie można wykonać operacji. Folder tylko do odczytu.';
 $messages['errornoperm'] = 'Nie można wykonać operacji. Brak uprawnień.';
+$messages['erroroverquota'] = 'Nie można wykonać operacji. Brak miejsca na dysku.';
+$messages['erroroverquotadelete'] = 'Brak miejsca na dysku. Użyj SHIFT+DEL aby usunąć wiadomość.';
 $messages['invalidrequest'] = 'Błędne żądanie! Nie zapisano danych.';
 $messages['invalidhost'] = 'Błędna nazwa serwera.';
 $messages['nomessagesfound'] = 'Brak wiadomości w skrzynce.';
@@ -43,7 +45,7 @@ $messages['sendingmessage'] = 'Wysyłanie wiadomości...';
 $messages['messagesent'] = 'Wiadomość została wysłana.';
 $messages['savingmessage'] = 'Zapisywanie wiadomości...';
 $messages['messagesaved'] = 'Wiadomość została zapisana w folderze Kopie robocze.';
-$messages['successfullysaved'] = 'Zapisano.';
+$messages['successfullysaved'] = 'Zapisano pomyślnie.';
 $messages['addedsuccessfully'] = 'Kontakt został dodany.';
 $messages['contactexists'] = 'Kontakt o podanym adresie e-mail już istnieje!';
 $messages['contactnameexists'] = 'Kontakt z podaną nazwą już istnieje!';
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 93943947a..262e3d490 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'لمېسل';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'ايچ ټي‌ام ايل استوزي وليکه';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ايچ ټي ام ايل لاسليک';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'پخوانی چوکاټ وښييه';
 $labels['skin'] = 'انټرفيس بڼه';
 $labels['logoutclear'] = 'کثافت داني د وتنې په وخت کې پاکه کړه';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index c133b8c0e..d3a8483ee 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ليکبکس کې هېڅ استوزي ونه مونده';
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 1d28088a3..9a1946eee 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'Mover para...';
 $labels['download'] = 'Baixar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Exibir';
 $labels['showanyway'] = 'Exibir mesmo assim';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Página atual';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Marcadas';
 $labels['unanswered'] = 'Não respondidas';
+$labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Excluídas';
 $labels['undeleted'] = 'Não excluídas';
 $labels['invert'] = 'Inverter';
@@ -204,6 +206,8 @@ $labels['body']  = 'Conteúdo';
 
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
+$labels['changeformattext'] = 'Exibir em formato de texto simples';
+$labels['changeformathtml'] = 'Exibir com formatação HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como novo';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Criar mensagens em HTML';
 $labels['htmlonreply'] = 'em resposta à mensagem em HTML somente';
 $labels['htmlonreplyandforward'] = 'em resposta ou encaminhamento de mensagem em HTML';
 $labels['htmlsignature'] = 'Assinatura em HTML';
+$labels['showemail'] = 'Exibir o endereço de email junto ao nome de exibição';
 $labels['previewpane'] = 'Exibir pré-visualização';
 $labels['skin'] = 'Aparência da interface (tema)';
 $labels['logoutclear'] = 'Esvaziar a Lixeira ao sair';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Remover assinatura original da mensagem ao re
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
 $labels['newmessageonly'] = 'somente em novas mensagens';
 $labels['replyandforwardonly'] = 'somente em respostas e encaminhamentos';
-$labels['replysignaturepos'] = 'Inserir assinatura ao responder ou encaminhar';
-$labels['belowquote'] = 'abaixo da citação';
-$labels['abovequote'] = 'acima da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
 $labels['previewpanemarkread']  = 'Marcar mensagens pré-visualizadas como lidas';
 $labels['afternseconds']  = 'depois de $n segundos';
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index f734c7fbd..6ec481b8f 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Erro no banco de dados!';
 $messages['requesttimedout'] = 'Tempo da requisição esgotado';
 $messages['errorreadonly'] = 'Não foi possível realizar a operação. Pasta somente leitura';
 $messages['errornoperm'] = 'Não foi possível realizar a operação. Acesso negado';
+$messages['erroroverquota'] = 'Não foi possível realizar a operação. Não há espaço disponível.';
+$messages['erroroverquotadelete'] = 'Não há espaço disponível. Utilize SHIFT+DEL para apagar a mensagem.';
 $messages['invalidrequest'] = 'Requisição inválida! Nenhum dado foi salvo.';
 $messages['invalidhost'] = 'Endereço de servidor inválido.';
 $messages['nomessagesfound'] = 'Nenhuma mensagem encontrada nessa caixa de mensagens';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 20105a348..316255e5e 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiar';
 $labels['move']     = 'Mover';
 $labels['moveto']   = 'mover para...';
 $labels['download'] = 'descarregar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar na mesma';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Página actual';
 $labels['unread'] = 'Não lidas';
 $labels['flagged'] = 'Sinalizadas';
 $labels['unanswered'] = 'Não respondidas';
+$labels['withattachment'] = 'Com anexo';
 $labels['deleted'] = 'Eliminadas';
 $labels['undeleted'] = 'Não eliminada';
 $labels['invert'] = 'Inverter selecção';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corpo';
 
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
+$labels['changeformattext'] = 'Mostrar em formato de texto simples';
+$labels['changeformathtml'] = 'Mostrar em formato HTML';
 
 // message compose
 $labels['editasnew']      = 'Editar como nova';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Escrever mensagens em HTML';
 $labels['htmlonreply'] = 'apenas em resposta a mensagens HTML';
 $labels['htmlonreplyandforward'] = 'no reencaminhamento ou resposta de mensagem em HTML';
 $labels['htmlsignature'] = 'Assinatura em HTML';
+$labels['showemail'] = 'Mostrar endereço de e-mail com o nome a exibir';
 $labels['previewpane'] = 'Mostrar pré-visualização';
 $labels['skin'] = 'Aspecto [tema]';
 $labels['logoutclear'] = 'Esvaziar a Reciclagem ao sair';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Ao responder, remover a assinatura original d
 $labels['autoaddsignature'] = 'Adicionar assinatura automaticamente';
 $labels['newmessageonly'] = 'apenas em novas mensagens';
 $labels['replyandforwardonly'] = 'apenas em respostas e reenvios';
-$labels['replysignaturepos'] = 'Ao responder ou reencaminhar colocar assinatura';
-$labels['belowquote'] = 'depois da citação';
-$labels['abovequote'] = 'antes da citação';
 $labels['insertsignature'] = 'Inserir assinatura';
 $labels['previewpanemarkread']  = 'Marcar mensagem como lida';
 $labels['afternseconds']  = 'após $n segundos';
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 638b0fcdd..88b96e60e 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Erro na base de dados!';
 $messages['requesttimedout'] = 'A solicitação expirou';
 $messages['errorreadonly'] = 'Não foi possível efectuar a operação. A pasta é só de leitura.';
 $messages['errornoperm'] = 'Não tem permissões para efectuar esta operação.';
+$messages['erroroverquota'] = 'Não foi possível executar a operação. Não há espaço livre em disco.';
+$messages['erroroverquotadelete'] = 'Não há espaço livre em disco. Use SHIFT + DEL para eliminar algumas mensagens.';
 $messages['invalidrequest'] = 'Pedido inválido! Não foi guardada nenhuma informação.';
 $messages['invalidhost'] = 'Nome do servidor inválido.';
 $messages['nomessagesfound'] = 'Não existem mensagens nesta pasta.';
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index 00ec11f13..6b59da313 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Copiază';
 $labels['move']     = 'Mută';
 $labels['moveto']   = 'Mută in...';
 $labels['download'] = 'Descarcă';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Arată';
 $labels['showanyway'] = 'Arată oricum';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Pagina curentă';
 $labels['unread'] = 'Necitite';
 $labels['flagged'] = 'Marcat';
 $labels['unanswered'] = 'Fără răspuns';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Şterse';
 $labels['undeleted'] = 'Nu a fost șters';
 $labels['invert'] = 'Inversează';
@@ -204,6 +206,8 @@ $labels['body']  = 'Corp';
 
 $labels['openinextwin'] = 'Deschide într-o fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Editează ca nou';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Scrie mesaje HTML';
 $labels['htmlonreply'] = 'la răspunsul doar către un mesaj HTML';
 $labels['htmlonreplyandforward'] = 'la trimitere mai departe sau la răspuns la mesaj HTML';
 $labels['htmlsignature'] = 'Semnatură HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Previzualizare mail';
 $labels['skin'] = 'Temă interfaţă';
 $labels['logoutclear'] = 'Goleşte Coşul de Gunoi la deconectare';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Când răspundeţi, se şterge semnătura ori
 $labels['autoaddsignature'] = 'Adăugarea automată a semnăturii';
 $labels['newmessageonly'] = 'numai la mesajele noi';
 $labels['replyandforwardonly'] = 'numai la răspunsuri si cele trimise mai departe';
-$labels['replysignaturepos'] = 'Când răspundeţi sau trimiteţi mai departe, semnătura se va plasa';
-$labels['belowquote'] = 'dedesubtul citatului';
-$labels['abovequote'] = 'deasupra citatului';
 $labels['insertsignature'] = 'Introduce o semnătură';
 $labels['previewpanemarkread']  = 'Marchează mesajele previzualizate ca citite';
 $labels['afternseconds']  = 'după $n secunde';
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 68d1ab6a7..96b9de593 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Eroare bază de date!';
 $messages['requesttimedout'] = 'Timpul alocat cereri a expirat';
 $messages['errorreadonly'] = 'Nu se poate efectua operaţia. Dosarul este doar-citire.';
 $messages['errornoperm'] = 'Nu se poate efectua operaţia. Acces interzis.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
 $messages['invalidhost'] = 'Hosname invalid';
 $messages['nomessagesfound'] = 'Nu a fost găsit nici un mesaj în această căsuţă poştală';
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 9d854450a..8a136aa77 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копировать';
 $labels['move']     = 'Переместить';
 $labels['moveto']   = 'Переместить в...';
 $labels['download'] = 'Загрузить';
+$labels['open']     = 'Открыть';
 $labels['showattachment'] = 'Показать';
 $labels['showanyway'] = 'Все равно показать';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Текущая страница';
 $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
 $labels['unanswered'] = 'Неотвеченные';
+$labels['withattachment'] = 'С вложением';
 $labels['deleted'] = 'Удаленное';
 $labels['undeleted'] = 'Не удалено';
 $labels['invert'] = 'Инвертное';
@@ -204,6 +206,8 @@ $labels['body']  = 'Тело письма';
 
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
+$labels['changeformattext'] = 'Показать в формате обычного текста';
+$labels['changeformathtml'] = 'Показать в HTML формате';
 
 // message compose
 $labels['editasnew']      = 'Редактировать как новое';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Создавать сообщения в HTML';
 $labels['htmlonreply'] = 'только в ответ на сообщение в HTML';
 $labels['htmlonreplyandforward'] = 'при пересылке или ответе на HTML сообщение';
 $labels['htmlsignature'] = 'Подпись в HTML';
+$labels['showemail'] = 'Показывать адрес электронной почты и имя адресата';
 $labels['previewpane'] = 'Показать панель превью';
 $labels['skin'] = 'Стиль оформления';
 $labels['logoutclear'] = 'Очищать корзину при выходе';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Удалить подпись при отве
 $labels['autoaddsignature'] = 'Автоматически добавлять подпись';
 $labels['newmessageonly'] = 'только в новых сообщениях';
 $labels['replyandforwardonly'] = 'только в ответах и пересылках';
-$labels['replysignaturepos'] = 'Прикрепить подпись при ответе и пересылке';
-$labels['belowquote'] = 'после цитаты';
-$labels['abovequote'] = 'до цитаты';
 $labels['insertsignature'] = 'Вставить подпись';
 $labels['previewpanemarkread']  = 'Отмечать просмотренные сообщения как прочитанные';
 $labels['afternseconds']  = 'через $n секунд';
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 0693887c0..f9c8c433a 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Ошибка базы данных!';
 $messages['requesttimedout'] = 'Превышено время ожидания запроса';
 $messages['errorreadonly'] = 'Невозможно выполнить операцию. Папка доступна только для чтения';
 $messages['errornoperm'] = 'Невозможно выполнить операцию. Доступ запрещён';
+$messages['erroroverquota'] = 'Невозможно выполнить операцию. Нет свободного места на диске.';
+$messages['erroroverquotadelete'] = 'Нет свободного места на диске. Используйте SHIFT+DEL для удаления сообщения.';
 $messages['invalidrequest'] = 'Неверный запрос! Информация не сохранена.';
 $messages['invalidhost'] = 'Неверное имя сервера.';
 $messages['nomessagesfound'] = 'Сообщений не найдено';
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 3d1dfccdb..d8cd71662 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'පිටපත් කරන්න';
 $labels['move']     = 'ගෙනයන්න';
 $labels['moveto']   = 'ගෙන යන්න...';
 $labels['download'] = 'බාගත කරන්න';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'දැනට ඇති පිටුව';
 $labels['unread'] = 'නොකියවූ';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'මකා දැමූ';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML පණිවිඩයක් සෑදීම';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML අත්සන';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'පූර්වදර්ශන කොටස පෙන්නන්න';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'ස්වයංක්‍රීයව අත්සන ඇතුලත් කරන්න';
 $labels['newmessageonly'] = 'අලුත් පණිවිඩය පමණක්';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'අත්සන ඇතුලත් කරන්න';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'තත්පර $nකට පසු';
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index b8ecab335..c3828bc64 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'දත්ත ගබඩාවේ දෝෂය!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'ලියුම් පෙට්ටියේ පනිවුඩ නැත';
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index 702131d7e..10673382a 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopírovať';
 $labels['move']     = 'Presunúť';
 $labels['moveto']   = 'presunúť do...';
 $labels['download'] = 'stiahnuť';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Aktuálna stránka';
 $labels['unread'] = 'Neprečítané';
 $labels['flagged'] = 'Označené';
 $labels['unanswered'] = 'Neoznačené';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Zmazané';
 $labels['undeleted'] = 'Nevymazané';
 $labels['invert'] = 'Prevrátiť';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Upraviť ako novú';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Vytvoriť HTML správu';
 $labels['htmlonreply'] = 'len v odpovedi na HTML správy';
 $labels['htmlonreplyandforward'] = 'pri preposielaní alebo odpovedi na HTML správu';
 $labels['htmlsignature'] = 'HTML podpis';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Ukázať náhľad';
 $labels['skin'] = 'Vzhľad';
 $labels['logoutclear'] = 'Vyprázdniť kôš pri odhlásení';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Pri odpovedaní odstrániť zo správy pôvod
 $labels['autoaddsignature'] = 'Automaticky pridať podpis';
 $labels['newmessageonly'] = 'iba k novým správam';
 $labels['replyandforwardonly'] = 'len k odpovede a preposílanej správe';
-$labels['replysignaturepos'] = 'Pri odpovedaní alebo preposielanie správy vložiť podpis';
-$labels['belowquote'] = 'nad citáciu';
-$labels['abovequote'] = 'pod citáciu';
 $labels['insertsignature'] = 'Vložit podpis';
 $labels['previewpanemarkread']  = 'Označiť zobrazenej správy ako prečítané';
 $labels['afternseconds']  = 'po $n sekundách';
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index f0ee82978..a6f319db6 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databázová chyba!';
 $messages['requesttimedout'] = 'Čas požiadavky vypršal';
 $messages['errorreadonly'] = 'Nemožno vykonať operáciu. Adresár je len na čítanie';
 $messages['errornoperm'] = 'Nemožno vykonať operáciu. Prístup odmietnutý';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Chybný požiadavek. Žiadne údaje neboli uložené.';
 $messages['invalidhost'] = 'Neplatný názov servera';
 $messages['nomessagesfound'] = 'Vo Vašej schránke nie je žiadna správa';
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index a4e2d43e3..6b9ba2d41 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -64,8 +64,9 @@ $labels['copy']     = 'Kopiraj';
 $labels['move']     = 'Premakni';
 $labels['moveto']   = 'Premakni v...';
 $labels['download'] = 'Prenesi';
+$labels['open']     = 'Odpri';
 $labels['showattachment'] = 'Prikaži';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = 'Prikaži';
 
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Velikost datoteke';
@@ -161,8 +162,9 @@ $labels['currpage'] = 'Trenutna stran';
 $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Označeno';
 $labels['unanswered'] = 'Neoznačeno';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Izbrisano';
-$labels['undeleted'] = 'Not deleted';
+$labels['undeleted'] = 'Ni izbrisano';
 $labels['invert'] = 'Zamenjaj';
 $labels['filter'] = 'Prikaži';
 $labels['list'] = 'Seznam';
@@ -200,10 +202,12 @@ $labels['quicksearch']  = 'Hitri iskalnik';
 $labels['resetsearch']  = 'Prekliči iskanje';
 $labels['searchmod']  = 'Spremembe iskanja';
 $labels['msgtext']  = 'Celotno sporočilo';
-$labels['body']  = 'Body';
+$labels['body']  = 'Vsebina sporočila';
 
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Uredi kot novo';
@@ -241,9 +245,9 @@ $labels['nosubject']  = '(brez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Vedno prikaži slike od $sender';
 $labels['isdraft']    = 'To je osnutek sporočila.';
-$labels['andnmore']   = '$nr more...';
-$labels['togglemoreheaders'] = 'Show more message headers';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['andnmore']   = '$nr več...';
+$labels['togglemoreheaders'] = 'Prikaži več glav sporočila';
+$labels['togglefullheaders'] = 'Preklopi na neobdelan zapis glave sporočila';
 
 $labels['htmltoggle'] = 'Obogateno besedilo (HTML)';
 $labels['plaintoggle'] = 'Samo besedilo';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Sestavi sporočilo za';
 $labels['contactsfromto'] = 'Vizitke $from od $to do $count';
 $labels['print']          = 'Natisni';
 $labels['export']         = 'Izvozi';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Izvozi vse';
+$labels['exportsel']      = 'Izvozi označeno';
 $labels['exportvcards']   = 'Izvozi stike v formatu vCard';
 $labels['newcontactgroup'] = 'Ustvari novo skupino stikov';
 $labels['grouprename']    = 'Preimenuj skupino';
@@ -360,7 +364,7 @@ $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importdesc'] = 'Stike lahko naložite iz obstoječega imenika. <br/>Trenutno je podprt uvoz stikov v zapisu  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ali v CSV (z vejico ločene vrednosti) zapisu.';
 $labels['done'] = 'Dokončano';
 
 // settings
@@ -380,8 +384,8 @@ $labels['edititem'] = 'Uredi predmet';
 $labels['preferhtml'] = 'Prednostno HTML';
 $labels['defaultcharset'] = 'Privzeto kodiranje znakov';
 $labels['htmlmessage'] = 'HTML sporočilo';
-$labels['messagepart'] = 'Part';
-$labels['digitalsig'] = 'Digital Signature';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digitalni podpis';
 $labels['dateformat'] = 'Prikaz datuma';
 $labels['timeformat'] = 'Prikaz časa';
 $labels['prettydate'] = 'Bolj čitljivi datumi';
@@ -393,11 +397,12 @@ $labels['pagesize']  = 'Vrstic na stran';
 $labels['signature'] = 'Podpis';
 $labels['dstactive']  = 'Samodejna nastavitev zimskega/letnega časa';
 $labels['showinextwin'] = 'Odpri v novem oknu';
-$labels['composeextwin'] = 'Compose in a new window';
+$labels['composeextwin'] = 'Sestavi sporočilo v novem oknu';
 $labels['htmleditor'] = 'Sestavi sporočila z obogatenim besedilom';
 $labels['htmlonreply'] = 'le pri odgovoru na sporočila z obogatenim besedilom';
-$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
+$labels['htmlonreplyandforward'] = 'le pri posredovanju ali odgovoru na sporočila z obogatenim besedilom';
 $labels['htmlsignature'] = 'Podpis z obogatenim besedilom';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Prikaži predogled';
 $labels['skin'] = 'Tema uporabniškega vmesnika';
 $labels['logoutclear'] = 'Izprazni mapo Smeti ob odjavi';
@@ -422,7 +427,7 @@ $labels['always'] = 'vedno';
 $labels['showinlineimages'] = 'Prikaži priponke na dnu sporočila';
 $labels['autosavedraft']  = 'Samodejno shrani osnutke';
 $labels['everynminutes']  = '$n minut';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = 'Osveži (preglej nova sporočila)';
 $labels['never']  = 'nikoli';
 $labels['immediately']  = 'takoj';
 $labels['messagesdisplaying'] = 'Prikazovanje sporočil';
@@ -444,23 +449,20 @@ $labels['maintenance'] = 'Vzdrževanje';
 $labels['newmessage'] = 'Novo sporočilo';
 $labels['signatureoptions'] = 'Nastavitve podpisa';
 $labels['whenreplying'] = 'Pri odgovoru';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = 'ne navajaj izvornega sporočila v odgovoru';
 $labels['replytopposting'] = 'začni z novim sporočilom nad izvornim sporočilom';
 $labels['replybottomposting'] = 'začni z novim sporočilom pod izvornim sporočilom';
 $labels['replyremovesignature'] = 'Pri odgovoru na sporočilo odstrani izvorni podpis iz sporočila';
 $labels['autoaddsignature'] = 'Samodejno dodaj podpis';
 $labels['newmessageonly'] = 'samo novim sporočilom';
 $labels['replyandforwardonly'] = 'samo k odgovorom in posredovanim sporočilom';
-$labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporočila vstavi podpis';
-$labels['belowquote'] = 'pod citiran tekst';
-$labels['abovequote'] = 'nad citiran tekst';
 $labels['insertsignature'] = 'Vstavi podpis';
 $labels['previewpanemarkread']  = 'Označi predogledana sporočila kot prebrana';
 $labels['afternseconds']  = 'po $n sekundah';
 $labels['reqmdn'] = 'Vedno zahtevaj povratnico';
 $labels['reqdsn'] = 'Vedno zahtevaj obvestilo o statusu dostave';
 $labels['replysamefolder'] = 'Shrani odgovore na sporočilo v mapo izvornega sporočila';
-$labels['defaultabook'] = 'Default address book';
+$labels['defaultabook'] = 'Privzeti stiki';
 $labels['autocompletesingle'] = 'Preskoči nadomestni e-naslov pri samodejnem dokončanju';
 $labels['listnamedisplay'] = 'Prikaži seznam stikov kot';
 $labels['spellcheckbeforesend'] = 'Preveri črkovanje pred pošiljanjem sporočila';
@@ -470,8 +472,8 @@ $labels['spellcheckignorenums'] = 'Ne upoštevaj besed, ki vsebujejo številke';
 $labels['spellcheckignorecaps'] = 'Ne upoštevaj besed, ki vsebujejo samo velike črke';
 $labels['addtodict'] = 'Dodaj v slovar';
 $labels['mailtoprotohandler'] = 'Registriraj upravljavca protokola za e-naslov: povezave';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
+$labels['forwardmode'] = 'Posredovanje sporočil';
+$labels['inline'] = 'medvrstično';
 $labels['asattachment'] = 'Kot priponka';
 
 $labels['folder']  = 'Mapa';
@@ -500,7 +502,7 @@ $labels['sortasc']  = 'Uredi naraščajoče';
 $labels['sortdesc'] = 'Uredi padajoče';
 $labels['undo'] = 'Prekliči';
 
-$labels['installedplugins'] = 'Installed plugins';
+$labels['installedplugins'] = 'Nameščeni vtičniki';
 $labels['plugin'] = 'Vtičnik';
 $labels['version'] = 'Različica';
 $labels['source'] = 'Vir';
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index 3fd113b0d..081d912c1 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Napaka v bazi';
 $messages['requesttimedout'] = 'Zahteva je potekla';
 $messages['errorreadonly'] = 'Operacije ni bilo mogoče izvršiti. Mapa je na voljo samo za branje.';
 $messages['errornoperm'] = 'Operacije ni bilo mogoče izvršiti. Dostop zavrnjen.';
+$messages['erroroverquota'] = 'Operacije ni mogoče izvršiti. Diskovni prostor je zaseden.';
+$messages['erroroverquotadelete'] = 'Zmanjkalo je diskovnega prostora. Za izbris sporočila porabite tipki SHIFT+DEL.';
 $messages['invalidrequest'] = 'Neveljavna zahteva. Podatki niso bili shranjeni.';
 $messages['invalidhost'] = 'Nepravilno ime strežnika';
 $messages['nomessagesfound'] = 'V poštnem predalu ni sporočil.';
@@ -119,7 +121,7 @@ $messages['selectimportfile'] = 'Izberite datoteko, ki jo želite prenesti';
 $messages['addresswriterror'] = 'Izbran imenik ni zapisljiv';
 $messages['contactaddedtogroup'] = 'Stik je bil uspešno dodan v skupino';
 $messages['contactremovedfromgroup'] = 'Stik je bil uspešno izbrisan iz skupine';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['nogroupassignmentschanged'] = 'Dodeljevanje skupini ni bilo spremenjeno.';
 $messages['importwait'] = 'Uvažanje poteka...';
 $messages['importformaterror'] = 'Uvoz ni uspel! Uvožena datoteka ni pravega formata.';
 $messages['importconfirm'] = '<b>Uspešno uvoženi $inserted stiki, $skipped stikov že obstaja v imeniku</b>:<p><em>$names</em></p>';
@@ -163,7 +165,7 @@ $messages['invalidimageformat'] = 'Neveljaven format slike';
 $messages['mispellingsfound'] = 'V sporočilu so bile najdene napake v črkovanju';
 $messages['parentnotwritable'] = 'Podmape v tej mapi ni bilo mogoče ustvariti/premakniti. Nimate pravic.';
 $messages['messagetoobig'] = 'Sporočilo je preveliko za obdelavo.';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['attachmentvalidationerror'] = 'OPOZORILO! Priponka vsebuje sumljivo vsebino, saj tip priponke ne ustreza tipu, določenemu v sporočilu. Če ne zaupate pošiljatelju, priponke v brskalniku ne odpirajte, saj lahko vsebuje zlonamerno vsebino. <br/><br/><em>Pričakovano: $expected; Najdeno: $detected</em>';
 $messages['noscriptwarning'] = 'Opozorilo: Ta spletna stran zahteva Javascript! Za uporabo jo vključite v nastavitvah vašega brskalnika.';
 
 ?>
diff --git a/program/localization/sq_AL/labels.inc b/program/localization/sq_AL/labels.inc
index aa102670c..ba9b559d8 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopje';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'ço te...';
 $labels['download'] = 'shkarko';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'Palexuar';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Deleted';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Shkruaj mesazhe HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Nënshkrimi HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Shiko si duket';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index 46e7197e0..56bb9feb2 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Nuk ka mesazhe në këtë kuti postare';
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index 1461606eb..130d3a7a6 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копирај';
 $labels['move']     = 'Пребаци';
 $labels['moveto']   = 'Пребаци у...';
 $labels['download'] = 'Преузми (скидање)';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Тренутна страница';
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
 $labels['unanswered'] = 'Неодговорено';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Обрисано';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Уведи';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Модификуј као ново';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Састави HTML поруке';
 $labels['htmlonreply'] = 'само при одговору на HTML поруку';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML потпис';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи панел за преглед';
 $labels['skin'] = 'Интерфејс';
 $labels['logoutclear'] = 'Избриши смеће при логовању';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'При одговору одстрани ор
 $labels['autoaddsignature'] = 'Аутоматски додај потпис';
 $labels['newmessageonly'] = 'само нове поруке';
 $labels['replyandforwardonly'] = 'само одговори и прослеђивања';
-$labels['replysignaturepos'] = 'При одговору или прослеђивању додај потпис';
-$labels['belowquote'] = 'испод квоте';
-$labels['abovequote'] = 'изнад квоте';
 $labels['insertsignature'] = 'Убаци потпис';
 $labels['previewpanemarkread']  = 'Прегледану поруку означи као прочитану';
 $labels['afternseconds']  = 'након $n секунди';
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 7ffbbd34a..32007e6f2 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Грешка у бази података!';
 $messages['requesttimedout'] = 'Захтев је истекао';
 $messages['errorreadonly'] = 'Не може да изврши операцију. Фасцикла се може само читати.';
 $messages['errornoperm'] = 'Извршење операције није могуће. Одбијен захтев за дозволу.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Погрешан захтев! Подаци нису сачувани.';
 $messages['invalidhost'] = 'Погрешно име сервера.';
 $messages['nomessagesfound'] = 'Немате порука у сандучету.';
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 5d10334b3..f61433527 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopiera';
 $labels['move']     = 'Flytta';
 $labels['moveto']   = 'Flytta till:';
 $labels['download'] = 'Ladda ner';
+$labels['open']     = 'Öppna';
 $labels['showattachment'] = 'Visa';
 $labels['showanyway'] = 'Visa det ändå';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Sida';
 $labels['unread'] = 'Olästa';
 $labels['flagged'] = 'Flaggade';
 $labels['unanswered'] = 'Obesvarade';
+$labels['withattachment'] = 'Med bilaga';
 $labels['deleted'] = 'Borttagna';
 $labels['undeleted'] = 'Inte borttaget';
 $labels['invert'] = 'Invertera';
@@ -204,6 +206,8 @@ $labels['body']  = 'Innehåll';
 
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
+$labels['changeformattext'] = 'Visa i text-format';
+$labels['changeformathtml'] = 'Visa i HTML-format';
 
 // message compose
 $labels['editasnew']      = 'Redigera som nytt';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Skriv meddelanden i HTML-format';
 $labels['htmlonreply'] = 'Endast vid svar på meddelande i HTML-format';
 $labels['htmlonreplyandforward'] = 'Vid svar på eller vidarebefordran av meddelande i HTML-format';
 $labels['htmlsignature'] = 'HTML-signatur';
+$labels['showemail'] = 'Visa namn och adress';
 $labels['previewpane'] = 'Visa meddelandefältet';
 $labels['skin'] = 'Stilmall för användargränssnitt';
 $labels['logoutclear'] = 'Töm papperskorgen vid utloggning';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Ta bort befintlig signatur från meddelandet
 $labels['autoaddsignature'] = 'Infoga signatur automatiskt';
 $labels['newmessageonly'] = 'Vid nytt meddelande';
 $labels['replyandforwardonly'] = 'Vid svar och vidarebefordran';
-$labels['replysignaturepos'] = 'Vid svar eller vidarebefordran infoga signatur';
-$labels['belowquote'] = 'Nedanför befintligt meddelande';
-$labels['abovequote'] = 'Ovanför befintligt meddelande';
 $labels['insertsignature'] = 'Infoga signatur';
 $labels['previewpanemarkread']  = 'Märk meddelande som läst vid visning';
 $labels['afternseconds']  = 'Efter $n sekunder';
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 65ee6827d..63dddc548 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Databasfel!';
 $messages['requesttimedout'] = 'Begäran tog för lång tid';
 $messages['errorreadonly'] = 'Åtgärden kunde inte utföras. Katalogen är skrivskyddad';
 $messages['errornoperm'] = 'Åtgärden kunde inte utföras. Otillräcklig befogenhet';
+$messages['erroroverquota'] = 'Åtgärden kunde inte utföras. Otillräckligt lagringsutrymme.';
+$messages['erroroverquotadelete'] = 'Otillräckligt lagringsutrymme. Tryck på SHIFT och DEL för att ta bort ett meddelande.';
 $messages['invalidrequest'] = 'Ogiltig begäran! Informationen sparades inte.';
 $messages['invalidhost'] = 'Ogiltigt servernamn.';
 $messages['nomessagesfound'] = 'Inga meddelanden';
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index d71da6799..bc1db7d00 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'நகல்';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Current page';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'நீக்கியது';
 $labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'தலைகீழ்';
@@ -204,6 +206,8 @@ $labels['body']  = 'Body';
 
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'புதியதாக திருத்து';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML செய்திகளை எழுது';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'HTML கையொப்பம்';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'முந்திய பாத்தியை காட்டு';
 $labels['skin'] = 'முகப்பு தோற்றம்';
 $labels['logoutclear'] = 'வெளியேறும் போது குப்பையை காலி செய்';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'பதிலளிக்கும் பே�
 $labels['autoaddsignature'] = 'தானாக கையொப்பத்தை சேர்';
 $labels['newmessageonly'] = 'புது செய்தி மட்டும்';
 $labels['replyandforwardonly'] = 'பதிலளிப்பு முன்அனுப்பு மட்டும்';
-$labels['replysignaturepos'] = 'பதிலளிக்கும் போதும் முன்அனுப்பும் போதும் கையோப்பமிடு';
-$labels['belowquote'] = 'மேற்கோளுக்கு கீழே';
-$labels['abovequote'] = 'மேற்கோளுக்கு மேலே';
 $labels['insertsignature'] = 'கையோப்பமிடு';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index c06765435..65e611f88 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'செல்லாத வேண்டுகோள்! எந்த தரவும் சேமிக்கப்படவில்லை.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'இந்த தபால் பெட்டியில் எந்த தரவும் சேமிக்கப்படவில்லை';
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index f96bafa66..03b4161fb 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'คัดลอก';
 $labels['move']     = 'เลื่อน';
 $labels['moveto']   = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'แสดง';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'หน้าปัจจุบัน';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'ยังไม่ได้ตอบ';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'ลบแล้ว';
 $labels['undeleted'] = 'ยังไม่ได้ลบ';
 $labels['invert'] = 'Invert';
@@ -204,6 +206,8 @@ $labels['body']  = 'เนื้อหา';
 
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Edit as new';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'เขียนจดหมายแบบ HTML';
 $labels['htmlonreply'] = 'on reply to HTML message';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'ลายมือชื่อแบบ HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'แสดงหน้าต่างตัวอย่างแสดงผล';
 $labels['skin'] = 'Interface skin';
 $labels['logoutclear'] = 'Clear Trash on logout';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'เพิ่มลายเซ็นต์เข้าไปอัตโนมัติ';
 $labels['newmessageonly'] = 'เฉพาะข้อความใหม่เท่านั้น';
 $labels['replyandforwardonly'] = 'ตอบกลับและส่งต่อเท่านั้น';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'แทรกลายเซ็นต์';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 1b78b7d60..826930c0e 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'เกิดข้อผิดพลาดเกี่�
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'ชื่อเซิร์ฟเวอร์ไม่ถูกต้อง';
 $messages['nomessagesfound'] = 'ไม่มีจดหมายในกล่องจดหมายนี้';
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index 6937f2a1e..9e78ea3fa 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Kopyala';
 $labels['move']     = 'Taşı';
 $labels['moveto']   = 'Şuraya taşı...';
 $labels['download'] = 'İndir';
+$labels['open']     = 'Aç';
 $labels['showattachment'] = 'Göster';
 $labels['showanyway'] = 'Yine de göster';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Şimdiki sayfa';
 $labels['unread'] = 'Okunmamışları';
 $labels['flagged'] = 'İşaretlenmişleri';
 $labels['unanswered'] = 'Yanıtlanmamışları';
+$labels['withattachment'] = 'Eklenti ile';
 $labels['deleted'] = 'Silinmişleri';
 $labels['undeleted'] = 'Silinmemiş';
 $labels['invert'] = 'Seçimi Tersine Çevir';
@@ -204,6 +206,8 @@ $labels['body']  = 'Gövde';
 
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
+$labels['changeformattext'] = 'Düz yazı formatında göster';
+$labels['changeformathtml'] = 'HTML formatında göster';
 
 // message compose
 $labels['editasnew']      = 'Postayı yeni olarak düzenle';
@@ -335,8 +339,8 @@ $labels['composeto']      = 'Seçili kişiye posta gönder';
 $labels['contactsfromto'] = 'Kişiler: $from - $to , Toplam: $count';
 $labels['print']          = 'Yazdır';
 $labels['export']         = 'Dışa aktar';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = 'Hepsini dışa aktar';
+$labels['exportsel']      = 'Seçileni dışa aktar';
 $labels['exportvcards']   = 'vCard olarak dışa aktar';
 $labels['newcontactgroup'] = 'Yeni kişi grubu oluştur';
 $labels['grouprename']    = 'Grubu yeniden adlandır';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'HTML postaları oluştur';
 $labels['htmlonreply'] = 'sadece HTML postaları yanıtlarken';
 $labels['htmlonreplyandforward'] = 'HTML biçimindeki posta yanıtlandığında veye iletildiğinde';
 $labels['htmlsignature'] = 'HTML imza';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Önizleme panelini göster';
 $labels['skin'] = 'Arayüz görünümü';
 $labels['logoutclear'] = 'Oturumu kapatınca Çöpü temizle';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Yanıtlarken önceki imzaları sil';
 $labels['autoaddsignature'] = 'Otomatik olarak imza ekle';
 $labels['newmessageonly'] = 'sadece yeni postalarda';
 $labels['replyandforwardonly'] = 'sadece yanıtlar ve yönlendirmelerde';
-$labels['replysignaturepos'] = 'Yanıtlarken veya yönlendirirken imzayı yerleştir';
-$labels['belowquote'] = 'alıntının altına';
-$labels['abovequote'] = 'alıntının üstüne';
 $labels['insertsignature'] = 'İmza ekle';
 $labels['previewpanemarkread']  = 'Önzilemede görünen postaları okunmuş işaretle';
 $labels['afternseconds']  = '$n saniye sonra';
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index f3c0919c0..3b451d556 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Veritabanı Hatası!';
 $messages['requesttimedout'] = 'İstek zaman aşımına uğradı';
 $messages['errorreadonly'] = 'İşlem gerçekleştirilemedi. Dizin salt okunabilir';
 $messages['errornoperm'] = 'İşlem gerçekleştirilemedi. İzin verilmedi.';
+$messages['erroroverquota'] = 'İşlem gerçekleştirilemedi. Boş alan yok.';
+$messages['erroroverquotadelete'] = 'Boş alan yok. SHIFT+DEL tuş kombinasyonunu kullanarak mesajı silin.';
 $messages['invalidrequest'] = 'Geçersiz İstek! Veri kaydedilmedi';
 $messages['invalidhost'] = 'Geçersiz sunucu adı.';
 $messages['nomessagesfound'] = 'Posta kutusunda ileti bulunamadı';
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index d70718fcc..4605bb98d 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Копіювати';
 $labels['move']     = 'Перемістити';
 $labels['moveto']   = 'Перемістити до...';
 $labels['download'] = 'Завантажити';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Показати';
 $labels['showanyway'] = 'Все одно показати';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Поточна сторінка';
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
 $labels['unanswered'] = 'Без відповіді';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Видалені';
 $labels['undeleted'] = 'Не видалено';
 $labels['invert'] = 'Інвертувати виділення';
@@ -204,6 +206,8 @@ $labels['body']  = 'Тіло повідомлення';
 
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Редагувати як новий';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Створювати листи в HTML';
 $labels['htmlonreply'] = 'тільки у відповідь на HTML повідомлення';
 $labels['htmlonreplyandforward'] = 'під час пересилання або відповіді на повідомлення HTML';
 $labels['htmlsignature'] = 'Підпис в HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Показати панель перегляду';
 $labels['skin'] = 'Тема';
 $labels['logoutclear'] = 'Очищати кошик при виході';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'При відповіді видаляти п
 $labels['autoaddsignature'] = 'Автоматично додавати підпис';
 $labels['newmessageonly'] = 'тільки до нових листів';
 $labels['replyandforwardonly'] = 'тільки при відповідях та пересилках';
-$labels['replysignaturepos'] = 'При відповідях чи пересилках додавати підпис';
-$labels['belowquote'] = 'після цитати';
-$labels['abovequote'] = 'перед цитатою';
 $labels['insertsignature'] = 'Додати підпис';
 $labels['previewpanemarkread']  = 'Позначити переглянуті листи як прочитані';
 $labels['afternseconds']  = 'через $n секунд';
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index 522f1f4fc..521492d99 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Помилка бази даних!';
 $messages['requesttimedout'] = 'Тайм-аут запиту';
 $messages['errorreadonly'] = 'Неможливо виконати операцію. Папка доступна тільки для читання.';
 $messages['errornoperm'] = 'Неможливо виконати операцію. Доступ заборонено';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Невірний запит! Дані не збережено.';
 $messages['invalidhost'] = 'Невірне ім\'я серверу.';
 $messages['nomessagesfound'] = 'Листів не знайдено';
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index eb20b8cc5..f1cf95149 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = 'Sao chép';
 $labels['move']     = 'Di Chuyển';
 $labels['moveto']   = 'Di chuyển tới...';
 $labels['download'] = 'Tải về';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Hiển thị';
 $labels['showanyway'] = 'Tiếp tục hiển thị';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = 'Trang hiện tại';
 $labels['unread'] = 'Chưa đọc';
 $labels['flagged'] = 'Đã đánh dấu';
 $labels['unanswered'] = 'Chưa trả lời';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Đã xóa';
 $labels['undeleted'] = 'Chưa xóa được';
 $labels['invert'] = 'Đảo ngược';
@@ -204,6 +206,8 @@ $labels['body']  = 'Nội dung thư';
 
 $labels['openinextwin'] = 'Mở trong khung cửa mới';
 $labels['emlsave'] = 'Tải về theo định dạng .eml';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = 'Sửa như một email mới';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = 'Soạn thư dạng HTML';
 $labels['htmlonreply'] = 'Chỉ trả lời lại bằng thư HTML';
 $labels['htmlonreplyandforward'] = 'Khi chuyển tiếp hoặc trả lời thư theo định dạng HTML';
 $labels['htmlsignature'] = 'Chữ ký HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Hiển thị ô Xem thử';
 $labels['skin'] = 'Bề mặt giao diện';
 $labels['logoutclear'] = 'Xóa sạch rác khi thoát';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = 'Khi trả lời bỏ chữ ký cũ khỏi n�
 $labels['autoaddsignature'] = 'Tự động thêm chữ ký';
 $labels['newmessageonly'] = 'chỉ thư mới';
 $labels['replyandforwardonly'] = 'chỉ trả lời và chuyển tiếp thư';
-$labels['replysignaturepos'] = 'Khi trả lời hoặc chuyển tiếp thư thêm vào chữ ký';
-$labels['belowquote'] = 'Dưới phần nội dung cũ';
-$labels['abovequote'] = 'trên phần nội dung cũ';
 $labels['insertsignature'] = 'Chèn chữ ký';
 $labels['previewpanemarkread']  = 'Đánh dẫu thư xem thử là đã đọc';
 $labels['afternseconds']  = 'sau $n giây';
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 1d5f5f84c..50bf71846 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Lỗi cơ sở dữ liệu';
 $messages['requesttimedout'] = 'Yêu cầu hết  hạn';
 $messages['errorreadonly'] = 'Không thể thực hiện thao tác. Thư mục chỉ cho phép đọc.';
 $messages['errornoperm'] = 'Bạn không đủ quyền hạn để thực hiện thao tác này.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Yêu cầu không hợp lệ! Không có dữ liệu nào được lưu.';
 $messages['invalidhost'] = 'Sai thông tin máy chủ';
 $messages['nomessagesfound'] = 'Không thấy có thư nào trong hộp thư này.';
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index af2bd7b68..23a42b96d 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -33,15 +33,15 @@ $labels['addressbook'] = '通讯录';
 
 // mailbox names
 $labels['inbox']  = '收件箱';
-$labels['drafts'] = '草稿';
-$labels['sent']   = '已发送';
+$labels['drafts'] = '草稿箱';
+$labels['sent']   = '已发送邮件';
 $labels['trash']  = '已删除邮件';
 $labels['junk']   = '垃圾邮件';
 
 // message listing
 $labels['subject'] = '主题';
 $labels['from']    = '发件人';
-$labels['sender']  = 'Sender';
+$labels['sender']  = '发件人';
 $labels['to']      = '收件人';
 $labels['cc']      = '抄送';
 $labels['bcc']     = '密送';
@@ -50,22 +50,23 @@ $labels['followupto'] = '投递组';
 $labels['date']    = '日期';
 $labels['size']    = '大小';
 $labels['priority'] = '优先级';
-$labels['organization'] = '公司';
+$labels['organization'] = '组织';
 $labels['readstatus'] = '阅读状态';
-$labels['listoptions'] = 'List options...';
+$labels['listoptions'] = '列表选项';
 
-$labels['mailboxlist'] = '目录管理';
-$labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
-$labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
-$labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['mailboxlist'] = '邮件夹';
+$labels['messagesfromto'] = '第 $from 到 $to，共计 $count 封邮件';
+$labels['threadsfromto'] = '第 $from 到 $to，共计 $count 个主题';
+$labels['messagenrof'] = '第 $nr 封邮件，共计 $count 封';
 $labels['fromtoshort'] = '自 $from – $to 统计 $count';
 
 $labels['copy']     = '复制';
 $labels['move']     = '移动';
-$labels['moveto']   = '移动至';
+$labels['moveto']   = '移至...';
 $labels['download'] = '下载';
+$labels['open']     = '打开';
 $labels['showattachment'] = '显示';
-$labels['showanyway'] = 'Show it anyway';
+$labels['showanyway'] = '总是显示';
 
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
@@ -73,7 +74,7 @@ $labels['filesize'] = '文件大小';
 $labels['addtoaddressbook'] = '添加至通讯录';
 
 // weekdays short
-$labels['sun'] = '周日';
+$labels['sun'] = '星期日';
 $labels['mon'] = '星期一';
 $labels['tue'] = '星期二';
 $labels['wed'] = '星期三';
@@ -122,8 +123,8 @@ $labels['today'] = '今天';
 
 // toolbar buttons
 $labels['refresh']          = '刷新';
-$labels['checkmail']        = '收取新邮件';
-$labels['compose']          = '写邮件';
+$labels['checkmail']        = '检查新邮件';
+$labels['compose']          = '撰写新邮件';
 $labels['writenewmessage']  = '写邮件';
 $labels['reply']            = '回复';
 $labels['replytomessage']   = '回复发件人';
@@ -135,42 +136,43 @@ $labels['forwardinline']    = '直接转发';
 $labels['forwardattachment'] = '以附件转发';
 $labels['forwardmessage']   = '转发邮件';
 $labels['deletemessage']    = '删除邮件';
-$labels['movemessagetotrash'] = '移动邮件到回收站';
+$labels['movemessagetotrash'] = '移至已删除邮件';
 $labels['printmessage']     = '打印邮件';
 $labels['previousmessage']  = '显示上一封邮件';
 $labels['firstmessage']     = '显示第一封邮件';
 $labels['nextmessage']      = '下一封';
 $labels['lastmessage']      = '最后一封';
 $labels['backtolist']       = '返回邮件列表';
-$labels['viewsource']       = '显示邮件源文件';
+$labels['viewsource']       = '显示原始邮件文件';
 $labels['mark']             = '标记';
-$labels['markmessages']     = '标记邮件';
+$labels['markmessages']     = '标记选中的邮件为';
 $labels['markread']         = '已读';
 $labels['markunread']       = '未读';
 $labels['markflagged']      = '已标记';
 $labels['markunflagged']    = '未标记';
-$labels['moreactions']      = '更多动作...';
+$labels['moreactions']      = '更多操作...';
 $labels['more']             = '更多';
-$labels['back']             = '后退';
+$labels['back']             = '返回';
 $labels['options']          = '选项';
 
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
 $labels['currpage'] = '当前页';
-$labels['unread'] = '未读';
-$labels['flagged'] = '已标记';
-$labels['unanswered'] = '未回复';
-$labels['deleted'] = '删除';
-$labels['undeleted'] = 'Not deleted';
+$labels['unread'] = '未读邮件';
+$labels['flagged'] = '已标记邮件';
+$labels['unanswered'] = '未回复邮件';
+$labels['withattachment'] = 'With attachment';
+$labels['deleted'] = '已删除邮件';
+$labels['undeleted'] = '未删除邮件';
 $labels['invert'] = '反选';
 $labels['filter'] = '过滤';
 $labels['list'] = '列表';
 $labels['threads'] = '主题';
 $labels['expand-all'] = '展开全部';
 $labels['expand-unread'] = '展开未读';
-$labels['collapse-all'] = '收合全部';
-$labels['threaded'] = '线索';
+$labels['collapse-all'] = '收起全部';
+$labels['threaded'] = '所有邮件';
 
 $labels['autoexpand_threads'] = '展开消息主题';
 $labels['do_expand'] = '所有主题';
@@ -188,7 +190,7 @@ $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
 
-$labels['folderactions'] = '目录操作...';
+$labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
 
@@ -197,31 +199,33 @@ $labels['unknown']  = '未知';
 $labels['unlimited']  = '无限制';
 
 $labels['quicksearch']  = '快速查找';
-$labels['resetsearch']  = '清空查找内容';
-$labels['searchmod']  = '搜寻模式';
-$labels['msgtext']  = '整个邮件';
+$labels['resetsearch']  = '清空';
+$labels['searchmod']  = '修改搜索';
+$labels['msgtext']  = '整封邮件';
 $labels['body']  = '正文';
 
 $labels['openinextwin'] = '在新窗口中打开';
-$labels['emlsave'] = '下载（.eml）';
+$labels['emlsave'] = '下载(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
-$labels['editasnew']      = '编辑为新邮件';
+$labels['editasnew']      = '以新邮件编辑';
 $labels['send']           = '发送';
 $labels['sendmessage']    = '立即发送';
 $labels['savemessage']    = '保存为草稿';
 $labels['addattachment']  = '添加附件';
 $labels['charset']        = '字符集';
 $labels['editortype']     = '编辑器类型';
-$labels['returnreceipt']  = '邮件回执';
-$labels['dsn']            = '投递状态提示';
-$labels['mailreplyintro'] = '于 $date, $sender 回复:';
-$labels['originalmessage'] = '原始信件';
+$labels['returnreceipt']  = '需要已读回执';
+$labels['dsn']            = '投递状态通知';
+$labels['mailreplyintro'] = '在 $date，$sender 写道：';
+$labels['originalmessage'] = '原始邮件';
 
 $labels['editidents']    = '编辑身份';
 $labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
-$labels['resumeediting'] = '重新编辑';
+$labels['resumeediting'] = '继续编辑';
 $labels['revertto']      = '恢复至';
 
 $labels['attach'] = '附加';
@@ -237,19 +241,19 @@ $labels['normal']  = '普通';
 $labels['high']    = '高';
 $labels['highest'] = '最高';
 
-$labels['nosubject']  = '（无主题）';
+$labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
 $labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
-$labels['isdraft']    = '这是邮件草稿';
-$labels['andnmore']   = '$nr more...';
+$labels['isdraft']    = '这是一封草稿';
+$labels['andnmore']   = '第$nr封或更多...';
 $labels['togglemoreheaders'] = '显示更多消息头';
-$labels['togglefullheaders'] = 'Toggle raw message headers';
+$labels['togglefullheaders'] = '切换至原始消息头';
 
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '纯文本';
-$labels['savesentmessagein'] = '将已发送邮件保存到';
+$labels['savesentmessagein'] = '保存已发送邮件至';
 $labels['dontsave'] = '不保存';
-$labels['maxuploadsize'] = '允许的最大文件大小是 $size';
+$labels['maxuploadsize'] = '上传附件最大不超过 $size';
 
 $labels['addcc'] = '添加抄送';
 $labels['addbcc'] = '添加密送';
@@ -257,10 +261,10 @@ $labels['addreplyto'] = '添加回复';
 $labels['addfollowupto'] = '添加投递组';
 
 // mdn
-$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
-$labels['receiptread'] = '发送回执（已读）';
+$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送已读通知。您是否希望通知发件人？';
+$labels['receiptread'] = '发送回执(已读)';
 $labels['yourmessage'] = '这是您的邮件回执';
-$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
+$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或了解邮件内容。';
 
 // address boook
 $labels['name']         = '显示名称';
@@ -272,9 +276,9 @@ $labels['namesuffix']   = '后缀';
 $labels['nickname']     = '昵称';
 $labels['jobtitle']     = '职位';
 $labels['department']   = '部门';
-$labels['gender']       = 'Gender';
+$labels['gender']       = '性别';
 $labels['maidenname']   = '娘家姓';
-$labels['email']        = 'Email';
+$labels['email']        = '邮件地址';
 $labels['phone']        = '电话';
 $labels['address']      = '地址';
 $labels['street']       = '街道';
@@ -285,14 +289,14 @@ $labels['country']      = '国家';
 $labels['birthday']     = '生日';
 $labels['anniversary']  = '纪念日';
 $labels['website']      = '主页';
-$labels['instantmessenger'] = 'QQ';
+$labels['instantmessenger'] = '即时通讯';
 $labels['notes'] = '备注';
 $labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '经理';
 $labels['assistant'] = '助理';
 $labels['spouse'] = '配偶';
-$labels['allfields'] = '所有项目';
+$labels['allfields'] = '所有栏目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['advanced'] = '高级选项';
@@ -302,7 +306,7 @@ $labels['typehome']   = '家庭';
 $labels['typework']   = '工作';
 $labels['typeother']  = '其他';
 $labels['typemobile']  = '手机';
-$labels['typemain']  = '主';
+$labels['typemain']  = '主要';
 $labels['typehomefax']  = '家庭传真';
 $labels['typeworkfax']  = '工作传真';
 $labels['typecar']  = '车牌';
@@ -311,10 +315,10 @@ $labels['typevideo']  = '视频';
 $labels['typeassistant']  = '助理';
 $labels['typehomepage']  = '主页';
 $labels['typeblog'] = '博客';
-$labels['typeprofile'] = '资历';
+$labels['typeprofile'] = '资料';
 
-$labels['addfield'] = '增加项..';
-$labels['addcontact'] = '添加联系人';
+$labels['addfield'] = '新增条目...';
+$labels['addcontact'] = '新建联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
@@ -324,24 +328,24 @@ $labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
 $labels['save']   = '保存';
 $labels['delete'] = '删除';
-$labels['rename'] = '更名';
+$labels['rename'] = '重命名';
 $labels['addphoto'] = '上传';
-$labels['replacephoto'] = '覆盖';
+$labels['replacephoto'] = '替换照片';
 $labels['uploadphoto'] = '上传照片';
 
 $labels['newcontact']     = '新建联系人';
 $labels['deletecontact']  = '删除选中的联系人';
-$labels['composeto']      = '写信给';
+$labels['composeto']      = '写信至选中的联系人';
 $labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
 $labels['print']          = '打印';
 $labels['export']         = '导出';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
-$labels['exportvcards']   = '以 vCard 格式导出联系人';
-$labels['newcontactgroup'] = '创建新的组';
-$labels['grouprename']    = '重命名组';
-$labels['groupdelete']    = '删除组';
-$labels['groupremoveselected'] = '从分组中移除选中的联系人';
+$labels['exportall']      = '导出全部';
+$labels['exportsel']      = '导出选中';
+$labels['exportvcards']   = '导出联系人为 vCard 格式';
+$labels['newcontactgroup'] = '创建新的联系人群组';
+$labels['grouprename']    = '重命名群组';
+$labels['groupdelete']    = '删除群组组';
+$labels['groupremoveselected'] = '删除选中';
 
 $labels['previouspage']   = '上一页';
 $labels['firstpage']      = '第一页';
@@ -356,19 +360,19 @@ $labels['searchsave'] = '保存搜索';
 $labels['searchdelete'] = '删除搜索';
 
 $labels['import'] = '导入';
-$labels['importcontacts'] = '导入联系人';
+$labels['importcontacts'] = '导入通讯录';
 $labels['importfromfile'] = '从文件导入';
-$labels['importtarget'] = '增加新联系人到通讯录:';
-$labels['importreplace'] = '替换整个地址簿';
-$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
+$labels['importtarget'] = '添加新联系人至通讯录:';
+$labels['importreplace'] = '替换全部通讯录';
+$labels['importdesc'] = '您可以从通讯录文件上传联系人，目前已支持 <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> 和 CSV(逗号分隔)格式';
 $labels['done'] = '完成';
 
 // settings
 $labels['settingsfor'] = '设置';
 $labels['about'] = '关于';
-$labels['preferences'] = '偏好设置';
-$labels['userpreferences'] = '个人偏好';
-$labels['editpreferences'] = '修改个人偏好';
+$labels['preferences'] = '选项';
+$labels['userpreferences'] = '个人选项';
+$labels['editpreferences'] = '修改个人选项';
 
 $labels['identities'] = '发件身份';
 $labels['manageidentities'] = '管理此账号的身份';
@@ -380,7 +384,7 @@ $labels['edititem'] = '编辑条目';
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '部分';
 $labels['digitalsig'] = '数字签名';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '时间格式';
@@ -392,12 +396,13 @@ $labels['timezone']  = '时区';
 $labels['pagesize']  = '每页显示的邮件数量';
 $labels['signature'] = '签名';
 $labels['dstactive']  = '夏令时';
-$labels['showinextwin'] = 'Open message in a new window';
+$labels['showinextwin'] = '在新窗口中打开';
 $labels['composeextwin'] = '在新窗口中撰写';
 $labels['htmleditor'] = '使用 HTML 编辑器';
-$labels['htmlonreply'] = '仅当回复HTML邮件';
+$labels['htmlonreply'] = '仅当回复 HTML 邮件';
 $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = '使用 HTML 签名';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '显示预览窗口';
 $labels['skin'] = '界面皮肤';
 $labels['logoutclear'] = '退出时清空回收站';
@@ -422,7 +427,7 @@ $labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
 $labels['autosavedraft']  = '自动保存到草稿箱';
 $labels['everynminutes']  = '每隔 $n 分钟';
-$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['refreshinterval']  = '刷新间隔';
 $labels['never']  = '从不';
 $labels['immediately']  = '立即';
 $labels['messagesdisplaying'] = '显示参数';
@@ -431,12 +436,12 @@ $labels['mimeparamfolding'] = '附件名';
 $labels['2231folding'] = '完整的 RFC 2231（Thunderbird）';
 $labels['miscfolding'] = 'RFC 2047/2232（MS Outlook）';
 $labels['2047folding'] = '完整的 RFC 2047（其它）';
-$labels['force7bit'] = '对8位字符使用MIME编码';
+$labels['force7bit'] = '对8位字符使用 MIME 编码';
 $labels['advancedoptions'] = '高级选项';
 $labels['focusonnewmessage'] = '新邮件到达时将窗口提升为焦点窗口';
 $labels['checkallfolders'] = '检查所有邮件夹里的新邮件';
-$labels['displaynext'] = '当邮件删掉/移动后显示下一封邮件';
-$labels['defaultfont'] = '默认的HTML格式字体';
+$labels['displaynext'] = '当邮件删除/移动后显示下一封邮件';
+$labels['defaultfont'] = '默认的 HTML 格式字体';
 $labels['mainoptions'] = '主要选项';
 $labels['browseroptions'] = '浏览器选项';
 $labels['section'] = '项目';
@@ -444,16 +449,13 @@ $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
 $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
-$labels['replyempty'] = 'do not quote the original message';
+$labels['replyempty'] = '不要引用原始邮件';
 $labels['replytopposting'] = '在原文上面开始新邮件';
 $labels['replybottomposting'] = '在原文下面开始新邮件';
 $labels['replyremovesignature'] = '当回复时从邮件移除原始签名';
 $labels['autoaddsignature'] = '自动插入签名';
 $labels['newmessageonly'] = '仅新邮件';
 $labels['replyandforwardonly'] = '仅回复和转发邮件';
-$labels['replysignaturepos'] = '当回复或转发时插入签名';
-$labels['belowquote'] = '位于原文下方';
-$labels['abovequote'] = '位于原文上方';
 $labels['insertsignature'] = '插入签名';
 $labels['previewpanemarkread']  = '标记预览邮件为已读';
 $labels['afternseconds']  = '$n 秒之后';
@@ -462,7 +464,7 @@ $labels['reqdsn'] = '总是要求投递状态通知';
 $labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
 $labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
-$labels['listnamedisplay'] = 'List contacts as';
+$labels['listnamedisplay'] = '列出联系人为';
 $labels['spellcheckbeforesend'] = '发邮件前进行拼写检查';
 $labels['spellcheckoptions'] = '拼写检查选项';
 $labels['spellcheckignoresyms'] = '忽略带符号的单词';
@@ -470,9 +472,9 @@ $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['forwardmode'] = 'Messages forwarding';
-$labels['inline'] = 'inline';
-$labels['asattachment'] = 'as attachment';
+$labels['forwardmode'] = '邮件转发方式';
+$labels['inline'] = '内嵌';
+$labels['asattachment'] = '作为附件';
 
 $labels['folder']  = '目录管理';
 $labels['folders']  = '目录管理';
@@ -503,9 +505,9 @@ $labels['undo'] = '撤销';
 $labels['installedplugins'] = '已安装插件';
 $labels['plugin'] = '插件';
 $labels['version'] = '版本';
-$labels['source'] = '源';
+$labels['source'] = '源代码';
 $labels['license'] = '许可协议';
-$labels['support'] = '获取支持';
+$labels['support'] = '支持';
 
 // units
 $labels['B'] = 'B';
@@ -519,7 +521,7 @@ $labels['english'] = '英语';
 $labels['westerneuropean'] = '西欧';
 $labels['easterneuropean'] = '东欧';
 $labels['southeasterneuropean'] = '东南欧';
-$labels['baltic'] = '波罗的海';
+$labels['baltic'] = '波罗的语';
 $labels['cyrillic'] = '西里尔语';
 $labels['arabic'] = '阿拉伯语';
 $labels['greek'] = '希腊语';
@@ -527,7 +529,7 @@ $labels['hebrew'] = '希伯来语';
 $labels['turkish'] = '土耳其语';
 $labels['nordic'] = '北欧';
 $labels['thai'] = '泰语';
-$labels['celtic'] = '塞尔特';
+$labels['celtic'] = '塞尔特语';
 $labels['vietnamese'] = '越南语';
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index 31c6051f7..43703e311 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -19,35 +19,37 @@
 $messages = array();
 $messages['errortitle']  = '发生错误！';
 $messages['loginfailed']  = '登录失败。';
-$messages['cookiesdisabled'] = '您的浏览器不接受 cookies。';
-$messages['sessionerror'] = '会话已过期。';
-$messages['storageerror'] = '连接邮件服务器失败。';
+$messages['cookiesdisabled'] = '您的浏览器不支持 Cookies。';
+$messages['sessionerror'] = '会话无效或已过期。';
+$messages['storageerror'] = '连接至 IMAP 服务器失败。';
 $messages['servererror'] = '服务器错误！';
-$messages['servererrormsg'] = '服务器错误: $msg';
+$messages['servererrormsg'] = '服务器错误：$msg';
 $messages['dberror'] = '数据库错误！';
 $messages['requesttimedout'] = '请求超时';
-$messages['errorreadonly'] = '不可对只读文件夹进行操作。';
-$messages['errornoperm'] = '无权限操作';
-$messages['invalidrequest'] = '无效的请求！数据保存失败。';
-$messages['invalidhost'] = '非法主机名。';
+$messages['errorreadonly'] = '无法完成操作。文件夹为只读。';
+$messages['errornoperm'] = '无法完成操作。没有权限。';
+$messages['erroroverquota'] = '无法完成操作。没有足够的磁盘空间。';
+$messages['erroroverquotadelete'] = '没有足够的磁盘空间。请使用 SHIFT+DEL 删除一部分邮件。';
+$messages['invalidrequest'] = '请求无效！未保存数据。';
+$messages['invalidhost'] = '无效的主机名。';
 $messages['nomessagesfound'] = '此邮件夹内无邮件。';
-$messages['loggedout'] = '注销成功，再见！';
-$messages['mailboxempty'] = '邮件夹为空';
+$messages['loggedout'] = '您已成功注销，再见！';
+$messages['mailboxempty'] = '邮件夹为空。';
 $messages['refreshing'] = '正在刷新...';
-$messages['loading'] = '正在载入...';
+$messages['loading'] = '正在登录...';
 $messages['uploading'] = '正在上传文件...';
 $messages['uploadingmany'] = '正在上传文件...';
 $messages['loadingdata'] = '正在载入数据...';
 $messages['checkingmail'] = '正在检查新邮件...';
-$messages['sendingmessage'] = '正在发送邮件...';
-$messages['messagesent'] = '邮件发送成功。';
+$messages['sendingmessage'] = '正在发送...';
+$messages['messagesent'] = '邮件已发送。';
 $messages['savingmessage'] = '正在保存邮件...';
 $messages['messagesaved'] = '邮件已暂存至草稿箱。';
 $messages['successfullysaved'] = '保存成功。';
-$messages['addedsuccessfully'] = '成功添加联系人。';
+$messages['addedsuccessfully'] = '联系人已添加。';
 $messages['contactexists'] = '当前联系人的电子邮件地址已存在。';
 $messages['contactnameexists'] = '已存在同名联系人。';
-$messages['blockedimages'] = '为保护隐私，此邮件中的远程图片未予显示。';
+$messages['blockedimages'] = '由于保护隐私，此邮件中的远程图片未予显示。';
 $messages['encryptedmessage'] = '抱歉！该邮件已被加密，无法显示。';
 $messages['nocontactsfound'] = '未找到联系人。';
 $messages['contactnotfound'] = '未找到指定的联系人。';
@@ -60,74 +62,74 @@ $messages['errormoving'] = '无法移动邮件。';
 $messages['errorcopying'] = '无法复制邮件。';
 $messages['errordeleting'] = '无法删除邮件。';
 $messages['errormarking'] = '无法标记邮件。';
-$messages['deletecontactconfirm']  = '确定要删除已选中的联系人？';
-$messages['deletegroupconfirm']  = '确定要删除以选中的组?';
-$messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
-$messages['deletefolderconfirm']  = '确定要删除已选中的邮件夹？';
-$messages['purgefolderconfirm']  = '是否确认要删除当前邮件夹中的所有邮件？';
+$messages['deletecontactconfirm']  = '是否删除选中的联系人？';
+$messages['deletegroupconfirm']  = '是否删除选中的群组?';
+$messages['deletemessagesconfirm'] = '是否删除选中的邮件？';
+$messages['deletefolderconfirm']  = '是否删除选中的邮件夹？';
+$messages['purgefolderconfirm']  = '是否删除当前邮件夹中的全部邮件？';
 $messages['contactdeleting'] = '正在删除联系人...';
-$messages['groupdeleting'] = '正在删除组...';
+$messages['groupdeleting'] = '正在删除群组...';
 $messages['folderdeleting'] = '正在删除文件夹...';
 $messages['foldermoving'] = '正在移动文件夹...';
 $messages['foldersubscribing'] = '订阅文件夹中...';
 $messages['folderunsubscribing'] = '退订中...';
-$messages['formincomplete'] = '当前表单未填写完整，请完整填写。';
+$messages['formincomplete'] = '表单未填写完整。';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址。';
-$messages['nonamewarning']  = '请输入名字。';
-$messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
+$messages['nonamewarning']  = '请输入名称。';
+$messages['nopagesizewarning'] = '请输入每页显示的邮件数量。';
 $messages['nosenderwarning'] = '请输入发件人地址。';
-$messages['norecipientwarning'] = '至少需要一个收件人。';
+$messages['norecipientwarning'] = '至少输入一个收件人。';
 $messages['nosubjectwarning']  = '主题为空。您要输入一个主题吗？';
-$messages['nobodywarning'] = '要发送无正文的邮件吗？';
+$messages['nobodywarning'] = '要发送没有正文的邮件吗？';
 $messages['notsentwarning'] = '邮件未发送。您确定要离开并舍弃当前邮件吗？';
-$messages['noldapserver'] = '请选择一个LDAP服务器进行查找。';
-$messages['nosearchname'] = '请输入一个联系人姓名或电子邮件地址。';
-$messages['notuploadedwarning'] = '附件还没有全部上传，请等待或者取消上传。';
+$messages['noldapserver'] = '请选择一个用来查找的 LDAP 服务器。';
+$messages['nosearchname'] = '请输入联系人姓名或电子邮件地址。';
+$messages['notuploadedwarning'] = '附件尚未全部上传，请耐心等待或者取消上传。';
 $messages['searchsuccessful'] = '共找到 $nr 封邮件。';
 $messages['contactsearchsuccessful'] = '共找到 $nr 位联系人。';
-$messages['searchnomatch'] = '未找到任何符合条件的邮件';
+$messages['searchnomatch'] = '未找到任何符合条件的邮件。';
 $messages['searching'] = '正在搜索...';
 $messages['checking'] = '正在检查...';
-$messages['nospellerrors'] = '未发现拼写错误';
-$messages['folderdeleted'] = '文件夹已被成功删除。';
-$messages['foldersubscribed'] = '成功订阅文件夹。';
-$messages['folderunsubscribed'] = '成功退订的文件夹。';
-$messages['folderpurged'] = '成功清空文件夹。';
+$messages['nospellerrors'] = '未发现拼写错误。';
+$messages['folderdeleted'] = '删除文件夹成功。';
+$messages['foldersubscribed'] = '订阅文件夹成功。';
+$messages['folderunsubscribed'] = '退订文件夹成功。';
+$messages['folderpurged'] = '清空文件夹成功。';
 $messages['folderexpunged'] = '文件夹已清空。';
 $messages['deletedsuccessfully'] = '删除成功。';
 $messages['converting'] = '格式转换中...';
-$messages['messageopenerror'] = '无法从服务器上加载邮件内容。';
+$messages['messageopenerror'] = '无法从服务器加载邮件内容。';
 $messages['fileuploaderror'] = '文件上传失败。';
 $messages['filesizeerror'] = '上传的文件超过了 $size 的大小限制。';
 $messages['copysuccess'] = '成功复制 $nr 个地址。';
 $messages['copyerror'] = '无法复制地址。';
 $messages['sourceisreadonly'] = '源地址为只读。';
-$messages['errorsavingcontact'] = '无法保存联系人的地址。';
-$messages['movingmessage'] = '移动邮件到...';
-$messages['copyingmessage'] = '复制邮件到...';
-$messages['copyingcontact'] = '复制联系人...';
+$messages['errorsavingcontact'] = '无法保存联系人地址。';
+$messages['movingmessage'] = '正在移动邮件...';
+$messages['copyingmessage'] = '正在复制邮件...';
+$messages['copyingcontact'] = '正在复制联系人...';
 $messages['deletingmessage'] = '正在删除邮件...';
 $messages['markingmessage'] = '正在标记邮件...';
-$messages['addingmember'] = '正在添加联系人到组...';
-$messages['removingmember'] = '正在从组中删除联系人...';
-$messages['receiptsent'] = '成功发送了一个已读回执。';
-$messages['errorsendingreceipt'] = '无法发送回执。';
-$messages['deleteidentityconfirm'] = '您真的想删除这个验证信息吗？';
-$messages['nodeletelastidentity'] = '无法删除这个身份，这是最后一个。';
-$messages['forbiddencharacter'] = '目录名包含隐藏字符。';
+$messages['addingmember'] = '正在添加联系人至群组...';
+$messages['removingmember'] = '正在从群组中删除联系人...';
+$messages['receiptsent'] = '成功发送一个已读回执。';
+$messages['errorsendingreceipt'] = '无法发送已读回执。';
+$messages['deleteidentityconfirm'] = '是否删除该身份？';
+$messages['nodeletelastidentity'] = '无法删除该身份，这是最后一个。';
+$messages['forbiddencharacter'] = '目录名包含禁止字符。';
 $messages['selectimportfile'] = '请选择要上传的文件。';
-$messages['addresswriterror'] = '已选择的地址簿不可写。';
-$messages['contactaddedtogroup'] = '成功添加联系人至该分组。';
-$messages['contactremovedfromgroup'] = '成功从该分组移除联系人。';
-$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['addresswriterror'] = '选中的通讯录不可写。';
+$messages['contactaddedtogroup'] = '添加联系人至该群组成功。';
+$messages['contactremovedfromgroup'] = '从该群组移除联系人成功。';
+$messages['nogroupassignmentschanged'] = '群组资料没有变更。';
 $messages['importwait'] = '正在导入，请稍后...';
 $messages['importformaterror'] = '导入失败！文件无效。';
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人</b>';
 $messages['importconfirmskipped'] = '<b>跳过已存在的 $skipped 项目</b>';
 $messages['opnotpermitted'] = '不允许的操作!';
-$messages['nofromaddress'] = '选中的身份中没有邮件地址。';
-$messages['editorwarning'] = '切换到纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
-$messages['httpreceivedencrypterror'] = '发生了一个致命的配置错误，请立即联系管理员。<b>您的邮件无法发送。</b>';
+$messages['nofromaddress'] = '选中的身份没有邮件地址。';
+$messages['editorwarning'] = '切换至纯文本编辑器将导致邮件正文中的所有文本格式失效，您确定要这样做吗？';
+$messages['httpreceivedencrypterror'] = '<b>您的邮件无法发送</b>，因为发生了一个严重的配置错误，请立即联系管理员。';
 $messages['smtpconnerror'] = 'SMTP 错误 ($code):连接服务器失败。';
 $messages['smtpautherror'] = 'SMTP 错误 ($code): 认证失败。';
 $messages['smtpfromerror'] = 'SMTP 错误 ($code):添加发件人失败 "$from" ($msg)。';
@@ -137,17 +139,17 @@ $messages['smtperror'] = 'SMTP 错误: $msg';
 $messages['emailformaterror'] = '无效的邮件地址：$email';
 $messages['toomanyrecipients'] = '收件人太多，请减少人数至 $max。';
 $messages['maxgroupmembersreached'] = '组员数量超过最大值 $max。';
-$messages['internalerror'] = '遇到一个内部错误，请重试。';
+$messages['internalerror'] = '发生一个内部错误，请重试。';
 $messages['contactdelerror'] = '无法删除联系人。';
 $messages['contactdeleted'] = '删除联系人成功。';
 $messages['contactrestoreerror'] = '无法恢复已删除的联系人。';
 $messages['contactrestored'] = '联系人恢复成功。';
-$messages['groupdeleted'] = '成功删除组。';
-$messages['grouprenamed'] = '组改名成功。';
-$messages['groupcreated'] = '成功创建组';
+$messages['groupdeleted'] = '删除群组成功。';
+$messages['grouprenamed'] = '群组改名成功。';
+$messages['groupcreated'] = '成功创建群组';
 $messages['savedsearchdeleted'] = '成功删除保存的搜索';
 $messages['savedsearchdeleteerror'] = '无法删除保存的搜索';
-$messages['savedsearchcreated'] = '成功建立保存的搜索';
+$messages['savedsearchcreated'] = '成功创建保存的搜索';
 $messages['savedsearchcreateerror'] = '无法创建保存的搜索。';
 $messages['messagedeleted'] = '删除邮件成功。';
 $messages['messagemoved'] = '移动邮件成功。';
@@ -161,9 +163,9 @@ $messages['folderupdated'] = '成功更新文件夹';
 $messages['foldercreated'] = '成功创建文件夹';
 $messages['invalidimageformat'] = '非法的图像类型。';
 $messages['mispellingsfound'] = '检查到拼写错误。';
-$messages['parentnotwritable'] = '无法创建和转移到所选的目录,权限不足。';
-$messages['messagetoobig'] = '由于邮件部分过大无法处理。';
-$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['parentnotwritable'] = '无法创建/转移文件夹至指定的上级目录,权限不足。';
+$messages['messagetoobig'] = '邮件过大无法处理。';
+$messages['attachmentvalidationerror'] = '警告！该附件很可疑，因为其自身的格式与邮件中声明的格式不符。如果您不信任发送人，则不应该在浏览器中打开该附件。<br/><br/><em>声明格式：$expected；实际格式：$detected</em>';
 $messages['noscriptwarning'] = '警告：本程序需要 Javascript 支持！请在浏览器设置中启用 Javascript。';
 
 ?>
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index 6f2f7ed52..a545f2f81 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -64,6 +64,7 @@ $labels['copy']     = '複製';
 $labels['move']     = '移動';
 $labels['moveto']   = '移至...';
 $labels['download'] = '下載';
+$labels['open']     = 'Open';
 $labels['showattachment'] = '顯示';
 $labels['showanyway'] = '總是顯示';
 
@@ -161,6 +162,7 @@ $labels['currpage'] = '目前頁面';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
 $labels['unanswered'] = '未回覆的郵件';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '已刪除的郵件';
 $labels['undeleted'] = '未刪除的郵件';
 $labels['invert'] = '反選';
@@ -204,6 +206,8 @@ $labels['body']  = '內文';
 
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
 
 // message compose
 $labels['editasnew']      = '以新郵件編輯';
@@ -241,7 +245,7 @@ $labels['nosubject']  = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
 $labels['isdraft']    = '這是一封草稿';
-$labels['andnmore']   = '$nr more...';
+$labels['andnmore']   = '第$nr封或是更多...';
 $labels['togglemoreheaders'] = '顯示更多的訊息表頭';
 $labels['togglefullheaders'] = '切換原始訊息表頭';
 
@@ -335,8 +339,8 @@ $labels['composeto']      = '寄信至所選擇的聯絡人';
 $labels['contactsfromto'] = '聯絡人 $from 至 $to，共有 $count 人';
 $labels['print']          = '列印';
 $labels['export']         = '匯出通訊錄';
-$labels['exportall']      = 'Export all';
-$labels['exportsel']      = 'Export selected';
+$labels['exportall']      = '匯出全部';
+$labels['exportsel']      = '匯出選擇項目';
 $labels['exportvcards']   = '匯出通訊錄為 vCard 格式';
 $labels['newcontactgroup'] = '新增聯絡人群組';
 $labels['grouprename']    = '重新命名群組';
@@ -380,7 +384,7 @@ $labels['edititem'] = '編輯項目';
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['defaultcharset'] = '預設編碼';
 $labels['htmlmessage'] = 'HTML 郵件';
-$labels['messagepart'] = 'Part';
+$labels['messagepart'] = '部分';
 $labels['digitalsig'] = '數位簽章';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '時間格式';
@@ -398,6 +402,7 @@ $labels['htmleditor'] = '使用 HTML 撰寫郵件';
 $labels['htmlonreply'] = '只有在回覆HTML信件時';
 $labels['htmlonreplyandforward'] = '只有在轉寄或回覆HTML信件時';
 $labels['htmlsignature'] = 'HTML 簽名檔';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = '顯示預覽窗格';
 $labels['skin'] = '版面風格';
 $labels['logoutclear'] = '登出時清空垃圾桶';
@@ -451,9 +456,6 @@ $labels['replyremovesignature'] = '回覆時移除原有簽名檔';
 $labels['autoaddsignature'] = '自動附加簽名';
 $labels['newmessageonly'] = '只有新訊息';
 $labels['replyandforwardonly'] = '只有回覆或轉寄';
-$labels['replysignaturepos'] = '當回覆或轉寄時附上簽名檔';
-$labels['belowquote'] = '引用的下方';
-$labels['abovequote'] = '引用的上方';
 $labels['insertsignature'] = '插入簽名檔';
 $labels['previewpanemarkread']  = '標示已預覽訊息為已讀取';
 $labels['afternseconds']  = '$n 秒之後';
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index f0f92c848..5605ba815 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -28,6 +28,8 @@ $messages['dberror'] = '資料庫錯誤!';
 $messages['requesttimedout'] = '要求逾時';
 $messages['errorreadonly'] = '動作無法完成。資料夾唯讀';
 $messages['errornoperm'] = '動作無法完成。權限不符';
+$messages['erroroverquota'] = '動作無法完成。硬碟空間不夠';
+$messages['erroroverquotadelete'] = '硬碟空間不夠,請使用SHIFT+DEL來刪除訊息';
 $messages['invalidrequest'] = '要求無效！未儲存任何資料。';
 $messages['invalidhost'] = '無效的伺服器名稱';
 $messages['nomessagesfound'] = '此郵件匣沒有任何郵件';